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 89ABAA034E for ; Mon, 21 Feb 2022 16:37:32 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 84C36410F7; Mon, 21 Feb 2022 16:37:31 +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 3C89A4013F for ; Mon, 21 Feb 2022 16:37:30 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645457849; 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=klQbSkfoHQpSw9kQ9ddtZFlg9Tlf6rDdRCcg3UZN1iw=; b=GlUa+ioCRBUfT2GSi9oFuITi9wuymdTKZFdEReyZqnGmVDyRIYmLYS3kAv8N5OCINsem7M JBUeh5mpKJzhm4iVupTw4sur/xuWbOnDwh8UNTQMreXwfTBK7KKXPiK25F5WWHj6PhXoOl afVukO0KNCXTyF5Q1Rlid4FI34HTXp4= 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-98-siRicqkdM66UAD7CG7Ls0w-1; Mon, 21 Feb 2022 10:37:26 -0500 X-MC-Unique: siRicqkdM66UAD7CG7Ls0w-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 5166A100C662; Mon, 21 Feb 2022 15:37:25 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 09ACD7E133; Mon, 21 Feb 2022 15:37:23 +0000 (UTC) From: Kevin Traynor To: Pavan Nikhilesh Cc: Jay Jayatheerthan , dpdk stable Subject: patch 'eventdev/eth_rx: fix missing internal port checks' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:33:23 +0000 Message-Id: <20220221153625.152324-14-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/8d0ffec0cfd281a4807e4017a9d950d3a992e9a3 Thanks. Kevin --- >From 8d0ffec0cfd281a4807e4017a9d950d3a992e9a3 Mon Sep 17 00:00:00 2001 From: Pavan Nikhilesh Date: Mon, 13 Dec 2021 14:01:43 +0530 Subject: [PATCH] eventdev/eth_rx: fix missing internal port checks [ upstream commit de3c3a2f20c7a944eb33991bd35fc6739645bb34 ] When event delivery is through internal port, stats are maintained by HW and we should avoid reading SW data structures for stats. Fix missing internal port checks. Fixes: 995b150c1ae1 ("eventdev/eth_rx: add queue stats API") Signed-off-by: Pavan Nikhilesh Acked-by: Jay Jayatheerthan --- lib/eventdev/rte_event_eth_rx_adapter.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/lib/eventdev/rte_event_eth_rx_adapter.c b/lib/eventdev/rte_event_eth_rx_adapter.c index 3182b52c23..f946137b25 100644 --- a/lib/eventdev/rte_event_eth_rx_adapter.c +++ b/lib/eventdev/rte_event_eth_rx_adapter.c @@ -2985,13 +2985,15 @@ rte_event_eth_rx_adapter_queue_stats_get(uint8_t id, } - queue_info = &dev_info->rx_queue[rx_queue_id]; - event_buf = queue_info->event_buf; - q_stats = queue_info->stats; + if (dev_info->internal_event_port == 0) { + queue_info = &dev_info->rx_queue[rx_queue_id]; + event_buf = queue_info->event_buf; + q_stats = queue_info->stats; - stats->rx_event_buf_count = event_buf->count; - stats->rx_event_buf_size = event_buf->events_size; - stats->rx_packets = q_stats->rx_packets; - stats->rx_poll_count = q_stats->rx_poll_count; - stats->rx_dropped = q_stats->rx_dropped; + stats->rx_event_buf_count = event_buf->count; + stats->rx_event_buf_size = event_buf->events_size; + stats->rx_packets = q_stats->rx_packets; + stats->rx_poll_count = q_stats->rx_poll_count; + stats->rx_dropped = q_stats->rx_dropped; + } dev = &rte_eventdevs[rx_adapter->eventdev_id]; @@ -3087,6 +3089,8 @@ rte_event_eth_rx_adapter_queue_stats_reset(uint8_t id, } - queue_info = &dev_info->rx_queue[rx_queue_id]; - rxa_queue_stats_reset(queue_info); + if (dev_info->internal_event_port == 0) { + queue_info = &dev_info->rx_queue[rx_queue_id]; + rxa_queue_stats_reset(queue_info); + } dev = &rte_eventdevs[rx_adapter->eventdev_id]; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:44.984593231 +0000 +++ 0014-eventdev-eth_rx-fix-missing-internal-port-checks.patch 2022-02-21 15:22:44.040704010 +0000 @@ -1 +1 @@ -From de3c3a2f20c7a944eb33991bd35fc6739645bb34 Mon Sep 17 00:00:00 2001 +From 8d0ffec0cfd281a4807e4017a9d950d3a992e9a3 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit de3c3a2f20c7a944eb33991bd35fc6739645bb34 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org