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 ACD73C4708E for ; Thu, 5 Jan 2023 21:46:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 56B2990000B; Thu, 5 Jan 2023 16:46:38 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 51D40900009; Thu, 5 Jan 2023 16:46:38 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2FC4D90000C; Thu, 5 Jan 2023 16:46:38 -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 03BFE900009 for ; Thu, 5 Jan 2023 16:46:38 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id CC5A81A0B36 for ; Thu, 5 Jan 2023 21:46:37 +0000 (UTC) X-FDA: 80322080034.13.83122DD Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf12.hostedemail.com (Postfix) with ESMTP id 2996340003 for ; Thu, 5 Jan 2023 21:46:35 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b="n/jZKMKK"; spf=none (imf12.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=1672955196; 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=W4vmcDs403XfI6fIMo3T6IvLzSI+XWgXJovz62XtHH4=; b=3EAu1UafzYuQakyLKlqXb/iLiJoM9VzEluTONAOIDnJ4oL9udNSf5+L+IL1IKdSk4W7DRJ iXafcaggpiTrzkmpcfu+t4It/Dn6WNkSJ3pRKMP+a7ERhEZm2nWQTYqoDb/3HPMBngT7ND 86A6GO0JSY1bxl8Ap+IpguUgkN+twdA= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b="n/jZKMKK"; spf=none (imf12.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=1672955196; a=rsa-sha256; cv=none; b=5dwJ+pf1lRTP1P9cZLtbs6fwDhQHrwJVfclPcxGV3IpJ4jlYghpB9fu5Zkkcu939YYxuVN DJdZqBGvzyFDyF2xYGUICWRTbj6YGTNP9Kck45rupTHpFqeyTKkZjE7yHIdSykw6tTKdQF +1h39zylwxmjWA4qFPIUHKCX4IWaLpw= 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=W4vmcDs403XfI6fIMo3T6IvLzSI+XWgXJovz62XtHH4=; b=n/jZKMKK3aiij1j6pwIiyMsZPm T0LjJu2/hgZfcGGpORq5I3fkh6vjf2ZKIx0yDWVk8CTcXUTGPUYQ9qnemDEcqsErYirn5x9Xl9B4y cqHpI5wfN0H8tp6hqSvs4TKCHnOp59S59dziMWbcx0P9dExsK85AS5+rsPL5SJ76B7f8WMQAvMi5u aXfld+Pha+MGc5RD9BgmOfvMgFJ3KmAyX1lO0PrY/Hgu+nKUEunqtWbe+OEj8g9vfBHpmbIBWHpHQ TscltBITtNKX7ER8xSJ2WOJ4odicjBxlP/k2jhN+wor/+3/wDTQ6hZBalby9WbVcCBMfqpqq73dY3 7mhXMXwQ==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDY4H-00GWmz-FE; Thu, 05 Jan 2023 21:46:33 +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 03/24] page_pool: Add netmem_set_dma_addr() and netmem_get_dma_addr() Date: Thu, 5 Jan 2023 21:46:10 +0000 Message-Id: <20230105214631.3939268-4-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: rspam05 X-Rspamd-Queue-Id: 2996340003 X-Stat-Signature: 3pta9i3ywpsbnb4qhrhgiugfhu778ndf X-Rspam-User: X-HE-Tag: 1672955195-969347 X-HE-Meta: U2FsdGVkX19SIZpbBFtTNEuq0YraAW2iBwyPsw81esbZ/573GWTJMGZzm7YjK5DOFSQUuPWHDbHVehs/fLj68AUW1RmQpmHjroNPs6vU2kwf2oL+9nKMF3t60BLkyoJCPIuP0yfVqj++eXjNu/Zmhw4wWVDOg+mYb2BWTj+DEIiycmy9Sbd3Hy7JZgs/bQh/dNbYttvtU7iHyg0GwiUjz625yN9D5rwDlqwY/OQaOb3d64hYsSmenVsuGXqFo9Q1Dy41ZThLFAtwTXqUT9El12q1NCtK36eib85Th4eIymA/EuL48EWp224iVY4CCO9Hr8T/MICqWHqmYZMF2dHzSa0KOXXPyILG7FdSlsuPnNmq4lexfetn7htgzl/w2UvSa1cl3/BO8zzJsjzcWq7Cy56Nb6oLa7Yd49VFRh8q5imMWY12oKDjAy/xvBio3QuRFDLC+ECysRwTdvS7bXq3+PdZQnJ4oyn9LZqX5Bwgm5pKw6fZHLjFt/l2AKjIvEnGfRhJE6IWua/t/C1TZTHAB1o9rUV419YhqefwTvTZLSm8mZqOU7FmjSnr6hXrEM0Zs7KT2IIzI0NgPWkprJf1I5aaxS4U5hfS16K1ejrNimdJoUpJu+m32a7dnlxb93baoEPQ1MPfxeA01CKQOj0PGfx8ZLUjr+2wt7WFBesXe0p//kKIV3X+AWA7ermJbNS1Yz6F3R94Sf+M24tmSVmLVR/Vlfqvi8Kc0alQ6keShHlAH2WoS8lTTrzQa3RxQy2r5LY2xbBHUK0D66ukbEYle9/8naZ5jxUf50S5XaKfeIzvV5qTUPMcyc9TLnGEERBs4o1fCtAcHRzm87LgYNyHxHPMpA21Ez3i1QlaOUmYIJoz7riQHXDBcu+J95urmGVDAibyf7gri5mCCsdtoJqE+8tfP7tKAJ3GZO+7f2ySC2TN5XGJi+T+gw== 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) --- include/net/page_pool.h | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/include/net/page_pool.h b/include/net/page_pool.h index 84b4ea8af015..196b585763d9 100644 --- a/include/net/page_pool.h +++ b/include/net/page_pool.h @@ -449,21 +449,31 @@ 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) +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); +} + +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) -- 2.35.1