Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6af0c22 authored by Willem de Bruijn's avatar Willem de Bruijn Committed by David S. Miller
Browse files

ip: support SO_MARK cmsg 



Enable setting skb->mark for UDP and RAW sockets using cmsg.

This is analogous to existing support for TOS, TTL, txtime, etc.

Packet sockets already support this as of commit c7d39e32
("packet: support per-packet fwmark for af_packet sendmsg").

Similar to other fields, implement by
1. initialize the sockcm_cookie.mark from socket option sk_mark
2. optionally overwrite this in ip_cmsg_send/ip6_datagram_send_ctl
3. initialize inet_cork.mark from sockcm_cookie.mark
4. initialize each (usually just one) skb->mark from inet_cork.mark

Step 1 is handled in one location for most protocols by ipcm_init_sk
as of commit 35178206 ("ipv4: ipcm_cookie initializers").

Signed-off-by: default avatarWillem de Bruijn <willemb@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 823eb2a3

include/net/inet_sock.h

+1 −0
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ struct inet_cork { 
	char			priority;

	__u16			gso_size;

	u64			transmit_time;

	u32			mark;

};



struct inet_cork_full {

include/net/ip.h

+1 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ static inline void ipcm_init_sk(struct ipcm_cookie *ipcm, 
{

	ipcm_init(ipcm);



	ipcm->sockc.mark = inet->sk.sk_mark;

	ipcm->sockc.tsflags = inet->sk.sk_tsflags;

	ipcm->oif = inet->sk.sk_bound_dev_if;

	ipcm->addr = inet->inet_saddr;

net/ipv4/ip_output.c

+2 −1
Original line number Diff line number Diff line
@@ -1266,6 +1266,7 @@ static int ip_setup_cork(struct sock *sk, struct inet_cork *cork, 
	cork->length = 0;

	cork->ttl = ipc->ttl;

	cork->tos = ipc->tos;

	cork->mark = ipc->sockc.mark;

	cork->priority = ipc->priority;

	cork->transmit_time = ipc->sockc.transmit_time;

	cork->tx_flags = 0;
@@ -1529,7 +1530,7 @@ struct sk_buff *__ip_make_skb(struct sock *sk, 
	}



	skb->priority = (cork->tos != -1) ? cork->priority: sk->sk_priority;

	skb->mark = sk->sk_mark;

	skb->mark = cork->mark;

	skb->tstamp = cork->transmit_time;

	/*

	 * Steal rt from cork.dst to avoid a pair of atomic_inc/atomic_dec

net/ipv4/ping.c

+1 −1
Original line number Diff line number Diff line
@@ -781,7 +781,7 @@ static int ping_v4_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) 
	} else if (!ipc.oif)

		ipc.oif = inet->uc_index;



	flowi4_init_output(&fl4, ipc.oif, sk->sk_mark, tos,

	flowi4_init_output(&fl4, ipc.oif, ipc.sockc.mark, tos,

			   RT_SCOPE_UNIVERSE, sk->sk_protocol,

			   inet_sk_flowi_flags(sk), faddr, saddr, 0, 0,

			   sk->sk_uid);

net/ipv4/raw.c

+2 −2
Original line number Diff line number Diff line
@@ -375,7 +375,7 @@ static int raw_send_hdrinc(struct sock *sk, struct flowi4 *fl4, 
	skb_reserve(skb, hlen);



	skb->priority = sk->sk_priority;

	skb->mark = sk->sk_mark;

	skb->mark = sockc->mark;

	skb->tstamp = sockc->transmit_time;

	skb_dst_set(skb, &rt->dst);

	*rtp = NULL;
@@ -623,7 +623,7 @@ static int raw_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) 
		}

	}



	flowi4_init_output(&fl4, ipc.oif, sk->sk_mark, tos,

	flowi4_init_output(&fl4, ipc.oif, ipc.sockc.mark, tos,

			   RT_SCOPE_UNIVERSE,

			   hdrincl ? IPPROTO_RAW : sk->sk_protocol,

			   inet_sk_flowi_flags(sk) |