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 5DD58454E8 for ; Tue, 25 Jun 2024 01:59:44 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 57B994026F; Tue, 25 Jun 2024 01:59:44 +0200 (CEST) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mails.dpdk.org (Postfix) with ESMTP id 9053E41101 for ; Tue, 25 Jun 2024 01:59:42 +0200 (CEST) Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-3627ef1fc07so3717638f8f.3 for ; Mon, 24 Jun 2024 16:59:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719273582; x=1719878382; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=IEMqVxTUULD4bBtFnMD5hNkesC9nGOPuU7PzeBrXjsk=; b=mA28jAkgBIZN54JdZlINm1Wr4+jYzQRZ1a+4ITRc1meAMwBoUPsa0sbYbIp4F1pxBE dbaj5vwTLWJRHxUFcsOfJmZu7oIvTgqs+8QwLlN3TrEJ/VqI3OJJlv065f+LsVaxXSea 0Nw5ZiyofPkEIPLnuEtaktLXg419LDTtVNQtYbGnKs+NhrRG6FLQsVmpFkScwVm3HphQ j0CtRxbo0XGtpbv1tir8NY1rcXjuYxbf6OUJROXDSS/P+ruD2SZ+vjrjn6mN+g1smP9n 2A0RC/Ynon09jGlpz1Uk1vU6uE4CTgTLLA8k40duchLHwdvfJa6OgEfyX/JHb7JSj+PO 3iNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719273582; x=1719878382; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IEMqVxTUULD4bBtFnMD5hNkesC9nGOPuU7PzeBrXjsk=; b=nNhDm3Ini/QOiW9tvJKlFGHOXPYlaW414wktEi1QVi9A0jVE1hzqDSZJcoRAfyfEjc FIJALqzRecC/0rkdnd41pClqjS/YWknM9svRTMeiikDkxlNJZD01b7Ys7Y9Envdqx4Ua JEhMMPAu6eK5+qETmCzteaU4n0cmjkdBCdV7lx/W26CNE5LxsrVTToiQfObKiDP13xCM pr/hQnd0L0c45LaBr4sK5boYCzJANMfjYcEQCFsBaJwGx90V1dU8Pkhf8EviyBB0IBlH bT2zfy94fdrqx47we9SxO5RmfNOO+rkrgVgSdp67IGn1PeNbM/zIDoMpjQGkyYR4DrNH I7tg== X-Forwarded-Encrypted: i=1; AJvYcCU2BW9nm2HEfx+PRogXJJHADbMMTEQcAQAg2glulpVhacdrI5YNg4El5tOXQUGW/wEbG8R6fMeaaacPRvYIORM= X-Gm-Message-State: AOJu0Yyda2jtLSHl6DTks6gox7Yy9oyiUzsUVNhKUDDAEh4Fva8jJun6 ONbwWoEY8XJIpZ1oj6cdAzyiSk1ApZdn358ubwM+TJWKDZusryeU6zfp/Q== X-Google-Smtp-Source: AGHT+IFtzjJ3E4Iy9tJOJIvH3YHcawWUx8IQi/+essUfKcAa94ERL22IEMAfynxZ6CicnQMcW5YRow== X-Received: by 2002:adf:f409:0:b0:367:13a:5276 with SMTP id ffacd0b85a97d-367013a5389mr19143f8f.20.1719273582177; Mon, 24 Jun 2024 16:59:42 -0700 (PDT) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-366666ff3f0sm11034958f8f.68.2024.06.24.16.59.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jun 2024 16:59:41 -0700 (PDT) From: luca.boccassi@gmail.com To: Dengdui Huang Cc: Jie Hai , dpdk stable Subject: patch 'net/hns3: fix offload flag of IEEE 1588' has been queued to stable release 22.11.6 Date: Tue, 25 Jun 2024 00:57:56 +0100 Message-Id: <20240624235907.885628-10-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240624235907.885628-1-luca.boccassi@gmail.com> References: <20240624235907.885628-1-luca.boccassi@gmail.com> MIME-Version: 1.0 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 22.11.6 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/27/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/419ac23f30616787391300ed67909f9b1cad9b32 Thanks. Luca Boccassi --- >From 419ac23f30616787391300ed67909f9b1cad9b32 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 bbb3b305d1..b87655c953 100644 --- a/drivers/net/hns3/hns3_rxtx.c +++ b/drivers/net/hns3/hns3_rxtx.c @@ -2671,6 +2671,7 @@ hns3_recv_scattered_pkts(void *rx_queue, continue; } + 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); @@ -2700,7 +2701,7 @@ 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 = rte_le_to_cpu_16(rxd.rx.fd_id); -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-06-25 00:22:14.133677285 +0100 +++ 0010-net-hns3-fix-offload-flag-of-IEEE-1588.patch 2024-06-25 00:22:13.077183447 +0100 @@ -1 +1 @@ -From bd8f90f0175914bc7df9ef2e9170a850faaa253b Mon Sep 17 00:00:00 2001 +From 419ac23f30616787391300ed67909f9b1cad9b32 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 bbb3b305d1..b87655c953 100644 @@ -23 +24 @@ -@@ -2669,6 +2669,7 @@ hns3_recv_scattered_pkts(void *rx_queue, +@@ -2671,6 +2671,7 @@ hns3_recv_scattered_pkts(void *rx_queue, @@ -31 +32 @@ -@@ -2698,7 +2699,7 @@ hns3_recv_scattered_pkts(void *rx_queue, +@@ -2700,7 +2701,7 @@ hns3_recv_scattered_pkts(void *rx_queue,