From patchwork Tue Mar 18 02:51:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Ye X-Patchwork-Id: 14020221 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 DF1E2C282EC for ; Tue, 18 Mar 2025 03:08:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7782B280002; Mon, 17 Mar 2025 23:08:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 72838280001; Mon, 17 Mar 2025 23:08:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5F1CA280002; Mon, 17 Mar 2025 23:08:13 -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 45405280001 for ; Mon, 17 Mar 2025 23:08:13 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id AFEB756824 for ; Tue, 18 Mar 2025 03:08:13 +0000 (UTC) X-FDA: 83233188066.06.ED2E18C Received: from m16.mail.163.com (m16.mail.163.com [117.135.210.5]) by imf08.hostedemail.com (Postfix) with ESMTP id 09E8B160009 for ; Tue, 18 Mar 2025 03:08:10 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=163.com header.s=s110527 header.b="h0YYfd/B"; spf=pass (imf08.hostedemail.com: domain of liuyerd@163.com designates 117.135.210.5 as permitted sender) smtp.mailfrom=liuyerd@163.com; dmarc=pass (policy=none) header.from=163.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1742267292; 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-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=twhKDHS2bhTthfmdF+zbTPqo8rT9kGcPJYWcAYK7wrg=; b=E8FNrGqeIz/NBXwHGSQCiVV6WGezkxGj9JDJX6CywZ7GobyNZJdE6huQ3NLeQA2Bm1OES4 CzbE7xrLOgZUsaqAuKGTVv1UL/xcBkIQXzOnVfX9W2UEKiXG6mEEWWhFCjyLQjYrBkNUol 7qyYJvgNn7Z4R4pTnDfp9uSun/DGg7Q= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=163.com header.s=s110527 header.b="h0YYfd/B"; spf=pass (imf08.hostedemail.com: domain of liuyerd@163.com designates 117.135.210.5 as permitted sender) smtp.mailfrom=liuyerd@163.com; dmarc=pass (policy=none) header.from=163.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1742267292; a=rsa-sha256; cv=none; b=3Az1fI4VmL+zcdvjUenONgv6qzWsl/ePif4wjanmYSXQ8L8Be+zhsiqA+ZS1xi2Au3eqTO d993hVdKEhdXt6P5M9P/1LVug2GlAT9dr3XZGrJhvvrF57ibjGIIp+vEm8j0u1zd12r3PV U4GwwiLDB1zlo4mWTxG0vU3DghnQ1bE= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=twhKD HS2bhTthfmdF+zbTPqo8rT9kGcPJYWcAYK7wrg=; b=h0YYfd/BGw6VDCffz0AxD qRiU04m9ROEDQ84zETrC6KBUQ9uIVcaFYtwn/4W86Ij7XZoU9RVlGnMjtB2ZF7/+ BlPdxrlKcvzo4W8JGIKW4dsvU9uC/jCc3huzR7SSQd/6gyAVvbfzcdqpXUM/MJLQ bhCpOsOXk6QXNm8gCMhrMA= Received: from localhost.localdomain (unknown []) by gzga-smtp-mtada-g0-0 (Coremail) with SMTP id _____wD3WJfE39hnuBWKAA--.1949S2; Tue, 18 Mar 2025 10:51:50 +0800 (CST) From: Liu Ye To: hannes@cmpxchg.org, mhocko@kernel.org, roman.gushchin@linux.dev, shakeel.butt@linux.dev, muchun.song@linux.dev Cc: akpm@linux-foundation.org, willy@infradead.org, david@redhat.com, svetly.todorov@memverge.com, vbabka@suse.cz, liuyerd@163.com, ran.xiaokai@zte.com.cn, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, cgroups@vger.kernel.org, linux-mm@kvack.org, Liu Ye Subject: [PATCH v3] fs/proc/page: Refactoring to reduce code duplication. Date: Tue, 18 Mar 2025 10:51:38 +0800 Message-Id: <20250318025138.170876-1-liuyerd@163.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CM-TRANSID: _____wD3WJfE39hnuBWKAA--.1949S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxKr48XF43AF43tFWfurykXwb_yoWxXrW8pF s8GF4jyrs5W3s0kw1xJ398Zas8G3s3Aa1Yy3y7G34fZa47JrnakFySyFnYvFyxGryUZr1U ua909ry3CFWjyaDanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07j089NUUUUU= X-Originating-IP: [223.70.253.31] X-CM-SenderInfo: 5olx5vlug6il2tof0z/xtbBMRAUTGfY3fg8AwAAsc X-Rspam-User: X-Rspamd-Queue-Id: 09E8B160009 X-Rspamd-Server: rspam03 X-Stat-Signature: xsnfagjw4jwfoa8es6853455jina7fx3 X-HE-Tag: 1742267290-794626 X-HE-Meta: U2FsdGVkX18JutFFnk/TCKwI8LHT9VpOVbxGj8chYKkd+m4LGPGO9a9u0/UneteuSyKWz8rKS5goCEd97l32H8yPBH8ensSmL4my09FMZos6mnD3EtmclrLiPzvnAfDgZdzUHCrOdzA3sKMXGkmM5BwJfJlgRSonFBwinwFFlvvn61D0uRCe8bxEpFYurDNhXyVNC6iPG81rQLUKiNN3/7Sj/8PM2cDmeWvhyz00sQGZTfu7nPF0VNWOhpoJD0ICgpPWzSygML8jSkShB2OntjxlJIseKHAR49t0ejUiV1i5W0Y+CHRybkcO2/Q/OHRzKQJDSPmaJK8irFS9UMjxvvS0YXFJjGDN7wmB5r+7hqxSsYbV+dmdTyYPZwFglGp7Bu0j44YGWr/hhCleTEGaCrKKHH7k2n4XGVqwrng4tAeGBIMm20Bmlp+kHW+mMRBy1Zwr83/E40aRkWW+7mtoUqV/sFF5LIbmZNtYNrn+iopkVNPAcyJZ8KEWX1Dg3dt+DucgiPTraoqRxOD5Woboo5kjKGu7sX4c/xbgTD7vnpmenW2zUINPGZ1d6IcIyKkg377V/YPSt+LLUQ+7GdP3AbvvQm+UjQUrmmcaB5P4YqjEfcTaJRghLC5PqXfTsRyWNdITrV34c6smJ8SaLZDlqXi3XW8zAVA3vGkxbSfruXQGca3Jhjv57J7xovzRu6UdToECv+x8EEMh7A3HYuitL42x0DgHiSDWgcp9KN0JpVWn5/kRwbTztzExz8EFqp2Y4UAQeHlB4UKatUTAQvOA5PzW/HS6J7KfzOUL4EbkzYfciJKpu1rhfSBI4gIy8fsyCzFiOjeyQ03n+xCH83zNtEuqnEEKvn9e41RFvZ0wJRPY+LyIfpGbxOCNimunLKfJBS7qBVBjtDUhrBJPg11Llha0xRJ3VlRSN2DkuDd3QpwWV1MsqQ/k/FM+IcJtLrSvwa+wbF9+3R2oVymxgqy GnNLCRxQ AWwBL0sD+Mjbz4IyRvLIiPsyTkfzTD4ZvhqxLKjWu+FmkoF5G/0nO4/Rsne3e/F92c9Ai6eVpyh89hzynIOkAIZDnwr8rrogRmZ1ou3YGDmy8V3C/yX3Zj1wEk6UylkLC7rdkEJ9LiD7c6tqEkIYTc9J589vP0w87vn5eWqWq/CUY/g4KWTwXj1jGLbHwLvwzsUHYjM1FzKFJ53Eoi1/zeFCftU3ce0kIbnfEUeanJi8bFHLXATgz2cAbLjT7IGi1lDO5Lxt4+2GchFbUgixOHYvigdVPON++iEpe21/AJwmnXuUxjaAaigJKunO1iiHP8ZHcnr9H0jfiFdet2vo2iMz01A== 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: From: Liu Ye The function kpageflags_read and kpagecgroup_read is quite similar to kpagecount_read. Consider refactoring common code into a helper function to reduce code duplication. Signed-off-by: Liu Ye --- V3 : Add a stub for page_cgroup_ino and remove the #ifdef CONFIG_MEMCG. V2 : Use an enumeration to indicate the operation to be performed to avoid passing functions. --- --- fs/proc/page.c | 161 ++++++++++++------------------------- include/linux/memcontrol.h | 4 + 2 files changed, 57 insertions(+), 108 deletions(-) diff --git a/fs/proc/page.c b/fs/proc/page.c index a55f5acefa97..cbadbf9568a1 100644 --- a/fs/proc/page.c +++ b/fs/proc/page.c @@ -22,6 +22,12 @@ #define KPMMASK (KPMSIZE - 1) #define KPMBITS (KPMSIZE * BITS_PER_BYTE) +enum kpage_operation { + KPAGE_FLAGS, + KPAGE_COUNT, + KPAGE_CGROUP, +}; + static inline unsigned long get_max_dump_pfn(void) { #ifdef CONFIG_SPARSEMEM @@ -37,19 +43,17 @@ static inline unsigned long get_max_dump_pfn(void) #endif } -/* /proc/kpagecount - an array exposing page mapcounts - * - * Each entry is a u64 representing the corresponding - * physical page mapcount. - */ -static ssize_t kpagecount_read(struct file *file, char __user *buf, - size_t count, loff_t *ppos) +static ssize_t kpage_read(struct file *file, char __user *buf, + size_t count, loff_t *ppos, + enum kpage_operation op) { const unsigned long max_dump_pfn = get_max_dump_pfn(); u64 __user *out = (u64 __user *)buf; + struct page *ppage; unsigned long src = *ppos; unsigned long pfn; ssize_t ret = 0; + u64 info; pfn = src / KPMSIZE; if (src & KPMMASK || count & KPMMASK) @@ -59,19 +63,27 @@ static ssize_t kpagecount_read(struct file *file, char __user *buf, count = min_t(unsigned long, count, (max_dump_pfn * KPMSIZE) - src); while (count > 0) { - struct page *page; - u64 mapcount = 0; - - /* - * TODO: ZONE_DEVICE support requires to identify - * memmaps that were actually initialized. - */ - page = pfn_to_online_page(pfn); - if (page) - mapcount = folio_precise_page_mapcount(page_folio(page), - page); - - if (put_user(mapcount, out)) { + ppage = pfn_to_online_page(pfn); + + if (ppage) { + switch (op) { + case KPAGE_FLAGS: + info = stable_page_flags(ppage); + break; + case KPAGE_COUNT: + info = folio_precise_page_mapcount(page_folio(ppage), ppage); + break; + case KPAGE_CGROUP: + info = page_cgroup_ino(ppage); + break; + default: + info = 0; + break; + } + } else + info = 0; + + if (put_user(info, out)) { ret = -EFAULT; break; } @@ -89,17 +101,23 @@ static ssize_t kpagecount_read(struct file *file, char __user *buf, return ret; } +/* /proc/kpagecount - an array exposing page mapcounts + * + * Each entry is a u64 representing the corresponding + * physical page mapcount. + */ +static ssize_t kpagecount_read(struct file *file, char __user *buf, + size_t count, loff_t *ppos) +{ + return kpage_read(file, buf, count, ppos, KPAGE_COUNT); +} + static const struct proc_ops kpagecount_proc_ops = { .proc_flags = PROC_ENTRY_PERMANENT, .proc_lseek = mem_lseek, .proc_read = kpagecount_read, }; -/* /proc/kpageflags - an array exposing page flags - * - * Each entry is a u64 representing the corresponding - * physical page flags. - */ static inline u64 kpf_copy_bit(u64 kflags, int ubit, int kbit) { @@ -220,47 +238,17 @@ u64 stable_page_flags(const struct page *page) #endif return u; -}; +} +/* /proc/kpageflags - an array exposing page flags + * + * Each entry is a u64 representing the corresponding + * physical page flags. + */ static ssize_t kpageflags_read(struct file *file, char __user *buf, - size_t count, loff_t *ppos) + size_t count, loff_t *ppos) { - const unsigned long max_dump_pfn = get_max_dump_pfn(); - u64 __user *out = (u64 __user *)buf; - unsigned long src = *ppos; - unsigned long pfn; - ssize_t ret = 0; - - pfn = src / KPMSIZE; - if (src & KPMMASK || count & KPMMASK) - return -EINVAL; - if (src >= max_dump_pfn * KPMSIZE) - return 0; - count = min_t(unsigned long, count, (max_dump_pfn * KPMSIZE) - src); - - while (count > 0) { - /* - * TODO: ZONE_DEVICE support requires to identify - * memmaps that were actually initialized. - */ - struct page *page = pfn_to_online_page(pfn); - - if (put_user(stable_page_flags(page), out)) { - ret = -EFAULT; - break; - } - - pfn++; - out++; - count -= KPMSIZE; - - cond_resched(); - } - - *ppos += (char __user *)out - buf; - if (!ret) - ret = (char __user *)out - buf; - return ret; + return kpage_read(file, buf, count, ppos, KPAGE_FLAGS); } static const struct proc_ops kpageflags_proc_ops = { @@ -271,53 +259,10 @@ static const struct proc_ops kpageflags_proc_ops = { #ifdef CONFIG_MEMCG static ssize_t kpagecgroup_read(struct file *file, char __user *buf, - size_t count, loff_t *ppos) + size_t count, loff_t *ppos) { - const unsigned long max_dump_pfn = get_max_dump_pfn(); - u64 __user *out = (u64 __user *)buf; - struct page *ppage; - unsigned long src = *ppos; - unsigned long pfn; - ssize_t ret = 0; - u64 ino; - - pfn = src / KPMSIZE; - if (src & KPMMASK || count & KPMMASK) - return -EINVAL; - if (src >= max_dump_pfn * KPMSIZE) - return 0; - count = min_t(unsigned long, count, (max_dump_pfn * KPMSIZE) - src); - - while (count > 0) { - /* - * TODO: ZONE_DEVICE support requires to identify - * memmaps that were actually initialized. - */ - ppage = pfn_to_online_page(pfn); - - if (ppage) - ino = page_cgroup_ino(ppage); - else - ino = 0; - - if (put_user(ino, out)) { - ret = -EFAULT; - break; - } - - pfn++; - out++; - count -= KPMSIZE; - - cond_resched(); - } - - *ppos += (char __user *)out - buf; - if (!ret) - ret = (char __user *)out - buf; - return ret; + return kpage_read(file, buf, count, ppos, KPAGE_CGROUP); } - static const struct proc_ops kpagecgroup_proc_ops = { .proc_flags = PROC_ENTRY_PERMANENT, .proc_lseek = mem_lseek, diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 6e74b8254d9b..df4d28c7e1a3 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -1794,6 +1794,10 @@ static inline void count_objcg_events(struct obj_cgroup *objcg, { } +static inline ino_t page_cgroup_ino(struct page *page) +{ + return 0; +} #endif /* CONFIG_MEMCG */ #if defined(CONFIG_MEMCG) && defined(CONFIG_ZSWAP)