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 B14C04326F for ; Thu, 2 Nov 2023 14:14:24 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AB01942DED; Thu, 2 Nov 2023 14:14:24 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 82B8E42DE6 for ; Thu, 2 Nov 2023 14:14:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698930863; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UlRD37PadjQVLYpDwDfXalK5pOxnlUdNmL3m6jmG5vM=; b=KOdS8JYwCbf64dC3m5QVUzsv1JdToQlEX5+QikK8cXv8upApCX4t0P/zIwf7RfiN+NRrS8 xVnRPdvUeSivQ0bOgniRHnODKRjLstYbeDINxMz8DZz26iEpddeMJjDsWibYoKseuSzjTR PcjSHer7WAxbDM6mDtn0bxlfKD6DhAs= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-332-DZNC0bkFMB2dVAzIUMaKIQ-1; Thu, 02 Nov 2023 09:14:20 -0400 X-MC-Unique: DZNC0bkFMB2dVAzIUMaKIQ-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C819E1C04320; Thu, 2 Nov 2023 13:14:19 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1759C492BFC; Thu, 2 Nov 2023 13:14:18 +0000 (UTC) From: Kevin Traynor To: Beilei Xing Cc: Jingjing Wu , dpdk stable Subject: patch 'net/i40e: fix FDIR queue receives broadcast packets' has been queued to stable release 21.11.6 Date: Thu, 2 Nov 2023 13:11:59 +0000 Message-ID: <20231102131254.315947-53-ktraynor@redhat.com> In-Reply-To: <20231102131254.315947-1-ktraynor@redhat.com> References: <20231102131254.315947-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.11.6 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/08/23. 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/1d231c0c2699f60802599fa5764ad77e3075404c Thanks. Kevin --- >From 1d231c0c2699f60802599fa5764ad77e3075404c Mon Sep 17 00:00:00 2001 From: Beilei Xing Date: Fri, 21 Jul 2023 05:35:13 +0000 Subject: [PATCH] net/i40e: fix FDIR queue receives broadcast packets [ upstream commit c07aa47b6272cc14842af06e437cda870e867fbd ] FDIR Rxq is excepted to only receive FDIR programming status, won't receive broadcast packets. Fixes: a778a1fa2e4e ("i40e: set up and initialize flow director") Signed-off-by: Beilei Xing Acked-by: Jingjing Wu --- drivers/net/i40e/i40e_ethdev.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index 07deb272c3..d829467f41 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -5987,12 +5987,14 @@ i40e_vsi_setup(struct i40e_pf *pf, } - /* MAC/VLAN configuration */ - rte_memcpy(&filter.mac_addr, &broadcast, RTE_ETHER_ADDR_LEN); - filter.filter_type = I40E_MACVLAN_PERFECT_MATCH; + if (vsi->type != I40E_VSI_FDIR) { + /* MAC/VLAN configuration for non-FDIR VSI*/ + rte_memcpy(&filter.mac_addr, &broadcast, RTE_ETHER_ADDR_LEN); + filter.filter_type = I40E_MACVLAN_PERFECT_MATCH; - ret = i40e_vsi_add_mac(vsi, &filter); - if (ret != I40E_SUCCESS) { - PMD_DRV_LOG(ERR, "Failed to add MACVLAN filter"); - goto fail_msix_alloc; + ret = i40e_vsi_add_mac(vsi, &filter); + if (ret != I40E_SUCCESS) { + PMD_DRV_LOG(ERR, "Failed to add MACVLAN filter"); + goto fail_msix_alloc; + } } -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-02 13:09:42.115271715 +0000 +++ 0053-net-i40e-fix-FDIR-queue-receives-broadcast-packets.patch 2023-11-02 13:09:40.860163486 +0000 @@ -1 +1 @@ -From c07aa47b6272cc14842af06e437cda870e867fbd Mon Sep 17 00:00:00 2001 +From 1d231c0c2699f60802599fa5764ad77e3075404c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c07aa47b6272cc14842af06e437cda870e867fbd ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 50ba9aac94..0482647cc1 100644 +index 07deb272c3..d829467f41 100644 @@ -22 +23 @@ -@@ -6027,12 +6027,14 @@ i40e_vsi_setup(struct i40e_pf *pf, +@@ -5987,12 +5987,14 @@ i40e_vsi_setup(struct i40e_pf *pf,