* Re: [PATCH net-next] net: Remove KMSG_COMPONENT macro
2025-11-26 14:07 [PATCH net-next] net: Remove KMSG_COMPONENT macro Heiko Carstens
@ 2025-11-26 16:05 ` Alexandra Winter
2025-11-28 2:11 ` Jakub Kicinski
` (3 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Alexandra Winter @ 2025-11-26 16:05 UTC (permalink / raw)
To: Heiko Carstens, David S . Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Simon Horman, Pablo Neira Ayuso, Jozsef Kadlecsik,
Florian Westphal, D . Wythe, Dust Li, Sidraya Jayagond,
Wenjia Zhang, Thorsten Winkler
Cc: netdev
On 26.11.25 15:07, Heiko Carstens wrote:
> The KMSG_COMPONENT macro is a leftover of the s390 specific "kernel message
> catalog" from 2008 [1] which never made it upstream.
>
> The macro was added to s390 code to allow for an out-of-tree patch which
> used this to generate unique message ids. Also this out-of-tree patch
> doesn't exist anymore.
>
> The pattern of how the KMSG_COMPONENT macro is used can also be found at
> some non s390 specific code, for whatever reasons. Besides adding an
> indirection it is unused.
>
> Remove the macro in order to get rid of a pointless indirection. Replace
> all users with the string it defines. In all cases this leads to a simple
> replacement like this:
>
> - #define KMSG_COMPONENT "af_iucv"
> - #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> + #define pr_fmt(fmt) "af_iucv: " fmt
>
> [1] https://lwn.net/Articles/292650/
>
> Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
> ---
> net/iucv/af_iucv.c | 3 +--
> net/iucv/iucv.c | 3 +--
For net/iucv:
Acked-by: Alexandra Winter <wintera@linux.ibm.com>
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH net-next] net: Remove KMSG_COMPONENT macro
2025-11-26 14:07 [PATCH net-next] net: Remove KMSG_COMPONENT macro Heiko Carstens
2025-11-26 16:05 ` Alexandra Winter
@ 2025-11-28 2:11 ` Jakub Kicinski
2025-11-28 11:53 ` Pablo Neira Ayuso
2025-11-28 14:47 ` Julian Anastasov
` (2 subsequent siblings)
4 siblings, 1 reply; 8+ messages in thread
From: Jakub Kicinski @ 2025-11-28 2:11 UTC (permalink / raw)
To: Pablo Neira Ayuso, Jozsef Kadlecsik
Cc: Heiko Carstens, David S . Miller, Eric Dumazet, Paolo Abeni,
Simon Horman, Florian Westphal, D . Wythe, Dust Li,
Sidraya Jayagond, Wenjia Zhang, Alexandra Winter,
Thorsten Winkler, netdev
On Wed, 26 Nov 2025 15:07:05 +0100 Heiko Carstens wrote:
> net/iucv/af_iucv.c | 3 +--
> net/iucv/iucv.c | 3 +--
> net/netfilter/ipvs/ip_vs_app.c | 3 +--
> net/netfilter/ipvs/ip_vs_conn.c | 3 +--
Jozsef, Pablo, should we ask the author to split this up or just apply as is?
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH net-next] net: Remove KMSG_COMPONENT macro
2025-11-28 2:11 ` Jakub Kicinski
@ 2025-11-28 11:53 ` Pablo Neira Ayuso
2025-11-28 18:51 ` Jakub Kicinski
0 siblings, 1 reply; 8+ messages in thread
From: Pablo Neira Ayuso @ 2025-11-28 11:53 UTC (permalink / raw)
To: Jakub Kicinski
Cc: Jozsef Kadlecsik, Heiko Carstens, David S . Miller, Eric Dumazet,
Paolo Abeni, Simon Horman, Florian Westphal, D . Wythe, Dust Li,
Sidraya Jayagond, Wenjia Zhang, Alexandra Winter,
Thorsten Winkler, netdev, Julian Anastasov
Hi Jakub,
On Thu, Nov 27, 2025 at 06:11:27PM -0800, Jakub Kicinski wrote:
> On Wed, 26 Nov 2025 15:07:05 +0100 Heiko Carstens wrote:
> > net/iucv/af_iucv.c | 3 +--
> > net/iucv/iucv.c | 3 +--
> > net/netfilter/ipvs/ip_vs_app.c | 3 +--
> > net/netfilter/ipvs/ip_vs_conn.c | 3 +--
>
> Jozsef, Pablo, should we ask the author to split this up or just apply as is?
Patch looks trivial, and not so large for a tree wide.
But I'm Cc'ing Julian Anastasov so he has a chance to ack the IPVS bits.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH net-next] net: Remove KMSG_COMPONENT macro
2025-11-28 11:53 ` Pablo Neira Ayuso
@ 2025-11-28 18:51 ` Jakub Kicinski
0 siblings, 0 replies; 8+ messages in thread
From: Jakub Kicinski @ 2025-11-28 18:51 UTC (permalink / raw)
To: Pablo Neira Ayuso, Julian Anastasov
Cc: Jozsef Kadlecsik, Heiko Carstens, David S . Miller, Eric Dumazet,
Paolo Abeni, Simon Horman, Florian Westphal, D . Wythe, Dust Li,
Sidraya Jayagond, Wenjia Zhang, Alexandra Winter,
Thorsten Winkler, netdev
On Fri, 28 Nov 2025 11:53:40 +0000 Pablo Neira Ayuso wrote:
> On Thu, Nov 27, 2025 at 06:11:27PM -0800, Jakub Kicinski wrote:
> > On Wed, 26 Nov 2025 15:07:05 +0100 Heiko Carstens wrote:
> > > net/iucv/af_iucv.c | 3 +--
> > > net/iucv/iucv.c | 3 +--
> > > net/netfilter/ipvs/ip_vs_app.c | 3 +--
> > > net/netfilter/ipvs/ip_vs_conn.c | 3 +--
> >
> > Jozsef, Pablo, should we ask the author to split this up or just apply as is?
>
> Patch looks trivial, and not so large for a tree wide.
>
> But I'm Cc'ing Julian Anastasov so he has a chance to ack the IPVS bits.
Oops, my bad, I also meant Julian not Jozsef, sorry.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH net-next] net: Remove KMSG_COMPONENT macro
2025-11-26 14:07 [PATCH net-next] net: Remove KMSG_COMPONENT macro Heiko Carstens
2025-11-26 16:05 ` Alexandra Winter
2025-11-28 2:11 ` Jakub Kicinski
@ 2025-11-28 14:47 ` Julian Anastasov
2025-11-28 15:54 ` Sidraya Jayagond
2025-11-29 3:51 ` patchwork-bot+netdevbpf
4 siblings, 0 replies; 8+ messages in thread
From: Julian Anastasov @ 2025-11-28 14:47 UTC (permalink / raw)
To: Heiko Carstens
Cc: David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Simon Horman, Pablo Neira Ayuso, Jozsef Kadlecsik,
Florian Westphal, D . Wythe, Dust Li, Sidraya Jayagond,
Wenjia Zhang, Alexandra Winter, Thorsten Winkler, netdev
Hello,
On Wed, 26 Nov 2025, Heiko Carstens wrote:
> The KMSG_COMPONENT macro is a leftover of the s390 specific "kernel message
> catalog" from 2008 [1] which never made it upstream.
>
> The macro was added to s390 code to allow for an out-of-tree patch which
> used this to generate unique message ids. Also this out-of-tree patch
> doesn't exist anymore.
>
> The pattern of how the KMSG_COMPONENT macro is used can also be found at
> some non s390 specific code, for whatever reasons. Besides adding an
> indirection it is unused.
>
> Remove the macro in order to get rid of a pointless indirection. Replace
> all users with the string it defines. In all cases this leads to a simple
> replacement like this:
>
> - #define KMSG_COMPONENT "af_iucv"
> - #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> + #define pr_fmt(fmt) "af_iucv: " fmt
>
> [1] https://lwn.net/Articles/292650/
>
> Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
IPVS part looks good to me, thanks!
Acked-by: Julian Anastasov <ja@ssi.bg>
> ---
> net/iucv/af_iucv.c | 3 +--
> net/iucv/iucv.c | 3 +--
> net/netfilter/ipvs/ip_vs_app.c | 3 +--
> net/netfilter/ipvs/ip_vs_conn.c | 3 +--
> net/netfilter/ipvs/ip_vs_core.c | 3 +--
> net/netfilter/ipvs/ip_vs_ctl.c | 3 +--
> net/netfilter/ipvs/ip_vs_dh.c | 3 +--
> net/netfilter/ipvs/ip_vs_est.c | 3 +--
> net/netfilter/ipvs/ip_vs_fo.c | 3 +--
> net/netfilter/ipvs/ip_vs_ftp.c | 3 +--
> net/netfilter/ipvs/ip_vs_lblc.c | 3 +--
> net/netfilter/ipvs/ip_vs_lblcr.c | 3 +--
> net/netfilter/ipvs/ip_vs_lc.c | 3 +--
> net/netfilter/ipvs/ip_vs_mh.c | 3 +--
> net/netfilter/ipvs/ip_vs_nfct.c | 3 +--
> net/netfilter/ipvs/ip_vs_nq.c | 3 +--
> net/netfilter/ipvs/ip_vs_ovf.c | 3 +--
> net/netfilter/ipvs/ip_vs_pe.c | 3 +--
> net/netfilter/ipvs/ip_vs_pe_sip.c | 3 +--
> net/netfilter/ipvs/ip_vs_proto.c | 3 +--
> net/netfilter/ipvs/ip_vs_proto_ah_esp.c | 3 +--
> net/netfilter/ipvs/ip_vs_proto_tcp.c | 3 +--
> net/netfilter/ipvs/ip_vs_proto_udp.c | 3 +--
> net/netfilter/ipvs/ip_vs_rr.c | 3 +--
> net/netfilter/ipvs/ip_vs_sched.c | 3 +--
> net/netfilter/ipvs/ip_vs_sed.c | 3 +--
> net/netfilter/ipvs/ip_vs_sh.c | 3 +--
> net/netfilter/ipvs/ip_vs_sync.c | 3 +--
> net/netfilter/ipvs/ip_vs_twos.c | 3 +--
> net/netfilter/ipvs/ip_vs_wlc.c | 3 +--
> net/netfilter/ipvs/ip_vs_wrr.c | 3 +--
> net/netfilter/ipvs/ip_vs_xmit.c | 3 +--
> net/smc/af_smc.c | 3 +--
> 33 files changed, 33 insertions(+), 66 deletions(-)
>
> diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
> index a4f1df92417d..1e62fbc22cb7 100644
> --- a/net/iucv/af_iucv.c
> +++ b/net/iucv/af_iucv.c
> @@ -10,8 +10,7 @@
> * Ursula Braun <ursula.braun@de.ibm.com>
> */
>
> -#define KMSG_COMPONENT "af_iucv"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "af_iucv: " fmt
>
> #include <linux/filter.h>
> #include <linux/module.h>
> diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
> index 008be0abe3a5..da2af413c89d 100644
> --- a/net/iucv/iucv.c
> +++ b/net/iucv/iucv.c
> @@ -20,8 +20,7 @@
> * CP Programming Service, IBM document # SC24-5760
> */
>
> -#define KMSG_COMPONENT "iucv"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "iucv: " fmt
>
> #include <linux/kernel_stat.h>
> #include <linux/export.h>
> diff --git a/net/netfilter/ipvs/ip_vs_app.c b/net/netfilter/ipvs/ip_vs_app.c
> index fdacbc3c15be..d54d7da58334 100644
> --- a/net/netfilter/ipvs/ip_vs_app.c
> +++ b/net/netfilter/ipvs/ip_vs_app.c
> @@ -13,8 +13,7 @@
> * Author: Juan Jose Ciarlante, <jjciarla@raiz.uncu.edu.ar>
> */
>
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/module.h>
> #include <linux/kernel.h>
> diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
> index 37ebb0cb62b8..50cc492c7553 100644
> --- a/net/netfilter/ipvs/ip_vs_conn.c
> +++ b/net/netfilter/ipvs/ip_vs_conn.c
> @@ -17,8 +17,7 @@
> * Changes:
> */
>
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/interrupt.h>
> #include <linux/in.h>
> diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
> index 5ea7ab8bf4dc..90d56f92c0f6 100644
> --- a/net/netfilter/ipvs/ip_vs_core.c
> +++ b/net/netfilter/ipvs/ip_vs_core.c
> @@ -19,8 +19,7 @@
> * Harald Welte don't use nfcache
> */
>
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/module.h>
> #include <linux/kernel.h>
> diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
> index 4c8fa22be88a..068702894377 100644
> --- a/net/netfilter/ipvs/ip_vs_ctl.c
> +++ b/net/netfilter/ipvs/ip_vs_ctl.c
> @@ -13,8 +13,7 @@
> * Changes:
> */
>
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/module.h>
> #include <linux/init.h>
> diff --git a/net/netfilter/ipvs/ip_vs_dh.c b/net/netfilter/ipvs/ip_vs_dh.c
> index 75f4c231f4a0..bb7aca4601ff 100644
> --- a/net/netfilter/ipvs/ip_vs_dh.c
> +++ b/net/netfilter/ipvs/ip_vs_dh.c
> @@ -30,8 +30,7 @@
> *
> */
>
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/ip.h>
> #include <linux/slab.h>
> diff --git a/net/netfilter/ipvs/ip_vs_est.c b/net/netfilter/ipvs/ip_vs_est.c
> index 93a925f1ed9b..77f4f637ff67 100644
> --- a/net/netfilter/ipvs/ip_vs_est.c
> +++ b/net/netfilter/ipvs/ip_vs_est.c
> @@ -12,8 +12,7 @@
> * get_stats()) do the per cpu summing.
> */
>
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/kernel.h>
> #include <linux/jiffies.h>
> diff --git a/net/netfilter/ipvs/ip_vs_fo.c b/net/netfilter/ipvs/ip_vs_fo.c
> index ab117e5bc34e..d657b47c6511 100644
> --- a/net/netfilter/ipvs/ip_vs_fo.c
> +++ b/net/netfilter/ipvs/ip_vs_fo.c
> @@ -8,8 +8,7 @@
> * Kenny Mathis : added initial functionality based on weight
> */
>
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/module.h>
> #include <linux/kernel.h>
> diff --git a/net/netfilter/ipvs/ip_vs_ftp.c b/net/netfilter/ipvs/ip_vs_ftp.c
> index 206c6700e200..b315c608fda4 100644
> --- a/net/netfilter/ipvs/ip_vs_ftp.c
> +++ b/net/netfilter/ipvs/ip_vs_ftp.c
> @@ -16,8 +16,7 @@
> * Author: Wouter Gadeyne
> */
>
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/module.h>
> #include <linux/moduleparam.h>
> diff --git a/net/netfilter/ipvs/ip_vs_lblc.c b/net/netfilter/ipvs/ip_vs_lblc.c
> index 156181a3bacd..e6c8ed0c92f6 100644
> --- a/net/netfilter/ipvs/ip_vs_lblc.c
> +++ b/net/netfilter/ipvs/ip_vs_lblc.c
> @@ -34,8 +34,7 @@
> * me to write this module.
> */
>
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/ip.h>
> #include <linux/slab.h>
> diff --git a/net/netfilter/ipvs/ip_vs_lblcr.c b/net/netfilter/ipvs/ip_vs_lblcr.c
> index a021e6aba3d7..a25cf7bb6185 100644
> --- a/net/netfilter/ipvs/ip_vs_lblcr.c
> +++ b/net/netfilter/ipvs/ip_vs_lblcr.c
> @@ -32,8 +32,7 @@
> *
> */
>
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/ip.h>
> #include <linux/module.h>
> diff --git a/net/netfilter/ipvs/ip_vs_lc.c b/net/netfilter/ipvs/ip_vs_lc.c
> index c2764505e380..38cc38c5d8bb 100644
> --- a/net/netfilter/ipvs/ip_vs_lc.c
> +++ b/net/netfilter/ipvs/ip_vs_lc.c
> @@ -9,8 +9,7 @@
> * Wensong Zhang : added any dest with weight=0 is quiesced
> */
>
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/module.h>
> #include <linux/kernel.h>
> diff --git a/net/netfilter/ipvs/ip_vs_mh.c b/net/netfilter/ipvs/ip_vs_mh.c
> index e3d7f5c879ce..f61f54004c9e 100644
> --- a/net/netfilter/ipvs/ip_vs_mh.c
> +++ b/net/netfilter/ipvs/ip_vs_mh.c
> @@ -17,8 +17,7 @@
> *
> */
>
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/ip.h>
> #include <linux/slab.h>
> diff --git a/net/netfilter/ipvs/ip_vs_nfct.c b/net/netfilter/ipvs/ip_vs_nfct.c
> index 08adcb222986..81974f69e5bb 100644
> --- a/net/netfilter/ipvs/ip_vs_nfct.c
> +++ b/net/netfilter/ipvs/ip_vs_nfct.c
> @@ -30,8 +30,7 @@
> * PASV response can not be NAT-ed) but Active FTP should work
> */
>
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/module.h>
> #include <linux/types.h>
> diff --git a/net/netfilter/ipvs/ip_vs_nq.c b/net/netfilter/ipvs/ip_vs_nq.c
> index ed7f5c889b41..ada158c610ce 100644
> --- a/net/netfilter/ipvs/ip_vs_nq.c
> +++ b/net/netfilter/ipvs/ip_vs_nq.c
> @@ -26,8 +26,7 @@
> *
> */
>
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/module.h>
> #include <linux/kernel.h>
> diff --git a/net/netfilter/ipvs/ip_vs_ovf.c b/net/netfilter/ipvs/ip_vs_ovf.c
> index c7708b809700..c5c67df80a0b 100644
> --- a/net/netfilter/ipvs/ip_vs_ovf.c
> +++ b/net/netfilter/ipvs/ip_vs_ovf.c
> @@ -12,8 +12,7 @@
> * active connections
> */
>
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/module.h>
> #include <linux/kernel.h>
> diff --git a/net/netfilter/ipvs/ip_vs_pe.c b/net/netfilter/ipvs/ip_vs_pe.c
> index 166c669f0763..3035079ebd99 100644
> --- a/net/netfilter/ipvs/ip_vs_pe.c
> +++ b/net/netfilter/ipvs/ip_vs_pe.c
> @@ -1,6 +1,5 @@
> // SPDX-License-Identifier: GPL-2.0-only
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/module.h>
> #include <linux/spinlock.h>
> diff --git a/net/netfilter/ipvs/ip_vs_pe_sip.c b/net/netfilter/ipvs/ip_vs_pe_sip.c
> index e4ce1d9a63f9..85f31d71e29a 100644
> --- a/net/netfilter/ipvs/ip_vs_pe_sip.c
> +++ b/net/netfilter/ipvs/ip_vs_pe_sip.c
> @@ -1,6 +1,5 @@
> // SPDX-License-Identifier: GPL-2.0-only
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/module.h>
> #include <linux/kernel.h>
> diff --git a/net/netfilter/ipvs/ip_vs_proto.c b/net/netfilter/ipvs/ip_vs_proto.c
> index a9fd1d3fc2cb..fd9dbca24c85 100644
> --- a/net/netfilter/ipvs/ip_vs_proto.c
> +++ b/net/netfilter/ipvs/ip_vs_proto.c
> @@ -8,8 +8,7 @@
> * Changes:
> */
>
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/module.h>
> #include <linux/kernel.h>
> diff --git a/net/netfilter/ipvs/ip_vs_proto_ah_esp.c b/net/netfilter/ipvs/ip_vs_proto_ah_esp.c
> index 89602c16f6b6..44e14acc187e 100644
> --- a/net/netfilter/ipvs/ip_vs_proto_ah_esp.c
> +++ b/net/netfilter/ipvs/ip_vs_proto_ah_esp.c
> @@ -6,8 +6,7 @@
> * Wensong Zhang <wensong@linuxvirtualserver.org>
> */
>
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/in.h>
> #include <linux/ip.h>
> diff --git a/net/netfilter/ipvs/ip_vs_proto_tcp.c b/net/netfilter/ipvs/ip_vs_proto_tcp.c
> index 7da51390cea6..f68a1533ee45 100644
> --- a/net/netfilter/ipvs/ip_vs_proto_tcp.c
> +++ b/net/netfilter/ipvs/ip_vs_proto_tcp.c
> @@ -13,8 +13,7 @@
> * protocol ip_vs_proto_data and is handled by netns
> */
>
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/kernel.h>
> #include <linux/ip.h>
> diff --git a/net/netfilter/ipvs/ip_vs_proto_udp.c b/net/netfilter/ipvs/ip_vs_proto_udp.c
> index 68260d91c988..0f0107c80dd2 100644
> --- a/net/netfilter/ipvs/ip_vs_proto_udp.c
> +++ b/net/netfilter/ipvs/ip_vs_proto_udp.c
> @@ -9,8 +9,7 @@
> * Network name space (netns) aware.
> */
>
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/in.h>
> #include <linux/ip.h>
> diff --git a/net/netfilter/ipvs/ip_vs_rr.c b/net/netfilter/ipvs/ip_vs_rr.c
> index 6baa34dff9f0..4125ee561cdc 100644
> --- a/net/netfilter/ipvs/ip_vs_rr.c
> +++ b/net/netfilter/ipvs/ip_vs_rr.c
> @@ -14,8 +14,7 @@
> * Wensong Zhang : added any dest with weight=0 is quiesced
> */
>
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/module.h>
> #include <linux/kernel.h>
> diff --git a/net/netfilter/ipvs/ip_vs_sched.c b/net/netfilter/ipvs/ip_vs_sched.c
> index d4903723be7e..c6e421c4e299 100644
> --- a/net/netfilter/ipvs/ip_vs_sched.c
> +++ b/net/netfilter/ipvs/ip_vs_sched.c
> @@ -12,8 +12,7 @@
> * Changes:
> */
>
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/module.h>
> #include <linux/spinlock.h>
> diff --git a/net/netfilter/ipvs/ip_vs_sed.c b/net/netfilter/ipvs/ip_vs_sed.c
> index a46f99a56618..245a323c84cd 100644
> --- a/net/netfilter/ipvs/ip_vs_sed.c
> +++ b/net/netfilter/ipvs/ip_vs_sed.c
> @@ -30,8 +30,7 @@
> *
> */
>
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/module.h>
> #include <linux/kernel.h>
> diff --git a/net/netfilter/ipvs/ip_vs_sh.c b/net/netfilter/ipvs/ip_vs_sh.c
> index 92e77d7a6b50..0e85e07e23b9 100644
> --- a/net/netfilter/ipvs/ip_vs_sh.c
> +++ b/net/netfilter/ipvs/ip_vs_sh.c
> @@ -32,8 +32,7 @@
> *
> */
>
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/ip.h>
> #include <linux/slab.h>
> diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
> index 5a0c6f42bd8f..54dd1514ac45 100644
> --- a/net/netfilter/ipvs/ip_vs_sync.c
> +++ b/net/netfilter/ipvs/ip_vs_sync.c
> @@ -32,8 +32,7 @@
> * Persistence support, fwmark and time-out.
> */
>
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/module.h>
> #include <linux/slab.h>
> diff --git a/net/netfilter/ipvs/ip_vs_twos.c b/net/netfilter/ipvs/ip_vs_twos.c
> index 8d5419edde50..dbb7f5fd4688 100644
> --- a/net/netfilter/ipvs/ip_vs_twos.c
> +++ b/net/netfilter/ipvs/ip_vs_twos.c
> @@ -4,8 +4,7 @@
> * Authors: Darby Payne <darby.payne@applovin.com>
> */
>
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/kernel.h>
> #include <linux/module.h>
> diff --git a/net/netfilter/ipvs/ip_vs_wlc.c b/net/netfilter/ipvs/ip_vs_wlc.c
> index 9fa500927c0a..9da445ca09a1 100644
> --- a/net/netfilter/ipvs/ip_vs_wlc.c
> +++ b/net/netfilter/ipvs/ip_vs_wlc.c
> @@ -14,8 +14,7 @@
> * Wensong Zhang : added any dest with weight=0 is quiesced
> */
>
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/module.h>
> #include <linux/kernel.h>
> diff --git a/net/netfilter/ipvs/ip_vs_wrr.c b/net/netfilter/ipvs/ip_vs_wrr.c
> index 85ce0d04afac..99f09cbf2d9b 100644
> --- a/net/netfilter/ipvs/ip_vs_wrr.c
> +++ b/net/netfilter/ipvs/ip_vs_wrr.c
> @@ -13,8 +13,7 @@
> * with weight 0 when all weights are zero
> */
>
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/module.h>
> #include <linux/kernel.h>
> diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
> index 95af252b2939..3162ce3c2640 100644
> --- a/net/netfilter/ipvs/ip_vs_xmit.c
> +++ b/net/netfilter/ipvs/ip_vs_xmit.c
> @@ -21,8 +21,7 @@
> * - the only place where we can see skb->sk != NULL
> */
>
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/kernel.h>
> #include <linux/slab.h>
> diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c
> index e388de8dca09..f97f77b041d9 100644
> --- a/net/smc/af_smc.c
> +++ b/net/smc/af_smc.c
> @@ -16,8 +16,7 @@
> * based on prototype from Frank Blaschka
> */
>
> -#define KMSG_COMPONENT "smc"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "smc: " fmt
>
> #include <linux/module.h>
> #include <linux/socket.h>
> --
> 2.51.0
Regards
--
Julian Anastasov <ja@ssi.bg>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH net-next] net: Remove KMSG_COMPONENT macro
2025-11-26 14:07 [PATCH net-next] net: Remove KMSG_COMPONENT macro Heiko Carstens
` (2 preceding siblings ...)
2025-11-28 14:47 ` Julian Anastasov
@ 2025-11-28 15:54 ` Sidraya Jayagond
2025-11-29 3:51 ` patchwork-bot+netdevbpf
4 siblings, 0 replies; 8+ messages in thread
From: Sidraya Jayagond @ 2025-11-28 15:54 UTC (permalink / raw)
To: Heiko Carstens, David S . Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Simon Horman, Pablo Neira Ayuso, Jozsef Kadlecsik,
Florian Westphal, D . Wythe, Dust Li, Wenjia Zhang,
Alexandra Winter, Thorsten Winkler
Cc: netdev
On 26/11/25 7:37 pm, Heiko Carstens wrote:
> The KMSG_COMPONENT macro is a leftover of the s390 specific "kernel message
> catalog" from 2008 [1] which never made it upstream.
>
> The macro was added to s390 code to allow for an out-of-tree patch which
> used this to generate unique message ids. Also this out-of-tree patch
> doesn't exist anymore.
>
> The pattern of how the KMSG_COMPONENT macro is used can also be found at
> some non s390 specific code, for whatever reasons. Besides adding an
> indirection it is unused.
>
> Remove the macro in order to get rid of a pointless indirection. Replace
> all users with the string it defines. In all cases this leads to a simple
> replacement like this:
>
> - #define KMSG_COMPONENT "af_iucv"
> - #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> + #define pr_fmt(fmt) "af_iucv: " fmt
>
> [1] https://lwn.net/Articles/292650/
>
> Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
> ---
> net/iucv/af_iucv.c | 3 +--
> net/iucv/iucv.c | 3 +--
> net/netfilter/ipvs/ip_vs_app.c | 3 +--
> net/netfilter/ipvs/ip_vs_conn.c | 3 +--
> net/netfilter/ipvs/ip_vs_core.c | 3 +--
> net/netfilter/ipvs/ip_vs_ctl.c | 3 +--
> net/netfilter/ipvs/ip_vs_dh.c | 3 +--
> net/netfilter/ipvs/ip_vs_est.c | 3 +--
> net/netfilter/ipvs/ip_vs_fo.c | 3 +--
> net/netfilter/ipvs/ip_vs_ftp.c | 3 +--
> net/netfilter/ipvs/ip_vs_lblc.c | 3 +--
> net/netfilter/ipvs/ip_vs_lblcr.c | 3 +--
> net/netfilter/ipvs/ip_vs_lc.c | 3 +--
> net/netfilter/ipvs/ip_vs_mh.c | 3 +--
> net/netfilter/ipvs/ip_vs_nfct.c | 3 +--
> net/netfilter/ipvs/ip_vs_nq.c | 3 +--
> net/netfilter/ipvs/ip_vs_ovf.c | 3 +--
> net/netfilter/ipvs/ip_vs_pe.c | 3 +--
> net/netfilter/ipvs/ip_vs_pe_sip.c | 3 +--
> net/netfilter/ipvs/ip_vs_proto.c | 3 +--
> net/netfilter/ipvs/ip_vs_proto_ah_esp.c | 3 +--
> net/netfilter/ipvs/ip_vs_proto_tcp.c | 3 +--
> net/netfilter/ipvs/ip_vs_proto_udp.c | 3 +--
> net/netfilter/ipvs/ip_vs_rr.c | 3 +--
> net/netfilter/ipvs/ip_vs_sched.c | 3 +--
> net/netfilter/ipvs/ip_vs_sed.c | 3 +--
> net/netfilter/ipvs/ip_vs_sh.c | 3 +--
> net/netfilter/ipvs/ip_vs_sync.c | 3 +--
> net/netfilter/ipvs/ip_vs_twos.c | 3 +--
> net/netfilter/ipvs/ip_vs_wlc.c | 3 +--
> net/netfilter/ipvs/ip_vs_wrr.c | 3 +--
> net/netfilter/ipvs/ip_vs_xmit.c | 3 +--
> net/smc/af_smc.c | 3 +--
For net/smc
Acked-by: Sidraya Jayagond <sidraya@linux.ibm.com>
> 33 files changed, 33 insertions(+), 66 deletions(-)
>
> diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
> index a4f1df92417d..1e62fbc22cb7 100644
> --- a/net/iucv/af_iucv.c
> +++ b/net/iucv/af_iucv.c
> @@ -10,8 +10,7 @@
> * Ursula Braun <ursula.braun@de.ibm.com>
> */
>
> -#define KMSG_COMPONENT "af_iucv"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "af_iucv: " fmt
>
> #include <linux/filter.h>
> #include <linux/module.h>
> diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
> index 008be0abe3a5..da2af413c89d 100644
> --- a/net/iucv/iucv.c
> +++ b/net/iucv/iucv.c
> @@ -20,8 +20,7 @@
> * CP Programming Service, IBM document # SC24-5760
> */
>
> -#define KMSG_COMPONENT "iucv"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "iucv: " fmt
>
> #include <linux/kernel_stat.h>
> #include <linux/export.h>
> diff --git a/net/netfilter/ipvs/ip_vs_app.c b/net/netfilter/ipvs/ip_vs_app.c
> index fdacbc3c15be..d54d7da58334 100644
> --- a/net/netfilter/ipvs/ip_vs_app.c
> +++ b/net/netfilter/ipvs/ip_vs_app.c
> @@ -13,8 +13,7 @@
> * Author: Juan Jose Ciarlante, <jjciarla@raiz.uncu.edu.ar>
> */
>
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/module.h>
> #include <linux/kernel.h>
> diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
> index 37ebb0cb62b8..50cc492c7553 100644
> --- a/net/netfilter/ipvs/ip_vs_conn.c
> +++ b/net/netfilter/ipvs/ip_vs_conn.c
> @@ -17,8 +17,7 @@
> * Changes:
> */
>
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/interrupt.h>
> #include <linux/in.h>
> diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
> index 5ea7ab8bf4dc..90d56f92c0f6 100644
> --- a/net/netfilter/ipvs/ip_vs_core.c
> +++ b/net/netfilter/ipvs/ip_vs_core.c
> @@ -19,8 +19,7 @@
> * Harald Welte don't use nfcache
> */
>
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/module.h>
> #include <linux/kernel.h>
> diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
> index 4c8fa22be88a..068702894377 100644
> --- a/net/netfilter/ipvs/ip_vs_ctl.c
> +++ b/net/netfilter/ipvs/ip_vs_ctl.c
> @@ -13,8 +13,7 @@
> * Changes:
> */
>
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/module.h>
> #include <linux/init.h>
> diff --git a/net/netfilter/ipvs/ip_vs_dh.c b/net/netfilter/ipvs/ip_vs_dh.c
> index 75f4c231f4a0..bb7aca4601ff 100644
> --- a/net/netfilter/ipvs/ip_vs_dh.c
> +++ b/net/netfilter/ipvs/ip_vs_dh.c
> @@ -30,8 +30,7 @@
> *
> */
>
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/ip.h>
> #include <linux/slab.h>
> diff --git a/net/netfilter/ipvs/ip_vs_est.c b/net/netfilter/ipvs/ip_vs_est.c
> index 93a925f1ed9b..77f4f637ff67 100644
> --- a/net/netfilter/ipvs/ip_vs_est.c
> +++ b/net/netfilter/ipvs/ip_vs_est.c
> @@ -12,8 +12,7 @@
> * get_stats()) do the per cpu summing.
> */
>
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/kernel.h>
> #include <linux/jiffies.h>
> diff --git a/net/netfilter/ipvs/ip_vs_fo.c b/net/netfilter/ipvs/ip_vs_fo.c
> index ab117e5bc34e..d657b47c6511 100644
> --- a/net/netfilter/ipvs/ip_vs_fo.c
> +++ b/net/netfilter/ipvs/ip_vs_fo.c
> @@ -8,8 +8,7 @@
> * Kenny Mathis : added initial functionality based on weight
> */
>
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/module.h>
> #include <linux/kernel.h>
> diff --git a/net/netfilter/ipvs/ip_vs_ftp.c b/net/netfilter/ipvs/ip_vs_ftp.c
> index 206c6700e200..b315c608fda4 100644
> --- a/net/netfilter/ipvs/ip_vs_ftp.c
> +++ b/net/netfilter/ipvs/ip_vs_ftp.c
> @@ -16,8 +16,7 @@
> * Author: Wouter Gadeyne
> */
>
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/module.h>
> #include <linux/moduleparam.h>
> diff --git a/net/netfilter/ipvs/ip_vs_lblc.c b/net/netfilter/ipvs/ip_vs_lblc.c
> index 156181a3bacd..e6c8ed0c92f6 100644
> --- a/net/netfilter/ipvs/ip_vs_lblc.c
> +++ b/net/netfilter/ipvs/ip_vs_lblc.c
> @@ -34,8 +34,7 @@
> * me to write this module.
> */
>
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/ip.h>
> #include <linux/slab.h>
> diff --git a/net/netfilter/ipvs/ip_vs_lblcr.c b/net/netfilter/ipvs/ip_vs_lblcr.c
> index a021e6aba3d7..a25cf7bb6185 100644
> --- a/net/netfilter/ipvs/ip_vs_lblcr.c
> +++ b/net/netfilter/ipvs/ip_vs_lblcr.c
> @@ -32,8 +32,7 @@
> *
> */
>
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/ip.h>
> #include <linux/module.h>
> diff --git a/net/netfilter/ipvs/ip_vs_lc.c b/net/netfilter/ipvs/ip_vs_lc.c
> index c2764505e380..38cc38c5d8bb 100644
> --- a/net/netfilter/ipvs/ip_vs_lc.c
> +++ b/net/netfilter/ipvs/ip_vs_lc.c
> @@ -9,8 +9,7 @@
> * Wensong Zhang : added any dest with weight=0 is quiesced
> */
>
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/module.h>
> #include <linux/kernel.h>
> diff --git a/net/netfilter/ipvs/ip_vs_mh.c b/net/netfilter/ipvs/ip_vs_mh.c
> index e3d7f5c879ce..f61f54004c9e 100644
> --- a/net/netfilter/ipvs/ip_vs_mh.c
> +++ b/net/netfilter/ipvs/ip_vs_mh.c
> @@ -17,8 +17,7 @@
> *
> */
>
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/ip.h>
> #include <linux/slab.h>
> diff --git a/net/netfilter/ipvs/ip_vs_nfct.c b/net/netfilter/ipvs/ip_vs_nfct.c
> index 08adcb222986..81974f69e5bb 100644
> --- a/net/netfilter/ipvs/ip_vs_nfct.c
> +++ b/net/netfilter/ipvs/ip_vs_nfct.c
> @@ -30,8 +30,7 @@
> * PASV response can not be NAT-ed) but Active FTP should work
> */
>
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/module.h>
> #include <linux/types.h>
> diff --git a/net/netfilter/ipvs/ip_vs_nq.c b/net/netfilter/ipvs/ip_vs_nq.c
> index ed7f5c889b41..ada158c610ce 100644
> --- a/net/netfilter/ipvs/ip_vs_nq.c
> +++ b/net/netfilter/ipvs/ip_vs_nq.c
> @@ -26,8 +26,7 @@
> *
> */
>
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/module.h>
> #include <linux/kernel.h>
> diff --git a/net/netfilter/ipvs/ip_vs_ovf.c b/net/netfilter/ipvs/ip_vs_ovf.c
> index c7708b809700..c5c67df80a0b 100644
> --- a/net/netfilter/ipvs/ip_vs_ovf.c
> +++ b/net/netfilter/ipvs/ip_vs_ovf.c
> @@ -12,8 +12,7 @@
> * active connections
> */
>
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/module.h>
> #include <linux/kernel.h>
> diff --git a/net/netfilter/ipvs/ip_vs_pe.c b/net/netfilter/ipvs/ip_vs_pe.c
> index 166c669f0763..3035079ebd99 100644
> --- a/net/netfilter/ipvs/ip_vs_pe.c
> +++ b/net/netfilter/ipvs/ip_vs_pe.c
> @@ -1,6 +1,5 @@
> // SPDX-License-Identifier: GPL-2.0-only
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/module.h>
> #include <linux/spinlock.h>
> diff --git a/net/netfilter/ipvs/ip_vs_pe_sip.c b/net/netfilter/ipvs/ip_vs_pe_sip.c
> index e4ce1d9a63f9..85f31d71e29a 100644
> --- a/net/netfilter/ipvs/ip_vs_pe_sip.c
> +++ b/net/netfilter/ipvs/ip_vs_pe_sip.c
> @@ -1,6 +1,5 @@
> // SPDX-License-Identifier: GPL-2.0-only
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/module.h>
> #include <linux/kernel.h>
> diff --git a/net/netfilter/ipvs/ip_vs_proto.c b/net/netfilter/ipvs/ip_vs_proto.c
> index a9fd1d3fc2cb..fd9dbca24c85 100644
> --- a/net/netfilter/ipvs/ip_vs_proto.c
> +++ b/net/netfilter/ipvs/ip_vs_proto.c
> @@ -8,8 +8,7 @@
> * Changes:
> */
>
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/module.h>
> #include <linux/kernel.h>
> diff --git a/net/netfilter/ipvs/ip_vs_proto_ah_esp.c b/net/netfilter/ipvs/ip_vs_proto_ah_esp.c
> index 89602c16f6b6..44e14acc187e 100644
> --- a/net/netfilter/ipvs/ip_vs_proto_ah_esp.c
> +++ b/net/netfilter/ipvs/ip_vs_proto_ah_esp.c
> @@ -6,8 +6,7 @@
> * Wensong Zhang <wensong@linuxvirtualserver.org>
> */
>
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/in.h>
> #include <linux/ip.h>
> diff --git a/net/netfilter/ipvs/ip_vs_proto_tcp.c b/net/netfilter/ipvs/ip_vs_proto_tcp.c
> index 7da51390cea6..f68a1533ee45 100644
> --- a/net/netfilter/ipvs/ip_vs_proto_tcp.c
> +++ b/net/netfilter/ipvs/ip_vs_proto_tcp.c
> @@ -13,8 +13,7 @@
> * protocol ip_vs_proto_data and is handled by netns
> */
>
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/kernel.h>
> #include <linux/ip.h>
> diff --git a/net/netfilter/ipvs/ip_vs_proto_udp.c b/net/netfilter/ipvs/ip_vs_proto_udp.c
> index 68260d91c988..0f0107c80dd2 100644
> --- a/net/netfilter/ipvs/ip_vs_proto_udp.c
> +++ b/net/netfilter/ipvs/ip_vs_proto_udp.c
> @@ -9,8 +9,7 @@
> * Network name space (netns) aware.
> */
>
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/in.h>
> #include <linux/ip.h>
> diff --git a/net/netfilter/ipvs/ip_vs_rr.c b/net/netfilter/ipvs/ip_vs_rr.c
> index 6baa34dff9f0..4125ee561cdc 100644
> --- a/net/netfilter/ipvs/ip_vs_rr.c
> +++ b/net/netfilter/ipvs/ip_vs_rr.c
> @@ -14,8 +14,7 @@
> * Wensong Zhang : added any dest with weight=0 is quiesced
> */
>
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/module.h>
> #include <linux/kernel.h>
> diff --git a/net/netfilter/ipvs/ip_vs_sched.c b/net/netfilter/ipvs/ip_vs_sched.c
> index d4903723be7e..c6e421c4e299 100644
> --- a/net/netfilter/ipvs/ip_vs_sched.c
> +++ b/net/netfilter/ipvs/ip_vs_sched.c
> @@ -12,8 +12,7 @@
> * Changes:
> */
>
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/module.h>
> #include <linux/spinlock.h>
> diff --git a/net/netfilter/ipvs/ip_vs_sed.c b/net/netfilter/ipvs/ip_vs_sed.c
> index a46f99a56618..245a323c84cd 100644
> --- a/net/netfilter/ipvs/ip_vs_sed.c
> +++ b/net/netfilter/ipvs/ip_vs_sed.c
> @@ -30,8 +30,7 @@
> *
> */
>
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/module.h>
> #include <linux/kernel.h>
> diff --git a/net/netfilter/ipvs/ip_vs_sh.c b/net/netfilter/ipvs/ip_vs_sh.c
> index 92e77d7a6b50..0e85e07e23b9 100644
> --- a/net/netfilter/ipvs/ip_vs_sh.c
> +++ b/net/netfilter/ipvs/ip_vs_sh.c
> @@ -32,8 +32,7 @@
> *
> */
>
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/ip.h>
> #include <linux/slab.h>
> diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
> index 5a0c6f42bd8f..54dd1514ac45 100644
> --- a/net/netfilter/ipvs/ip_vs_sync.c
> +++ b/net/netfilter/ipvs/ip_vs_sync.c
> @@ -32,8 +32,7 @@
> * Persistence support, fwmark and time-out.
> */
>
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/module.h>
> #include <linux/slab.h>
> diff --git a/net/netfilter/ipvs/ip_vs_twos.c b/net/netfilter/ipvs/ip_vs_twos.c
> index 8d5419edde50..dbb7f5fd4688 100644
> --- a/net/netfilter/ipvs/ip_vs_twos.c
> +++ b/net/netfilter/ipvs/ip_vs_twos.c
> @@ -4,8 +4,7 @@
> * Authors: Darby Payne <darby.payne@applovin.com>
> */
>
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/kernel.h>
> #include <linux/module.h>
> diff --git a/net/netfilter/ipvs/ip_vs_wlc.c b/net/netfilter/ipvs/ip_vs_wlc.c
> index 9fa500927c0a..9da445ca09a1 100644
> --- a/net/netfilter/ipvs/ip_vs_wlc.c
> +++ b/net/netfilter/ipvs/ip_vs_wlc.c
> @@ -14,8 +14,7 @@
> * Wensong Zhang : added any dest with weight=0 is quiesced
> */
>
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/module.h>
> #include <linux/kernel.h>
> diff --git a/net/netfilter/ipvs/ip_vs_wrr.c b/net/netfilter/ipvs/ip_vs_wrr.c
> index 85ce0d04afac..99f09cbf2d9b 100644
> --- a/net/netfilter/ipvs/ip_vs_wrr.c
> +++ b/net/netfilter/ipvs/ip_vs_wrr.c
> @@ -13,8 +13,7 @@
> * with weight 0 when all weights are zero
> */
>
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/module.h>
> #include <linux/kernel.h>
> diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
> index 95af252b2939..3162ce3c2640 100644
> --- a/net/netfilter/ipvs/ip_vs_xmit.c
> +++ b/net/netfilter/ipvs/ip_vs_xmit.c
> @@ -21,8 +21,7 @@
> * - the only place where we can see skb->sk != NULL
> */
>
> -#define KMSG_COMPONENT "IPVS"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "IPVS: " fmt
>
> #include <linux/kernel.h>
> #include <linux/slab.h>
> diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c
> index e388de8dca09..f97f77b041d9 100644
> --- a/net/smc/af_smc.c
> +++ b/net/smc/af_smc.c
> @@ -16,8 +16,7 @@
> * based on prototype from Frank Blaschka
> */
>
> -#define KMSG_COMPONENT "smc"
> -#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> +#define pr_fmt(fmt) "smc: " fmt
>
> #include <linux/module.h>
> #include <linux/socket.h>
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH net-next] net: Remove KMSG_COMPONENT macro
2025-11-26 14:07 [PATCH net-next] net: Remove KMSG_COMPONENT macro Heiko Carstens
` (3 preceding siblings ...)
2025-11-28 15:54 ` Sidraya Jayagond
@ 2025-11-29 3:51 ` patchwork-bot+netdevbpf
4 siblings, 0 replies; 8+ messages in thread
From: patchwork-bot+netdevbpf @ 2025-11-29 3:51 UTC (permalink / raw)
To: Heiko Carstens
Cc: davem, edumazet, kuba, pabeni, horms, pablo, kadlec, fw, alibuda,
dust.li, sidraya, wenjia, wintera, twinkler, netdev
Hello:
This patch was applied to netdev/net-next.git (main)
by Jakub Kicinski <kuba@kernel.org>:
On Wed, 26 Nov 2025 15:07:05 +0100 you wrote:
> The KMSG_COMPONENT macro is a leftover of the s390 specific "kernel message
> catalog" from 2008 [1] which never made it upstream.
>
> The macro was added to s390 code to allow for an out-of-tree patch which
> used this to generate unique message ids. Also this out-of-tree patch
> doesn't exist anymore.
>
> [...]
Here is the summary with links:
- [net-next] net: Remove KMSG_COMPONENT macro
https://git.kernel.org/netdev/net-next/c/c940be4c7c75
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 8+ messages in thread