From patchwork Wed Jul 6 17:57:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Catalin Marinas X-Patchwork-Id: 71484 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp991770qgy; Wed, 6 Jul 2016 10:59:07 -0700 (PDT) X-Received: by 10.98.79.17 with SMTP id d17mr44026676pfb.127.1467827947081; Wed, 06 Jul 2016 10:59:07 -0700 (PDT) Return-Path: Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id r5si5157698pax.173.2016.07.06.10.59.06 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Jul 2016 10:59:07 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) client-ip=2001:1868:205::9; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) smtp.mailfrom=linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bKr5L-0003wQ-8h; Wed, 06 Jul 2016 17:58:07 +0000 Received: from foss.arm.com ([217.140.101.70]) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bKr5I-0003rZ-As for linux-arm-kernel@lists.infradead.org; Wed, 06 Jul 2016 17:58:05 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 340EC28; Wed, 6 Jul 2016 10:58:42 -0700 (PDT) Received: from e104818-lin.cambridge.arm.com (e104818-lin.cambridge.arm.com [10.1.203.148]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 3A2563F213; Wed, 6 Jul 2016 10:57:42 -0700 (PDT) Date: Wed, 6 Jul 2016 18:57:39 +0100 From: Catalin Marinas To: Kevin Brodsky Subject: Re: [PATCH RESEND] arm64: fix vdso-offsets.h dependency Message-ID: <20160706175739.GB22615@e104818-lin.cambridge.arm.com> References: <1463071155-7435-1-git-send-email-kevin.brodsky@arm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1463071155-7435-1-git-send-email-kevin.brodsky@arm.com> User-Agent: Mutt/1.5.23 (2014-03-12) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160706_105804_376471_4AC6C5C1 X-CRM114-Status: GOOD ( 14.52 ) X-Spam-Score: -8.3 (--------) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-8.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [217.140.101.70 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.4 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michal Marek , Will Deacon , linux-arm-kernel@lists.infradead.org, linux-kbuild@vger.kernel.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org On Thu, May 12, 2016 at 05:39:15PM +0100, Kevin Brodsky wrote: > +# We need to generate vdso-offsets.h before compiling certain files in kernel/. > +# In order to do that, we should use the archprepare target, but we can't since > +# asm-offsets.h is included in some files used to generate vdso-offsets.h, and > +# asm-offsets.h is built in prepare0, for which archprepare is a dependency. > +# Therefore we need to generate the header after prepare0 has been made, hence > +# this hack. > +prepare: vdso_prepare > +vdso_prepare: prepare0 > + $(Q)$(MAKE) $(build)=arch/arm64/kernel/vdso include/generated/vdso-offsets.h This indeed looks dodgy. I'm not sure about the makefile rules but would the above override the "prepare" target in the top Makefile? I think a dependency problem we have is that arch/arm64/kernel/signal.o depends on include/generated/vdso-offsets.h. However, we don't have any target for the latter, only for $(objtree)arch/arm64/kernel/vdso/vdso-offsets.h which no-one is including. Because of this, we have a fake dependency in arch/arm64/kernel/Makefile. It's been a long time since I wrote makefiles but I think a simpler approach may be to just get the include/generated/vdso-offsets.h target and remove the arch/arm64/kernel/vdso/vdso-offsets.h one entirely like below. Otherwise, we give up on storing the generated file in include/generated/ and move arch/arm64/include/asm/vdso.h to arch/arm64/kernel/vdso/. -----------8<------------------------- _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile index 7700c0c23962..9bdacbf59091 100644 --- a/arch/arm64/kernel/Makefile +++ b/arch/arm64/kernel/Makefile @@ -55,5 +55,4 @@ head-y := head.o extra-y += $(head-y) vmlinux.lds # vDSO - this must be built first to generate the symbol offsets -$(call objectify,$(arm64-obj-y)): $(obj)/vdso/vdso-offsets.h -$(obj)/vdso/vdso-offsets.h: $(obj)/vdso +$(objtree)/include/generated/vdso-offsets.h: $(obj)/vdso diff --git a/arch/arm64/kernel/vdso/Makefile b/arch/arm64/kernel/vdso/Makefile index b467fd0a384b..44c20e3c9f43 100644 --- a/arch/arm64/kernel/vdso/Makefile +++ b/arch/arm64/kernel/vdso/Makefile @@ -23,7 +23,7 @@ GCOV_PROFILE := n ccflags-y += -Wl,-shared obj-y += vdso.o -extra-y += vdso.lds vdso-offsets.h +extra-y += vdso.lds ../../../../include/generated/vdso-offsets.h CPPFLAGS_vdso.lds += -P -C -U$(ARCH) # Force dependency (incbin is bad) @@ -42,11 +42,10 @@ $(obj)/%.so: $(obj)/%.so.dbg FORCE gen-vdsosym := $(srctree)/$(src)/gen_vdso_offsets.sh quiet_cmd_vdsosym = VDSOSYM $@ define cmd_vdsosym - $(NM) $< | $(gen-vdsosym) | LC_ALL=C sort > $@ && \ - cp $@ include/generated/ + $(NM) $< | $(gen-vdsosym) | LC_ALL=C sort > $@ endef -$(obj)/vdso-offsets.h: $(obj)/vdso.so.dbg FORCE +$(obj)/../../../../include/generated/vdso-offsets.h: $(obj)/vdso.so.dbg FORCE $(call if_changed,vdsosym) # Assembly rules for the .S files