From mboxrd@z Thu Jan 1 00:00:00 1970 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 D5FE4C36005 for ; Mon, 24 Mar 2025 03:26:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 71056280002; Sun, 23 Mar 2025 23:26:06 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6BF3C280001; Sun, 23 Mar 2025 23:26:06 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 56037280002; Sun, 23 Mar 2025 23:26:06 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 3246E280001 for ; Sun, 23 Mar 2025 23:26:06 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 08922120F31 for ; Mon, 24 Mar 2025 03:26:06 +0000 (UTC) X-FDA: 83255005932.22.525C496 Received: from m16.mail.163.com (m16.mail.163.com [117.135.210.5]) by imf17.hostedemail.com (Postfix) with ESMTP id 4010D4000A for ; Mon, 24 Mar 2025 03:26:02 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=163.com header.s=s110527 header.b=CcNhVdVG; spf=pass (imf17.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=1742786764; 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:dkim-signature; bh=HkbejiPMTMwvJkup0zgJvuVm3HcrQGNtexmCZvXZV6Q=; b=LDgvT7660wP/Zq4LbXZT132/BnNz+6vG+Y6U3RW1Aoi6xn79MwYkNhUBiYsKdmXbFhlEcB 8ArMJ5topBLbK6uDFjyy5HuQUEfr1dgMV97wecBjBPKr/h0RBHwfwABO3rKwh1xTYc//K2 BqkC4dgzpiwKyioVv5RAG57FeQKGFak= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=163.com header.s=s110527 header.b=CcNhVdVG; spf=pass (imf17.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=1742786764; a=rsa-sha256; cv=none; b=45rzH0Bm3cWJnVYb4omlqrf4Dgp7kz5Gzc/jgp8IpwRR877WhqmCSVvl5E2msDke3A5PNC bK95L1bnA9SRIeYpj/UQadE9uBXi+XS0/1/2sv4A47hRoegFLMKu4pq79U5zhUgs877FF0 kXOxnI7Dtyf8s++PFMq0N/K8ZBSvLXE= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=Message-ID:Date:MIME-Version:Subject:From: Content-Type; bh=HkbejiPMTMwvJkup0zgJvuVm3HcrQGNtexmCZvXZV6Q=; b=CcNhVdVGCGSAQ1vmsePlw+MbAWWGDCHNksI+gvYxVcQd7oEDhfo8114/WCPUts NK1PuigMIeeYzcnedKib2qve8ZEpMMeTxRUnk09b1WmzoP682Xn4AO9qckB7m3+o 6gjt7zcdP6QaQRqJMURxoRweGf7H934H63Pls5PyQ495U= Received: from [192.168.22.248] (unknown [223.70.253.31]) by gzsmtp5 (Coremail) with SMTP id QCgvCgA3eaaU0OBnwVitSA--.46911S2; Mon, 24 Mar 2025 11:25:11 +0800 (CST) Message-ID: Date: Mon, 24 Mar 2025 11:25:08 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v4] fs/proc/page: Refactoring to reduce code duplication. 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, 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 References: <20250318063226.223284-1-liuyerd@163.com> Content-Language: en-US From: Liu Ye In-Reply-To: <20250318063226.223284-1-liuyerd@163.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-CM-TRANSID:QCgvCgA3eaaU0OBnwVitSA--.46911S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxKr45tr4kKFyxZFW7Jw1DKFg_yoWxur4fpF s8GF4jyw4xX34Ykr17Jws8Za45u3s5Za1Yy3y7G34fXa47twnakFySy3Z0vFy8GryUZF48 WFWq9r1akFWUtFJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jwa93UUUUU= X-Originating-IP: [223.70.253.31] X-CM-SenderInfo: 5olx5vlug6il2tof0z/xtbBMQ8aTGfgx7fuFQAAsk X-Rspamd-Queue-Id: 4010D4000A X-Rspamd-Server: rspam05 X-Rspam-User: X-Stat-Signature: 3g3sdq3rmrsm1u1xien3gfksh69hgtrk X-HE-Tag: 1742786762-782710 X-HE-Meta: U2FsdGVkX18Sx9IJhBkCdGa6VPSB90DsXWqI+5mnTTxyrfqSZLQ9IE6LL+l4qBpGEvKnEIlybJ5PW8C6ywsK/c+pc3o8rO4yDqTNtFRS8B1TnnY8VOmWf6tVHX7/3uJpmcWqwr6Wndvk8lDxIGLw+z/D5hg9PKMCzVTwqOtzORekwi4ROmfs//cpbYH3VCiQdIg9UlQk9QZZTnALZtsfe44sHJy/SanpaKxrIdfefxYayDbH84WEqHJUBO0+0TDYuleVnhMx9pfWoRSIzQa0X68Hxhoj1NDtk1xbPWeX8+rt9NfqwG//5u2vf4/RMErarHnE+GZlRwQkmdiVnwWbL8GsKagETW6zzGXOmBbqqnq6k4TmZEM3DNUTFasDAZYM3jIXGqcPQWSkFYS/i6cK4oURZMFazMCcP2QOzpWzbDDskE+UBbeKB3jCHTSCIcvMM7eEXTOIv+YT6BLfsO/HZpOKQgks2Vu2YzBum8tuByHD36XY+57yakSMn8QnuUxqo0BqrSheitXb0Ak/M4SiJVO23pK4PzhfMO2+pmJUHlzVcfWmNApcQTnRhzVmTxHHR2TZt/x5aMVKsLb9iVAytl0bnRRc25RfFBbxx365sRw8uRQQcFIstlGRa9s3/Reqazl3/cLjdQomYr2aE7Xyocydu9eKCb8S02tUNO3CaHV23z+jT3IA32uwTU6wErj5dyBKwbQMePlx+fc8FA3J1jpa6GmOcorc1tg3B9KBSkzcAVzlgzzH+N9oQlkGHihiQwwzftyE1SFJEBVtpS10I3ax2qPmn8ydo2sAgX8c2VP0uneDvV7MD74qsCGakmH7Cq+Kv7b+a+9E6+hYkVuo0fawIYNx18ugrGycx0Ow/7GSzS5H/qLJBT7apwiodn66wVTob7sYQVMEJJac7672j1aEgG4F2I++aQsl3oQksJBk1cWfjTU+JtVVd2GZnTYI1NnTijgsG632qNV0l4k WSOHYPjX 9ELwKe7r5bON9AraQyYbFyMcjDVHQO0ta4MhIg4CmJA7+3SBuf4NzQe1MqW4SEDR9sGjBFgPAGPKt886Kk4eD93f+Rpk+7ezqzMdYFsP3jvHL0bXufivwCHBrPXTy+XAf2B8HcivFcvn6NYu9wK0L9BwVrFEj4IUeXXtF9YIGrcs95GJLyjyGsoL1mbC1by2WFF5DxWCQJzXq8q6Pa+tkFDAIOrWdiu+5jCPQgJBo4fJVG6zycbv1obK9lz3VNaFIKRPWYkk83LczuSGlrvsg7TC7m0m8KGdPKMQd4rG0bB6EthLGBHpW7nwNfyOcAbvtVqOEP3drWtW19OftonLSZqCIGRxI5NmaWKxsB9NjqUIk9k4UZxZsYW3X3BBgKLEEPYtY1fbuud3J1TmLuwgrCJ5veT8e8m1qI2qLOT97ANzlM2L7jGJWjt08dDv33HBvtlrxU8BsIdXOBqE= 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: Friendly ping. 在 2025/3/18 14:32, Liu Ye 写道: > 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 > > --- > 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)