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 96885C352A1 for ; Wed, 30 Nov 2022 22:08:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C71B46B0096; Wed, 30 Nov 2022 17:08:30 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BF9D76B0098; Wed, 30 Nov 2022 17:08:30 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A4D2A6B0099; Wed, 30 Nov 2022 17:08:30 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 86B176B0096 for ; Wed, 30 Nov 2022 17:08:30 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 4DBE01211C1 for ; Wed, 30 Nov 2022 22:08:30 +0000 (UTC) X-FDA: 80191498380.11.C50FF88 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf25.hostedemail.com (Postfix) with ESMTP id E8990A0013 for ; Wed, 30 Nov 2022 22:08:29 +0000 (UTC) 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=XdUZ+/B1a8lpS36cSldYYXGLY2sJggnamDfVktxibus=; b=wSYzYd+gcAS0OyS39Pteb8Kmi7 0XR76OvpCj2XroqfT5bGk8qgskXN/+XYcI+snuoGPopc918i9YIxBiy95MS6NKqUGGwo+w2bVW2lR g6E7aD8WyfLOKe2QGKwQikLGUK4/Al4TSbWJdxZV8Z6NQX9Miu+VKoUVethIgQu6iYBY0fpa8QnEy jLQiavCTSra4ppZlE9kKr2uoxiLh93U3CGwQkmTGUsbiws+QXN4kdOLJFyfoyYh0vLg1lxu+YN0/K S3BlZLd5JDgH6dIKHk4/ReOWDg/ji7C9+oSF8uK3oRyclV1IkoZDVvOxgVqz4AjpS1+Kb1/Mia4F6 s5N5sNDw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1p0VFM-00FLV2-Qa; Wed, 30 Nov 2022 22:08:04 +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 03/24] page_pool: Add netmem_set_dma_addr() and netmem_get_dma_addr() Date: Wed, 30 Nov 2022 22:07:42 +0000 Message-Id: <20221130220803.3657490-4-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 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1669846110; 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=XdUZ+/B1a8lpS36cSldYYXGLY2sJggnamDfVktxibus=; b=HP3SCPRuC71Av1yyQ2g0i4Y3sXv7kpVgIDOry3nJbaXjmjHZjDCihcbKHWBTu7s01MHVg+ eLkCwSUnx1urW1mHuYoKLlnhiZkWUHvk+VUXPjaUn+DUpZKSXATptAhf10WF1i+w3v3BIM 7oOqP7oM9Ldz2mUkrxp3ni3MqRrElbo= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=wSYzYd+g; spf=none (imf25.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=1669846110; a=rsa-sha256; cv=none; b=T9eRJtUKOHIUrOi9e1BpW6qmIHi82TdthyY3xQ2ZlyMnQn1KoEG/e36WslOTFkYRrqzNhI qKHYFPLet1ZEVcG3ZARWUTtnqoDmxASyfaS6pNCHrbCpJ+29YVn1OS2c6qxU0Nn5hoMmR6 m649NEV1GfusNaWhd4+vno3C31Wbtjg= X-Stat-Signature: o343xt3xumgm9r81s3hkadt5yw5ki5bs X-Rspamd-Queue-Id: E8990A0013 Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=wSYzYd+g; spf=none (imf25.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none X-Rspamd-Server: rspam06 X-Rspam-User: X-HE-Tag: 1669846109-912277 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 0ce20b95290b..a68746a5b99c 100644 --- a/include/net/page_pool.h +++ b/include/net/page_pool.h @@ -427,21 +427,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