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 9B146A00C5 for ; Tue, 21 Jun 2022 10:03:49 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9705A427F0; Tue, 21 Jun 2022 10:03:49 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2059.outbound.protection.outlook.com [40.107.223.59]) by mails.dpdk.org (Postfix) with ESMTP id 8D3A440151 for ; Tue, 21 Jun 2022 10:03:47 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Gu6ZKOL7F04wDWg/0K9syYxN7spn0jsZJHukhSOEjwhF4fvgCui+iWQcGzMJKibdYve61yhWsiFyUKSPjvE0ajbZj0U1p6ZeluIoLnP5LAnOA8QT8u43WcMkjWPgPp9ABUqkTYimESAJcGCe6AQ0ocPdaEnSUA+Fmu2oaL/o67T4gyMNzJ09hCcrMRoZSNct3tukohbFbiJEKkHD+441oXrIuPug4Wvg0EgQTdBjWm8PGNRRGLWhhMal3tdcukcN1Ci6G+xEy1zhYUcEo/isK5BinakuXK/AwDLkCzsIgB/OeFstJWDNJLZhbrOSwg+facgnL203J4QXXcQVjLzYow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=X76V0YJ60q4x9sWdToDn2DTG+VZrXkXIpyr9859MA9U=; b=GuaudreHIXftZwkUGuOWWvOs5TL7+K8APVFCELzXC14rBbJpoGk4QPN4KDrGWIC8lWxxZ5yTVqA2sonx+DJvf9h4SyUkGbzdN4htG7Y93p9bTT/ge0jCl0pPy5q+CRHLMNv5jnJeTZNE87ulxZBhuoDNNrMvvyIDHolEGRcoAWXi0Wn1cwzUBQsi5sH1ydSKX7hsK3SZnNIIL+4pTfORIGqaXOqnxW0h5vQDA8CjuiY8oWgch/srMOm7DaOaa+YOxv4vC/q9evR84xEHk5qlWPcctWPz6QgPdz+8CmQ7Dsvvhrnn4dCUgJsd+tJP6vW9nscDfKxhMA5ZN/6AzmHVsw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.234) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=X76V0YJ60q4x9sWdToDn2DTG+VZrXkXIpyr9859MA9U=; b=i4DAvooP6D1JPBH7EJWW1N3UriRH455JiKVLqM20ozjGSygp7zO42v+PkCM4snn3/1a9rvzLcEKtO1wpUHxAq9EohyDnwgOnHXxipdCynyZ1yHpJUMvcFkiOTZiXAVDCd/pRnaSN+bWKyoaAh1AjY5sutWCNDUNDPbSPKsw8pKcfSO7eR5+xDtIumXrDoKNNvCzUyXL39kb1yQ62QjBg5q1RPegD5oXBnhY9fI/Yb4aBTOah7IrcFkaD0lWVjxhs7auMrmdA/uxHfhNvHw7BVaBBRa/BwppTZakOKwT7XwT9D/Q95wAV4qTx1KOSGF9/8ZH4+pzj34PJ342es69AGw== Received: from BN1PR13CA0008.namprd13.prod.outlook.com (2603:10b6:408:e2::13) by DM6PR12MB3177.namprd12.prod.outlook.com (2603:10b6:5:187::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.16; Tue, 21 Jun 2022 08:03:46 +0000 Received: from BN8NAM11FT051.eop-nam11.prod.protection.outlook.com (2603:10b6:408:e2:cafe::92) by BN1PR13CA0008.outlook.office365.com (2603:10b6:408:e2::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.15 via Frontend Transport; Tue, 21 Jun 2022 08:03:45 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.234) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 12.22.5.234 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.234; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (12.22.5.234) by BN8NAM11FT051.mail.protection.outlook.com (10.13.177.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5353.14 via Frontend Transport; Tue, 21 Jun 2022 08:03:45 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by DRHQMAIL101.nvidia.com (10.27.9.10) with Microsoft SMTP Server (TLS) id 15.0.1497.32; Tue, 21 Jun 2022 08:03:45 +0000 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.22; Tue, 21 Jun 2022 01:03:43 -0700 From: Xueming Li To: Steve Yang CC: Beilei Xing , dpdk stable Subject: patch 'net/iavf: fix HW ring scan method selection' has been queued to stable release 20.11.6 Date: Tue, 21 Jun 2022 11:01:12 +0300 Message-ID: <20220621080301.2315720-7-xuemingl@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220621080301.2315720-1-xuemingl@nvidia.com> References: <20220621080301.2315720-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3bc976cf-dd43-4721-e2b2-08da535c90d1 X-MS-TrafficTypeDiagnostic: DM6PR12MB3177:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pSkAX20gvtlMrmScPj/hj7lX9mJjgBkmrGo7qj1nneW3hCvYggCikEz1vDpvpgnIa8WxxKhGlsbesnKaVzPR45j22OhBzZNvHgTDG76uyPaWkJdz0dRm8J0Rb0E9OCyV2sT7iGKqZimk+Ifl8mFh5HGjIHIeOD4j0VaqV2c83mG4Ar9h7p3eIWtG3joZ9otGEWlIHf2v6eRpR2b9fx3z1qEQdmzI/jARI7MOmrZugf3f9fGo3s9P/0gSgd2+F4n8bVJJJEr0sBA+EYMuCUTmky7+Sq07cllrzjkTe7VNa/qRFOPKPiLiqAqHTB+2o+qCetsYEBvxEgalmeWRzjv1/UgW+WQSGLbNJ2PjfoOJSIqbfj62nZ8aO6cLRnoX4QpOJzA3/hyHz2EDV1Yej0zOMvtR2QhXQZZOSKoOorzXO1CUxYi+vhB/H8/Mk2W2KVhnAuHkdzGiGFVkmvgwnVMSuS8OWwyyBlxI+mSfB88RS+SSsUzlZl1hXnUtlEmD5uYNpT/4CKIesi8YdLfyTKe0zu5NviWW2k9b6UkTxFTzyNCUgYVjW/0hS8I+PczoRy8HbVoXKsNDDIgG1qi3l0LpeIllEKUPioJDZ0PR+5L2WUa8C79LnMJ2F1PfiIWS1Yu/lIGIHuGE+cQkZgPvJIhFvpnhSwEJUge36dLxNv1w/mWHnjDJIXJ5nhNZBOi1j0UCzEUUD4btN4ni8Y7HhkiVavDoq0g8zkpeYUqgPl1A33y7mf8o27E2zyxUMf4OJaZoXXBgeR045tnoR/sLRDcdjSKu9Hv+u2z92VZuIUCEal6HjX9yG5nIdJaV6IDwLTQAQ938SPEUfyYJYL7jybfGaJmQz9r7VG5qWdgn4nGjSaU= X-Forefront-Antispam-Report: CIP:12.22.5.234; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:InfoNoRecords; CAT:NONE; SFS:(13230016)(4636009)(346002)(136003)(376002)(39860400002)(396003)(36840700001)(46966006)(40470700004)(40480700001)(6916009)(5660300002)(54906003)(478600001)(86362001)(356005)(82740400003)(81166007)(36860700001)(55016003)(40460700003)(70206006)(8936002)(53546011)(8676002)(966005)(70586007)(316002)(4326008)(47076005)(6286002)(426003)(26005)(336012)(83380400001)(6666004)(186003)(2616005)(41300700001)(16526019)(82310400005)(2906002)(36756003)(7696005)(1076003)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jun 2022 08:03:45.6398 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3bc976cf-dd43-4721-e2b2-08da535c90d1 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[12.22.5.234]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT051.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3177 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.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 06/23/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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/236835c94ff7bf830e2f75c8c8f00ab0a0779c35 Thanks. Xueming Li --- >From 236835c94ff7bf830e2f75c8c8f00ab0a0779c35 Mon Sep 17 00:00:00 2001 From: Steve Yang Date: Mon, 14 Mar 2022 09:31:46 +0000 Subject: [PATCH] net/iavf: fix HW ring scan method selection Cc: Xueming Li [ upstream commit 070ef4e6c815bf7f4647070acf1ed4025e0512e9 ] When setup Rx queue, the rxdid would be changed if it's "IAVF_RXDID_LEGACY_0/1", that caused the scan HW ring used the wrong function 'iavf_rx_scan_hw_ring_flex_rxd()'. Ignore the rxdid changed when equals "IAVF_RXDID_LEGACY_0/1". Fixes: 0ed16e01313e ("net/iavf: fix function pointer in multi-process") Signed-off-by: Steve Yang Acked-by: Beilei Xing --- drivers/net/iavf/iavf_rxtx.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c index c8fa912b99..7554ce3593 100644 --- a/drivers/net/iavf/iavf_rxtx.c +++ b/drivers/net/iavf/iavf_rxtx.c @@ -441,6 +441,8 @@ iavf_rxd_to_pkt_fields_by_comms_aux_v2(struct iavf_rx_queue *rxq, static const iavf_rxd_to_pkt_fields_t rxd_to_pkt_fields_ops[IAVF_RXDID_LAST + 1] = { + [IAVF_RXDID_LEGACY_0] = iavf_rxd_to_pkt_fields_by_comms_ovs, + [IAVF_RXDID_LEGACY_1] = iavf_rxd_to_pkt_fields_by_comms_ovs, [IAVF_RXDID_COMMS_AUX_VLAN] = iavf_rxd_to_pkt_fields_by_comms_aux_v1, [IAVF_RXDID_COMMS_AUX_IPV4] = iavf_rxd_to_pkt_fields_by_comms_aux_v1, [IAVF_RXDID_COMMS_AUX_IPV6] = iavf_rxd_to_pkt_fields_by_comms_aux_v1, @@ -479,6 +481,8 @@ iavf_select_rxd_to_pkt_fields_handler(struct iavf_rx_queue *rxq, uint32_t rxdid) rte_pmd_ifd_dynflag_proto_xtr_ip_offset_mask; break; case IAVF_RXDID_COMMS_OVS_1: + case IAVF_RXDID_LEGACY_0: + case IAVF_RXDID_LEGACY_1: break; default: /* update this according to the RXDID for FLEX_DESC_NONE */ -- 2.35.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-21 15:37:49.570923702 +0800 +++ 0006-net-iavf-fix-HW-ring-scan-method-selection.patch 2022-06-21 15:37:48.957784301 +0800 @@ -1 +1 @@ -From 070ef4e6c815bf7f4647070acf1ed4025e0512e9 Mon Sep 17 00:00:00 2001 +From 236835c94ff7bf830e2f75c8c8f00ab0a0779c35 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 070ef4e6c815bf7f4647070acf1ed4025e0512e9 ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index d2cc3ed4bd..764218ace0 100644 +index c8fa912b99..7554ce3593 100644 @@ -25 +27 @@ -@@ -477,6 +477,8 @@ iavf_rxd_to_pkt_fields_by_comms_aux_v2(struct iavf_rx_queue *rxq, +@@ -441,6 +441,8 @@ iavf_rxd_to_pkt_fields_by_comms_aux_v2(struct iavf_rx_queue *rxq, @@ -34,2 +36,2 @@ -@@ -521,6 +523,8 @@ iavf_select_rxd_to_pkt_fields_handler(struct iavf_rx_queue *rxq, uint32_t rxdid) - rte_pmd_ifd_dynflag_proto_xtr_ipsec_crypto_said_mask; +@@ -479,6 +481,8 @@ iavf_select_rxd_to_pkt_fields_handler(struct iavf_rx_queue *rxq, uint32_t rxdid) + rte_pmd_ifd_dynflag_proto_xtr_ip_offset_mask;