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 61EEAA0C3F for ; Sat, 12 Jun 2021 01:16:00 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5B3474003F; Sat, 12 Jun 2021 01:16:00 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2065.outbound.protection.outlook.com [40.107.92.65]) by mails.dpdk.org (Postfix) with ESMTP id 5AA2A4003F for ; Sat, 12 Jun 2021 01:15:59 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Z9FLoHdKqnEqW9V5ts6rrQtOhUZ0W/OzuGciCUQKwxKCqRveO+1YGD6MpEqB4R9i2Lzio0MclG8DY59dn1caMGNIxY9biISYKziUrTBdV5y6GzRZTpiFBhoREd4mBk0ZhZLEd+4GstPwnMC537YUNjcZzlj6HJ9Q2dfK15edQLH/R1ZDzLaMn3ecw/CXYZEUhXQK5IHM+lLJFpMtMKJkEb0oADu7fMX40VExjoeMC6+5ZNtWRI1jqQezk1XUsoibeOo0ru0yHpX3wrkbdadyOF1e1T0dWz1vwdE8FHjTPfLixdBRsc+WUX2V3DkWFIyT3r9ah4Zbozyxd1DAUoz+BA== 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-SenderADCheck; bh=Ylv6MsI67QDceKX6pAV96hEdqC2Uc3XPhB7Vfr7Ints=; b=JmCRRoHqHOwSm3iSqe+ZYBWP84VDgDZ4ZnE3444cI2MdNJr0bbSrTKl7N6W3pn/qakp5f57BZmzem4si0MvYwu0RjIQxmr7ZnEf1lK1pxZP6mX784buTWMkRftPDGCX5y4W+ngGXocG7NEeYw6hjIA2qqBMbZDT0SERMvQu3OMUAQLLlBPwfb/cS+Sq8VU62rM4dgZUOSkc/iXart1CZw93CcTetR81/k894CajPYmz3/f2bGMxfGBmeYgcpAxTNj1G+Leyg1Iske9m9SQRdm/PpaBAcf3eL9rNSPwXyfYELdhCqQKjEFXTVyMLDRLMiFn+8DNyEvgMGJJt7nn6DNw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=amazon.com smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none 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=Ylv6MsI67QDceKX6pAV96hEdqC2Uc3XPhB7Vfr7Ints=; b=bxPtigxUMyEnNnapBfAhSCsSiNNwFmqStW+DXDwKQYZAugTvFXld7zUpj1+1GStSPWpqIa4Uh2w5198EYpn/cOnGuJrtWRNCn1ntTEzjGe/s5RzxgCLoBkP9GtBuK53D2S3OUxLg6Se14h7ECFbHKc83ThnsZvVleicA+42kaavXrXmYpBZOp1qs6uZUSWde3ivlAi6WkSXyNoptgelm/IijQZTFZNgoodk/7XsJ63OKWBLfRZ/4teUmyLVhc+F5Edz4Evhonjz+F65Mk+lDVCHetKyUsnzOJeTX53Z3+R8lec+X8f/cgnqFZtLA07/h6O5g2nnBMz8zZPwFVi+vkw== Received: from BN6PR13CA0015.namprd13.prod.outlook.com (2603:10b6:404:10a::25) by CH2PR12MB3895.namprd12.prod.outlook.com (2603:10b6:610:2a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.22; Fri, 11 Jun 2021 23:15:57 +0000 Received: from BN8NAM11FT055.eop-nam11.prod.protection.outlook.com (2603:10b6:404:10a:cafe::2b) by BN6PR13CA0015.outlook.office365.com (2603:10b6:404:10a::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.9 via Frontend Transport; Fri, 11 Jun 2021 23:15:57 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; amazon.com; dkim=none (message not signed) header.d=none;amazon.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by BN8NAM11FT055.mail.protection.outlook.com (10.13.177.62) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4219.21 via Frontend Transport; Fri, 11 Jun 2021 23:15:57 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 11 Jun 2021 23:15:54 +0000 From: Xueming Li To: Stanislaw Kardach CC: Luca Boccassi , Michal Krawczyk , Igor Chauskin , Shay Agroskin , dpdk stable Date: Sat, 12 Jun 2021 07:03:30 +0800 Message-ID: <20210611230433.8208-116-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210611230433.8208-1-xuemingl@nvidia.com> References: <20210510160258.30982-229-xuemingl@nvidia.com> <20210611230433.8208-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL105.nvidia.com (172.20.187.12) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d46dc2b2-9565-4176-8da2-08d92d2ede71 X-MS-TrafficTypeDiagnostic: CH2PR12MB3895: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uGWI5O+YCVsTsBscJmtWoJC/8ZosA9RSpvKaUNz+mLVntwrbk5CpJ7Fv/o/VO+p709nAG48fxwTkUaCcDII2yTNNVLbZkOFwoAoim358umqrKYu7Yyya24qL14t/ZVTExTVfAditMAmCu/pRS9N6mvD6ldVJx8mdS8DnHkNzOGOdD5L7diAYEKxv2xWAsT60k/ELlHViHVMigczpncxxbzyKygTtetCwI/B9MssMvvyQ/xd5QGl1uQqyKtGFWd5G5V1YRoZepsy6zUFj5C6vr7LyJnJt7F/Iq5tGeyW+tjsplSA1jLMzdqfLASZVUkbucD32X3un6Be9GS4bz76wZrIcbb00hhY6esqVvsSVoSx7Vb9WgnJeZyzt15KVlVIDtu6y9s4TQlVSnm7udlAi24r40d6DcAX78OUZwx4qcp72f0QROi81SUy7Nqzjrp1rT798+CSBMWjsX/QDR0hDSnzn2LYQ7s4g+fPHPjHlRhHOkeiKmjZdoBJBD1JKtZYvbvSmgxvd0KDMyTmm9xnhGalB6QLjdwSWJgXMuTPYj42D9dPGgLRC2XJZhPTYfircIDbi6ETl3dApDSjEsEm0GoVCbY2y9LbkPY4qZK4/CHY/e+ld0VIVWjbTEdgGimK2ryF0RT9SprgLhm3JB3MdbvkA8JqBh9KbmqGfSsEhwumCYdTDLqPUfJ07YvEko55n0CrvbN92Mf7+2epjwcqu64JjsoMFnBa4bG2VXsZcTUihpwy+wqXwyqtuCUxnIgyo6bckv56hTNSZjGnFpQ08etoHVU5bEaD6yk7OPuEbJIn8zWBeyRV/pfipM24uDXHT X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(396003)(136003)(39860400002)(346002)(376002)(36840700001)(46966006)(26005)(2616005)(16526019)(478600001)(6286002)(36860700001)(7696005)(186003)(47076005)(70586007)(36756003)(316002)(70206006)(426003)(55016002)(53546011)(82310400003)(83380400001)(86362001)(4326008)(1076003)(82740400003)(356005)(7636003)(8676002)(54906003)(5660300002)(8936002)(966005)(6916009)(336012)(6666004)(36906005)(2906002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2021 23:15:57.1356 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d46dc2b2-9565-4176-8da2-08d92d2ede71 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT055.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB3895 Subject: [dpdk-stable] patch 'net/ena: report default ring size' has been queued to stable release 20.11.2 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.2 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/14/21. 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/c9000c686e2021d23d60ae649ebcb50490e0202b Thanks. Xueming Li --- >From c9000c686e2021d23d60ae649ebcb50490e0202b Mon Sep 17 00:00:00 2001 From: Stanislaw Kardach Date: Tue, 11 May 2021 08:45:53 +0200 Subject: [PATCH] net/ena: report default ring size Cc: Luca Boccassi [ upstream commit 30a6c7ef4054e1f4fcc6bd68606c5991c324f08c ] Remove invalid ring size alignment logic and add default Rx and Tx port ring sizes to the device info spec. The logic in lines 1297 and 1371 is invalid. The RTE_ETH_DEV_FALLBACK_RX_RINGSIZE (and the TX counterpart) is a value that rte_eth_rx_queue_setup() will set if dev_info.default_rxportconf.ring_size is 0 and user provided 0 in nb_rx_desc argument. However the current code treats it as a hint for the PMD to change the ring size to internal defaults. Additionally since the ENA_DEFAULT_RING_SIZE is defined, report it in the device capabilities so that both rte_ethdev code and the user can utilize it for device configuration. Fixes: ea93d37eb49d ("net/ena: add HW queues depth setup") Signed-off-by: Stanislaw Kardach Reviewed-by: Michal Krawczyk Reviewed-by: Igor Chauskin Reviewed-by: Shay Agroskin --- drivers/net/ena/ena_ethdev.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c index 46ef021072..aa497ba985 100644 --- a/drivers/net/ena/ena_ethdev.c +++ b/drivers/net/ena/ena_ethdev.c @@ -1275,9 +1275,6 @@ static int ena_tx_queue_setup(struct rte_eth_dev *dev, return -EINVAL; } - if (nb_desc == RTE_ETH_DEV_FALLBACK_TX_RINGSIZE) - nb_desc = adapter->max_tx_ring_size; - txq->port_id = dev->data->port_id; txq->next_to_clean = 0; txq->next_to_use = 0; @@ -1349,9 +1346,6 @@ static int ena_rx_queue_setup(struct rte_eth_dev *dev, return ENA_COM_FAULT; } - if (nb_desc == RTE_ETH_DEV_FALLBACK_RX_RINGSIZE) - nb_desc = adapter->max_rx_ring_size; - if (!rte_is_power_of_2(nb_desc)) { PMD_DRV_LOG(ERR, "Unsupported size of RX queue: %d is not a power of 2.\n", @@ -2068,6 +2062,9 @@ static int ena_infos_get(struct rte_eth_dev *dev, dev_info->tx_desc_lim.nb_mtu_seg_max = RTE_MIN(ENA_PKT_MAX_BUFS, adapter->max_tx_sgl_size); + dev_info->default_rxportconf.ring_size = ENA_DEFAULT_RING_SIZE; + dev_info->default_txportconf.ring_size = ENA_DEFAULT_RING_SIZE; + return 0; } -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-12 06:53:59.568922200 +0800 +++ 0116-net-ena-report-default-ring-size.patch 2021-06-12 06:53:56.500000000 +0800 @@ -1 +1 @@ -From 30a6c7ef4054e1f4fcc6bd68606c5991c324f08c Mon Sep 17 00:00:00 2001 +From c9000c686e2021d23d60ae649ebcb50490e0202b Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit 30a6c7ef4054e1f4fcc6bd68606c5991c324f08c ] @@ -21 +23,0 @@ -Cc: stable@dpdk.org @@ -32 +34 @@ -index 9721a70cf8..1099ae8efa 100644 +index 46ef021072..aa497ba985 100644