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 9504AA0543 for ; Tue, 21 Jun 2022 10:09:50 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1FCE342BBE; Tue, 21 Jun 2022 10:09:32 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2042.outbound.protection.outlook.com [40.107.236.42]) by mails.dpdk.org (Postfix) with ESMTP id 9E09A42BB5 for ; Tue, 21 Jun 2022 10:09:29 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BMHsHlrrexqYrgH6kBqi0JrYaa37CkGTtHX2a9jw/IhpN8WpHIlCpPFvmqi0h0LH2SfRfCYhrTywq86zDqykFKLN7Rp9tQLvLrKyfmoLN3GS6m89KqfNVKx1hMR8sxdX3HGe5/8gPkI2Y3FjqbiYtbKK08MzpCP3Wq6rTLNhf9Ho6/CLmzOp0ZuExpKOqiwWFJz/45+tOYd1VOea8KzVTFAHNu38EP4mXtgL3XjPEwDrdQ6eswYG/bqmgz7SQ4LFMO2D2QRMsuxoZfPByzeLk5vsUr9D4G1LOWLrhvZLXAT9hhaail34pzpwzOP6bH3xEAU697gQlaGn265olKgoHQ== 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=hh7AB8uMYh54Fmz5sFllwIqjmI+lUXnePPU9yeAuU9k=; b=MGBeX3YdEuoY9gPZxtNr4JtVtZUgDrXvKKro76/VAXFgVV5sYFrtwoFJfmH0XfQMAbYiO4lBxnHjxXaIoZq0S6LfcZtYAhJ2yTjDFtArB3Pq1D4El8rWlkhfyat67uSE4NMu5ejWoX7PMEWJ6A/Q8UKqIxHorVbQCNYWiHXWr1AEQfczd+ED0kHzvfU2htNjXlCvXFP/u94SsGhfD2XPfi27Jq06pC2hqoCVPGi0v8zKOh4wE8trWxnJpGhXbazYzJgK4wfOaRX0DsM2BSsphLAP4cKgHAw3Sym+PIT3IjY3lDB0uQ+04o4elf9t/XDB+ivsLCrdUNUGVXhMHyZ2fA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.235) smtp.rcpttodomain=oktetlabs.ru 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=hh7AB8uMYh54Fmz5sFllwIqjmI+lUXnePPU9yeAuU9k=; b=F4nwAQKfaiT5mR2Sx9bQZQzxJ41prB/HR/d4rvylhiCMa4mCki6zv4DGawYGwgP21IZADVRz4DDRwDpHaSaf0LDB8lBcicMQwr1UoUp6rdKQcJ8eLJ/QCZnkAl/BIpBoavj8Ojwb0X+PuNYCs5EREu+nOmsBUOKk5TGik8V/4lhnqitD4DIqKBIq5W9lEuFF/j6Vp+9L5B7iJv5TRkBrZ3TpxUU4DzguOCFuN5RGy7E+Q93VHsWaQgwpUrmNfkVW77vaYyxkYpChHmMh2iBRvUw34uRMx/ns+ZsIJDod5CD6TTpekrkEiLuVE0swudtZUCT8F0Tt/hRMgjDSl7J8gg== Received: from MW4PR03CA0309.namprd03.prod.outlook.com (2603:10b6:303:dd::14) by BN6PR1201MB2528.namprd12.prod.outlook.com (2603:10b6:404:ae::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.15; Tue, 21 Jun 2022 08:09:27 +0000 Received: from CO1NAM11FT039.eop-nam11.prod.protection.outlook.com (2603:10b6:303:dd:cafe::e1) by MW4PR03CA0309.outlook.office365.com (2603:10b6:303:dd::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.15 via Frontend Transport; Tue, 21 Jun 2022 08:09:27 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.235) 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.235 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.235; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (12.22.5.235) by CO1NAM11FT039.mail.protection.outlook.com (10.13.174.110) 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:09:26 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by DRHQMAIL107.nvidia.com (10.27.9.16) with Microsoft SMTP Server (TLS) id 15.0.1497.32; Tue, 21 Jun 2022 08:09:25 +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:09:23 -0700 From: Xueming Li To: Chengwen Feng CC: =?UTF-8?q?Morten=20Br=C3=B8rup?= , "Andrew Rybchenko" , dpdk stable Subject: patch 'net/ipn3ke: fix xstats get return if xstats is null' has been queued to stable release 20.11.6 Date: Tue, 21 Jun 2022 11:02:18 +0300 Message-ID: <20220621080301.2315720-73-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-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit 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: 9fc60383-2fce-41f1-62b7-08da535d5bac X-MS-TrafficTypeDiagnostic: BN6PR1201MB2528: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: wyxjM8Mb2C6TWV4VCSjVEn5n+nuvoDDZyLvcs74XUo4BI00bugVlfWstl2PZbtQS8Slh8I7OHmhAovPnGSJ5PZswC4C6AIjUNHsSvbAd8J5jdi1mKS2N5nrVRZHmwOcwHJ3O4U7TCwoKIcITGd99K0QSJnTtNTfcjrDdYx8Us2h2UiGCUeFceDBi7k4gdtnEt9u+Ldvqh7zH2tozhP3BGetppoW/hOzDqWfndjnjHDcOS6w/wcsTywWE9Xu6RmOejIXlYHTF+W/gJ75YMArD49Oc3+EmJJqaKeQMfMUjnHTKKSBmd3O1DMguTpl53j3LrT1zmXtT2ov3d5PoL/afEcCvs0EUgxwtmB9e0oEcv/doZLzqcWJjl9FFauZfYrnjTYO8hodGefdyI1XMr1cVg14D+WfNp5SRyvz/xfy8O3Z4e2LjWxjN6QB8aSmpwHcSS1vtMA68QQ5Y+yUEGGJrullxeRY4j5fg8cgUMMRiyD1P8xDnIRJ5al3EmarzOnBceClZUY2C4YL/sAIWqAKGFmiXihoC/PVLVr2Rr6Ny2NkZyFQIa7RESl+jzi7WSw6aFq8qhqIMEIsl+BpUA1+6hW/DPK6KH4r7I8vGoSXjRpknSYvobwLjGYMy3M0iqe5b17gzmWnpn81RgOTreYBoWEErxaLBPfJ92++O5ahjrXtoI5fH1svS44MWcxnotKxSj3NRu4rdVz4apUan1iEvOne/lWW8RToYJ8s3AW4YBOnUWAJINce2ttE1VI4/6WDFTHjqRnSJ+zhFeY3SCWJnBMISibhF/QCLDKIqExwK8u7rmNApqbQfgrXQcTo00kb5GIWrlf3ueTJN6WfjNzHcIK00HlXNiLXoj76lc5PBmcM= X-Forefront-Antispam-Report: CIP:12.22.5.235; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:InfoNoRecords; CAT:NONE; SFS:(13230016)(4636009)(376002)(346002)(396003)(136003)(39860400002)(46966006)(40470700004)(36840700001)(70206006)(16526019)(8676002)(336012)(2906002)(966005)(4326008)(6286002)(47076005)(66574015)(70586007)(426003)(26005)(186003)(7696005)(1076003)(53546011)(83380400001)(5660300002)(6666004)(40460700003)(41300700001)(2616005)(478600001)(8936002)(86362001)(356005)(36756003)(82740400003)(82310400005)(40480700001)(55016003)(316002)(6916009)(54906003)(36860700001)(81166007)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jun 2022 08:09:26.0184 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9fc60383-2fce-41f1-62b7-08da535d5bac 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.235]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT039.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR1201MB2528 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/007dfe41028fba0388a3c5fcd9a7f91100b63c3e Thanks. Xueming Li --- >From 007dfe41028fba0388a3c5fcd9a7f91100b63c3e Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Fri, 13 May 2022 10:53:52 +0800 Subject: [PATCH] net/ipn3ke: fix xstats get return if xstats is null MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Xueming Li [ upstream commit e17cb41db7656121f5809e353f8db126b026fbb4 ] Many user (e.g. telemetry) invokes rte_eth_xstats_get(port_id, NULL, 0) to retrieve the required number of elements, but currently ipn3ke PMD returns zero when xstats is null. Dedicated check for xstats vs null is not required, since ethdev layer guarantees that it may be null only if number of entries n is 0 (which is definitely smaller than total xstats count). Fixes: 5a6d883878db ("net/ipn3ke: implement statistics") Signed-off-by: Chengwen Feng Acked-by: Morten Brørup Reviewed-by: Andrew Rybchenko --- drivers/net/ipn3ke/ipn3ke_representor.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/net/ipn3ke/ipn3ke_representor.c b/drivers/net/ipn3ke/ipn3ke_representor.c index 9fc3918303..603017f896 100644 --- a/drivers/net/ipn3ke/ipn3ke_representor.c +++ b/drivers/net/ipn3ke/ipn3ke_representor.c @@ -2228,9 +2228,6 @@ ipn3ke_rpst_xstats_get struct ipn3ke_rpst_hw_port_stats hw_stats; struct rte_eth_stats stats; - if (!xstats) - return 0; - if (!ethdev) { IPN3KE_AFU_PMD_ERR("ethernet device to get statistics is NULL"); return -EINVAL; -- 2.35.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-21 15:37:52.550537456 +0800 +++ 0072-net-ipn3ke-fix-xstats-get-return-if-xstats-is-null.patch 2022-06-21 15:37:49.107784833 +0800 @@ -1 +1 @@ -From e17cb41db7656121f5809e353f8db126b026fbb4 Mon Sep 17 00:00:00 2001 +From 007dfe41028fba0388a3c5fcd9a7f91100b63c3e Mon Sep 17 00:00:00 2001 @@ -7,0 +8,3 @@ +Cc: Xueming Li + +[ upstream commit e17cb41db7656121f5809e353f8db126b026fbb4 ] @@ -18 +20,0 @@ -Cc: stable@dpdk.org @@ -28 +30 @@ -index c9dde1d82e..abbecfdf2e 100644 +index 9fc3918303..603017f896 100644 @@ -31 +33 @@ -@@ -2218,9 +2218,6 @@ ipn3ke_rpst_xstats_get +@@ -2228,9 +2228,6 @@ ipn3ke_rpst_xstats_get