From patchwork Mon Jun 17 13:14:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yunsheng Lin X-Patchwork-Id: 13700607 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 450E3C27C79 for ; Mon, 17 Jun 2024 13:17:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CD5306B01A3; Mon, 17 Jun 2024 09:17:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CAC386B01A4; Mon, 17 Jun 2024 09:17:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B4E5A6B01A5; Mon, 17 Jun 2024 09:17:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 981076B01A3 for ; Mon, 17 Jun 2024 09:17:40 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 4E7551A169C for ; Mon, 17 Jun 2024 13:17:40 +0000 (UTC) X-FDA: 82240432680.24.91E2FE3 Received: from szxga06-in.huawei.com (szxga06-in.huawei.com [45.249.212.32]) by imf29.hostedemail.com (Postfix) with ESMTP id B026C12001C for ; Mon, 17 Jun 2024 13:17:37 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=none; spf=pass (imf29.hostedemail.com: domain of linyunsheng@huawei.com designates 45.249.212.32 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=1718630254; 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=JmGxiz51IjV4pqZfZI6EmWlYWef76Wbg12B+cYvKB35Gir7hVS0sAkkYFGWG0GosuwwhzT 3mUqoenXfd7o4UmMnDofcRVi/dMFu3udD79JzFu/ahxt7jy4JWq/43PzHazWnn95tA3if9 896sSTm6yMX+H3V8/pTN5w7CEQix258= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=none; spf=pass (imf29.hostedemail.com: domain of linyunsheng@huawei.com designates 45.249.212.32 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=1718630254; a=rsa-sha256; cv=none; b=HZ7LQESGN6YvHWzJM11oy0SNblgKU5TVs9HT8ucM+Tsxvz2zcDCRzwvcxaeX05QPzFR0s1 X3EvEo1IrWlRpThNYpyuwppc9Fs7wkJqA9S935A0hC7oXxuL+OWtWXuf+hdMLRoPSVMmhs OjehY9tMSnA1+f1qS1SU3sa+ReWm79Q= Received: from mail.maildlp.com (unknown [172.19.88.214]) by szxga06-in.huawei.com (SkyGuard) with ESMTP id 4W2r480Hksz1xsdG; Mon, 17 Jun 2024 21:16:08 +0800 (CST) Received: from dggpemf200006.china.huawei.com (unknown [7.185.36.61]) by mail.maildlp.com (Postfix) with ESMTPS id 940551A016C; Mon, 17 Jun 2024 21:17:33 +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; Mon, 17 Jun 2024 21:17:33 +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 v8 05/13] mm: page_frag: avoid caller accessing 'page_frag_cache' directly Date: Mon, 17 Jun 2024 21:14:04 +0800 Message-ID: <20240617131413.25189-6-linyunsheng@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20240617131413.25189-1-linyunsheng@huawei.com> References: <20240617131413.25189-1-linyunsheng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpemf200006.china.huawei.com (7.185.36.61) X-Stat-Signature: u8i6wkn6tu6hx69uxf5fh517gpibddu9 X-Rspam-User: X-Rspamd-Queue-Id: B026C12001C X-Rspamd-Server: rspam02 X-HE-Tag: 1718630257-872313 X-HE-Meta: U2FsdGVkX19TDFr1pUaF3rotjy7EXMV07vjU8IMESiEqVdL15iDIhl7M9YEZA/JgsPBmuReTvGCGtxwE5efGaHYr6go4m0vr5HN025OEzxMZPmn3FTzF8JDMn/WkzV1aLX1vyPaYXlJAoQfjraR1RnQwDSqqqw82glua5VMtefH9RKZbkKJXFbPs8vQwm0GLbMHYp4Mh41dD0X/Q2C38pddRCXVmsMIN8rhsuuT2RTVkTjNGJMSLDq08A2cQ3T93L3qVjYy2lMY2e0S7v3HGx2bhgJkkfhOVq+o3jIn9GlS/ij/cX/Q1ZavbTXTQ4LaG7rDIRb7ibFwxMnQ07dKU7pC9HkkpICDlw4ejSgyx34oRGKNvh2V3it0wgWco6nHv4qq9pfaI2X0sGswbGbT/K9gWQZWpFh410i5B9674/16No3k8SED460jsxmFXHFwgok/0ddfg9zqmhzwBaHJkmnuTjib9Wgxf/HBVCZHgxo5cNRXYuNs4KaBYWPkxPQE7JQnk+LFllYbJ4H22fS7wuSudORE2k6SD8nrQPGz2Vr4B2JW3GLZ5dX0dgd0Hj6Re43lVHWqgIY1r3KxPQ9t7BrIliyrmz/zm9+diIYIOrh9wQaB21cQiadQBGO2wxIsEJ3L4hbpPHzhqBRkEPmslRtjnh+2PDMoHdu/LjF5D5+1F476aP1wilEI/9RS/JJqJVYKiHC2uBdPtSFClr2sq/9FfQjI+EmyDG6x9xnWnjFktwWq289nzyuC8gEvSIgkupQN+OmU265TNvdMlDCw9Z2dLcRvKz0vesBgdhFgRTta2nHe5zsZEAUB15mVZrMIuy0wQeTpwCxQVcEsDYK2R4HZ3aTlF9Y5YSH5o5rV4XySvzB4rIqsZIuzeZBLfWqlkc4HzpyZGJ3jQCRQbbK0/Pm5heGOvtPnA1IxQnQWAInKu2+D5BEILclivx+SeAbZZRqJ2RDGvfj9PT3nzXYT Efy0NKYL OyyItnBkChjmYe/mX2apgZv+nuhskBgWVrEhqWpU2/ntu9YfbBVN83N+Hr4D/sG8IjwSn6c3iA8iFap5wXxiDmQ6Jlr6zQvxSQrDIpj7c8QUHkDA24jvgW7HRNAI9xHRpyMM9jFaSgervlpaMfIFJgNVksriUezq2j82bGE9u6KCjf4gxPQfGJdmDmwkU0YkEyNH566nQKOvnqRckIA+MKKbyIzvDIT93P3RyaU2sIZRSkA96nCO0SJwaSmkf20l3aFzW6tnNiQChsWKxsQXkncejiNloZyrgwAdj 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); }