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 c7d39e32632e
("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 351782067b6b ("ipv4: ipcm_cookie initializers").

Signed-off-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/inet_sock.h b/include/net/inet_sock.h
index 7769c9b36d75592ec11e9c9d679ac38482162bd0..34c4436fd18ff400a8af086f4a4c0eae08d10b18 100644 (file)
--- a/include/net/inet_sock.h
+++ b/include/net/inet_sock.h
@@ -160,6 +160,7 @@ struct inet_cork {
        char                    priority;
        __u16                   gso_size;
        u64                     transmit_time;
+       u32                     mark;
 };
 
 struct inet_cork_full {

diff --git a/include/net/ip.h b/include/net/ip.h
index 29d89de39822288f7b61d20c96374cfed5f6b8fb..95bb77f95bcc37404c143f7176117c72c2023d27 100644 (file)
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -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;

diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index cc7ef0d05bbd2baf4f4a1b8f9a8fe4f56b901f77..5eb73775c3f7da2014bd658980d10d8a22960b6b 100644 (file)
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -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

diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
index 9d24ef5c5d8f0c85960aafa378ccd284f68f193e..535427292194eb57e8a268f882174710ccb76b30 100644 (file)
--- a/net/ipv4/ping.c
+++ b/net/ipv4/ping.c
@@ -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);

diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
index 40a6abbc9cf613ed1c180f8bae65a9713736dfdd..80da5a66d5d7b6e53034de728cfda19630fa2399 100644 (file)
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
@@ -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) |

diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index d88821c794fbe3b2765bb8945fe5afb21c92ead5..fbcd9be3a470f5f6d2597bb948788171b8b66199 100644 (file)
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -1130,7 +1130,7 @@ int udp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
 
                fl4 = &fl4_stack;
 
-               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,
                                   flow_flags,
                                   faddr, saddr, dport, inet->inet_sport,

diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index 8e49fd62eea917764816fe7e343fe50673111a1b..89a4c7c2e25d01cc2ef18ae9c407f8f3319590d9 100644 (file)
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -1294,6 +1294,7 @@ static int ip6_setup_cork(struct sock *sk, struct inet_cork_full *cork,
        cork->base.fragsize = mtu;
        cork->base.gso_size = ipc6->gso_size;
        cork->base.tx_flags = 0;
+       cork->base.mark = ipc6->sockc.mark;
        sock_tx_timestamp(sk, ipc6->sockc.tsflags, &cork->base.tx_flags);
 
        if (dst_allfrag(xfrm_dst_path(&rt->dst)))
@@ -1764,7 +1765,7 @@ struct sk_buff *__ip6_make_skb(struct sock *sk,
        hdr->daddr = *final_dst;
 
        skb->priority = sk->sk_priority;
-       skb->mark = sk->sk_mark;
+       skb->mark = cork->base.mark;
 
        skb->tstamp = cork->base.transmit_time;
 

diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index 8a6131991e38fec5db19a6cbedda315cd22a539d..6e1888ee403628fcefe1c9afca4d5de81b249ab2 100644 (file)
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -646,7 +646,7 @@ static int rawv6_send_hdrinc(struct sock *sk, struct msghdr *msg, int length,
 
        skb->protocol = htons(ETH_P_IPV6);
        skb->priority = sk->sk_priority;
-       skb->mark = sk->sk_mark;
+       skb->mark = sockc->mark;
        skb->tstamp = sockc->transmit_time;
 
        skb_put(skb, length);
@@ -810,6 +810,7 @@ static int rawv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
 
        ipcm6_init(&ipc6);
        ipc6.sockc.tsflags = sk->sk_tsflags;
+       ipc6.sockc.mark = sk->sk_mark;
 
        if (sin6) {
                if (addr_len < SIN6_LEN_RFC2133)
@@ -891,6 +892,7 @@ static int rawv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
        opt = ipv6_fixup_options(&opt_space, opt);
 
        fl6.flowi6_proto = proto;
+       fl6.flowi6_mark = ipc6.sockc.mark;
 
        if (!hdrincl) {
                rfv.msg = msg;

diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index 827fe738507887875f92c7dcc674f54e02e2b939..2c8beb3896d17ea8bd482d9106f8a8896cab2053 100644 (file)
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -1230,6 +1230,7 @@ int udpv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
        ipcm6_init(&ipc6);
        ipc6.gso_size = up->gso_size;
        ipc6.sockc.tsflags = sk->sk_tsflags;
+       ipc6.sockc.mark = sk->sk_mark;
 
        /* destination address check */
        if (sin6) {
@@ -1352,7 +1353,7 @@ do_udp_sendmsg:
        if (!fl6.flowi6_oif)
                fl6.flowi6_oif = np->sticky_pktinfo.ipi6_ifindex;
 
-       fl6.flowi6_mark = sk->sk_mark;
+       fl6.flowi6_mark = ipc6.sockc.mark;
        fl6.flowi6_uid = sk->sk_uid;
 
        if (msg->msg_controllen) {