From patchwork Mon Sep 2 12:03:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yunsheng Lin X-Patchwork-Id: 13787180 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 3EC95CD342A for ; Mon, 2 Sep 2024 12:09:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A6AE58D00CD; Mon, 2 Sep 2024 08:09:20 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A407E8D0098; Mon, 2 Sep 2024 08:09:20 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8DA898D00CD; Mon, 2 Sep 2024 08:09:20 -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 4D2E58D0098 for ; Mon, 2 Sep 2024 08:09:20 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 0A1A91A1CE7 for ; Mon, 2 Sep 2024 12:09:20 +0000 (UTC) X-FDA: 82519678080.24.52CCBB4 Received: from szxga05-in.huawei.com (szxga05-in.huawei.com [45.249.212.191]) by imf14.hostedemail.com (Postfix) with ESMTP id 4BBD2100016 for ; Mon, 2 Sep 2024 12:09:16 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=none; spf=pass (imf14.hostedemail.com: domain of linyunsheng@huawei.com designates 45.249.212.191 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=1725278884; 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=GtonIyiO4poQSNhyMpkdJV5gDy9SV0Nh687A6ckntA4=; b=N7MPQ74wNiYDTVZzkNTOpfSn1lpOXNj3BhRjDxJdKqW/xjAo68EKa6PthkfUZZckFWh6QK U5wQaBW0Tf6WEMsUH5aQiplT4FqiW731PFSQQX8q9CKLX2vqaKBYLMxiVS1vWkQd97Ht2q lXp/0zHcLW4hd/H4Pt6uP3Xv2tbAiVE= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=none; spf=pass (imf14.hostedemail.com: domain of linyunsheng@huawei.com designates 45.249.212.191 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=1725278884; a=rsa-sha256; cv=none; b=ijSunbOADvEE59FGhfZWNfmbfM1x5GfaqjEI5oOdHJzuz4C5UKZk2NdE+bLxqpAIW1y0Fo kMIMdcCN3cqOS7fBeKS1TBDxbsyIeK3/aAVjyFamsy25wzDMGwtYpKDz7rwB7ls06r5LWq BnFO7mF+HH81RS1lIT57n+BlYL6+SMk= Received: from mail.maildlp.com (unknown [172.19.88.163]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4Wy6sS4bs0z1HJ3y; Mon, 2 Sep 2024 20:05:48 +0800 (CST) Received: from dggpemf200006.china.huawei.com (unknown [7.185.36.61]) by mail.maildlp.com (Postfix) with ESMTPS id F1AA518001B; Mon, 2 Sep 2024 20:09:13 +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; Mon, 2 Sep 2024 20:09:13 +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 v17 04/14] mm: page_frag: avoid caller accessing 'page_frag_cache' directly Date: Mon, 2 Sep 2024 20:03:03 +0800 Message-ID: <20240902120314.508180-5-linyunsheng@huawei.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20240902120314.508180-1-linyunsheng@huawei.com> References: <20240902120314.508180-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-Stat-Signature: pd1yh9p3kybcmakobzbbdjqabi9qks71 X-Rspam-User: X-Rspamd-Queue-Id: 4BBD2100016 X-Rspamd-Server: rspam02 X-HE-Tag: 1725278956-479891 X-HE-Meta: U2FsdGVkX1/5ln9qxslIaeuC4ARNCw0+ZFdii9Y+rYlCEQjEarwHJF7sxKGOLd2NRLoJkk97lHixQiIwASttfetUxca/hTtS0lc3Fmg+sVghtmBcXXbRUfzs8Qo0UaJfjUExhE8pmHkW6JICvpO+0Yx7W6kvQFchYRHzDaaxVkcDYb5yIMnoNrcfV477j7o0s8kHFFEK530qKa+BPIs3Nxj/oNncUwgCTRXhgyGtGKJVWmlm4GHaV80SPJUkOH5dAA25b+Vedx1PPhoja/nrQwWg5Rn/jhZ6HfVF0BOaUYYxkZuzd2Hg3s6sJxZMbihyIYikaqDTMqzVfqs75Uszfa1Thr9DAt7jAYN5FPlXWI9mnO0ARHehEepKWJ7bJHjFXJCx4lkha8enN5lKKBmWmVP7QScXZIXz3AGPWiquNvd5uvhmsfMVlx/fdOacLe8qj1parFCDRDrc4fBVQ88XvWTrb8qjo8BlXt6hjo8ufvNlteBFoWMggQZwwq0IqRhbEnfv+4gF8glRGL7iL6i/ALHDzPjCYXHseiEhEY3WRGHbt3wBqsrtpVHbcJHLNH7PKYHzkDdAqb4x/yegLlKt9zb4Cw8yNfNynu0qK2yv7meo/jhEPGYw2tkEMpWXS4X5/+qozL2HZg+bMPvjWaitD5QBle7C0Xsd6etobl14TTrIjbHKTgdwMpZPQ0uX4Ugx3hPom24jnS5m8GNpJGn8DANSPACA/asPh22LOyHgTeRbs/sgxUScwp/zIqZCnXTgLZe+wTJ+bWY8bEe6lxKScs/c8cEmCGHSTEz3I9oMs7dEgGpdTyQpTiS6IoFIwWRABb9jxw4dHzqQ9m5KGRR9pNeHQhMWzznl2C39L1kCKwjstlViBlkaeDow2ujMzzTdbM7L+rTPCgoErFRUQgp3Sb98nuylb0HcRT9UPSW0T0ypKMk+7L+dTekMr9TkeNjOm3oC/14VTm8YExzBdpQ bSdME7ds 3w8Aau0exuygaZAymVjjVk/0kj2y5LLy4VT7H8A5uk8zMHqQfCXwWUyuarVFRpZW78lr6XwfDJdeP6KAa3WD3SK24QdR2pe0tv+1KaIowgtoK7YvJnKHAGUo5XasACuFm62gy+uL2IYvQQQeWu1E6BzvDxat/7G04XPEFuqdvKKTYA4DL8FJEuwxDe3/VCZ37zVjIZkF6BbGJt/SqXPc4e/4q8hY59Yy21XhyaTHN0A2GGQ3VFYzgKThxYSIjQ5O9etj2imx6W8v4FH680wS3zciMhz81CIbjXJGOGiJobelwX+DF0WPgPa+CXBGz/SGlEzO5ljwhcPxP/dQ= 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 5395a36e4030..a4bd543d6950 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);