From patchwork Fri Jun 7 12:38:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yunsheng Lin X-Patchwork-Id: 13689831 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 D9C8DC27C5F for ; Fri, 7 Jun 2024 12:41:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4CC316B0088; Fri, 7 Jun 2024 08:41:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 47C786B00AB; Fri, 7 Jun 2024 08:41:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 31BF66B00AC; Fri, 7 Jun 2024 08:41:35 -0400 (EDT) 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 13F5D6B0088 for ; Fri, 7 Jun 2024 08:41:35 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 86CBA403F8 for ; Fri, 7 Jun 2024 12:41:34 +0000 (UTC) X-FDA: 82204053708.04.B1E5202 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by imf23.hostedemail.com (Postfix) with ESMTP id 2C90E14001F for ; Fri, 7 Jun 2024 12:41:31 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf23.hostedemail.com: domain of linyunsheng@huawei.com designates 45.249.212.187 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=1717764092; 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=wbJ2qSC9AHYT0hTg1VGtrN0o849L6WrA3O2jJfDdywQ=; b=5RwULCji0eugsREomNHDkPjxZ7HHr1g1qGRxYJaf9rdiJHXZHFxsSiBOgb+y5r3Nnc3H03 qR1uvjr+TsEROOb/3nMWF+3LNVGJuuFzRxeX36KDIWCGAO2fNcYWW+k82KaLIW54AjFLnI cu6l6jLTDuEybmZhspYAWJD4hFTOoMY= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf23.hostedemail.com: domain of linyunsheng@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=linyunsheng@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1717764092; a=rsa-sha256; cv=none; b=HulaGsoCXwhHm5zIGTRZeMq9xfisiz0UkIhcDeGiQy+hKG8LCpLiNz9ZTXGnsewqRm7dhk jKe6rcWMg+pdrRxcXCoZjgr0PUa/ZYZrLGGDfTUW+b3OWKdRz6zufCB87nFC6fSWVH9CS7 FX/ljMaNbalcv3Z4SrAcJmi792hK4Ck= Received: from mail.maildlp.com (unknown [172.19.88.105]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4VwghB2pvkzsTCv; Fri, 7 Jun 2024 20:37:30 +0800 (CST) Received: from dggpemf200006.china.huawei.com (unknown [7.185.36.61]) by mail.maildlp.com (Postfix) with ESMTPS id 6ECE6140336; Fri, 7 Jun 2024 20:41:29 +0800 (CST) Received: from localhost.localdomain (10.69.192.56) by dggpemf200006.china.huawei.com (7.185.36.61) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Fri, 7 Jun 2024 20:41:29 +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 v7 07/15] mm: page_frag: avoid caller accessing 'page_frag_cache' directly Date: Fri, 7 Jun 2024 20:38:10 +0800 Message-ID: <20240607123819.40694-8-linyunsheng@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20240607123819.40694-1-linyunsheng@huawei.com> References: <20240607123819.40694-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 dggpemf200006.china.huawei.com (7.185.36.61) X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 2C90E14001F X-Stat-Signature: iw6urjzz4xmkybrbo6fm6r8t7exnfycj X-HE-Tag: 1717764091-965371 X-HE-Meta: U2FsdGVkX1/d9t2082/mCgLY8A7On6gYpcgYY2kDaOjG6Xiuue5GqdHYUxBv99yJzZpqbvpMc3s7M+fwlwsvcBgg/FSgMRaKHrBE0Hsq/KRzs83hJ+JQ0kk5p5oNLBx/4F+0ZouhC7xLmdpSiQ0NCGIL9aTD9O+MlV1gUCl1P6MvVJ/9CFenA8ljjmFkCI5IIxESnoKj7Ziddyu0SXnnjgT2hGrFKgp0sLMjdLyzPeaetUmUdENHtl99NuGEb3yPE+oaUkfio5kYPSv9B4LzHV5lErww4CCYqqKTlZeawp9Uth2VtYbCccmpFbGHC7/ChRebtPwHhtynvHp0byIboycmYlSFElm6qMZwz6Viqhx3JoRLWaGEDC5lflDNBwa8V0VXfWB8dBIP6jY2NKpcQgyrShcTEGEY8rxNDA/1wycC3Jr10LD2f1k++zwIogd2g0GPUWoreMOyhM7EY9LM2R6G6B+APLU2OY74/LuW7ps2no0VkA2uNkemsAL+IYmoYLKtelFppvMf9FQ0N1NOO+RsE3iRKdsSCUlhUKv952mDBBbrx+o0+gBruaKMA70v+98jD8PcPkUQTyk1HSMFSb96QUebjr3Qdy7pceUPys0YE9jchPHJHCGxSafO+LeytI1oVDC9Zv+W0VJcap2rioh+znStDFdyk2LqC0SAfXzLrcr5hbfUJOnB+3I99NC5SPsqv3B3McQOYg5kaHObkNcp8GBSBOatjLV1Nm6s9CzD5Z3u7YrVqiS/SEpHojRv3uUXQh8ZDm3yYuAJB7VMR4/lRPG8EP3XindEd921J7/hyEnteQbq5xRmujswTN6pMMGZjlM6DvXLisB/CQMMSwKBUj6TXnct1hwaEzm2adT39ykM9VMYUWhJCzau4mW0EQNWEhIBHXHvEfI/vVRMNtNa8H8Uhr6S3FvA1m6c0jtaIm+qX2orjQYsi/i989GbEwkXFfD7j7ycFzHXtpq jQPehp6d BYDuvhMfT5O0Sj7J/PShSXeL27Gl6s4E217EHNp8EVWYfDE8qx5LTeth0NohM9cQVaBaXq0fHU+II8eCN2R8+Bza18BweYqN8r8i/S0zzPkZfZ7tFqw3c5s4z6Jw52EMdY5UC5U0J43mJyHuV7zuj3p6BtfkvW5bifJX0ojYVh0o5yHLRw+d2n0Xh3iX3iYKpjuClDQnUjP83S7NRUzpiPGn0xYxvZqT19FYjsFL8tOqB8018N7SHYMZ22V56FM7cdf6q0aCkYMpy6xz5UOZpAhJ4lhT09PPv20ki 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 6842fa6a71a5..ac5fe61c0ff2 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); }