From patchwork Thu Jul 11 05:44:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 168813 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp10913952ilk; Wed, 10 Jul 2019 22:45:56 -0700 (PDT) X-Google-Smtp-Source: APXvYqz95sbYNZEamC7ocnmE5D2jAKO7ItRn/4/IbuH74tEjiYSX7uB7r2cJUCn/ifNzkPEJVTdH X-Received: by 2002:a65:454c:: with SMTP id x12mr2460487pgr.354.1562823956369; Wed, 10 Jul 2019 22:45:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562823956; cv=none; d=google.com; s=arc-20160816; b=L8IE8BNTRJGICPYCI/wCpX9Q6kA6BIkrQwnplPhPjAeAGSj3eTsKVMeSDaC9JSLI/n 4FzzB0SCBHo4PJc/wOmImzjWCIhfjnGWpGGZTpnQ7KxmpKkhPHYbLCAMuji74jRNmx9X iD7ISQez9L8RQsZzhoXViisLfNjkRwnd2NrtA4XR71QbZ7oGVUwu1buiiFd1uTJftis/ u/RzBd7yYirOquKoZLYu5Faa2Dduh4H+ldvi6kq4VZXrwqMVMlmWA3dvfGdTLaGc5e3f QnghIwyF3hW+I+yXSugpsWALpXHkIIMNEaXv1M3o1fx4aT37igZfPcjUKSYtotnnGNKK ttZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=mjkkjTnXRVjdI3ciIRz1HWZFd7z2yTHWDPrWodufX/o=; b=ZJfL29k4kcbisU88MXLSSecmlS4cZXzC/zhzHHmoc29bImDmW/blbE0/ZQMOAu6u/e ilGxUScZNmJutflaB+vXtxbQNlQFxYOSyVI0ylxXfxMzYqkwLqck/6AUnhmfSP0fxIup PwpU+4nGtUjyrY5iAvb+eKIoOZuimDe1fjvLFEmYAcvYJER26FQwfLDg+QIjPkNwSe43 O0CXj0b4NlDuETE5c6RxJ7WTROn7YyRubeONTrM1dcUQ2LCjtYqBQtyGxG5JUjpjWRuC oibfBRZzlZbIlEwCMFFuvvwBZglURt72gO5Pvhhch8qeCZ7SVP309uMk2KvD8xkLdq5r BhIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=jAODMvDC; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d5si3803908pla.17.2019.07.10.22.45.56; Wed, 10 Jul 2019 22:45:56 -0700 (PDT) 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=@nifty.com header.s=dec2015msa header.b=jAODMvDC; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728072AbfGKFpy (ORCPT + 29 others); Thu, 11 Jul 2019 01:45:54 -0400 Received: from conuserg-08.nifty.com ([210.131.2.75]:59471 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727922AbfGKFpx (ORCPT ); Thu, 11 Jul 2019 01:45:53 -0400 Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id x6B5ip8L031345; Thu, 11 Jul 2019 14:44:53 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com x6B5ip8L031345 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1562823893; bh=mjkkjTnXRVjdI3ciIRz1HWZFd7z2yTHWDPrWodufX/o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jAODMvDCKfqR1Zhn7vZaIDr1Mbtv7fOKReJCqG98rha6TTAsX3wWiAChWv1gg25W8 r6Sxv0+lEkZ6VZJ30c30gqKTqg0NArc0RYsEIpt5p8cSYVpQn3Pmos6nn6KXvJhJxf ITaMDCsE1YIxfHHN0wFCEuVLsMZARh5uJMs3XIUoxQ/++Uu5X8WcHhi8yJ1B4FsWyW 3Ujk0mejbaMkFCqygqJzfrj168G2a3v9D1O9RJBbuwJFxBPATN8UUyzrMpvxqjFmbA gDWmtm80d1Y3qgfdivmIgylOveCorw2YRsKLGa1cAUtCwLiXXVpDXtsr/aqbzzhvRv 8GEcsS8bddsvA== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Sam Ravnborg , Nicolas Pitre , Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH v2 01/11] kbuild: do not create empty modules.order in the prepare stage Date: Thu, 11 Jul 2019 14:44:24 +0900 Message-Id: <20190711054434.1177-2-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190711054434.1177-1-yamada.masahiro@socionext.com> References: <20190711054434.1177-1-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently, $(objtree)/modules.order is touched in two places. In the 'prepare0' rule, scripts/Makefile.build creates an empty modules.order while processing 'obj=.' In the 'modules' rule, the top-level Makefile overwrites it with the correct list of modules. While this might be a good side-effect that modules.order is made empty every time (probably this is not intended functionality), I personally do not like this behavior. Create modules.order only when it is sensible to do so. This avoids creating the following pointless files: scripts/basic/modules.order scripts/dtc/modules.order scripts/gcc-plugins/modules.order scripts/genksyms/modules.order scripts/mod/modules.order scripts/modules.order scripts/selinux/genheaders/modules.order scripts/selinux/mdp/modules.order scripts/selinux/modules.order Going forward, $(objtree)/modules.order lists the modules that was built in the last successful build. Signed-off-by: Masahiro Yamada --- Changes in v2: - inverted the logic "preparing" -> need-modorder Makefile | 4 ++-- scripts/Makefile.build | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) -- 2.17.1 diff --git a/Makefile b/Makefile index 5c75ea7177f6..d8421d245f75 100644 --- a/Makefile +++ b/Makefile @@ -1076,7 +1076,7 @@ $(sort $(vmlinux-deps)): $(vmlinux-dirs) ; PHONY += $(vmlinux-dirs) $(vmlinux-dirs): prepare - $(Q)$(MAKE) $(build)=$@ need-builtin=1 + $(Q)$(MAKE) $(build)=$@ need-builtin=1 need-modorder=1 filechk_kernel.release = \ echo "$(KERNELVERSION)$$($(CONFIG_SHELL) $(srctree)/scripts/setlocalversion $(srctree))" @@ -1611,7 +1611,7 @@ $(objtree)/Module.symvers: module-dirs := $(addprefix _module_,$(KBUILD_EXTMOD)) PHONY += $(module-dirs) modules $(module-dirs): prepare $(objtree)/Module.symvers - $(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@) + $(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@) need-modorder=1 modules: $(module-dirs) @$(kecho) ' Building modules, stage 2.'; diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 776842b7e6a3..e9b3d88257dd 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -63,7 +63,7 @@ ifneq ($(strip $(real-obj-y) $(need-builtin)),) builtin-target := $(obj)/built-in.a endif -ifdef CONFIG_MODULES +ifeq ($(CONFIG_MODULES)$(need-modorder),y1) modorder-target := $(obj)/modules.order endif From patchwork Thu Jul 11 05:44:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 168817 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp10914181ilk; Wed, 10 Jul 2019 22:46:11 -0700 (PDT) X-Google-Smtp-Source: APXvYqxDuGHSjWzjfiHZRvK3FyvNdOpYar/KKWbnSBFBMckNv5vE+YzxGxKWiY+P0G1OZGamvVac X-Received: by 2002:a17:90a:25c8:: with SMTP id k66mr2689706pje.129.1562823971560; Wed, 10 Jul 2019 22:46:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562823971; cv=none; d=google.com; s=arc-20160816; b=rCeEoWma4HItJgTOWFS4RxdMafj5ilpZowY+1v0RmASB2Ry14ZpijaXSqC2FMzIr1F wekvZnQJBZNTCO7uxMLSXmwtGDJ1QcaDQ1JNeiDzoB5k+F7Q0HsnuhSBObS/EiAuKuMX llW5gwlFTbZHmKj4v2em8HSpRr3gOjSYoV4JobIWqm7xDYd/fwrM2pbsDAbG30xN44ZY R1ZLx+XvuQA/waYbpx9agQ9l9VL++o3ajf93jM9YnCYoKNYiOAoX8FIvfyD69EdegKu5 Z4Grcr+AikycEtFf/Canfvv71a6W/4pfjFMGwfBSimvnQLwgRA1dbMdc7sQhidJ0ZCny 7qmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=X0Z9xUjl6EX9XPtrMZWPoQaJCvf/QCS9Lre9ezeX1dQ=; b=H9QHaLzif+t/etAQmMZAWWEFddFnCM+ps+hmBZMY+pRBvsZw3FcrhtWF1oFc7duLAY 55X7Xi6+Sc/3If9fXTRhymVExZX2ydn8ie5UGgw4F09bIgHPqJx1PHijXLghzerDV1r8 b3gVmXZFkvWyoxpwMo/U1rjRP/PBKB0uuVY56Ax8miUYCyJKO0XTSsiQsgs39E3UOTbv VY/bX3Ap1g0wPYYsPsxYd2EHW8kqTppuZwDRuLVh1YjEekdHsC6A6D5G/JA/cGmWFbtU B7nNfHFQSYz7ylluijSuPXksARPHPqHipjoo5lF7Ny4OXRRX3UbGuvvewO47tKjo8+Og WpVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=bHwi8ztP; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r17si4376111pgo.310.2019.07.10.22.46.11; Wed, 10 Jul 2019 22:46:11 -0700 (PDT) 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=@nifty.com header.s=dec2015msa header.b=bHwi8ztP; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728162AbfGKFqK (ORCPT + 29 others); Thu, 11 Jul 2019 01:46:10 -0400 Received: from conuserg-08.nifty.com ([210.131.2.75]:59529 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728031AbfGKFp4 (ORCPT ); Thu, 11 Jul 2019 01:45:56 -0400 Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id x6B5ip8M031345; Thu, 11 Jul 2019 14:44:53 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com x6B5ip8M031345 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1562823894; bh=X0Z9xUjl6EX9XPtrMZWPoQaJCvf/QCS9Lre9ezeX1dQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bHwi8ztPYdyDa6tI8DH5CsZJ9IRYV8xVu2KGAUcQqdXoBTMAQBFNRrPA/qm0dig9/ 94BEql1ASPfq7azRtzByUL1CC+q9fawkzTaxeS/lVdBimCwn85p6aWt25RVHphZm1L 76hwfT1SufnxyQURYMqZ9IJYzuBxOwXF02FW+Zo/c8w6so/zB5l6H9bReYwP8vRVFu KB00hqisImA3lP6sxtEm8M8PKKnlzeySyfrOqLJDS3/zG8GILIlHza9zm5njCno6IR pnbLTyF4I8ZxLRYoj4TK5fbGVtulUhsXTjz+GcmlgmbQSs2GAkOW4PYnQfFjjAmEWx ElTKeO9I3b0IQ== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Sam Ravnborg , Nicolas Pitre , Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH v2 02/11] kbuild: get rid of kernel/ prefix from in-tree modules.{order, builtin} Date: Thu, 11 Jul 2019 14:44:25 +0900 Message-Id: <20190711054434.1177-3-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190711054434.1177-1-yamada.masahiro@socionext.com> References: <20190711054434.1177-1-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Removing the 'kernel/' prefix will make our life easier because we can simply do 'cat modules.order' to get all built modules with full paths. Currently, we parse the first line of '*.mod' files in $(MODVERDIR). Since we have duplicated functionality here, I plan to remove MODVERDIR entirely. In fact, modules.order is generated also for external modules in a broken format. It adds the 'kernel/' prefix to the absolute path of the module, like this: kernel//path/to/your/external/module/foo.ko This is fine for now since modules.order is not used for external modules. However, I want to sanitize the format everywhere towards the goal of removing MODVERDIR. We cannot change the format of installed module.{order,builtin}. So, 'make modules_install' will add the 'kernel/' prefix while copying them to $(MODLIB)/. Signed-off-by: Masahiro Yamada --- Changes in v2: None Makefile | 4 ++-- scripts/Makefile.build | 2 +- scripts/Makefile.modbuiltin | 2 +- scripts/modules-check.sh | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) -- 2.17.1 diff --git a/Makefile b/Makefile index d8421d245f75..b5e21d676ee2 100644 --- a/Makefile +++ b/Makefile @@ -1333,8 +1333,8 @@ _modinst_: rm -f $(MODLIB)/build ; \ ln -s $(CURDIR) $(MODLIB)/build ; \ fi - @cp -f $(objtree)/modules.order $(MODLIB)/ - @cp -f $(objtree)/modules.builtin $(MODLIB)/ + @sed 's:^:kernel/:' modules.order > $(MODLIB)/modules.order + @sed 's:^:kernel/:' modules.builtin > $(MODLIB)/modules.builtin @cp -f $(objtree)/modules.builtin.modinfo $(MODLIB)/ $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modinst diff --git a/scripts/Makefile.build b/scripts/Makefile.build index e9b3d88257dd..f21d691c776a 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -426,7 +426,7 @@ endif # builtin-target modorder-cmds = \ $(foreach m, $(modorder), \ $(if $(filter %/modules.order, $m), \ - cat $m;, echo kernel/$m;)) + cat $m;, echo $m;)) $(modorder-target): $(subdir-ym) FORCE $(Q)(cat /dev/null; $(modorder-cmds)) > $@ diff --git a/scripts/Makefile.modbuiltin b/scripts/Makefile.modbuiltin index ea90a90b41a0..12ac300fe51b 100644 --- a/scripts/Makefile.modbuiltin +++ b/scripts/Makefile.modbuiltin @@ -40,7 +40,7 @@ __modbuiltin: $(modbuiltin-target) $(subdir-ym) @: $(modbuiltin-target): $(subdir-ym) FORCE - $(Q)(for m in $(modbuiltin-mods); do echo kernel/$$m; done; \ + $(Q)(for m in $(modbuiltin-mods); do echo $$m; done; \ cat /dev/null $(modbuiltin-subdirs)) > $@ PHONY += FORCE diff --git a/scripts/modules-check.sh b/scripts/modules-check.sh index 39e8cb36ba19..f51f446707b8 100755 --- a/scripts/modules-check.sh +++ b/scripts/modules-check.sh @@ -9,7 +9,7 @@ check_same_name_modules() for m in $(sed 's:.*/::' modules.order | sort | uniq -d) do echo "warning: same module names found:" >&2 - sed -n "/\/$m/s:^kernel/: :p" modules.order >&2 + sed -n "/\/$m/s:^: :p" modules.order >&2 done } From patchwork Thu Jul 11 05:44:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 168823 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp10914469ilk; Wed, 10 Jul 2019 22:46:32 -0700 (PDT) X-Google-Smtp-Source: APXvYqzm5glDByPjAvvA0cV0NzJodvXtU+2YUG0RufUCZQrkJEjfmJcFuEExHKG9KnKSPjnqvMgq X-Received: by 2002:a17:902:c509:: with SMTP id o9mr2628068plx.222.1562823992023; Wed, 10 Jul 2019 22:46:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562823992; cv=none; d=google.com; s=arc-20160816; b=ZxKPjjjgqy4CgsdccmTqHOgGMHYGpHhAdMPwoY9UDtHk2b2fgZzrBVCspxcWax8ig3 ghyWobF4wG4frxkitsMW0KtohFVXmATipgNW8xywqnlNcuWU6ZVnjjL4ubJ+Gb7rswBZ dh+1I1JdcOi7tLMWcaPz1PpvrKW13CEoB9V2saIMvNIbS/uG2brGf60oilbimXJ6Uw0Z 0cEItV9V3EsRi+67yuQnPgnD86Wnw2T8jjXMSNYkpGuchQLa2VBWm580pUlfcy/JrDRt PLl3OWxMga4f/td65jyRiFe+0iAgPB0dyEuBA11mgU/kMBZmekBXlv+Y04dF3zLWjHKF 8g0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=73BNt3XOxU/QtVB4UusmprlWYwd5Q4e7yWpAuZSG5uY=; b=eBPuwWyhzMJaP9nzvy8LPdLn4Gl2RKZPi6NnMXJZr62b9jB3MrpvAjHjKnXPF6cBs7 vfroBbF4cyp9Aj4/CkYyY/hLfwfKfAvbQw7/GFIGtzwJg0AJnfjBgy4JoR8SgvyDtYPV Mm99zHA7m/9eOpCGR9VNE4K+yEm3WdnRBqreFuGNIv1WRDX2j/MSxzCtWoQazMr7nmE9 uD7LTqvEvEbTQCsr3ix1UskztCo9wTTbqXTzXWm+2XOAymdGmuDeNU9GjRA3Z01ohlU4 z4d1RHGuO/QQy/Z42tAH43FPI/5o5wWbBJk2JTgyHWQhLSXzA+ii5gGXMbq6KnObjlmC vltg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=YCK5T9hS; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g17si3900449plo.406.2019.07.10.22.46.31; Wed, 10 Jul 2019 22:46:32 -0700 (PDT) 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=@nifty.com header.s=dec2015msa header.b=YCK5T9hS; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728271AbfGKFqa (ORCPT + 29 others); Thu, 11 Jul 2019 01:46:30 -0400 Received: from conuserg-08.nifty.com ([210.131.2.75]:59531 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727960AbfGKFpz (ORCPT ); Thu, 11 Jul 2019 01:45:55 -0400 Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id x6B5ip8N031345; Thu, 11 Jul 2019 14:44:54 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com x6B5ip8N031345 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1562823894; bh=73BNt3XOxU/QtVB4UusmprlWYwd5Q4e7yWpAuZSG5uY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YCK5T9hStu+Tg1CcwBxF7RxNzvgQxSD8fZegCbPmyxjHMkTIzehtyWz21wLmdYItT 0xnfiBXXycLrcGRTX7bFIiWTZ+xvl5CJww5/lQDoRO0M5pu40AXZsC6ioXz4S8+3S2 iOKwUYQpMxAan67dXUrCZYmUVz1leCcEdb4f0zoKHRCRCIumcI+5iXgfj2U69fCJhh IbWA8/kyQjcW277Sr1/NHY6uTEYk4UkMUEgjJvhefpU+GOULQoA8dyCyPQkBTlkScH TfcniABve4vtENr0+/C0Oa6F1rPk+qbmog471lBrAha2kPWQviYShv0RhS9xAtNhr2 smX6TrK+sS1xA== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Sam Ravnborg , Nicolas Pitre , Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH v2 03/11] kbuild: remove duplication from modules.order in sub-directories Date: Thu, 11 Jul 2019 14:44:26 +0900 Message-Id: <20190711054434.1177-4-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190711054434.1177-1-yamada.masahiro@socionext.com> References: <20190711054434.1177-1-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently, only the top-level modules.order drops duplicated entries. The modules.order files in sub-directories potentially contain duplication. To list out the paths of all modules, I want to use modules.order instead of parsing *.mod files in $(MODVERDIR). To achieve this, I want to rip off duplication from modules.order of external modules too. Signed-off-by: Masahiro Yamada --- Changes in v2: None scripts/Makefile.build | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) -- 2.17.1 diff --git a/scripts/Makefile.build b/scripts/Makefile.build index f21d691c776a..98dede0b2ca8 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -423,13 +423,10 @@ endif # builtin-target # # Create commands to either record .ko file or cat modules.order from # a subdirectory -modorder-cmds = \ - $(foreach m, $(modorder), \ - $(if $(filter %/modules.order, $m), \ - cat $m;, echo $m;)) - $(modorder-target): $(subdir-ym) FORCE - $(Q)(cat /dev/null; $(modorder-cmds)) > $@ + $(Q){ $(foreach m, $(modorder), \ + $(if $(filter %/modules.order, $m), cat $m, echo $m);) :; } \ + | $(AWK) '!x[$$0]++' - > $@ # # Rule to compile a set of .o files into one .a file (with symbol table) From patchwork Thu Jul 11 05:44:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 168818 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp10914190ilk; Wed, 10 Jul 2019 22:46:12 -0700 (PDT) X-Google-Smtp-Source: APXvYqwRIY/r9Ou9+82HKTizejYMIQRFWj0aug/ZfeqkUpX4Koc+TisIpnOulf/H4uYuVjo46az8 X-Received: by 2002:a17:902:b603:: with SMTP id b3mr2610633pls.9.1562823972800; Wed, 10 Jul 2019 22:46:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562823972; cv=none; d=google.com; s=arc-20160816; b=g1LnLUGumXUnA6G1n/FTKZAuk3/nrvUMazY0OcOmMDTK7N6qMRgV9x7xNjxF5B9YHR 9kkIbHJrBaTRoMwlM3+WthhMcIPrKsU4a9laW4GJNzF35lts69omzGcY5GxTdr6n2bCw RyL8xudFbJzws7meiHDmnSY82aPokVfHrCDoXwQj1dKURoSq0L7lV8EHo9GCdeUJMkn0 Gu3oFDfRSNji5H9LrkuH4NWdqZy2khDqEZddeCIX0VdFI5TH/yosjMTiySvTqNbOVHZO WOB0y5U/A9jl/XyH5kZmW5u2CP6TRJxQCwXNIKnscVCFeMwxmeRruW3ZculDNrekX8aX gtIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=aRuS7xPLwHQCrWoOTeMolVYBvvu7Tw4KJE4Uze+OyV0=; b=LgqlnkBhzzwhZNY9AyW17nS1awFlg2zN6907aJ8CZligm3aHCdp21Obpt9NUzx9BMt CKb6P53DTNLGl6qxO8FZWUjb8f5/1NQxTCtbCv/noFDx1wOHzwDyw11EkDJ5ymVM0ZKo +O7F1Jcn6u/EkL7CnaZk8X4NuVQLjaLwYmgePfswfwKhc4SV0Gy9bs8GV6ZDk2QHdXkm ifRscHGc6CiXuIEaa/4tikWrMQffaqdjdqoM10YEDx9XoRPCIVkAATE04/gZTNwDANrx Ke+eV3UM/hGntRc1S4PuWwF+5CepSjUquGTLtMmIj1S6mSYmraOnMCBaAjaG8xa9vaTg E+QA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=iV9jU60t; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r17si4376111pgo.310.2019.07.10.22.46.12; Wed, 10 Jul 2019 22:46:12 -0700 (PDT) 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=@nifty.com header.s=dec2015msa header.b=iV9jU60t; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728178AbfGKFqK (ORCPT + 29 others); Thu, 11 Jul 2019 01:46:10 -0400 Received: from conuserg-08.nifty.com ([210.131.2.75]:59588 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728085AbfGKFp4 (ORCPT ); Thu, 11 Jul 2019 01:45:56 -0400 Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id x6B5ip8O031345; Thu, 11 Jul 2019 14:44:55 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com x6B5ip8O031345 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1562823895; bh=aRuS7xPLwHQCrWoOTeMolVYBvvu7Tw4KJE4Uze+OyV0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iV9jU60tfKU5vtZ9Py2MycrCttKLlDxXkXYEHJUGLEj2+jU0MkKckEekY5ywAbK0g pvQiUQ5DQkRNigrmzpPB4i0tUQh8ms9VfWQXv1uRhAc4+TyiR1OmCeqJqp4o/CQIZe YNfUcpLKp8CugcjV3GUl3PO6iCtmOsZ18hyFS7LNWt6gXutm3LH8Lr/p8SoIb+GNzH s5MjcMScACopRKuqiZ20qZAwG+ZnFmivNZTm7q77bnnd7QDD2d8Cku7bJ0gazk1/52 MoYupam9tbvDOGZgG3lUQFZKCUDpmgwnl+I7yKSkPGtLdiERWD9E1MCb1pF3BRehZ5 J2vx62iLSHKpA== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Sam Ravnborg , Nicolas Pitre , Masahiro Yamada , "James E.J. Bottomley" , "Martin K. Petersen" , linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 04/11] scsi: remove pointless $(MODVERDIR)/$(obj)/53c700.ver Date: Thu, 11 Jul 2019 14:44:27 +0900 Message-Id: <20190711054434.1177-5-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190711054434.1177-1-yamada.masahiro@socionext.com> References: <20190711054434.1177-1-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Nothing depends on this, so it is dead code. Signed-off-by: Masahiro Yamada --- I will apply this to kbuild tree since it is trivial. Changes in v2: None drivers/scsi/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1 diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile index 8826111fdf4a..acdd57e647f8 100644 --- a/drivers/scsi/Makefile +++ b/drivers/scsi/Makefile @@ -183,7 +183,7 @@ zalon7xx-objs := zalon.o ncr53c8xx.o # Files generated that shall be removed upon make clean clean-files := 53c700_d.h 53c700_u.h scsi_devinfo_tbl.c -$(obj)/53c700.o $(MODVERDIR)/$(obj)/53c700.ver: $(obj)/53c700_d.h +$(obj)/53c700.o: $(obj)/53c700_d.h $(obj)/scsi_sysfs.o: $(obj)/scsi_devinfo_tbl.c From patchwork Thu Jul 11 05:44:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 168821 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp10914404ilk; Wed, 10 Jul 2019 22:46:28 -0700 (PDT) X-Google-Smtp-Source: APXvYqxv0MrA4wEgOJW4vaUbVhFPdJaDopCkdir/iIl2sj2N/MiWJ8QVvfXVAsMbVi1JTPNpNIzr X-Received: by 2002:a17:902:7612:: with SMTP id k18mr2573049pll.48.1562823988171; Wed, 10 Jul 2019 22:46:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562823988; cv=none; d=google.com; s=arc-20160816; b=tBxvGS/Not6eG+sof+Uy/m/XbRfsB5jl5xGbUAWlpnRAe4yMKs97kxfZu6E76HvW8u XOxZLTKpTGyZ71WMC230mkbQkEL74MutmZKLGTBcu04W0yk3WjANKHPzT15Pc8cfqgsM WfWYTZZsrvOIc+2IaS6IfwOPcS5WbJtcPNwfHSfOvzSG9/G6bYlQU74ni7J9/6v0ftUq SXkPxVYwal0zgw4fQQquqBdMHnqCXcg+AlqxGLQ6Zau+9ZBDUo3OjbNRAuhjG+Kpx1mV b0n8iI3jo9tBGLxqHMeVulPnxP1aATvTAzdFQ0DEl8HzyZy68kn4U4Mvzf9SABSJW0uu L0Cw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=6aRVUmTSBwVJYpeiNrND1Xnxtiy5tFvj/eUl4BEOmnc=; b=XHFC1TILb1AdTzyJxMJ3g1P1jIQUfgQ/TMy6RjuiT9TVsMVdYdWJkVFRlz79qTuv05 c8z1cicxTn84Xrt3vzMiDstIHOYmAR/Jvt84MwGJDU/VqHRMgIh7aB3aLaMPKOMvIc1F VThnzND7awo+b4qpcM+w+cJcTEtAyUXsrKJ6GRT5ezPjSzZhQpK6cl0JkBZgowv1NyF0 w22XMk7VQLJEW0HxcVXcKQlS7x9UFkyiukWY0pyCxq44WVekm8elGdSZsEUwxDugGU2p oKaUgiRp2R9OQvmGJphicMiPmcgklmkeG5mKQ/7U2Pf0yyHCd+Ntm9/qiKp8PE41Vlpn 2rlg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b="gI/Vgxkl"; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y8si3965396plp.96.2019.07.10.22.46.27; Wed, 10 Jul 2019 22:46:28 -0700 (PDT) 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=@nifty.com header.s=dec2015msa header.b="gI/Vgxkl"; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728243AbfGKFq0 (ORCPT + 29 others); Thu, 11 Jul 2019 01:46:26 -0400 Received: from conuserg-08.nifty.com ([210.131.2.75]:59527 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728028AbfGKFpz (ORCPT ); Thu, 11 Jul 2019 01:45:55 -0400 Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id x6B5ip8P031345; Thu, 11 Jul 2019 14:44:55 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com x6B5ip8P031345 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1562823896; bh=6aRVUmTSBwVJYpeiNrND1Xnxtiy5tFvj/eUl4BEOmnc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gI/Vgxkl42D76bzIw86W0xAvgqd/+P9LGeK3eqdoNY+/3cg32JjQiPq+OEI5ruDDa 53++i6RCIod+sjVonx9UOF0AwIH8wwyq+kz98nq1muLri3nAmE+/CY0hSD8vYgThxN xlluPEopOqRYPImPeZwz+pPjZ/CUOhFu0eRVuAXpLqSFg5cJow8jRY74FA0GNoS/zM v7VRJyoDyUx5aGxAtrYOA81J0VHJsSGZmLvcBY2QTHd4XpRw6RHIf529efE1P/YQxk RpokO3chRPcsLuBW6FmfUYun6h5aivyvfGhM3tSHAUgcYusgAmO6s+yO3sc9mLklIj wWGw2od18x9UA== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Sam Ravnborg , Nicolas Pitre , Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH v2 05/11] kbuild: modinst: read modules.order instead of $(MODVERDIR)/*.mod Date: Thu, 11 Jul 2019 14:44:28 +0900 Message-Id: <20190711054434.1177-6-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190711054434.1177-1-yamada.masahiro@socionext.com> References: <20190711054434.1177-1-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Towards the goal of removing MODVERDIR, read out modules.order to get the list of modules to be installed. This is simpler than parsing *.mod files in $(MODVERDIR). For external modules, $(KBUILD_EXTMOD)/modules.order should be read. Signed-off-by: Masahiro Yamada --- Changes in v2: None scripts/Makefile.modinst | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) -- 2.17.1 diff --git a/scripts/Makefile.modinst b/scripts/Makefile.modinst index 0dae402661f3..5a4579e76485 100644 --- a/scripts/Makefile.modinst +++ b/scripts/Makefile.modinst @@ -8,10 +8,7 @@ __modinst: include scripts/Kbuild.include -# - -__modules := $(sort $(shell grep -h '\.ko$$' /dev/null $(wildcard $(MODVERDIR)/*.mod))) -modules := $(patsubst %.o,%.ko,$(wildcard $(__modules:.ko=.o))) +modules := $(sort $(shell cat $(if $(KBUILD_EXTMOD),$(KBUILD_EXTMOD)/)modules.order)) PHONY += $(modules) __modinst: $(modules) From patchwork Thu Jul 11 05:44:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 168822 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp10914422ilk; Wed, 10 Jul 2019 22:46:29 -0700 (PDT) X-Google-Smtp-Source: APXvYqwJGi8K1MzPfceu94u8ZB38/ShqjoNKVT/dI83v266oHTtsqSyvkR9JULzeIy1vJdotOUx0 X-Received: by 2002:a17:90a:35e5:: with SMTP id r92mr2789140pjb.34.1562823989532; Wed, 10 Jul 2019 22:46:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562823989; cv=none; d=google.com; s=arc-20160816; b=g2LrAoEcj70yXAsYNuISraSPjjqI4csGVxlKzF9rBzPT10NPdxyZectk+OA4WiylnJ PWvm0AEkRr+AH57nLIDqKaO8+HVhRPd+6BVJSwHToRcVvSHDs30GWlZk0aozMZ9fUdkP xf2TDKCNr8rcBQkWnbfExGQ7wL3h1LP/7S4xsZiWNysN/Ac6XJD58pg3Ge4jNqh9xDq8 nSEYAeF+Z+0+mbIDY0hkkFfg3p0oq8K29VhPtjP09sZUeLndXhk06Ph29liK4kDojvM1 BcCgoGKCeMLpXZ7G9d0zWkC0Qo4wzWlitqqukI+nZBnOW0OT6/mkOetLVgdHSu6p4+Fc e7Qg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=1zEZHAW0UpTSAns9BBkOgZFy59b+y/4j41w96kvIZ+Q=; b=a4CG0VMWro9YpQKpJZna+0XhL2hZ/TvCtBu2+d4PvVtKitiNKr06/zwi8mqYfLWUJl xgUx5coTx4RMxhSLpDlSftNEHkz/bZdXBsD3+b+DKqCl2T/Xyvk+TtnaIvIISrOY6J9X PEqCmmPgfpYRvSBT5ehLe8Y/F0+w0no2PEQQfLYgl46VMW5v1cW62CqK9AN2PavRl3PI rav+/N+xP/RZPgtmLGOD47Gu9w7Oq24+W9gUcE1j/tyQTMOm3mYuI68jjAqA/EowEtd4 UtsV6twzwlrjlN8SbamFOdVYt4lpRtkAcZwE2YHWmksB+QDUEkKh1hL6rMKEhBXzDKs0 sQBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=G9HS4ZmB; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y8si3965396plp.96.2019.07.10.22.46.29; Wed, 10 Jul 2019 22:46:29 -0700 (PDT) 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=@nifty.com header.s=dec2015msa header.b=G9HS4ZmB; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728257AbfGKFq2 (ORCPT + 29 others); Thu, 11 Jul 2019 01:46:28 -0400 Received: from conuserg-08.nifty.com ([210.131.2.75]:59526 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728030AbfGKFpz (ORCPT ); Thu, 11 Jul 2019 01:45:55 -0400 Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id x6B5ip8Q031345; Thu, 11 Jul 2019 14:44:56 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com x6B5ip8Q031345 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1562823896; bh=1zEZHAW0UpTSAns9BBkOgZFy59b+y/4j41w96kvIZ+Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=G9HS4ZmBuLG3L98G76TzvdwLRWUjZU78qt+ES9tTxhlzPWOFwsgPsbVLHjglL8kvQ hbg5pY2s6o5wEuZN1Kl27fO0NqkDOVWyJ3aTokFSk+RI+pSpTX1DeuYNxVJ0Cy1Lvd fMZtfyaioNI0HgIsrPdwLj540EOcTokB7xK/KYZOPfsMwYiD4hNyB3bHmRVz54y0pp zFfi/0Y2H52/KbLxpJQn0EDOEg0ev1cLrHpYWd3ziHTnH7C68i/4Ws45P2HrLeYt2X eRRQ3Uiv1sG71oNfaEa67YbosbyH4DGDYrXg1DUaPD2ihc1aNcR+JAxcltcMrZzB4u ld3fC6bbVTaXA== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Sam Ravnborg , Nicolas Pitre , Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH v2 06/11] kbuild: modsign: read modules.order instead of $(MODVERDIR)/*.mod Date: Thu, 11 Jul 2019 14:44:29 +0900 Message-Id: <20190711054434.1177-7-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190711054434.1177-1-yamada.masahiro@socionext.com> References: <20190711054434.1177-1-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Towards the goal of removing MODVERDIR, read out modules.order to get the list of modules to be signed. This is simpler than parsing *.mod files in $(MODVERDIR). The modules_sign target is only supported for in-kernel modules. So, this commit does not take care of external modules. Signed-off-by: Masahiro Yamada --- Changes in v2: None scripts/Makefile.modsign | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- 2.17.1 diff --git a/scripts/Makefile.modsign b/scripts/Makefile.modsign index da56aa78d245..d7325cefe709 100644 --- a/scripts/Makefile.modsign +++ b/scripts/Makefile.modsign @@ -8,8 +8,7 @@ __modsign: include scripts/Kbuild.include -__modules := $(sort $(shell grep -h '\.ko$$' /dev/null $(wildcard $(MODVERDIR)/*.mod))) -modules := $(patsubst %.o,%.ko,$(wildcard $(__modules:.ko=.o))) +modules := $(sort $(shell cat modules.order)) PHONY += $(modules) __modsign: $(modules) From patchwork Thu Jul 11 05:44:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 168816 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp10914091ilk; Wed, 10 Jul 2019 22:46:06 -0700 (PDT) X-Google-Smtp-Source: APXvYqxYSoJJ8smrqxnU8ib5UrMRlx48Q32zaTNmrMdpEV5y3wJDhMmn7oQ2Ybf5gpP5QwpdqcY4 X-Received: by 2002:a65:6401:: with SMTP id a1mr2497128pgv.42.1562823966365; Wed, 10 Jul 2019 22:46:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562823966; cv=none; d=google.com; s=arc-20160816; b=REAdYkThYydBInsK+XX2A8OGexYxirXI75MPW3QGF+Q5X57/W2ARQuc0xBsiz39K/Y 73OaIgtvI+1HZdIIuTcMGwTcvrDz0PCFsZVauJU6g1RJA9bI5nCQ8JZQ/7tEy4txwhTn ZYiCN9KuFaEl6YgRbR4gt/Q1/HZ3Rg1okJIAdxZS4+3UEIw5bMW74tL9g4/hUsPFG06v sUn1Nsq17vx4/lEnAw/34XeuH2uenRNvT3sHmIp1Q6nm8DWAEmFzZv2fSTucpxst0zLT kPlAcUMa2D5I9BbcnMiNKx5+pqEl5NVUXbbu0Ho2HPAKwSAT0hdAxtRj7bMGoeUAwxl9 Ty7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=3stWZci9Q+1wdEeQ+22mZim0UiOILKQPDAUatPWkXUI=; b=MMZ6guCbE8cq0RHMq9SHXs2LyO/DgIpTyWYf3x4WSBNbJh3xzBv+/eEj51utFesDZw Pn90Cghp2BUNG547GYD0GjOHTjyT0qcgJrOlPs5QvP1bueTJPQdLa/Hev3r3zpDoqypc HcN3WLFJ7HxLk+sDtcYu3MIsT6sGkD4ijyGlL7MOeCu/da2s+T0ZWpcMtUZD33xwDqV8 18DbRvHfG1u4srxvCaMh5e2ERC28F7FINYzDQnnjryE7uDkUeUyMA/qEhqBsWRL4vwi5 4OvQDPSXK++dhl0rK3gtbuBGdeG+PU2xejcXZ+s6J4gmNWDP0gO47lgaq2G904kjqX7V tJ8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=zzCfgYA1; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q2si4096926pjq.89.2019.07.10.22.46.06; Wed, 10 Jul 2019 22:46:06 -0700 (PDT) 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=@nifty.com header.s=dec2015msa header.b=zzCfgYA1; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728142AbfGKFqF (ORCPT + 29 others); Thu, 11 Jul 2019 01:46:05 -0400 Received: from conuserg-08.nifty.com ([210.131.2.75]:59469 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727785AbfGKFpx (ORCPT ); Thu, 11 Jul 2019 01:45:53 -0400 Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id x6B5ip8R031345; Thu, 11 Jul 2019 14:44:57 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com x6B5ip8R031345 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1562823897; bh=3stWZci9Q+1wdEeQ+22mZim0UiOILKQPDAUatPWkXUI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zzCfgYA12HxNWflkTTSLjdaoGUyyLL9M/njlyZm5txsFXwvgJ74ShigkKw5imyZss kj8ERkblQ7mqx44PHmO/10pfcCrbHP5C/I9wot+jrNFccigeDUKEnwI04V+fgBncmL RFD4T5FPwZVADdTjjOw5g4GNWzpH+f6O7a5KIby/9/DHMvVBZ1t5CXpuE1bcFvCDv1 B9COiiUpEIyfHCm4A1D3SVkjPGegRCEiJiDVrbEW8klESO24PwaNQyujT+yJyhVqVj b1pEjy1iPZmi52NbIXi0UIkMjHpL/b8CmEV9dE8qeFlVDFMl+/sWdQm/YPGlzlVjSR OwrXibzngaTQQ== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Sam Ravnborg , Nicolas Pitre , Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH v2 07/11] kbuild: modpost: read modules.order instead of $(MODVERDIR)/*.mod Date: Thu, 11 Jul 2019 14:44:30 +0900 Message-Id: <20190711054434.1177-8-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190711054434.1177-1-yamada.masahiro@socionext.com> References: <20190711054434.1177-1-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Towards the goal of removing MODVERDIR, read out modules.order to get the list of modules to be processed. This is simpler than parsing *.mod files in $(MODVERDIR). For external modules, $(KBUILD_EXTMOD)/modules.order should be read. Signed-off-by: Masahiro Yamada --- Changes in v2: None scripts/Makefile.modpost | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) -- 2.17.1 diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost index fec6ec2ffa47..2ab1694a7df3 100644 --- a/scripts/Makefile.modpost +++ b/scripts/Makefile.modpost @@ -8,9 +8,10 @@ # b) A .o file which is the .o files above linked together # c) A .mod file in $(MODVERDIR)/, listing the name of the # the preliminary .o file, plus all .o files +# d) modules.order, which lists all the modules # Stage 2 is handled by this file and does the following -# 1) Find all modules from the files listed in $(MODVERDIR)/ +# 1) Find all modules listed in modules.order # 2) modpost is then used to # 3) create one .mod.c file pr. module # 4) create one Module.symvers file with CRC for all exported symbols @@ -60,10 +61,10 @@ include scripts/Makefile.lib kernelsymfile := $(objtree)/Module.symvers modulesymfile := $(firstword $(KBUILD_EXTMOD))/Module.symvers -# Step 1), find all modules listed in $(MODVERDIR)/ -MODLISTCMD := find $(MODVERDIR) -name '*.mod' | xargs -r grep -h '\.ko$$' | sort -u -__modules := $(shell $(MODLISTCMD)) -modules := $(patsubst %.o,%.ko, $(wildcard $(__modules:.ko=.o))) +modorder := $(if $(KBUILD_EXTMOD),$(KBUILD_EXTMOD)/)modules.order + +# Step 1), find all modules listed in modules.order +modules := $(sort $(shell cat $(modorder))) # Stop after building .o files if NOFINAL is set. Makes compile tests quicker _modpost: $(if $(KBUILD_MODPOST_NOFINAL), $(modules:.ko:.o),$(modules)) @@ -84,7 +85,7 @@ MODPOST_OPT=$(subst -i,-n,$(filter -i,$(MAKEFLAGS))) # We can go over command line length here, so be careful. quiet_cmd_modpost = MODPOST $(words $(filter-out vmlinux FORCE, $^)) modules - cmd_modpost = $(MODLISTCMD) | sed 's/\.ko$$/.o/' | $(modpost) $(MODPOST_OPT) -s -T - + cmd_modpost = sed 's/ko$$/o/' $(modorder) | $(modpost) $(MODPOST_OPT) -s -T - PHONY += __modpost __modpost: $(modules:.ko=.o) FORCE From patchwork Thu Jul 11 05:44:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 168820 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp10914324ilk; Wed, 10 Jul 2019 22:46:24 -0700 (PDT) X-Google-Smtp-Source: APXvYqxeq4MnkjL4ANXpFjWV46nG4X8xLqGRw2Tw5LPQaqFbcDLsaIMDuq8G7iAoLVsvoPnSdLCY X-Received: by 2002:a17:90b:28f:: with SMTP id az15mr2713193pjb.18.1562823983972; Wed, 10 Jul 2019 22:46:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562823983; cv=none; d=google.com; s=arc-20160816; b=MJamThlrf7t1N8ob+hW7QSBLkuNqtRiQgjrvAp8PnOzdWBxmEnV7UA5U4BH7PHQWwd wbmyJa2FeFFM6UA58sajeIWHShq97kR0TxPVhEH7mcpoWYDvyTf/6yfjsstiCNbcvB/n XZ5EXD8R8QzAiep/1Jbruta6lOBTWzjzTg2i7kOAZqPkBg370le1IUnB42LuDd9qM7P/ AWNMtSqygmyCodsoSlr52FuyfQ54FSQ5+jxGM4nIR1gNmqsTvnBPq6kZhTP2PGyMBExf 5xcIiD02z8D397FaVMIkZXu+3O6LYg8+Uo+OF1VO25DQqQUoYUgpz6eEqwS+6KlOwa7t hsZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=zZHC7kuEat8Wjj58eLs5YktuTxK/MA2LOpg5kpa1Adk=; b=lg6jBiO60Z2ChMvsfSasWsdmo9ILIHbMQUZlvE6Ss7g2ihIHhdZfI+OB3tWXF3svkI d735vKoeyFIu6tO0GIR5rb1/mwyKFvJ+223kg5g3cl9bvpQ/3ZxD8nhjjzYKg+Nbd+u3 JIFUbHBZ2aSsj4n6WygUUVBXAAfE2uLHkMg6P0z9klZMkSVouJomcT0PT7I5pl+lInYC uTkeBSNxu3QzTDVbmJtWFr6696goJR+CA5qSqF6VgHpGH7VU+XWLbb+2GirJhfaRWeZx nwicKgGnD79JL8Lyriou0d5mvYyZDuvNXUIMQps6n3n8roZ94uWSlBoKgfQy2cfn8BTB QTug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=FCqFYTZz; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m6si4118075pgq.275.2019.07.10.22.46.23; Wed, 10 Jul 2019 22:46:23 -0700 (PDT) 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=@nifty.com header.s=dec2015msa header.b=FCqFYTZz; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728217AbfGKFqW (ORCPT + 29 others); Thu, 11 Jul 2019 01:46:22 -0400 Received: from conuserg-08.nifty.com ([210.131.2.75]:59830 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728133AbfGKFqG (ORCPT ); Thu, 11 Jul 2019 01:46:06 -0400 Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id x6B5ip8S031345; Thu, 11 Jul 2019 14:44:57 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com x6B5ip8S031345 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1562823898; bh=zZHC7kuEat8Wjj58eLs5YktuTxK/MA2LOpg5kpa1Adk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FCqFYTZznK80VZReW6vN2qr2vh3/mBUofINF1wV7zGe9hPo9+3JT8cZLb7uJdIBqN bdCcg6nrdpM+bPPFn11wwp4luRgBlf2smhwbCKwkvvALb2abXQ+YDCobdrUTCUymSA TCbG77NJwu3Y2TxlKGcCz3Lznj8/TUGNOSiauftierRJzv06Om82QNcfPZdHCxz0pb ILpkkWdRarZhq7ZwepmX0ol2I15fne+iCU3VGLOZD2lthmBoMzrGOf82gZlK4FKJvc GN4i02P/rf4LP+7nMp40J5Aezj4L/uEJlokQS5lBnqXjr1e9txTx01eIGPKtygi1NB IMPzydkBNfk1w== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Sam Ravnborg , Nicolas Pitre , Masahiro Yamada , linux-doc@vger.kernel.org, Jonathan Corbet , linux-kernel@vger.kernel.org, Michal Marek Subject: [PATCH v2 08/11] kbuild: create *.mod with full directory path and remove MODVERDIR Date: Thu, 11 Jul 2019 14:44:31 +0900 Message-Id: <20190711054434.1177-9-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190711054434.1177-1-yamada.masahiro@socionext.com> References: <20190711054434.1177-1-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org While descending directories, Kbuild produces objects for modules, but do not link final *.ko files; it is done in the modpost. To keep track of modules, Kbuild creates a *.mod file in $(MODVERDIR) for every module it is building. Some post-processing steps read the necessary information from *.mod files. This avoids descending into directories again. This mechanism was introduced in 2003 or so. Later, commit 551559e13af1 ("kbuild: implement modules.order") added modules.order. So, we can simply read it out to know all the modules with directory paths. This is easier than parsing the first line of *.mod files. $(MODVERDIR) has a flat directory structure, that is, *.mod files are named only with base names. This is based on the assumption that the module name is unique across the tree. This assumption is really fragile. Stephen Rothwell reported a race condition caused by a module name conflict: https://lkml.org/lkml/2019/5/13/991 In parallel building, two different threads could write to the same $(MODVERDIR)/*.mod simultaneously. Non-unique module names are the source of all kind of troubles, hence commit 3a48a91901c5 ("kbuild: check uniqueness of module names") introduced a new checker script. However, it is still fragile in the build system point of view because this race happens before scripts/modules-check.sh is invoked. If it happens again, the modpost will emit unclear error messages. To fix this issue completely, create *.mod in the same directory as *.ko so that two threads never attempt to write to the same file. $(MODVERDIR) is no longer needed. Since modules with directory paths are listed in modules.order, Kbuild is still able to find *.mod files without additional descending. Signed-off-by: Masahiro Yamada Acked-by: Nicolas Pitre --- Changes in v2: - Remove -r of xargs, which is a GNU extension - Add '--' for extra safety .gitignore | 1 + Documentation/dontdiff | 1 + Makefile | 20 +++----------------- scripts/Makefile.build | 8 ++------ scripts/Makefile.modpost | 4 ++-- scripts/adjust_autoksyms.sh | 11 ++++------- scripts/mod/sumversion.c | 16 +++------------- scripts/package/mkspec | 2 +- 8 files changed, 17 insertions(+), 46 deletions(-) -- 2.17.1 diff --git a/.gitignore b/.gitignore index 7587ef56b92d..8f5422cba6e2 100644 --- a/.gitignore +++ b/.gitignore @@ -30,6 +30,7 @@ *.lz4 *.lzma *.lzo +*.mod *.mod.c *.o *.o.* diff --git a/Documentation/dontdiff b/Documentation/dontdiff index 5eba889ea84d..9f4392876099 100644 --- a/Documentation/dontdiff +++ b/Documentation/dontdiff @@ -30,6 +30,7 @@ *.lzo *.mo *.moc +*.mod *.mod.c *.o *.o.* diff --git a/Makefile b/Makefile index b5e21d676ee2..4243b6daffcf 100644 --- a/Makefile +++ b/Makefile @@ -488,11 +488,6 @@ export KBUILD_AFLAGS_MODULE KBUILD_CFLAGS_MODULE KBUILD_LDFLAGS_MODULE export KBUILD_AFLAGS_KERNEL KBUILD_CFLAGS_KERNEL export KBUILD_ARFLAGS -# When compiling out-of-tree modules, put MODVERDIR in the module -# tree rather than in the kernel tree. The kernel tree might -# even be read-only. -export MODVERDIR := $(if $(KBUILD_EXTMOD),$(firstword $(KBUILD_EXTMOD))/).tmp_versions - # Files to ignore in find ... statements export RCS_FIND_IGNORE := \( -name SCCS -o -name BitKeeper -o -name .svn -o \ @@ -1033,7 +1028,7 @@ vmlinux-deps := $(KBUILD_LDS) $(KBUILD_VMLINUX_OBJS) $(KBUILD_VMLINUX_LIBS) # Recurse until adjust_autoksyms.sh is satisfied PHONY += autoksyms_recursive -autoksyms_recursive: $(vmlinux-deps) +autoksyms_recursive: $(vmlinux-deps) modules.order ifdef CONFIG_TRIM_UNUSED_KSYMS $(Q)$(CONFIG_SHELL) $(srctree)/scripts/adjust_autoksyms.sh \ "$(MAKE) -f $(srctree)/Makefile vmlinux" @@ -1117,7 +1112,6 @@ endif prepare1: prepare3 outputmakefile asm-generic $(version_h) $(autoksyms_h) \ include/generated/utsrelease.h - $(cmd_crmodverdir) archprepare: archheaders archscripts prepare1 scripts @@ -1375,7 +1369,7 @@ endif # CONFIG_MODULES # make distclean Remove editor backup files, patch leftover files and the like # Directories & files removed with 'make clean' -CLEAN_DIRS += $(MODVERDIR) include/ksym +CLEAN_DIRS += include/ksym CLEAN_FILES += modules.builtin.modinfo # Directories & files removed with 'make mrproper' @@ -1636,7 +1630,6 @@ PHONY += $(clean-dirs) clean $(clean-dirs): $(Q)$(MAKE) $(clean)=$(patsubst _clean_%,%,$@) -clean: rm-dirs := $(MODVERDIR) clean: rm-files := $(KBUILD_EXTMOD)/Module.symvers PHONY += help @@ -1650,8 +1643,6 @@ help: @echo '' PHONY += prepare -prepare: - $(cmd_crmodverdir) endif # KBUILD_EXTMOD clean: $(clean-dirs) @@ -1662,7 +1653,7 @@ clean: $(clean-dirs) -o -name '*.ko.*' \ -o -name '*.dtb' -o -name '*.dtb.S' -o -name '*.dt.yaml' \ -o -name '*.dwo' -o -name '*.lst' \ - -o -name '*.su' \ + -o -name '*.su' -o -name '*.mod' \ -o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \ -o -name '*.lex.c' -o -name '*.tab.[ch]' \ -o -name '*.asn1.[ch]' \ @@ -1791,11 +1782,6 @@ quiet_cmd_depmod = DEPMOD $(KERNELRELEASE) cmd_depmod = $(CONFIG_SHELL) $(srctree)/scripts/depmod.sh $(DEPMOD) \ $(KERNELRELEASE) -# Create temporary dir for module support files -# clean it up only when building all modules -cmd_crmodverdir = $(Q)mkdir -p $(MODVERDIR) \ - $(if $(KBUILD_MODULES),; rm -f $(MODVERDIR)/*) - # read saved command lines for existing targets existing-targets := $(wildcard $(sort $(targets))) diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 98dede0b2ca8..9fb30633acd2 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -67,8 +67,6 @@ ifeq ($(CONFIG_MODULES)$(need-modorder),y1) modorder-target := $(obj)/modules.order endif -# We keep a list of all modules in $(MODVERDIR) - __build: $(if $(KBUILD_BUILTIN),$(builtin-target) $(lib-target) $(extra-y)) \ $(if $(KBUILD_MODULES),$(obj-m) $(modorder-target)) \ $(subdir-ym) $(always) @@ -278,13 +276,11 @@ $(obj)/%.o: $(src)/%.c $(recordmcount_source) $(objtool_dep) FORCE $(call cmd,force_checksrc) $(call if_changed_rule,cc_o_c) -# Single-part modules are special since we need to mark them in $(MODVERDIR) - $(single-used-m): $(obj)/%.o: $(src)/%.c $(recordmcount_source) $(objtool_dep) FORCE $(call cmd,force_checksrc) $(call if_changed_rule,cc_o_c) @{ echo $(@:.o=.ko); echo $@; \ - $(cmd_undef_syms); } > $(MODVERDIR)/$(@F:.o=.mod) + $(cmd_undef_syms); } > $(patsubst %.o,%.mod,$@) quiet_cmd_cc_lst_c = MKLST $@ cmd_cc_lst_c = $(CC) $(c_flags) -g -c -o $*.o $< && \ @@ -466,7 +462,7 @@ cmd_link_multi-m = $(LD) $(ld_flags) -r -o $@ $(filter %.o,$^) $(cmd_secanalysis $(multi-used-m): FORCE $(call if_changed,link_multi-m) @{ echo $(@:.o=.ko); echo $(filter %.o,$^); \ - $(cmd_undef_syms); } > $(MODVERDIR)/$(@F:.o=.mod) + $(cmd_undef_syms); } > $(patsubst %.o,%.mod,$@) $(call multi_depend, $(multi-used-m), .o, -objs -y -m) targets += $(multi-used-m) diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost index 2ab1694a7df3..3e229d4f4d72 100644 --- a/scripts/Makefile.modpost +++ b/scripts/Makefile.modpost @@ -6,8 +6,8 @@ # Stage one of module building created the following: # a) The individual .o files used for the module # b) A .o file which is the .o files above linked together -# c) A .mod file in $(MODVERDIR)/, listing the name of the -# the preliminary .o file, plus all .o files +# c) A .mod file, listing the name of the preliminary .o file, +# plus all .o files # d) modules.order, which lists all the modules # Stage 2 is handled by this file and does the following diff --git a/scripts/adjust_autoksyms.sh b/scripts/adjust_autoksyms.sh index aab4e299d7a2..8b44bb80a451 100755 --- a/scripts/adjust_autoksyms.sh +++ b/scripts/adjust_autoksyms.sh @@ -47,13 +47,10 @@ cat > "$new_ksyms_file" << EOT */ EOT -[ "$(ls -A "$MODVERDIR")" ] && -for mod in "$MODVERDIR"/*.mod; do - sed -n -e '3{s/ /\n/g;/^$/!p;}' "$mod" -done | sort -u | -while read sym; do - echo "#define __KSYM_${sym} 1" -done >> "$new_ksyms_file" +sed 's/ko$/mod/' modules.order | +xargs -n1 sed -n -e '3{s/ /\n/g;/^$/!p;}' -- | +sort -u | +sed -e 's/\(.*\)/#define __KSYM_\1 1/' >> "$new_ksyms_file" # Special case for modversions (see modpost.c) if [ -n "$CONFIG_MODVERSIONS" ]; then diff --git a/scripts/mod/sumversion.c b/scripts/mod/sumversion.c index 0f6dcb4011a8..166f3fa247a9 100644 --- a/scripts/mod/sumversion.c +++ b/scripts/mod/sumversion.c @@ -396,21 +396,11 @@ void get_src_version(const char *modname, char sum[], unsigned sumlen) unsigned long len; struct md4_ctx md; char *sources, *end, *fname; - const char *basename; char filelist[PATH_MAX + 1]; - char *modverdir = getenv("MODVERDIR"); - if (!modverdir) - modverdir = "."; - - /* Source files for module are in .tmp_versions/modname.mod, - after the first line. */ - if (strrchr(modname, '/')) - basename = strrchr(modname, '/') + 1; - else - basename = modname; - snprintf(filelist, sizeof(filelist), "%s/%.*s.mod", modverdir, - (int) strlen(basename) - 2, basename); + /* objects for a module are listed in the second line of *.mod file. */ + snprintf(filelist, sizeof(filelist), "%.*smod", + (int)strlen(modname) - 1, modname); file = grab_file(filelist, &len); if (!file) diff --git a/scripts/package/mkspec b/scripts/package/mkspec index 2d29df4a0a53..8640c278f1aa 100755 --- a/scripts/package/mkspec +++ b/scripts/package/mkspec @@ -29,7 +29,7 @@ fi PROVIDES="$PROVIDES kernel-$KERNELRELEASE" __KERNELRELEASE=$(echo $KERNELRELEASE | sed -e "s/-/_/g") -EXCLUDES="$RCS_TAR_IGNORE --exclude=.tmp_versions --exclude=*vmlinux* \ +EXCLUDES="$RCS_TAR_IGNORE --exclude=*vmlinux* --exclude=*.mod \ --exclude=*.o --exclude=*.ko --exclude=*.cmd --exclude=Documentation \ --exclude=.config.old --exclude=.missing-syscalls.d --exclude=*.s" From patchwork Thu Jul 11 05:44:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 168815 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp10914030ilk; Wed, 10 Jul 2019 22:46:01 -0700 (PDT) X-Google-Smtp-Source: APXvYqztokBes091GhOf2HWc8yM/JiHaFR6JlQZo7DqfjaCm6SyviPMf7EnAbwYV55Up73i59Xmg X-Received: by 2002:a65:6401:: with SMTP id a1mr2496814pgv.42.1562823961696; Wed, 10 Jul 2019 22:46:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562823961; cv=none; d=google.com; s=arc-20160816; b=Va6tXJ+W37txxaQGlQQzIRQV2KssK6NvaiI3ht4tDU3auho0vLKH82ZarjTXM9QFUJ 7vDlnQ7FSks1Tzd2ZacI26F2tnSlvSH/uErqqHxaiMydtKLk3tlaLrsN+iGI+drCU9oG cljnDBRBtDN+qaxbI+9esNb2+TS8mbcTX7FwqnB5ekXiEAfc9qOwqfZbcmsaGjROPFox KKQqRFxhUudgHKzcl4mcmOOuWpeF/N0exKJO7lmivKgMZXiYAfwX0T656c/5qpUhaxht awsSQpBmfRL01pFCdUKi5pPUr/Sq/BGP55D1iVItai5MDZZBFDGmRbpaSiDz3tHdWU9t 5uQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=iZRH/pqcP+K+A+neVC6JVPL+Vc4UBQc7CTbEdrMj1B8=; b=oEtP12KU/VmbKCC4tb/Pti72G4Wppa1DCuX8GNlkCDPiG5bPccifvDBLpmCp3afzP4 9WYatjA2lOir2eIU5Kn4I8luQkE8U9RiodFxbMAaQcPAluBQInsYiJwBEpWL3Spu07iD 2GlADxVXXYqQGsofmsedhTiplGxIiGxao5xy3AFbsFt7m158hM/TmTpEbZNQWc97dWZR AbUlX9B0nKvNQxsb0P2Gv/nsm0UjArqKduZTlnBFFCo0xF2mORro6aZh8WRcU1YTDXv2 xA+tMzDpxculZM8qUG2TPybr8lixK80imAHjy1CpxAzCqfWltvdsQU8z7hFmfS7hE8f/ 4VvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=mlVGsQwY; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q2si4096926pjq.89.2019.07.10.22.46.01; Wed, 10 Jul 2019 22:46:01 -0700 (PDT) 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=@nifty.com header.s=dec2015msa header.b=mlVGsQwY; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728124AbfGKFqA (ORCPT + 29 others); Thu, 11 Jul 2019 01:46:00 -0400 Received: from conuserg-08.nifty.com ([210.131.2.75]:59467 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726088AbfGKFpx (ORCPT ); Thu, 11 Jul 2019 01:45:53 -0400 Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id x6B5ip8T031345; Thu, 11 Jul 2019 14:44:58 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com x6B5ip8T031345 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1562823898; bh=iZRH/pqcP+K+A+neVC6JVPL+Vc4UBQc7CTbEdrMj1B8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mlVGsQwYQrxJg90PTLm52mBuqGweoB+CPzQbf6QvCV0ZUtIl7a1bvZOTnzt0sQLcp f8fDC1/p3uD+3JlI93ZJO4w0J6r9cr3seTLJtkxha//rjK2bEAfwKlwerAkkO63T0J yEX+3+VMFdAeVAPazEHvof9Oa419QX6AZLYWwLS2qohjske8vaxATuhSGVvR+aSTWr RCTQrAeTGVh5/3UWqR4h8DOH0Ji/UQHwLVeifXEZ4ZmcMC1LN99D9LwbivpQ+sH7Cc +hOpKqz7+QXkHs/O8vXHyRllYVdjVORSLCkP6DNygPTN9tSeRXDkudZUd1WUOqOqet anh8tFjYBKNzw== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Sam Ravnborg , Nicolas Pitre , Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH v2 09/11] kbuild: remove the first line of *.mod files Date: Thu, 11 Jul 2019 14:44:32 +0900 Message-Id: <20190711054434.1177-10-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190711054434.1177-1-yamada.masahiro@socionext.com> References: <20190711054434.1177-1-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The current format of *.mod is like this: line 1: directory path to the .ko file line 2: a list of objects linked into this module line 3: unresolved symbols (only when CONFIG_TRIM_UNUSED_KSYMS=y) Now that *.mod and *.ko are created in the same directory, the line 1 provides no valuable information. It can be derived by replacing the extension .mod with .ko. Cut the first line. Signed-off-by: Masahiro Yamada --- Changes in v2: None scripts/Makefile.build | 4 ++-- scripts/adjust_autoksyms.sh | 2 +- scripts/mod/sumversion.c | 9 ++------- 3 files changed, 5 insertions(+), 10 deletions(-) -- 2.17.1 diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 9fb30633acd2..2709646b1a5d 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -279,7 +279,7 @@ $(obj)/%.o: $(src)/%.c $(recordmcount_source) $(objtool_dep) FORCE $(single-used-m): $(obj)/%.o: $(src)/%.c $(recordmcount_source) $(objtool_dep) FORCE $(call cmd,force_checksrc) $(call if_changed_rule,cc_o_c) - @{ echo $(@:.o=.ko); echo $@; \ + @{ echo $@; \ $(cmd_undef_syms); } > $(patsubst %.o,%.mod,$@) quiet_cmd_cc_lst_c = MKLST $@ @@ -461,7 +461,7 @@ cmd_link_multi-m = $(LD) $(ld_flags) -r -o $@ $(filter %.o,$^) $(cmd_secanalysis $(multi-used-m): FORCE $(call if_changed,link_multi-m) - @{ echo $(@:.o=.ko); echo $(filter %.o,$^); \ + @{ echo $(filter %.o,$^); \ $(cmd_undef_syms); } > $(patsubst %.o,%.mod,$@) $(call multi_depend, $(multi-used-m), .o, -objs -y -m) diff --git a/scripts/adjust_autoksyms.sh b/scripts/adjust_autoksyms.sh index 8b44bb80a451..89871cae3954 100755 --- a/scripts/adjust_autoksyms.sh +++ b/scripts/adjust_autoksyms.sh @@ -48,7 +48,7 @@ cat > "$new_ksyms_file" << EOT EOT sed 's/ko$/mod/' modules.order | -xargs -n1 sed -n -e '3{s/ /\n/g;/^$/!p;}' -- | +xargs -n1 sed -n -e '2{s/ /\n/g;/^$/!p;}' -- | sort -u | sed -e 's/\(.*\)/#define __KSYM_\1 1/' >> "$new_ksyms_file" diff --git a/scripts/mod/sumversion.c b/scripts/mod/sumversion.c index 166f3fa247a9..63062024ce0e 100644 --- a/scripts/mod/sumversion.c +++ b/scripts/mod/sumversion.c @@ -398,7 +398,7 @@ void get_src_version(const char *modname, char sum[], unsigned sumlen) char *sources, *end, *fname; char filelist[PATH_MAX + 1]; - /* objects for a module are listed in the second line of *.mod file. */ + /* objects for a module are listed in the first line of *.mod file. */ snprintf(filelist, sizeof(filelist), "%.*smod", (int)strlen(modname) - 1, modname); @@ -407,13 +407,8 @@ void get_src_version(const char *modname, char sum[], unsigned sumlen) /* not a module or .mod file missing - ignore */ return; - sources = strchr(file, '\n'); - if (!sources) { - warn("malformed versions file for %s\n", modname); - goto release; - } + sources = file; - sources++; end = strchr(sources, '\n'); if (!end) { warn("bad ending versions file for %s\n", modname); From patchwork Thu Jul 11 05:44:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 168814 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp10913978ilk; Wed, 10 Jul 2019 22:45:58 -0700 (PDT) X-Google-Smtp-Source: APXvYqxNsICYfN4H3qO6Eg5P4jcda0TA+seJH78xKTUtBUbD7d5LtxgfI0v2g5EOkeNSQ4VfwyaS X-Received: by 2002:a17:902:59c3:: with SMTP id d3mr2562513plj.22.1562823958632; Wed, 10 Jul 2019 22:45:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562823958; cv=none; d=google.com; s=arc-20160816; b=SUvB+FwlO3/HY0PwUOA3yVTuaMnXh6LuLZP66S0D9lY97XkZdH8zuTfMhD/oU8UFLN 4BjkgHhjn+mNk+zr4Zr16lHC1JIhzNd+7tJ2trbPjU+TJP0nkMUoEhcN/zLdz24EkxjS yi3eI4BhijLdjnJb1VJabCpvfXgjRGa+jpT4s/wWka8HA9r+YgK/tEvkJXa/Z3PsYZ07 vrb3bhdtw6KU1LIwh3BOO1QufI3KErVyIzxJzPOyuwtZuONkdlKItW8uqDcMH9PhXvSQ CrCfUUkFwutjvkKpSINeXDSL9hz9NtOQbfUJcCr+XOeDzbqeQ6S5ZiGF8aG2/KomzCKL y2Gw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=Ns+sXHJZbzo/hYCT2LP+L4TcrC5zi8mC7e+kBaXavh4=; b=LmTqlCH2kg4drIy4h5Vllf25fPhRyjHZ/6NmFFwbwVcS2Zz+dh4rn5OBmk/qgiMdXf qm5fMt1Ap5Wgx6muHzuqGIdiLWw5Kx+LhJQBKLt1Vy0i2d9UZ3+ACfGOJLQ12o+pIw8F u4lIFk7LFPZLO9pIFze2K6/t4XoXCN8Zb+SNIb8QiFLRZVpBmO9cPFhhUBg4ARhfk2Lj ImA9C8p+2G98p138t1u6rILGXYa3efL1Kw+wFlQ04T+i5yUb8Y/J5rJYcsGRj/UrIrtc oyCtvN0tDe5sl8CFxQM9QFcbFy3HU/67gcuRQbF+R19OShjUbYNBYKsD8yfWTomCTmbk oR2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=dl2hS4bC; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m45si4295546pje.39.2019.07.10.22.45.58; Wed, 10 Jul 2019 22:45:58 -0700 (PDT) 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=@nifty.com header.s=dec2015msa header.b=dl2hS4bC; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728104AbfGKFp4 (ORCPT + 29 others); Thu, 11 Jul 2019 01:45:56 -0400 Received: from conuserg-08.nifty.com ([210.131.2.75]:59468 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727956AbfGKFpx (ORCPT ); Thu, 11 Jul 2019 01:45:53 -0400 Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id x6B5ip8U031345; Thu, 11 Jul 2019 14:44:59 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com x6B5ip8U031345 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1562823899; bh=Ns+sXHJZbzo/hYCT2LP+L4TcrC5zi8mC7e+kBaXavh4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dl2hS4bC47jOuAJKxFYhxgx3/mkDJGp+FB6ejQdwkgRoovkUEhE77ghFexiCV2vT5 vBqiBj5ksQJ3d5oP8rj84I3y6UD90fpM+LXgCjiaHzzQ/cVpbULJdtRZ0rS4u9alla Ss/kfRge6YJqs/ZHn2xR+FCDGxcotVTP4Ctu8lHLKgEG8XIZmZEr/hvg+pP078mSiY Ecbpm6nCsIxKRRxzvQ1ZwBMoelhFBzyXAR+fxKxECBAl1roq8sYso2vcJoE3Khngvh CMgCTAMLzMmw8VXUcPgApuV/V7kUFCU6/L/zQHFPpIEZB495HVHumyXjkRTbgYRgyh O6NDviHp/qF6g== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Sam Ravnborg , Nicolas Pitre , Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH v2 10/11] kbuild: remove 'prepare1' target Date: Thu, 11 Jul 2019 14:44:33 +0900 Message-Id: <20190711054434.1177-11-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190711054434.1177-1-yamada.masahiro@socionext.com> References: <20190711054434.1177-1-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now that there is no rule for 'prepare1', it can go away. Signed-off-by: Masahiro Yamada --- Changes in v2: None Makefile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) -- 2.17.1 diff --git a/Makefile b/Makefile index 4243b6daffcf..8de893e41149 100644 --- a/Makefile +++ b/Makefile @@ -1093,7 +1093,7 @@ scripts: scripts_basic scripts_dtc # archprepare is used in arch Makefiles and when processed asm symlink, # version.h and scripts_basic is processed / created. -PHONY += prepare archprepare prepare1 prepare3 +PHONY += prepare archprepare prepare3 # prepare3 is used to check if we are building in a separate output directory, # and if so do: @@ -1110,10 +1110,8 @@ ifneq ($(srctree),.) fi; endif -prepare1: prepare3 outputmakefile asm-generic $(version_h) $(autoksyms_h) \ - include/generated/utsrelease.h - -archprepare: archheaders archscripts prepare1 scripts +archprepare: archheaders archscripts scripts prepare3 outputmakefile \ + asm-generic $(version_h) $(autoksyms_h) include/generated/utsrelease.h prepare0: archprepare $(Q)$(MAKE) $(build)=scripts/mod From patchwork Thu Jul 11 05:44:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 168812 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp10913938ilk; Wed, 10 Jul 2019 22:45:56 -0700 (PDT) X-Google-Smtp-Source: APXvYqzuhTxn+qrFcXBiqVGmQHXP4zLpIvLERWhYZ2Txf8O2NaT/jBWJuhbVoThLZRhSjuQQGTjp X-Received: by 2002:a17:902:9346:: with SMTP id g6mr2558420plp.61.1562823956003; Wed, 10 Jul 2019 22:45:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562823955; cv=none; d=google.com; s=arc-20160816; b=u+ZvmJ8J8kSEiQydoqMDgw64xwbTJT15msvJzzCED84Uvz+gFsrIZCuHIBq+wcvkO+ lChQUavYuMUTDcA6/wz9qYsbUfVpyweCPoliXg7Ya3oi+VGGHq1brEwrjc3lrgC6qDRC fm19FjnuraPXKlykuaxQmIhIOekvQv5haXhYyAwc1ZWfzd7IJ0Q23Hpr3YqFcCmoScq3 l7vP1QKrXhpE9v+VqGUV6Vv4UrTrMHje+QGwEne+6qZkqSUiLUeDA3TPdr3BQnKH9I1x yiFFrfPrCdM1lfcCU+q2HhGJGPKmJ2IykMMIPY5XY5iJN4bbVn0Tq78dLmY+3kN2IaVZ kckg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=iRp9Du8hIMlIwOLhJe7rDNMn7P7N/4zadqD4+iwRwl8=; b=cC50qu2WUbZh5RteTYzQhiiSttzTiYN5jBdIVUe0Hxfkxy4X4uV62lutUWfkfE0E4P ko4sONFA5p/0iM51Ffqtx5fVc/TmJ+u2o6/Y5JOIvbBI6hW0vRz44ngIWCuQ73XdJwi/ KYBGHAhidtVaFS8abgCFhK31n4KHfV/KPsPbCoIMABGXyNOAd1XZH5oFHEDyKXxcOSMr pRoXThXr1DlnSiKglTZMFta96hsedv5SVvhw6v+TaCRhxK4AkFDrojVEk1QCKZ/5lGdJ WLYm0BTyQkV6gYZoce8lODDHzxZcEXIUhblSv5rexg2zqh5r3MTHxHgBg26DvR3Rh4wU ZzYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=kHHROSX5; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d5si3803908pla.17.2019.07.10.22.45.55; Wed, 10 Jul 2019 22:45:55 -0700 (PDT) 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=@nifty.com header.s=dec2015msa header.b=kHHROSX5; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728022AbfGKFpx (ORCPT + 29 others); Thu, 11 Jul 2019 01:45:53 -0400 Received: from conuserg-08.nifty.com ([210.131.2.75]:59472 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727960AbfGKFpx (ORCPT ); Thu, 11 Jul 2019 01:45:53 -0400 Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id x6B5ip8V031345; Thu, 11 Jul 2019 14:44:59 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com x6B5ip8V031345 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1562823900; bh=iRp9Du8hIMlIwOLhJe7rDNMn7P7N/4zadqD4+iwRwl8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kHHROSX5oyo66/pfhCsF+TrfXLXku+LACPJkW0iet8erC7xG/EvN4XWYSx5tsRd/W lsFYztWkgGnh31I5CogAYVE1AD20ywUkiqdw7T2a/L9KKpjZ4e74xRXA4Peqey4nJ6 gowGCHXn/8v2uBm8G8bJdnfXKUn+mxBVNKfl4K7VKH6BOatc6BPFpwQWENIIJzddyh ge9KxtwnrpMCyjXJRLm6OcUmdxeD2bEk99+ybLty2fZrElUbLtSesyNB+eHNlsaTnc utDi+WeMxMGD4ZFlOGRLEAsSuC7BAGg7lUtPXje6fX8D/iDN7fK2xvGm5nMS3+DGR6 sQfWX0otXw6Jw== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Sam Ravnborg , Nicolas Pitre , Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH v2 11/11] kbuild: split out *.mod out of {single, multi}-used-m rules Date: Thu, 11 Jul 2019 14:44:34 +0900 Message-Id: <20190711054434.1177-12-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190711054434.1177-1-yamada.masahiro@socionext.com> References: <20190711054434.1177-1-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently, *.mod is created as a side-effect of obj-m. Split out *.mod as a dedicated build rule, which allows to unify the %.c -> %.o rule, and remove the single-used-m rule. This also makes the incremental build of allmodconfig faster because it saves $(NM) invocation when there is no change in the module. Signed-off-by: Masahiro Yamada --- Changes in v2: None scripts/Makefile.build | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) -- 2.17.1 diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 2709646b1a5d..63fc266b4985 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -67,8 +67,10 @@ ifeq ($(CONFIG_MODULES)$(need-modorder),y1) modorder-target := $(obj)/modules.order endif +mod-targets := $(patsubst %.o, %.mod, $(obj-m)) + __build: $(if $(KBUILD_BUILTIN),$(builtin-target) $(lib-target) $(extra-y)) \ - $(if $(KBUILD_MODULES),$(obj-m) $(modorder-target)) \ + $(if $(KBUILD_MODULES),$(obj-m) $(mod-targets) $(modorder-target)) \ $(subdir-ym) $(always) @: @@ -266,7 +268,7 @@ endef # List module undefined symbols (or empty line if not enabled) ifdef CONFIG_TRIM_UNUSED_KSYMS -cmd_undef_syms = $(NM) $@ | sed -n 's/^ *U //p' | xargs echo +cmd_undef_syms = $(NM) $< | sed -n 's/^ *U //p' | xargs echo else cmd_undef_syms = echo endif @@ -276,11 +278,15 @@ $(obj)/%.o: $(src)/%.c $(recordmcount_source) $(objtool_dep) FORCE $(call cmd,force_checksrc) $(call if_changed_rule,cc_o_c) -$(single-used-m): $(obj)/%.o: $(src)/%.c $(recordmcount_source) $(objtool_dep) FORCE - $(call cmd,force_checksrc) - $(call if_changed_rule,cc_o_c) - @{ echo $@; \ - $(cmd_undef_syms); } > $(patsubst %.o,%.mod,$@) +cmd_mod = { \ + echo $(if $($*-objs)$($*-y)$($*-m), $(addprefix $(obj)/, $($*-objs) $($*-y) $($*-m)), $(@:.mod=.o)); \ + $(cmd_undef_syms); \ + } > $@ + +$(obj)/%.mod: $(obj)/%.o FORCE + $(call if_changed,mod) + +targets += $(mod-targets) quiet_cmd_cc_lst_c = MKLST $@ cmd_cc_lst_c = $(CC) $(c_flags) -g -c -o $*.o $< && \ @@ -461,8 +467,6 @@ cmd_link_multi-m = $(LD) $(ld_flags) -r -o $@ $(filter %.o,$^) $(cmd_secanalysis $(multi-used-m): FORCE $(call if_changed,link_multi-m) - @{ echo $(filter %.o,$^); \ - $(cmd_undef_syms); } > $(patsubst %.o,%.mod,$@) $(call multi_depend, $(multi-used-m), .o, -objs -y -m) targets += $(multi-used-m)