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 8C46EA054A for ; Tue, 25 Oct 2022 17:10:15 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 88A0142C48; Tue, 25 Oct 2022 17:10:15 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 2FE4F42C34 for ; Tue, 25 Oct 2022 17:10:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666710613; 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=opC+jIPrkrjHlaP2ZarGX+ZbQVqIEaq9A+p6pE9kq1c=; b=XqHQucsryXTiikQoSIIbC+kt3gllIjtFE7CgPvP7H4Zc3XQvuJPdgTDuG3byb37rWXyXjK iEc23ygQjuD/cmBKJQPCijAZhxJHTT39mIwOb7OEdN8Zw4AgRfzPZXffXYHCuT1AhiNsqD XM7hyARqY/yd9bhgtNhKKuF2xKneE3Q= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-657-YQnQDXgsN0K0yV49g0xUtg-1; Tue, 25 Oct 2022 11:10:10 -0400 X-MC-Unique: YQnQDXgsN0K0yV49g0xUtg-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C174E3826A45; Tue, 25 Oct 2022 15:10:09 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id B8BAC4A9254; Tue, 25 Oct 2022 15:10:08 +0000 (UTC) From: Kevin Traynor To: Huisong Li Cc: Dongdong Liu , dpdk stable Subject: patch 'net/hns3: fix Rx with PTP' has been queued to stable release 21.11.3 Date: Tue, 25 Oct 2022 16:07:30 +0100 Message-Id: <20221025150734.142189-95-ktraynor@redhat.com> In-Reply-To: <20221025150734.142189-1-ktraynor@redhat.com> References: <20221025150734.142189-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/01/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/5210f643fed4a12d746a871ac0cc351381bff5fc Thanks. Kevin --- >From 5210f643fed4a12d746a871ac0cc351381bff5fc Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Mon, 5 Sep 2022 16:59:31 +0800 Subject: [PATCH] net/hns3: fix Rx with PTP [ upstream commit 4ac14c1d961b27212f7af1c6441fa8f7ec594db9 ] The Rx and Tx vector algorithm of hns3 PMD don't support PTP function. Currently, hns3 driver uses 'pf->ptp_enable' to check whether PTP is enabled so as to not select Rx and Tx vector algorithm. And the variable is set when call rte_eth_timesync_enable(). Namely, it may not be set before selecting Rx/Tx function, let's say the case: set PTP offload in dev_configure(), do dev_start() and then call rte_eth_timesync_enable(). In this case, all PTP packets can not be received to application. So this patch fixes the check based on the RTE_ETH_RX_OFFLOAD_TIMESTAMP flag. Fixes: 3ca3dcd65101 ("net/hns3: fix vector Rx/Tx when PTP enabled") Signed-off-by: Huisong Li Signed-off-by: Dongdong Liu --- drivers/net/hns3/hns3_ptp.c | 1 - drivers/net/hns3/hns3_rxtx_vec.c | 20 +++++++++----------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/drivers/net/hns3/hns3_ptp.c b/drivers/net/hns3/hns3_ptp.c index 0b0061bba5..6bbd85ba23 100644 --- a/drivers/net/hns3/hns3_ptp.c +++ b/drivers/net/hns3/hns3_ptp.c @@ -126,5 +126,4 @@ hns3_timesync_enable(struct rte_eth_dev *dev) if (pf->ptp_enable) return 0; - hns3_warn(hw, "note: please ensure Rx/Tx burst mode is simple or common when enabling PTP!"); rte_spinlock_lock(&hw->lock); diff --git a/drivers/net/hns3/hns3_rxtx_vec.c b/drivers/net/hns3/hns3_rxtx_vec.c index 73f0ab6bc8..153866cf03 100644 --- a/drivers/net/hns3/hns3_rxtx_vec.c +++ b/drivers/net/hns3/hns3_rxtx_vec.c @@ -18,6 +18,5 @@ hns3_tx_check_vec_support(struct rte_eth_dev *dev) { struct rte_eth_txmode *txmode = &dev->data->dev_conf.txmode; - struct hns3_adapter *hns = dev->data->dev_private; - struct hns3_pf *pf = &hns->pf; + struct rte_eth_rxmode *rxmode = &dev->data->dev_conf.rxmode; /* Only support RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE */ @@ -25,6 +24,10 @@ hns3_tx_check_vec_support(struct rte_eth_dev *dev) return -ENOTSUP; - /* Vec is not supported when PTP enabled */ - if (pf->ptp_enable) + /* + * PTP function requires the cooperation of Rx and Tx. + * Tx vector isn't supported if RTE_ETH_RX_OFFLOAD_TIMESTAMP is set + * in Rx offloads. + */ + if (rxmode->offloads & RTE_ETH_RX_OFFLOAD_TIMESTAMP) return -ENOTSUP; @@ -234,7 +237,6 @@ hns3_rx_check_vec_support(struct rte_eth_dev *dev) struct rte_eth_rxmode *rxmode = &dev->data->dev_conf.rxmode; uint64_t offloads_mask = RTE_ETH_RX_OFFLOAD_TCP_LRO | - RTE_ETH_RX_OFFLOAD_VLAN; - struct hns3_adapter *hns = dev->data->dev_private; - struct hns3_pf *pf = &hns->pf; + RTE_ETH_RX_OFFLOAD_VLAN | + RTE_ETH_RX_OFFLOAD_TIMESTAMP; if (dev->data->scattered_rx) @@ -250,8 +252,4 @@ hns3_rx_check_vec_support(struct rte_eth_dev *dev) return -ENOTSUP; - /* Vec is not supported when PTP enabled */ - if (pf->ptp_enable) - return -ENOTSUP; - return 0; } -- 2.37.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-10-25 14:19:00.687252841 +0100 +++ 0095-net-hns3-fix-Rx-with-PTP.patch 2022-10-25 14:18:58.537798542 +0100 @@ -1 +1 @@ -From 4ac14c1d961b27212f7af1c6441fa8f7ec594db9 Mon Sep 17 00:00:00 2001 +From 5210f643fed4a12d746a871ac0cc351381bff5fc Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 4ac14c1d961b27212f7af1c6441fa8f7ec594db9 ] + @@ -17 +18,0 @@ -Cc: stable@dpdk.org @@ -37 +38 @@ -index 0dd6fccb13..cd9264d91b 100644 +index 73f0ab6bc8..153866cf03 100644 @@ -61 +62 @@ -@@ -233,7 +236,6 @@ hns3_rx_check_vec_support(struct rte_eth_dev *dev) +@@ -234,7 +237,6 @@ hns3_rx_check_vec_support(struct rte_eth_dev *dev) @@ -71 +72 @@ -@@ -246,8 +248,4 @@ hns3_rx_check_vec_support(struct rte_eth_dev *dev) +@@ -250,8 +252,4 @@ hns3_rx_check_vec_support(struct rte_eth_dev *dev)