From patchwork Wed Jun 5 13:32:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yunsheng Lin X-Patchwork-Id: 13686905 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 8934CC27C5F for ; Wed, 5 Jun 2024 13:36:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 149356B0098; Wed, 5 Jun 2024 09:36:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0DEDB6B0099; Wed, 5 Jun 2024 09:36:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EB6726B009A; Wed, 5 Jun 2024 09:36:25 -0400 (EDT) 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 CC9CC6B0098 for ; Wed, 5 Jun 2024 09:36:25 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 908A7A11AA for ; Wed, 5 Jun 2024 13:36:25 +0000 (UTC) X-FDA: 82196934330.08.7E904F1 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by imf05.hostedemail.com (Postfix) with ESMTP id 11749100021 for ; Wed, 5 Jun 2024 13:36:22 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=none; spf=pass (imf05.hostedemail.com: domain of linyunsheng@huawei.com designates 45.249.212.189 as permitted sender) smtp.mailfrom=linyunsheng@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1717594583; 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=UWDEFcVWt3PUwT1zHgBlwDTWAF6g0ZroxpvhPQP4WAc=; b=yF1xh82TCDvv5XweeuOcCe5GSB2GZh0rQEGHjT/FozclMfekDUg/xIkuoAvO8O33BK7GCB xjM1PrUq2Wx9xFEWhCTJkbJ60ZsmslLuBCj3FmEFuhHMkMh8Gbe7n4MmP82v+dqC68bU5L SPxGnIiHZ1zgpaxmI/zwZKlmiOBWI8s= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1717594583; a=rsa-sha256; cv=none; b=ph89DU2DrJaIxAyo00X71D2fpo1bGtLNjEkJw/eMvvJyHaHc3ggHVLxYLww0ofYK88Teyj OX4fuRpes2AMD4qOEDaVaaT7kU/hLfnH7u/o4V/WXE/My/O3rs0lgnJPOgy9lP9ubPJv3u wYuc2q5FkNo2Q0gzPvYSawf9LbPsvtg= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=none; spf=pass (imf05.hostedemail.com: domain of linyunsheng@huawei.com designates 45.249.212.189 as permitted sender) smtp.mailfrom=linyunsheng@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com Received: from mail.maildlp.com (unknown [172.19.163.252]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4VvT194Sh5zPnsm; Wed, 5 Jun 2024 21:33:01 +0800 (CST) Received: from dggpemm500005.china.huawei.com (unknown [7.185.36.74]) by mail.maildlp.com (Postfix) with ESMTPS id 26CD618007A; Wed, 5 Jun 2024 21:36:19 +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_256_GCM_SHA384) id 15.1.2507.39; Wed, 5 Jun 2024 21:36:18 +0800 From: Yunsheng Lin To: , , CC: , , Yunsheng Lin , Alexander Duyck , "Michael S. Tsirkin" , Jason Wang , =?utf-8?q?Eugenio_P=C3=A9rez?= , Andrew Morton , Eric Dumazet , David Howells , Marc Dionne , Chuck Lever , Jeff Layton , Neil Brown , Olga Kornievskaia , Dai Ngo , Tom Talpey , Trond Myklebust , Anna Schumaker , , , , , Subject: [PATCH net-next v6 07/15] mm: page_frag: avoid caller accessing 'page_frag_cache' directly Date: Wed, 5 Jun 2024 21:32:57 +0800 Message-ID: <20240605133306.11272-8-linyunsheng@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20240605133306.11272-1-linyunsheng@huawei.com> References: <20240605133306.11272-1-linyunsheng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To dggpemm500005.china.huawei.com (7.185.36.74) X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 11749100021 X-Rspam-User: X-Stat-Signature: sdjcqqwhszxsjz9oat4duyisc6trbg4j X-HE-Tag: 1717594582-570813 X-HE-Meta: U2FsdGVkX1925y3dXw8XfCf5ehR/l3F4GPZttk4+57Ec0zHLJc4loqD+vB+Bl/moyNcAkC0+/5VHqPA0V0q6psq8wRUX38ul12+RYnm7oZ5NosogOpX4jkcwD4YBiXwW5vvF98pmwuV00PjM4qVTfiE/JD3OUMTWsyFU4xJDeM1P0Fo/tFvJbNRndTeaI+vqHG48A3x1fckg4XqjjPYVP20QBb5yq2o0ZzWVAiMWiLmptRuRj+wcMckS6finKAGlFgYyqD/PIG2Wlg3ic/6buH4fzcKAnZlHDssdXNmi9HiU8yx5EVVz3uB2Q/lNb1PIqP9Ax7gA+ULLzwaUF4HpUvelpqgWGqpfPAnLKpr3FIao1B+Jb76ewCx+wn+Fg64RmDRC4ZR/ThsZgVi82aX+puHk2eVhDIrs7lf28sYuiB7bb0Zy2cbLrP9eWNpMrHwohzDbZiX/qTT6gAxeI1o5oS44oj3w4zPq7iC5XLMntkKjALP8BY5nixFHPfMXjljxg2mvShqnYluLV2MDBQ8NUyeLewUUDYgYmows4pdK0x7LOyTEhR6qT5Ks9QcerkgeymvyZiGTg5vvAOSeNWwqM0wC8UcAshHfoqfdY1iLVrwLwLN+6tC1deOhIOndqG5kBI9sNvgwqNOjrUo31bJZOT7MbxyScDiyrTYKeLdvfJvZB/d4haAHCgZWxTHX2lHjSPPpT12Zt7ODGPMLNEx1j3Az0BPI+sdvYK4ep39etsBqH5J8G0YR6MHbSHSQjkLIGqwJzYDGLbwp7pwZN+lsHGd6Li11uPtCoc/0cdwKdM7x5vuNz0wcOv3XAj1pZDjRcesQGz1USn6frgFfjatzV3G6grZEpuWnDHKYaorRI9vEAJArkKgugoL5/vZk/c1kyMhNuz5PcIb9xoKRSWhXt+I0y0cy/QdxgIFuai52VMfzRmRlLptMuvlfTpB5QqQWhscPqQ3Dy8YlYogzZjR De+PZfJe xPA5Z9kPte38ESx0Rvf0IPZ5C8DmQmRmdREQQho0RxDeAUO1JHnSA+lk+w70cjJ2G1+8hot72nTcuC5Yo9tJq7tSQbd0AzPAwGZXVsu6keDQ+x+28KuncFCcVbFyfKv8ea0A87p3pOW0wmjzZTdW/YV4uR2sAr8JScEtd/Z5MpCIr860TwOsIBkdu6Ml8oOpfcw3A8X7+HSAk08oiwciSBzks3wt6Zt8jNCBm+WHO3JDEZJ6zbFReWpubo/09xLdyHQ1t3fQblg8+0xuF9FQM0p2kHk7Lvy230Ozab2FoRyRi6ao= 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: Use appropriate frag_page API instead of caller accessing 'page_frag_cache' directly. CC: Alexander Duyck Signed-off-by: Yunsheng Lin --- drivers/vhost/net.c | 2 +- include/linux/page_frag_cache.h | 10 ++++++++++ mm/page_frag_test.c | 2 +- net/core/skbuff.c | 6 +++--- net/rxrpc/conn_object.c | 4 +--- net/rxrpc/local_object.c | 4 +--- net/sunrpc/svcsock.c | 6 ++---- 7 files changed, 19 insertions(+), 15 deletions(-) diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c index 6691fac01e0d..b2737dc0dc50 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c @@ -1325,7 +1325,7 @@ static int vhost_net_open(struct inode *inode, struct file *f) vqs[VHOST_NET_VQ_RX]); f->private_data = n; - n->pf_cache.va = NULL; + page_frag_cache_init(&n->pf_cache); return 0; } diff --git a/include/linux/page_frag_cache.h b/include/linux/page_frag_cache.h index c6fde197a6eb..6ac3a25089d1 100644 --- a/include/linux/page_frag_cache.h +++ b/include/linux/page_frag_cache.h @@ -23,6 +23,16 @@ struct page_frag_cache { bool pfmemalloc; }; +static inline void page_frag_cache_init(struct page_frag_cache *nc) +{ + nc->va = NULL; +} + +static inline bool page_frag_cache_is_pfmemalloc(struct page_frag_cache *nc) +{ + return !!nc->pfmemalloc; +} + void page_frag_cache_drain(struct page_frag_cache *nc); void __page_frag_cache_drain(struct page *page, unsigned int count); void *__page_frag_alloc_va_align(struct page_frag_cache *nc, diff --git a/mm/page_frag_test.c b/mm/page_frag_test.c index c3cfce87fbbf..8b259e422fae 100644 --- a/mm/page_frag_test.c +++ b/mm/page_frag_test.c @@ -341,7 +341,7 @@ static int __init page_frag_test_init(void) u64 duration; int ret; - test_frag.va = NULL; + page_frag_cache_init(&test_frag); atomic_set(&nthreads, 2); init_completion(&wait); diff --git a/net/core/skbuff.c b/net/core/skbuff.c index dca4e7445348..caee22db1cc7 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -741,12 +741,12 @@ struct sk_buff *__netdev_alloc_skb(struct net_device *dev, unsigned int len, if (in_hardirq() || irqs_disabled()) { nc = this_cpu_ptr(&netdev_alloc_cache); data = page_frag_alloc_va(nc, len, gfp_mask); - pfmemalloc = nc->pfmemalloc; + pfmemalloc = page_frag_cache_is_pfmemalloc(nc); } else { local_bh_disable(); nc = this_cpu_ptr(&napi_alloc_cache.page); data = page_frag_alloc_va(nc, len, gfp_mask); - pfmemalloc = nc->pfmemalloc; + pfmemalloc = page_frag_cache_is_pfmemalloc(nc); local_bh_enable(); } @@ -834,7 +834,7 @@ struct sk_buff *napi_alloc_skb(struct napi_struct *napi, unsigned int len) len = SKB_HEAD_ALIGN(len); data = page_frag_alloc_va(&nc->page, len, gfp_mask); - pfmemalloc = nc->page.pfmemalloc; + pfmemalloc = page_frag_cache_is_pfmemalloc(&nc->page); } if (unlikely(!data)) diff --git a/net/rxrpc/conn_object.c b/net/rxrpc/conn_object.c index 1539d315afe7..694c4df7a1a3 100644 --- a/net/rxrpc/conn_object.c +++ b/net/rxrpc/conn_object.c @@ -337,9 +337,7 @@ static void rxrpc_clean_up_connection(struct work_struct *work) */ rxrpc_purge_queue(&conn->rx_queue); - if (conn->tx_data_alloc.va) - __page_frag_cache_drain(virt_to_page(conn->tx_data_alloc.va), - conn->tx_data_alloc.pagecnt_bias); + page_frag_cache_drain(&conn->tx_data_alloc); call_rcu(&conn->rcu, rxrpc_rcu_free_connection); } diff --git a/net/rxrpc/local_object.c b/net/rxrpc/local_object.c index 504453c688d7..a8cffe47cf01 100644 --- a/net/rxrpc/local_object.c +++ b/net/rxrpc/local_object.c @@ -452,9 +452,7 @@ void rxrpc_destroy_local(struct rxrpc_local *local) #endif rxrpc_purge_queue(&local->rx_queue); rxrpc_purge_client_connections(local); - if (local->tx_alloc.va) - __page_frag_cache_drain(virt_to_page(local->tx_alloc.va), - local->tx_alloc.pagecnt_bias); + page_frag_cache_drain(&local->tx_alloc); } /* diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c index 42d20412c1c3..4b1e87187614 100644 --- a/net/sunrpc/svcsock.c +++ b/net/sunrpc/svcsock.c @@ -1609,7 +1609,6 @@ static void svc_tcp_sock_detach(struct svc_xprt *xprt) static void svc_sock_free(struct svc_xprt *xprt) { struct svc_sock *svsk = container_of(xprt, struct svc_sock, sk_xprt); - struct page_frag_cache *pfc = &svsk->sk_frag_cache; struct socket *sock = svsk->sk_sock; trace_svcsock_free(svsk, sock); @@ -1619,8 +1618,7 @@ static void svc_sock_free(struct svc_xprt *xprt) sockfd_put(sock); else sock_release(sock); - if (pfc->va) - __page_frag_cache_drain(virt_to_head_page(pfc->va), - pfc->pagecnt_bias); + + page_frag_cache_drain(&svsk->sk_frag_cache); kfree(svsk); }