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 2C562A0555 for ; Thu, 9 Jun 2022 13:37:46 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 26A7842829; Thu, 9 Jun 2022 13:37:46 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 4BB354281A for ; Thu, 9 Jun 2022 13:37:45 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654774664; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PB3ks98L707E81vC5wLGTYwWZR6f1a4fxtye0vH9/KY=; b=UdAE+4LuGIWC60wYlscW7TX5KUyjSa/q4zd3aAs8vqLvv+3JEwU23qWw9Gp9CAhTvWQ271 dSyRkojXjmFVNwTdkiS1mXJ18AA5ki8mj+Fhm/hfkKmtyXkr6wqZV8zy3lC98BgrAnOFzs kO+A7Xu4jCKAeO4so98FFTCCxaPYt6k= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-193-ZTJDpS-CMhuAw4L30iSB0Q-1; Thu, 09 Jun 2022 07:37:41 -0400 X-MC-Unique: ZTJDpS-CMhuAw4L30iSB0Q-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5FF8029ABA19; Thu, 9 Jun 2022 11:37:41 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.195.82]) by smtp.corp.redhat.com (Postfix) with ESMTP id 217941730C; Thu, 9 Jun 2022 11:37:39 +0000 (UTC) From: Kevin Traynor 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 21.11.2 Date: Thu, 9 Jun 2022 12:36:09 +0100 Message-Id: <20220609113701.386938-22-ktraynor@redhat.com> In-Reply-To: <20220609113701.386938-1-ktraynor@redhat.com> References: <20220609113701.386938-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 21.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/13/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/6682fda5b37e3d31ec2a64901c4b8b112c9d1019 Thanks. Kevin --- >From 6682fda5b37e3d31ec2a64901c4b8b112c9d1019 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 [ 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 c9dde1d82e..abbecfdf2e 100644 --- a/drivers/net/ipn3ke/ipn3ke_representor.c +++ b/drivers/net/ipn3ke/ipn3ke_representor.c @@ -2219,7 +2219,4 @@ ipn3ke_rpst_xstats_get struct rte_eth_stats stats; - if (!xstats) - return 0; - if (!ethdev) { IPN3KE_AFU_PMD_ERR("ethernet device to get statistics is NULL"); -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-09 12:34:30.298091929 +0100 +++ 0022-net-ipn3ke-fix-xstats-get-return-if-xstats-is-null.patch 2022-06-09 12:34:29.675980521 +0100 @@ -1 +1 @@ -From e17cb41db7656121f5809e353f8db126b026fbb4 Mon Sep 17 00:00:00 2001 +From 6682fda5b37e3d31ec2a64901c4b8b112c9d1019 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit e17cb41db7656121f5809e353f8db126b026fbb4 ] + @@ -18 +19,0 @@ -Cc: stable@dpdk.org