From: Simon Horman <horms@kernel•org>
To: "Michal Koutný" <mkoutny@suse•com>
Cc: netdev@vger•kernel.org, linux-kernel@vger•kernel.org,
bpf@vger•kernel.org, cake@lists•bufferbloat.net,
"David S . Miller" <davem@davemloft•net>,
"Eric Dumazet" <edumazet@google•com>,
"Jakub Kicinski" <kuba@kernel•org>,
"Paolo Abeni" <pabeni@redhat•com>,
"Jamal Hadi Salim" <jhs@mojatatu•com>,
"Cong Wang" <xiyou.wangcong@gmail•com>,
"Jiri Pirko" <jiri@resnulli•us>,
"Alexei Starovoitov" <ast@kernel•org>,
"Daniel Borkmann" <daniel@iogearbox•net>,
"Andrii Nakryiko" <andrii@kernel•org>,
"Martin KaFai Lau" <martin.lau@linux•dev>,
"Song Liu" <song@kernel•org>,
"Yonghong Song" <yonghong.song@linux•dev>,
"John Fastabend" <john.fastabend@gmail•com>,
"KP Singh" <kpsingh@kernel•org>,
"Stanislav Fomichev" <sdf@google•com>,
"Hao Luo" <haoluo@google•com>, "Jiri Olsa" <jolsa@kernel•org>,
"Toke Høiland-Jørgensen" <toke@toke•dk>,
"Vinicius Costa Gomes" <vinicius.gomes@intel•com>,
"Stephen Hemminger" <stephen@networkplumber•org>,
"Petr Pavlu" <ppavlu@suse•cz>,
"Michal Kubecek" <mkubecek@suse•cz>,
"Martin Wilck" <mwilck@suse•com>,
"Pedro Tammela" <pctammela@mojatatu•com>
Subject: Re: [PATCH v4 3/4] net/sched: Load modules via their alias
Date: Tue, 23 Jan 2024 17:40:02 +0000 [thread overview]
Message-ID: <20240123174002.GN254773@kernel.org> (raw)
In-Reply-To: <20240123135242.11430-4-mkoutny@suse.com>
On Tue, Jan 23, 2024 at 02:52:41PM +0100, Michal Koutný wrote:
> The cls_,sch_,act_ modules may be loaded lazily during network
> configuration but without user's awareness and control.
>
> Switch the lazy loading from canonical module names to a module alias.
> This allows finer control over lazy loading, the precedent from
> commit 7f78e0351394 ("fs: Limit sys_mount to only request filesystem
> modules.") explains it already:
>
> Using aliases means user space can control the policy of which
> filesystem^W net/sched modules are auto-loaded by editing
> /etc/modprobe.d/*.conf with blacklist and alias directives.
> Allowing simple, safe, well understood work-arounds to known
> problematic software.
>
> By default, nothing changes. However, if a specific module is
> blacklisted (its canonical name), it won't be modprobe'd when requested
> under its alias (i.e. kernel auto-loading). It would appear as if the
> given module was unknown.
>
> The module can still be loaded under its canonical name, which is an
> explicit (privileged) user action.
>
> Signed-off-by: Michal Koutný <mkoutny@suse•com>
> ---
> net/sched/act_api.c | 2 +-
> net/sched/cls_api.c | 2 +-
> net/sched/sch_api.c | 4 ++--
> 3 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/net/sched/act_api.c b/net/sched/act_api.c
> index 3e30d7260493..60c0fadfac6d 100644
> --- a/net/sched/act_api.c
> +++ b/net/sched/act_api.c
> @@ -1363,7 +1363,7 @@ struct tc_action_ops *tc_action_load_ops(struct nlattr *nla, u32 flags,
>
> if (rtnl_held)
> rtnl_unlock();
> - request_module("act_%s", act_name);
> + request_module(NET_ACT_ALIAS_PREFIX "%s", name);
Hi Michal,
name doesn't exist in this context, perhaps the line above should be:
request_module(NET_ACT_ALIAS_PREFIX "%s", act_name);
> if (rtnl_held)
> rtnl_lock();
>
> diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
> index 92a12e3d0fe6..b31b832598e7 100644
> --- a/net/sched/cls_api.c
> +++ b/net/sched/cls_api.c
> @@ -257,7 +257,7 @@ tcf_proto_lookup_ops(const char *kind, bool rtnl_held,
> #ifdef CONFIG_MODULES
> if (rtnl_held)
> rtnl_unlock();
> - request_module("cls_%s", kind);
> + request_module(NET_CLS_ALIAS_PREFIX "%s", name);
Likewise, perhaps the line above should be:
request_module(NET_CLS_ALIAS_PREFIX "%s", kind);
> if (rtnl_held)
> rtnl_lock();
> ops = __tcf_proto_lookup_ops(kind);
...
--
pw-bot: changes-requested
next prev parent reply other threads:[~2024-01-23 17:40 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-23 13:52 [PATCH v4 0/4] net/sched: Load modules via alias Michal Koutný
2024-01-23 13:52 ` [PATCH v4 1/4] net/sched: Add helper macros with module names Michal Koutný
2024-01-23 13:52 ` [PATCH v4 2/4] net/sched: Add module aliases for cls_,sch_,act_ modules Michal Koutný
2024-01-23 13:52 ` [PATCH v4 3/4] net/sched: Load modules via their alias Michal Koutný
2024-01-23 17:40 ` Simon Horman [this message]
2024-01-24 10:45 ` Michal Koutný
2024-01-23 13:52 ` [PATCH v4 4/4] net/sched: Remove alias of sch_clsact Michal Koutný
2024-01-24 12:17 ` [PATCH v4 0/4] net/sched: Load modules via alias Jamal Hadi Salim
2024-01-24 13:19 ` Michal Koutný
2024-02-02 11:00 ` Michal Koutný
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=20240123174002.GN254773@kernel.org \
--to=horms@kernel$(echo .)org \
--cc=andrii@kernel$(echo .)org \
--cc=ast@kernel$(echo .)org \
--cc=bpf@vger$(echo .)kernel.org \
--cc=cake@lists$(echo .)bufferbloat.net \
--cc=daniel@iogearbox$(echo .)net \
--cc=davem@davemloft$(echo .)net \
--cc=edumazet@google$(echo .)com \
--cc=haoluo@google$(echo .)com \
--cc=jhs@mojatatu$(echo .)com \
--cc=jiri@resnulli$(echo .)us \
--cc=john.fastabend@gmail$(echo .)com \
--cc=jolsa@kernel$(echo .)org \
--cc=kpsingh@kernel$(echo .)org \
--cc=kuba@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=martin.lau@linux$(echo .)dev \
--cc=mkoutny@suse$(echo .)com \
--cc=mkubecek@suse$(echo .)cz \
--cc=mwilck@suse$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=pabeni@redhat$(echo .)com \
--cc=pctammela@mojatatu$(echo .)com \
--cc=ppavlu@suse$(echo .)cz \
--cc=sdf@google$(echo .)com \
--cc=song@kernel$(echo .)org \
--cc=stephen@networkplumber$(echo .)org \
--cc=toke@toke$(echo .)dk \
--cc=vinicius.gomes@intel$(echo .)com \
--cc=xiyou.wangcong@gmail$(echo .)com \
--cc=yonghong.song@linux$(echo .)dev \
/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