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 7CD50454E8 for ; Tue, 25 Jun 2024 01:59:55 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 77E3F4026F; Tue, 25 Jun 2024 01:59:55 +0200 (CEST) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mails.dpdk.org (Postfix) with ESMTP id CB553400EF for ; Tue, 25 Jun 2024 01:59:53 +0200 (CEST) Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-4217990f997so37308165e9.2 for ; Mon, 24 Jun 2024 16:59:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719273593; x=1719878393; 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=nq7lPvcgK4Dzr67h3k9YW1J9QUkWnWLOt74qJmL5C+0=; b=Ph/7eWzVjBT1Vq4tAkzg6Lf2IxhCn5Bryg586708Ey4udPmOaU8NlXfuWMPrtezKpe ZqGsK6mrzZL7QddJF/XxT9Q4iRdkueA9ObBj5iOyrOdJXjlbDtgiyOvmh6ZPVuDacJ7F rRh8XFL6TqU8y4GAgpp4nNSH77pw0O+VWaQ0qL7P+xADLJHke/1zxDqU4jmErqAruW3+ ohH+DjAL4nIsWP8IQ11XMjbtYjf7X9tgiKaSy7KBEarwZS7B3sL25TS/hCnX5B9Gk8VO 2k18xLCq6Vobv2T2n76oRH47+eNCDNbcGdJjdcfoNcm3YrtkEHqjraabYyn6u0CBlePy 5RTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719273593; x=1719878393; 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=nq7lPvcgK4Dzr67h3k9YW1J9QUkWnWLOt74qJmL5C+0=; b=tlrzH6GTDyOpI0KtO/6pKKgSp5jOtda+5z/C2Mt9474ygRmlkG3Hb6ZAB+VZCN4GRH 5GueDRdv5lkFIFn1V1LoYKsQwmq1rCY8buV4bLG5IGFL9SKxWP/FmHBuCS0UslF7Sa5z b+ay3KzMfdFJ8hxPHy+7gwhGGYOEgKR2sVdqmqaN0T1gDZ/vBFLtM7cWXIQjsQe6UZ+2 MgfDgz275sg81At31bcbCwHsltksxXh5Ejh6C0vL9IY/A1Z5voKUDLHHuURTtSzkpBFK j8/7lUkucZeCoXWeLHvfK+hT1ifGJfNrlYPaiU0EmxKnREhJwZKNAyfBY7AssR9g53yV oSRw== X-Forwarded-Encrypted: i=1; AJvYcCXyDyEwoeTYz8zNIX5k4eqAOR16MCwz1+zQ99mR4ddLR7Zmr/zg3UNzvyzPrXmQj5xX9+JZCRryaCUvp0OndjM= X-Gm-Message-State: AOJu0YzjcPgee3fgyFBGzbgy7Fe4Aj0heEdz2oJDNnqIaDL8N0Pployl sbk/C0ShI4h9kFiAIDyCHHEbuBZ9OpvTK2c+s/GzuDqEyS4NPRJXUkVa5w== X-Google-Smtp-Source: AGHT+IFrZ6/6pAnUL6Sl8KoqUc1pfJOyhMPRg0M1JBpV6dM3+L/fTCYZrnQga/wZYdezHhjXeZD4ig== X-Received: by 2002:a5d:522a:0:b0:364:a733:74de with SMTP id ffacd0b85a97d-366e4ed3e13mr4822971f8f.28.1719273593355; Mon, 24 Jun 2024 16:59:53 -0700 (PDT) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3663a2f6d02sm11280539f8f.85.2024.06.24.16.59.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jun 2024 16:59:52 -0700 (PDT) From: luca.boccassi@gmail.com To: Dengdui Huang Cc: Jie Hai , dpdk stable Subject: patch 'net/hns3: fix Rx timestamp flag' has been queued to stable release 22.11.6 Date: Tue, 25 Jun 2024 00:57:57 +0100 Message-Id: <20240624235907.885628-11-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/afd6de50ebd4bd2d41abe98bf0aa2a3c8146bb36 Thanks. Luca Boccassi --- >From afd6de50ebd4bd2d41abe98bf0aa2a3c8146bb36 Mon Sep 17 00:00:00 2001 From: Dengdui Huang Date: Wed, 3 Apr 2024 18:16:20 +0800 Subject: [PATCH] net/hns3: fix Rx timestamp flag [ upstream commit e7141041d3aa74ff49b703424f120a6e2c00dcb4 ] The flag RTE_MBUF_F_RX_IEEE1588_PTP depends on the packet type and does not need to be set when reading Rx timestamp. Fixes: 38b539d96eb6 ("net/hns3: support IEEE 1588 PTP") Signed-off-by: Dengdui Huang Signed-off-by: Jie Hai --- drivers/net/hns3/hns3_rxtx.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/hns3/hns3_rxtx.c b/drivers/net/hns3/hns3_rxtx.c index b87655c953..392df0bae5 100644 --- a/drivers/net/hns3/hns3_rxtx.c +++ b/drivers/net/hns3/hns3_rxtx.c @@ -2392,8 +2392,7 @@ hns3_rx_ptp_timestamp_handle(struct hns3_rx_queue *rxq, struct rte_mbuf *mbuf, { struct hns3_pf *pf = HNS3_DEV_PRIVATE_TO_PF(rxq->hns); - mbuf->ol_flags |= RTE_MBUF_F_RX_IEEE1588_PTP | - RTE_MBUF_F_RX_IEEE1588_TMST; + mbuf->ol_flags |= RTE_MBUF_F_RX_IEEE1588_TMST; if (hns3_timestamp_rx_dynflag > 0) { *RTE_MBUF_DYNFIELD(mbuf, hns3_timestamp_dynfield_offset, rte_mbuf_timestamp_t *) = timestamp; -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-06-25 00:22:14.211019811 +0100 +++ 0011-net-hns3-fix-Rx-timestamp-flag.patch 2024-06-25 00:22:13.081183529 +0100 @@ -1 +1 @@ -From e7141041d3aa74ff49b703424f120a6e2c00dcb4 Mon Sep 17 00:00:00 2001 +From afd6de50ebd4bd2d41abe98bf0aa2a3c8146bb36 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e7141041d3aa74ff49b703424f120a6e2c00dcb4 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index e6d277ffad..55311402fe 100644 +index b87655c953..392df0bae5 100644 @@ -22 +23 @@ -@@ -2389,8 +2389,7 @@ hns3_rx_ptp_timestamp_handle(struct hns3_rx_queue *rxq, struct rte_mbuf *mbuf, +@@ -2392,8 +2392,7 @@ hns3_rx_ptp_timestamp_handle(struct hns3_rx_queue *rxq, struct rte_mbuf *mbuf,