From patchwork Wed Jan 11 04:21:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Matthew Wilcox (Oracle)" X-Patchwork-Id: 13095998 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 07C75C5479D for ; Wed, 11 Jan 2023 04:22:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0E29A940009; Tue, 10 Jan 2023 23:22:38 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 090B3940007; Tue, 10 Jan 2023 23:22:37 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DB011940009; Tue, 10 Jan 2023 23:22:37 -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 BBE98940007 for ; Tue, 10 Jan 2023 23:22:37 -0500 (EST) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 8EDDA1406BE for ; Wed, 11 Jan 2023 04:22:37 +0000 (UTC) X-FDA: 80341221954.26.D456949 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf17.hostedemail.com (Postfix) with ESMTP id 1ECA540010 for ; Wed, 11 Jan 2023 04:22:35 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=QqMEVI1e; 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=1673410956; a=rsa-sha256; cv=none; b=boqDZXOh9SN5kKJ7qMWtWt+ZOUNlHE4eLQXXSNYLOkKAe88g5jPCpDe5GTkjo+BwAT63r/ 5Q+IPSRc7ptjXqzFRcitg1dxUmyjqouRC49WMmuqp84fCMyUdRd3AeANPC931/ky1LHBoL /w3LGZuTc4jzriMyTMbXlYGOUV7ef+k= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=QqMEVI1e; 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=1673410956; 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=0azbnQLE/iS8Hxok7qIg20pGmsfVsXiZRb6KS8BjIqY=; b=r63Pn4+jKkA2ZwThw5kaKMK06sGNtPxEVnNRZpLZQgJ73pwaK/GFpraeo66TxIWAkc89Jc Dfb8i6sQbrxgVJ4tWORn2m9qsB4oix1zGCnQ7QUng4RLE88PydHFDKkx0so5jWec4WQNyQ J83BdRmDzdRayaPTS1DZR4P1XEY34CQ= 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=0azbnQLE/iS8Hxok7qIg20pGmsfVsXiZRb6KS8BjIqY=; b=QqMEVI1eVM8Ds6Qm2wr6OiPby+ 0KEYFh7xMhh675MlHV84blnuHBpci3KHmGqP0UsWlt60pEIvf00zvPrMoq27p3UlcbxtnCS0DNbOG i6L2ELQ7Kuu1u3+P2l+IuEBmJ851mjXpTmKG5MdjdeFkQepZ3CBrV1cikM9d2RRI9Qe4biGHqR5ui 0rPqddyAMr1BpWxQ3+8lwQtVgDo9GFrTf53Tt61u4Wy6MtKWOCsc8/QquQlyW2Vn8J3O2RCyghCFZ 4PSHlO9nMD3pBnqXRMWcE4DADJ28gwW7rN8cq/wTFHN35hUIgFMDMYtb06KUuoMlrE44rvOjZ7RUh wH/NcNQw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pFScy-003nxm-DB; Wed, 11 Jan 2023 04:22:16 +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 03/26] page_pool: Add netmem_set_dma_addr() and netmem_get_dma_addr() Date: Wed, 11 Jan 2023 04:21:51 +0000 Message-Id: <20230111042214.907030-4-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 X-Rspam-User: X-Rspamd-Queue-Id: 1ECA540010 X-Rspamd-Server: rspam01 X-Stat-Signature: uyz1ghxp8hymm9nb67gartiz9ocfhyuy X-HE-Tag: 1673410955-21732 X-HE-Meta: U2FsdGVkX1+JngUWpbksMm3CZEhkBCh5se0YuKldhxghVlCBGOXOfOwNZTPABopdEaKKJ/qiV6IkIh0qxG9/ZkWFEa3vrSBFbczUMkmJm9Q7UMd8DTLS2ySK+K7w2eWH7AFTyvHnVMhS9Fku/RgrCGZYgwxuijEQgpa8PzJ0uljnFG30ZvWMwhst8VffUB4anTJnnNMEF2DsvLVvVT5vozl3msAOns2qmzOyUr9aFew2ohwDy+0fVT36QIQSUu+7Jfnl7HknmyRutxlCbdroRHwCO9sNON9fD68G77fmrUG5Bjxux0O0AEslgIwemFA7xItWEr2y2W8fBziY5eUjRf4umCccm4BqYfiEEp8Erjuzhz/1eQY96KFsUdahxgiRuqX73k+XVWFKF12RxjcsCFLPfFwaI0hQtBxCmosD2Ww8V5LfiYJZgw1EfxjB1RWwvUS09+ror2YJXgiLkrIvYpu/9fJQRlkGeJZrBU46jot+//lFVFW/zclIDBZ/MI2oBF9Y9eFRrOHNWir2UpOa4q98AxtvpoITVIzyDOV1djOJW4RV8oaqBVDVAOWjK4Twg8BUZBgi9esCQAD3gU4ko2/EsNbd4xnNY6YbxDLF2Z7aotX4FxrAtNxKUyNndCU+H+0GlVnIoh6KjBLrywACjXuO6Jl3CnzdF6cS21eaSw6RT3Fg4s+8IqWKWA/BZ3IPvunD7udPI2WPYUhSqyEdgTU+vDZgUrBqVnAvKi8znzLI0PFuTj/VXuwZ9f7nBck7MNs22MNS4dcqNVppa2hu/ecwrDLcU4Prm5qoJPJ7jvjcGeYM1NVFzGFYh5LWoHHOJNJQZzlE1w1W2hxzP2mQioRQ4wpryhdPC+NVbRDF/KErLeB3S4Hm4Iinh7EA2IdxvoVI3NRDVxtdfO8YZcjDWO7bKw7h0CAWGOWClf0kYl1YIyQqGJg6UQ== 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: Turn page_pool_set_dma_addr() and page_pool_get_dma_addr() into wrappers. Signed-off-by: Matthew Wilcox (Oracle) Acked-by: Jesper Dangaard Brouer Reviewed-by: Ilias Apalodimas Reviewed-by: Jesse Brandeburg --- include/net/page_pool.h | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/include/net/page_pool.h b/include/net/page_pool.h index 414907e67ff6..ff4d11d43697 100644 --- a/include/net/page_pool.h +++ b/include/net/page_pool.h @@ -449,21 +449,33 @@ static inline void page_pool_recycle_direct(struct page_pool *pool, #define PAGE_POOL_DMA_USE_PP_FRAG_COUNT \ (sizeof(dma_addr_t) > sizeof(unsigned long)) -static inline dma_addr_t page_pool_get_dma_addr(struct page *page) +static inline dma_addr_t netmem_get_dma_addr(struct netmem *nmem) { - dma_addr_t ret = page->dma_addr; + dma_addr_t ret = nmem->dma_addr; if (PAGE_POOL_DMA_USE_PP_FRAG_COUNT) - ret |= (dma_addr_t)page->dma_addr_upper << 16 << 16; + ret |= (dma_addr_t)nmem->dma_addr_upper << 16 << 16; return ret; } -static inline void page_pool_set_dma_addr(struct page *page, dma_addr_t addr) +/* Compat, remove when all users gone */ +static inline dma_addr_t page_pool_get_dma_addr(struct page *page) +{ + return netmem_get_dma_addr(page_netmem(page)); +} + +static inline void netmem_set_dma_addr(struct netmem *nmem, dma_addr_t addr) { - page->dma_addr = addr; + nmem->dma_addr = addr; if (PAGE_POOL_DMA_USE_PP_FRAG_COUNT) - page->dma_addr_upper = upper_32_bits(addr); + nmem->dma_addr_upper = upper_32_bits(addr); +} + +/* Compat, remove when all users gone */ +static inline void page_pool_set_dma_addr(struct page *page, dma_addr_t addr) +{ + netmem_set_dma_addr(page_netmem(page), addr); } static inline bool is_page_pool_compiled_in(void)