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 B7E7542ECF for ; Thu, 20 Jul 2023 17:31:25 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B477940685; Thu, 20 Jul 2023 17:31:25 +0200 (CEST) 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 1EF35400D6 for ; Thu, 20 Jul 2023 17:31:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689867083; 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=7PfQdLnt1TF98IAswGpgIkn9LWXzGKFr2ADyudCf5oQ=; b=R7hXqjjkZuVqMeG5tYmV8ah6cFgwiYkKWmVJorMpKJAO5QMyvog82OOIGyOGmLwkb3a4dw 1x3NcUlMYwMRLJQIu0JfwRTJPV2mG9ztRDb6I24XbBRDJgVOVC5+gpQEVum91LoyEpx3oJ tsJturT5Fpx+J0iXW0MtrN+57ERALYw= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-599-0BkNhOygNHe_9tR9l7R1bA-1; Thu, 20 Jul 2023 11:22:18 -0400 X-MC-Unique: 0BkNhOygNHe_9tR9l7R1bA-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id F2A2B1064B0B; Thu, 20 Jul 2023 15:21:52 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0FE634CD0E1; Thu, 20 Jul 2023 15:21:51 +0000 (UTC) From: Kevin Traynor To: Wenjing Qiao Cc: Qi Zhang , dpdk stable Subject: patch 'net/ice: fix timestamp enabling' has been queued to stable release 21.11.5 Date: Thu, 20 Jul 2023 16:18:25 +0100 Message-ID: <20230720151942.262154-74-ktraynor@redhat.com> In-Reply-To: <20230720151942.262154-1-ktraynor@redhat.com> References: <20230720151942.262154-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/25/23. 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/634cd44ea096f2c456bc63b3077c6ce0a0f92ca3 Thanks. Kevin --- >From 634cd44ea096f2c456bc63b3077c6ce0a0f92ca3 Mon Sep 17 00:00:00 2001 From: Wenjing Qiao Date: Fri, 19 May 2023 02:47:38 -0400 Subject: [PATCH] net/ice: fix timestamp enabling [ upstream commit 71021636964dcd074ff2ee1663dc67ec830e6a14 ] Use the following command: 1. dpdk-testpmd -c 0x3 -n 4 --force-max-simd-bitwidth=64 -- -i --enable-rx-timestamp 2. port stop 0 3. port config 0 rx_offload timestamp off 4. port start 0 Then start it, log will show timestamp info, which should not appear. Because ice_timestamp_dynflag is still more than 0, code will still calculate timestamp. So fix it. Fixes: f9c561ffbccc ("net/ice: fix performance for Rx timestamp") Signed-off-by: Wenjing Qiao Acked-by: Qi Zhang --- drivers/net/ice/ice_rxtx.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c index c16443d0ce..9ad8793709 100644 --- a/drivers/net/ice/ice_rxtx.c +++ b/drivers/net/ice/ice_rxtx.c @@ -1638,5 +1638,6 @@ ice_rx_scan_hw_ring(struct ice_rx_queue *rxq) rxd_to_pkt_fields_ops[rxq->rxdid](rxq, mb, &rxdp[j]); #ifndef RTE_LIBRTE_ICE_16BYTE_RX_DESC - if (ice_timestamp_dynflag > 0) { + if (ice_timestamp_dynflag > 0 && + (rxq->offloads & RTE_ETH_RX_OFFLOAD_TIMESTAMP)) { rxq->time_high = rte_le_to_cpu_32(rxdp[j].wb.flex_ts.ts_high); @@ -1985,5 +1986,6 @@ ice_recv_scattered_pkts(void *rx_queue, pkt_flags = ice_rxd_error_to_pkt_flags(rx_stat_err0); #ifndef RTE_LIBRTE_ICE_16BYTE_RX_DESC - if (ice_timestamp_dynflag > 0) { + if (ice_timestamp_dynflag > 0 && + (rxq->offloads & RTE_ETH_RX_OFFLOAD_TIMESTAMP)) { rxq->time_high = rte_le_to_cpu_32(rxd.wb.flex_ts.ts_high); @@ -2436,5 +2438,6 @@ ice_recv_pkts(void *rx_queue, pkt_flags = ice_rxd_error_to_pkt_flags(rx_stat_err0); #ifndef RTE_LIBRTE_ICE_16BYTE_RX_DESC - if (ice_timestamp_dynflag > 0) { + if (ice_timestamp_dynflag > 0 && + (rxq->offloads & RTE_ETH_RX_OFFLOAD_TIMESTAMP)) { rxq->time_high = rte_le_to_cpu_32(rxd.wb.flex_ts.ts_high); -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 16:18:03.874275327 +0100 +++ 0074-net-ice-fix-timestamp-enabling.patch 2023-07-20 16:17:54.910751525 +0100 @@ -1 +1 @@ -From 71021636964dcd074ff2ee1663dc67ec830e6a14 Mon Sep 17 00:00:00 2001 +From 634cd44ea096f2c456bc63b3077c6ce0a0f92ca3 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 71021636964dcd074ff2ee1663dc67ec830e6a14 ] + @@ -17 +18,0 @@ -Cc: stable@dpdk.org @@ -26 +27 @@ -index c998b0080a..7b6784b177 100644 +index c16443d0ce..9ad8793709 100644 @@ -29 +30 @@ -@@ -1766,5 +1766,6 @@ ice_rx_scan_hw_ring(struct ice_rx_queue *rxq) +@@ -1638,5 +1638,6 @@ ice_rx_scan_hw_ring(struct ice_rx_queue *rxq) @@ -37 +38 @@ -@@ -2132,5 +2133,6 @@ ice_recv_scattered_pkts(void *rx_queue, +@@ -1985,5 +1986,6 @@ ice_recv_scattered_pkts(void *rx_queue, @@ -45 +46 @@ -@@ -2622,5 +2624,6 @@ ice_recv_pkts(void *rx_queue, +@@ -2436,5 +2438,6 @@ ice_recv_pkts(void *rx_queue,