From patchwork Thu Mar 9 02:03:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jianguo Wu X-Patchwork-Id: 13166718 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EF597C678D5 for ; Thu, 9 Mar 2023 02:05:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229875AbjCICEs (ORCPT ); Wed, 8 Mar 2023 21:04:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53158 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229484AbjCICEq (ORCPT ); Wed, 8 Mar 2023 21:04:46 -0500 Received: from m12.mail.163.com (m12.mail.163.com [220.181.12.198]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 61B4892F38 for ; Wed, 8 Mar 2023 18:04:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=Message-ID:Date:MIME-Version:From:Subject: Content-Type; bh=6yq4hURNfyZBbYcyn7SO0/aipKpw/Paasop2Oo7qa6c=; b=JGvaWyGSf7uASVHTMFPGRtnqwZVw/8W6Bwg0UHdpHOlm2a7BDQcwJ+4ooByV+e K6J0nWsZU++0ChnPitmD1AEXixLwCoeyf7rH78YBj7meJHYXcngQ2kM+sxHlzyAT +soNXkc2WPe+QltPuMMkpkefFzDHJ8AGfHFKQc3BlPFbQ= Received: from [172.22.5.12] (unknown [27.148.194.72]) by zwqz-smtp-mta-g4-1 (Coremail) with SMTP id _____wCHzR14PglkcHySCg--.60328S2; Thu, 09 Mar 2023 10:03:36 +0800 (CST) Message-ID: <29865b1f-6db7-c07a-de89-949d3721ea30@163.com> Date: Thu, 9 Mar 2023 10:03:36 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.6.1 To: netdev Cc: "edumazet@google.com >> Eric Dumazet" , davem@davemloft.net, daniel@iogearbox.net, Florian Westphal From: Jianguo Wu Subject: [PATCH net-next] ipvlan: Make skb->skb_iif track skb->dev for l3s mode X-CM-TRANSID: _____wCHzR14PglkcHySCg--.60328S2 X-Coremail-Antispam: 1Uf129KBjvJXoW7Aw1UWF4UWr43Jr48AryUGFg_yoW8Gry5pr 47GFy5Kr4DX3W8Aa409a18XFyYg3WDKrySkFWvk34q93s8tFy8urW0yFZxAF4UtrZYva1Y vF1avw4UWwn8CwUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07U6v35UUUUU= X-Originating-IP: [27.148.194.72] X-CM-SenderInfo: 5zxmxt5qjx0iiqw6il2tof0z/xtbB6AItkGBHLz29vwAAsg Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org From: Jianguo Wu For l3s mode, skb->dev is set to ipvlan interface in ipvlan_nf_input(): skb->dev = addr->master->dev but, skb->skb_iif remain unchanged, this will cause socket lookup failed if a target socket is bound to a interface, like the following example: ip link add ipvlan0 link eth0 type ipvlan mode l3s ip addr add dev ipvlan0 192.168.124.111/24 ip link set ipvlan0 up ping -c 1 -I ipvlan0 8.8.8.8 100% packet loss This is because there is no match sk in __raw_v4_lookup() as sk->sk_bound_dev_if != dif(skb->skb_iif). Fix this by make skb->skb_iif track skb->dev in ipvlan_nf_input(). Fixes: c675e06a98a4 ("ipvlan: decouple l3s mode dependencies from other modes"). Signed-off-by: Jianguo Wu Reviewed-by: Jiri Pirko --- drivers/net/ipvlan/ipvlan_l3s.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ipvlan/ipvlan_l3s.c b/drivers/net/ipvlan/ipvlan_l3s.c index 943d26cbf39f..71712ea25403 100644 --- a/drivers/net/ipvlan/ipvlan_l3s.c +++ b/drivers/net/ipvlan/ipvlan_l3s.c @@ -101,6 +101,7 @@ static unsigned int ipvlan_nf_input(void *priv, struct sk_buff *skb, goto out; skb->dev = addr->master->dev; + skb->skb_iif = skb->dev->ifindex; len = skb->len + ETH_HLEN; ipvlan_count_rx(addr->master, len, true, false); out: