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 0BC42A0566; Mon, 8 Mar 2021 23:30:00 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8855222A503; Mon, 8 Mar 2021 23:29:40 +0100 (CET) Received: from mail-qv1-f48.google.com (mail-qv1-f48.google.com [209.85.219.48]) by mails.dpdk.org (Postfix) with ESMTP id 559A822A505 for ; Mon, 8 Mar 2021 23:29:38 +0100 (CET) Received: by mail-qv1-f48.google.com with SMTP id k7so5464588qvo.6 for ; Mon, 08 Mar 2021 14:29:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=atomicrules-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=77nZGHOwmZeTKBNp/JhIIrDzIWU7Eqc1qdMKZACbvWA=; b=tjWrk3+nSWfZjT8uIIfD/31O828FIQ3MS3R0a/RqT3UM7UNnlFhRR8/L4XiMzSVIND QwmMwM/Rt1xAgNH3o8t/B9VvyDh4se06tWCC2VkyuRnMXccbHxkExIvjvLPlMFH9KYdk +QAuk2yf9eTAhmWduvwYmqVQ7ssHJX0edM3jVM80QlG+wMuU3kHehqjZN+jQTacPbz6R fbE8FTaE1wE7uxjliJ9YDkb7AxVOCNTbz7vlComrNlh+nB97HZJVJzX2Zt8zCgCxbfh6 Xc6Nzj5V8xbyzLigXD4gosdT8TM6mGC7CkXnGgGpwz1TBlgjgVSk08A5iKRySinVCRTa 0Amw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=77nZGHOwmZeTKBNp/JhIIrDzIWU7Eqc1qdMKZACbvWA=; b=sWfWOm1LhdNZeaVPf2VZNRLNtDehIM0AeGq2zI1kCQ1Rlg3QbHrrCMtQ4Lj5ewvNWO Rhce+QxutfKIebFhDkkzx+bfoc5zWzdheHXIbbuVK76658tDmObrcChL7rckQSWVOxQf raDkvVG55pnpz4kWH6kJUFTXtJeWNGQ+TWFMaFu6qtcDCB78LimvaVv2U2AQ+yj7T7OX Pq3TTMM0vsKjViiaGCBtzWfrIK4vhmpxBKOnauSYnMNqb42m3y/CfgSvSzIow/oJZSHR ozHrWBnY1i07FmW5uC7cL27Fzq/wnUzYUTKPomr1aAA33GTfJwvb4c9NVm8HqbTxqcZz XaOw== X-Gm-Message-State: AOAM532SNI8Zru4nGwzi8vRtiH7Z9EeqmE+AC5piGMev6Bl9/0ZKBsN5 t4TkjFVPgk3vu581POyjcR6MQYfS2ZekkQ== X-Google-Smtp-Source: ABdhPJzRSVAnDrElgV0ioMDfMcQ+5gmSp+4vOJRhVYqWAWuTJiTfW2dZJeWLvTBGvA8LWstpsQnerg== X-Received: by 2002:ad4:558b:: with SMTP id e11mr22503385qvx.59.1615242577213; Mon, 08 Mar 2021 14:29:37 -0800 (PST) Received: from z390.czeck.local (pool-72-74-133-40.bstnma.fios.verizon.net. [72.74.133.40]) by smtp.gmail.com with ESMTPSA id z188sm8892774qkb.40.2021.03.08.14.29.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Mar 2021 14:29:36 -0800 (PST) From: Ed Czeck To: dev@dpdk.org, ferruh.yigit@intel.com Cc: shepard.siegel@atomicrules.com, john.miller@atomicrules.com Date: Mon, 8 Mar 2021 17:29:20 -0500 Message-Id: <20210308222922.30667-4-ed.czeck@atomicrules.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210308222922.30667-1-ed.czeck@atomicrules.com> References: <20210304165637.24658-1-ed.czeck@atomicrules.com> <20210308222922.30667-1-ed.czeck@atomicrules.com> Subject: [dpdk-dev] [PATCH v3 4/6] net/ark: generalize meta data between FPGA and PMD X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" In this commit we generalize the movement of user-specified meta data between mbufs and FPGA AXIS tuser fields using user-defined hook functions. - Previous use of PMD dynfields are removed - Hook function added to ark_user_ext - Add hook function calls in Rx and Tx paths Signed-off-by: Ed Czeck --- v3: - split function rename to separate commit --- drivers/net/ark/ark_ethdev.c | 58 ++--------------- drivers/net/ark/ark_ethdev_rx.c | 27 +++++--- drivers/net/ark/ark_ethdev_rx.h | 3 - drivers/net/ark/ark_ethdev_tx.c | 23 ++++--- drivers/net/ark/ark_global.h | 20 ++++++ drivers/net/ark/ark_udm.h | 5 +- drivers/net/ark/rte_pmd_ark.h | 112 -------------------------------- drivers/net/ark/version.map | 7 -- 8 files changed, 61 insertions(+), 194 deletions(-) diff --git a/drivers/net/ark/ark_ethdev.c b/drivers/net/ark/ark_ethdev.c index 9f0a8d9e8..15ec83893 100644 --- a/drivers/net/ark/ark_ethdev.c +++ b/drivers/net/ark/ark_ethdev.c @@ -79,12 +79,6 @@ static int eth_ark_set_mtu(struct rte_eth_dev *dev, uint16_t size); #define ARK_TX_MAX_QUEUE (4096 * 4) #define ARK_TX_MIN_QUEUE (256) -uint64_t ark_timestamp_rx_dynflag; -int ark_timestamp_dynfield_offset = -1; - -int rte_pmd_ark_rx_userdata_dynfield_offset = -1; -int rte_pmd_ark_tx_userdata_dynfield_offset = -1; - static const char * const valid_arguments[] = { ARK_PKTGEN_ARG, ARK_PKTCHKR_ARG, @@ -243,6 +237,12 @@ check_for_ext(struct ark_adapter *ark) (int (*)(struct rte_eth_dev *, uint16_t, void *)) dlsym(ark->d_handle, "set_mtu"); + ark->user_ext.rx_user_meta_hook = + (rx_user_meta_hook_fn)dlsym(ark->d_handle, + "rte_pmd_ark_rx_user_meta_hook"); + ark->user_ext.tx_user_meta_hook = + (tx_user_meta_hook_fn)dlsym(ark->d_handle, + "rte_pmd_ark_tx_user_meta_hook"); return found; } @@ -255,16 +255,6 @@ eth_ark_dev_init(struct rte_eth_dev *dev) int ret; int port_count = 1; int p; - static const struct rte_mbuf_dynfield ark_tx_userdata_dynfield_desc = { - .name = RTE_PMD_ARK_TX_USERDATA_DYNFIELD_NAME, - .size = sizeof(rte_pmd_ark_tx_userdata_t), - .align = __alignof__(rte_pmd_ark_tx_userdata_t), - }; - static const struct rte_mbuf_dynfield ark_rx_userdata_dynfield_desc = { - .name = RTE_PMD_ARK_RX_USERDATA_DYNFIELD_NAME, - .size = sizeof(rte_pmd_ark_rx_userdata_t), - .align = __alignof__(rte_pmd_ark_rx_userdata_t), - }; ark->eth_dev = dev; @@ -275,30 +265,6 @@ eth_ark_dev_init(struct rte_eth_dev *dev) if (ret) return ret; - /* Extra mbuf fields for user data */ - if (RTE_PMD_ARK_TX_USERDATA_ENABLE) { - rte_pmd_ark_tx_userdata_dynfield_offset = - rte_mbuf_dynfield_register(&ark_tx_userdata_dynfield_desc); - if (rte_pmd_ark_tx_userdata_dynfield_offset < 0) { - ARK_PMD_LOG(ERR, - "Failed to register mbuf field for tx userdata\n"); - return -rte_errno; - } - ARK_PMD_LOG(INFO, "Registered TX-meta dynamic field at %d\n", - rte_pmd_ark_tx_userdata_dynfield_offset); - } - if (RTE_PMD_ARK_RX_USERDATA_ENABLE) { - rte_pmd_ark_rx_userdata_dynfield_offset = - rte_mbuf_dynfield_register(&ark_rx_userdata_dynfield_desc); - if (rte_pmd_ark_rx_userdata_dynfield_offset < 0) { - ARK_PMD_LOG(ERR, - "Failed to register mbuf field for rx userdata\n"); - return -rte_errno; - } - ARK_PMD_LOG(INFO, "Registered RX-meta dynamic field at %d\n", - rte_pmd_ark_rx_userdata_dynfield_offset); - } - pci_dev = RTE_ETH_DEV_TO_PCI(dev); rte_eth_copy_pci_info(dev, pci_dev); dev->data->dev_flags |= RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS; @@ -559,18 +525,6 @@ static int eth_ark_dev_configure(struct rte_eth_dev *dev) { struct ark_adapter *ark = dev->data->dev_private; - int ret; - - if (dev->data->dev_conf.rxmode.offloads & DEV_RX_OFFLOAD_TIMESTAMP) { - ret = rte_mbuf_dyn_rx_timestamp_register( - &ark_timestamp_dynfield_offset, - &ark_timestamp_rx_dynflag); - if (ret != 0) { - ARK_PMD_LOG(ERR, - "Failed to register Rx timestamp field/flag\n"); - return -rte_errno; - } - } eth_ark_dev_set_link_up(dev); if (ark->user_ext.dev_configure) diff --git a/drivers/net/ark/ark_ethdev_rx.c b/drivers/net/ark/ark_ethdev_rx.c index 21a9af41a..48ea48404 100644 --- a/drivers/net/ark/ark_ethdev_rx.c +++ b/drivers/net/ark/ark_ethdev_rx.c @@ -39,6 +39,9 @@ struct ark_rx_queue { struct ark_udm_t *udm; struct ark_mpu_t *mpu; + rx_user_meta_hook_fn rx_user_meta_hook; + void *ext_user_data; + uint32_t queue_size; uint32_t queue_mask; @@ -53,8 +56,7 @@ struct ark_rx_queue { uint32_t unused; - /* separate cache line */ - /* second cache line - fields only used in slow path */ + /* next cache line - fields written by device */ RTE_MARKER cacheline1 __rte_cache_min_aligned; volatile uint32_t prod_index; /* step 2 filled by FPGA */ @@ -167,6 +169,8 @@ eth_ark_dev_rx_queue_setup(struct rte_eth_dev *dev, queue->queue_index = queue_idx; queue->queue_size = nb_desc; queue->queue_mask = nb_desc - 1; + queue->rx_user_meta_hook = ark->user_ext.rx_user_meta_hook; + queue->ext_user_data = ark->user_data[dev->data->port_id]; queue->reserve_q = rte_zmalloc_socket("Ark_rx_queue mbuf", @@ -243,8 +247,11 @@ eth_ark_recv_pkts(void *rx_queue, struct ark_rx_queue *queue; register uint32_t cons_index, prod_index; uint16_t nb; + uint16_t i; struct rte_mbuf *mbuf; + struct rte_mbuf **pmbuf; struct ark_rx_meta *meta; + rx_user_meta_hook_fn rx_user_meta_hook; queue = (struct ark_rx_queue *)rx_queue; if (unlikely(queue == 0)) @@ -253,6 +260,8 @@ eth_ark_recv_pkts(void *rx_queue, return 0; prod_index = queue->prod_index; cons_index = queue->cons_index; + if (prod_index == cons_index) + return 0; nb = 0; while (prod_index != cons_index) { @@ -266,13 +275,6 @@ eth_ark_recv_pkts(void *rx_queue, mbuf->pkt_len = meta->pkt_len; mbuf->data_len = meta->pkt_len; - /* set timestamp if enabled at least on one device */ - if (ark_timestamp_rx_dynflag > 0) { - *RTE_MBUF_DYNFIELD(mbuf, ark_timestamp_dynfield_offset, - rte_mbuf_timestamp_t *) = meta->timestamp; - mbuf->ol_flags |= ark_timestamp_rx_dynflag; - } - rte_pmd_ark_mbuf_rx_userdata_set(mbuf, meta->user_data); if (ARK_DEBUG_CORE) { /* debug sanity checks */ if ((meta->pkt_len > (1024 * 16)) || @@ -315,6 +317,13 @@ eth_ark_recv_pkts(void *rx_queue, break; } + rx_user_meta_hook = queue->rx_user_meta_hook; + for (pmbuf = rx_pkts, i = 0; rx_user_meta_hook && i < nb; i++) { + mbuf = *pmbuf++; + meta = RTE_PTR_ADD(mbuf->buf_addr, ARK_RX_META_OFFSET); + rx_user_meta_hook(mbuf, meta->user_meta, queue->ext_user_data); + } + eth_ark_rx_update_cons_index(queue, cons_index); return nb; diff --git a/drivers/net/ark/ark_ethdev_rx.h b/drivers/net/ark/ark_ethdev_rx.h index 33c1f2c95..c8dc340a8 100644 --- a/drivers/net/ark/ark_ethdev_rx.h +++ b/drivers/net/ark/ark_ethdev_rx.h @@ -11,9 +11,6 @@ #include #include -extern uint64_t ark_timestamp_rx_dynflag; -extern int ark_timestamp_dynfield_offset; - int eth_ark_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, uint16_t nb_desc, diff --git a/drivers/net/ark/ark_ethdev_tx.c b/drivers/net/ark/ark_ethdev_tx.c index 00e5dbf7c..d6e8345b2 100644 --- a/drivers/net/ark/ark_ethdev_tx.c +++ b/drivers/net/ark/ark_ethdev_tx.c @@ -33,6 +33,9 @@ struct ark_tx_queue { /* Stats HW tracks bytes and packets, need to count send errors */ uint64_t tx_errors; + tx_user_meta_hook_fn tx_user_meta_hook; + void *ext_user_data; + uint32_t queue_size; uint32_t queue_mask; @@ -45,9 +48,7 @@ struct ark_tx_queue { /* The queue Index within the dpdk device structures */ uint16_t queue_index; - uint32_t pad[1]; - - /* second cache line - fields written by device */ + /* next cache line - fields written by device */ RTE_MARKER cacheline1 __rte_cache_min_aligned; volatile int32_t cons_index; /* hw is done, can be freed */ } __rte_cache_aligned; @@ -120,15 +121,17 @@ eth_ark_xmit_pkts(void *vtxq, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) { struct ark_tx_queue *queue; struct rte_mbuf *mbuf; - uint32_t user_meta; + uint32_t user_meta[5]; int stat; int32_t prod_index_limit; uint16_t nb; - uint8_t user_len = 1; + uint8_t user_len = 0; const uint32_t min_pkt_len = ARK_MIN_TX_PKTLEN; + tx_user_meta_hook_fn tx_user_meta_hook; queue = (struct ark_tx_queue *)vtxq; + tx_user_meta_hook = queue->tx_user_meta_hook; /* free any packets after the HW is done with them */ free_completed_tx(queue); @@ -163,16 +166,18 @@ eth_ark_xmit_pkts(void *vtxq, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) memset(appended, 0, to_add); } - user_meta = rte_pmd_ark_mbuf_tx_userdata_get(mbuf); + if (tx_user_meta_hook) + tx_user_meta_hook(mbuf, user_meta, &user_len, + queue->ext_user_data); if (unlikely(mbuf->nb_segs != 1)) { stat = eth_ark_tx_jumbo(queue, mbuf, - &user_meta, user_len); + user_meta, user_len); if (unlikely(stat != 0)) break; /* Queue is full */ } else { eth_ark_tx_desc_fill(queue, mbuf, ARK_DDM_SOP | ARK_DDM_EOP, - &user_meta, user_len); + user_meta, user_len); } } @@ -271,6 +276,8 @@ eth_ark_tx_queue_setup(struct rte_eth_dev *dev, queue->phys_qid = qidx; queue->queue_index = queue_idx; dev->data->tx_queues[queue_idx] = queue; + queue->tx_user_meta_hook = ark->user_ext.tx_user_meta_hook; + queue->ext_user_data = ark->user_data[dev->data->port_id]; queue->meta_q = rte_zmalloc_socket("Ark_txqueue meta", diff --git a/drivers/net/ark/ark_global.h b/drivers/net/ark/ark_global.h index 91726ecc2..6f9b3013d 100644 --- a/drivers/net/ark/ark_global.h +++ b/drivers/net/ark/ark_global.h @@ -57,6 +57,23 @@ void *v; \ } name + +/* Extension hooks for extraction and placement of user meta data + * during RX an TX operations. These functions are the bridge + * between the mbuf struct and the tuser fields on the AXIS + * interfaces in the FPGA + */ +/* RX hook populates mbuf fields from user defined *meta up to 20 bytes */ +typedef void (*rx_user_meta_hook_fn)(struct rte_mbuf *mbuf, + const uint32_t *meta, + void *ext_user_data); +/* TX hook poplulate *meta, with up to 20 bytes. meta_cnt + * returns the number of uint32_t words populated, 0 to 5 + */ +typedef void (*tx_user_meta_hook_fn)(const struct rte_mbuf *mbuf, + uint32_t *meta, uint8_t *meta_cnt, + void *ext_user_data); + struct ark_user_ext { void *(*dev_init)(struct rte_eth_dev *, void *abar, int port_id); void (*dev_uninit)(struct rte_eth_dev *, void *); @@ -79,6 +96,9 @@ struct ark_user_ext { void (*mac_addr_set)(struct rte_eth_dev *, struct rte_ether_addr *, void *); int (*set_mtu)(struct rte_eth_dev *, uint16_t, void *); + /* user meta, hook functions */ + rx_user_meta_hook_fn rx_user_meta_hook; + tx_user_meta_hook_fn tx_user_meta_hook; }; struct ark_adapter { diff --git a/drivers/net/ark/ark_udm.h b/drivers/net/ark/ark_udm.h index ea92d4b6e..4e51a5e82 100644 --- a/drivers/net/ark/ark_udm.h +++ b/drivers/net/ark/ark_udm.h @@ -19,9 +19,8 @@ * -- 32 bytes */ struct ark_rx_meta { - uint64_t timestamp; - uint64_t user_data; - uint8_t reserved[14]; + uint32_t user_meta[5]; /* user defined based on fpga code */ + uint8_t reserved[10]; uint16_t pkt_len; } __rte_packed; diff --git a/drivers/net/ark/rte_pmd_ark.h b/drivers/net/ark/rte_pmd_ark.h index 6f26d66b1..a77dd311f 100644 --- a/drivers/net/ark/rte_pmd_ark.h +++ b/drivers/net/ark/rte_pmd_ark.h @@ -10,116 +10,4 @@ * ARK driver-specific API */ -#include -#include - -#ifndef RTE_PMD_ARK_TX_USERDATA_ENABLE -#define RTE_PMD_ARK_TX_USERDATA_ENABLE 0 -#endif - -#ifndef RTE_PMD_ARK_RX_USERDATA_ENABLE -#define RTE_PMD_ARK_RX_USERDATA_ENABLE 0 -#endif - -typedef uint32_t rte_pmd_ark_tx_userdata_t; -typedef uint64_t rte_pmd_ark_rx_userdata_t; - -extern int rte_pmd_ark_tx_userdata_dynfield_offset; -extern int rte_pmd_ark_rx_userdata_dynfield_offset; - -/** mbuf dynamic field for custom Tx ARK data */ -#define RTE_PMD_ARK_TX_USERDATA_DYNFIELD_NAME "rte_net_ark_dynfield_tx_userdata" -/** mbuf dynamic field for custom Rx ARK data */ -#define RTE_PMD_ARK_RX_USERDATA_DYNFIELD_NAME "rte_net_ark_dynfield_rx_userdata" - -/** - * @warning - * @b EXPERIMENTAL: this API may change without prior notice - * - * Read Tx user data from mbuf. - * - * @param mbuf Structure to read from. - * @return user data - */ -__rte_experimental -static inline rte_pmd_ark_tx_userdata_t -rte_pmd_ark_mbuf_tx_userdata_get(const struct rte_mbuf *mbuf) -{ -#if RTE_PMD_ARK_TX_USERDATA_ENABLE - return *RTE_MBUF_DYNFIELD(mbuf, rte_pmd_ark_tx_userdata_dynfield_offset, - rte_pmd_ark_tx_userdata_t *); -#else - RTE_SET_USED(mbuf); - return 0; -#endif -} - -/** - * @warning - * @b EXPERIMENTAL: this API may change without prior notice - * - * Write Tx user data to mbuf. - * - * @param mbuf Structure to write into. - * @param data User data. - */ -__rte_experimental -static inline void -rte_pmd_ark_mbuf_tx_userdata_set(struct rte_mbuf *mbuf, - rte_pmd_ark_tx_userdata_t data) -{ -#if RTE_PMD_ARK_TX_USERDATA_ENABLE - *RTE_MBUF_DYNFIELD(mbuf, rte_pmd_ark_tx_userdata_dynfield_offset, - rte_pmd_ark_tx_userdata_t *) = data; -#else - RTE_SET_USED(mbuf); - RTE_SET_USED(data); -#endif -} - -/** - * @warning - * @b EXPERIMENTAL: this API may change without prior notice - * - * Read Rx user data from mbuf. - * - * @param mbuf Structure to read from. - * @return user data - */ -__rte_experimental -static inline rte_pmd_ark_rx_userdata_t -rte_pmd_ark_mbuf_rx_userdata_get(const struct rte_mbuf *mbuf) -{ -#if RTE_PMD_ARK_RX_USERDATA_ENABLE - return *RTE_MBUF_DYNFIELD(mbuf, rte_pmd_ark_rx_userdata_dynfield_offset, - rte_pmd_ark_rx_userdata_t *); -#else - RTE_SET_USED(mbuf); - return 0; -#endif -} - -/** - * @warning - * @b EXPERIMENTAL: this API may change without prior notice - * - * Write Rx user data to mbuf. - * - * @param mbuf Structure to write into. - * @param data User data. - */ -__rte_experimental -static inline void -rte_pmd_ark_mbuf_rx_userdata_set(struct rte_mbuf *mbuf, - rte_pmd_ark_rx_userdata_t data) -{ -#if RTE_PMD_ARK_RX_USERDATA_ENABLE - *RTE_MBUF_DYNFIELD(mbuf, rte_pmd_ark_rx_userdata_dynfield_offset, - rte_pmd_ark_rx_userdata_t *) = data; -#else - RTE_SET_USED(mbuf); - RTE_SET_USED(data); -#endif -} - #endif /* RTE_PMD_ARK_H */ diff --git a/drivers/net/ark/version.map b/drivers/net/ark/version.map index 954bea679..4a76d1d52 100644 --- a/drivers/net/ark/version.map +++ b/drivers/net/ark/version.map @@ -1,10 +1,3 @@ DPDK_21 { local: *; }; - -EXPERIMENTAL { - global: - - rte_pmd_ark_tx_userdata_dynfield_offset; - rte_pmd_ark_rx_userdata_dynfield_offset; -}; -- 2.17.1