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 1C322C352A1 for ; Tue, 6 Dec 2022 16:05:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 82A538E0005; Tue, 6 Dec 2022 11:05:45 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7D9348E0001; Tue, 6 Dec 2022 11:05:45 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6A23A8E0005; Tue, 6 Dec 2022 11:05:45 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 5D11F8E0001 for ; Tue, 6 Dec 2022 11:05:45 -0500 (EST) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 0885BA05E1 for ; Tue, 6 Dec 2022 16:05:45 +0000 (UTC) X-FDA: 80212357050.26.EA3363A Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf21.hostedemail.com (Postfix) with ESMTP id 335DA1C0012 for ; Tue, 6 Dec 2022 16:05:42 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=AlPNq+68; dmarc=none; spf=none (imf21.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1670342743; 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=4icAOvmrxTKchMrADp++FcHPPFRR8CrUb6dlnPoOzwg=; b=p/5eylZnX55q6HI7KTLmgXEGGPLDsA8v/kfNZmidLPz9nwT1zA0qs6IyUbC7a2PI7X+4dG LmxacffYS3B/J3OIl71C4Do1QvPZarwJUgeTu7m6KM5WvdAm7j9FLNuLje8Q56KgeBh5ol PFTsAQjMV18MHawlzg59xxZyVqPDrp8= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=AlPNq+68; dmarc=none; spf=none (imf21.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1670342743; a=rsa-sha256; cv=none; b=Cq3mV/TpsOQtv4OAfO4lPAfimNuE3BoqK8Tmt2r9NtwS9RPp3vOEUDyGYRGLPZqK0/gOi8 7GTzaNBkA9eeX65pVZMd75HL5RmFlkOChK0gNo7cQtMvi/YliXV1xcCVoWvuyUsbwZ/xyp ROPlfoMcEfarOrjE/Of30gzZ0bXvtBw= 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=4icAOvmrxTKchMrADp++FcHPPFRR8CrUb6dlnPoOzwg=; b=AlPNq+68y2pVteEGObEwIqxqNG w47ES80i4MSal/x+QtESa8ln4fY9Ig+suDfDv5o+9uPrAvZE59sKf5ujHFFhlO0LuH5ZAr/+Oz03K RK98ssOFJz0Fg+5abxSlTZtEnxJAYJexTTfKGgW1hs464jVX5oIDEpe/k9Ptxoo1+OQmk0K3/JmZ+ uD3YNC3PmVgXDtVUZ/Pk9KIXLyW8Vj3AZNckV8HovmlQ6We+fV4121Y7MVK5Wrk2EPgo+lPnBbzAV n62kBU1xzl17809N27C/j4/q4ppdPBOeUZuCk5nH45BXuXny0SL7j79UMHJ7JNMGVU/OD0ChscirV Kzw93ybw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1p2aRv-004aAm-6J; Tue, 06 Dec 2022 16:05:39 +0000 From: "Matthew Wilcox (Oracle)" To: Jesper Dangaard Brouer , Ilias Apalodimas Cc: "Matthew Wilcox (Oracle)" , netdev@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 25/26] netpool: Additional utility functions Date: Tue, 6 Dec 2022 16:05:36 +0000 Message-Id: <20221206160537.1092343-1-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20221130220803.3657490-1-willy@infradead.org> References: <20221130220803.3657490-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Result: default: False [-2.70 / 9.00]; BAYES_HAM(-6.00)[99.99%]; R_MISSING_CHARSET(2.50)[]; MID_CONTAINS_FROM(1.00)[]; R_DKIM_ALLOW(-0.20)[infradead.org:s=casper.20170209]; MIME_GOOD(-0.10)[text/plain]; RCVD_NO_TLS_LAST(0.10)[]; R_SPF_NA(0.00)[no SPF record]; MIME_TRACE(0.00)[0:+]; FROM_EQ_ENVFROM(0.00)[]; DKIM_TRACE(0.00)[infradead.org:+]; RCPT_COUNT_FIVE(0.00)[5]; RCVD_COUNT_TWO(0.00)[2]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_SOME(0.00)[]; ARC_SIGNED(0.00)[hostedemail.com:s=arc-20220608:i=1]; DMARC_NA(0.00)[infradead.org]; ARC_NA(0.00)[] X-Rspamd-Queue-Id: 335DA1C0012 X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: cea66o6w3uhpx9ehqwsh1j5u3rhcbzsj X-HE-Tag: 1670342742-461234 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: To be folded into earlier commit --- include/net/page_pool.h | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/include/net/page_pool.h b/include/net/page_pool.h index 4878fe30f52c..94bad45ed8d0 100644 --- a/include/net/page_pool.h +++ b/include/net/page_pool.h @@ -117,16 +117,28 @@ static inline void *netmem_to_virt(const struct netmem *nmem) return page_to_virt(netmem_page(nmem)); } +static inline void *netmem_address(const struct netmem *nmem) +{ + return page_address(netmem_page(nmem)); +} + static inline int netmem_ref_count(const struct netmem *nmem) { return page_ref_count(netmem_page(nmem)); } +static inline void netmem_get(struct netmem *nmem) +{ + struct folio *folio = (struct folio *)nmem; + + folio_get(folio); +} + static inline void netmem_put(struct netmem *nmem) { struct folio *folio = (struct folio *)nmem; - return folio_put(folio); + folio_put(folio); } static inline bool netmem_is_pfmemalloc(const struct netmem *nmem) @@ -295,6 +307,11 @@ struct page_pool { struct netmem *page_pool_alloc_netmem(struct page_pool *pool, gfp_t gfp); +static inline struct netmem *page_pool_dev_alloc_netmem(struct page_pool *pool) +{ + return page_pool_alloc_netmem(pool, GFP_ATOMIC | __GFP_NOWARN); +} + static inline struct page *page_pool_alloc_pages(struct page_pool *pool, gfp_t gfp) { @@ -452,6 +469,12 @@ static inline void page_pool_recycle_direct(struct page_pool *pool, page_pool_put_full_page(pool, page, true); } +static inline void page_pool_recycle_netmem(struct page_pool *pool, + struct netmem *nmem) +{ + page_pool_put_full_netmem(pool, nmem, true); +} + #define PAGE_POOL_DMA_USE_PP_FRAG_COUNT \ (sizeof(dma_addr_t) > sizeof(unsigned long)) -- 2.35.1