From patchwork Tue Jul 9 13:27:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yunsheng Lin X-Patchwork-Id: 13727977 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 3417CC3DA41 for ; Tue, 9 Jul 2024 13:31:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1E55F6B00C2; Tue, 9 Jul 2024 09:31:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 194086B00C3; Tue, 9 Jul 2024 09:31:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 037E86B00C4; Tue, 9 Jul 2024 09:31:20 -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 B81486B00C2 for ; Tue, 9 Jul 2024 09:31:20 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 6210B1418D1 for ; Tue, 9 Jul 2024 13:31:20 +0000 (UTC) X-FDA: 82320300720.22.ACA83AF Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by imf27.hostedemail.com (Postfix) with ESMTP id B369940024 for ; Tue, 9 Jul 2024 13:31:17 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf27.hostedemail.com: domain of linyunsheng@huawei.com designates 45.249.212.189 as permitted sender) smtp.mailfrom=linyunsheng@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1720531853; a=rsa-sha256; cv=none; b=eaaPbRNUbH+Noiu00AWNYKXB9HwAFyytP5XvLWoOhCOrG3kGIGekKMFn+CTu3YgOw5Eudi WJYtkBg4h7dv6jsnM+Gpuqn5Ya3cp6FzwTX36VQOUi33Bxj8B6cXSR37mxvGO/eKPmiuQc oxyCxM/stpe89NGA4BWB276897HURwk= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf27.hostedemail.com: domain of linyunsheng@huawei.com designates 45.249.212.189 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=1720531853; 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=oaPf5ETAe89wxhSZu4CnM3yAXRIb2UndjMGv2uzDz+g=; b=jUNQqYMGIq3U6sdMqPkDsrLawt0lTCK0ylbb0Wub5ofXRUS8GNFhhQNpr473KVTXkf8NaL pWOEWIMyC+m0mvT5cujqM1pEhDrMXBwtPMt0o3ImlVYq0L2GbpEK18viOuBSvRYF8m4nbW F9mHYh+BI6JXKTdOOdWhZZrWJs+ISVk= Received: from mail.maildlp.com (unknown [172.19.163.48]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4WJMGp5BKwzQl5Q; Tue, 9 Jul 2024 21:27:14 +0800 (CST) Received: from dggpemf200006.china.huawei.com (unknown [7.185.36.61]) by mail.maildlp.com (Postfix) with ESMTPS id 8CF08180064; Tue, 9 Jul 2024 21:31:09 +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; Tue, 9 Jul 2024 21:31:09 +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 v10 05/15] mm: page_frag: avoid caller accessing 'page_frag_cache' directly Date: Tue, 9 Jul 2024 21:27:30 +0800 Message-ID: <20240709132741.47751-6-linyunsheng@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20240709132741.47751-1-linyunsheng@huawei.com> References: <20240709132741.47751-1-linyunsheng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggpemf200006.china.huawei.com (7.185.36.61) X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: B369940024 X-Stat-Signature: jpbgy1jdbxtnmhi3pjgi1mxrsq3eo7w8 X-Rspam-User: X-HE-Tag: 1720531877-472536 X-HE-Meta: U2FsdGVkX1+fgQcI//6vAWxUKUQtdLiyLX8vGG/Gsj5+vAaVW3sU4ocGHe7C5FJsU2tz7M6Ls+e7RgQaT1ntjESarS6scIfVjGjvLUaDSz2RVGhGCFEpbqsuV0b/OX6zMK5IxzHRK5yEU15lRksrVkw5TYqHPPg3AFun9BWXH7s30P+83NLT9ZXidgRnQhatIhXgKBtAmIBMchRvhLmhzGdYHAkRecU/HmgfbwLrTdD5Gw0SDj3VHr/6XYPZd4/sXZhVMlNXMbN6gZdI9RbtKYhBMtAsP7Y8R8libwQysRmHC9oa8DraFma6jEpFZlJXi8Wh1hKRPwH2thxqflZEu5/ZRZFgyiXtFH8rfkNNiAEv1PR76U4uotNj7Tp/FLJs3YueDdii43xz7ZhFdB2/8ZdwQO4JnXaLoW3wwVT9juFLeyO5eycyk/FHFdOS/drZMQnpKgxid8dN+y1ZNwFsiF2BDUul8FYCkzkc/abmHdcT1H0mPofweu88chGn4UNHf9ePcooln6XwJ7Y2m3M5VHu8awoOFx0iJtC1w7tJIgZ/JE4OafpBFCbbHmIUpYp3LOaLJJqxDnUpIqeyeqqlv9drnsbIioTOq+R/FuDJlBM6YxbC1polCxMwpq7PRZat6wBbbStqmyDzM2OVqHghZgh1Mcg3VLmk+feL9Ud5BwXJQtyFJsk4AnuVbQzMBytpQjRl+kJ5XrTenD4FLVOuMu23ttnulaa37qn1kcK9scPTdOa3R5MdXMZe9q3f2ys7XWDIoXxzOhyzxB6UjL6RIt5kYFRaqBZD1CkrIMT0T7t9MB+BCyM/PZhEnj5F7S+vO4zjteJArF7wmVlpmHTid6RZezMM//kKEFVP9LJjIv60EkEnMdCfL9v29wVnnrOB8dAEdVE0L5MGvaxilbjIQL7w0A2KFUD8DYpVmvyKnn/CwYje654BsZ/aj3+Ef/AkzmL/YrrUNmWDeWMNcX8 Ew6wsbr4 fCK5dO1mkVcR/hJ1Lx0c6ojjrszrmZpA9oRRAxXWYmmTbxtjS07Px4EmeYzgumRl8WKuKlkitHfKdx2RyYxqmBWTXbGU8EVwAg3TYXq3F1ZOUvhBkPtgfYWdWPDf9cQOok0A9lSwlAfa2XPaJHQtqyDfUvvqgttm3gA1DYaxNp8VjNjQBEy+AsrV75QxqfWONfNOWaZMkWfotoWzistDNelnYgNVngwYVY8iXoD91uQLKA5Wl6oLPz6RF4V2HupPzHZrkVf8CLBiW9OSVUn+ztMUhwAulpzAuRY8w 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 185d875e3e6b..0ba96b7b64ad 100644 --- a/include/linux/page_frag_cache.h +++ b/include/linux/page_frag_cache.h @@ -26,6 +26,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 50166a059c7d..0d47235b5cf2 100644 --- a/mm/page_frag_test.c +++ b/mm/page_frag_test.c @@ -340,7 +340,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 4b8acd967793..76a473b1072d 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -749,14 +749,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_va(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_va(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(); @@ -846,7 +846,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); } 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 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); }