From: Greg KH <gregkh@linuxfoundation•org>
To: Luis Chamberlain <mcgrof@kernel•org>
Cc: jack@suse•cz, rafael@kernel•org, airlied@linux•ie,
amir73il@gmail•com, clemens@ladisch•de,
dri-devel@lists•freedesktop.org, joseph.qi@linux•alibaba.com,
sfr@canb•auug.org.au, mark@fasheh•com, rdna@fb•com,
yzaikin@google•com, joonas.lahtinen@linux•intel.com,
keescook@chromium•org, arnd@arndb•de,
intel-gfx@lists•freedesktop.org, jani.nikula@linux•intel.com,
julia.lawall@lip6•fr, jlbec@evilplan•org, rodrigo.vivi@intel•com,
nixiaoming@huawei•com, vbabka@suse•cz, axboe@kernel•dk,
tytso@mit•edu, linux-kernel@vger•kernel.org,
ebiederm@xmission•com, daniel@ffwll•ch,
akpm@linux-foundation•org, linuxppc-dev@lists•ozlabs.org,
ocfs2-devel@oss•oracle.com, viro@zeniv•linux.org.uk
Subject: Re: [PATCH 09/13] firmware_loader: simplify sysctl declaration with register_sysctl_subdir()
Date: Fri, 29 May 2020 12:26:13 +0200 [thread overview]
Message-ID: <20200529102613.GA1345939@kroah.com> (raw)
In-Reply-To: <20200529074108.16928-10-mcgrof@kernel.org>
On Fri, May 29, 2020 at 07:41:04AM +0000, Luis Chamberlain wrote:
> From: Xiaoming Ni <nixiaoming@huawei•com>
>
> Move the firmware config sysctl table to fallback_table.c and use the
> new register_sysctl_subdir() helper. This removes the clutter from
> kernel/sysctl.c.
>
> Signed-off-by: Xiaoming Ni <nixiaoming@huawei•com>
> Signed-off-by: Luis Chamberlain <mcgrof@kernel•org>
> ---
> drivers/base/firmware_loader/fallback.c | 4 ++++
> drivers/base/firmware_loader/fallback.h | 11 ++++++++++
> drivers/base/firmware_loader/fallback_table.c | 22 +++++++++++++++++--
> include/linux/sysctl.h | 1 -
> kernel/sysctl.c | 7 ------
> 5 files changed, 35 insertions(+), 10 deletions(-)
So it now takes more lines than the old stuff? :(
>
> diff --git a/drivers/base/firmware_loader/fallback.c b/drivers/base/firmware_loader/fallback.c
> index d9ac7296205e..8190653ae9a3 100644
> --- a/drivers/base/firmware_loader/fallback.c
> +++ b/drivers/base/firmware_loader/fallback.c
> @@ -200,12 +200,16 @@ static struct class firmware_class = {
>
> int register_sysfs_loader(void)
> {
> + int ret = register_firmware_config_sysctl();
> + if (ret != 0)
> + return ret;
checkpatch :(
> return class_register(&firmware_class);
And if that fails?
> }
>
> void unregister_sysfs_loader(void)
> {
> class_unregister(&firmware_class);
> + unregister_firmware_config_sysctl();
> }
>
> static ssize_t firmware_loading_show(struct device *dev,
> diff --git a/drivers/base/firmware_loader/fallback.h b/drivers/base/firmware_loader/fallback.h
> index 06f4577733a8..7d2cb5f6ceb8 100644
> --- a/drivers/base/firmware_loader/fallback.h
> +++ b/drivers/base/firmware_loader/fallback.h
> @@ -42,6 +42,17 @@ void fw_fallback_set_default_timeout(void);
>
> int register_sysfs_loader(void);
> void unregister_sysfs_loader(void);
> +#ifdef CONFIG_SYSCTL
> +extern int register_firmware_config_sysctl(void);
> +extern void unregister_firmware_config_sysctl(void);
> +#else
> +static inline int register_firmware_config_sysctl(void)
> +{
> + return 0;
> +}
> +static inline void unregister_firmware_config_sysctl(void) { }
> +#endif /* CONFIG_SYSCTL */
> +
> #else /* CONFIG_FW_LOADER_USER_HELPER */
> static inline int firmware_fallback_sysfs(struct firmware *fw, const char *name,
> struct device *device,
> diff --git a/drivers/base/firmware_loader/fallback_table.c b/drivers/base/firmware_loader/fallback_table.c
> index 46a731dede6f..4234aa5ee5df 100644
> --- a/drivers/base/firmware_loader/fallback_table.c
> +++ b/drivers/base/firmware_loader/fallback_table.c
> @@ -24,7 +24,7 @@ struct firmware_fallback_config fw_fallback_config = {
> EXPORT_SYMBOL_NS_GPL(fw_fallback_config, FIRMWARE_LOADER_PRIVATE);
>
> #ifdef CONFIG_SYSCTL
> -struct ctl_table firmware_config_table[] = {
> +static struct ctl_table firmware_config_table[] = {
> {
> .procname = "force_sysfs_fallback",
> .data = &fw_fallback_config.force_sysfs_fallback,
> @@ -45,4 +45,22 @@ struct ctl_table firmware_config_table[] = {
> },
> { }
> };
> -#endif
> +
> +static struct ctl_table_header *hdr;
> +int register_firmware_config_sysctl(void)
> +{
> + if (hdr)
> + return -EEXIST;
How can hdr be set?
> + hdr = register_sysctl_subdir("kernel", "firmware_config",
> + firmware_config_table);
> + if (!hdr)
> + return -ENOMEM;
> + return 0;
> +}
> +
> +void unregister_firmware_config_sysctl(void)
> +{
> + if (hdr)
> + unregister_sysctl_table(hdr);
Why can't unregister_sysctl_table() take a null pointer value?
And what sets 'hdr' (worst name for a static variable) to NULL so that
it knows not to be unregistered again as it looks like
register_firmware_config_sysctl() could be called multiple times.
thanks,
greg k-h
next prev parent reply other threads:[~2020-05-29 10:28 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-29 7:40 [PATCH 00/13] sysctl: spring cleaning Luis Chamberlain
2020-05-29 7:40 ` [PATCH 01/13] sysctl: add new register_sysctl_subdir() helper Luis Chamberlain
2020-05-29 8:13 ` Jani Nikula
2020-05-29 12:16 ` Luis Chamberlain
2020-05-29 12:40 ` Eric W. Biederman
2020-05-29 12:42 ` Eric W. Biederman
2020-05-29 7:40 ` [PATCH 02/13] cdrom: use new sysctl subdir helper register_sysctl_subdir() Luis Chamberlain
2020-05-29 12:46 ` Eric W. Biederman
2020-05-29 7:40 ` [PATCH 03/13] hpet: " Luis Chamberlain
2020-05-29 7:40 ` [PATCH 04/13] i915: " Luis Chamberlain
2020-05-29 7:41 ` [PATCH 05/13] macintosh/mac_hid.c: " Luis Chamberlain
2020-05-29 7:41 ` [PATCH 06/13] ocfs2: " Luis Chamberlain
2020-05-29 8:23 ` Kees Cook
2020-05-29 11:49 ` [Intel-gfx] " Luis Chamberlain
2020-05-29 14:49 ` Kees Cook
2020-05-29 7:41 ` [PATCH 07/13] test_sysctl: " Luis Chamberlain
2020-05-29 7:41 ` [PATCH 08/13] inotify: simplify sysctl declaration with register_sysctl_subdir() Luis Chamberlain
2020-05-29 7:41 ` [PATCH 09/13] firmware_loader: " Luis Chamberlain
2020-05-29 10:26 ` Greg KH [this message]
2020-05-29 11:59 ` Xiaoming Ni
2020-05-29 12:09 ` Luis Chamberlain
2020-05-29 7:41 ` [PATCH 10/13] eventpoll: " Luis Chamberlain
2020-05-29 7:41 ` [PATCH 11/13] random: " Luis Chamberlain
2020-05-29 10:26 ` Greg KH
2020-05-29 12:09 ` Xiaoming Ni
2020-05-29 7:41 ` [PATCH 12/13] sysctl: add helper to register empty subdir Luis Chamberlain
2020-05-29 8:15 ` Kees Cook
2020-05-29 13:03 ` Eric W. Biederman
2021-11-17 3:30 ` Luis Chamberlain
2020-05-29 7:41 ` [PATCH 13/13] fs: move binfmt_misc sysctl to its own file Luis Chamberlain
2020-05-29 8:14 ` Kees Cook
2020-06-04 8:45 ` Xiaoming Ni
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=20200529102613.GA1345939@kroah.com \
--to=gregkh@linuxfoundation$(echo .)org \
--cc=airlied@linux$(echo .)ie \
--cc=akpm@linux-foundation$(echo .)org \
--cc=amir73il@gmail$(echo .)com \
--cc=arnd@arndb$(echo .)de \
--cc=axboe@kernel$(echo .)dk \
--cc=clemens@ladisch$(echo .)de \
--cc=daniel@ffwll$(echo .)ch \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=ebiederm@xmission$(echo .)com \
--cc=intel-gfx@lists$(echo .)freedesktop.org \
--cc=jack@suse$(echo .)cz \
--cc=jani.nikula@linux$(echo .)intel.com \
--cc=jlbec@evilplan$(echo .)org \
--cc=joonas.lahtinen@linux$(echo .)intel.com \
--cc=joseph.qi@linux$(echo .)alibaba.com \
--cc=julia.lawall@lip6$(echo .)fr \
--cc=keescook@chromium$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=mark@fasheh$(echo .)com \
--cc=mcgrof@kernel$(echo .)org \
--cc=nixiaoming@huawei$(echo .)com \
--cc=ocfs2-devel@oss$(echo .)oracle.com \
--cc=rafael@kernel$(echo .)org \
--cc=rdna@fb$(echo .)com \
--cc=rodrigo.vivi@intel$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tytso@mit$(echo .)edu \
--cc=vbabka@suse$(echo .)cz \
--cc=viro@zeniv$(echo .)linux.org.uk \
--cc=yzaikin@google$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox