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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7B7B2C54EBC for ; Wed, 11 Jan 2023 04:22:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4D8C1900009; Tue, 10 Jan 2023 23:22:24 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 488CA900003; Tue, 10 Jan 2023 23:22:24 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2B4F3900009; Tue, 10 Jan 2023 23:22:24 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 1BA73900003 for ; Tue, 10 Jan 2023 23:22:24 -0500 (EST) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id F124CAEC81 for ; Wed, 11 Jan 2023 04:22:23 +0000 (UTC) X-FDA: 80341221366.26.A9928DA Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf17.hostedemail.com (Postfix) with ESMTP id 8411E40002 for ; Wed, 11 Jan 2023 04:22:22 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=bLXhO64C; spf=none (imf17.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1673410942; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=V/N8ZDynthW5Fc5GLNsWK45Y4vcH+YJgVhAgrk4URbs=; b=6v6YA1S1iNnCAO7KxXFToKSG8eBuwjsRh+AzQi0KAHApIomqrqXQVPrf35FDK8lM2amo4c 3RbHilmfheR8DIuvJ/C5Yo0BcjOY6SP7KysV+CG7yOcSxfnxh3uP8BE2KhsmTA/dpnuZQD wutf5ebJ6AddSdUAXYQbK252YXhv6dk= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=bLXhO64C; spf=none (imf17.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1673410942; a=rsa-sha256; cv=none; b=07E1QAFfyRadBKeczUQ4IRIuNAHo2ioK47VLD0wBz4yFcKTnloRTI5LSkw6z7fgAZewJ66 KIrdp4qrCv5pR6xrIyUqy2MEgi6QA7qG9yscixgXvr3n+s0SjJnyOf/kFZE1H/J4GHY+e9 8HXLUGBZdunqrMx4og6RHi2+k1Y+8NE= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=V/N8ZDynthW5Fc5GLNsWK45Y4vcH+YJgVhAgrk4URbs=; b=bLXhO64CiVSYtCXYvg7dj2411b 6Ih8FOPtWZtKEy7IVmUOEV+d89FQF98GOFKAmZR5T2nQJuT7FwpgYskeYrGvUoeMD5okrfF/nvb6E LhmdFmC3bh6g12Aiw3j6UkvGuG/nvKd2yYsr+9WxgpzjLwqQZc2/WgyJTgfyC3wmBBXPIU7s7zGYn rcYEIkFAEW6rObiVuPRLo6SsZa6Eg0kfRfQMOwsoVux8qWYRO0Pb+U+BlNlMXIdf0CQSVf9LhqGFC 4xgvixNEoR1V298HVLSrUmHJza/v2FjW8e86Sh3iUVMd25nP7jAbSAouI1PlonCOZoIZam0yiuFMX XIWR8J6w==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pFSd0-003nz0-5e; Wed, 11 Jan 2023 04:22:18 +0000 From: "Matthew Wilcox (Oracle)" To: Jesper Dangaard Brouer , Ilias Apalodimas Cc: "Matthew Wilcox (Oracle)" , netdev@vger.kernel.org, linux-mm@kvack.org, Shakeel Butt , Jesper Dangaard Brouer , Jesse Brandeburg Subject: [PATCH v3 22/26] page_pool: Pass a netmem to init_callback() Date: Wed, 11 Jan 2023 04:22:10 +0000 Message-Id: <20230111042214.907030-23-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230111042214.907030-1-willy@infradead.org> References: <20230111042214.907030-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 8411E40002 X-Stat-Signature: 8wdd3d9qqygas3mjczuw71b3jahp5349 X-Rspam-User: X-HE-Tag: 1673410942-413299 X-HE-Meta: U2FsdGVkX184MjxR0H6UMqWLcc2WedJgx8WnpZJz3Jq2yG4MToPrk1ypZuOpSQlncheH6UDeymdVtQxGHfdwZDSQYRxhhlLQE35f3MJRxtds6WU/xYuJ8nRlD+/yaOZeJCkwKvLV8ViFqsayGO4BTNzFqjKkNfVjmsm5Yk3+FBC0a0kqw4e68qjaqWmjr7TucfEfVOzT0ruxEAc5KLbLfatbtBNoGpA89vClvYvTvCmXeJHf0gnqkI5XQ2M55KtrLHCxrGitUj4DOZXoVch03zwkz63Kiz9JKzIIrCfuFJiKZUSVQQkJy0bPwvw1PmrWBen2vOXgewDzSewtrQwQ8449X8B5vmNc/T34z880yGNgOTCHXPYLxUYeusm+xKdE+JU3n/rqO7ksyrUcPmfp37Bz/+xUF6qjIf/3ePzpn3vPagUH7qEW0/cBONGwd/en6aYo3NvFkZ8uQoK/ZwW/eEJtFv03iax1R2fECTaDAe5l4KCwpOL1GeCw/5wbIfoZmBpApVgQifdKgReQ+mW9PYymD4WApxHnFwapTTEh95c9bP1rm3jpe+db5t/lYuYxQpH1+zRSMf8DyaaddjctNxL3aYLLRNIXPnghpz/qhKiHygMhhFMJ6G/xIxUdzKkxTie3CeZpDLqCJuDumF/BRApn2Te4rpJXXrzhMyPRULtLTpJkUZhO/+zqZNAsnv+WhJHRhobk7gqqZ3rSmGSOCtmbxItrpNhVIGX56QQvgdoF9mblXcdvoW2xTKLZUdn9MlWKfhYYiTyu1gkTqDU2Tpgnx1LUS97M/mNbKEQ7Ux/pCBll5d/FzMoO6shgk0AfHeE2jessAXEIiLEg5HVsKrqQ7m9PKm10z5/yvKXcEuILPwCGLOqOiVk17Vv4iz2xDYRjF6JkIwub7U5H+vl+b07b5nYfC7KDrFvw1/zhT5aPIYyvv0/58A== 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: Convert the only user of init_callback. Signed-off-by: Matthew Wilcox (Oracle) Acked-by: Jesper Dangaard Brouer Reviewed-by: Ilias Apalodimas Reviewed-by: Jesse Brandeburg --- include/net/page_pool.h | 2 +- net/bpf/test_run.c | 4 ++-- net/core/page_pool.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/net/page_pool.h b/include/net/page_pool.h index 2f0cd018b8f2..af8ba8a0dd05 100644 --- a/include/net/page_pool.h +++ b/include/net/page_pool.h @@ -181,7 +181,7 @@ struct page_pool_params { enum dma_data_direction dma_dir; /* DMA mapping direction */ unsigned int max_len; /* max DMA sync memory size */ unsigned int offset; /* DMA addr offset */ - void (*init_callback)(struct page *page, void *arg); + void (*init_callback)(struct netmem *nmem, void *arg); void *init_arg; }; diff --git a/net/bpf/test_run.c b/net/bpf/test_run.c index 2723623429ac..bd3c64e69f6e 100644 --- a/net/bpf/test_run.c +++ b/net/bpf/test_run.c @@ -116,9 +116,9 @@ struct xdp_test_data { #define TEST_XDP_FRAME_SIZE (PAGE_SIZE - sizeof(struct xdp_page_head)) #define TEST_XDP_MAX_BATCH 256 -static void xdp_test_run_init_page(struct page *page, void *arg) +static void xdp_test_run_init_page(struct netmem *nmem, void *arg) { - struct xdp_page_head *head = phys_to_virt(page_to_phys(page)); + struct xdp_page_head *head = netmem_to_virt(nmem); struct xdp_buff *new_ctx, *orig_ctx; u32 headroom = XDP_PACKET_HEADROOM; struct xdp_test_data *xdp = arg; diff --git a/net/core/page_pool.c b/net/core/page_pool.c index 5624cdae1f4e..a1e404a7397f 100644 --- a/net/core/page_pool.c +++ b/net/core/page_pool.c @@ -334,7 +334,7 @@ static void page_pool_set_pp_info(struct page_pool *pool, nmem->pp = pool; nmem->pp_magic |= PP_SIGNATURE; if (pool->p.init_callback) - pool->p.init_callback(netmem_page(nmem), pool->p.init_arg); + pool->p.init_callback(nmem, pool->p.init_arg); } static void page_pool_clear_pp_info(struct netmem *nmem) -- 2.35.1