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 A5099C3DA7A for ; Thu, 5 Jan 2023 21:46:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 53204900006; Thu, 5 Jan 2023 16:46:36 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 014FD900002; Thu, 5 Jan 2023 16:46:35 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CC3348E0008; Thu, 5 Jan 2023 16:46:35 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 8F3EF900002 for ; Thu, 5 Jan 2023 16:46:35 -0500 (EST) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 4C05B1609B1 for ; Thu, 5 Jan 2023 21:46:35 +0000 (UTC) X-FDA: 80322079950.30.078F22F Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf20.hostedemail.com (Postfix) with ESMTP id C28091C0007 for ; Thu, 5 Jan 2023 21:46:33 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=i9ijuvOF; 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=1672955193; 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=Go7QGIGQsO8rLobpKFmZxg0grUkeRc8v5+9IoJUhrYw=; b=sSrB8hSSEI+j4mtW/nmGfxGt6x85mTNh3ErSOYdEnqPwe5xPf1n3jQj3ohthWzFG+2tUrg dSRq906MuZ0T2zhJYvs+/pwGIchiLzb5nogox6kIcC20dWHFM5Vlo1qxaD4eLZz9WRIonx kZMijNN7XYc1Zp7yZAQ3fubEVFIZxCs= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=i9ijuvOF; 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=1672955193; a=rsa-sha256; cv=none; b=PkGwes4NNRptet8kJTSV8ZE1qeSzohx5HrPj8L32mY8/ndxKOJFiJr1Keor2aCY/gWQr3z B/rtCiELskuaOnZk1jrKG49au6n0tUJY9iOuHRRBTZQ8ivS0PXLrcS3xdD8IypIOq7uwLO jBUjbGgTXQR6rUMoNp98WBgvLMcoKd4= 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=Go7QGIGQsO8rLobpKFmZxg0grUkeRc8v5+9IoJUhrYw=; b=i9ijuvOFde1802UamBYB/rtJ9T +OsoqrraDtdWTimBPLx8HymlABrDqNhVghPTbp8oIVYguHUKqy8ARPmXTyM6wJqad7VDbe0fuGTCI 2BD0SnAfh1SgjLhC6xHNki5BIh7qsjAsAEprSXYSsCHiAJqnDD/hjyTuQsBkJwD4ulWBTcYyJij47 DPQPh3Q+6C4QKqaq+WsWVVeNPYC9ySi8IdNDEDEpyu98caq267NsbHGYCiYM4/g76l/0N2pG5eV3x USU2HXHXUIOX/3W95tQXE7HW4Mx+NFqJ9UsxVipDhAjCgHhiPnRy3LrcMm2ibKSG+c9mMWLKSwHMW iy+LcxLA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDY4J-00GWor-P6; 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 23/24] mvneta: Convert to netmem Date: Thu, 5 Jan 2023 21:46:30 +0000 Message-Id: <20230105214631.3939268-24-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: C28091C0007 X-Rspam-User: X-Stat-Signature: wqie7dd8s55n8rehwre4ox1awnfkehmk X-HE-Tag: 1672955193-101368 X-HE-Meta: U2FsdGVkX18btinjALspSUFzMm8611S2DUi3PONCtzyMohZe5ahr9R1n5/jnR4ad43Qtj/czmVMvdlXF7/eko+zcRB6KeR2hJHByBilhk2tMjowl1pbQM5fapGiHtaYcH4cz9bNIIMoM6eJrZVULJQZ0ndbBFt9u0IzLImyE0E6wM7NTQKh34ybIeWX7vehXdBR8mIGAq0abGlyU/Xd66ctKD4FioZ3ULtv6XADDQtgiWnbxkA7tAdsWSgWmdVBHebazE004tITlJbkC4BWGnHIrz2VqaVy4Q1v5YiVltZG4JeFOyLdz4FDLQ8GmIe2HdkAL0QZsfs9athmuZx7zy0XoyEiuMWvwwFsd6q3ChDMQZ+uDxyULDzm1n8f0BVuTdKAaz0bshwgn1KmQ9k/uUjTEqFNCvoFv4EoDod9Z+jE3kCMGX3xSH7CMHiy96gxLpoQYXCQhEGFsPszLbhxMQoh3XnR0XkecdI2v73q8df3eUSDn9D3vmG5Bnyjen1Zq0HdgEUgwzvdzmBp2OUDHg6pkHLFDOVB1fYGoIeQfmHU5k/bf6r1wBdLk+pbVywqGqfPNz6WCcK9cb9NUXoyL/s5SYKY74YM6EEijpDAJix53XlSj6AEITj/m6mWIuJGYoYnRH5Dm9tLPCxlA7HuaPxFDBs0lWUp666uKu+6YcLjLqrtRc+TViGAL3+FT+pck7o8d7Yr2Onl5MLucEdRvV0v0ubGVq0UjUMhncLqCUYJbdcaql623StIG4xpOhkS45EXk9kivkOGlPKgonIvLNkY6VQdODBPbPtxsVfkvyZW2opB2VOBMvn5PTVl3S5DuWGHook/e53E6BXPA/PFkrp/Ak3kEtoE4Blz2YWU+hX9OD8VchU6pZz08lFkvB6l6 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: Use the netmem APIs instead of the page APIs. Improves type-safety. Signed-off-by: Matthew Wilcox (Oracle) --- drivers/net/ethernet/marvell/mvneta.c | 48 +++++++++++++-------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c index f8925cac61e4..6177d2ffd33c 100644 --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c @@ -1931,15 +1931,15 @@ static int mvneta_rx_refill(struct mvneta_port *pp, gfp_t gfp_mask) { dma_addr_t phys_addr; - struct page *page; + struct netmem *nmem; - page = page_pool_alloc_pages(rxq->page_pool, + nmem = page_pool_alloc_netmem(rxq->page_pool, gfp_mask | __GFP_NOWARN); - if (!page) + if (!nmem) return -ENOMEM; - phys_addr = page_pool_get_dma_addr(page) + pp->rx_offset_correction; - mvneta_rx_desc_fill(rx_desc, phys_addr, page, rxq); + phys_addr = netmem_get_dma_addr(nmem) + pp->rx_offset_correction; + mvneta_rx_desc_fill(rx_desc, phys_addr, nmem, rxq); return 0; } @@ -2006,7 +2006,7 @@ static void mvneta_rxq_drop_pkts(struct mvneta_port *pp, if (!data || !(rx_desc->buf_phys_addr)) continue; - page_pool_put_full_page(rxq->page_pool, data, false); + page_pool_put_full_netmem(rxq->page_pool, data, false); } if (xdp_rxq_info_is_reg(&rxq->xdp_rxq)) xdp_rxq_info_unreg(&rxq->xdp_rxq); @@ -2072,11 +2072,11 @@ mvneta_xdp_put_buff(struct mvneta_port *pp, struct mvneta_rx_queue *rxq, goto out; for (i = 0; i < sinfo->nr_frags; i++) - page_pool_put_full_page(rxq->page_pool, - skb_frag_page(&sinfo->frags[i]), true); + page_pool_put_full_netmem(rxq->page_pool, + skb_frag_netmem(&sinfo->frags[i]), true); out: - page_pool_put_page(rxq->page_pool, virt_to_head_page(xdp->data), + page_pool_put_netmem(rxq->page_pool, virt_to_netmem(xdp->data), sync_len, true); } @@ -2088,7 +2088,6 @@ mvneta_xdp_submit_frame(struct mvneta_port *pp, struct mvneta_tx_queue *txq, struct device *dev = pp->dev->dev.parent; struct mvneta_tx_desc *tx_desc; int i, num_frames = 1; - struct page *page; if (unlikely(xdp_frame_has_frags(xdpf))) num_frames += sinfo->nr_frags; @@ -2123,9 +2122,10 @@ mvneta_xdp_submit_frame(struct mvneta_port *pp, struct mvneta_tx_queue *txq, buf->type = MVNETA_TYPE_XDP_NDO; } else { - page = unlikely(frag) ? skb_frag_page(frag) - : virt_to_page(xdpf->data); - dma_addr = page_pool_get_dma_addr(page); + struct netmem *nmem = unlikely(frag) ? + skb_frag_netmem(frag) : + virt_to_netmem(xdpf->data); + dma_addr = netmem_get_dma_addr(nmem); if (unlikely(frag)) dma_addr += skb_frag_off(frag); else @@ -2308,9 +2308,9 @@ mvneta_swbm_rx_frame(struct mvneta_port *pp, struct mvneta_rx_desc *rx_desc, struct mvneta_rx_queue *rxq, struct xdp_buff *xdp, int *size, - struct page *page) + struct netmem *nmem) { - unsigned char *data = page_address(page); + unsigned char *data = netmem_to_virt(nmem); int data_len = -MVNETA_MH_SIZE, len; struct net_device *dev = pp->dev; enum dma_data_direction dma_dir; @@ -2343,7 +2343,7 @@ mvneta_swbm_add_rx_fragment(struct mvneta_port *pp, struct mvneta_rx_desc *rx_desc, struct mvneta_rx_queue *rxq, struct xdp_buff *xdp, int *size, - struct page *page) + struct netmem *nmem) { struct skb_shared_info *sinfo = xdp_get_shared_info_from_buff(xdp); struct net_device *dev = pp->dev; @@ -2371,16 +2371,16 @@ mvneta_swbm_add_rx_fragment(struct mvneta_port *pp, skb_frag_off_set(frag, pp->rx_offset_correction); skb_frag_size_set(frag, data_len); - __skb_frag_set_page(frag, page); + __skb_frag_set_netmem(frag, nmem); if (!xdp_buff_has_frags(xdp)) { sinfo->xdp_frags_size = *size; xdp_buff_set_frags_flag(xdp); } - if (page_is_pfmemalloc(page)) + if (netmem_is_pfmemalloc(nmem)) xdp_buff_set_frag_pfmemalloc(xdp); } else { - page_pool_put_full_page(rxq->page_pool, page, true); + page_pool_put_full_netmem(rxq->page_pool, nmem, true); } *size -= len; } @@ -2440,10 +2440,10 @@ static int mvneta_rx_swbm(struct napi_struct *napi, struct mvneta_rx_desc *rx_desc = mvneta_rxq_next_desc_get(rxq); u32 rx_status, index; struct sk_buff *skb; - struct page *page; + struct netmem *nmem; index = rx_desc - rxq->descs; - page = (struct page *)rxq->buf_virt_addr[index]; + nmem = rxq->buf_virt_addr[index]; rx_status = rx_desc->status; rx_proc++; @@ -2461,17 +2461,17 @@ static int mvneta_rx_swbm(struct napi_struct *napi, desc_status = rx_status; mvneta_swbm_rx_frame(pp, rx_desc, rxq, &xdp_buf, - &size, page); + &size, nmem); } else { if (unlikely(!xdp_buf.data_hard_start)) { rx_desc->buf_phys_addr = 0; - page_pool_put_full_page(rxq->page_pool, page, + page_pool_put_full_netmem(rxq->page_pool, nmem, true); goto next; } mvneta_swbm_add_rx_fragment(pp, rx_desc, rxq, &xdp_buf, - &size, page); + &size, nmem); } /* Middle or Last descriptor */ if (!(rx_status & MVNETA_RXD_LAST_DESC)) -- 2.35.1