From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Ahern Subject: [PATCH 04/10] udp: Handle VRF device Date: Wed, 5 Aug 2015 11:14:47 -0600 Message-ID: <1438794894-70217-5-git-send-email-dsa@cumulusnetworks.com> References: <1438794894-70217-1-git-send-email-dsa@cumulusnetworks.com> Cc: shm@cumulusnetworks.com, roopa@cumulusnetworks.com, gospo@cumulusnetworks.com, jtoppins@cumulusnetworks.com, nikolay@cumulusnetworks.com, ddutt@cumulusnetworks.com, hannes@stressinduktion.org, nicolas.dichtel@6wind.com, stephen@networkplumber.org, hadi@mojatatu.com, ebiederm@xmission.com, davem@davemloft.net, svaidya@brocade.com, David Ahern To: netdev@vger.kernel.org Return-path: Received: from mail-io0-f177.google.com ([209.85.223.177]:33400 "EHLO mail-io0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753135AbbHERQ3 (ORCPT ); Wed, 5 Aug 2015 13:16:29 -0400 Received: by ioii16 with SMTP id i16so56094776ioi.0 for ; Wed, 05 Aug 2015 10:16:29 -0700 (PDT) In-Reply-To: <1438794894-70217-1-git-send-email-dsa@cumulusnetworks.com> Sender: netdev-owner@vger.kernel.org List-ID: For unconnected UDP sockets using a VRF device lookup source address based on VRF table. This allows the UDP header to be properly setup before showing up at the VRF device via the dst. Signed-off-by: Shrijeet Mukherjee Signed-off-by: David Ahern --- net/ipv4/udp.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 83aa604f9273..b513d72a21b3 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -884,7 +884,7 @@ int udp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) struct rtable *rt = NULL; int free = 0; int connected = 0; - __be32 daddr, faddr, saddr; + __be32 daddr, faddr, saddr, vsaddr = 0; __be16 dport; u8 tos; int err, is_udplite = IS_UDPLITE(sk); @@ -1013,11 +1013,30 @@ int udp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) if (!rt) { struct net *net = sock_net(sk); + __u8 flow_flags = inet_sk_flowi_flags(sk); fl4 = &fl4_stack; + + /* unconnected socket. If output device is enslaved to a VRF + * device lookup source address from VRF table. This mimics + * behavior of ip_route_connect{_init}. + */ + if (netif_index_is_vrf(net, ipc.oif)) { + flowi4_init_output(fl4, ipc.oif, sk->sk_mark, tos, + RT_SCOPE_UNIVERSE, sk->sk_protocol, + (flow_flags | FLOWI_FLAG_VRFSRC), + faddr, saddr, dport, inet->inet_sport); + + rt = ip_route_output_flow(net, fl4, sk); + if (!IS_ERR(rt)) { + vsaddr = fl4->saddr; + ip_rt_put(rt); + } + } + flowi4_init_output(fl4, ipc.oif, sk->sk_mark, tos, RT_SCOPE_UNIVERSE, sk->sk_protocol, - inet_sk_flowi_flags(sk), + flow_flags, faddr, saddr, dport, inet->inet_sport); security_sk_classify_flow(sk, flowi4_to_flowi(fl4)); @@ -1042,6 +1061,8 @@ int udp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) goto do_confirm; back_from_confirm: + if (vsaddr) + fl4->saddr = vsaddr; saddr = fl4->saddr; if (!ipc.addr) daddr = ipc.addr = fl4->daddr; -- 2.3.2 (Apple Git-55)