From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eyal Birger Subject: [PATCH net-next v3 0/4] net: Introducing socket mark receive socket option Date: Mon, 23 Feb 2015 19:51:20 +0200 Message-ID: <1424713884-6780-1-git-send-email-eyal.birger@gmail.com> Cc: edumazet@google.com, shmulik.ladkani@gmail.com, netdev@vger.kernel.org, Eyal Birger To: davem@davemloft.net Return-path: Received: from mail-we0-f170.google.com ([74.125.82.170]:35674 "EHLO mail-we0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752032AbbBWRv2 (ORCPT ); Mon, 23 Feb 2015 12:51:28 -0500 Received: by wevl61 with SMTP id l61so16158430wev.2 for ; Mon, 23 Feb 2015 09:51:26 -0800 (PST) Sender: netdev-owner@vger.kernel.org List-ID: This patch set introduces a new socket option for fetching the mark of skbs passed to sockets as ancillary data. A userspace program may wish to receive the mark of packets it receives, for example for distinguishing between different TPROXY diversion rules to the same userspace proxy socket. The patch set includes a minor function renaming, as well as a change in struct sk_buff for allowing skb->mark to persist after being queued to the socket queue. --- Changes in v3: - Rebase - Set skb->priority immediately prior to transmittion in IGMPv3/MLD - Extended commit message regarding use of skb->priority instead of skb->mark in struct sk_buff union Changes in v2: - Function parameter indentation - Commit message formatting --- Eyal Birger (4): net: Rename sock_recv_ts_and_drops() to sock_cmsg_recv() ipv4,v6: avoid setting skb->priority when skb->reserved_tailroom is in use in igmpv3/mld net: use skb->priority for overloading skb->dropcount and skb->reserved_tailroom instead of skb->mark net: Introducing socket mark receive socket option arch/alpha/include/uapi/asm/socket.h | 2 ++ arch/avr32/include/uapi/asm/socket.h | 2 ++ arch/cris/include/uapi/asm/socket.h | 2 ++ arch/frv/include/uapi/asm/socket.h | 2 ++ arch/ia64/include/uapi/asm/socket.h | 2 ++ arch/m32r/include/uapi/asm/socket.h | 2 ++ arch/mips/include/uapi/asm/socket.h | 2 ++ arch/mn10300/include/uapi/asm/socket.h | 2 ++ arch/parisc/include/uapi/asm/socket.h | 2 ++ arch/powerpc/include/uapi/asm/socket.h | 2 ++ arch/s390/include/uapi/asm/socket.h | 2 ++ arch/sparc/include/uapi/asm/socket.h | 2 ++ arch/xtensa/include/uapi/asm/socket.h | 2 ++ include/linux/skbuff.h | 4 ++-- include/net/sock.h | 18 ++++++++++-------- include/uapi/asm-generic/socket.h | 2 ++ net/atm/common.c | 2 +- net/bluetooth/af_bluetooth.c | 4 ++-- net/can/bcm.c | 2 +- net/can/raw.c | 2 +- net/core/sock.c | 8 ++++++++ net/ieee802154/socket.c | 4 ++-- net/ipv4/igmp.c | 3 ++- net/ipv4/raw.c | 2 +- net/ipv4/udp.c | 2 +- net/ipv6/mcast.c | 3 ++- net/ipv6/raw.c | 2 +- net/ipv6/udp.c | 2 +- net/key/af_key.c | 2 +- net/packet/af_packet.c | 2 +- net/rxrpc/ar-recvmsg.c | 2 +- net/sctp/socket.c | 2 +- net/socket.c | 15 ++++++++++++--- 33 files changed, 79 insertions(+), 30 deletions(-) -- 2.1.4