From patchwork Tue Mar 18 06:32:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Ye X-Patchwork-Id: 14020370 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 8F406C282EC for ; Tue, 18 Mar 2025 06:33:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 566B7280002; Tue, 18 Mar 2025 02:33:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5164C280001; Tue, 18 Mar 2025 02:33:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3B8BA280002; Tue, 18 Mar 2025 02:33:38 -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 1BB75280001 for ; Tue, 18 Mar 2025 02:33:38 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 3A52080B68 for ; Tue, 18 Mar 2025 06:33:40 +0000 (UTC) X-FDA: 83233705800.27.76A443C Received: from m16.mail.163.com (m16.mail.163.com [117.135.210.4]) by imf29.hostedemail.com (Postfix) with ESMTP id EAC20120006 for ; Tue, 18 Mar 2025 06:33:37 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=163.com header.s=s110527 header.b=C2aHdx9E; dmarc=pass (policy=none) header.from=163.com; spf=pass (imf29.hostedemail.com: domain of liuyerd@163.com designates 117.135.210.4 as permitted sender) smtp.mailfrom=liuyerd@163.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1742279618; a=rsa-sha256; cv=none; b=fYiei81ywCKEFTyPsUR8pJx4TY5uhKkAoAzGNdx+0xU+aloLh6cjkRopCE0vUhGFMNlr1m nHDxt8ptyK6Z56ElLXhjs0F27yGZuG8Rfz6iFvE5pOTuZ9cDP+lCh5/h2KaSzfxuK1see6 0zQdkuFGAA9KN9dUBZ5cJ80RrJkrjxA= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=163.com header.s=s110527 header.b=C2aHdx9E; dmarc=pass (policy=none) header.from=163.com; spf=pass (imf29.hostedemail.com: domain of liuyerd@163.com designates 117.135.210.4 as permitted sender) smtp.mailfrom=liuyerd@163.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1742279618; 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=/lMSmDJnLQOCrq8yGaCgmI/hezWy6ytM+F+ncidM3WY=; b=fMKgelJuiKn7v/teiVS7M/bnqc7fSmFRTplOEx2RaTKQeKzOkwdl6lBsAH9XFd+kwmsAn2 xZpI/UIPOC6+sSYgJ8rp/9uO/g3+R95QmE3en2RErEmQEKhGY94KP9hB0hOkzXasfyWrwl K3mdxm5TXn6ACQLlEWwOxuhkgywn5CY= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=/lMSm DJnLQOCrq8yGaCgmI/hezWy6ytM+F+ncidM3WY=; b=C2aHdx9EIQtVaa3mFsBHS /F2jAQxF2koD63mAcmLhPD5hzL+rn2ZObrWyrYJFUvTtnK5merK6LWCOD+feLOm1 T1s0wBWMeIqVv55HQFpEf0Yn3YV289ZWSG0H+fzUXXG3hxW9cLFPYKHFGIeVzcha EYl/FqhHZAU7sq8I2KqwQY= Received: from localhost.localdomain (unknown []) by gzga-smtp-mtada-g1-2 (Coremail) with SMTP id _____wDnj1R_E9lnWny0AA--.27191S2; Tue, 18 Mar 2025 14:32:32 +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 v4] fs/proc/page: Refactoring to reduce code duplication. Date: Tue, 18 Mar 2025 14:32:26 +0800 Message-Id: <20250318063226.223284-1-liuyerd@163.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CM-TRANSID: _____wDnj1R_E9lnWny0AA--.27191S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxKr48XF4xZr1kuw4xZw4kXrb_yoWxAry8pF s8Gr4jyw48W34Ykr1xJ395Zas8G3s3Aa1Yy3y7G34Sva47JFnaka4SyFn0vFyxGryUZF1U ua909ry3CFWjyaDanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jnjjgUUUUU= X-Originating-IP: [223.70.253.31] X-CM-SenderInfo: 5olx5vlug6il2tof0z/1tbiKBAUTGfZDod+JgAAsP X-Rspamd-Server: rspam07 X-Rspam-User: X-Stat-Signature: rrbrwnx683h9k4girntj4ht6fw5na3os X-Rspamd-Queue-Id: EAC20120006 X-HE-Tag: 1742279617-995462 X-HE-Meta: U2FsdGVkX18kHE+eFM1WO8Vo1eI3doRNT/lW1tnuYNXZV1An8e5/Ppu5TIC/l24GOrA5F0P7IA89m4w6UYvu57/6zWTYdXSyTGAXX3LyXxygbbrBoKWjk5Y49YxhhPLX6E7BZ7W22Dx0l7DNS65+aAooK+djCy2ZYXQlJp1fP38mQIY42XcTRmLE4rG9C28/j68nNGxQKP3Vh9q1Inc/ObVnu/So4fe2vF8ICumLw3pEQmlI8Bh1Dxc5hSTraUKvCoDMSCLEWZOASnQDQbzsQl24VFpIj1dzaoiR4WKJvyKyRpIN1rPw1jSqd9yRuIZkDpEERko0FijdQuqMAeowiJQjvggaISU70wz6ywnjXNoDt9lZUFTvvafCSwV1b+0wYZE0MCF7JlbaoGODHV5Pue79/32TCFcBazPONhPzkZShazqlnz6nYU7a3KItHXPwTPcaWg+99+OB+vmEKG/FaFlcRCqRfRmcuX4cxcVtVDsEdYNharCtrnzfmtvqzc8u8zIwEWk2DeAV/UgJuOy3J5zhM6uoC7kMzkc+dlsPBcP14+AtWhJ2SyicuLGMp4cYJxcXaUyhXduN6uMSdt7635nMMxSAJLwvDOhkeNSohXvlTPx6AQ6Ay+jFBnojgKRZ3WKxRVNZWmj1OggiRCvU9JuJAlhu/kQfLt/gDfxj/cL0etid/KX+0QIV/vejHA0q74JBVqUMSEn77REFS5O8SksAKVmWp6g27NyUn7StDx/ydKR7/jkvwZRMCr2VYgO/GYf1IdtiTqE4a4n4lsrcJtPDEZ+B1HIYDwi9ONApbiqeHovfmpUYNnn/Sjvu0CTJwjYRT4tcZP66AYOkTo8ob81+jbyDAV/BsE0OJkcaTkGAP02prWZN3aMxct/jhwv9r7TqndSPZN0G44V3n/z5dAHVF0T646CWDLqxUMwGMZ70pCuw/Zt2VN8G2iVOTjP+35EKFjRvCbROghKYdsC zh2nh07+ ysEde9SVZKQuzMe3xtHrPamBD+ETUxFEB0VvPqvl6mnKnU9Wl2rTaKm62dlNRo/jTz33VoL8/8ik2qIqBNzjLtpM3UHnTSCrBDakbIinvUSAS6X08RWEgk/sVnhDLNvdHIUu5Su64P6MTW3YOwTi5jk4gJyq0o3Nz/Vz8ZNTwUBTWtlyLWwb5tzPIjfUDjUyBeq9i4FbYunRg0e2bl56Pyqtn83h8KSfc8QFCg5DcDVbhjqT5ULpDoEyeDid1n4+RMfkjNRN89C3gJYdEQnwKy00+aon+zaGBAcBhrmkWjaeUXwtA5N2g9bDLmjKlHx3VfVjjc+iXCph7vXNSE3535LuXOeeC+ptmNFAS 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 Acked-by: David Hildenbrand --- V4 : Update code remake patch. 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, 58 insertions(+), 107 deletions(-) diff --git a/fs/proc/page.c b/fs/proc/page.c index 23fc771100ae..999af26c7298 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 *page; unsigned long src = *ppos; unsigned long pfn; ssize_t ret = 0; + u64 info; pfn = src / KPMSIZE; if (src & KPMMASK || count & KPMMASK) @@ -59,24 +63,34 @@ 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) { - struct folio *folio = page_folio(page); - if (IS_ENABLED(CONFIG_PAGE_MAPCOUNT)) - mapcount = folio_precise_page_mapcount(folio, page); - else - mapcount = folio_average_page_mapcount(folio); - } - - if (put_user(mapcount, out)) { + if (page) { + switch (op) { + case KPAGE_FLAGS: + info = stable_page_flags(page); + break; + case KPAGE_COUNT: + if (IS_ENABLED(CONFIG_PAGE_MAPCOUNT)) + info = folio_precise_page_mapcount(page_folio(page), page); + else + info = folio_average_page_mapcount(page_folio(page)); + break; + case KPAGE_CGROUP: + info = page_cgroup_ino(page); + break; + default: + info = 0; + break; + } + } else + info = 0; + + if (put_user(info, out)) { ret = -EFAULT; break; } @@ -94,17 +108,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) { @@ -225,47 +245,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 = { @@ -276,53 +266,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 53364526d877..5264d148bdd9 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -1793,6 +1793,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)