Received: by 2002:a25:1506:0:0:0:0:0 with SMTP id 6csp352242ybv; Wed, 19 Feb 2020 00:47:24 -0800 (PST) X-Google-Smtp-Source: APXvYqy1tJynPM4VzxmYC2RyFCgSp/YxxaXCA2z+0hic+oJ6+GKnECWeZSDRngzR6Zisf70ReGFu X-Received: by 2002:a05:6830:13d9:: with SMTP id e25mr18399086otq.134.1582102044452; Wed, 19 Feb 2020 00:47:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582102044; cv=none; d=google.com; s=arc-20160816; b=wVnpri+k/Phlr3j7TSODTxm+s8kSHaMAtqeqsnlFQiiJA45tpLf6SlQJ8hS/P/A61v xrrrNYYN0hEI1O15XhFqD/yVMjVTXtuYy7vWxpT1YCIWH7V3WYg6kAio9xKyQo2hScGZ CRpJxFH7VuYfbe0LLtDDSBmBnL0C6CyuBlwmSER4R2mapvJEOXI93JVH6y0bvY20FsYM Q82iWfGiHUXk4muDpTeFCo3CXFRB77Q6WjOC11Wmf71KSZ2zUNSIayEdigghoIO4fRbP Ii1VjPVKqHCIJW1AyxO857pS6qowITZHe/VV3GFG1b9FBzQhn+xiIfi1AsJ8XEsRp3yn DuVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-disposition:mime-version:references:message-id:subject:cc :to:from:date:dkim-signature; bh=cP7ys0m2hqeqrqB3NnN1yGnN3JOcL3wggL/POKNeIus=; b=ADDUoyW2BcmziuFF0PvMSZ6NqhqE1CRcr2CjIqZDGdjp8w08waqNYUnRlgEiXQ1Qgo 5jDoP5/aFjNjh13pGBZoIK6bNwDM3Ijdo9tus86rn5fLlVIGRL+VQyvHYGzOkyFn/6Eo Q6Ugc800cZl0mCeO9A0q26iXO8Ax3ctZZ4BUxU/9ZYz+gS5lJN+5ONiyf7YvqfVvMNuE +vfWoKodrMgDZklmGakEA0ONzQO8eqdEm37FSp64UBVPNoVDaZRGtVxdkprY8iYCc3hX S6kxsfWZ99BxcmL3UUEpeMJZld0FEEBiU+4Y+dUWGI/nKTDsXxT+B6Oj3cAEDk4wgI5A G/LA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=GayTIAtw; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y8si9031114oih.141.2020.02.19.00.47.12; Wed, 19 Feb 2020 00:47:24 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=GayTIAtw; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726496AbgBSIqv (ORCPT + 99 others); Wed, 19 Feb 2020 03:46:51 -0500 Received: from mail.kernel.org ([198.145.29.99]:43778 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726197AbgBSIqv (ORCPT ); Wed, 19 Feb 2020 03:46:51 -0500 Received: from linux-8ccs (p5B2812F9.dip0.t-ipconnect.de [91.40.18.249]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A1077208E4; Wed, 19 Feb 2020 08:46:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582102010; bh=FyYxiqQBTSfI8r6qT92R/vRz7GJKnKCv1ldA8gwPu1U=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=GayTIAtwO4nHDBqLTJtfVUrlCE80sKZcvuoGg6SnICCIqzag81XyGoJP2QKnM03// XT35/rs+VpNfQvSNtcqaTNAGrf2uytTAwGo54DBuwQAfr2HJ1j5E5wzXLYpunbW/pt qn/uHKN4uBVuCsyMcNugsB6F8xYK9X1gNwsSRbRI= Date: Wed, 19 Feb 2020 09:46:46 +0100 From: Jessica Yu To: Masahiro Yamada Cc: Matthias Maennich , Linux Kernel Mailing List , Martijn Coenen Subject: Re: [PATCH] modpost: return error if module is missing ns imports and MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS=n Message-ID: <20200219084643.GA25067@linux-8ccs> References: <20200214143709.6490-1-jeyu@kernel.org> <20200217145644.GA221719@google.com> <20200218160553.GA18056@linux-8ccs> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: X-OS: Linux linux-8ccs 4.12.14-lp150.12.61-default x86_64 User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org +++ Masahiro Yamada [19/02/20 04:27 +0900]: >On Wed, Feb 19, 2020 at 1:06 AM Jessica Yu wrote: >> >> +++ Matthias Maennich [17/02/20 14:56 +0000]: >> >Hi Jessica! >> > >> >On Fri, Feb 14, 2020 at 03:37:09PM +0100, Jessica Yu wrote: >> >>Currently when CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS=n, modpost only warns >> >>when a module is missing namespace imports. Under this configuration, such a module >> >>cannot be loaded into the kernel anyway, as the module loader would reject it. >> >>We might as well return a build error when a module is missing namespace imports >> >>under CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS=n, so that the build >> >>warning does not go ignored/unnoticed. >> > >> >I generally agree with the idea of the patch. Thanks for working on >> >this! I also can't remember any reason why I did not write it like this >> >initially. Probably just because I introduced this configuration option >> >quite late in the development process of the initial patches. >> > >> >> >> >>Signed-off-by: Jessica Yu >> >>--- >> >>scripts/Makefile.modpost | 1 + >> >>scripts/mod/modpost.c | 19 +++++++++++++++---- >> >>2 files changed, 16 insertions(+), 4 deletions(-) >> >> >> >>diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost >> >>index b4d3f2d122ac..a53660f910a9 100644 >> >>--- a/scripts/Makefile.modpost >> >>+++ b/scripts/Makefile.modpost >> >>@@ -53,6 +53,7 @@ MODPOST = scripts/mod/modpost \ >> >> $(if $(KBUILD_EXTMOD),$(addprefix -e ,$(KBUILD_EXTRA_SYMBOLS))) \ >> >> $(if $(KBUILD_EXTMOD),-o $(modulesymfile)) \ >> >> $(if $(CONFIG_SECTION_MISMATCH_WARN_ONLY),,-E) \ >> >>+ $(if $(CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS),,-N) \ >> >> $(if $(KBUILD_MODPOST_WARN),-w) >> >> >> >>ifdef MODPOST_VMLINUX >> >>diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c >> >>index 7edfdb2f4497..53e966f7d557 100644 >> >>--- a/scripts/mod/modpost.c >> >>+++ b/scripts/mod/modpost.c >> >>@@ -39,6 +39,8 @@ static int sec_mismatch_count = 0; >> >>static int sec_mismatch_fatal = 0; >> >>/* ignore missing files */ >> >>static int ignore_missing_files; >> >>+/* Return an error when there are missing namespace imports */ >> >>+static int missing_ns_import_error = 0; >> > >> >A more suitable name is maybe missing_ns_import_is_error or follow the >> >naming of the config option: allow_missing_ns_imports (with default = 1). >> > >> >> >> >>enum export { >> >> export_plain, export_unused, export_gpl, >> >>@@ -2216,9 +2218,15 @@ static int check_exports(struct module *mod) >> >> >> >> if (exp->namespace && >> >> !module_imports_namespace(mod, exp->namespace)) { >> >>- warn("module %s uses symbol %s from namespace %s, but does not import it.\n", >> >>- basename, exp->name, exp->namespace); >> >>- add_namespace(&mod->missing_namespaces, exp->namespace); >> >>+ if (missing_ns_import_error) { >> >>+ merror("module %s uses symbol %s from namespace %s, but does not import it.\n", >> >>+ basename, exp->name, exp->namespace); >> > >> >I would like to avoid the code duplication here. The string literal is >> >identical for both cases. >> >> Hm, but one is a call to merror() and the other to warn(). The >> previous if (warn_unresolved) block does the same thing. I am not sure >> how to simplify it to one call without introducing macro magic or >> overcomplicating things. Or were you thinking of something else? > > >I would not say this is a horrible duplication, >but if you avoid repeating the same string, >maybe you could do like this: > >PRINTF log(enum loglevel loglevel, const char *fmt, ...) > > > >BTW, you accidentally changed the indentation of >add_namespace(&mod->missing_namespaces, exp->namespace); > > > >> >>+ err = 1; >> > >> >Also, if we fail here, we might as well help the user to fix it by >> >suggesting to run `make nsdeps` (once per failed modpost run). Speaking >> >of which, `make nsdeps` is currently broken by this patch as it relies >> >on a successful (yet warning-full) build of the modules. So, in case of >> >`make nsdeps`, we probably have to omit the -N flag again when invoking >> >modpost. >> >> Good catch! Since KBUILD_NSDEPS is set when running `make nsdeps`, >> maybe we can do something like: >> >> diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost >> index a53660f910a9..145703ef8d3a 100644 >> --- a/scripts/Makefile.modpost >> +++ b/scripts/Makefile.modpost >> @@ -53,7 +53,7 @@ MODPOST = scripts/mod/modpost \ >> $(if $(KBUILD_EXTMOD),$(addprefix -e ,$(KBUILD_EXTRA_SYMBOLS))) \ >> $(if $(KBUILD_EXTMOD),-o $(modulesymfile)) \ >> $(if $(CONFIG_SECTION_MISMATCH_WARN_ONLY),,-E) \ >> - $(if $(CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS),,-N) \ >> + $(if $(CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS),,$(if $(KBUILD_NSDEPS),,-N)) \ > > >If you follow Matthias' suggestion >"follow the naming of the config option: allow_missing_ns_imports >(with default = 1)." >the option is inverted, and you can write it more simply: > > > $(if $(CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS)$(KBUILD_NSDEPS),-n) > \ Yeah, that looks much better. Thanks! Jessica