From nobody Tue Dec 16 16:39:11 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 235AEC77B73 for ; Sun, 23 Apr 2023 07:55:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230154AbjDWHzF (ORCPT ); Sun, 23 Apr 2023 03:55:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34720 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230110AbjDWHzC (ORCPT ); Sun, 23 Apr 2023 03:55:02 -0400 Received: from mail-ed1-x564.google.com (mail-ed1-x564.google.com [IPv6:2a00:1450:4864:20::564]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7EB971712 for ; Sun, 23 Apr 2023 00:54:59 -0700 (PDT) Received: by mail-ed1-x564.google.com with SMTP id 4fb4d7f45d1cf-506767f97f8so5553476a12.1 for ; Sun, 23 Apr 2023 00:54:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dectris.com; s=google; t=1682236498; x=1684828498; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=8eN7Be/85uzfpyW2w/rr50iULiGv8D2Gnkfs37ktaYM=; b=rNC4EJKXU49aedFwPrZkwlJrx07csMDu16FlwNyYTADq2p1Xdr/K3g3uaArMvAUc9e 9Wrw2wXWZNQSnaKnIvDD31gFW1UpuQ6MEDUWssKk2AHRP4A3XTWiCKYEEohWO9KuTMiv 9TD8+BTUznpT+EKqAbp45/6QMeXsJ1NjIHpeg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682236498; x=1684828498; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=8eN7Be/85uzfpyW2w/rr50iULiGv8D2Gnkfs37ktaYM=; b=dYwl08RU+y6XU4WrIyx8E7WPrplwtFW7Frb9kZZ5L7Pp9/Kl9xjRR9QEkloJM7iBwN Zv4XcXVVbFQ/Rs3hUiLUSmUyLCgTcmCYgCCK5c91p8zmw84I3vzlg6TgXXnNrDYtr6qe +UQ8hYEH8u2nF9GlGkpVsPXI/37aW1ADdz63yDQo+skeeuFgO5JvYM3PA1DCfTfPN/67 dvNUCINfQuMV3oNn88XY64In4Oboj3uBWVY20x3KEe0+p73wv2gmRocnwD/cT+unEAM1 cXbelj8nqoEqq7Gs/7mcuW3n6DMFATfLQEIsTf0x9QMB4IO1jueermo9UfrsrN/1GsHh Xwtw== X-Gm-Message-State: AAQBX9dSjs/4umov0766oaylThOPjRMeWjhBSpUi+jDG7m0H9Su188Qx BJSsePdMqfcDeZiaARkFs0BgPBeJZAtp9XITYSe11zkUVPio X-Google-Smtp-Source: AKy350YLtMPDAkgPEJsURq5+gvm+IsB0e3MuHJpNtuodio4i6qQUIhDApkdP+hTygnE+RIN7cpFUaLrJqsOA X-Received: by 2002:aa7:d6ca:0:b0:508:4808:b62b with SMTP id x10-20020aa7d6ca000000b005084808b62bmr9552284edr.22.1682236497826; Sun, 23 Apr 2023 00:54:57 -0700 (PDT) Received: from fedora.dectris.local (dect-ch-bad-pfw.cyberlink.ch. [62.12.151.50]) by smtp-relay.gmail.com with ESMTPS id y15-20020a50bb0f000000b00504940f2549sm1549894ede.40.2023.04.23.00.54.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Apr 2023 00:54:57 -0700 (PDT) X-Relaying-Domain: dectris.com From: Kal Conley To: =?UTF-8?q?Bj=C3=B6rn=20T=C3=B6pel?= , Magnus Karlsson , Maciej Fijalkowski , Jonathan Lemon , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend Cc: Kal Conley , netdev@vger.kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] xsk: Use pool->dma_pages to check for DMA Date: Sun, 23 Apr 2023 09:53:34 +0200 Message-Id: <20230423075335.92597-1-kal.conley@dectris.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Compare pool->dma_pages instead of pool->dma_pages_cnt to check for an active DMA mapping. pool->dma_pages needs to be read anyway to access the map so this compiles to more efficient code. Signed-off-by: Kal Conley Acked-by: Magnus Karlsson --- include/net/xsk_buff_pool.h | 2 +- net/xdp/xsk_buff_pool.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/net/xsk_buff_pool.h b/include/net/xsk_buff_pool.h index d318c769b445..a8d7b8a3688a 100644 --- a/include/net/xsk_buff_pool.h +++ b/include/net/xsk_buff_pool.h @@ -180,7 +180,7 @@ static inline bool xp_desc_crosses_non_contig_pg(struct= xsk_buff_pool *pool, if (likely(!cross_pg)) return false; =20 - return pool->dma_pages_cnt && + return pool->dma_pages && !(pool->dma_pages[addr >> PAGE_SHIFT] & XSK_NEXT_PG_CONTIG_MASK); } =20 diff --git a/net/xdp/xsk_buff_pool.c b/net/xdp/xsk_buff_pool.c index b2df1e0f8153..26f6d304451e 100644 --- a/net/xdp/xsk_buff_pool.c +++ b/net/xdp/xsk_buff_pool.c @@ -350,7 +350,7 @@ void xp_dma_unmap(struct xsk_buff_pool *pool, unsigned = long attrs) { struct xsk_dma_map *dma_map; =20 - if (pool->dma_pages_cnt =3D=3D 0) + if (!pool->dma_pages) return; =20 dma_map =3D xp_find_dma_map(pool); @@ -364,6 +364,7 @@ void xp_dma_unmap(struct xsk_buff_pool *pool, unsigned = long attrs) =20 __xp_dma_unmap(dma_map, attrs); kvfree(pool->dma_pages); + pool->dma_pages =3D NULL; pool->dma_pages_cnt =3D 0; pool->dev =3D NULL; } @@ -503,7 +504,7 @@ static struct xdp_buff_xsk *__xp_alloc(struct xsk_buff_= pool *pool) if (pool->unaligned) { xskb =3D pool->free_heads[--pool->free_heads_cnt]; xp_init_xskb_addr(xskb, pool, addr); - if (pool->dma_pages_cnt) + if (pool->dma_pages) xp_init_xskb_dma(xskb, pool, pool->dma_pages, addr); } else { xskb =3D &pool->heads[xp_aligned_extract_idx(pool, addr)]; @@ -569,7 +570,7 @@ static u32 xp_alloc_new_from_fq(struct xsk_buff_pool *p= ool, struct xdp_buff **xd if (pool->unaligned) { xskb =3D pool->free_heads[--pool->free_heads_cnt]; xp_init_xskb_addr(xskb, pool, addr); - if (pool->dma_pages_cnt) + if (pool->dma_pages) xp_init_xskb_dma(xskb, pool, pool->dma_pages, addr); } else { xskb =3D &pool->heads[xp_aligned_extract_idx(pool, addr)]; --=20 2.39.2