From patchwork Fri Aug 23 15:00:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yunsheng Lin X-Patchwork-Id: 13775387 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 3A464C52D7C for ; Fri, 23 Aug 2024 15:06:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C6E95800A5; Fri, 23 Aug 2024 11:06:51 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C1F28800A4; Fri, 23 Aug 2024 11:06:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B34A4800A5; Fri, 23 Aug 2024 11:06:51 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 95E13800A4 for ; Fri, 23 Aug 2024 11:06:51 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 5703F81A47 for ; Fri, 23 Aug 2024 15:06:51 +0000 (UTC) X-FDA: 82483837422.21.2BBC79A Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by imf26.hostedemail.com (Postfix) with ESMTP id 6B5C514001A for ; Fri, 23 Aug 2024 15:06:47 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=none; spf=pass (imf26.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-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1724425567; a=rsa-sha256; cv=none; b=AkEr+5MpxG9MbdxJUR2YBEB8vH45+yuWysyIEqD4y+FBh6DjxcOcfDg8V/HmbN7dsSjpvM ZiarMsBjEJG3uLzY0iD0fWhtvnL/WvprreyPj7Gy+0FksC+Jcj+tzXlDB5/vRGSL3Pmw/v knbANXFLiwKXRRmHAjUn/KiFoB+cGWs= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=none; spf=pass (imf26.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=1724425567; 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=srJHYmktV8Fuy88vTRRFr1X/R6V1yXGJsFP6jFbGahQ=; b=iHp2eT36PbAjv6vWZrhd2AKZCmMVp2YjbXDToQ9UrzyqXkM1O9zQXyY6Om++7o8FnOcfxP UBm0TXgme1L76Ly65xUjmtFwcvxchwHE8Q+s2+t7I+MBghqlvj3AK6cMsi8WDfNY6ocFrA bvceD/EejmhOntO1Kzx4n3orTKuDwcs= Received: from mail.maildlp.com (unknown [172.19.163.174]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4Wr3FM5gwqzQqQb; Fri, 23 Aug 2024 23:01:59 +0800 (CST) Received: from dggpemf200006.china.huawei.com (unknown [7.185.36.61]) by mail.maildlp.com (Postfix) with ESMTPS id 44ECD140390; Fri, 23 Aug 2024 23:06:44 +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, 23 Aug 2024 23:06:43 +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 , Jeff Layton , Neil Brown , Olga Kornievskaia , Dai Ngo , Tom Talpey , Trond Myklebust , Anna Schumaker , Shuah Khan , , , , , , Subject: [PATCH net-next v14 04/11] mm: page_frag: avoid caller accessing 'page_frag_cache' directly Date: Fri, 23 Aug 2024 23:00:32 +0800 Message-ID: <20240823150040.1567062-5-linyunsheng@huawei.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20240823150040.1567062-1-linyunsheng@huawei.com> References: <20240823150040.1567062-1-linyunsheng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.90.30.45] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To dggpemf200006.china.huawei.com (7.185.36.61) X-Stat-Signature: da5uxm7hza1swwzy7p1dc8fcsnbc3top X-Rspamd-Queue-Id: 6B5C514001A X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1724425607-94793 X-HE-Meta: U2FsdGVkX18xk/LsCniljcpmFms7ASwKXP3zzcwpNlLed0/CtE2EhvRw3XIOMaCGwpdcJa1W043A8Ls03gS3Bnhu1NAGPvKgk6rZE7VJLJfsrBX/tAXLKieiukWBJWDsJSDhZG7Hn2aI5+dFIRN0ZRTgR6JjSeb5KqDlVB75fbZvifhvEX5fFh1LTGWJPd9Cb/2ektG+hJzUO4oRFA4UPz+RBrosnSInTtmzP3qmzAPcHRPeHS4RZtECVAHw1bpbbkN/uKlSaubC2YJ0Hf/895mK/di8ajr9S1fcybWlx2e2qzlWo81zm4C9nqaM1vyJyZUQ41ho+iAlogDFru8IJmWoiTfJPmzT85D8OZIQ4/Xe2OYtm8oBybEQn2jDMBmRifSoKSbQZ545To4DqlFyR3cSBu1cUfD+LQgzZX0eppSfz3ws2ulEKuwOvRgTT9xDAsDj4ofMfJROONuobri7WbO5ZCjTLSeNBJFc1rCe4rNQy7ffALOVu+wwqR3VLqTw8JZ+fM3GR//bOaw/B2DgA/G4a2p1BiM0xP5rm3UfDrIOQtkb2e6K/r/7RMHltwef/cnCQTdMNvgXfY511Hm0hJI95kHDciIL1cfNEmI1yNUd+Y8/IAzMuiNb8wyPudqVSV6uuyBBQekiBfUZuw5M1tnzFz1+4XQ6Jncr2OiFAjjR9WUVjQa0zFtZ1QkUe+Y60TvSgoITV8xCXB3N6aZRsuHfnETLhsn3xAGRUcJIKhjpDFx08gasw78SYwq5Q5d/NLnHAyLy4bw/1w8uE81twI/MU81NDGtWeuhq2Qees0CHJrHNIFR7/+GNJYdin9OnUFh9zkIMXP+eB3wyP+e1eix5h4jOgyZUhEOPr7EU9XYzSBnv52WehPGnhruruLNkc+d/ul+LOSpgB6ZAHx78c2LabSmLSSCRhOcYp+7VLgDFG66Fa6k+tCp3O58d5tRdgq8AnAxiTUDKEuPMeWW M8SBicBL +bjmn2td6P+qf+UJ7HUM6BuCGY/dNwWYnOnEnylt89epTbApvs3XgxWNA08g5WW2Zx1E5dDO01Dku1Ud5Io1Hkov0wx6IId3nb26Obu6KcKeM2wjAsRc8cGG0q3rUJh/AZg7glXosN/hVTPfWu0rhRvB45ACSOVG61xzaZPKAEtW/HBeL+4AvxpX4ycFQMQoQibEgJjptFK8mM/DQvPteKRXwHuZwCUbqCgzh0auLwQvqnXwEGLLj7UYuI9WomiXoLOhVbdRHMLCYOweJw+DgXkEqRdPtrfF0CgmIiVRyXUyzZAPwXiqd0l6UJtxV0o6Eqd8io/Lb5vJ3YQ1OJowv2rDc1Bn4vs8h+DrYF+Szxv5CHUG85LPstcipBQ== 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 de2a044cc665..969e345b0f9c 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 4a009122991e..c52598eaf7e7 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_frag.va = NULL; + page_frag_cache_init(&test_frag); atomic_set(&nthreads, 2); init_completion(&wait);