* [PATCH 1/3] scripts/nsdeps: get 'make nsdeps' working again
2024-12-03 10:21 [PATCH 0/3] module: fixups after module namespace conversion Masahiro Yamada
@ 2024-12-03 10:21 ` Masahiro Yamada
2024-12-03 10:21 ` [PATCH 2/3] doc: module: revert misconversions for MODULE_IMPORT_NS() Masahiro Yamada
` (3 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Masahiro Yamada @ 2024-12-03 10:21 UTC (permalink / raw)
To: Linus Torvalds
Cc: Greg Kroah-Hartman, Peter Zijlstra, Matthias Maennich,
linux-kbuild, linux-kernel, Masahiro Yamada
Since commit cdd30ebb1b9f ("module: Convert symbol namespace to string
literal"), when MODULE_IMPORT_NS() is missing, 'make nsdeps' inserts
pointless code:
MODULE_IMPORT_NS("ns");
Here, "ns" is not a namespace, but the variable in the semantic patch.
It must not be quoted. Instead, a string literal must be passed to
Coccinelle.
Fixes: cdd30ebb1b9f ("module: Convert symbol namespace to string literal")
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---
scripts/coccinelle/misc/add_namespace.cocci | 4 ++--
scripts/nsdeps | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/scripts/coccinelle/misc/add_namespace.cocci b/scripts/coccinelle/misc/add_namespace.cocci
index d66c4e3cd946..cbf1614163cb 100644
--- a/scripts/coccinelle/misc/add_namespace.cocci
+++ b/scripts/coccinelle/misc/add_namespace.cocci
@@ -13,7 +13,7 @@ virtual report
declarer name MODULE_IMPORT_NS;
identifier virtual.ns;
@@
-MODULE_IMPORT_NS("ns");
+MODULE_IMPORT_NS(ns);
// Add missing imports, but only adjacent to a MODULE_LICENSE statement.
// That ensures we are adding it only to the main module source file.
@@ -23,7 +23,7 @@ expression license;
identifier virtual.ns;
@@
MODULE_LICENSE(license);
-+ MODULE_IMPORT_NS("ns");
++ MODULE_IMPORT_NS(ns);
// Dummy rule for report mode that would otherwise be empty and make spatch
// fail ("No rules apply.")
diff --git a/scripts/nsdeps b/scripts/nsdeps
index bab4ec870e50..a3372166ac01 100644
--- a/scripts/nsdeps
+++ b/scripts/nsdeps
@@ -21,7 +21,7 @@ fi
generate_deps_for_ns() {
$SPATCH --very-quiet --in-place --sp-file \
- $srctree/scripts/coccinelle/misc/add_namespace.cocci -D nsdeps -D ns=$1 $2
+ $srctree/scripts/coccinelle/misc/add_namespace.cocci -D nsdeps -D ns=\"$1\" $2
}
generate_deps() {
--
2.43.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 2/3] doc: module: revert misconversions for MODULE_IMPORT_NS()
2024-12-03 10:21 [PATCH 0/3] module: fixups after module namespace conversion Masahiro Yamada
2024-12-03 10:21 ` [PATCH 1/3] scripts/nsdeps: get 'make nsdeps' working again Masahiro Yamada
@ 2024-12-03 10:21 ` Masahiro Yamada
2024-12-03 10:21 ` [PATCH 3/3] module: Convert default symbol namespace to string literal Masahiro Yamada
` (2 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Masahiro Yamada @ 2024-12-03 10:21 UTC (permalink / raw)
To: Linus Torvalds
Cc: Greg Kroah-Hartman, Peter Zijlstra, Matthias Maennich,
linux-kbuild, linux-kernel, Masahiro Yamada
This reverts the misconversions introduced by commit cdd30ebb1b9f
("module: Convert symbol namespace to string literal").
The affected descriptions refer to MODULE_IMPORT_NS() tags in general,
rather than suggesting the use of the empty string ("") as the namespace.
Fixes: cdd30ebb1b9f ("module: Convert symbol namespace to string literal")
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---
Documentation/core-api/symbol-namespaces.rst | 4 ++--
.../translations/it_IT/core-api/symbol-namespaces.rst | 4 ++--
.../translations/zh_CN/core-api/symbol-namespaces.rst | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Documentation/core-api/symbol-namespaces.rst b/Documentation/core-api/symbol-namespaces.rst
index d04639fd8a41..55886b4e6aea 100644
--- a/Documentation/core-api/symbol-namespaces.rst
+++ b/Documentation/core-api/symbol-namespaces.rst
@@ -106,7 +106,7 @@ inspected with modinfo::
[...]
-It is advisable to add the MODULE_IMPORT_NS("") statement close to other module
+It is advisable to add the MODULE_IMPORT_NS() statement close to other module
metadata definitions like MODULE_AUTHOR() or MODULE_LICENSE(). Refer to section
5. for a way to create missing import statements automatically.
@@ -128,7 +128,7 @@ enable loading regardless, but will emit a warning.
Missing namespaces imports can easily be detected at build time. In fact,
modpost will emit a warning if a module uses a symbol from a namespace
without importing it.
-MODULE_IMPORT_NS("") statements will usually be added at a definite location
+MODULE_IMPORT_NS() statements will usually be added at a definite location
(along with other module meta data). To make the life of module authors (and
subsystem maintainers) easier, a script and make target is available to fixup
missing imports. Fixing missing imports can be done with::
diff --git a/Documentation/translations/it_IT/core-api/symbol-namespaces.rst b/Documentation/translations/it_IT/core-api/symbol-namespaces.rst
index 55a7978c662b..df152c2c55db 100644
--- a/Documentation/translations/it_IT/core-api/symbol-namespaces.rst
+++ b/Documentation/translations/it_IT/core-api/symbol-namespaces.rst
@@ -107,7 +107,7 @@ modinfo::
[...]
-Si consiglia di posizionare la dichiarazione MODULE_IMPORT_NS("") vicino
+Si consiglia di posizionare la dichiarazione MODULE_IMPORT_NS() vicino
ai metadati del modulo come MODULE_AUTHOR() o MODULE_LICENSE(). Fate
riferimento alla sezione 5. per creare automaticamente le importazioni
mancanti.
@@ -131,7 +131,7 @@ emetterà un avviso.
La mancanza di un'importazione può essere individuata facilmente al momento
della compilazione. Infatti, modpost emetterà un avviso se il modulo usa
un simbolo da uno spazio dei nomi che non è stato importato.
-La dichiarazione MODULE_IMPORT_NS("") viene solitamente aggiunta in un posto
+La dichiarazione MODULE_IMPORT_NS() viene solitamente aggiunta in un posto
ben definito (assieme agli altri metadati del modulo). Per facilitare
la vita di chi scrive moduli (e i manutentori di sottosistemi), esistono uno
script e un target make per correggere le importazioni mancanti. Questo può
diff --git a/Documentation/translations/zh_CN/core-api/symbol-namespaces.rst b/Documentation/translations/zh_CN/core-api/symbol-namespaces.rst
index 5e698f58b3fe..fc7f3797dcee 100644
--- a/Documentation/translations/zh_CN/core-api/symbol-namespaces.rst
+++ b/Documentation/translations/zh_CN/core-api/symbol-namespaces.rst
@@ -99,7 +99,7 @@
[...]
-建议将 MODULE_IMPORT_NS("") 语句添加到靠近其他模块元数据定义的地方，
+建议将 MODULE_IMPORT_NS() 语句添加到靠近其他模块元数据定义的地方，
如 MODULE_AUTHOR() 或 MODULE_LICENSE() 。关于自动创建缺失的导入
语句的方法，请参考第5节。
@@ -118,7 +118,7 @@ EINVAL方式失败。要允许加载不满足这个前提条件的模块，可
缺少命名空间的导入可以在构建时很容易被检测到。事实上，如果一个模块
使用了一个命名空间的符号而没有导入它，modpost会发出警告。
-MODULE_IMPORT_NS("")语句通常会被添加到一个明确的位置（和其他模块元
+MODULE_IMPORT_NS()语句通常会被添加到一个明确的位置（和其他模块元
数据一起）。为了使模块作者（和子系统维护者）的生活更加轻松，我们提
供了一个脚本和make目标来修复丢失的导入。修复丢失的导入可以用::
--
2.43.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 3/3] module: Convert default symbol namespace to string literal
2024-12-03 10:21 [PATCH 0/3] module: fixups after module namespace conversion Masahiro Yamada
2024-12-03 10:21 ` [PATCH 1/3] scripts/nsdeps: get 'make nsdeps' working again Masahiro Yamada
2024-12-03 10:21 ` [PATCH 2/3] doc: module: revert misconversions for MODULE_IMPORT_NS() Masahiro Yamada
@ 2024-12-03 10:21 ` Masahiro Yamada
2024-12-03 10:41 ` Uwe Kleine-König
2024-12-03 10:26 ` [PATCH 0/3] module: fixups after module namespace conversion Peter Zijlstra
2024-12-03 11:09 ` Masahiro Yamada
4 siblings, 1 reply; 8+ messages in thread
From: Masahiro Yamada @ 2024-12-03 10:21 UTC (permalink / raw)
To: Linus Torvalds
Cc: Greg Kroah-Hartman, Peter Zijlstra, Matthias Maennich,
linux-kbuild, linux-kernel, Masahiro Yamada
Commit cdd30ebb1b9f ("module: Convert symbol namespace to string
literal") only converted MODULE_IMPORT_NS() and EXPORT_SYMBOL_NS(),
leaving DEFAULT_SYMBOL_NAMESPACE as a macro expansion.
This commit converts DEFAULT_SYMBOL_NAMESPACE in the same way to
avoid annoyance for the default namespace as well.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---
Documentation/core-api/symbol-namespaces.rst | 4 ++--
.../translations/it_IT/core-api/symbol-namespaces.rst | 4 ++--
.../translations/zh_CN/core-api/symbol-namespaces.rst | 4 ++--
drivers/cdx/Makefile | 2 +-
drivers/crypto/intel/iaa/Makefile | 2 +-
drivers/crypto/intel/qat/qat_common/Makefile | 2 +-
drivers/dma/idxd/Makefile | 2 +-
drivers/gpio/gpio-idio-16.c | 2 +-
drivers/hwmon/nct6775-core.c | 2 +-
drivers/i2c/busses/i2c-designware-common.c | 2 +-
drivers/i2c/busses/i2c-designware-master.c | 2 +-
drivers/i2c/busses/i2c-designware-slave.c | 2 +-
drivers/pwm/core.c | 2 +-
drivers/pwm/pwm-dwc-core.c | 2 +-
drivers/pwm/pwm-lpss.c | 2 +-
drivers/tty/serial/sc16is7xx.c | 2 +-
drivers/usb/storage/Makefile | 2 +-
include/linux/export.h | 2 +-
18 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/Documentation/core-api/symbol-namespaces.rst b/Documentation/core-api/symbol-namespaces.rst
index 55886b4e6aea..27a9cccc792c 100644
--- a/Documentation/core-api/symbol-namespaces.rst
+++ b/Documentation/core-api/symbol-namespaces.rst
@@ -68,7 +68,7 @@ is to define the default namespace in the ``Makefile`` of the subsystem. E.g. to
export all symbols defined in usb-common into the namespace USB_COMMON, add a
line like this to drivers/usb/common/Makefile::
- ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE=USB_COMMON
+ ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE='"USB_COMMON"'
That will affect all EXPORT_SYMBOL() and EXPORT_SYMBOL_GPL() statements. A
symbol exported with EXPORT_SYMBOL_NS() while this definition is present, will
@@ -79,7 +79,7 @@ A second option to define the default namespace is directly in the compilation
unit as preprocessor statement. The above example would then read::
#undef DEFAULT_SYMBOL_NAMESPACE
- #define DEFAULT_SYMBOL_NAMESPACE USB_COMMON
+ #define DEFAULT_SYMBOL_NAMESPACE "USB_COMMON"
within the corresponding compilation unit before any EXPORT_SYMBOL macro is
used.
diff --git a/Documentation/translations/it_IT/core-api/symbol-namespaces.rst b/Documentation/translations/it_IT/core-api/symbol-namespaces.rst
index df152c2c55db..6ee713988531 100644
--- a/Documentation/translations/it_IT/core-api/symbol-namespaces.rst
+++ b/Documentation/translations/it_IT/core-api/symbol-namespaces.rst
@@ -69,7 +69,7 @@ Per esempio per esportare tutti i simboli definiti in usb-common nello spazio
dei nomi USB_COMMON, si può aggiungere la seguente linea in
drivers/usb/common/Makefile::
- ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE=USB_COMMON
+ ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE='"USB_COMMON"'
Questo cambierà tutte le macro EXPORT_SYMBOL() ed EXPORT_SYMBOL_GPL(). Invece,
un simbolo esportato con EXPORT_SYMBOL_NS() non verrà cambiato e il simbolo
@@ -79,7 +79,7 @@ Una seconda possibilità è quella di definire il simbolo di preprocessore
direttamente nei file da compilare. L'esempio precedente diventerebbe::
#undef DEFAULT_SYMBOL_NAMESPACE
- #define DEFAULT_SYMBOL_NAMESPACE USB_COMMON
+ #define DEFAULT_SYMBOL_NAMESPACE "USB_COMMON"
Questo va messo prima di un qualsiasi uso di EXPORT_SYMBOL.
diff --git a/Documentation/translations/zh_CN/core-api/symbol-namespaces.rst b/Documentation/translations/zh_CN/core-api/symbol-namespaces.rst
index fc7f3797dcee..b1bec219912d 100644
--- a/Documentation/translations/zh_CN/core-api/symbol-namespaces.rst
+++ b/Documentation/translations/zh_CN/core-api/symbol-namespaces.rst
@@ -66,7 +66,7 @@
子系统的 ``Makefile`` 中定义默认命名空间。例如，如果要将usb-common中定义的所有符号导
出到USB_COMMON命名空间，可以在drivers/usb/common/Makefile中添加这样一行::
- ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE=USB_COMMON
+ ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE='"USB_COMMON"'
这将影响所有 EXPORT_SYMBOL() 和 EXPORT_SYMBOL_GPL() 语句。当这个定义存在时，
用EXPORT_SYMBOL_NS()导出的符号仍然会被导出到作为命名空间参数传递的命名空间中，
@@ -76,7 +76,7 @@
成::
#undef DEFAULT_SYMBOL_NAMESPACE
- #define DEFAULT_SYMBOL_NAMESPACE USB_COMMON
+ #define DEFAULT_SYMBOL_NAMESPACE "USB_COMMON"
应置于相关编译单元中任何 EXPORT_SYMBOL 宏之前
diff --git a/drivers/cdx/Makefile b/drivers/cdx/Makefile
index 749a3295c2bd..3ca7068a3052 100644
--- a/drivers/cdx/Makefile
+++ b/drivers/cdx/Makefile
@@ -5,7 +5,7 @@
# Copyright (C) 2022-2023, Advanced Micro Devices, Inc.
#
-ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE=CDX_BUS
+ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE='"CDX_BUS"'
obj-$(CONFIG_CDX_BUS) += cdx.o controller/
diff --git a/drivers/crypto/intel/iaa/Makefile b/drivers/crypto/intel/iaa/Makefile
index b64b208d2344..55bda7770fac 100644
--- a/drivers/crypto/intel/iaa/Makefile
+++ b/drivers/crypto/intel/iaa/Makefile
@@ -3,7 +3,7 @@
# Makefile for IAA crypto device drivers
#
-ccflags-y += -I $(srctree)/drivers/dma/idxd -DDEFAULT_SYMBOL_NAMESPACE=IDXD
+ccflags-y += -I $(srctree)/drivers/dma/idxd -DDEFAULT_SYMBOL_NAMESPACE='"IDXD"'
obj-$(CONFIG_CRYPTO_DEV_IAA_CRYPTO) := iaa_crypto.o
diff --git a/drivers/crypto/intel/qat/qat_common/Makefile b/drivers/crypto/intel/qat/qat_common/Makefile
index eac73cbfdd38..7acf9c576149 100644
--- a/drivers/crypto/intel/qat/qat_common/Makefile
+++ b/drivers/crypto/intel/qat/qat_common/Makefile
@@ -1,6 +1,6 @@
# SPDX-License-Identifier: GPL-2.0
obj-$(CONFIG_CRYPTO_DEV_QAT) += intel_qat.o
-ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE=CRYPTO_QAT
+ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE='"CRYPTO_QAT"'
intel_qat-objs := adf_cfg.o \
adf_isr.o \
adf_ctl_drv.o \
diff --git a/drivers/dma/idxd/Makefile b/drivers/dma/idxd/Makefile
index 2b4a0d406e1e..9ff9d7b87b64 100644
--- a/drivers/dma/idxd/Makefile
+++ b/drivers/dma/idxd/Makefile
@@ -1,4 +1,4 @@
-ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE=IDXD
+ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE='"IDXD"'
obj-$(CONFIG_INTEL_IDXD_BUS) += idxd_bus.o
idxd_bus-y := bus.o
diff --git a/drivers/gpio/gpio-idio-16.c b/drivers/gpio/gpio-idio-16.c
index 53b1eb876a12..2c9512589297 100644
--- a/drivers/gpio/gpio-idio-16.c
+++ b/drivers/gpio/gpio-idio-16.c
@@ -14,7 +14,7 @@
#include "gpio-idio-16.h"
-#define DEFAULT_SYMBOL_NAMESPACE GPIO_IDIO_16
+#define DEFAULT_SYMBOL_NAMESPACE "GPIO_IDIO_16"
#define IDIO_16_DAT_BASE 0x0
#define IDIO_16_OUT_BASE IDIO_16_DAT_BASE
diff --git a/drivers/hwmon/nct6775-core.c b/drivers/hwmon/nct6775-core.c
index ee04795b98aa..c243b51837d2 100644
--- a/drivers/hwmon/nct6775-core.c
+++ b/drivers/hwmon/nct6775-core.c
@@ -57,7 +57,7 @@
#include "nct6775.h"
#undef DEFAULT_SYMBOL_NAMESPACE
-#define DEFAULT_SYMBOL_NAMESPACE HWMON_NCT6775
+#define DEFAULT_SYMBOL_NAMESPACE "HWMON_NCT6775"
#define USE_ALTERNATE
diff --git a/drivers/i2c/busses/i2c-designware-common.c b/drivers/i2c/busses/i2c-designware-common.c
index 857783d458fb..183a35038eef 100644
--- a/drivers/i2c/busses/i2c-designware-common.c
+++ b/drivers/i2c/busses/i2c-designware-common.c
@@ -29,7 +29,7 @@
#include <linux/types.h>
#include <linux/units.h>
-#define DEFAULT_SYMBOL_NAMESPACE I2C_DW_COMMON
+#define DEFAULT_SYMBOL_NAMESPACE "I2C_DW_COMMON"
#include "i2c-designware-core.h"
diff --git a/drivers/i2c/busses/i2c-designware-master.c b/drivers/i2c/busses/i2c-designware-master.c
index 69705cc7e607..c8cbe5b1aeb1 100644
--- a/drivers/i2c/busses/i2c-designware-master.c
+++ b/drivers/i2c/busses/i2c-designware-master.c
@@ -22,7 +22,7 @@
#include <linux/regmap.h>
#include <linux/reset.h>
-#define DEFAULT_SYMBOL_NAMESPACE I2C_DW
+#define DEFAULT_SYMBOL_NAMESPACE "I2C_DW"
#include "i2c-designware-core.h"
diff --git a/drivers/i2c/busses/i2c-designware-slave.c b/drivers/i2c/busses/i2c-designware-slave.c
index a98dcddacece..dc2b788eac5b 100644
--- a/drivers/i2c/busses/i2c-designware-slave.c
+++ b/drivers/i2c/busses/i2c-designware-slave.c
@@ -16,7 +16,7 @@
#include <linux/pm_runtime.h>
#include <linux/regmap.h>
-#define DEFAULT_SYMBOL_NAMESPACE I2C_DW
+#define DEFAULT_SYMBOL_NAMESPACE "I2C_DW"
#include "i2c-designware-core.h"
diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c
index 9c733877e98e..675b252d9c8c 100644
--- a/drivers/pwm/core.c
+++ b/drivers/pwm/core.c
@@ -6,7 +6,7 @@
* Copyright (C) 2011-2012 Avionic Design GmbH
*/
-#define DEFAULT_SYMBOL_NAMESPACE PWM
+#define DEFAULT_SYMBOL_NAMESPACE "PWM"
#include <linux/acpi.h>
#include <linux/module.h>
diff --git a/drivers/pwm/pwm-dwc-core.c b/drivers/pwm/pwm-dwc-core.c
index c8425493b95d..6dabec93a3c6 100644
--- a/drivers/pwm/pwm-dwc-core.c
+++ b/drivers/pwm/pwm-dwc-core.c
@@ -9,7 +9,7 @@
* Author: Raymond Tan <raymond.tan@intel.com>
*/
-#define DEFAULT_SYMBOL_NAMESPACE dwc_pwm
+#define DEFAULT_SYMBOL_NAMESPACE "dwc_pwm"
#include <linux/bitops.h>
#include <linux/export.h>
diff --git a/drivers/pwm/pwm-lpss.c b/drivers/pwm/pwm-lpss.c
index 867e2bc8c601..3b99feb3bb49 100644
--- a/drivers/pwm/pwm-lpss.c
+++ b/drivers/pwm/pwm-lpss.c
@@ -19,7 +19,7 @@
#include <linux/pm_runtime.h>
#include <linux/time.h>
-#define DEFAULT_SYMBOL_NAMESPACE PWM_LPSS
+#define DEFAULT_SYMBOL_NAMESPACE "PWM_LPSS"
#include "pwm-lpss.h"
diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c
index 9d0c971e49f5..a3093e09309f 100644
--- a/drivers/tty/serial/sc16is7xx.c
+++ b/drivers/tty/serial/sc16is7xx.c
@@ -8,7 +8,7 @@
*/
#undef DEFAULT_SYMBOL_NAMESPACE
-#define DEFAULT_SYMBOL_NAMESPACE SERIAL_NXP_SC16IS7XX
+#define DEFAULT_SYMBOL_NAMESPACE "SERIAL_NXP_SC16IS7XX"
#include <linux/bits.h>
#include <linux/clk.h>
diff --git a/drivers/usb/storage/Makefile b/drivers/usb/storage/Makefile
index 46635fa4a340..28db337f190b 100644
--- a/drivers/usb/storage/Makefile
+++ b/drivers/usb/storage/Makefile
@@ -8,7 +8,7 @@
ccflags-y := -I $(srctree)/drivers/scsi
-ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE=USB_STORAGE
+ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE='"USB_STORAGE"'
obj-$(CONFIG_USB_UAS) += uas.o
obj-$(CONFIG_USB_STORAGE) += usb-storage.o
diff --git a/include/linux/export.h b/include/linux/export.h
index f5f3950a1e42..2633df4d31e6 100644
--- a/include/linux/export.h
+++ b/include/linux/export.h
@@ -60,7 +60,7 @@
#endif
#ifdef DEFAULT_SYMBOL_NAMESPACE
-#define _EXPORT_SYMBOL(sym, license) __EXPORT_SYMBOL(sym, license, __stringify(DEFAULT_SYMBOL_NAMESPACE))
+#define _EXPORT_SYMBOL(sym, license) __EXPORT_SYMBOL(sym, license, DEFAULT_SYMBOL_NAMESPACE)
#else
#define _EXPORT_SYMBOL(sym, license) __EXPORT_SYMBOL(sym, license, "")
#endif
--
2.43.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 3/3] module: Convert default symbol namespace to string literal
2024-12-03 10:21 ` [PATCH 3/3] module: Convert default symbol namespace to string literal Masahiro Yamada
@ 2024-12-03 10:41 ` Uwe Kleine-König
0 siblings, 0 replies; 8+ messages in thread
From: Uwe Kleine-König @ 2024-12-03 10:41 UTC (permalink / raw)
To: Masahiro Yamada
Cc: Linus Torvalds, Greg Kroah-Hartman, Peter Zijlstra,
Matthias Maennich, linux-kbuild, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 1499 bytes --]
Hello Masahiro,
On Tue, Dec 03, 2024 at 07:21:07PM +0900, Masahiro Yamada wrote:
> Commit cdd30ebb1b9f ("module: Convert symbol namespace to string
> literal") only converted MODULE_IMPORT_NS() and EXPORT_SYMBOL_NS(),
> leaving DEFAULT_SYMBOL_NAMESPACE as a macro expansion.
>
> This commit converts DEFAULT_SYMBOL_NAMESPACE in the same way to
> avoid annoyance for the default namespace as well.
>
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
You were quicker than me, I'm still in the build test phase of a very
similar patch.
> diff --git a/Documentation/core-api/symbol-namespaces.rst b/Documentation/core-api/symbol-namespaces.rst
> index 55886b4e6aea..27a9cccc792c 100644
> --- a/Documentation/core-api/symbol-namespaces.rst
> +++ b/Documentation/core-api/symbol-namespaces.rst
> @@ -68,7 +68,7 @@ is to define the default namespace in the ``Makefile`` of the subsystem. E.g. to
> export all symbols defined in usb-common into the namespace USB_COMMON, add a
I added quotes around USB_COMMON here --------------------------^, too
(and in the translated variants).
> line like this to drivers/usb/common/Makefile::
>
> - ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE=USB_COMMON
> + ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE='"USB_COMMON"'
And I used
-DDEFAULT_SYMBOL_NAMESPACE=\"USB_COMMON\"
which is probably just subjective.
Independant of the above:
Reviewed-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
Best regards
Uwe
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 0/3] module: fixups after module namespace conversion
2024-12-03 10:21 [PATCH 0/3] module: fixups after module namespace conversion Masahiro Yamada
` (2 preceding siblings ...)
2024-12-03 10:21 ` [PATCH 3/3] module: Convert default symbol namespace to string literal Masahiro Yamada
@ 2024-12-03 10:26 ` Peter Zijlstra
2024-12-03 11:09 ` Masahiro Yamada
4 siblings, 0 replies; 8+ messages in thread
From: Peter Zijlstra @ 2024-12-03 10:26 UTC (permalink / raw)
To: Masahiro Yamada
Cc: Linus Torvalds, Greg Kroah-Hartman, Matthias Maennich,
linux-kbuild, linux-kernel
On Tue, Dec 03, 2024 at 07:21:04PM +0900, Masahiro Yamada wrote:
>
> [1/3]
> Commit cdd30ebb1b9f added double-quotes to enclose the variable in the
> semantic patch, scripts/coccinelle/misc/add_namespace.cocci.
> Since then, 'make nsdepds' always changes the missing import to silly code:
> MODULE_IMPORT_NS("ns");
>
> [2/3]
> MODULE_IMPORT_NS("") is misleading in the context of documentation
> about MODULE_IMPORT_NS() tags in general.
>
> [3/3]
> Convert DEFAULT_SYMBOL_NAMESPACE from a macro expansion to a string
> literal. There is no good reason to keep inconsistency in the default
> case.
>
>
>
> Masahiro Yamada (3):
> scripts/nsdeps: get 'make nsdeps' working again
> doc: module: revert misconversions for MODULE_IMPORT_NS()
> module: Convert default symbol namespace to string literal
Thanks, I totally missed the DEFAULT_SYMBOL_NAMESPACE thing.
And my coccinelle foo is non-existent, I would've never spotted that.
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 0/3] module: fixups after module namespace conversion
2024-12-03 10:21 [PATCH 0/3] module: fixups after module namespace conversion Masahiro Yamada
` (3 preceding siblings ...)
2024-12-03 10:26 ` [PATCH 0/3] module: fixups after module namespace conversion Peter Zijlstra
@ 2024-12-03 11:09 ` Masahiro Yamada
2024-12-03 16:23 ` Linus Torvalds
4 siblings, 1 reply; 8+ messages in thread
From: Masahiro Yamada @ 2024-12-03 11:09 UTC (permalink / raw)
To: Linus Torvalds
Cc: Greg Kroah-Hartman, Peter Zijlstra, Matthias Maennich,
linux-kbuild, linux-kernel
Hi Linus,
I submitted this patch set to you, hoping you can merge it.
Please let me know if you would prefer a different course.
On Tue, Dec 3, 2024 at 7:21 PM Masahiro Yamada <masahiroy@kernel.org> wrote:
>
>
> [1/3]
> Commit cdd30ebb1b9f added double-quotes to enclose the variable in the
> semantic patch, scripts/coccinelle/misc/add_namespace.cocci.
> Since then, 'make nsdepds' always changes the missing import to silly code:
> MODULE_IMPORT_NS("ns");
>
> [2/3]
> MODULE_IMPORT_NS("") is misleading in the context of documentation
> about MODULE_IMPORT_NS() tags in general.
>
> [3/3]
> Convert DEFAULT_SYMBOL_NAMESPACE from a macro expansion to a string
> literal. There is no good reason to keep inconsistency in the default
> case.
>
>
>
> Masahiro Yamada (3):
> scripts/nsdeps: get 'make nsdeps' working again
> doc: module: revert misconversions for MODULE_IMPORT_NS()
> module: Convert default symbol namespace to string literal
>
> Documentation/core-api/symbol-namespaces.rst | 8 ++++----
> .../translations/it_IT/core-api/symbol-namespaces.rst | 8 ++++----
> .../translations/zh_CN/core-api/symbol-namespaces.rst | 8 ++++----
> drivers/cdx/Makefile | 2 +-
> drivers/crypto/intel/iaa/Makefile | 2 +-
> drivers/crypto/intel/qat/qat_common/Makefile | 2 +-
> drivers/dma/idxd/Makefile | 2 +-
> drivers/gpio/gpio-idio-16.c | 2 +-
> drivers/hwmon/nct6775-core.c | 2 +-
> drivers/i2c/busses/i2c-designware-common.c | 2 +-
> drivers/i2c/busses/i2c-designware-master.c | 2 +-
> drivers/i2c/busses/i2c-designware-slave.c | 2 +-
> drivers/pwm/core.c | 2 +-
> drivers/pwm/pwm-dwc-core.c | 2 +-
> drivers/pwm/pwm-lpss.c | 2 +-
> drivers/tty/serial/sc16is7xx.c | 2 +-
> drivers/usb/storage/Makefile | 2 +-
> include/linux/export.h | 2 +-
> scripts/coccinelle/misc/add_namespace.cocci | 4 ++--
> scripts/nsdeps | 2 +-
> 20 files changed, 30 insertions(+), 30 deletions(-)
>
> --
> 2.43.0
>
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 8+ messages in thread