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 81BCF42D46 for ; Sun, 25 Jun 2023 08:45:17 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7D63340ED8; Sun, 25 Jun 2023 08:45:17 +0200 (CEST) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2065.outbound.protection.outlook.com [40.107.212.65]) by mails.dpdk.org (Postfix) with ESMTP id 34CD240A7F for ; Sun, 25 Jun 2023 08:45:16 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FSse9cU8SsnCejwJCacOUoXO1Yp7e9Xm6oXSfmjHTd4QaKaJaFzWtHHCD6r81e1h7r7N0YZRbChT6yHoNar8b16KbCaOmaJ2sVC3V2gSUiC3HJ96NGsT28cZA5L/PzckfKloQddXVJyzQRaIClNFANDg7JdQ7PxAsWOPs7ZQRA9Ma/CCZAp7AjQ2uOA+NI/Q8o0s3NaBhR1SPKfRh6fupVvxmAtw5MyAtVzF1FXEhrhqPUn7xvxf7TqOgCOkCRHc5fVN0uKtqj9NI2WVfSOyIiyqKtW2JqamP5TclSSZoezZe3Lzo02JD+io3rvddsfYQIgIVvf7K7sV55mv1VbWtw== 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=v9rR+bXrzHgr5xl1GnNSN+Q5R6oMiF+iYZbzZjKyk4k=; b=ApFnce2dZLixXSkOY+lIHMBcrKlkB4TSop0TomHK/wmad46DgBMP+/q2ha4D0WmDB9+YlzhB9eEivoqRb8IXZpFBSEfmIAJI4CGYn3SIvmT/O5lRs09dVdFx+YBLr+Jm3z+0OEu8X5nq7LF/dC6MNh6rqA1hS0fgWS4NEcMXVwZ1N85H8eU0al9KEfXKEDV6JhtpD1lzyoTJxfGLkrQpA2SXIQTJlaN+tLMS5r/DOPcXJ7tZ3xTNk8sbqwdro08R7cWTLHesQGMI/44ZQdkJ14vmwib/rG6gXp1vtoFrD1Hi00sNvuCunD6jyZe8/0pCABURhI6rZSuSs31zFiYYkQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=intel.com 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=v9rR+bXrzHgr5xl1GnNSN+Q5R6oMiF+iYZbzZjKyk4k=; b=OxOfXZYvz7OJ5ZslCeterTHD8jAySP+NDsKv25qxNUqm9x+I/tmbi8GE9ZF1rlN2EmTe2MTVsT1Jf9cAZpJeWq3ZgX4uw0/TGX3yizRUNNR/rbwOWQ94BfA0IWGqsT+XkDAUC7BISmgNCwfvf/+ncRtWE1oBfdui58pSPjS1QweR00s3ghonMtG6HqKHz45ZFsoktibndtAXCyEhaLlfciDP0AjELFcMmZwWQlqtx3jcjd9+/oFUWi1zIbTW1l9ULb5+sMRf5Ni7u73dcqeAWCd9SVW1+lNS/PsWnHZYAPIZe4/XTMMAUGz+yWjbYVsKx+89T/osB9Mx8PkQT0VLUw== Received: from BN9PR03CA0901.namprd03.prod.outlook.com (2603:10b6:408:107::6) by DM6PR12MB4283.namprd12.prod.outlook.com (2603:10b6:5:211::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.26; Sun, 25 Jun 2023 06:45:14 +0000 Received: from BN8NAM11FT068.eop-nam11.prod.protection.outlook.com (2603:10b6:408:107:cafe::6d) by BN9PR03CA0901.outlook.office365.com (2603:10b6:408:107::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.32 via Frontend Transport; Sun, 25 Jun 2023 06:45:14 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by BN8NAM11FT068.mail.protection.outlook.com (10.13.177.69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.47 via Frontend Transport; Sun, 25 Jun 2023 06:45:13 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Sat, 24 Jun 2023 23:45:02 -0700 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.37; Sat, 24 Jun 2023 23:45:01 -0700 From: Xueming Li To: Wenjun Wu CC: Qi Zhang , dpdk stable Subject: patch 'net/iavf: fix Rx data buffer size' has been queued to stable release 22.11.3 Date: Sun, 25 Jun 2023 14:35:23 +0800 Message-ID: <20230625063544.11183-106-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230625063544.11183-1-xuemingl@nvidia.com> References: <20230625063544.11183-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-TrafficTypeDiagnostic: BN8NAM11FT068:EE_|DM6PR12MB4283:EE_ X-MS-Office365-Filtering-Correlation-Id: 6776d893-6966-49af-0fd6-08db7547bab3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: E6y+UpNnxOMQKxA9pXiYmXUgPEYTi3VDcM9xu9VM6UKwwyRWcTiUlgX1PpEBdn6FJMehpi7eXuP5TMkb6GR1BkwbZTUU7yXEEDZ/plHKx7aGrHVfRG7nnirE7SEMJScP6K75p3oNfuzm9+LCWaaNW2O7qo2r0ef6OehEiL1cxcpAgLo3MBkIYlAXQpAI8iqpszFzew1Nn9JBDhRNFenMfsnav5g1PNWHFFcg9lwlJCrY4zYGFCzISDL9eS0O1/BaFbyDmxOYMVZK6HsjYiHQu25K+Rx/7klBxbds5UoQE7ScbT0KNxKl7PEiGHzGJwqBzQg8eQO4WQvcJFe/gVMrW6MhlCKSlqw+J92fpfGN9qUqpB9mB6mRpnInhj1T6wQzhNru20dP27kaR++X5K5Mii5Gk0ZRAP66TcwuIAjz+0g26hr91lL6z+wfRzBzG7c5KFjdu1giYEuPtCjT4G9FzIBhvv0dBHcYsDubU/gK/0BWJQfJXQTjoBLEnP2HtMIsf07Mg9fYFapk/1XaObQ7h0P51hOJ+2TjR6fcGaMa7ld57InUe0n9KMfyd05VaMxkFKywANrSJExb1tHY65SQq2fbOOiS5eCTYfD9MwV5R1FvFfpZesQ+BQKHSe5gAyXvMyNtCUFCm7jDNUG6zaOxtCi2Y3ovwjOEUs5XZ3Dw7Iyyu2MqrC9XDukCMrH4b7mSiZWO7cfnWJ7ldwVKC8JTrTER4uVVwxbmVXJf9BcMu5MBOKG0CGIPcmKv5HNnjAZhMohKheWLMBlczEAEX/n1OA== X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(376002)(136003)(396003)(39860400002)(346002)(451199021)(40470700004)(46966006)(36840700001)(8936002)(8676002)(55016003)(4326008)(6916009)(70206006)(70586007)(41300700001)(316002)(53546011)(1076003)(16526019)(26005)(186003)(6286002)(336012)(426003)(2616005)(478600001)(54906003)(6666004)(40460700003)(966005)(7696005)(82310400005)(2906002)(5660300002)(40480700001)(82740400003)(356005)(7636003)(36756003)(86362001)(36860700001)(47076005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jun 2023 06:45:13.6450 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6776d893-6966-49af-0fd6-08db7547bab3 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.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT068.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4283 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.3 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/27/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=78c374bf4155002170bc118f59027b3d30a4a1e2 Thanks. Xueming Li --- >From 78c374bf4155002170bc118f59027b3d30a4a1e2 Mon Sep 17 00:00:00 2001 From: Wenjun Wu Date: Fri, 14 Apr 2023 13:47:42 +0800 Subject: [PATCH] net/iavf: fix Rx data buffer size Cc: Xueming Li [ upstream commit c5549f1d9b1bf2bf2b09517daf89c84fbf5b18e0 ] According to hardware spec, the data buffer size should not be greater than 16K - 128. Fixes: 69dd4c3d0898 ("net/avf: enable queue and device") Signed-off-by: Wenjun Wu Acked-by: Qi Zhang --- drivers/net/iavf/iavf_rxtx.c | 1 + drivers/net/iavf/iavf_rxtx.h | 3 +++ 2 files changed, 4 insertions(+) diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c index 3d9224b38d..4a38a7b985 100644 --- a/drivers/net/iavf/iavf_rxtx.c +++ b/drivers/net/iavf/iavf_rxtx.c @@ -654,6 +654,7 @@ iavf_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, len = rte_pktmbuf_data_room_size(rxq->mp) - RTE_PKTMBUF_HEADROOM; rxq->rx_buf_len = RTE_ALIGN_FLOOR(len, (1 << IAVF_RXQ_CTX_DBUFF_SHIFT)); + rxq->rx_buf_len = RTE_MIN(rxq->rx_buf_len, IAVF_RX_MAX_DATA_BUF_SIZE); /* Allocate the software ring. */ len = nb_desc + IAVF_RX_MAX_BURST; diff --git a/drivers/net/iavf/iavf_rxtx.h b/drivers/net/iavf/iavf_rxtx.h index a6ad88885b..2c4d8e2700 100644 --- a/drivers/net/iavf/iavf_rxtx.h +++ b/drivers/net/iavf/iavf_rxtx.h @@ -16,6 +16,9 @@ /* used for Rx Bulk Allocate */ #define IAVF_RX_MAX_BURST 32 +/* Max data buffer size must be 16K - 128 bytes */ +#define IAVF_RX_MAX_DATA_BUF_SIZE (16 * 1024 - 128) + /* used for Vector PMD */ #define IAVF_VPMD_RX_MAX_BURST 32 #define IAVF_VPMD_TX_MAX_BURST 32 -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-25 14:32:01.306344800 +0800 +++ 0105-net-iavf-fix-Rx-data-buffer-size.patch 2023-06-25 14:31:58.555773900 +0800 @@ -1 +1 @@ -From c5549f1d9b1bf2bf2b09517daf89c84fbf5b18e0 Mon Sep 17 00:00:00 2001 +From 78c374bf4155002170bc118f59027b3d30a4a1e2 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit c5549f1d9b1bf2bf2b09517daf89c84fbf5b18e0 ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index b1d0fbceb6..0db3aabd92 100644 +index 3d9224b38d..4a38a7b985 100644 @@ -23 +25 @@ -@@ -697,6 +697,7 @@ iavf_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, +@@ -654,6 +654,7 @@ iavf_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, @@ -32 +34 @@ -index 09e2127db0..f205a2aaf1 100644 +index a6ad88885b..2c4d8e2700 100644