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 76507A0032 for ; Fri, 18 Feb 2022 13:41:50 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7121141140; Fri, 18 Feb 2022 13:41:50 +0100 (CET) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mails.dpdk.org (Postfix) with ESMTP id 487A940E2D for ; Fri, 18 Feb 2022 13:41:49 +0100 (CET) Received: by mail-wr1-f41.google.com with SMTP id x5so9528990wrg.13 for ; Fri, 18 Feb 2022 04:41:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mTFi6+m/gEBa710l32M+fVUIxhQi/YEVi6C3g9zb6H4=; b=Ho0ASAp4cZqWtgdcl4ZIP+0bF49Ka/7l+63ObxMV9N9lCX0Wu7cnIyhPT+8OTVPx9k zcJ/F5gVUTbWsQT3yJnJCDLgY8U4iYXMf4KIt40yMoSMPYENG3froJY8prlM97nHsSxZ IXqbHk7HvibG8RHoeSkqsdM00QoCJ1X/uV2Bfqya/4VpYmeaNEkys66dnTx5MqH284EJ BYXQ92Rw9zCitQSIuPBsnV0QdW7Cl74oh/g7Ef+X98nLst05us3Nzpein1oS9RKMz9g9 2JLStWb+Ho//exHd5+q7o9XHaJWDK4VLICNahvAPGKf7nfTSokVIBm63jzZkOyhYEzop KQRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mTFi6+m/gEBa710l32M+fVUIxhQi/YEVi6C3g9zb6H4=; b=j26WRa+GYKPSe34L988NqQXE/Hl4+tVwNLccyIJb/9j6VhX+zkFvm7wFh/yq3zgPS4 IbtnAdhH16/AEmFpG/6bhIHgqXdauGJuOuP+zBD6zO279IKrxh8tcG98MB7LVLnl1N+v QXODrDDTD5DeHA/k6fFhePZ9WN4nMAtegR4iqovGIo/RjosDMClJsRxkSSQuxYgPKV+0 OyL05iaVOdqPlThrOdzdk+BM/H4+pxHL33/3ArpBaATA92EMoL3mP8j30SbKyVPeypq6 EAJzQuEBrFNb/jgTCqdB/xvngKllTCYpytl1fJF4emk3a7Fd2TJSYPAMzyDjq51GQGYm FAZQ== X-Gm-Message-State: AOAM531UYtxEDEG/XhuJPSKh0+Zeji1a67qb6uu+amz/xd4KJyz4QgIq hBn5DgkBl2HqUJQgfgytFK5KRDjmqZW4XA1D X-Google-Smtp-Source: ABdhPJyqRzAPApNoIxFHw2SGF1hFUy3KgXhCVluTfWOjBzFf85+VE46+VFQ9OiN/hHof8E9je8oV5Q== X-Received: by 2002:a5d:6482:0:b0:1e8:330e:e442 with SMTP id o2-20020a5d6482000000b001e8330ee442mr6050406wri.107.1645188108910; Fri, 18 Feb 2022 04:41:48 -0800 (PST) Received: from localhost ([2a01:4b00:f41a:3600:360b:9754:2e3a:c344]) by smtp.gmail.com with ESMTPSA id v5sm21487653wrr.7.2022.02.18.04.41.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Feb 2022 04:41:48 -0800 (PST) From: luca.boccassi@gmail.com To: Vanshika Shukla Cc: Hemant Agrawal , dpdk stable Subject: patch 'net/dpaa2: fix timestamping for IEEE1588' has been queued to stable release 20.11.5 Date: Fri, 18 Feb 2022 12:38:13 +0000 Message-Id: <20220218123931.1749595-44-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220218123931.1749595-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-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 20.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 02/20/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/1d10966a22caf15f3b61e986becbeccdb2f03b33 Thanks. Luca Boccassi --- >From 1d10966a22caf15f3b61e986becbeccdb2f03b33 Mon Sep 17 00:00:00 2001 From: Vanshika Shukla Date: Mon, 3 Jan 2022 15:31:19 +0530 Subject: [PATCH] net/dpaa2: fix timestamping for IEEE1588 [ upstream commit 90762e5cb8154bb437618f81488ac92a24455521 ] The current implementation of DPAA2 driver code is such that it records Rx and Tx timestamp for PTP without checking if they are PTP packets or not. Packets for which RTE_MBUF_F_RX_IEEE1588_TMST and RTE_MBUF_F_TX_IEEE1588_TMST is not set, Rx and Tx timestamp should not be recorded. This patch fixes this issue by checking if the required flags are set in the mbuf before recording timestamps. Also this change defines separate values for DPAA2_TX_CONF_ENABLE and DPAA2_NO_PREFETCH_RX Fixes: e806bf878c17 ("net/dpaa2: support timestamp") Signed-off-by: Vanshika Shukla Acked-by: Hemant Agrawal --- drivers/net/dpaa2/dpaa2_ethdev.h | 2 ++ drivers/net/dpaa2/dpaa2_ptp.c | 8 ++++--- drivers/net/dpaa2/dpaa2_rxtx.c | 39 +++++++++++++++++++++++++------- 3 files changed, 38 insertions(+), 11 deletions(-) diff --git a/drivers/net/dpaa2/dpaa2_ethdev.h b/drivers/net/dpaa2/dpaa2_ethdev.h index 0a8a4599c2..203d03d272 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.h +++ b/drivers/net/dpaa2/dpaa2_ethdev.h @@ -59,6 +59,8 @@ /* Disable RX tail drop, default is enable */ #define DPAA2_RX_TAILDROP_OFF 0x04 +/* Tx confirmation enabled */ +#define DPAA2_TX_CONF_ENABLE 0x06 #define DPAA2_RSS_OFFLOAD_ALL ( \ ETH_RSS_L2_PAYLOAD | \ diff --git a/drivers/net/dpaa2/dpaa2_ptp.c b/drivers/net/dpaa2/dpaa2_ptp.c index 899dd5d442..26a037acd4 100644 --- a/drivers/net/dpaa2/dpaa2_ptp.c +++ b/drivers/net/dpaa2/dpaa2_ptp.c @@ -111,10 +111,12 @@ int dpaa2_timesync_read_tx_timestamp(struct rte_eth_dev *dev, { struct dpaa2_dev_priv *priv = dev->data->dev_private; - if (priv->next_tx_conf_queue) - dpaa2_dev_tx_conf(priv->next_tx_conf_queue); - else + if (priv->next_tx_conf_queue) { + while (!priv->tx_timestamp) + dpaa2_dev_tx_conf(priv->next_tx_conf_queue); + } else { return -1; + } *timestamp = rte_ns_to_timespec(priv->tx_timestamp); return 0; diff --git a/drivers/net/dpaa2/dpaa2_rxtx.c b/drivers/net/dpaa2/dpaa2_rxtx.c index 06f01dfc08..ecd004f9fa 100644 --- a/drivers/net/dpaa2/dpaa2_rxtx.c +++ b/drivers/net/dpaa2/dpaa2_rxtx.c @@ -139,8 +139,10 @@ dpaa2_dev_rx_parse_slow(struct rte_mbuf *mbuf, annotation->word3, annotation->word4); #if defined(RTE_LIBRTE_IEEE1588) - if (BIT_ISSET_AT_POS(annotation->word1, DPAA2_ETH_FAS_PTP)) + if (BIT_ISSET_AT_POS(annotation->word1, DPAA2_ETH_FAS_PTP)) { mbuf->ol_flags |= PKT_RX_IEEE1588_PTP; + mbuf->ol_flags |= PKT_RX_IEEE1588_TMST; + } #endif if (BIT_ISSET_AT_POS(annotation->word3, L2_VLAN_1_PRESENT)) { @@ -640,7 +642,10 @@ dpaa2_dev_prefetch_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) else bufs[num_rx] = eth_fd_to_mbuf(fd, eth_data->port_id); #if defined(RTE_LIBRTE_IEEE1588) - priv->rx_timestamp = *dpaa2_timestamp_dynfield(bufs[num_rx]); + if (bufs[num_rx]->ol_flags & PKT_RX_IEEE1588_TMST) { + priv->rx_timestamp = + *dpaa2_timestamp_dynfield(bufs[num_rx]); + } #endif if (eth_data->dev_conf.rxmode.offloads & @@ -853,6 +858,13 @@ dpaa2_dev_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) bufs[num_rx] = eth_fd_to_mbuf(fd, eth_data->port_id); +#if defined(RTE_LIBRTE_IEEE1588) + if (bufs[num_rx]->ol_flags & PKT_RX_IEEE1588_TMST) { + priv->rx_timestamp = + *dpaa2_timestamp_dynfield(bufs[num_rx]); + } +#endif + if (eth_data->dev_conf.rxmode.offloads & DEV_RX_OFFLOAD_VLAN_STRIP) { rte_vlan_strip(bufs[num_rx]); @@ -888,6 +900,8 @@ uint16_t dpaa2_dev_tx_conf(void *queue) struct rte_eth_dev_data *eth_data = dpaa2_q->eth_data; struct dpaa2_dev_priv *priv = eth_data->dev_private; struct dpaa2_annot_hdr *annotation; + void *v_addr; + struct rte_mbuf *mbuf; #endif if (unlikely(!DPAA2_PER_LCORE_DPIO)) { @@ -972,10 +986,16 @@ uint16_t dpaa2_dev_tx_conf(void *queue) num_tx_conf++; num_pulled++; #if defined(RTE_LIBRTE_IEEE1588) - annotation = (struct dpaa2_annot_hdr *)((size_t) - DPAA2_IOVA_TO_VADDR(DPAA2_GET_FD_ADDR(fd)) + - DPAA2_FD_PTA_SIZE); - priv->tx_timestamp = annotation->word2; + v_addr = DPAA2_IOVA_TO_VADDR(DPAA2_GET_FD_ADDR(fd)); + mbuf = DPAA2_INLINE_MBUF_FROM_BUF(v_addr, + rte_dpaa2_bpid_info[DPAA2_GET_FD_BPID(fd)].meta_data_size); + + if (mbuf->ol_flags & PKT_TX_IEEE1588_TMST) { + annotation = (struct dpaa2_annot_hdr *)((size_t) + DPAA2_IOVA_TO_VADDR(DPAA2_GET_FD_ADDR(fd)) + + DPAA2_FD_PTA_SIZE); + priv->tx_timestamp = annotation->word2; + } #endif } while (pending); @@ -1050,8 +1070,11 @@ dpaa2_dev_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) * corresponding to last packet transmitted for reading * the timestamp */ - priv->next_tx_conf_queue = dpaa2_q->tx_conf_queue; - dpaa2_dev_tx_conf(dpaa2_q->tx_conf_queue); + if ((*bufs)->ol_flags & PKT_TX_IEEE1588_TMST) { + priv->next_tx_conf_queue = dpaa2_q->tx_conf_queue; + dpaa2_dev_tx_conf(dpaa2_q->tx_conf_queue); + priv->tx_timestamp = 0; + } #endif /*Prepare enqueue descriptor*/ -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-18 12:37:39.780297289 +0000 +++ 0044-net-dpaa2-fix-timestamping-for-IEEE1588.patch 2022-02-18 12:37:37.654791116 +0000 @@ -1 +1 @@ -From 90762e5cb8154bb437618f81488ac92a24455521 Mon Sep 17 00:00:00 2001 +From 1d10966a22caf15f3b61e986becbeccdb2f03b33 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 90762e5cb8154bb437618f81488ac92a24455521 ] + @@ -19 +20,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ - drivers/net/dpaa2/dpaa2_ethdev.h | 2 +- + drivers/net/dpaa2/dpaa2_ethdev.h | 2 ++ @@ -27 +28 @@ - 3 files changed, 37 insertions(+), 12 deletions(-) + 3 files changed, 38 insertions(+), 11 deletions(-) @@ -30 +31 @@ -index e27239e256..fd4eabed4e 100644 +index 0a8a4599c2..203d03d272 100644 @@ -33 +34,2 @@ -@@ -62,7 +62,7 @@ +@@ -59,6 +59,8 @@ + @@ -36,2 +38 @@ - /* Tx confirmation enabled */ --#define DPAA2_TX_CONF_ENABLE 0x08 ++/* Tx confirmation enabled */ @@ -41 +42 @@ - RTE_ETH_RSS_L2_PAYLOAD | \ + ETH_RSS_L2_PAYLOAD | \ @@ -43 +44 @@ -index 8d79e39244..3a4536dd69 100644 +index 899dd5d442..26a037acd4 100644 @@ -63 +64 @@ -index 90b971b4bf..9fb6c5f91d 100644 +index 06f01dfc08..ecd004f9fa 100644 @@ -66 +67 @@ -@@ -140,8 +140,10 @@ dpaa2_dev_rx_parse_slow(struct rte_mbuf *mbuf, +@@ -139,8 +139,10 @@ dpaa2_dev_rx_parse_slow(struct rte_mbuf *mbuf, @@ -72,2 +73,2 @@ - mbuf->ol_flags |= RTE_MBUF_F_RX_IEEE1588_PTP; -+ mbuf->ol_flags |= RTE_MBUF_F_RX_IEEE1588_TMST; + mbuf->ol_flags |= PKT_RX_IEEE1588_PTP; ++ mbuf->ol_flags |= PKT_RX_IEEE1588_TMST; @@ -78 +79 @@ -@@ -769,7 +771,10 @@ dpaa2_dev_prefetch_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) +@@ -640,7 +642,10 @@ dpaa2_dev_prefetch_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) @@ -90 +91 @@ -@@ -986,6 +991,13 @@ dpaa2_dev_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) +@@ -853,6 +858,13 @@ dpaa2_dev_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) @@ -102 +103 @@ - RTE_ETH_RX_OFFLOAD_VLAN_STRIP) { + DEV_RX_OFFLOAD_VLAN_STRIP) { @@ -104 +105 @@ -@@ -1021,6 +1033,8 @@ uint16_t dpaa2_dev_tx_conf(void *queue) +@@ -888,6 +900,8 @@ uint16_t dpaa2_dev_tx_conf(void *queue) @@ -113 +114 @@ -@@ -1105,10 +1119,16 @@ uint16_t dpaa2_dev_tx_conf(void *queue) +@@ -972,10 +986,16 @@ uint16_t dpaa2_dev_tx_conf(void *queue) @@ -134 +135 @@ -@@ -1184,8 +1204,11 @@ dpaa2_dev_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) +@@ -1050,8 +1070,11 @@ dpaa2_dev_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)