From patchwork Mon Jul 16 12:21:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martijn Coenen X-Patchwork-Id: 10526623 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id AF0A260348 for ; Mon, 16 Jul 2018 12:21:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9F33B288EA for ; Mon, 16 Jul 2018 12:21:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 92AED28A7E; Mon, 16 Jul 2018 12:21:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 29AFA28A81 for ; Mon, 16 Jul 2018 12:21:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731151AbeGPMsw (ORCPT ); Mon, 16 Jul 2018 08:48:52 -0400 Received: from mail-ed1-f68.google.com ([209.85.208.68]:39258 "EHLO mail-ed1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730869AbeGPMsv (ORCPT ); Mon, 16 Jul 2018 08:48:51 -0400 Received: by mail-ed1-f68.google.com with SMTP id w14-v6so29805491eds.6 for ; Mon, 16 Jul 2018 05:21:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=android.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=eVZIJPfvWJqOSFveqFBy2DcrPUiSUudnPwDvBU+djl0=; b=latej/bnQ6e2xx7dGFsNEEB0rGAz34NFJLp53eBusAUOwA8+V2T96PhEhXiAkFky8E 8VpfbWo9E0XwOGfOduqfJLTGmtT19P2zwY6yctG/fmh5+GWNroTe7jS1hDcFhM0boGkE VXaU0wFnVZn8jDlY/Hc3hJLlYz02uc2RLUiLxQDdpWXRSrMom3TrnhbdhV/jZo+mITFN 7DQFUMM8btSdMHO0peDNyberBR5yjc9wbAcmn2/D4Gf2TQ08bNIH77aHgMo8sUYmz1qd JcPocKJiNSrAzbzx57VOxVL0DlWf3Ix2tzSnnjY0DPfME+Yf8syI6b1mtxIPuwp9iujQ fcCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=eVZIJPfvWJqOSFveqFBy2DcrPUiSUudnPwDvBU+djl0=; b=A/6OztE8PuXgZgG6uf1Lek3+Q9wpUZYGK2LVZBrf+EqUxEkZhyaLvqAG/zCja/4L/v 6zDKUyNIrZ7iFzsvbdlpyHR/v+n/a/JLcbxIWsHpN+ZyHuGCGAyM9x9x27AYC8ONbgQK LVon2R+cH5QusfnNiuWeC2SAXXY4zBCOEeBzDU/JRpND5C+u8Y9nBsJyBGkFf6e88s2k 5goPOWp/VZkkUnqg4Dd180w9Z5OpyeERZ7mv0iGdnIdgIbHfHsFvD5LSx7AgKBSh+XLa n38rS84rVa+PARjYHvZ7yHsEhVTQ8yl+bhnD5KgydBamLvrtuJ3Al5mID0oZ3bsmy/Cr aLyQ== X-Gm-Message-State: AOUpUlGEizcFNyqpMEUAdEIWhWiZUzChU1ybS5xh+ABKviDwyUdRaRRM LsoQYXxI0pgGfWgKUlzel8bheg== X-Google-Smtp-Source: AAOMgpdADJwxmcLe5kwD62Tsw9tQT2sAu7WdYyaoFf05HHZsMXN1NgWJuldTp/92+BI3mgfLQmPvhQ== X-Received: by 2002:a50:b5a5:: with SMTP id a34-v6mr16570081ede.88.1531743697889; Mon, 16 Jul 2018 05:21:37 -0700 (PDT) Received: from maco.fcp3.net (a83-162-234-235.adsl.xs4all.nl. [83.162.234.235]) by smtp.gmail.com with ESMTPSA id a9-v6sm4635471edi.26.2018.07.16.05.21.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Jul 2018 05:21:37 -0700 (PDT) From: Martijn Coenen To: linux-kernel@vger.kernel.org Cc: Martijn Coenen , Masahiro Yamada , Michal Marek , Geert Uytterhoeven , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, Alan Stern , Greg Kroah-Hartman , Oliver Neukum , Arnd Bergmann , Jessica Yu , Stephen Boyd , Philippe Ombredanne , Kate Stewart , Sam Ravnborg , linux-kbuild@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-usb@vger.kernel.org, usb-storage@lists.one-eyed-alien.net, linux-scsi@vger.kernel.org, linux-arch@vger.kernel.org, maco@google.com, sspatil@google.com, malchev@google.com, joelaf@google.com Subject: [PATCH 4/6] modpost: add support for generating namespace dependencies. Date: Mon, 16 Jul 2018 14:21:23 +0200 Message-Id: <20180716122125.175792-5-maco@android.com> X-Mailer: git-send-email 2.18.0.203.gfac676dfb9-goog In-Reply-To: <20180716122125.175792-1-maco@android.com> References: <20180716122125.175792-1-maco@android.com> Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch adds an option to modpost to generate a .ns_deps file per module, containing the namespace depedencies for that module. This file can subsequently be used by other tools to automatically add newly introduced namespaces to the modules that require them, saving a lot of manual work. Signed-off-by: Martijn Coenen --- scripts/mod/modpost.c | 58 +++++++++++++++++++++++++++++++++++++++---- scripts/mod/modpost.h | 2 ++ 2 files changed, 55 insertions(+), 5 deletions(-) diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index a56a8461a96a..be33d60d5527 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -39,6 +39,8 @@ static int sec_mismatch_verbose = 1; static int sec_mismatch_fatal = 0; /* ignore missing files */ static int ignore_missing_files; +/* Write namespace dependencies */ +static int write_ns_deps; enum export { export_plain, export_unused, export_gpl, @@ -2151,10 +2153,15 @@ static void check_exports(struct module *mod) else basename = mod->name; - if (exp->ns && !module_imports_namespace(mod, exp->ns)) { - warn("module %s uses symbol %s from namespace %s, " - "but does not import it.\n", - basename, exp->name, exp->ns); + if (exp->ns) { + add_namespace(&mod->required_namespaces, exp->ns); + + if (!write_ns_deps && + !module_imports_namespace(mod, exp->ns)) { + warn("module %s uses symbol %s from namespace " + "%s, but does not import it.\n", + basename, exp->name, exp->ns); + } } if (!mod->gpl_compatible) @@ -2457,6 +2464,38 @@ static void write_dump(const char *fname) free(buf.p); } +static void write_ns_deps_files(void) +{ + struct module *mod; + struct namespace_list *ns; + struct buffer ns_deps_buf = { }; + + for (mod = modules; mod; mod = mod->next) { + char fname[PATH_MAX]; + const char *basename; + + if (mod->skip) + continue; + + ns_deps_buf.pos = 0; + + for (ns = mod->required_namespaces; ns; ns = ns->next) + buf_printf(&ns_deps_buf, "%s\n", ns->namespace); + + if (ns_deps_buf.pos == 0) + continue; + + basename = strrchr(mod->name, '/'); + if (basename) + basename++; + else + basename = mod->name; + + sprintf(fname, ".tmp_versions/%s.ns_deps", basename); + write_if_changed(&ns_deps_buf, fname); + } +} + struct ext_sym_list { struct ext_sym_list *next; const char *file; @@ -2473,7 +2512,7 @@ int main(int argc, char **argv) struct ext_sym_list *extsym_iter; struct ext_sym_list *extsym_start = NULL; - while ((opt = getopt(argc, argv, "i:I:e:mnsST:o:awM:K:E")) != -1) { + while ((opt = getopt(argc, argv, "i:I:e:mnsST:o:awM:K:Ed")) != -1) { switch (opt) { case 'i': kernel_read = optarg; @@ -2517,6 +2556,9 @@ int main(int argc, char **argv) case 'E': sec_mismatch_fatal = 1; break; + case 'd': + write_ns_deps = 1; + break; default: exit(1); } @@ -2545,6 +2587,12 @@ int main(int argc, char **argv) check_exports(mod); } + if (write_ns_deps) { + /* Just write namespace dependencies and exit */ + write_ns_deps_files(); + return 0; + } + err = 0; for (mod = modules; mod; mod = mod->next) { diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h index 9626bf3e7424..92a926d375d2 100644 --- a/scripts/mod/modpost.h +++ b/scripts/mod/modpost.h @@ -126,6 +126,8 @@ struct module { struct buffer dev_table_buf; char srcversion[25]; int is_dot_o; + // Required namespace dependencies + struct namespace_list *required_namespaces; // Actual imported namespaces struct namespace_list *imported_namespaces; };