diff mbox series

[net-next,4/4] net/smc: Enable module load on netlink usage

Message ID 20220725141000.70347-5-wenjia@linux.ibm.com (mailing list archive)
State Accepted
Commit 28ec53f3a830750f1b5ccf73cb13dae66ade1660
Delegated to: Netdev Maintainers
Headers show
Series net/smc: updates 2022-7-25 | expand

Checks

Context Check Description
netdev/tree_selection success Clearly marked for net-next
netdev/fixes_present success Fixes tag not required for -next series
netdev/subject_prefix success Link
netdev/cover_letter success Series has a cover letter
netdev/patch_count success Link
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 0 this patch: 0
netdev/cc_maintainers warning 2 maintainers not CCed: pabeni@redhat.com edumazet@google.com
netdev/build_clang success Errors and warnings before: 0 this patch: 0
netdev/module_param success Was 0 now: 0
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success No Fixes tag
netdev/build_allmodconfig_warn success Errors and warnings before: 0 this patch: 0
netdev/checkpatch fail ERROR: Unrecognized email address: 'Wenjia Zhang < wenjia@linux.ibm.com>'
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0

Commit Message

Wenjia Zhang July 25, 2022, 2:10 p.m. UTC 
From: Stefan Raspl <raspl@linux.ibm.com>

Previously, the smc and smc_diag modules were automatically loaded as
dependencies of the ism module whenever an ISM device was present.
With the pending rework of the ISM API, the smc module will no longer
automatically be loaded in presence of an ISM device. Usage of an AF_SMC
socket will still trigger loading of the smc modules, but usage of a
netlink socket will not.
This is addressed by setting the correct module aliases.

Signed-off-by: Stefan Raspl <raspl@linux.ibm.com>
Signed-off-by: Wenjia Zhang < wenjia@linux.ibm.com>
---
 net/smc/af_smc.c   | 1 +
 net/smc/smc_diag.c | 1 +
 2 files changed, 2 insertions(+)

Comments

Tony Lu July 26, 2022, 2:54 a.m. UTC | #1 
On Mon, Jul 25, 2022 at 04:10:00PM +0200, Wenjia Zhang wrote:
> From: Stefan Raspl <raspl@linux.ibm.com>
> 
> Previously, the smc and smc_diag modules were automatically loaded as
> dependencies of the ism module whenever an ISM device was present.
> With the pending rework of the ISM API, the smc module will no longer
> automatically be loaded in presence of an ISM device. Usage of an AF_SMC
> socket will still trigger loading of the smc modules, but usage of a
> netlink socket will not.
> This is addressed by setting the correct module aliases.
> 
> Signed-off-by: Stefan Raspl <raspl@linux.ibm.com>
> Signed-off-by: Wenjia Zhang < wenjia@linux.ibm.com>

This patch looks good to me.

Reviewed-by: Tony Lu <tonylu@linux.alibaba.com>

> ---
>  net/smc/af_smc.c   | 1 +
>  net/smc/smc_diag.c | 1 +
>  2 files changed, 2 insertions(+)
> 
> diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c
> index 6e70d9c10b78..79c1318af1fe 100644
> --- a/net/smc/af_smc.c
> +++ b/net/smc/af_smc.c
> @@ -3515,3 +3515,4 @@ MODULE_DESCRIPTION("smc socket address family");
>  MODULE_LICENSE("GPL");
>  MODULE_ALIAS_NETPROTO(PF_SMC);
>  MODULE_ALIAS_TCP_ULP("smc");
> +MODULE_ALIAS_GENL_FAMILY(SMC_GENL_FAMILY_NAME);
> diff --git a/net/smc/smc_diag.c b/net/smc/smc_diag.c
> index 1fca2f90a9c7..80ea7d954ece 100644
> --- a/net/smc/smc_diag.c
> +++ b/net/smc/smc_diag.c
> @@ -268,3 +268,4 @@ module_init(smc_diag_init);
>  module_exit(smc_diag_exit);
>  MODULE_LICENSE("GPL");
>  MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_NETLINK, NETLINK_SOCK_DIAG, 43 /* AF_SMC */);
> +MODULE_ALIAS_GENL_FAMILY(SMCR_GENL_FAMILY_NAME);
> -- 
> 2.35.2
diff mbox series

Patch

diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c
index 6e70d9c10b78..79c1318af1fe 100644
--- a/net/smc/af_smc.c
+++ b/net/smc/af_smc.c
@@ -3515,3 +3515,4 @@  MODULE_DESCRIPTION("smc socket address family");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS_NETPROTO(PF_SMC);
 MODULE_ALIAS_TCP_ULP("smc");
+MODULE_ALIAS_GENL_FAMILY(SMC_GENL_FAMILY_NAME);
diff --git a/net/smc/smc_diag.c b/net/smc/smc_diag.c
index 1fca2f90a9c7..80ea7d954ece 100644
--- a/net/smc/smc_diag.c
+++ b/net/smc/smc_diag.c
@@ -268,3 +268,4 @@  module_init(smc_diag_init);
 module_exit(smc_diag_exit);
 MODULE_LICENSE("GPL");
 MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_NETLINK, NETLINK_SOCK_DIAG, 43 /* AF_SMC */);
+MODULE_ALIAS_GENL_FAMILY(SMCR_GENL_FAMILY_NAME);