| Message ID | 1589774397-42485-1-git-send-email-nixiaoming@huawei.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | cleaning up the sysctls table (hung_task watchdog) | expand |
On Mon, May 18, 2020 at 11:59:53AM +0800, Xiaoming Ni wrote: > Kernel/sysctl.c contains more than 190 interface files, and there are a > large number of config macro controls. When modifying the sysctl > interface directly in kernel/sysctl.c, conflicts are very easy to occur. > E.g: https://lkml.org/lkml/2020/5/10/413. FWIW un the future please avoid using lkmk.org and instead use https://lkml.kernel.org/r/<MESSAGE-ID> for references. > Use register_sysctl() to register the sysctl interface to avoid > merge conflicts when different features modify sysctl.c at the same time. > > So consider cleaning up the sysctls table, details are in: > https://kernelnewbies.org/KernelProjects/proc > https://lkml.org/lkml/2020/5/13/990 > > The current patch set extracts register_sysctl_init and some sysctl_vals > variables, and clears the interface of hung_task and watchdog in sysctl.c. > > The current patch set is based on commit b9bbe6ed63b2b9 ("Linux 5.7-rc6"), > which conflicts with the latest branch of linux-next: > 9b4caf6941fc41d ("kernel / hung_task.c: introduce sysctl to print > all traces when a hung task is detected") > > Should I modify to make patch based on the "linux-next" branch to avoid > conflicts, or other branches? If you can do that, that would be appreciated. I have a sysctl fs cleanup stuff, so I can take your patches, and put my work ont op of yours and then send this to Andrew once done. Luis
On 2020/5/19 1:16, Luis Chamberlain wrote: > On Mon, May 18, 2020 at 11:59:53AM +0800, Xiaoming Ni wrote: >> Kernel/sysctl.c contains more than 190 interface files, and there are a >> large number of config macro controls. When modifying the sysctl >> interface directly in kernel/sysctl.c, conflicts are very easy to occur. >> E.g: https://lkml.org/lkml/2020/5/10/413. > > FWIW un the future please avoid using lkmk.org and instead use > https://lkml.kernel.org/r/<MESSAGE-ID> for references. > >> Use register_sysctl() to register the sysctl interface to avoid >> merge conflicts when different features modify sysctl.c at the same time. >> >> So consider cleaning up the sysctls table, details are in: >> https://kernelnewbies.org/KernelProjects/proc >> https://lkml.org/lkml/2020/5/13/990 >> >> The current patch set extracts register_sysctl_init and some sysctl_vals >> variables, and clears the interface of hung_task and watchdog in sysctl.c. >> >> The current patch set is based on commit b9bbe6ed63b2b9 ("Linux 5.7-rc6"), >> which conflicts with the latest branch of linux-next: >> 9b4caf6941fc41d ("kernel / hung_task.c: introduce sysctl to print >> all traces when a hung task is detected") >> >> Should I modify to make patch based on the "linux-next" branch to avoid >> conflicts, or other branches? > > If you can do that, that would be appreciated. I have a sysctl fs cleanup > stuff, so I can take your patches, and put my work ont op of yours and > then send this to Andrew once done. > > Luis > Ok, I will redo the v4 version based on the linux-next branch as soon as possible I want to continue to participate in the subsequent sysctl cleanup, how to push the subsequent cleanup patch to your series, and minimize conflict Thanks Xiaoming Ni
Kernel/sysctl.c contains more than 190 interface files, and there are a large number of config macro controls. When modifying the sysctl interface directly in kernel/sysctl.c, conflicts are very easy to occur. E.g: https://lkml.org/lkml/2020/5/10/413. Use register_sysctl() to register the sysctl interface to avoid merge conflicts when different features modify sysctl.c at the same time. So consider cleaning up the sysctls table, details are in: https://kernelnewbies.org/KernelProjects/proc https://lkml.org/lkml/2020/5/13/990 The current patch set extracts register_sysctl_init and some sysctl_vals variables, and clears the interface of hung_task and watchdog in sysctl.c. The current patch set is based on commit b9bbe6ed63b2b9 ("Linux 5.7-rc6"), which conflicts with the latest branch of linux-next: 9b4caf6941fc41d ("kernel / hung_task.c: introduce sysctl to print all traces when a hung task is detected") Should I modify to make patch based on the "linux-next" branch to avoid conflicts, or other branches? changes in v3: 1. make hung_task_timeout_max to be const 2. fix build warning: kernel/watchdog.c:779:14: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers] .extra2 = &sixty, ^ V2: https://lkml.org/lkml/2020/5/16/81 changes in v2: 1. Adjusted the order of patches, first do public function extraction, then do feature code movement 2. Move hung_task sysctl to hung_task.c instead of adding new file 3. Extract multiple common variables instead of only neg_one, and keep the order of member values in sysctl_vals 4. Add const modification to the variable sixty in watchdog sysctl V1: https://lkml.org/lkml/2020/5/15/17 Xiaoming Ni (4): sysctl: Add register_sysctl_init() interface sysctl: Move some boundary constants form sysctl.c to sysctl_vals hung_task: Move hung_task sysctl interface to hung_task.c watchdog: move watchdog sysctl interface to watchdog.c fs/proc/proc_sysctl.c | 2 +- include/linux/sched/sysctl.h | 8 +- include/linux/sysctl.h | 13 ++- kernel/hung_task.c | 63 +++++++++++++- kernel/sysctl.c | 202 ++++++++----------------------------------- kernel/watchdog.c | 101 ++++++++++++++++++++++ 6 files changed, 210 insertions(+), 179 deletions(-)