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 BE8AEA034E for ; Mon, 21 Feb 2022 16:39:05 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B92A3410F7; Mon, 21 Feb 2022 16:39:05 +0100 (CET) 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 1DDEC4013F for ; Mon, 21 Feb 2022 16:39:05 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645457944; 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=RVhfwNml+9iFsR3L7c7IIC/1mq7R7QDPsUyUZ2lgar4=; b=PkTX7zc1cEoeyTPH6sTJ5T6mXPU6CDx05gbymMyUmGVnnPKcXLuf09KzQumsQXjVnRk+AV Q5yUH6QfpCJA68HsWoLFIB2UhSh7OUb0wV+JsomHtVJf6ylsK8VUCJ5Ps0pM5gEbZ+bXO1 +P4BIpniOy8NKV00uJUueLvOGvkmogQ= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-36-pA87uPvPNauU_D9DHNsM4g-1; Mon, 21 Feb 2022 10:39:01 -0500 X-MC-Unique: pA87uPvPNauU_D9DHNsM4g-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 67186801ADB; Mon, 21 Feb 2022 15:39:00 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5AE6D78DDE; Mon, 21 Feb 2022 15:38:59 +0000 (UTC) From: Kevin Traynor To: Vanshika Shukla Cc: Hemant Agrawal , dpdk stable Subject: patch 'net/dpaa2: fix timestamping for IEEE1588' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:34:25 +0000 Message-Id: <20220221153625.152324-76-ktraynor@redhat.com> In-Reply-To: <20220221153625.152324-1-ktraynor@redhat.com> References: <20220221153625.152324-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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.1 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/26/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/279f0d75c023b8c257f77ed7cb5a62773afdf29e Thanks. Kevin --- >From 279f0d75c023b8c257f77ed7cb5a62773afdf29e 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, 37 insertions(+), 12 deletions(-) diff --git a/drivers/net/dpaa2/dpaa2_ethdev.h b/drivers/net/dpaa2/dpaa2_ethdev.h index e27239e256..fd4eabed4e 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.h +++ b/drivers/net/dpaa2/dpaa2_ethdev.h @@ -63,5 +63,5 @@ #define DPAA2_RX_TAILDROP_OFF 0x04 /* Tx confirmation enabled */ -#define DPAA2_TX_CONF_ENABLE 0x08 +#define DPAA2_TX_CONF_ENABLE 0x06 #define DPAA2_RSS_OFFLOAD_ALL ( \ diff --git a/drivers/net/dpaa2/dpaa2_ptp.c b/drivers/net/dpaa2/dpaa2_ptp.c index 8d79e39244..3a4536dd69 100644 --- a/drivers/net/dpaa2/dpaa2_ptp.c +++ b/drivers/net/dpaa2/dpaa2_ptp.c @@ -112,8 +112,10 @@ 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); diff --git a/drivers/net/dpaa2/dpaa2_rxtx.c b/drivers/net/dpaa2/dpaa2_rxtx.c index 90b971b4bf..9fb6c5f91d 100644 --- a/drivers/net/dpaa2/dpaa2_rxtx.c +++ b/drivers/net/dpaa2/dpaa2_rxtx.c @@ -141,6 +141,8 @@ dpaa2_dev_rx_parse_slow(struct rte_mbuf *mbuf, #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 |= RTE_MBUF_F_RX_IEEE1588_PTP; + mbuf->ol_flags |= RTE_MBUF_F_RX_IEEE1588_TMST; + } #endif @@ -770,5 +772,8 @@ dpaa2_dev_prefetch_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) - 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 @@ -987,4 +992,11 @@ dpaa2_dev_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) 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 & RTE_ETH_RX_OFFLOAD_VLAN_STRIP) { @@ -1022,4 +1034,6 @@ uint16_t dpaa2_dev_tx_conf(void *queue) struct dpaa2_dev_priv *priv = eth_data->dev_private; struct dpaa2_annot_hdr *annotation; + void *v_addr; + struct rte_mbuf *mbuf; #endif @@ -1106,8 +1120,14 @@ uint16_t dpaa2_dev_tx_conf(void *queue) 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); @@ -1185,6 +1205,9 @@ dpaa2_dev_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) * 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 -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:46.297740475 +0000 +++ 0076-net-dpaa2-fix-timestamping-for-IEEE1588.patch 2022-02-21 15:22:44.166704294 +0000 @@ -1 +1 @@ -From 90762e5cb8154bb437618f81488ac92a24455521 Mon Sep 17 00:00:00 2001 +From 279f0d75c023b8c257f77ed7cb5a62773afdf29e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 90762e5cb8154bb437618f81488ac92a24455521 ] + @@ -19 +20,0 @@ -Cc: stable@dpdk.org