From patchwork Tue Mar 25 15:45:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= X-Patchwork-Id: 14029159 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 12D21C35FFC for ; Tue, 25 Mar 2025 15:46:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9F07D280015; Tue, 25 Mar 2025 11:46:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7B43D280007; Tue, 25 Mar 2025 11:46:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5B111280007; Tue, 25 Mar 2025 11:46:45 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 0D129280020 for ; Tue, 25 Mar 2025 11:46:45 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 3E959576BA for ; Tue, 25 Mar 2025 15:46:46 +0000 (UTC) X-FDA: 83260501212.06.724EB27 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf20.hostedemail.com (Postfix) with ESMTP id ADC4B1C0018 for ; Tue, 25 Mar 2025 15:46:43 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="BsBaq/Hr"; spf=pass (imf20.hostedemail.com: domain of toke@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=toke@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1742917603; h=from:from:sender: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:dkim-signature; bh=7qelpf0cr1Bxyx5yCbHo7HXz9cxxZ6ghzCl2hi3M+JE=; b=4iQZC4SCUMj4s23ciBV9vD2SxWdIt+IZzDjC+dMAgBLrth3u7A+KDKHzejw4rRaAVA0Ngv RYwe2Yvvki8DiMcQjVwu0Socvavf0EeEewvcQggMJ1+m9GxtDeZC0I+g4ufvRLTWEwFs2/ JbsqNHlMhz5Wh2rFmysr+Nb3F7cGXhM= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="BsBaq/Hr"; spf=pass (imf20.hostedemail.com: domain of toke@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=toke@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1742917603; a=rsa-sha256; cv=none; b=J/V/f/X8xXKCfa3MZeewMq52piiqJoFfb3sJ4MZrtJKBpa4sKxdLDUn2umYuo5p/VI7ooJ nXITP4IRluakoEFHQq1m/Y2N3CVfHp2u1hXoxUkWRhqd1TmGVUVxOZ2ndY27zZ3JY1nBdR QRD4/PMPGEllSnEcS4BF42VD8gaeYpk= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1742917603; 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=7qelpf0cr1Bxyx5yCbHo7HXz9cxxZ6ghzCl2hi3M+JE=; b=BsBaq/HrHAP/NHNgkrEAlTtpi3PXxI/qkriefpEZCNsFA1sSbSQcGaEuQIes0Nuzt/YvIL 01rrqB5w62M/86cr7fzCyZ39pzWE/lLNh7gqFY8DMEsuv6RAtf71UlLMONh7T6Gmn0qLE7 J17EtiDzzo6N54mwHANNJsXRIWIhEnA= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-413-Hqi6YHqwPu69piBSm-8Vtw-1; Tue, 25 Mar 2025 11:46:41 -0400 X-MC-Unique: Hqi6YHqwPu69piBSm-8Vtw-1 X-Mimecast-MFC-AGG-ID: Hqi6YHqwPu69piBSm-8Vtw_1742917600 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-ac27f00a8a5so443547066b.3 for ; Tue, 25 Mar 2025 08:46:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742917600; x=1743522400; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7qelpf0cr1Bxyx5yCbHo7HXz9cxxZ6ghzCl2hi3M+JE=; b=PTd2wByq8myXkcFtVK5Ev7a9w2WhIyExhUZm6hjim37LDjQp+sTqUJB9gWPGhHgRyz mwOAyxSghy5Oz6/C3BQjLPhhCtUTkj9fgeuF+nNYjlK+BTY9hQAJQn6u/UHHiPuj1pl+ WJFef4EANa6cTT8ZqsWPxAu1z/4bvb9cUaSzS5aQhosiQQ47tfuYa9SW3bIfzX9gaXdl cBlQI+SRLPNMbGceHwIC84grSYmO9OkOwvwQMhx42HRSJnEASKWuAcCedHY/RJbKEnb/ M88pmCUzYWpC2R1hg/kREftNO/KOreJn/ZZI4Bj7HL5u4k3sHNu540TbKcr0pyVvFAP9 C2LQ== X-Forwarded-Encrypted: i=1; AJvYcCURktUgid46/3xfxU9QgEByf97GGENqFQA4/Cj3wFx8SVl9nFOU9ut2goF/JlZNhZsUwg6DzXWh6Q==@kvack.org X-Gm-Message-State: AOJu0YwGIWtnE1aefFU8hYqCPsxbtd9yUqMt9si5ErJXptD5rQVW2sfy 66UefqPTSnGBG5sIzD3mYIH1sT0Ih8B8q5z6y8ihc3HgRVyo1wLveX+SvVtY6EbW9IyxRGb/gK9 3+AdBEmoao5eoe5VsyKwb+7WXJxBMVSr1LVjuaLURZNkoF7yt X-Gm-Gg: ASbGnctcyDTP+Ly0zwV7BMqb+3xFqsVCmVqZyW9j/UhZQhD3eqgFTe/IXbpxKsSnfdP 4LRipO41w1Ml7lKsmWVbXdINBjDSlov3sRcYhWL/AEfguFRnlgOjDXUEsPHrpRJeNuDDBrA9mJ6 ylv+Vhe1QIA6+cbrZc94+g2nJG/5S9MnZoCURU99PJZ9Hn2BE0q9DayCnN+faanGMfyAkyGK8+Q cpwbuWVesSaZnEK8G5gZy7Vqk3JynXMTqgvrfCcyz6vY1hvEm+RdayEQte/lmKZgSeJ0BhrWJr2 LbJ36tEhJfUDhiOHr4mNgKuLGsKjhvlRomYPKbqO X-Received: by 2002:a17:906:c109:b0:ac6:cea2:6c7 with SMTP id a640c23a62f3a-ac6cea2122dmr209870366b.42.1742917600056; Tue, 25 Mar 2025 08:46:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGOdJXWY+OX6Pisfk0vOr5e4GyVLnFPg79bwnTUB2L/Or27l1la/vuNBO9tmBFaSgYvASXEiA== X-Received: by 2002:a17:906:c109:b0:ac6:cea2:6c7 with SMTP id a640c23a62f3a-ac6cea2122dmr209865166b.42.1742917599597; Tue, 25 Mar 2025 08:46:39 -0700 (PDT) Received: from alrua-x1.borgediget.toke.dk ([45.145.92.2]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ac3ef8675a9sm876497966b.28.2025.03.25.08.46.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Mar 2025 08:46:38 -0700 (PDT) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id C8DC518FC8BA; Tue, 25 Mar 2025 16:46:36 +0100 (CET) From: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= Date: Tue, 25 Mar 2025 16:45:43 +0100 Subject: [PATCH net-next v2 2/3] page_pool: Turn dma_sync and dma_sync_cpu fields into a bitmap MIME-Version: 1.0 Message-Id: <20250325-page-pool-track-dma-v2-2-113ebc1946f3@redhat.com> References: <20250325-page-pool-track-dma-v2-0-113ebc1946f3@redhat.com> In-Reply-To: <20250325-page-pool-track-dma-v2-0-113ebc1946f3@redhat.com> To: "David S. Miller" , Jakub Kicinski , Jesper Dangaard Brouer , Saeed Mahameed , Leon Romanovsky , Tariq Toukan , Andrew Lunn , Eric Dumazet , Paolo Abeni , Ilias Apalodimas , Simon Horman , Andrew Morton , Mina Almasry , Yonglong Liu , Yunsheng Lin , Pavel Begunkov , Matthew Wilcox Cc: netdev@vger.kernel.org, bpf@vger.kernel.org, linux-rdma@vger.kernel.org, linux-mm@kvack.org, =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= X-Mailer: b4 0.14.2 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: C0E7b_-TI-uPJIhM6pJ_GT9My31hjhrp1jH7ER6N4_c_1742917600 X-Mimecast-Originator: redhat.com X-Rspamd-Queue-Id: ADC4B1C0018 X-Stat-Signature: wmht7gmakmhgceowywzsgsb41nbhsurw X-Rspam-User: X-Rspamd-Server: rspam12 X-HE-Tag: 1742917603-692530 X-HE-Meta: U2FsdGVkX1+VVa+mVMRQg2RCGrH3rSOBaM2y6t+w+1pCHiSswuMs36f/XJhuBhPx5Tdiup2QCQ3dMkRvhIpkiO4RIk1SgfZtta+MbfOIYWqdqseJXQIHk4eGKD9clkh44sWzaHYiMCvJsjI1jCQ1SrxhmtTCcwNDSr8sjLzJael/tMmFiUzu6l2627gRjCXZsBX4bSzxno30MMRF3Iw+orHvJbjqbBvw23KNyxCVcXs9ORn5j6Y5bLmP6pM9namhouH+dAHSfnV6K2adHAwSLQMVWg8/SY52loEPMXeDiJ646MLxXS9Oq4cJnQAaUpF6dRREsItMDQ3pXCQM09d39U2gRgGtbyO7hyUwqRqZ4LRrtG49Sj963gs044h4qySTFdhkWxV1gIpQoGvfTYfgUMU9x4/zE+dH2v3PHRm8UkERgB4Ix57DX7XHtCwKtSUXNQOMfFkbo5KglcCe8lPl/qrZ2qno+Tc4qieO3n5T/tGRLeq9tnSt0Yc2Dkfn4QrYZ3Qhdgt5QCPC4JrwaiTHBg6RWDWgxLy6697t4bJxV0DCdLJfDyZFZ+tKe6SVmtrrtq7gIm4Ue0MnoAnMoJqEIDc1VUCnHlD5Bd2GkhvuImUEfL6xRg48gKDnILva2C5ZG/FcwuIjAHqAZBsRDW/5YyEzA5P16K5pQwsXj8TqoBu1hpPn9WBJK1pZTKzDGO5uLl/bh8sGGlZ5CvBzWbjbB2wORkMkDSUVmFFgNQqtHpyYEfnc7+0BRrH5EbMuBUNFmjAyDyg6ZATIcoSY08vsJyiNZ5aAasv8xkNExbdsHEjjs4pUXwXi6Kjik7kibQyyi4DQvcCBKGB+lniPq8r71Nszxq1ODt7WyPS6oEEgaIkT7TU7bhZGY+uCMqkFp9/Tmr8pIlx+JoeZxwfkCY9uoYeufdF5MOgn7gVEQ196Esj2qJWSGrzDAKg80K8/P6wuUC6lkugOY6N2cZMIdU0 jz/r/ji3 i2Z0B4qlLju/nTig+Pc4xVzaoIwo2iD5ASsgMrHczbiLglDsR3xFNgynlfTiHrY2si+EPuLMTehMRmG4uNhgEx6JUWnhwYDDL8cKVobHBgVWqTspckysrQt3Pirf7SMZGfVPJ46b/sOrTncXbfChVpGFnvOHn7KN9XSSx79ek4zBS/ZJberlDCZiDmL+WNk5EpSuUzpZ/T74azUTQmE9N10bRF1QAh4RYnCaYonhdvppP+9PCVlLx5HQTXV7hFZY4moD4EkUzr+L5aLUyzMyNC5Y562PPj4Ak9Iyr7ERfglRrGzN8PKGsd8TgSwLkcB8wGa3dBXnlOr9fQFLIzpkrwkbgRH3ALJyXWX+FE1AkmBWtxu6FPNf0Vm08Auw1Y9Zc0IHzxf/TZ2hhP6wrPGoKVV0o0wZ9thBHB3omxMFPkxXJjyFzGCWkx3kyht2ZVHWQ5S1A7xn7aa77G/fkIOrop7RpyLoRdTwJma+hWFNuWSxTRk6p7b5y3FFjL8CVdi2hus+uw9efoNxbwFyL6NXOjT7VuMoaCXShoVUzAjEzqhc+/GpmDZVk6dVtINGoqsKdJqmRLYkGb8uhOLhk2QVUcgeHWM14SWBVa7ihGsE8KnUvy2f6oVjmrfrcwvYTtqipHtvERi87zMIFvlg= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Change the single-bit booleans for dma_sync into an unsigned long with BIT() definitions so that a subsequent patch can write them both with a singe WRITE_ONCE() on teardown. Also move the check for the sync_cpu side into __page_pool_dma_sync_for_cpu() so it can be disabled for non-netmem providers as well. Reviewed-by: Mina Almasry Tested-by: Yonglong Liu Signed-off-by: Toke Høiland-Jørgensen --- include/net/page_pool/helpers.h | 6 +++--- include/net/page_pool/types.h | 8 ++++++-- net/core/devmem.c | 3 +-- net/core/page_pool.c | 9 +++++---- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/include/net/page_pool/helpers.h b/include/net/page_pool/helpers.h index 582a3d00cbe2315edeb92850b6a42ab21e509e45..7ed32bde4b8944deb7fb22e291e95b8487be681a 100644 --- a/include/net/page_pool/helpers.h +++ b/include/net/page_pool/helpers.h @@ -443,6 +443,9 @@ static inline void __page_pool_dma_sync_for_cpu(const struct page_pool *pool, const dma_addr_t dma_addr, u32 offset, u32 dma_sync_size) { + if (!(READ_ONCE(pool->dma_sync) & PP_DMA_SYNC_CPU)) + return; + dma_sync_single_range_for_cpu(pool->p.dev, dma_addr, offset + pool->p.offset, dma_sync_size, page_pool_get_dma_dir(pool)); @@ -473,9 +476,6 @@ page_pool_dma_sync_netmem_for_cpu(const struct page_pool *pool, const netmem_ref netmem, u32 offset, u32 dma_sync_size) { - if (!pool->dma_sync_for_cpu) - return; - __page_pool_dma_sync_for_cpu(pool, page_pool_get_dma_addr_netmem(netmem), offset, dma_sync_size); diff --git a/include/net/page_pool/types.h b/include/net/page_pool/types.h index df0d3c1608929605224feb26173135ff37951ef8..fbe34024b20061e8bcd1d4474f6ebfc70992f1eb 100644 --- a/include/net/page_pool/types.h +++ b/include/net/page_pool/types.h @@ -33,6 +33,10 @@ #define PP_FLAG_ALL (PP_FLAG_DMA_MAP | PP_FLAG_DMA_SYNC_DEV | \ PP_FLAG_SYSTEM_POOL | PP_FLAG_ALLOW_UNREADABLE_NETMEM) +/* bit values used in pp->dma_sync */ +#define PP_DMA_SYNC_DEV BIT(0) +#define PP_DMA_SYNC_CPU BIT(1) + /* * Fast allocation side cache array/stack * @@ -175,12 +179,12 @@ struct page_pool { bool has_init_callback:1; /* slow::init_callback is set */ bool dma_map:1; /* Perform DMA mapping */ - bool dma_sync:1; /* Perform DMA sync for device */ - bool dma_sync_for_cpu:1; /* Perform DMA sync for cpu */ #ifdef CONFIG_PAGE_POOL_STATS bool system:1; /* This is a global percpu pool */ #endif + unsigned long dma_sync; + __cacheline_group_begin_aligned(frag, PAGE_POOL_FRAG_GROUP_ALIGN); long frag_users; netmem_ref frag_page; diff --git a/net/core/devmem.c b/net/core/devmem.c index 6802e82a4d03b6030f6df50ae3661f81e40bc101..955d392d707b12fe784747aa2040ce1a882a64db 100644 --- a/net/core/devmem.c +++ b/net/core/devmem.c @@ -340,8 +340,7 @@ int mp_dmabuf_devmem_init(struct page_pool *pool) /* dma-buf dma addresses do not need and should not be used with * dma_sync_for_cpu/device. Force disable dma_sync. */ - pool->dma_sync = false; - pool->dma_sync_for_cpu = false; + pool->dma_sync = 0; if (pool->p.order != 0) return -E2BIG; diff --git a/net/core/page_pool.c b/net/core/page_pool.c index acef1fcd8ddcfd1853a6f2055c1f1820ab248e8d..d51ca4389dd62d8bc266a9a2b792838257173535 100644 --- a/net/core/page_pool.c +++ b/net/core/page_pool.c @@ -203,7 +203,7 @@ static int page_pool_init(struct page_pool *pool, memcpy(&pool->slow, ¶ms->slow, sizeof(pool->slow)); pool->cpuid = cpuid; - pool->dma_sync_for_cpu = true; + pool->dma_sync = PP_DMA_SYNC_CPU; /* Validate only known flags were used */ if (pool->slow.flags & ~PP_FLAG_ALL) @@ -238,7 +238,7 @@ static int page_pool_init(struct page_pool *pool, if (!pool->p.max_len) return -EINVAL; - pool->dma_sync = true; + pool->dma_sync |= PP_DMA_SYNC_DEV; /* pool->p.offset has to be set according to the address * offset used by the DMA engine to start copying rx data @@ -291,7 +291,7 @@ static int page_pool_init(struct page_pool *pool, } if (pool->mp_ops) { - if (!pool->dma_map || !pool->dma_sync) + if (!pool->dma_map || !(pool->dma_sync & PP_DMA_SYNC_DEV)) return -EOPNOTSUPP; if (WARN_ON(!is_kernel_rodata((unsigned long)pool->mp_ops))) { @@ -466,7 +466,8 @@ page_pool_dma_sync_for_device(const struct page_pool *pool, netmem_ref netmem, u32 dma_sync_size) { - if (pool->dma_sync && dma_dev_need_sync(pool->p.dev)) + if ((READ_ONCE(pool->dma_sync) & PP_DMA_SYNC_DEV) && + dma_dev_need_sync(pool->p.dev)) __page_pool_dma_sync_for_device(pool, netmem, dma_sync_size); }