netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Hangbin Liu <liuhangbin@gmail.com>
To: netdev@vger.kernel.org
Cc: David Ahern <dsa@cumulusnetworks.com>,
	Jianguo Wu <wujianguo@chinatelecom.cn>,
	Daniel Borkmann <daniel@iogearbox.net>,
	Mahesh Bandewar <maheshb@google.com>,
	Hangbin Liu <liuhangbin@gmail.com>
Subject: [PATCH net] ipvlan: fix bound dev checking for IPv6 l3s mode
Date: Wed,  7 Jun 2023 16:45:30 +0800	[thread overview]
Message-ID: <20230607084530.2739069-1-liuhangbin@gmail.com> (raw)

The commit 59a0b022aa24 ("ipvlan: Make skb->skb_iif track skb->dev for l3s
mode") fixed ipvlan bonded dev checking by updating skb skb_iif. This fix
works for IPv4, as in raw_v4_input() the dif is from inet_iif(skb), which
is skb->skb_iif when there is no route.

But for IPv6, the fix is not enough, because in ipv6_raw_deliver() ->
raw_v6_match(), the dif is inet6_iif(skb), which is returns IP6CB(skb)->iif
instead of skb->skb_iif if it's not a l3_slave. To fix the IPv6 part
issue. Let's set IP6SKB_L3SLAVE flag for ipvlan l3s input packets.

Fixes: c675e06a98a4 ("ipvlan: decouple l3s mode dependencies from other modes")
Link: https://bugzilla.redhat.com/show_bug.cgi?id=2196710
Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
---
I'm not 100% sure if we can use IP6SKB_L3SLAVE flag for ipvlan. But since
the l3s mode is a part of l3mdev enhancements. I assume it should be OK.

BTW, the fixes tag also looks not fit enough. The ipvlan_nf_input() is already
there in commit c675e06a98a4 ("ipvlan: decouple l3s mode dependencies from
other modes"). I think we should use 4fbae7d83c98 ("ipvlan: Introduce l3s
mode"). But I would keep using c675e06a98a4 as a consistence of the IPv4
version fix if no object.
---
 drivers/net/ipvlan/ipvlan_l3s.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/net/ipvlan/ipvlan_l3s.c b/drivers/net/ipvlan/ipvlan_l3s.c
index 71712ea25403..df675d9d2f21 100644
--- a/drivers/net/ipvlan/ipvlan_l3s.c
+++ b/drivers/net/ipvlan/ipvlan_l3s.c
@@ -100,6 +100,11 @@ static unsigned int ipvlan_nf_input(void *priv, struct sk_buff *skb,
 	if (!addr)
 		goto out;
 
+#if IS_ENABLED(CONFIG_IPV6)
+	if (addr->atype == IPVL_IPV6)
+		IP6CB(skb)->flags |= IP6SKB_L3SLAVE;
+#endif
+
 	skb->dev = addr->master->dev;
 	skb->skb_iif = skb->dev->ifindex;
 	len = skb->len + ETH_HLEN;
-- 
2.38.1


             reply	other threads:[~2023-06-07  8:45 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-07  8:45 Hangbin Liu [this message]
2023-06-08  8:46 ` [PATCH net] ipvlan: fix bound dev checking for IPv6 l3s mode Paolo Abeni

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=20230607084530.2739069-1-liuhangbin@gmail.com \
    --to=liuhangbin@gmail.com \
    --cc=daniel@iogearbox.net \
    --cc=dsa@cumulusnetworks.com \
    --cc=maheshb@google.com \
    --cc=netdev@vger.kernel.org \
    --cc=wujianguo@chinatelecom.cn \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).