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 DDB94431D5 for ; Sun, 22 Oct 2023 16:23:52 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D6F3E402D9; Sun, 22 Oct 2023 16:23:52 +0200 (CEST) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2052.outbound.protection.outlook.com [40.107.101.52]) by mails.dpdk.org (Postfix) with ESMTP id 46814402D8 for ; Sun, 22 Oct 2023 16:23:52 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BG8FqGVAUXcqmX1lIX4/+Cu2lbmK3UBUvy4TKKye1ytRpL1/jCbYcX1NczWdbFqOmnm2jX2EmP2T0KWQFStTmtfCkrxj8CZx/R5Iiz/H4JyOkH0qYU9t57BFnr90nLBQ7DZ98jrnlec35ulwNUjsL1g9x9T9lj2uQsxdD6bPZx8q2o/y+7kKvgRWnqErgDRw8uUUz6qu9QSckChaurPTFrTcp+NB2I+TCtw7WCt1Xh3OQp5Ba7Xcud3+O8+X1DKt+9swU//f+oRjxjexSz63/oe+95EnEqvMf9sa2LYnHNI3/p395OidzzXvAnXHAyRxLYxLktIDYCmmaiOh565cjw== 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=BEfzIthO12iUAqs9BSbsgwGwAqS979/YPu06CWWrocg=; b=S9Y30rmwOVZwpfDB8KBnse/X6qqGW9/kVao+XjCZRhMdwMVJ/8YWCjjMLJ1C6fZWgjb23CIOLbPz8yb6oNf5QRHBRPV7U5t9CZrNpsuP8ruvSPha7VRFaZJ/lE8RnXMzNenkgq5es5jLqbk8rU4WDvhDL9AJlu2aBXXJ3YZqT0OHQm3DogWWFRT38CTp8xNk6jA+huhajJkm4qhOJsGOOuBDdPIfRKQxVirPZSlg0uZQxaw2EDEYQmiHkZTfctAdCOdoXigGUgJ01AdvT8MuPOgdZ/V3cnxVCCVCIvNUzQiNKzqLyyKvkosBP5nIyZTCwjcnw4Tq3YzJJBa5cs811Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=arknetworks.am 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=BEfzIthO12iUAqs9BSbsgwGwAqS979/YPu06CWWrocg=; b=Hd8zLvZmH7R4RZy/IDl/bPeVueSFyEHn9UVSlEK5zLlxkdeaGXZdTprc6fOPPQHHoZMDyis+gPyBd3cRYPvd+kwO/OTQKDqEXfNBllCsn+NeaC4Tz8HJbABQUii0b74cbIx8P7PEd7WC0IcsrivjCcVHtR0em82ksmMURi6ouWMa9V8z5zQNCndKNcgEty/Jixr86hqh1KZy6JY8+UE5OsRF/3JmLOeDael0EqegXqtHKTm+ORv0kn8a1ljvHAQvJ1vPy0kUBt7VlXINkRwOzpmF6ygiJP1yljvl6zn+r3OpeU4FnJDPoA/+Tz0dFyUjRO4XXz1ZiCenKqWVvRUXYA== Received: from MW3PR06CA0021.namprd06.prod.outlook.com (2603:10b6:303:2a::26) by SJ2PR12MB7990.namprd12.prod.outlook.com (2603:10b6:a03:4c3::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.26; Sun, 22 Oct 2023 14:23:50 +0000 Received: from CO1PEPF000044F0.namprd05.prod.outlook.com (2603:10b6:303:2a:cafe::cf) by MW3PR06CA0021.outlook.office365.com (2603:10b6:303:2a::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.26 via Frontend Transport; Sun, 22 Oct 2023 14:23:50 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by CO1PEPF000044F0.mail.protection.outlook.com (10.167.241.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.15 via Frontend Transport; Sun, 22 Oct 2023 14:23:50 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Sun, 22 Oct 2023 07:23:39 -0700 Received: from nvidia.com (10.126.231.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.41; Sun, 22 Oct 2023 07:23:37 -0700 From: Xueming Li To: Viacheslav Galaktionov CC: Ivan Malov , Andy Moreton , Andrew Rybchenko , "dpdk stable" Subject: patch 'net/sfc: account for data offset on Tx' has been queued to stable release 22.11.4 Date: Sun, 22 Oct 2023 22:20:36 +0800 Message-ID: <20231022142250.10324-8-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231022142250.10324-1-xuemingl@nvidia.com> References: <20231022142250.10324-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000044F0:EE_|SJ2PR12MB7990:EE_ X-MS-Office365-Filtering-Correlation-Id: fe82fa1b-8f80-435b-03cf-08dbd30a82fa X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ogjo28d91uh1BORYc/g70a210zRSywWEBUWr0ictOZ5QgvrTlXRAhrtgpbxt9YZcvK7GPjShFy0tmNzGkla2VLiGoJZ64weWFzSUUqi/Ee+GHR3/wTGieyarWp2bAwiZrZrrChXPZ5lwr5Xjeq9gXSml0MLVqUVzsdgLi1LFC+sT3wBKkzO7d66YXo6NEbPQ3Nl5OMEr6rx5/pIroqjBWbP7o2KmEMBOuI57iF4pEOO5nxn+HifHUZ0LENRQLefTzxqmUXm4ZSsGi83k3/U+UEMTzKBQe1OUc5Z8Sx7yKqY0tHlrji5axvSyY+QM3FRxtdOR3HdCk98e0PS2oXP7KioO5oGXgmLXWzYuT6Ftv6zT+hw+2sj2YVQFtQ9qWLL/NajwbDxvqsOufKma61h3XImmHwsD9+jv1tj6Dyihf0sChWf8PjwG2NST2al+OfmGsJh4sK8SM4Q46KGkZozcIHPnv63lI5CbHVOrg5o9U3WDtnH3Y877vFwhlsmSg9pKuFxR6wHPYBcEvuWl2fOBHsMFI3v9UiEx94Eq/l5U0ZVILBv0ZYH0G6jbdWxrQMIejspMs9BC+pEbxSb/j5tcs9vpJoy5VG/S+wvW6BWoP5iZCvB0xNwzBL5EnQX0l7EGVjQlWW0VfcaU3JryiNnhgezaq63i41UZh8N0EtujDRbCY0ZNl7rs9vaQgNYcR5amU2VMX5iCauEUMimTTgKrqwyNKmIuExmR7VLja0t38dOg1QozyDgfAq4/WSmHARnN7j9Wyg+RqSSUd7d5+mTd1FgI4AeY7JpZf98xbIuFqI8= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230031)(4636009)(346002)(376002)(136003)(396003)(39860400002)(230922051799003)(82310400011)(451199024)(64100799003)(1800799009)(186009)(46966006)(40470700004)(36840700001)(6916009)(55016003)(40460700003)(4001150100001)(15650500001)(2906002)(1076003)(70206006)(53546011)(7696005)(70586007)(2616005)(54906003)(478600001)(41300700001)(86362001)(356005)(966005)(83380400001)(47076005)(336012)(426003)(26005)(82740400003)(7636003)(16526019)(6286002)(36860700001)(5660300002)(316002)(36756003)(8936002)(8676002)(4326008)(40480700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Oct 2023 14:23:50.1426 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fe82fa1b-8f80-435b-03cf-08dbd30a82fa X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000044F0.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB7990 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 22.11.4 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/15/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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=563e7c87dfb4b29b7e39b3851989b0a106f98a29 Thanks. Xueming Li --- >From 563e7c87dfb4b29b7e39b3851989b0a106f98a29 Mon Sep 17 00:00:00 2001 From: Viacheslav Galaktionov Date: Mon, 11 Sep 2023 14:47:41 +0400 Subject: [PATCH] net/sfc: account for data offset on Tx Cc: Xueming Li [ upstream commit e7694b080de025fbc4bb31fbe7eb149f20a10373 ] Memory buffers passed by the application may contain private data, which must not be sent to the NIC. Omit this private data by using the actual data address instead of the default one. Fixes: 3037e6cf3dde ("net/sfc: support regioned NIC DMA memory mapping type") Signed-off-by: Viacheslav Galaktionov Reviewed-by: Ivan Malov Reviewed-by: Andy Moreton Acked-by: Andrew Rybchenko --- drivers/net/sfc/sfc_ef100_tx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/sfc/sfc_ef100_tx.c b/drivers/net/sfc/sfc_ef100_tx.c index 4c2205f7a4..1b6374775f 100644 --- a/drivers/net/sfc/sfc_ef100_tx.c +++ b/drivers/net/sfc/sfc_ef100_tx.c @@ -405,7 +405,7 @@ sfc_ef100_tx_qdesc_send_create(const struct sfc_ef100_txq *txq, m->l2_len + m->l3_len) >> 1; } - rc = sfc_ef100_tx_map(txq, rte_mbuf_data_iova_default(m), + rc = sfc_ef100_tx_map(txq, rte_mbuf_data_iova(m), rte_pktmbuf_data_len(m), &dma_addr); if (unlikely(rc != 0)) return rc; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-10-22 22:17:34.738905000 +0800 +++ 0007-net-sfc-account-for-data-offset-on-Tx.patch 2023-10-22 22:17:34.126723700 +0800 @@ -1 +1 @@ -From e7694b080de025fbc4bb31fbe7eb149f20a10373 Mon Sep 17 00:00:00 2001 +From 563e7c87dfb4b29b7e39b3851989b0a106f98a29 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit e7694b080de025fbc4bb31fbe7eb149f20a10373 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org