From patchwork Tue May 28 12:55: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: 13676635 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 E4FD1C27C44 for ; Tue, 28 May 2024 12:59:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 73E5F6B00A0; Tue, 28 May 2024 08:59:12 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6C7FE6B00A1; Tue, 28 May 2024 08:59:12 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 58FE16B00A2; Tue, 28 May 2024 08:59:12 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 2FB856B00A0 for ; Tue, 28 May 2024 08:59:12 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id E2FE2A035E for ; Tue, 28 May 2024 12:59:11 +0000 (UTC) X-FDA: 82167810102.26.B70B22D Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by imf16.hostedemail.com (Postfix) with ESMTP id 80B33180027 for ; Tue, 28 May 2024 12:59:09 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf16.hostedemail.com: domain of linyunsheng@huawei.com designates 45.249.212.188 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=1716901150; 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=UTzFuXTot5KI/KsvqeeR/v0wGJ2L3/3l55GbMUM5St0=; b=3/mwi4v5d/ZgZN/PC6WVVN9X+XjdtwCqlvuLRcB3jyxVg4mVmD5rGzzJPJO7J0WRKUXf82 nEW9ZtP3XNKkn/EEDLdFD4L5n/2fHfjLyudKt+UPrI7Co5WqI6gMDKtc3chU2PNNVtIXTH saNDTFVn5/C7ZwDitz6jijOR/8eiyVQ= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf16.hostedemail.com: domain of linyunsheng@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=linyunsheng@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1716901150; a=rsa-sha256; cv=none; b=ZXVe1M6HFsWBVOOXauP666xaHiRDlxS9nVSuWy7YTxannhJ838czW5MlXSzC7gSKyhmz/v EtuhqVhgLMx+G9mMUqTsxuNYHEEP3A0Ws8JHTTQEvMaJp7EgHB+/BiD3978VwPkTKX+s42 Jdsd/eRA+k+iKd00h/82qktKg1E2dt8= Received: from mail.maildlp.com (unknown [172.19.163.174]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4VpXcB3L0NzckN8; Tue, 28 May 2024 20:57:46 +0800 (CST) Received: from dggpemm500005.china.huawei.com (unknown [7.185.36.74]) by mail.maildlp.com (Postfix) with ESMTPS id E15211400D1; Tue, 28 May 2024 20:59:06 +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.35; Tue, 28 May 2024 20:59:06 +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 , Trond Myklebust , Anna Schumaker , Chuck Lever , Jeff Layton , Neil Brown , Olga Kornievskaia , Dai Ngo , Tom Talpey , , , , , Subject: [PATCH net-next v5 07/13] mm: page_frag: avoid caller accessing 'page_frag_cache' directly Date: Tue, 28 May 2024 20:55:57 +0800 Message-ID: <20240528125604.63048-8-linyunsheng@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20240528125604.63048-1-linyunsheng@huawei.com> References: <20240528125604.63048-1-linyunsheng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To dggpemm500005.china.huawei.com (7.185.36.74) X-Rspamd-Queue-Id: 80B33180027 X-Stat-Signature: fqxz5nj8t8wsg51auhd8xo34fufsguux X-Rspam-User: X-Rspamd-Server: rspam04 X-HE-Tag: 1716901149-178812 X-HE-Meta: U2FsdGVkX19Juv+2hAkGJ5YYgunp+0xHi26jB/SxzUFHlcSKKnCIdr+FhthRPDkURjk8NLUgKE0m/rkSX18K7V60XmZRRvKf7NoeGdnZBM7iD3pJFMylDBSULjckSxhS3kfeihCymJG+y1vMjhhFZ45fxMxvbtUoG8Zqi+ioh/FhI5h3H8HUQ7enXm/kE3Iu33A/KGpo3J8X+bD/wRb+qexnHhoJkW6ArvAjthvGAaBMSGRHO79PYlku+xpxLkM+kxuCTZGCc9fe3MJndIIO8mlkqx4Pqc9I1fOmpUOOmmffNMml+WyHYOa1lZ8zaeNN49/B0oP6UWvjiyg2Q5eUZtVcvf/jygoJMDaOZtfmSHl8UTRpU2eTCb6Dw3V5YqCnufV+497R3XKosy8q/fAeTUAIkr00nOtitovJKei9+IoFICtPoaeA/PXa1RCJIgw/HSJk6PeS1SzcYcteeOJwMRBpXrLPh9xNkG9MH0ICuzTtmLFA3ogtOwgYvPNtDtnwUTbchcftTfXA64pB4v5CEjmbb3et5/X7+yebt6/Lc+8c63UiNQ2KESrjnr5WlVm4+MXT0AIMiPa7WBuyJW9lWvONL9AcHnvzmOkxrjEyK7kT8QfcetsUlUh2OImXZIeUqScl0c70RL1nkl9nG7YtT0gKGAaQtDePk9XOaj+rduNXrA7wLK+outmyNMpfH4lGFjm28HJynVlA6OSolWj+BBb+RDkb60kofqyuRLQnKbMwiKYB7NFjCSCPAWUwNtxXr0DhQ7CIx0olwF6jPlsdgteMpGTGFhZsYgF6cR7ulwpJy/BPvT29Qwk+h++Qd9E5+OKg0IebOG4dlZmOo5AWZ1h7fLo8UPI1hQuuqXfN+x/zzOD7dcptoKMR2iA95tmmnfphYavssPTyQAv+osR2PsKof/DgM/qf/0QnET2BVR0qRYq++cjKBwi7euYWrhWfTaojwdoWrAb+X1FMV1k Obs5pXc0 FgTxhwutlpYAaa5y8KzAmHNsLiJzUpBYdisAiWJXe6xgNLD/+5SOZP3i55aIf30kVlGtk92gVIOSB3XGZ4N7d+Alron5pdw9Bmeof+uuvpR1Sb363UNkobEunHjnySfNOQeE9YC36oLCf87QeItDOjRRsvW0QyNIWBYNPBAVhwnTBkx4KRLcv8dSoDXGtTPwLcX4yVRXLNqP7EOw5+ADbKL+7kM+w1XeX9Goepl34Mrqk2bFW5MxgMDiLJcsda/pPWJ/IZ3eaKVTF+e948CJsxCXZRNPMUg4TsUi7E8woI8kLrUc= 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 bb9f5aa84631..641255136105 100644 --- a/mm/page_frag_test.c +++ b/mm/page_frag_test.c @@ -337,7 +337,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); }