From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Feng Tang <feng.tang@linux.alibaba.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
linux-kernel@vger.kernel.org
Cc: Andrew Morton <akpm@linux-foundation.org>,
Nathan Chancellor <nathan@kernel.org>
Subject: [PATCH v1 7/7] panic: sys_info: Factor out read and write handlers
Date: Fri, 11 Jul 2025 12:51:13 +0300 [thread overview]
Message-ID: <20250711095413.1472448-8-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20250711095413.1472448-1-andriy.shevchenko@linux.intel.com>
For the sake of the code readability and easier maintenance
factor out read and write sys_info handlers.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
lib/sys_info.c | 72 ++++++++++++++++++++++++++++++--------------------
1 file changed, 44 insertions(+), 28 deletions(-)
diff --git a/lib/sys_info.c b/lib/sys_info.c
index 7483b6e9b30b..32bf639c4de2 100644
--- a/lib/sys_info.c
+++ b/lib/sys_info.c
@@ -40,13 +40,52 @@ unsigned long sys_info_parse_param(char *str)
}
#ifdef CONFIG_SYSCTL
+static int sys_info_write_handler(struct ctl_table *table,
+ void *buffer, size_t *lenp, loff_t *ppos,
+ unsigned long *si_bits_global)
+{
+ unsigned long si_bits;
+ int ret;
+
+ ret = proc_dostring(table, 1, buffer, lenp, ppos);
+ if (ret)
+ return ret;
+
+ si_bits = sys_info_parse_param(table->data);
+
+ /* The access to the global value is not synchronized. */
+ WRITE_ONCE(*si_bits_global, si_bits);
+
+ return 0;
+}
+
+static int sys_info_read_handler(struct ctl_table *table,
+ void *buffer, size_t *lenp, loff_t *ppos,
+ unsigned long *si_bits_global)
+{
+ unsigned long si_bits;
+ unsigned int len = 0;
+ char *delim = "";
+ unsigned int i;
+
+ /* The access to the global value is not synchronized. */
+ si_bits = READ_ONCE(*si_bits_global);
+
+ for_each_set_bit(i, &si_bits, ARRAY_SIZE(si_names)) {
+ len += scnprintf(table->data + len, table->maxlen - len,
+ "%s%s", delim, si_names[i]);
+ delim = ",";
+ }
+
+ return proc_dostring(table, 0, buffer, lenp, ppos);
+}
+
int sysctl_sys_info_handler(const struct ctl_table *ro_table, int write,
void *buffer, size_t *lenp,
loff_t *ppos)
{
struct ctl_table table;
unsigned long *si_bits_global;
- unsigned long si_bits;
unsigned int i;
size_t maxlen;
@@ -64,33 +103,10 @@ int sysctl_sys_info_handler(const struct ctl_table *ro_table, int write,
table.data = names;
table.maxlen = maxlen;
- if (write) {
- int ret;
-
- ret = proc_dostring(&table, write, buffer, lenp, ppos);
- if (ret)
- return ret;
-
- si_bits = sys_info_parse_param(names);
- /* The access to the global value is not synchronized. */
- WRITE_ONCE(*si_bits_global, si_bits);
- return 0;
- } else {
- /* for 'read' operation */
- unsigned int len = 0;
- char *delim = "";
-
- /* The access to the global value is not synchronized. */
- si_bits = READ_ONCE(*si_bits_global);
-
- for_each_set_bit(i, &si_bits, ARRAY_SIZE(si_names)) {
- len += scnprintf(names + len, maxlen - len,
- "%s%s", delim, si_names[i]);
- delim = ",";
- }
-
- return proc_dostring(&table, write, buffer, lenp, ppos);
- }
+ if (write)
+ return sys_info_write_handler(&table, buffer, lenp, ppos, si_bits_global);
+ else
+ return sys_info_read_handler(&table, buffer, lenp, ppos, si_bits_global);
}
#endif
--
2.47.2
next prev parent reply other threads:[~2025-07-11 9:54 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-11 9:51 [rft, PATCH v1 0/7] panic: sys_info: Refactor and fix a compilation issue Andy Shevchenko
2025-07-11 9:51 ` [PATCH v1 1/7] Revert "panic: fix compilation error (`make W=1`)" Andy Shevchenko
2025-07-11 9:51 ` [PATCH v1 2/7] panic: sys_info: Align constant definition names with parameters Andy Shevchenko
2025-07-11 9:51 ` [PATCH v1 3/7] panic: sys_info: Capture si_bits_global before iterating over it Andy Shevchenko
2025-07-11 14:56 ` Feng Tang
2025-07-11 15:05 ` Andy Shevchenko
2025-07-11 9:51 ` [PATCH v1 4/7] panic: sys_info: Replace struct sys_info_name with plain array of strings Andy Shevchenko
2025-07-11 15:21 ` Feng Tang
2025-07-11 16:26 ` Andy Shevchenko
2025-07-11 9:51 ` [PATCH v1 5/7] panic: sys_info: Fix compilation error (`make W=1`) Andy Shevchenko
2025-07-11 9:51 ` [PATCH v1 6/7] panic: sys_info: Deduplicate local variable 'table; assignments Andy Shevchenko
2025-07-11 9:51 ` Andy Shevchenko [this message]
2025-07-11 15:09 ` [PATCH v1 7/7] panic: sys_info: Factor out read and write handlers Feng Tang
2025-07-11 16:34 ` Andy Shevchenko
2025-07-11 12:13 ` [rft, PATCH v1 0/7] panic: sys_info: Refactor and fix a compilation issue Andy Shevchenko
2025-07-11 15:42 ` Feng Tang
2025-07-11 16:36 ` Andy Shevchenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250711095413.1472448-8-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=akpm@linux-foundation.org \
--cc=feng.tang@linux.alibaba.com \
--cc=linux-kernel@vger.kernel.org \
--cc=nathan@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.