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 10F6FC3DA7A for ; Thu, 5 Jan 2023 21:46:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D0E63900008; Thu, 5 Jan 2023 16:46:37 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C9431940008; Thu, 5 Jan 2023 16:46:37 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8C375900008; Thu, 5 Jan 2023 16:46:37 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 6D586900004 for ; Thu, 5 Jan 2023 16:46:37 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 31CE71A0B36 for ; Thu, 5 Jan 2023 21:46:37 +0000 (UTC) X-FDA: 80322080034.22.B15F339 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf20.hostedemail.com (Postfix) with ESMTP id 7C6511C0006 for ; Thu, 5 Jan 2023 21:46:35 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=eOJKLnG8; spf=none (imf20.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=1672955195; 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=pXeNES8pyHVZBMwH4642v/IjLs/jyC0INFstQa9QZBQ=; b=XA8XGVtM9i2ifR9vnN/t340eHv0NbBXTHUhLuAnmhDVG8kaHyet6zmJC235+EQZ/ubQ3/R Q0y6/EQxOCvDnieQ7nlDZWvA0uEW8ReghZFJm3UwGzL0MQ84aqpZk5mycNeI9bkpcCRCFS D3NXFVPYkc8gzNhOZnGolHNJzBeLBAo= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=eOJKLnG8; spf=none (imf20.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=1672955195; a=rsa-sha256; cv=none; b=5jPmLpsgakBBue0nIws9riQUtiEeOKKH0I8yXfeGA03cWnYTuHBbDPG31vA6wmEx//D45f slJ1Wm7jg9EB2ycfE49Ph+UqyPDe8DpPQ2viInU8ugJay5mMoq3R4Ehxl24ZHxFX68UR6O 2zgkv8pI7sBucFYsnCo1bWClgN1vAdw= 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=pXeNES8pyHVZBMwH4642v/IjLs/jyC0INFstQa9QZBQ=; b=eOJKLnG8Rr92sywy/+UEfUME49 VQiOPrQaj2vRFtRTufsxm632f3qKW6xizMlKfNJHA/L4I5RG57xbOjW+yoOlXZM9PWRF4UVWIFXSU y9zMNId29AsEMqJ00is1Dh7fuOuF4H4EDdANupo8Ry9RNr40DGRqZvrSF7teb1z5eN5arTyatyBqS L0XQq+WicyY8SiVom780FshL0lUQyKqKWj8vopqV3kXJPJrIHXEg7Me+JLH0wfQPhd3b19+DKLP91 ZNMTsBXw9gJbRC7uRCROpn+q+xCas0M906m1tWeiHe4xIV2PAdkESeMMu1o/1K8zIMhtfIqllRx93 Pv9LQarA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDY4J-00GWob-G5; Thu, 05 Jan 2023 21:46:35 +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 Subject: [PATCH v2 21/24] page_pool: Pass a netmem to init_callback() Date: Thu, 5 Jan 2023 21:46:28 +0000 Message-Id: <20230105214631.3939268-22-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230105214631.3939268-1-willy@infradead.org> References: <20230105214631.3939268-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 7C6511C0006 X-Rspam-User: X-Stat-Signature: yahp9kbnz1bn8h1wua8ebmjnrmm9ehbc X-HE-Tag: 1672955195-162080 X-HE-Meta: U2FsdGVkX19g/AQ6QT1+bt3gtQU81DROXVHS3k71rdHYxfql92q0l2MConjmUGOVrnwoRqBAHy3c71XtHo8mcaeDneMlf5CRsIWPfAoZZAzItywrjrJoWAdCUbwkXeZdmHvnnpAQBs/mrStdJEp7Of3mkvKR0eJa8BtaV08Psk4adac5TYeyO1wdZ7/BmmxO7GSoN4byB4a8IvyyXei0OZRWJgh6YuUMUxAXTHpnOjVQmfH9Z0uprfZwch+4WyzEGW9ksSHN8/HwZNolGTelmRNFL7/EpwS7UdPNpg5/8iQh8WeSRBm/R8k/AAoqsVbRE+DwkUzl/uxphhG81PmcsuwNuEDQX/0NHZR/NVn7H74GaqNZ1ZAJiLnJIIyqAUgqTbXyykRYHgjD4HiLCMTGSjEPXfKSXVvQ/AlxgeFH+dHrte/FoeHcV6ymc6GkbdOyt5Mu6ocEdrFtrq7bBuVGzAcClkDuyLkQzgoSQ9e4X/LvNO+Jcrl7grU0iWWwn6ZKYyv+J4lN728SQ4IdIIj1qfSgc8WWqnP3PLfck3XoiulmjCOFAaRX2LvT5rv8UwgKz8gQ/gbUg2gZA/SNQsDqqB8lGr45y0z/rcdD+3RAE8t/fyfH6hWoPwaxVrepKPT6ezpSfAIKsFu2J+eSS+43FLzraOAI3PwhB79jo2klkIXXzzaKj5i/g19aRXTuwZ9/ttuGXJDUgZA7gIqRTPlOkbg/0r3Y/jYwF8yfvcmHB0G1nBCb20UtyMEwbwOwv2aSgMN7HeMHzlT4Twdk9HdE3BU0iiiZmcJqSGYy2PscpWHomx5HHVFMIjhS+NWP3IUvcXjklGf1QSpAzmUCc+A+r+7r4B0hrbY8/0SA9+cW9Bi8ML3lKXAvg9Ra3QK73H94GmEN6Q3ld+bIK2ySWYk48ZJ/mp5ByUK4lIeqtJnW7gy+7a6saLdaLg== 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) --- 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 c607d67c96dc..d2f98b9dce13 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