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 9D512A034E for ; Mon, 21 Feb 2022 16:38:22 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8B6EE4013F; Mon, 21 Feb 2022 16:38:22 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 9F5F7410F6 for ; Mon, 21 Feb 2022 16:38:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645457901; 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=FOQDB+8AopHOfypMDSEwtCAfsyGc+7/z2rJoS5cIkzk=; b=RhMtXxqyL2sPIDhbHOyPtgOq6+ZbevjYoJNKMl/D2cLH+HU/QTbOTy2YpKu64NHKurCxeo 0icz/WPcDWaRTH+Qmte588tRIh0sqUGnT5QnMXIxaLwd7zsflEeIlikW3JUAcyCw0cAI+C 949vyvza7SpWoUrt9oQHsaRQINk4xsk= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-286-FsGzuFuPPlSUI5qRXaFnKA-1; Mon, 21 Feb 2022 10:38:18 -0500 X-MC-Unique: FsGzuFuPPlSUI5qRXaFnKA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4B3FB1091DA1; Mon, 21 Feb 2022 15:38:17 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0EA3F7E133; Mon, 21 Feb 2022 15:38:15 +0000 (UTC) From: Kevin Traynor To: Lance Richardson Cc: Ajit Khaparde , dpdk stable Subject: patch 'net/bnxt: fix xstats names query overrun' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:33:58 +0000 Message-Id: <20220221153625.152324-49-ktraynor@redhat.com> In-Reply-To: <20220221153625.152324-1-ktraynor@redhat.com> References: <20220221153625.152324-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/26/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/c59f883c2407908e12a3dcc74ae90ed4635b6da5 Thanks. Kevin --- >From c59f883c2407908e12a3dcc74ae90ed4635b6da5 Mon Sep 17 00:00:00 2001 From: Lance Richardson Date: Tue, 30 Nov 2021 09:42:26 -0500 Subject: [PATCH] net/bnxt: fix xstats names query overrun [ upstream commit 8dcee14fbfca8c90cd09c88e0fda65819d82ded6 ] When the xstats_names parameter to rte_eth_xstats_get_names() is non-NULL and the size parameter is less than the required number of entries, the driver must return the required size without modifying (and over-running) the caller's xstats_names array. Update bnxt_dev_xstats_get_names_op() in accordance with this requirement. Fixes: bfb9c2260be2 ("net/bnxt: support xstats get/reset") Signed-off-by: Lance Richardson Acked-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_stats.c | 103 +++++++++++++++++----------------- 1 file changed, 51 insertions(+), 52 deletions(-) diff --git a/drivers/net/bnxt/bnxt_stats.c b/drivers/net/bnxt/bnxt_stats.c index 991eafc644..197fd7c02b 100644 --- a/drivers/net/bnxt/bnxt_stats.c +++ b/drivers/net/bnxt/bnxt_stats.c @@ -847,5 +847,5 @@ int bnxt_flow_stats_cnt(struct bnxt *bp) int bnxt_dev_xstats_get_names_op(struct rte_eth_dev *eth_dev, struct rte_eth_xstat_name *xstats_names, - __rte_unused unsigned int limit) + unsigned int size) { struct bnxt *bp = (struct bnxt *)eth_dev->data->dev_private; @@ -863,62 +863,61 @@ int bnxt_dev_xstats_get_names_op(struct rte_eth_dev *eth_dev, return rc; - if (xstats_names != NULL) { - count = 0; - - for (i = 0; i < RTE_DIM(bnxt_rx_stats_strings); i++) { - strlcpy(xstats_names[count].name, - bnxt_rx_stats_strings[i].name, - sizeof(xstats_names[count].name)); - count++; - } - - for (i = 0; i < RTE_DIM(bnxt_tx_stats_strings); i++) { - strlcpy(xstats_names[count].name, - bnxt_tx_stats_strings[i].name, + if (xstats_names == NULL || size < stat_cnt) + return stat_cnt; + + for (i = 0; i < RTE_DIM(bnxt_rx_stats_strings); i++) { + strlcpy(xstats_names[count].name, + bnxt_rx_stats_strings[i].name, + sizeof(xstats_names[count].name)); + count++; + } + + for (i = 0; i < RTE_DIM(bnxt_tx_stats_strings); i++) { + strlcpy(xstats_names[count].name, + bnxt_tx_stats_strings[i].name, + sizeof(xstats_names[count].name)); + count++; + } + + for (i = 0; i < RTE_DIM(bnxt_func_stats_strings); i++) { + strlcpy(xstats_names[count].name, + bnxt_func_stats_strings[i].name, + sizeof(xstats_names[count].name)); + count++; + } + + for (i = 0; i < RTE_DIM(bnxt_rx_ext_stats_strings); i++) { + strlcpy(xstats_names[count].name, + bnxt_rx_ext_stats_strings[i].name, + sizeof(xstats_names[count].name)); + + count++; + } + + for (i = 0; i < RTE_DIM(bnxt_tx_ext_stats_strings); i++) { + strlcpy(xstats_names[count].name, + bnxt_tx_ext_stats_strings[i].name, + sizeof(xstats_names[count].name)); + + count++; + } + + if (bp->fw_cap & BNXT_FW_CAP_ADV_FLOW_COUNTERS && + bp->fw_cap & BNXT_FW_CAP_ADV_FLOW_MGMT && + BNXT_FLOW_XSTATS_EN(bp)) { + for (i = 0; i < bp->max_l2_ctx; i++) { + char buf[RTE_ETH_XSTATS_NAME_SIZE]; + + sprintf(buf, "flow_%d_bytes", i); + strlcpy(xstats_names[count].name, buf, sizeof(xstats_names[count].name)); count++; - } - for (i = 0; i < RTE_DIM(bnxt_func_stats_strings); i++) { - strlcpy(xstats_names[count].name, - bnxt_func_stats_strings[i].name, - sizeof(xstats_names[count].name)); - count++; - } - - for (i = 0; i < RTE_DIM(bnxt_rx_ext_stats_strings); i++) { - strlcpy(xstats_names[count].name, - bnxt_rx_ext_stats_strings[i].name, + sprintf(buf, "flow_%d_packets", i); + strlcpy(xstats_names[count].name, buf, sizeof(xstats_names[count].name)); count++; } - - for (i = 0; i < RTE_DIM(bnxt_tx_ext_stats_strings); i++) { - strlcpy(xstats_names[count].name, - bnxt_tx_ext_stats_strings[i].name, - sizeof(xstats_names[count].name)); - - count++; - } - - if (bp->fw_cap & BNXT_FW_CAP_ADV_FLOW_COUNTERS && - bp->fw_cap & BNXT_FW_CAP_ADV_FLOW_MGMT && - BNXT_FLOW_XSTATS_EN(bp)) { - for (i = 0; i < bp->max_l2_ctx; i++) { - char buf[RTE_ETH_XSTATS_NAME_SIZE]; - - sprintf(buf, "flow_%d_bytes", i); - strlcpy(xstats_names[count].name, buf, - sizeof(xstats_names[count].name)); - count++; - - sprintf(buf, "flow_%d_packets", i); - strlcpy(xstats_names[count].name, buf, - sizeof(xstats_names[count].name)); - - count++; - } - } } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:45.714455748 +0000 +++ 0049-net-bnxt-fix-xstats-names-query-overrun.patch 2022-02-21 15:22:44.107704162 +0000 @@ -1 +1 @@ -From 8dcee14fbfca8c90cd09c88e0fda65819d82ded6 Mon Sep 17 00:00:00 2001 +From c59f883c2407908e12a3dcc74ae90ed4635b6da5 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8dcee14fbfca8c90cd09c88e0fda65819d82ded6 ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org