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 E28FF45804 for ; Fri, 23 Aug 2024 18:19:58 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DDB8043381; Fri, 23 Aug 2024 18:19:58 +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 EF13540295 for ; Fri, 23 Aug 2024 18:19:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724429997; 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=8Cm6U/os4OwpN7GnPX/axoxrACtifFcBTzV3sS2xAUA=; b=QX+U0VCtsiGcReNi4Sq8non3jW65aB+hQgQ8u0S+LBqzE3V9kixOkaRNiKDBy6xcJ0i2d+ zdWlb18oU9yG3znGIlnrA9/xodc584TUTlm6kml3Tf2G3hCCmYNqRVW1chFgrF5uKgcofk oQMPMYkoqsUVVWzqIM++nC45FiuWuGw= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-330-jdHpMqdPOqC27XF-V4Kqqg-1; Fri, 23 Aug 2024 12:19:55 -0400 X-MC-Unique: jdHpMqdPOqC27XF-V4Kqqg-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5EB771955D4D; Fri, 23 Aug 2024 16:19:54 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.193.224]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 98BAE1956053; Fri, 23 Aug 2024 16:19:52 +0000 (UTC) From: Kevin Traynor To: Dengdui Huang Cc: Jie Hai , dpdk stable Subject: patch 'net/hns3: fix offload flag of IEEE 1588' has been queued to stable release 21.11.8 Date: Fri, 23 Aug 2024 17:17:15 +0100 Message-ID: <20240823161929.1004778-7-ktraynor@redhat.com> In-Reply-To: <20240823161929.1004778-1-ktraynor@redhat.com> References: <20240823161929.1004778-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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.8 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/28/24. 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/4b362a6ca1b84d92b2500e52e85f82946b7a1b0e Thanks. Kevin --- >From 4b362a6ca1b84d92b2500e52e85f82946b7a1b0e Mon Sep 17 00:00:00 2001 From: Dengdui Huang Date: Wed, 3 Apr 2024 18:16:19 +0800 Subject: [PATCH] net/hns3: fix offload flag of IEEE 1588 [ upstream commit bd8f90f0175914bc7df9ef2e9170a850faaa253b ] Currently, the RTE_MBUF_F_RX_IEEE1588_TMST offload flag will not be set when the scatter algorithm is used. This patch fixes it. Fixes: 4801f0403b58 ("net/hns3: fix IEEE 1588 PTP for scalar scattered Rx") Signed-off-by: Dengdui Huang Signed-off-by: Jie Hai --- drivers/net/hns3/hns3_rxtx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/hns3/hns3_rxtx.c b/drivers/net/hns3/hns3_rxtx.c index 3e905f8aac..da6b924eab 100644 --- a/drivers/net/hns3/hns3_rxtx.c +++ b/drivers/net/hns3/hns3_rxtx.c @@ -2683,4 +2683,5 @@ hns3_recv_scattered_pkts(void *rx_queue, } + first_seg->ol_flags = 0; if (unlikely(bd_base_info & BIT(HNS3_RXD_TS_VLD_B))) hns3_rx_ptp_timestamp_handle(rxq, first_seg, timestamp); @@ -2712,5 +2713,5 @@ hns3_recv_scattered_pkts(void *rx_queue, first_seg->port = rxq->port_id; first_seg->hash.rss = rte_le_to_cpu_32(rxd.rx.rss_hash); - first_seg->ol_flags = RTE_MBUF_F_RX_RSS_HASH; + first_seg->ol_flags |= RTE_MBUF_F_RX_RSS_HASH; if (unlikely(bd_base_info & BIT(HNS3_RXD_LUM_B))) { first_seg->hash.fdir.hi = -- 2.46.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-23 17:18:10.226941113 +0100 +++ 0007-net-hns3-fix-offload-flag-of-IEEE-1588.patch 2024-08-23 17:18:09.614429735 +0100 @@ -1 +1 @@ -From bd8f90f0175914bc7df9ef2e9170a850faaa253b Mon Sep 17 00:00:00 2001 +From 4b362a6ca1b84d92b2500e52e85f82946b7a1b0e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit bd8f90f0175914bc7df9ef2e9170a850faaa253b ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 73a388b2fe..e6d277ffad 100644 +index 3e905f8aac..da6b924eab 100644 @@ -23 +24 @@ -@@ -2670,4 +2670,5 @@ hns3_recv_scattered_pkts(void *rx_queue, +@@ -2683,4 +2683,5 @@ hns3_recv_scattered_pkts(void *rx_queue, @@ -29 +30 @@ -@@ -2699,5 +2700,5 @@ hns3_recv_scattered_pkts(void *rx_queue, +@@ -2712,5 +2713,5 @@ hns3_recv_scattered_pkts(void *rx_queue,