Re: [PATCH 3/4] scripts/nsdeps: support nsdeps for external module builds

[Matthias Maennich <maennich@xxxxxxxxxx>]

On Tue, Oct 29, 2019 at 09:38:08PM +0900, Masahiro Yamada wrote:
> Apparently, scripts/nsdeps is written to take care of only in-tree
> modules. Perhaps, this is not a bug, but just a design. At least,
> Documentation/core-api/symbol-namespaces.rst focuses on in-tree modules:
>
>  Again, `make nsdeps` will eventually add the missing namespace imports for
>  in-tree modules::
>  ^^^^^^^
>
> Having said that, I already saw at least two people trying nsdeps for
> external module builds. So, it would be nice to support it.
>
> Reported-by: Steve French <smfrench@xxxxxxxxx>
> Reported-by: Jessica Yu <jeyu@xxxxxxxxxx>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@xxxxxxxxxxxxx>
> ---

Reviewed-by: Matthias Maennich <maennich@xxxxxxxxxx>
Tested-by: Matthias Maennich <maennich@xxxxxxxxxx>

Cheers,
Matthias

> Documentation/core-api/symbol-namespaces.rst |  3 +++
> Makefile                                     |  1 +
> scripts/Makefile.modpost                     |  2 +-
> scripts/nsdeps                               | 10 ++++++++--
> 4 files changed, 13 insertions(+), 3 deletions(-)
>
> diff --git a/Documentation/core-api/symbol-namespaces.rst b/Documentation/core-api/symbol-namespaces.rst
> index 982ed7b568ac..9b76337f6756 100644
> --- a/Documentation/core-api/symbol-namespaces.rst
> +++ b/Documentation/core-api/symbol-namespaces.rst
> @@ -152,3 +152,6 @@ in-tree modules::
> 	- notice the warning of modpost telling about a missing import
> 	- run `make nsdeps` to add the import to the correct code location
>
> +You can also run nsdeps for external module builds. A typical usage is::
> +
> +	$ make -C <path_to_kernel_src> M=$PWD nsdeps
> diff --git a/Makefile b/Makefile
> index 1e3f307bd49b..780a65493866 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1007,6 +1007,7 @@ endif
> PHONY += prepare0
>
> export MODORDER := $(extmod-prefix)modules.order
> +export MODULES_NSDEPS := $(extmod-prefix)modules.nsdeps
>
> ifeq ($(KBUILD_EXTMOD),)
> core-y		+= kernel/ certs/ mm/ fs/ ipc/ security/ crypto/ block/
> diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost
> index da37128c3f9f..8359f8af5ee6 100644
> --- a/scripts/Makefile.modpost
> +++ b/scripts/Makefile.modpost
> @@ -66,7 +66,7 @@ __modpost:
> else
>
> MODPOST += $(subst -i,-n,$(filter -i,$(MAKEFLAGS))) -s -T - \
> -	$(if $(KBUILD_NSDEPS),-d modules.nsdeps)
> +	$(if $(KBUILD_NSDEPS),-d $(MODULES_NSDEPS))
>
> ifeq ($(KBUILD_EXTMOD),)
> MODPOST += $(wildcard vmlinux)
> diff --git a/scripts/nsdeps b/scripts/nsdeps
> index 08db427a7fe5..3b8a9e173ebf 100644
> --- a/scripts/nsdeps
> +++ b/scripts/nsdeps
> @@ -21,6 +21,12 @@ if [ "$SPATCH_VERSION_NUM" -lt "$SPATCH_REQ_VERSION_NUM" ] ; then
> 	exit 1
> fi
>
> +if [ "$KBUILD_EXTMOD" ]; then
> +	src_prefix=
> +else
> +	src_prefix=$srctree/
> +fi
> +
> generate_deps_for_ns() {
> 	$SPATCH --very-quiet --in-place --sp-file \
> 		$srctree/scripts/coccinelle/misc/add_namespace.cocci -D ns=$1 $2
> @@ -32,7 +38,7 @@ generate_deps() {
> 	local namespaces="$*"
> 	local mod_source_files=`cat $mod.mod | sed -n 1p                      \
> 					      | sed -e 's/\.o/\.c/g'           \
> -					      | sed "s|[^ ]* *|${srctree}/&|g"`
> +					     | sed "s|[^ ]* *|${src_prefix}&|g"`
> 	for ns in $namespaces; do
> 		echo "Adding namespace $ns to module $mod.ko."
> 		generate_deps_for_ns $ns $mod_source_files
> @@ -54,4 +60,4 @@ generate_deps() {
> while read line
> do
> 	generate_deps $line
> -done < modules.nsdeps
> +done < $MODULES_NSDEPS
> --
> 2.17.1