From: David Ahern <dsa@cumulusnetworks•com>
To: Julian Anastasov <ja@ssi•bg>
Cc: netdev@vger•kernel.org
Subject: Re: [PATCH net-next 06/13] net: original ingress device index in PKTINFO
Date: Thu, 5 May 2016 09:00:34 -0600 [thread overview]
Message-ID: <572B6012.60806@cumulusnetworks.com> (raw)
In-Reply-To: <alpine.LFD.2.11.1605051040320.2118@ja.home.ssi.bg>
On 5/5/16 2:41 AM, Julian Anastasov wrote:
>
> Hello,
>
> On Wed, 4 May 2016, David Ahern wrote:
>
>> Applications such as OSPF and BFD need the original ingress device not
>> the VRF device; the latter can be derived from the former. To that end
>> add the skb_iif to inet_skb_parm and set it in ipv4 code after clearing
>> the skb control buffer similar to IPv6. From there the pktinfo can just
>> pull it from cb with the PKTINFO_SKB_CB cast.
>>
>> The previous patch moving the skb->dev change to L3 means nothing else
>> is needed for IPv6; it just works.
>>
>> Signed-off-by: David Ahern <dsa@cumulusnetworks•com>
>> ---
>> include/net/ip.h | 1 +
>> net/ipv4/ip_input.c | 1 +
>> net/ipv4/ip_sockglue.c | 9 +++++++--
>> 3 files changed, 9 insertions(+), 2 deletions(-)
>>
>> diff --git a/include/net/ip.h b/include/net/ip.h
>> index 247ac82e9cf2..37165fba3741 100644
>> --- a/include/net/ip.h
>> +++ b/include/net/ip.h
>> @@ -36,6 +36,7 @@
>> struct sock;
>>
>> struct inet_skb_parm {
>> + int iif;
>> struct ip_options opt; /* Compiled IP options */
>> unsigned char flags;
>>
>> diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c
>> index 37375eedeef9..4b351af3e67b 100644
>> --- a/net/ipv4/ip_input.c
>> +++ b/net/ipv4/ip_input.c
>> @@ -478,6 +478,7 @@ int ip_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt,
>>
>> /* Remove any debris in the socket control block */
>> memset(IPCB(skb), 0, sizeof(struct inet_skb_parm));
>> + IPCB(skb)->iif = skb->skb_iif;
>
> For loopback traffic (including looped back multicast)
> this is now a zero :( Can inet_iif be moved to ip_rcv_finish
> instead? Still, we spend cycles in fast path in case nobody
> listens for such info.
Why is that? skb_iif is set to skb->dev->index in
__netif_receive_skb_core and ip_rcv is called it. Is there another path
to it?
>
>> /* Must drop socket now because of tproxy. */
>> skb_orphan(skb);
>> diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
>> index bdb222c0c6a2..dbcd027c38e7 100644
>> --- a/net/ipv4/ip_sockglue.c
>> +++ b/net/ipv4/ip_sockglue.c
>> @@ -476,9 +476,9 @@ static bool ipv4_datagram_support_cmsg(const struct sock *sk,
>> (!skb->dev))
>> return false;
>>
>> + /* see comment in ipv4_pktinfo_prepare about CB re-use */
>> info = PKTINFO_SKB_CB(skb);
>> info->ipi_spec_dst.s_addr = ip_hdr(skb)->saddr;
>> - info->ipi_ifindex = skb->dev->ifindex;
>
> This code is only for SOF_TIMESTAMPING_OPT_CMSG.
> I'm not sure skb passes ip_rcv in all cases. So, we can not
> easily remove it.
ok.
next prev parent reply other threads:[~2016-05-05 15:00 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-05 3:33 [PATCH net-next 00/13] net: Various VRF patches David Ahern
2016-05-05 3:33 ` [PATCH net-next 01/13] net: vrf: Create FIB tables on link create David Ahern
2016-05-05 3:33 ` [PATCH net-next 02/13] net: l3mdev: Move get_saddr and rt6_dst David Ahern
2016-05-05 3:33 ` [PATCH net-next 03/13] net: l3mdev: Allow send on enslaved interface David Ahern
2016-05-05 7:40 ` Julian Anastasov
2016-05-05 14:50 ` David Ahern
2016-05-05 3:33 ` [PATCH net-next 04/13] net: ipv6: tcp reset, icmp need to consider L3 domain David Ahern
2016-05-05 3:33 ` [PATCH net-next 05/13] net: l3mdev: Add hook in ip and ipv6 David Ahern
2016-05-05 3:33 ` [PATCH net-next 06/13] net: original ingress device index in PKTINFO David Ahern
2016-05-05 8:41 ` Julian Anastasov
2016-05-05 15:00 ` David Ahern [this message]
2016-05-05 20:00 ` Julian Anastasov
2016-05-05 3:33 ` [PATCH net-next 07/13] net: vrf: ipv4 support for local traffic to local addresses David Ahern
2016-05-05 3:33 ` [PATCH net-next 08/13] net: vrf: ipv6 " David Ahern
2016-05-05 3:33 ` [PATCH net-next 09/13] net: l3mdev: Propagate route lookup flags for IPv6 David Ahern
2016-05-05 3:33 ` [PATCH net-next 10/13] net: vrf: Handle ipv6 multicast and link-local addresses David Ahern
2016-05-05 3:33 ` [PATCH net-next 11/13] net: vrf: rcu protect changes to private data David Ahern
2016-05-05 3:33 ` [PATCH net-next 12/13] net: vrf: Implement get_saddr for IPv6 David Ahern
2016-05-05 3:33 ` [PATCH net-next 13/13] net: ipv6: address selection should only consider devices in L3 domain David Ahern
2016-05-05 3:59 ` [PATCH net-next 00/13] net: Various VRF patches David Miller
2016-05-05 4:13 ` David Ahern
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=572B6012.60806@cumulusnetworks.com \
--to=dsa@cumulusnetworks$(echo .)com \
--cc=ja@ssi$(echo .)bg \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox