From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id CD4AAA0543 for ; Sat, 5 Nov 2022 18:13:23 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C8D9340151; Sat, 5 Nov 2022 18:13:23 +0100 (CET) Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by mails.dpdk.org (Postfix) with ESMTP id 64476400D5 for ; Sat, 5 Nov 2022 18:13:22 +0100 (CET) Received: by mail-wm1-f47.google.com with SMTP id bg9-20020a05600c3c8900b003bf249616b0so4876277wmb.3 for ; Sat, 05 Nov 2022 10:13:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Lq6nl1LBORppqEXsGXuatgREJzXOZx3eGez70IwMAEY=; b=XZslwhWri/leLRbU4WK0xHbDcUd8hb0gsn/CBPPuOckFwUjj9EpkXKJmvP4AngWlYS XrDTmho/qH3qWBKXbJJVYAa1sU1NC8WKdywIUchEeULFL7KjDrVXIR136phbzh7u7L2z xTBvv1nYwJJL12hQ0cKxE262yBtjfSd5zr/QRdFh+2kmp+7vjvLGM6I2lkwfmsADsH8t E3oZfOAs6QEo5nM5aVLN2lHRvABzWJOTuw5VgGIbtFwGY2OOrEM1/MYOjfNfAlf/5cy0 XgKx4Nxf06T65OI8+85nfzcDYzI1wHMhmbnT1p46PcSb9xAU5QSMVZrzbJ345vowWam2 3lJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Lq6nl1LBORppqEXsGXuatgREJzXOZx3eGez70IwMAEY=; b=MIO4QlKUbVZvllLy3sAYb4L4iIKCtT+emJU4mMhj9t1dRlemepBNbpv98DNBmk1Od6 G0Ne1vnyALQ3rhLQk+t2Pshcr0FAgMMZrYfB4rbyMcTPbCXwd8zG0mL60vz3SVxfzBIA G26f8Z7ldc23Kt8YetvnFRmmG8y9E96eWRJ8UWcEnPNhSJjvghFOSH0Dwu/zGONM+Weh E8wCZJ8wb8lnbQnc2t2FelIMc5aUWo8Ulu4ZGnZfnKoVWZueB5UmGy4FZ6V+OUahoeK7 ez99eg+4Qkp30ztjjIMSvkY8Q6ZjNCKZTBzPUnb8cmO44v9Oi4n9CpCy8DpOAV6UrzSF XknQ== X-Gm-Message-State: ACrzQf2BgDx563OXI9xYFIv7LHEa5jR9FMkTF1SA7HRObBAtWbmpND/W I9Km5MAy+Lxp7IlPInPns2w= X-Google-Smtp-Source: AMsMyM6I6nrSc0C8nOJ4YjciRZ4PMSnbNQGI6tscyRmbB6gsN1wJL6jbWy5rdBcCYTO94paAiomZBA== X-Received: by 2002:a05:600c:384f:b0:3c6:fb0d:4369 with SMTP id s15-20020a05600c384f00b003c6fb0d4369mr27123980wmr.18.1667668402116; Sat, 05 Nov 2022 10:13:22 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id x10-20020a05600c21ca00b003c6f3f6675bsm6177100wmj.26.2022.11.05.10.13.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Nov 2022 10:13:21 -0700 (PDT) From: luca.boccassi@gmail.com To: Olivier Matz Cc: Wenjun Wu , dpdk stable Subject: patch 'net/ixgbe: fix unexpected VLAN Rx in promisc mode on VF' has been queued to stable release 20.11.7 Date: Sat, 5 Nov 2022 17:11:29 +0000 Message-Id: <20221105171146.1520039-30-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221105171146.1520039-1-luca.boccassi@gmail.com> References: <20221103092758.1099402-100-luca.boccassi@gmail.com> <20221105171146.1520039-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 20.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/07/22. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/ca45dbea55e7e3a0d6125960a5c144c2747c1e70 Thanks. Luca Boccassi --- >From ca45dbea55e7e3a0d6125960a5c144c2747c1e70 Mon Sep 17 00:00:00 2001 From: Olivier Matz Date: Thu, 29 Sep 2022 14:09:01 +0200 Subject: [PATCH] net/ixgbe: fix unexpected VLAN Rx in promisc mode on VF MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit 15ce76460a681b133709475f0eb5dbe12bb61b32 ] When the promiscuous mode is enabled on a VF, the IXGBE_VMOLR_VPE bit (VLAN Promiscuous Enable) is set. This means that the VF will receive packets whose VLAN is not the same as the VLAN of the VF. For instance, in this situation: ┌────────┐ ┌────────┐ ┌────────┐ │ │ │ │ │ │ │ │ │ │ │ │ │ VF0├────┤VF1 VF2├────┤VF3 │ │ │ │ │ │ │ └────────┘ └────────┘ └────────┘ VM1 VM2 VM3 vf 0: vlan 1000 vf 1: vlan 1000 vf 2: vlan 1001 vf 3: vlan 1001 If we tcpdump on VF3, we see all the packets, even those transmitted on vlan 1000. This behavior prevents to bridge VF1 and VF2 in VM2, because it will create a loop: packets transmitted on VF1 will be received by VF2 and vice-versa, and bridged again through the software bridge. This patch remove the activation of VLAN Promiscuous when a VF enables the promiscuous mode. However, the IXGBE_VMOLR_UPE bit (Unicast Promiscuous) is kept, so that a VF receives all packets that has the same VLAN, whatever the destination MAC address. A similar patch was accepted in Linux kernel (see link). Link: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=7bb0fb7c63df Fixes: 0355c379b71f ("net/ixgbe: support VF promiscuous by PF driver") Signed-off-by: Olivier Matz Acked-by: Wenjun Wu --- drivers/net/ixgbe/ixgbe_pf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ixgbe/ixgbe_pf.c b/drivers/net/ixgbe/ixgbe_pf.c index 7e75a114de..403fcfa100 100644 --- a/drivers/net/ixgbe/ixgbe_pf.c +++ b/drivers/net/ixgbe/ixgbe_pf.c @@ -781,9 +781,9 @@ ixgbe_set_vf_mc_promisc(struct rte_eth_dev *dev, uint32_t vf, uint32_t *msgbuf) return -1; } - disable = 0; + disable = IXGBE_VMOLR_VPE; enable = IXGBE_VMOLR_BAM | IXGBE_VMOLR_ROMPE | - IXGBE_VMOLR_MPE | IXGBE_VMOLR_UPE | IXGBE_VMOLR_VPE; + IXGBE_VMOLR_MPE | IXGBE_VMOLR_UPE; break; default: return -1; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-05 17:11:11.319778896 +0000 +++ 0030-net-ixgbe-fix-unexpected-VLAN-Rx-in-promisc-mode-on-.patch 2022-11-05 17:11:08.738944016 +0000 @@ -1 +1 @@ -From 15ce76460a681b133709475f0eb5dbe12bb61b32 Mon Sep 17 00:00:00 2001 +From ca45dbea55e7e3a0d6125960a5c144c2747c1e70 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 15ce76460a681b133709475f0eb5dbe12bb61b32 ] + @@ -44 +45,0 @@ -Cc: stable@dpdk.org @@ -53 +54 @@ -index c5ef940533..0a0f639e39 100644 +index 7e75a114de..403fcfa100 100644 @@ -56 +57 @@ -@@ -771,9 +771,9 @@ ixgbe_set_vf_mc_promisc(struct rte_eth_dev *dev, uint32_t vf, uint32_t *msgbuf) +@@ -781,9 +781,9 @@ ixgbe_set_vf_mc_promisc(struct rte_eth_dev *dev, uint32_t vf, uint32_t *msgbuf)