Commit 6fd1d51c authored by Erin MacNeil's avatar Erin MacNeil Committed by Jakub Kicinski
Browse files

net: SO_RCVMARK socket option for SO_MARK with recvmsg() 



Adding a new socket option, SO_RCVMARK, to indicate that SO_MARK
should be included in the ancillary data returned by recvmsg().

Renamed the sock_recv_ts_and_drops() function to sock_recv_cmsgs().

Signed-off-by: default avatarErin MacNeil <lnx.erin@gmail.com>
Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
Reviewed-by: default avatarDavid Ahern <dsahern@kernel.org>
Acked-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
Link: https://lore.kernel.org/r/20220427200259.2564-1-lnx.erin@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 0e55546b

arch/alpha/include/uapi/asm/socket.h

+2 −0
Original line number Diff line number Diff line
@@ -135,6 +135,8 @@ 


#define SO_TXREHASH		74



#define SO_RCVMARK		75



#if !defined(__KERNEL__)



#if __BITS_PER_LONG == 64

arch/mips/include/uapi/asm/socket.h

+2 −0
Original line number Diff line number Diff line
@@ -146,6 +146,8 @@ 


#define SO_TXREHASH		74



#define SO_RCVMARK		75



#if !defined(__KERNEL__)



#if __BITS_PER_LONG == 64

arch/parisc/include/uapi/asm/socket.h

+2 −0
Original line number Diff line number Diff line
@@ -127,6 +127,8 @@ 


#define SO_TXREHASH		0x4048



#define SO_RCVMARK		0x4049



#if !defined(__KERNEL__)



#if __BITS_PER_LONG == 64

arch/sparc/include/uapi/asm/socket.h

+1 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ 


#define SO_TXREHASH              0x0053



#define SO_RCVMARK               0x0054



#if !defined(__KERNEL__)

include/net/sock.h

+10 −8
Original line number Diff line number Diff line
@@ -893,6 +893,7 @@ enum sock_flags { 
	SOCK_TXTIME,

	SOCK_XDP, /* XDP is attached */

	SOCK_TSTAMP_NEW, /* Indicates 64 bit timestamps always */

	SOCK_RCVMARK, /* Receive SO_MARK  ancillary data with packet */

};



#define SK_FLAGS_TIMESTAMP ((1UL << SOCK_TIMESTAMP) | (1UL << SOCK_TIMESTAMPING_RX_SOFTWARE))
@@ -2647,20 +2648,21 @@ sock_recv_timestamp(struct msghdr *msg, struct sock *sk, struct sk_buff *skb) 
		__sock_recv_wifi_status(msg, sk, skb);

}



void __sock_recv_ts_and_drops(struct msghdr *msg, struct sock *sk,

void __sock_recv_cmsgs(struct msghdr *msg, struct sock *sk,

		       struct sk_buff *skb);



#define SK_DEFAULT_STAMP (-1L * NSEC_PER_SEC)

static inline void sock_recv_ts_and_drops(struct msghdr *msg, struct sock *sk,

static inline void sock_recv_cmsgs(struct msghdr *msg, struct sock *sk,

				   struct sk_buff *skb)

{

#define FLAGS_TS_OR_DROPS ((1UL << SOCK_RXQ_OVFL)			| \

			   (1UL << SOCK_RCVTSTAMP))

#define FLAGS_RECV_CMSGS ((1UL << SOCK_RXQ_OVFL)			| \

			   (1UL << SOCK_RCVTSTAMP)			| \

			   (1UL << SOCK_RCVMARK))

#define TSFLAGS_ANY	  (SOF_TIMESTAMPING_SOFTWARE			| \

			   SOF_TIMESTAMPING_RAW_HARDWARE)



	if (sk->sk_flags & FLAGS_TS_OR_DROPS || sk->sk_tsflags & TSFLAGS_ANY)

		__sock_recv_ts_and_drops(msg, sk, skb);

	if (sk->sk_flags & FLAGS_RECV_CMSGS || sk->sk_tsflags & TSFLAGS_ANY)

		__sock_recv_cmsgs(msg, sk, skb);

	else if (unlikely(sock_flag(sk, SOCK_TIMESTAMP)))

		sock_write_timestamp(sk, skb->tstamp);

	else if (unlikely(sk->sk_stamp == SK_DEFAULT_STAMP))