From patchwork Fri Aug 30 11:18:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yunsheng Lin X-Patchwork-Id: 13784984 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 1B906CA0FE1 for ; Fri, 30 Aug 2024 11:24:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0B6E36B0112; Fri, 30 Aug 2024 07:24:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0165E6B0113; Fri, 30 Aug 2024 07:24:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DAC946B0114; Fri, 30 Aug 2024 07:24:51 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id B17326B0112 for ; Fri, 30 Aug 2024 07:24:51 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 621361A0F48 for ; Fri, 30 Aug 2024 11:24:51 +0000 (UTC) X-FDA: 82508679582.16.56FA314 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by imf26.hostedemail.com (Postfix) with ESMTP id DA360140022 for ; Fri, 30 Aug 2024 11:24:48 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=none; spf=pass (imf26.hostedemail.com: domain of linyunsheng@huawei.com designates 45.249.212.188 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=1725017044; 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=aXbGFzP01IbB1a0lS1BZMeOEqPq6LnY6OHbxeTf5nlo=; b=U+M5D7Sl3HPfQ71lZSUsESQkyp2RJWowXYMeGLrtWhlnBJt79M2eQ5/WAZ50NJRg8LuMbh KsAKGXmbHNECQgglZbo3uzSu7KhTtZAm//3kDYfqEv/9m4X55oJrFykNy7coAFGx+LH8t0 NcvpQUSF7ko4PvnzYQ2bIwJMmk3zVqA= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=none; spf=pass (imf26.hostedemail.com: domain of linyunsheng@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=linyunsheng@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1725017044; a=rsa-sha256; cv=none; b=TfbGocTaxYyDZ8JMG047ANqB3PXnmQhU+X0VfSjs0RTx03mT6SpsxY5/eIFAJ23yxCCNff wOmoq7/sdqqtjNJC5inJFtcfNtoLsMuwHvDeaVPlT5MFeCnnyp6Flgk2jRN0tqefJbMP1X 5eVJo8eWwandwrx7c34BKsmcqeG/npk= Received: from mail.maildlp.com (unknown [172.19.88.105]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4WwG3S505QzpTtx; Fri, 30 Aug 2024 19:23:00 +0800 (CST) Received: from dggpemf200006.china.huawei.com (unknown [7.185.36.61]) by mail.maildlp.com (Postfix) with ESMTPS id C54F1140360; Fri, 30 Aug 2024 19:24:45 +0800 (CST) Received: from localhost.localdomain (10.90.30.45) 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, 30 Aug 2024 19:24:45 +0800 From: Yunsheng Lin To: , , CC: , , Yunsheng Lin , Alexander Duyck , Alexander Duyck , Chuck Lever , "Michael S. Tsirkin" , Jason Wang , =?utf-8?q?Eugenio_P=C3=A9rez?= , Andrew Morton , Eric Dumazet , David Howells , Marc Dionne , Trond Myklebust , Anna Schumaker , Jeff Layton , Neil Brown , Olga Kornievskaia , Dai Ngo , Tom Talpey , Shuah Khan , , , , , , Subject: [PATCH net-next v16 04/14] mm: page_frag: avoid caller accessing 'page_frag_cache' directly Date: Fri, 30 Aug 2024 19:18:34 +0800 Message-ID: <20240830111845.1593542-5-linyunsheng@huawei.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20240830111845.1593542-1-linyunsheng@huawei.com> References: <20240830111845.1593542-1-linyunsheng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.90.30.45] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggpemf200006.china.huawei.com (7.185.36.61) X-Rspamd-Server: rspam03 X-Rspam-User: X-Rspamd-Queue-Id: DA360140022 X-Stat-Signature: gk9xmfp5ozfzozwukw3ko9gkier47us1 X-HE-Tag: 1725017088-994835 X-HE-Meta: U2FsdGVkX1+BeSJa32xzyUISC37znf3Id8sY/epdQix38JHgUkavcbVutPUIraRf/z5+X6SqM4kVEG8HdZZ2IHWsErOdfmX/Ie7Mk8e0P1FQHpWumYFx1/tHVe7HW+f5zylml+tXLrx0s6J1/V20NdZQpc1lHyIha3nYMw0u7yitjA0d7Ku/RIClRYpGUzVl210eRm3lAEnKSARd/KlKzBfyjKi0cVM97KMgXg2kCeiUmZHXLfvNSuKSWUS0H09faHdxznVFqjXAcO8xSUQo8AlfGmuYyNdei0vPMs/E+4/L09Gh6k0Xbzl5kuuog84W/9s9/5GdCo40CeMeEiF4zvP9O+20iEqE66YTfE0adwvXPm7lWvhiGDJauhwdvON5GGNdf28GmIjAZh8io5fLRXNfCJ+SqsZEGMOUZGI/5w8kujCMpOYuasHLdkd4+m4IguenXdD++wSvyVYLEuZAF8l4UlfsNTCmW5ZypoqOp+hBmP9FdCYqRnDjHYgyyme1i7qAwrlKPEjTO5ykNZHJgDX8SPyQVz73RjYaCaCzT0P/PeW0Ytq7lt/muuUYFjHmRh1AFu9XjqqQ400anp1OPfuuqOx/9lC4OHV7aAUbnUpvd0I/OUBXGJIhwqdAQ6UmE/cbQOcIY+jZEtJl30j3qHclUrexxysqDEWQ8C/n8ezRjNNeAtgMPFa3AoDgAn5uYrPhy5PT8lro/C+sNDnxgemt/zK5hZYLr+r5jD88OkdTedJblvVZkW97zRty6UNphvWhXHUtf6xMfU08mc3rw6/xsgi+4tT2TpQsh5UlFwEJbjSYbP74RhAaoMzjMlVNsn8mt9K3zZGOK70ZSE6VSS+ZkTtWV6jCeyqnZK1jRm31of7Y2+Gmn5ku6B47ex01YfKF2iQyZhvdN63GewSE+H2LMzC69aRWpbVCVswM9FcGog6555QvnIVYoSi9wm4CBKR8fLa0y5zokE3vTkL QaJfhUy3 ZEf/OaifRJCQ/6tEDZ6cWx7vVRw38rEjZkqnMIraFwB1yLBMEeDeavEVD23jEdTGXojWppIfjX2bDvKzcAOv6lDQHIy5t7HhP5NlCako6jy+ogSmOF8nUNEzVMeNkUbuGDS8b7yWEXnQ+JRYLyWAp2vV75jUl12XwkJUMctxEIQOQQ0OOvQhjFGJxc+c9M0hf8qvCJrMgOoe1UUBcJRarMBtgj5oW2/OhBBD84amsNNKyWmYVugag58FpnVlHWDLywg8JCk4dzeLZahKwvk8p5orqK881HCgxS3QwuWv9SRwkaiTnbMkPvXKcnIC/UjzEjys4gvwqK9399FCsHgxiw91ESw== 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 Reviewed-by: Alexander Duyck Acked-by: Chuck Lever --- drivers/vhost/net.c | 2 +- include/linux/page_frag_cache.h | 10 ++++++++++ net/core/skbuff.c | 6 +++--- net/rxrpc/conn_object.c | 4 +--- net/rxrpc/local_object.c | 4 +--- net/sunrpc/svcsock.c | 6 ++---- tools/testing/selftests/mm/page_frag/page_frag_test.c | 2 +- 7 files changed, 19 insertions(+), 15 deletions(-) diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c index f16279351db5..9ad37c012189 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 67ac8626ed9b..0a52f7a179c8 100644 --- a/include/linux/page_frag_cache.h +++ b/include/linux/page_frag_cache.h @@ -7,6 +7,16 @@ #include #include +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_align(struct page_frag_cache *nc, unsigned int fragsz, diff --git a/net/core/skbuff.c b/net/core/skbuff.c index a52638363ea5..a5f8e4e0c649 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -752,14 +752,14 @@ 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(nc, len, gfp_mask); - pfmemalloc = nc->pfmemalloc; + pfmemalloc = page_frag_cache_is_pfmemalloc(nc); } else { local_bh_disable(); local_lock_nested_bh(&napi_alloc_cache.bh_lock); nc = this_cpu_ptr(&napi_alloc_cache.page); data = page_frag_alloc(nc, len, gfp_mask); - pfmemalloc = nc->pfmemalloc; + pfmemalloc = page_frag_cache_is_pfmemalloc(nc); local_unlock_nested_bh(&napi_alloc_cache.bh_lock); local_bh_enable(); @@ -849,7 +849,7 @@ struct sk_buff *napi_alloc_skb(struct napi_struct *napi, unsigned int len) len = SKB_HEAD_ALIGN(len); data = page_frag_alloc(&nc->page, len, gfp_mask); - pfmemalloc = nc->page.pfmemalloc; + pfmemalloc = page_frag_cache_is_pfmemalloc(&nc->page); } local_unlock_nested_bh(&napi_alloc_cache.bh_lock); 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 6b3f01beb294..dcfd84cf0694 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); } diff --git a/tools/testing/selftests/mm/page_frag/page_frag_test.c b/tools/testing/selftests/mm/page_frag/page_frag_test.c index 72a3861c2de1..e21a22b1d70b 100644 --- a/tools/testing/selftests/mm/page_frag/page_frag_test.c +++ b/tools/testing/selftests/mm/page_frag/page_frag_test.c @@ -117,7 +117,7 @@ static int __init page_frag_test_init(void) u64 duration; int ret; - test_nc.va = NULL; + page_frag_cache_init(&test_nc); atomic_set(&nthreads, 2); init_completion(&wait);