From patchwork Tue Jan 30 11:37:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yunsheng Lin X-Patchwork-Id: 13537371 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 0C504C46CD2 for ; Tue, 30 Jan 2024 11:38:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DE3B86B0087; Tue, 30 Jan 2024 06:38:11 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D43206B008C; Tue, 30 Jan 2024 06:38:11 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B6FE26B0092; Tue, 30 Jan 2024 06:38:11 -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 A69786B0087 for ; Tue, 30 Jan 2024 06:38:11 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 7FAD71204C2 for ; Tue, 30 Jan 2024 11:38:11 +0000 (UTC) X-FDA: 81735778782.11.2DA08EA Received: from szxga05-in.huawei.com (szxga05-in.huawei.com [45.249.212.191]) by imf03.hostedemail.com (Postfix) with ESMTP id A286120015 for ; Tue, 30 Jan 2024 11:38:08 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf03.hostedemail.com: domain of linyunsheng@huawei.com designates 45.249.212.191 as permitted sender) smtp.mailfrom=linyunsheng@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706614689; a=rsa-sha256; cv=none; b=R+QwOlH/NKs7vTUvS+0cJmJr+MlX9U+0iWcYar2NhVCTKql7SsXUb5WkjQmIynqYwvhwvv ptehWD6jK4DyRfHsKy6s2aw+le8bYuxtmO7hDuDFYeyAu2mruXZgBhkx7gEP3cSPMFd/7C AcEMnvVq8y/KqdIgjn3RsoUevmpUSfQ= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf03.hostedemail.com: domain of linyunsheng@huawei.com designates 45.249.212.191 as permitted sender) smtp.mailfrom=linyunsheng@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1706614689; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LFeLLnJaR3JtjOxpUpdms1bffkbapejcBiKMtBdfGb8=; b=KPgjKqs1967IhuNj68xlw8v+ASmby+FAmkjTA8SadxX9XZ7dOFIIIBtgTzsQQybtgE56G2 hNi/et/pZzFfQN6SXQqP4M/iYTQekM6hteCP7iq9SuIUUkujEEFfCcES0DDua1gae5BJIe ShhWX34WlpaztxWlmypYKVSGfmjeHvU= Received: from mail.maildlp.com (unknown [172.19.162.112]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4TPNR22P6rz1gy1H; Tue, 30 Jan 2024 19:36:14 +0800 (CST) Received: from dggpemm500005.china.huawei.com (unknown [7.185.36.74]) by mail.maildlp.com (Postfix) with ESMTPS id B48431404D7; Tue, 30 Jan 2024 19:38:03 +0800 (CST) Received: from localhost.localdomain (10.69.192.56) by dggpemm500005.china.huawei.com (7.185.36.74) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Tue, 30 Jan 2024 19:38:03 +0800 From: Yunsheng Lin To: , , CC: , , Yunsheng Lin , Jason Wang , Alexander Duyck , Jeroen de Borst , Praveen Kaligineedi , Shailend Chand , Eric Dumazet , Felix Fietkau , Sean Wang , Mark Lee , Lorenzo Bianconi , Matthias Brugger , AngeloGioacchino Del Regno , Keith Busch , Jens Axboe , Christoph Hellwig , Sagi Grimberg , Chaitanya Kulkarni , Andrew Morton , , , , Subject: [PATCH net-next v4 3/5] net: introduce page_frag_cache_drain() Date: Tue, 30 Jan 2024 19:37:08 +0800 Message-ID: <20240130113710.34511-4-linyunsheng@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20240130113710.34511-1-linyunsheng@huawei.com> References: <20240130113710.34511-1-linyunsheng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To dggpemm500005.china.huawei.com (7.185.36.74) X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: A286120015 X-Stat-Signature: oqc4qczey1fchep7o1x4rnxp645n616w X-Rspam-User: X-HE-Tag: 1706614688-751380 X-HE-Meta: U2FsdGVkX19pcoNpluN2ALxZ9xntrUPdmqAEToCa89MZ2RCLu75fT+C356/GmsGiGcmx416somse5jEaY0IcMDvQyv0HP/W3YvNyjRoaKVQR71XgiwFGezAtV52ZCjBlyetLKSkSdvlDxa9BrShYTev4I91qsPBEU6+5gz+Gx9Qjla3GxxSuNbWvE+w4B9Kex1FGy3WkGn/vKUT43SEBH/NVKxUPqNZ6v0SNRGk0TqIruLK41yUy9RjXOjKpSctOJUkdKz7WsYM/Qz6GAGcUgCU0x0izA5PcoG3qRN9gE3d1OWnNv+WfmAOjskzjXhc7r4z+Q5FdAtiWPt5y/aOZpIVHD1RCg1xnV39hLrYHKGZTAH7jlK/qu8XY2KrUgflYsKljuOUNvY0tkasDULF1845ShWYNEoZw3KGoNjzilPv0V2CYlYLLoXliFvC+sZtfMYt3KSDHeV3Ooqg37onAgu2v/x78bjZdgCMakd6IeXHnVaFY+0D3vEyDqsyLBA/6Z6ef/9UtPcYM5dheFXsuqxjcGw9RhnO/ztl35xUHBodGXw53/k4/JtlHsXLqYDNPS0VdElnox53Roj8iohHZY9AO+diYgIoIYT0JEpWGGOTdCdGbd8Y23QmTsuIoRcGVLMLIGV8Qh124fKuPEL5tOtW+B7MuN9LulTBa61CM98WziBMS/lDcfAln5dV0JFmFD41TLekbvusPYUG7uwqCwlNAAvNUNPCuRpefK5wttyaLyRwGuUtw19/sHK60RPGZQLeBrMIvgvU/Z1qD6Hv4H3A/MRNnlBhCGlCph6KqqtvhyJpbCumxt6FsBnppABvPSPn1NRf8XNUaXbabtWWov+rdee4RpML+ynJkgGKPq9+qVaVfgBVPqHfOCO98YW8OeiUBTUCsjw2WGK8GfstSN5FAUHtZrayMYZiiLAmdDyfUGnOUW/L1sp3r+jEZ1RbRVj4kkDUiIjfxUgYqRDY bk5wcciF 8R8JAuL+OPhlNH9GeOPjt4vH7rMrr3ClmwzIJuobh0exiJ1FLrzIpU4wEET1mLRvudAxhEct2pSyqk+82dgm+Yd5P1Kj737bQ99Gzu9AZ7XUm3goefnOYcLzM/ZM/8Oo6/4Ct0Wfo0jynyCNNvas/IlBuEbH8A965FuwpbSny8e8bPONiwr8mmxK4FUDMIyXfAO1ngXzAhfpWC0oSxlNFJZYuAUv9Lri/TmhMekTW3T2YYhSRbYZfPA3aWpVonER92dhHu2t/k8j+9hDYO1i0k4ekm4QTxz5/OO2gJmLT1P5lHt36X7OMC6jUVLWzYff0n9DLwb4l7eVsWPAHZmfEd/629w== 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: List-Subscribe: List-Unsubscribe: When draining a page_frag_cache, most user are doing the similar steps, so introduce an API to avoid code duplication. Signed-off-by: Yunsheng Lin Acked-by: Jason Wang Reviewed-by: Alexander Duyck --- drivers/net/ethernet/google/gve/gve_main.c | 11 ++--------- drivers/net/ethernet/mediatek/mtk_wed_wo.c | 17 ++--------------- drivers/nvme/host/tcp.c | 7 +------ drivers/nvme/target/tcp.c | 4 +--- include/linux/gfp.h | 1 + mm/page_alloc.c | 10 ++++++++++ 6 files changed, 17 insertions(+), 33 deletions(-) diff --git a/drivers/net/ethernet/google/gve/gve_main.c b/drivers/net/ethernet/google/gve/gve_main.c index db6d9ae7cd78..dec6458bb8d7 100644 --- a/drivers/net/ethernet/google/gve/gve_main.c +++ b/drivers/net/ethernet/google/gve/gve_main.c @@ -1276,17 +1276,10 @@ static void gve_unreg_xdp_info(struct gve_priv *priv) static void gve_drain_page_cache(struct gve_priv *priv) { - struct page_frag_cache *nc; int i; - for (i = 0; i < priv->rx_cfg.num_queues; i++) { - nc = &priv->rx[i].page_cache; - if (nc->va) { - __page_frag_cache_drain(virt_to_page(nc->va), - nc->pagecnt_bias); - nc->va = NULL; - } - } + for (i = 0; i < priv->rx_cfg.num_queues; i++) + page_frag_cache_drain(&priv->rx[i].page_cache); } static void gve_qpls_get_curr_alloc_cfg(struct gve_priv *priv, diff --git a/drivers/net/ethernet/mediatek/mtk_wed_wo.c b/drivers/net/ethernet/mediatek/mtk_wed_wo.c index d58b07e7e123..7063c78bd35f 100644 --- a/drivers/net/ethernet/mediatek/mtk_wed_wo.c +++ b/drivers/net/ethernet/mediatek/mtk_wed_wo.c @@ -286,7 +286,6 @@ mtk_wed_wo_queue_free(struct mtk_wed_wo *wo, struct mtk_wed_wo_queue *q) static void mtk_wed_wo_queue_tx_clean(struct mtk_wed_wo *wo, struct mtk_wed_wo_queue *q) { - struct page *page; int i; for (i = 0; i < q->n_desc; i++) { @@ -301,19 +300,12 @@ mtk_wed_wo_queue_tx_clean(struct mtk_wed_wo *wo, struct mtk_wed_wo_queue *q) entry->buf = NULL; } - if (!q->cache.va) - return; - - page = virt_to_page(q->cache.va); - __page_frag_cache_drain(page, q->cache.pagecnt_bias); - memset(&q->cache, 0, sizeof(q->cache)); + page_frag_cache_drain(&q->cache); } static void mtk_wed_wo_queue_rx_clean(struct mtk_wed_wo *wo, struct mtk_wed_wo_queue *q) { - struct page *page; - for (;;) { void *buf = mtk_wed_wo_dequeue(wo, q, NULL, true); @@ -323,12 +315,7 @@ mtk_wed_wo_queue_rx_clean(struct mtk_wed_wo *wo, struct mtk_wed_wo_queue *q) skb_free_frag(buf); } - if (!q->cache.va) - return; - - page = virt_to_page(q->cache.va); - __page_frag_cache_drain(page, q->cache.pagecnt_bias); - memset(&q->cache, 0, sizeof(q->cache)); + page_frag_cache_drain(&q->cache); } static void diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c index d058d990532b..22e1fb9c9c0f 100644 --- a/drivers/nvme/host/tcp.c +++ b/drivers/nvme/host/tcp.c @@ -1344,7 +1344,6 @@ static int nvme_tcp_alloc_async_req(struct nvme_tcp_ctrl *ctrl) static void nvme_tcp_free_queue(struct nvme_ctrl *nctrl, int qid) { - struct page *page; struct nvme_tcp_ctrl *ctrl = to_tcp_ctrl(nctrl); struct nvme_tcp_queue *queue = &ctrl->queues[qid]; unsigned int noreclaim_flag; @@ -1355,11 +1354,7 @@ static void nvme_tcp_free_queue(struct nvme_ctrl *nctrl, int qid) if (queue->hdr_digest || queue->data_digest) nvme_tcp_free_crypto(queue); - if (queue->pf_cache.va) { - page = virt_to_head_page(queue->pf_cache.va); - __page_frag_cache_drain(page, queue->pf_cache.pagecnt_bias); - queue->pf_cache.va = NULL; - } + page_frag_cache_drain(&queue->pf_cache); noreclaim_flag = memalloc_noreclaim_save(); /* ->sock will be released by fput() */ diff --git a/drivers/nvme/target/tcp.c b/drivers/nvme/target/tcp.c index 6a1e6bb80062..56224dc59f17 100644 --- a/drivers/nvme/target/tcp.c +++ b/drivers/nvme/target/tcp.c @@ -1591,7 +1591,6 @@ static void nvmet_tcp_free_cmd_data_in_buffers(struct nvmet_tcp_queue *queue) static void nvmet_tcp_release_queue_work(struct work_struct *w) { - struct page *page; struct nvmet_tcp_queue *queue = container_of(w, struct nvmet_tcp_queue, release_work); @@ -1615,8 +1614,7 @@ static void nvmet_tcp_release_queue_work(struct work_struct *w) if (queue->hdr_digest || queue->data_digest) nvmet_tcp_free_crypto(queue); ida_free(&nvmet_tcp_queue_ida, queue->idx); - page = virt_to_head_page(queue->pf_cache.va); - __page_frag_cache_drain(page, queue->pf_cache.pagecnt_bias); + page_frag_cache_drain(&queue->pf_cache); kfree(queue); } diff --git a/include/linux/gfp.h b/include/linux/gfp.h index 28aea17fa59b..6cef1c241180 100644 --- a/include/linux/gfp.h +++ b/include/linux/gfp.h @@ -311,6 +311,7 @@ extern void __free_pages(struct page *page, unsigned int order); extern void free_pages(unsigned long addr, unsigned int order); struct page_frag_cache; +void page_frag_cache_drain(struct page_frag_cache *nc); extern void __page_frag_cache_drain(struct page *page, unsigned int count); void *__page_frag_alloc_align(struct page_frag_cache *nc, unsigned int fragsz, gfp_t gfp_mask, unsigned int align_mask); diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 636145c29f70..06aa1ebbd21c 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -4699,6 +4699,16 @@ static struct page *__page_frag_cache_refill(struct page_frag_cache *nc, return page; } +void page_frag_cache_drain(struct page_frag_cache *nc) +{ + if (!nc->va) + return; + + __page_frag_cache_drain(virt_to_head_page(nc->va), nc->pagecnt_bias); + nc->va = NULL; +} +EXPORT_SYMBOL(page_frag_cache_drain); + void __page_frag_cache_drain(struct page *page, unsigned int count) { VM_BUG_ON_PAGE(page_ref_count(page) == 0, page);