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 D118346151 for ; Thu, 30 Jan 2025 23:19:24 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C7D0C410D2; Thu, 30 Jan 2025 23:19:24 +0100 (CET) Received: from mail-ed1-f98.google.com (mail-ed1-f98.google.com [209.85.208.98]) by mails.dpdk.org (Postfix) with ESMTP id 9B11C410D2 for ; Thu, 30 Jan 2025 23:19:21 +0100 (CET) Received: by mail-ed1-f98.google.com with SMTP id 4fb4d7f45d1cf-5d3e6274015so2187546a12.0 for ; Thu, 30 Jan 2025 14:19:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind.com; s=google; t=1738275561; x=1738880361; 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=WG9BHdM8SNqVry6anHPgfAW9LybIxX4PlmGjSM/tBF0=; b=AMDEQB5lFDuZQW/rsFtMAL4EfmLewCbGIX5HehJ81Vy0ZeNhSGMkjGKygW5v+Gyu6L 8t2Ga8a6XrIVicVKYj8E7SfZ1eB2v1Iqi8IQYOeIgcvGcUL5a3s5d4pqiCY8q3b6BqwO EZiUWZnQTEVM9MOenaJCYzCkGedJbP5pyMD71jKOFcpMpnntc8VRdI2R5SZ3GV7Mhjod rZLh8CsZcX4OL9p3S822xbUARDsaI9TIg4dap7k7HrnP4ZQbQpCJsW7Nz+pTSEJ5A8ZP f4/iwa9NqIoCC+S1FQkKeVMQIHiacF5zo05qYVs5wt7SjQgGJafgVAtQjrBLTvlaPsqx DZLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738275561; x=1738880361; 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=WG9BHdM8SNqVry6anHPgfAW9LybIxX4PlmGjSM/tBF0=; b=S8FtMxz+7wl8K/AoMPjP4KJqk1+s2r8OMHQEqy9Ze3BW/vfMAoelAtRdovJrncpdDw 5LJq2kzJCNSvt3B6I4CcGfhe5UQ3HfbAUBtb047UasCs+JkkXnUSw6yOS1n21EBbjy4L JH0s8FoHKa9NcF66nJVf628WGR/vUDUcaXX/fGUQX7nzJ2QneKWkufypiQ/mzqgiErSj CfZivqEgEAssgj0nHXjgCtCnXVl4XTiA1d72pd6gr1bHxYlNiIU8oWJg5usCFQeN9EUf LtI74Pt+trvRtEvLEJDmdQhHVINqwP+LB9cKYkiLhW0ZPfINCgqEhV3vcxJhB3GCnQ+1 vSBw== X-Gm-Message-State: AOJu0YwmYfJtREtdaIoYnkknKXotcJHA+byV5GH1CELKHHTiQm6oejJr LYalA5IBBjuH8FfbZyGt+0gZwthcUChkHQ6eEX4bnkejeeiO8lTaZjrkHFivP6E6d3wCtFEUAcV 7h+aFo+PeiCfGgIHyj95zSEgsXJ3ukdG5 X-Gm-Gg: ASbGncuDm78jt1T9/uaiU9CTaTJZ+/Cc1YeiSnWhtnEL5fkbsfJZz45SXsb8TtsJqDF 1BqjCpVx3EO/Neniku7rDoyCiNaUsnPUA431BwX2Xf09PW/LS5LaLaMUujmaBAlS/vzL/temV// viWvPvO+Hsew0EXKP7XwpeaAmIs5wzVrHqdOTdwJGAZauodJcDiUpPVNiisqQqFT+ygj6pV8kNK Ogi+CRP3ONIUi81Kl2UfziJJW8uYOrXmN3sD4gHxVTZDdxPHh127LO34wJwaguXlh+wfXm9TpCL qINwWQLnmpaS+00Mhu7YEszCSS9N4tF8RKqfOFEHp8QGCd2Zjg== X-Google-Smtp-Source: AGHT+IEZMRwpehk/vAc2chfeXEE5SQScXQIs3wNG9JXOhPKEEKhdTaVw52O3K8HTbbml4y+Yb/+3zCvtEWYo X-Received: by 2002:a17:906:7951:b0:aa6:6885:e2fa with SMTP id a640c23a62f3a-ab6cfcbb89cmr919197966b.14.1738275561147; Thu, 30 Jan 2025 14:19:21 -0800 (PST) Received: from smtpservice.6wind.com ([185.13.181.2]) by smtp-relay.gmail.com with ESMTP id a640c23a62f3a-ab6e48b8ccbsm7776566b.115.2025.01.30.14.19.21; Thu, 30 Jan 2025 14:19:21 -0800 (PST) X-Relaying-Domain: 6wind.com Received: from localhost (rainbow.dev.6wind.com [10.17.1.165]) by smtpservice.6wind.com (Postfix) with ESMTP id 0183E194F6; Thu, 30 Jan 2025 23:19:21 +0100 (CET) From: Ariel Otilibili To: dev@dpdk.org Cc: stable@dpdk.org, Thomas Monjalon , David Marchand , Ariel Otilibili , Ciara Loftus , Maryam Tahhan , Stephen Hemminger Subject: [PATCH v4 2/2] net/af_xdp: Refactor af_xdp_tx_zc Date: Thu, 30 Jan 2025 23:18:53 +0100 Message-Id: <20250130221853.789366-3-ariel.otilibili@6wind.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20250130221853.789366-1-ariel.otilibili@6wind.com> References: <20250116195640.68885-1-ariel.otilibili@6wind.com> <20250130221853.789366-1-ariel.otilibili@6wind.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 Both legs of the loop share the same logic: the common parts are about reserving and filling both address and length into the description. This is moved into reserve_and_fill(). Bugzilla ID: 1440 Suggested-by: Maryam Tahhan Signed-off-by: Ariel Otilibili --- drivers/net/af_xdp/rte_eth_af_xdp.c | 62 ++++++++++++++++------------- 1 file changed, 34 insertions(+), 28 deletions(-) diff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c b/drivers/net/af_xdp/rte_eth_af_xdp.c index 092bcb73aa0a..3f5de4d9cbda 100644 --- a/drivers/net/af_xdp/rte_eth_af_xdp.c +++ b/drivers/net/af_xdp/rte_eth_af_xdp.c @@ -536,6 +536,31 @@ kick_tx(struct pkt_tx_queue *txq, struct xsk_ring_cons *cq) } } +static inline struct xdp_desc* +reserve_and_fill(struct pkt_tx_queue *txq, struct rte_mbuf *mbuf, + struct xsk_umem_info *umem) +{ + struct xdp_desc *desc = NULL; + uint32_t *idx_tx = NULL; + uint64_t addr, offset; + + if (!xsk_ring_prod__reserve(&txq->tx, 1, idx_tx)) + goto out; + + desc = xsk_ring_prod__tx_desc(&txq->tx, *idx_tx); + desc->len = mbuf->pkt_len; + + addr = (uint64_t)mbuf - (uint64_t)umem->buffer + - umem->mb_pool->header_size; + offset = rte_pktmbuf_mtod(mbuf, uint64_t) - (uint64_t)mbuf + + umem->mb_pool->header_size; + offset = offset << XSK_UNALIGNED_BUF_OFFSET_SHIFT; + desc->addr = addr | offset; + +out: + return desc; +} + #if defined(XDP_UMEM_UNALIGNED_CHUNK_FLAG) static uint16_t af_xdp_tx_zc(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) @@ -545,10 +570,8 @@ af_xdp_tx_zc(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) struct rte_mbuf *mbuf; unsigned long tx_bytes = 0; int i; - uint32_t idx_tx; uint16_t count = 0; struct xdp_desc *desc; - uint64_t addr, offset; struct xsk_ring_cons *cq = &txq->pair->cq; uint32_t free_thresh = cq->size >> 1; @@ -559,21 +582,12 @@ af_xdp_tx_zc(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) mbuf = bufs[i]; if (mbuf->pool == umem->mb_pool) { - if (!xsk_ring_prod__reserve(&txq->tx, 1, &idx_tx)) { + if (!(desc = reserve_and_fill(txq, mbuf, umem))) { kick_tx(txq, cq); - if (!xsk_ring_prod__reserve(&txq->tx, 1, - &idx_tx)) + if (!(desc = reserve_and_fill(txq, mbuf, umem))) goto out; } - desc = xsk_ring_prod__tx_desc(&txq->tx, idx_tx); - desc->len = mbuf->pkt_len; - addr = (uint64_t)mbuf - (uint64_t)umem->buffer - - umem->mb_pool->header_size; - offset = rte_pktmbuf_mtod(mbuf, uint64_t) - - (uint64_t)mbuf + - umem->mb_pool->header_size; - offset = offset << XSK_UNALIGNED_BUF_OFFSET_SHIFT; - desc->addr = addr | offset; + tx_bytes += desc->len; count++; } else { @@ -584,26 +598,18 @@ af_xdp_tx_zc(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) if (local_mbuf == NULL) goto out; - if (!xsk_ring_prod__reserve(&txq->tx, 1, &idx_tx)) { + if (!(desc = reserve_and_fill(txq, local_mbuf, umem))) { rte_pktmbuf_free(local_mbuf); goto out; } - desc = xsk_ring_prod__tx_desc(&txq->tx, idx_tx); - desc->len = mbuf->pkt_len; - - addr = (uint64_t)local_mbuf - (uint64_t)umem->buffer - - umem->mb_pool->header_size; - offset = rte_pktmbuf_mtod(local_mbuf, uint64_t) - - (uint64_t)local_mbuf + - umem->mb_pool->header_size; - pkt = xsk_umem__get_data(umem->buffer, addr + offset); - offset = offset << XSK_UNALIGNED_BUF_OFFSET_SHIFT; - desc->addr = addr | offset; + pkt = xsk_umem__get_data(umem->buffer, + (desc->addr & ~0xFFF) + + (desc->addr & 0xFFF)); rte_memcpy(pkt, rte_pktmbuf_mtod(mbuf, void *), - desc->len); - tx_bytes += desc->len; + desc->len); rte_pktmbuf_free(mbuf); + tx_bytes += desc->len; count++; } } -- 2.30.2