From mboxrd@z Thu Jan 1 00:00:00 1970 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 80072C77B6E for ; Wed, 12 Apr 2023 16:21:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230182AbjDLQVp (ORCPT ); Wed, 12 Apr 2023 12:21:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51956 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229839AbjDLQVh (ORCPT ); Wed, 12 Apr 2023 12:21:37 -0400 Received: from mail-lj1-x261.google.com (mail-lj1-x261.google.com [IPv6:2a00:1450:4864:20::261]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 85A6F659F for ; Wed, 12 Apr 2023 09:21:29 -0700 (PDT) Received: by mail-lj1-x261.google.com with SMTP id a3so6971873ljr.11 for ; Wed, 12 Apr 2023 09:21:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dectris.com; s=google; t=1681316488; x=1683908488; 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=8eN7Be/85uzfpyW2w/rr50iULiGv8D2Gnkfs37ktaYM=; b=iKVPaBauwu1vFSnDItMwiTT0PWIVGH1IhukyHZUJINyb3jTPxbwV72l4TQxgdRE80k S2TtdyAs214hWjxHl6wNQVN1CyXJ7TXWkUxKs95O83cQ9AkqzwdX/IBdydNTPlUmaTJE /V/GSVoE7Iou3+Czml55E8eBbbm+DzxTwairs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681316488; x=1683908488; 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=8eN7Be/85uzfpyW2w/rr50iULiGv8D2Gnkfs37ktaYM=; b=i949n5TvvyMxE2ntmdic2BnOZlL3r3NuzXoQV5FBFkysLp9TdjPn3bGxy/pEZQ17js HHVZK0mAoO96cjMtYNdONZ8Y+tZHrgHXcYv0HBhreQARWrolyN9eeNwVnBP2z2BgO13h YZSASre4kcF7u/vPgzBB963P9jBYFruPTGvuPMjWdtLJuvOgRhkYOPgM6bczx4tF2U7I JCLvE3HH7h07q41wJCCIddBV96TcWM71VRzxqP42OSU+tGDd5mqosjUgZkv5Z16AIqnU e2iLzrgN4H1JTTGdRm0QVsjrHYbk02mhvwVho+XlHkTngv0BTxd37tKvmY1tbCZIwiRE vpFw== X-Gm-Message-State: AAQBX9dMoNVf/LaOnyq8AvcLW8NDuZm3JxhRoOaZQz8iL5asK24Vti3K DY+aX13OGLLRKIKNv/ehm8Qj7OD5L+ixFe5sLM9Opay+j18d X-Google-Smtp-Source: AKy350bXfD+qgr5S53CoNBQXvCEfUNx+ridAujSoVE5Bw02RPjB2fla8krpHFCTzrBYlgpeWoZlX4/GxhH47 X-Received: by 2002:a2e:3609:0:b0:29f:b199:5120 with SMTP id d9-20020a2e3609000000b0029fb1995120mr1842127lja.4.1681316487840; Wed, 12 Apr 2023 09:21:27 -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 t19-20020a2e8e73000000b002a77614d960sm2108109ljk.62.2023.04.12.09.21.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Apr 2023 09:21:27 -0700 (PDT) X-Relaying-Domain: dectris.com From: Kal Conley To: Magnus Karlsson , =?UTF-8?q?Bj=C3=B6rn=20T=C3=B6pel?= , 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 bpf-next v6 1/4] xsk: Use pool->dma_pages to check for DMA Date: Wed, 12 Apr 2023 18:21:11 +0200 Message-Id: <20230412162114.19389-2-kal.conley@dectris.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230412162114.19389-1-kal.conley@dectris.com> References: <20230412162114.19389-1-kal.conley@dectris.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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; - return pool->dma_pages_cnt && + return pool->dma_pages && !(pool->dma_pages[addr >> PAGE_SHIFT] & XSK_NEXT_PG_CONTIG_MASK); } 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; - if (pool->dma_pages_cnt == 0) + if (!pool->dma_pages) return; dma_map = xp_find_dma_map(pool); @@ -364,6 +364,7 @@ void xp_dma_unmap(struct xsk_buff_pool *pool, unsigned long attrs) __xp_dma_unmap(dma_map, attrs); kvfree(pool->dma_pages); + pool->dma_pages = NULL; pool->dma_pages_cnt = 0; pool->dev = NULL; } @@ -503,7 +504,7 @@ static struct xdp_buff_xsk *__xp_alloc(struct xsk_buff_pool *pool) if (pool->unaligned) { xskb = 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 = &pool->heads[xp_aligned_extract_idx(pool, addr)]; @@ -569,7 +570,7 @@ static u32 xp_alloc_new_from_fq(struct xsk_buff_pool *pool, struct xdp_buff **xd if (pool->unaligned) { xskb = 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 = &pool->heads[xp_aligned_extract_idx(pool, addr)]; -- 2.39.2