From patchwork Thu Sep 5 22:08:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 13793032 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 65209CE7AA4 for ; Thu, 5 Sep 2024 22:08:33 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.791411.1201254 (Exim 4.92) (envelope-from ) id 1smKeK-0000gf-65; Thu, 05 Sep 2024 22:08:20 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 791411.1201254; Thu, 05 Sep 2024 22:08:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1smKeJ-0000gQ-Uv; Thu, 05 Sep 2024 22:08:19 +0000 Received: by outflank-mailman (input) for mailman id 791411; Thu, 05 Sep 2024 22:08:19 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1smKeJ-0000d4-Ba for xen-devel@lists.xenproject.org; Thu, 05 Sep 2024 22:08:19 +0000 Received: from mail-lj1-x22d.google.com (mail-lj1-x22d.google.com [2a00:1450:4864:20::22d]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 5ab4e46e-6bd3-11ef-99a1-01e77a169b0f; Fri, 06 Sep 2024 00:08:17 +0200 (CEST) Received: by mail-lj1-x22d.google.com with SMTP id 38308e7fff4ca-2f3eabcd293so14937871fa.2 for ; Thu, 05 Sep 2024 15:08:17 -0700 (PDT) Received: from andrewcoop.eng.citrite.net ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a8a6236d020sm187525166b.127.2024.09.05.15.08.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Sep 2024 15:08:15 -0700 (PDT) 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: 5ab4e46e-6bd3-11ef-99a1-01e77a169b0f DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1725574096; x=1726178896; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Y6ymGvYQ1tOTkYL6CVhzUbxQEQbDorO1VPkvnskpwj8=; b=S7kLyRuGtKeOb0Ldu5Ssw7HSPsilll0Urs9bxWw+ywFc+vw2yLcYOmGpmjxlADY8ig 537NYYk+HyS15apO7/dtXVRKlrlj12aUftqoJ6lCOsrZMrHvtzw5LR2y7sPsVayuGY2h 2SKBf4Wtu2KCZvwO8nNpMuWJFZy87sdilvKS0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725574096; x=1726178896; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Y6ymGvYQ1tOTkYL6CVhzUbxQEQbDorO1VPkvnskpwj8=; b=Hcu679KlEJn3jfreZBH/T3FxV8ZlNcV7UfZ+W7REgUldFTFKhH3S+/O0gb5RKIXsaL fAC/ik3kAYCmI2jVqy5O0tLWOA13EUY9QwSR72f77DQC/B8RYYL20u/OYRaNZm/BqM3X C7Szf77nYqa7i0DkDRPdvamUzT0GX0m9hp/HjKZi8lL7o3kgNbKnp6jpXFOeJFCOQr+R +MyVhFHi0DLD2/+qEsJ+vgz5i4dqI9yJFdT/HGLcKah9jVPT6n3wJ43GbDc0kpTbKa2K 2wESaTjXoRnBIc/MUIjWcMTWhuoK0sJet51lYksDX3Db68RM++aV7DeR9Xi3bPYecDlk JMeg== X-Gm-Message-State: AOJu0YyWb2KncPeFSkVWA5vyALK+oid4N0l2qrrpEQJIqMWvDYPNR7uh fdsJU59CGQbwFNvx0yrxV1ba3/5kJ9OL3ko3TmCRCVGUHuga0ZBlGxeSunCvm+0+TUwmGWF4P/4 3 X-Google-Smtp-Source: AGHT+IFcw8pctbt8BaM90sGdB9UwIKjhHJN3ZJ7yUUhXSrdYDg21H+OK+5afl3TNwF7Eo8QS9EOWPA== X-Received: by 2002:a05:6512:3b2a:b0:533:d3e:16f5 with SMTP id 2adb3069b0e04-536587fc619mr166203e87.38.1725574095937; Thu, 05 Sep 2024 15:08:15 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Jan Beulich , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Stefano Stabellini , Julien Grall , Volodymyr Babchuk , Bertrand Marquis , Michal Orzel Subject: [PATCH 1/5] x86/build: Rework includes in genapic/probe.c Date: Thu, 5 Sep 2024 23:08:02 +0100 Message-Id: <20240905220806.141300-2-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240905220806.141300-1-andrew.cooper3@citrix.com> References: <20240905220806.141300-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 probe.c includes a large number of headers which are unused, and not from churn so far as I can see in history. Strip back to a reasonable set. One complication is that genapic.h has to include xen/cpumask.h because there's no way to forward declare a cpumask_t. Also strip trailing whitespace while adjusting the file. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- CC: Jan Beulich CC: Roger Pau Monné CC: Stefano Stabellini CC: Julien Grall CC: Volodymyr Babchuk CC: Bertrand Marquis CC: Michal Orzel --- xen/arch/x86/genapic/probe.c | 34 ++++++++++++++---------------- xen/arch/x86/include/asm/genapic.h | 2 ++ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/xen/arch/x86/genapic/probe.c b/xen/arch/x86/genapic/probe.c index 10ceeae4d247..946c3d3ce364 100644 --- a/xen/arch/x86/genapic/probe.c +++ b/xen/arch/x86/genapic/probe.c @@ -1,25 +1,23 @@ -/* Copyright 2003 Andi Kleen, SuSE Labs. - * Subject to the GNU Public License, v.2 - * +/* Copyright 2003 Andi Kleen, SuSE Labs. + * Subject to the GNU Public License, v.2 + * * Generic x86 APIC driver probe layer. - */ -#include -#include -#include -#include + */ +#include +#include #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include + +#include +#include struct genapic __ro_after_init genapic; static const struct genapic *const __initconstrel apic_probe[] = { - &apic_bigsmp, + &apic_bigsmp, &apic_default, /* must be last */ NULL, }; @@ -57,8 +55,8 @@ static int __init cf_check genapic_apic_force(const char *str) } custom_param("apic", genapic_apic_force); -void __init generic_apic_probe(void) -{ +void __init generic_apic_probe(void) +{ int i; record_boot_APIC_mode(); @@ -75,4 +73,4 @@ void __init generic_apic_probe(void) BUG_ON(!genapic.name); printk(KERN_INFO "Using APIC driver %s\n", genapic.name); -} +} diff --git a/xen/arch/x86/include/asm/genapic.h b/xen/arch/x86/include/asm/genapic.h index 970df8ffe0a4..a694371c6d16 100644 --- a/xen/arch/x86/include/asm/genapic.h +++ b/xen/arch/x86/include/asm/genapic.h @@ -1,6 +1,8 @@ #ifndef _ASM_GENAPIC_H #define _ASM_GENAPIC_H 1 +#include + /* * Generic APIC driver interface. * From patchwork Thu Sep 5 22:08:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 13793029 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 6383DCE7AA0 for ; Thu, 5 Sep 2024 22:08:32 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.791413.1201271 (Exim 4.92) (envelope-from ) id 1smKeL-00018Q-Gm; Thu, 05 Sep 2024 22:08:21 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 791413.1201271; Thu, 05 Sep 2024 22:08:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1smKeL-00017R-DT; Thu, 05 Sep 2024 22:08:21 +0000 Received: by outflank-mailman (input) for mailman id 791413; Thu, 05 Sep 2024 22:08:20 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1smKeK-0000d4-Bb for xen-devel@lists.xenproject.org; Thu, 05 Sep 2024 22:08:20 +0000 Received: from mail-lf1-x12d.google.com (mail-lf1-x12d.google.com [2a00:1450:4864:20::12d]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 5b4cc098-6bd3-11ef-99a1-01e77a169b0f; Fri, 06 Sep 2024 00:08:18 +0200 (CEST) Received: by mail-lf1-x12d.google.com with SMTP id 2adb3069b0e04-5356aa9a0afso2295014e87.2 for ; Thu, 05 Sep 2024 15:08:18 -0700 (PDT) Received: from andrewcoop.eng.citrite.net ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a8a6236d020sm187525166b.127.2024.09.05.15.08.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Sep 2024 15:08:16 -0700 (PDT) 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: 5b4cc098-6bd3-11ef-99a1-01e77a169b0f DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1725574098; x=1726178898; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nATHuqwrSOYw1vLuBUTAd5OQXfMll/9QK99fmcLPJNA=; b=lsX2dNvrsrKnrM/Tmip1JgDLzD9WxBi/XqnbDx7pwr7cEZ9HsLbnxhDSPaJdBnzsLf h0C0abTPUQZpndsDvNhelL/Sx0rncE/4tWZlbh2thzjw47VJJSBnPMAxOyHKOqM/38dY 2+DZ5GMErCHQodm81NJYUweUt7elzoqWyO6bk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725574098; x=1726178898; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nATHuqwrSOYw1vLuBUTAd5OQXfMll/9QK99fmcLPJNA=; b=G7h2affOJjqOm1Vu9gR5RU5pcYq7Yb4u++ZbfwpDLgdGJNT5TlsehFovcKPbElZKao A7jvfFvZKEMd7rNJaHZVz+cenByt11WB83DXwpQEix3KUJrfYeHxXWRN/0A8B8yhbwBL Y3qddl9Dox2XJKHVr2lsBXXynVm9iCClCMgLNO9AZFEXz3Mq4CBGB/1ojPcijDkarMGj YRA6vwcnG1SucP+48NEW7gIIdDf2+dK3v5LZGfFiRqHPR5J39OLswVpj8kdk0uie5Nvg HYXFDp/ar6MUmsVUhSnFaDjVgd3BPdIIVzLWJZCTA4hfRD/6c/uYbCyufFpwqlA/p2SW ab+w== X-Gm-Message-State: AOJu0Yx7NKbWms5LzqIf1IKk/MehtpRGDeJpiyhnxwKVo60kuSyOlpSi 4KcreynVs6oyF/AXn6B1+ymurirmR35P+RbXqcLbYAHob9yrrtr3s/YCzwrvbbv5v7Mh1k2UXuy p X-Google-Smtp-Source: AGHT+IFnfWNe/Vn5XlLsBfNZy4sLg4dUFfxNInf0Ty0gLt3Dwei01aCguBoPhfCvv5xzwGwSwfM6Xw== X-Received: by 2002:a05:6512:b1e:b0:529:b718:8d00 with SMTP id 2adb3069b0e04-536587a68c7mr361172e87.8.1725574097013; Thu, 05 Sep 2024 15:08:17 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Jan Beulich , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Stefano Stabellini , Julien Grall , Volodymyr Babchuk , Bertrand Marquis , Michal Orzel Subject: [PATCH 2/5] xen/build: Drop unused includes of xen/cache.h Date: Thu, 5 Sep 2024 23:08:03 +0100 Message-Id: <20240905220806.141300-3-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240905220806.141300-1-andrew.cooper3@citrix.com> References: <20240905220806.141300-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 None of these are used, not even transitively. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- CC: Jan Beulich CC: Roger Pau Monné CC: Stefano Stabellini CC: Julien Grall CC: Volodymyr Babchuk CC: Bertrand Marquis CC: Michal Orzel --- xen/arch/x86/bzimage.c | 1 - xen/arch/x86/dmi_scan.c | 1 - xen/arch/x86/include/asm/processor.h | 1 - xen/common/decompress.h | 1 - xen/include/acpi/platform/aclinux.h | 1 - xen/include/xen/rcupdate.h | 1 - 6 files changed, 6 deletions(-) diff --git a/xen/arch/x86/bzimage.c b/xen/arch/x86/bzimage.c index ac4fd428be0e..66f648f311e4 100644 --- a/xen/arch/x86/bzimage.c +++ b/xen/arch/x86/bzimage.c @@ -1,4 +1,3 @@ -#include #include #include #include diff --git a/xen/arch/x86/dmi_scan.c b/xen/arch/x86/dmi_scan.c index 81f80c053a7a..811bf355fba6 100644 --- a/xen/arch/x86/dmi_scan.c +++ b/xen/arch/x86/dmi_scan.c @@ -3,7 +3,6 @@ #include #include #include -#include #include #include #include diff --git a/xen/arch/x86/include/asm/processor.h b/xen/arch/x86/include/asm/processor.h index e71dbb8d3fbf..26e2fb13699a 100644 --- a/xen/arch/x86/include/asm/processor.h +++ b/xen/arch/x86/include/asm/processor.h @@ -5,7 +5,6 @@ #define __ASM_X86_PROCESSOR_H #ifndef __ASSEMBLY__ -#include #include #include #include diff --git a/xen/common/decompress.h b/xen/common/decompress.h index e8195b353a15..4683eb6c7ea1 100644 --- a/xen/common/decompress.h +++ b/xen/common/decompress.h @@ -1,6 +1,5 @@ #ifdef __XEN__ -#include #include #include #include diff --git a/xen/include/acpi/platform/aclinux.h b/xen/include/acpi/platform/aclinux.h index f5e0a6108e0b..a66c2e6d1d8f 100644 --- a/xen/include/acpi/platform/aclinux.h +++ b/xen/include/acpi/platform/aclinux.h @@ -47,7 +47,6 @@ #define ACPI_USE_SYSTEM_CLIBRARY #define ACPI_USE_DO_WHILE_0 -#include #include #include #include diff --git a/xen/include/xen/rcupdate.h b/xen/include/xen/rcupdate.h index 6f2587058edb..95f4ad81c4a8 100644 --- a/xen/include/xen/rcupdate.h +++ b/xen/include/xen/rcupdate.h @@ -31,7 +31,6 @@ #ifndef __XEN_RCUPDATE_H #define __XEN_RCUPDATE_H -#include #include #include #include From patchwork Thu Sep 5 22:08:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 13793028 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 35C91CE7A9F for ; Thu, 5 Sep 2024 22:08:32 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.791412.1201267 (Exim 4.92) (envelope-from ) id 1smKeL-000163-AG; Thu, 05 Sep 2024 22:08:21 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 791412.1201267; Thu, 05 Sep 2024 22:08:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1smKeL-00015w-70; Thu, 05 Sep 2024 22:08:21 +0000 Received: by outflank-mailman (input) for mailman id 791412; Thu, 05 Sep 2024 22:08:20 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1smKeK-0000fY-7d for xen-devel@lists.xenproject.org; Thu, 05 Sep 2024 22:08:20 +0000 Received: from mail-ej1-x62c.google.com (mail-ej1-x62c.google.com [2a00:1450:4864:20::62c]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 5bb43f38-6bd3-11ef-a0b3-8be0dac302b0; Fri, 06 Sep 2024 00:08:19 +0200 (CEST) Received: by mail-ej1-x62c.google.com with SMTP id a640c23a62f3a-a7a9cf7d3f3so183368466b.1 for ; Thu, 05 Sep 2024 15:08:19 -0700 (PDT) Received: from andrewcoop.eng.citrite.net ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a8a6236d020sm187525166b.127.2024.09.05.15.08.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Sep 2024 15:08:17 -0700 (PDT) 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: 5bb43f38-6bd3-11ef-a0b3-8be0dac302b0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1725574098; x=1726178898; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Q+OQc0atbyoTq9OoM9RHvS+NplIzx6wUPK2piuypKDw=; b=ZD8NigYG6MHT+P+lXgbSK/rHZYp6pTMYY5nZIMli3O43Gk6n+q/J3kUrHIdAV7wr+j E2QIQX29CvoFRiF+wJUPi4CDPKnxI95d0OeTqFFXofo2o/Nzm+Lf+SZWuatbCG0xRiNb wncaXdL3E7clRiGCTaBomZDdT6PxxFFDqCaR4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725574098; x=1726178898; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Q+OQc0atbyoTq9OoM9RHvS+NplIzx6wUPK2piuypKDw=; b=Ai8lAi7C1EE6X3W2Cz03bGSAnyhV5OC4Pxw7ACY+VDweOaejeeMHqK0ULzWUMjJW7a r0JBW7D4bsUt9Z5FahOuTLYvETBpJTO091DtBDI5q7rjyOTipRMPAux41Vdll9h4l6Sr usgynQNCFbEVzHOLpRLKQAbu+NuPVvsDxFaIsmd4wsnG5k3+c/OOrJGfoAQn0lESdMaX 1MIWiMVKvchwKVU5ua4LkQYXyUfapHSWmGeCLs8UY5ca+KQFg/QgG5RkwPZUN8s61mJN qjixjC/0oFQB1EV3xPE97sQM2VzSCMhIWc3w3lxDCjYAtnhTa30+VrfBvcLn/Sy9/f4p 6Phw== X-Gm-Message-State: AOJu0YxLmlhG+T6dP00uhnSGrVSvv7FVHrkUuLr6Nxn/1KAmWHScQA3w 4A/gZbhMJnFcjT/DZCm9jM1kxQsyUK7bpDhekx5n/1EYiZ1Doi06WLggQsQj8Uy92sHcSz9KV5b d X-Google-Smtp-Source: AGHT+IGgPq6dEZPy5CtqDYGLKFSqBkWkIUQfcNpz5A+6oQVKXCctHQSJ3uEBp72hMqvPxEToDH/42w== X-Received: by 2002:a17:907:1c1b:b0:a7a:af5d:f312 with SMTP id a640c23a62f3a-a8a887e60c8mr32081466b.46.1725574098288; Thu, 05 Sep 2024 15:08:18 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Jan Beulich , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Stefano Stabellini , Julien Grall , Volodymyr Babchuk , Bertrand Marquis , Michal Orzel Subject: [PATCH 3/5] x86/build: Swap cache.h includes for xen/sections.h Date: Thu, 5 Sep 2024 23:08:04 +0100 Message-Id: <20240905220806.141300-4-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240905220806.141300-1-andrew.cooper3@citrix.com> References: <20240905220806.141300-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 These include {xen/asm}/cache.h but only want xen/sections.h. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- CC: Jan Beulich CC: Roger Pau Monné CC: Stefano Stabellini CC: Julien Grall CC: Volodymyr Babchuk CC: Bertrand Marquis CC: Michal Orzel --- xen/arch/x86/acpi/cpu_idle.c | 3 ++- xen/arch/x86/cpu-policy.c | 2 +- xen/arch/x86/guest/hypervisor.c | 2 +- xen/common/efi/runtime.c | 3 ++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index f175e4d7d370..876317fad059 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -40,7 +40,8 @@ #include #include #include -#include +#include + #include #include #include diff --git a/xen/arch/x86/cpu-policy.c b/xen/arch/x86/cpu-policy.c index 888e7ac4d4dc..2524c1c7a60d 100644 --- a/xen/arch/x86/cpu-policy.c +++ b/xen/arch/x86/cpu-policy.c @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ -#include #include #include #include +#include #include diff --git a/xen/arch/x86/guest/hypervisor.c b/xen/arch/x86/guest/hypervisor.c index ac80e8324599..7afc5038b4e4 100644 --- a/xen/arch/x86/guest/hypervisor.c +++ b/xen/arch/x86/guest/hypervisor.c @@ -8,9 +8,9 @@ */ #include #include +#include #include -#include #include static struct hypervisor_ops __ro_after_init ops; diff --git a/xen/common/efi/runtime.c b/xen/common/efi/runtime.c index d952c3ba785e..d03e5c90ce9f 100644 --- a/xen/common/efi/runtime.c +++ b/xen/common/efi/runtime.c @@ -1,9 +1,10 @@ #include "efi.h" #include "runtime.h" -#include + #include #include #include +#include #include DEFINE_XEN_GUEST_HANDLE(CHAR16); From patchwork Thu Sep 5 22:08:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 13793033 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id E1CDECE7AA2 for ; Thu, 5 Sep 2024 22:08:32 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.791415.1201297 (Exim 4.92) (envelope-from ) id 1smKeO-0001rc-7n; Thu, 05 Sep 2024 22:08:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 791415.1201297; Thu, 05 Sep 2024 22:08:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1smKeO-0001rI-3h; Thu, 05 Sep 2024 22:08:24 +0000 Received: by outflank-mailman (input) for mailman id 791415; Thu, 05 Sep 2024 22:08:23 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1smKeM-0000d4-Si for xen-devel@lists.xenproject.org; Thu, 05 Sep 2024 22:08:22 +0000 Received: from mail-ej1-x635.google.com (mail-ej1-x635.google.com [2a00:1450:4864:20::635]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 5cd8793f-6bd3-11ef-99a1-01e77a169b0f; Fri, 06 Sep 2024 00:08:21 +0200 (CEST) Received: by mail-ej1-x635.google.com with SMTP id a640c23a62f3a-a86910caf9cso444595666b.1 for ; Thu, 05 Sep 2024 15:08:21 -0700 (PDT) Received: from andrewcoop.eng.citrite.net ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a8a6236d020sm187525166b.127.2024.09.05.15.08.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Sep 2024 15:08:18 -0700 (PDT) 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: 5cd8793f-6bd3-11ef-99a1-01e77a169b0f DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1725574100; x=1726178900; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Z07Rt8xWRkaIJIJwoIRUcGqCQ60a5xLz+kCbQYTjXpk=; b=QjOvMi/MapPD9rSa3kSa3WKlqhWgsxR3urb426eviUioQt4bH8GFlaIVqH+UCsXbwQ ZSIup7yxLQOKZHC52USXhuZbPhE5MvoX/E3ykNzCu/WMj492nmOx3T3cljQXxJVTstwD wsh/LfH+bcXGFDLESMlmkkEqB3hj/I8dGNV20= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725574100; x=1726178900; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Z07Rt8xWRkaIJIJwoIRUcGqCQ60a5xLz+kCbQYTjXpk=; b=W7MA7m/3lcdrquYInxQRxWMlFMDMzP5pVz/pxC7eiTqD35q0J6IbSx6LushMN16HiN aroT60euvy4ffq390fZY3U5k9UFATi4aIRfjQQ2U2TrDzM87KWHgNuNrnZ0LxHrlgiMb Ulf9iQGvXpjqKmZt3dMCRnff2MrlHFjrHwrUQ2Ijl2K0W9z/cwsFZYdPBPeUJyjxVyKx sEWXl6os8vDP1/3SWtR+/Au5vi3OPccYkOn/9NkTem/aoEQybGmaqujObGAvq65qHzrK dNVV7WhWq1km7zjOB1QA3ofGbepVbvmNsfoA/fMpnCMEAjFvT+x5U5KgH3oq95yCYJ1o NrpQ== X-Gm-Message-State: AOJu0YxNhrfDfjQ5w/XqRxCULfR1e58ilmY0pFehRqqp+VxoEM2MoWvF RTxIOHTJFloCNjmHHtszFnGd3x8uPHGC1TA9r+YZXDkAjgU//77PyAfytszLo9sSabikMhbIHFU 9 X-Google-Smtp-Source: AGHT+IH6MdX3GEZWCMtR7PcKtqVSBubYjR64pQJl/gJmLkC0I/kvdKtRQpDLIR5qfacWmOWx6ArYNw== X-Received: by 2002:a17:907:987:b0:a77:ca3b:996c with SMTP id a640c23a62f3a-a8a8604476emr74497766b.16.1725574099903; Thu, 05 Sep 2024 15:08:19 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Jan Beulich , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Stefano Stabellini , Julien Grall , Volodymyr Babchuk , Bertrand Marquis , Michal Orzel Subject: [PATCH 4/5] x86/cache: Drop legacy __read_mostly/__ro_after_init definitions Date: Thu, 5 Sep 2024 23:08:05 +0100 Message-Id: <20240905220806.141300-5-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240905220806.141300-1-andrew.cooper3@citrix.com> References: <20240905220806.141300-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Lots of files were picking these up transitively, including lib.h However, lib.h needs __read_mostly for printk_once() and this has the side effect of kicking the transitive can down the road. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- CC: Jan Beulich CC: Roger Pau Monné CC: Stefano Stabellini CC: Julien Grall CC: Volodymyr Babchuk CC: Bertrand Marquis CC: Michal Orzel --- xen/arch/x86/include/asm/cache.h | 3 --- xen/include/xen/cache.h | 2 +- xen/include/xen/lib.h | 1 + 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/include/asm/cache.h b/xen/arch/x86/include/asm/cache.h index 956c05493e23..f15d10dc7f2d 100644 --- a/xen/arch/x86/include/asm/cache.h +++ b/xen/arch/x86/include/asm/cache.h @@ -9,9 +9,6 @@ #define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT) #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) -/* TODO: Phase out the use of this via cache.h */ -#define __read_mostly __section(".data.read_mostly") - #ifndef __ASSEMBLY__ void cache_flush(const void *addr, unsigned int size); diff --git a/xen/include/xen/cache.h b/xen/include/xen/cache.h index a19942fd63ef..90816ba05b1a 100644 --- a/xen/include/xen/cache.h +++ b/xen/include/xen/cache.h @@ -15,7 +15,7 @@ #define __cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES))) #endif -#if defined(CONFIG_ARM) || defined(CONFIG_X86) +#if defined(CONFIG_ARM) /* TODO: Phase out the use of this via cache.h */ #define __ro_after_init __section(".data.ro_after_init") #endif diff --git a/xen/include/xen/lib.h b/xen/include/xen/lib.h index e884a02ee8ce..81b722ea3e80 100644 --- a/xen/include/xen/lib.h +++ b/xen/include/xen/lib.h @@ -10,6 +10,7 @@ #include #include #include +#include #define __ACCESS_ONCE(x) ({ \ (void)(typeof(x))0; /* Scalar typecheck. */ \ From patchwork Thu Sep 5 22:08:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 13793031 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 45CB1CE7AA3 for ; Thu, 5 Sep 2024 22:08:33 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.791414.1201286 (Exim 4.92) (envelope-from ) id 1smKeM-0001aa-VB; Thu, 05 Sep 2024 22:08:22 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 791414.1201286; Thu, 05 Sep 2024 22:08:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1smKeM-0001aJ-R1; Thu, 05 Sep 2024 22:08:22 +0000 Received: by outflank-mailman (input) for mailman id 791414; Thu, 05 Sep 2024 22:08:22 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1smKeM-0000fY-Bx for xen-devel@lists.xenproject.org; Thu, 05 Sep 2024 22:08:22 +0000 Received: from mail-lf1-x12d.google.com (mail-lf1-x12d.google.com [2a00:1450:4864:20::12d]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 5d3cf61d-6bd3-11ef-a0b3-8be0dac302b0; Fri, 06 Sep 2024 00:08:21 +0200 (CEST) Received: by mail-lf1-x12d.google.com with SMTP id 2adb3069b0e04-53567b4c3f4so1274621e87.2 for ; Thu, 05 Sep 2024 15:08:21 -0700 (PDT) Received: from andrewcoop.eng.citrite.net ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a8a6236d020sm187525166b.127.2024.09.05.15.08.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Sep 2024 15:08:20 -0700 (PDT) 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: 5d3cf61d-6bd3-11ef-a0b3-8be0dac302b0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1725574101; x=1726178901; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Nb88Eml8FYOcYrY0RBCFSiM4UYtlmEjFIcTet7qdkb8=; b=BZIQsIbHcG4Tmn5qJEa+8Zaavj/cKkYuV/WyiUkNE5Wur6qnJUIhMoKMGWGV9ZA4k4 JEF2Kqv6nVjQBWoJNYTqcKBf9fW/7SXvTdrMaz77Wumr+61U+Vj6ZEed64hPmQMKD+gq cyO/PwVYFGidGr+AYkcPbZN2tCTVeBymzse1s= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725574101; x=1726178901; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Nb88Eml8FYOcYrY0RBCFSiM4UYtlmEjFIcTet7qdkb8=; b=ujH22gXVjqwT0tkYhNMPauTbxkimRLHhxJSyz96lSoKfnIqgQSbsYt7N59wKOp8bTS 168wAfiedCxZXXKKg5CS6s4egIKcGY0CbncENJLKSKxJIZ0wscXXHwZYVaYiMHh+ZwFl wnx/L8QoukhZzMSYSkatSZGmRr54R/mDhsAz0mM5mVUINbQBqSTxemYriMngmFnHdHfq u9RS+hhNtAJV9FF5kd49dMxDADl+sUAufYemeqpzlUa+bEZHu4AQMd+rRaLL2G070ont B83fVpDiNPo1JCRKv1xgI3TY/5u+NePqiY+OpW1YS0eY+0X2sBFCohog2uFeJycpFJX4 w0lQ== X-Gm-Message-State: AOJu0YyfMzmA7ppKK27nGgnAIZ97inpBiBSqz+mJ0CEM6urBaUWQsoaF nSaqDhcu73+PigBzrncsR+1XQAOb5kMAFipziRecCD0cNUl7brOOChwELVCx4D/TuNXRCsr4MSR 7 X-Google-Smtp-Source: AGHT+IGH0DzygvP+ko/2gw+1dA47ljd9t+93lNvE9Fd2xk1S6ixY4v5WShoeduSeAZWQZvE+Cc7YJg== X-Received: by 2002:a05:6512:39c8:b0:535:6a83:86f9 with SMTP id 2adb3069b0e04-53658813810mr145730e87.60.1725574100672; Thu, 05 Sep 2024 15:08:20 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Jan Beulich , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Stefano Stabellini , Julien Grall , Volodymyr Babchuk , Bertrand Marquis , Michal Orzel Subject: [PATCH 5/5] ARM/cache: Drop legacy __read_mostly/__ro_after_init definitions Date: Thu, 5 Sep 2024 23:08:06 +0100 Message-Id: <20240905220806.141300-6-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240905220806.141300-1-andrew.cooper3@citrix.com> References: <20240905220806.141300-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 These are no longer needed. Signed-off-by: Andrew Cooper Acked-by: Julien Grall --- CC: Jan Beulich CC: Roger Pau Monné CC: Stefano Stabellini CC: Julien Grall CC: Volodymyr Babchuk CC: Bertrand Marquis CC: Michal Orzel --- xen/arch/arm/include/asm/cache.h | 3 --- xen/include/xen/cache.h | 5 ----- 2 files changed, 8 deletions(-) diff --git a/xen/arch/arm/include/asm/cache.h b/xen/arch/arm/include/asm/cache.h index 029b2896fb3e..b75c970b6806 100644 --- a/xen/arch/arm/include/asm/cache.h +++ b/xen/arch/arm/include/asm/cache.h @@ -6,9 +6,6 @@ #define L1_CACHE_SHIFT (CONFIG_ARM_L1_CACHE_SHIFT) #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) -/* TODO: Phase out the use of this via cache.h */ -#define __read_mostly __section(".data.read_mostly") - #endif /* * Local variables: diff --git a/xen/include/xen/cache.h b/xen/include/xen/cache.h index 90816ba05b1a..6ee174efa439 100644 --- a/xen/include/xen/cache.h +++ b/xen/include/xen/cache.h @@ -15,9 +15,4 @@ #define __cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES))) #endif -#if defined(CONFIG_ARM) -/* TODO: Phase out the use of this via cache.h */ -#define __ro_after_init __section(".data.ro_after_init") -#endif - #endif /* __LINUX_CACHE_H */