From patchwork Mon Mar 8 09:22:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 12121849 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.2 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DCB13C433E0 for ; Mon, 8 Mar 2021 09:22:22 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 64E3D651EB for ; Mon, 8 Mar 2021 09:22:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 64E3D651EB Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=suse.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.94715.178274 (Exim 4.92) (envelope-from ) id 1lJC5d-00021M-T1; Mon, 08 Mar 2021 09:22:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 94715.178274; Mon, 08 Mar 2021 09:22:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lJC5d-00021E-PC; Mon, 08 Mar 2021 09:22:13 +0000 Received: by outflank-mailman (input) for mailman id 94715; Mon, 08 Mar 2021 09:22:13 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lJC5d-000218-0A for xen-devel@lists.xenproject.org; Mon, 08 Mar 2021 09:22:13 +0000 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 314afd13-a55b-4dde-a39c-d5bbfb0002bc; Mon, 08 Mar 2021 09:22:11 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id D3419AC54; Mon, 8 Mar 2021 09:22:10 +0000 (UTC) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 314afd13-a55b-4dde-a39c-d5bbfb0002bc X-Virus-Scanned: by amavisd-new at test-mx.suse.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1615195330; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MBPEIIF1GkKi/wEzrj3sY/FjwcZUTOVXQqJe8a6sZ7I=; b=POzOGYtBSbb+2Htpn0nR23n/YVEHsg76seL8gd2jcK2CDFy2ieAwfizkEYh7PZaRj7IX+m MVcq46rNI4vIUR80Y8B8OvcUYFaXEDyuW7IjuAT9k/pA3M5uxElm6hk9a4ZGOFkC+/Pf45 oAttEarzg+ed7MgmqXIWwrbNs2A5Iuc= Subject: [PATCH 1/2][4.15?] tools/x86: don't rebuild cpuid-autogen.h every time From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Ian Jackson , Andrew Cooper , Wei Liu , =?utf-8?q?Roger_Pau_Monn=C3=A9?= References: Message-ID: <336aaf51-f163-8ee7-d8ee-297f6f3052fd@suse.com> Date: Mon, 8 Mar 2021 10:22:10 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.7.1 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US The first thing the "xen-dir" rule does is delete the entire xen/ subtree. Obviously this includes deleting xen/lib/x86/*autogen.h. As a result there's no original version for $(move-if-changed ...) to compare against, and hence the file and all its consumers would get rebuilt every time. Introduce a "prep-y" rule to move xen/lib/x86/ on the side, to then recover any *autogen.h from there prior to invoking the respective recursive $(MAKE) invocation. Fixes: eddf9559c977 ("libx86: generate cpuid-autogen.h in the libx86 include dir") Signed-off-by: Jan Beulich --- a/.gitignore +++ b/.gitignore @@ -234,6 +234,7 @@ tools/hotplug/NetBSD/rc.d/xendriverdomain tools/include/acpi tools/include/_libxl*.h +tools/include/.xen*/* tools/include/_xentoolcore_list.h tools/include/xen/* tools/include/xen-xsm/* --- a/tools/include/Makefile +++ b/tools/include/Makefile @@ -10,15 +10,15 @@ include $(XEN_ROOT)/tools/Rules.mk # Relative to $(XEN_ROOT)/xen/xsm/flask FLASK_H_DEPEND := policy/initial_sids -.PHONY: all all-y build xen-dir +.PHONY: all all-y build prep-y xen-dir all build: all-y xen-foreign xen-dir xen-xsm/.dir -all-y: +all-y prep-y: .PHONY: xen-foreign xen-foreign: $(MAKE) -C xen-foreign -xen-dir: +xen-dir: prep-y @rm -rf xen acpi mkdir -p xen/libelf acpi ln -s $(XEN_ROOT)/xen/include/public/COPYING xen/ @@ -36,7 +36,15 @@ ifeq ($(CONFIG_X86),y) ln -s $(XEN_ROOT)/xen/include/xen/lib/x86/Makefile xen/lib/x86/ endif +# Arrange for preserving of auto-generated headers (to avoid them getting +# rebuilt every time): Move the entire xen/lib/x86/ to a temporary place. +prep-$(CONFIG_X86): + rm -rf .xen-lib-x86 + test ! -d xen/lib/x86 || mv xen/lib/x86 .xen-lib-x86 + all-$(CONFIG_X86): xen-dir + $(if $(wildcard .xen-lib-x86/*autogen.h),mv .xen-lib-x86/*autogen.h xen/lib/x86/) + rm -rf .xen-lib-x86 $(MAKE) -C xen/lib/x86 all XEN_ROOT=$(XEN_ROOT) PYTHON=$(PYTHON) # Not xen/xsm as that clashes with link to @@ -78,7 +86,7 @@ uninstall: .PHONY: clean clean: - rm -rf xen xen-xsm acpi + rm -rf xen xen-xsm .xen* acpi $(MAKE) -C xen-foreign clean .PHONY: dist From patchwork Mon Mar 8 09:22:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 12121851 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.2 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1C1D5C433DB for ; Mon, 8 Mar 2021 09:22:50 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A8D0A651EE for ; Mon, 8 Mar 2021 09:22:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A8D0A651EE Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=suse.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.94717.178286 (Exim 4.92) (envelope-from ) id 1lJC64-000272-6A; Mon, 08 Mar 2021 09:22:40 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 94717.178286; Mon, 08 Mar 2021 09:22:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lJC64-00026v-23; Mon, 08 Mar 2021 09:22:40 +0000 Received: by outflank-mailman (input) for mailman id 94717; Mon, 08 Mar 2021 09:22:39 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lJC63-00026T-59 for xen-devel@lists.xenproject.org; Mon, 08 Mar 2021 09:22:39 +0000 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id e2c4c53a-2167-4c79-9e0d-fecd377e3814; Mon, 08 Mar 2021 09:22:36 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id AA7FFAC54; Mon, 8 Mar 2021 09:22:35 +0000 (UTC) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: e2c4c53a-2167-4c79-9e0d-fecd377e3814 X-Virus-Scanned: by amavisd-new at test-mx.suse.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1615195355; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HM/JPFP9UxjelZCsGhQtKcxAk3Q+KDuvq+vWM6E/EQ0=; b=CC3I7zk/NMIE9et4xYaXnvRld+4D6MZJO+gcBp2/V7NgC7R4AD95+Bz5rWgPD0jbArUNWJ /aJmT2EHcGA/56qdo4JtJrU2BVDnetl0T58WsT9kZnrH6cnhJKrEpt8YHSKPJVVP9fGUtf YRv2mAHb8nfptZp65rfsd8v1R4vPR6g= Subject: [PATCH 2/2] tools/x86: move arch-specific include/xen/ population into arch-specific rule From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Ian Jackson , Andrew Cooper , Wei Liu , =?utf-8?q?Roger_Pau_Monn=C3=A9?= References: Message-ID: <0702c375-4769-7246-ba47-613ed69330e1@suse.com> Date: Mon, 8 Mar 2021 10:22:35 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.7.1 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US There's no need for the common "xen-dir" rule to have an arch-specific part when there already is a arch-specific rule where this can be taken care of. Signed-off-by: Jan Beulich --- I was tempted to also uniformly change the pattern from *autogen.h to *-autogen.h right here - thoughts? I was also tempted to move the "xen-dir" dependency from all-$(CONFIG_X86) to the general all-y, but perhaps that's less related and hence should really be a separate change (and there may also be arguments against that). --- a/tools/include/Makefile +++ b/tools/include/Makefile @@ -29,12 +29,6 @@ xen-dir: prep-y ln -s ../xen-foreign xen/foreign ln -s $(XEN_ROOT)/xen/include/acpi/platform acpi/ ln -s $(XEN_ROOT)/xen/include/acpi/ac*.h acpi/ -ifeq ($(CONFIG_X86),y) - ln -s $(XEN_ROOT)/xen/include/asm-x86 xen/asm - mkdir -p xen/lib/x86 - ln -s $(filter-out %autogen.h,$(wildcard $(XEN_ROOT)/xen/include/xen/lib/x86/*.h)) xen/lib/x86/ - ln -s $(XEN_ROOT)/xen/include/xen/lib/x86/Makefile xen/lib/x86/ -endif # Arrange for preserving of auto-generated headers (to avoid them getting # rebuilt every time): Move the entire xen/lib/x86/ to a temporary place. @@ -43,6 +37,10 @@ prep-$(CONFIG_X86): test ! -d xen/lib/x86 || mv xen/lib/x86 .xen-lib-x86 all-$(CONFIG_X86): xen-dir + ln -s $(XEN_ROOT)/xen/include/asm-x86 xen/asm + mkdir -p xen/lib/x86 + ln -s $(filter-out %autogen.h,$(wildcard $(XEN_ROOT)/xen/include/xen/lib/x86/*.h)) xen/lib/x86/ + ln -s $(XEN_ROOT)/xen/include/xen/lib/x86/Makefile xen/lib/x86/ $(if $(wildcard .xen-lib-x86/*autogen.h),mv .xen-lib-x86/*autogen.h xen/lib/x86/) rm -rf .xen-lib-x86 $(MAKE) -C xen/lib/x86 all XEN_ROOT=$(XEN_ROOT) PYTHON=$(PYTHON)