From mboxrd@z Thu Jan 1 00:00:00 1970 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 1C336C2BD05 for ; Fri, 21 Jun 2024 20:19:57 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.745530.1152681 (Exim 4.92) (envelope-from ) id 1sKkjW-0007HB-Et; Fri, 21 Jun 2024 20:19:42 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 745530.1152681; Fri, 21 Jun 2024 20:19:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sKkjW-0007H4-C7; Fri, 21 Jun 2024 20:19:42 +0000 Received: by outflank-mailman (input) for mailman id 745530; Fri, 21 Jun 2024 20:19:40 +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 1sKkjU-0006yu-Qz for xen-devel@lists.xenproject.org; Fri, 21 Jun 2024 20:19:40 +0000 Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [2a00:1450:4864:20::634]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 95c6e334-300b-11ef-b4bb-af5377834399; Fri, 21 Jun 2024 22:19:39 +0200 (CEST) Received: by mail-ej1-x634.google.com with SMTP id a640c23a62f3a-a63359aaaa6so345706866b.2 for ; Fri, 21 Jun 2024 13:19:38 -0700 (PDT) Received: from andrewcoop.eng.citrite.net ([160.101.139.1]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a6fcf48b3a6sm116947466b.87.2024.06.21.13.19.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jun 2024 13:19:36 -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: 95c6e334-300b-11ef-b4bb-af5377834399 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1719001177; x=1719605977; 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=wDT9rwgL0Bk0ve6LGO8WCMJ5rW7pfBPKsUYdXcImh4o=; b=osXFIGds3WPQ4CBpEagIPWBEEOtZzlzzs1P1MyahsllV/usyCw89LK9JEKfarPWy6+ JXO0Amp52hc0KjL/f+S4C1rcBnEk5KYVUsKIlUZvw1yiFfcbv5PFfhDnXOS8XnoMrZpz SGS0lxoFsgGobphbdOZd7kveMASEMq5hV+Ayo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719001177; x=1719605977; 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=wDT9rwgL0Bk0ve6LGO8WCMJ5rW7pfBPKsUYdXcImh4o=; b=dRMPS2nokeihDF7/FCq7g67tWN5hsu0Ixmu14Uoylx6sr8d8IkeYaY7hujmDSgZGq6 6CeCN0NhmgzJkCjNEzO9B4+7l8pS4gSsgm3z4ver3KVLqS0ssZgWmpA/NBpvJ4xYw2r5 8M+VF+neauHi4bOke+5+H0PAbLdBW+MZARAgC+yVQSkqlTzHhg5Lor5G/XqHjSSBzbor E74utA/xff9rKh2a1xCXl72w9b64RGY58PgQ93TaEA3vB5FIBbUjL1Rq/aQy9cIndFB0 teQSyAyhHefvSekmKh5mLSesE6n8ie2+B2EqmtAoQnZzVIrVNnV2RBQFKVkPRXfAYVOy AT4w== X-Gm-Message-State: AOJu0YwvDELflXoFV2eVcWOogN/vuP+KzpEWqHs2DqF0PsuAqsP2vfH+ Gxk5LF6QWCR6IvN/0hGxUPbh7SHJlmZBY2aRKRXZRjmdWZ1fLZ0IB2qNxU96sisL/U0GZ6r2uwe j6zI= X-Google-Smtp-Source: AGHT+IGpU1hLDKtxt0s0NY1c8UQ3fpd/SJaLRV0yiCzxO3HBX5V60JLK+HU+eSl5pXo+FIj8+o1uDw== X-Received: by 2002:a17:906:ce34:b0:a6e:f7b5:3189 with SMTP id a640c23a62f3a-a6fab7d7d0dmr538523066b.76.1719001177453; Fri, 21 Jun 2024 13:19:37 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Shawn Anastasio , Oleksii Kurochko , George Dunlap , Jan Beulich , Stefano Stabellini , Julien Grall Subject: [PATCH 3/3] xen/ppc: Avoid using the legacy __read_mostly/__ro_after_init definitions Date: Fri, 21 Jun 2024 21:19:28 +0100 Message-Id: <20240621201928.319293-4-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240621201928.319293-1-andrew.cooper3@citrix.com> References: <20240621201928.319293-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit RISC-V wants to introduce a full build of Xen without using the legacy definitions. PPC64 has the most minimal full build of Xen right now, so make it compile without the legacy definitions. Mostly this is just including xen/sections.h in a variety of common files. In a couple of cases, we can drop an inclusion of {xen,asm}/cache.h, but almost all files get the definitions transitively. No functional change. Signed-off-by: Andrew Cooper --- CC: Shawn Anastasio CC: Oleksii Kurochko CC: George Dunlap CC: Jan Beulich CC: Stefano Stabellini CC: Julien Grall https://gitlab.com/xen-project/people/andyhhp/xen/-/pipelines/1342714126 --- xen/arch/ppc/include/asm/cache.h | 3 --- xen/arch/ppc/mm-radix.c | 1 + xen/arch/ppc/stubs.c | 1 + xen/common/argo.c | 1 + xen/common/cpu.c | 1 + xen/common/debugtrace.c | 1 + xen/common/domain.c | 1 + xen/common/event_channel.c | 2 ++ xen/common/keyhandler.c | 1 + xen/common/memory.c | 1 + xen/common/page_alloc.c | 1 + xen/common/pdx.c | 1 + xen/common/radix-tree.c | 1 + xen/common/random.c | 2 +- xen/common/rcupdate.c | 1 + xen/common/sched/core.c | 1 + xen/common/sched/cpupool.c | 1 + xen/common/sched/credit.c | 1 + xen/common/sched/credit2.c | 1 + xen/common/shutdown.c | 1 + xen/common/spinlock.c | 1 + xen/common/timer.c | 1 + xen/common/version.c | 3 +-- xen/common/virtual_region.c | 1 + xen/common/vmap.c | 2 +- xen/drivers/char/console.c | 1 + xen/drivers/char/ns16550.c | 1 + xen/drivers/char/serial.c | 2 +- xen/include/xen/cache.h | 2 +- xen/include/xen/hypfs.h | 1 + 30 files changed, 30 insertions(+), 9 deletions(-) diff --git a/xen/arch/ppc/include/asm/cache.h b/xen/arch/ppc/include/asm/cache.h index 13c0bf3242c8..8a0a6b7b1756 100644 --- a/xen/arch/ppc/include/asm/cache.h +++ b/xen/arch/ppc/include/asm/cache.h @@ -3,7 +3,4 @@ #ifndef _ASM_PPC_CACHE_H #define _ASM_PPC_CACHE_H -/* TODO: Phase out the use of this via cache.h */ -#define __read_mostly __section(".data.read_mostly") - #endif /* _ASM_PPC_CACHE_H */ diff --git a/xen/arch/ppc/mm-radix.c b/xen/arch/ppc/mm-radix.c index ab5a10695c5f..0a47959e64f2 100644 --- a/xen/arch/ppc/mm-radix.c +++ b/xen/arch/ppc/mm-radix.c @@ -2,6 +2,7 @@ #include #include #include +#include #include #include diff --git a/xen/arch/ppc/stubs.c b/xen/arch/ppc/stubs.c index a10691165b1b..0e7a26dadbc1 100644 --- a/xen/arch/ppc/stubs.c +++ b/xen/arch/ppc/stubs.c @@ -3,6 +3,7 @@ #include #include #include +#include #include #include #include diff --git a/xen/common/argo.c b/xen/common/argo.c index 901f41eb2dbe..df19006744a3 100644 --- a/xen/common/argo.c +++ b/xen/common/argo.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include diff --git a/xen/common/cpu.c b/xen/common/cpu.c index 6e35b114c080..f09af0444b6a 100644 --- a/xen/common/cpu.c +++ b/xen/common/cpu.c @@ -3,6 +3,7 @@ #include #include #include +#include #include #include diff --git a/xen/common/debugtrace.c b/xen/common/debugtrace.c index a272e5e43761..ca883ad9198d 100644 --- a/xen/common/debugtrace.c +++ b/xen/common/debugtrace.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include diff --git a/xen/common/domain.c b/xen/common/domain.c index 67cadb7c3f4f..3db0e0b793f9 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index a67feff98976..822b2c982489 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -26,6 +26,8 @@ #include #include #include +#include + #include #include diff --git a/xen/common/keyhandler.c b/xen/common/keyhandler.c index 127ca506965c..674e7be39e9d 100644 --- a/xen/common/keyhandler.c +++ b/xen/common/keyhandler.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include diff --git a/xen/common/memory.c b/xen/common/memory.c index de2cc7ad92a5..a6f2f6d1b348 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 054b7edb3989..33c8c917d984 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -134,6 +134,7 @@ #include #include #include +#include #include #include diff --git a/xen/common/pdx.c b/xen/common/pdx.c index d3d63b075032..b8384e6189df 100644 --- a/xen/common/pdx.c +++ b/xen/common/pdx.c @@ -19,6 +19,7 @@ #include #include #include +#include /** * Maximum (non-inclusive) usable pdx. Must be diff --git a/xen/common/radix-tree.c b/xen/common/radix-tree.c index adc3034222dc..fb283a9d52fc 100644 --- a/xen/common/radix-tree.c +++ b/xen/common/radix-tree.c @@ -21,6 +21,7 @@ #include #include #include +#include struct radix_tree_path { struct radix_tree_node *node; diff --git a/xen/common/random.c b/xen/common/random.c index a29f2fcb991a..35a9f387fd5c 100644 --- a/xen/common/random.c +++ b/xen/common/random.c @@ -1,6 +1,6 @@ -#include #include #include +#include #include #include #include diff --git a/xen/common/rcupdate.c b/xen/common/rcupdate.c index 212a99acd8c8..fd5d3d7484a5 100644 --- a/xen/common/rcupdate.c +++ b/xen/common/rcupdate.c @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include diff --git a/xen/common/sched/core.c b/xen/common/sched/core.c index d84b65f197b3..1a3ff5ae4dec 100644 --- a/xen/common/sched/core.c +++ b/xen/common/sched/core.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include diff --git a/xen/common/sched/cpupool.c b/xen/common/sched/cpupool.c index ad8f60846273..57dfee26f21f 100644 --- a/xen/common/sched/cpupool.c +++ b/xen/common/sched/cpupool.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include "private.h" diff --git a/xen/common/sched/credit.c b/xen/common/sched/credit.c index 020f44595ed0..a6bb321e7da1 100644 --- a/xen/common/sched/credit.c +++ b/xen/common/sched/credit.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include diff --git a/xen/common/sched/credit2.c b/xen/common/sched/credit2.c index 685929c2902b..a7da60f40376 100644 --- a/xen/common/sched/credit2.c +++ b/xen/common/sched/credit2.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include diff --git a/xen/common/shutdown.c b/xen/common/shutdown.c index 5f8141edc6b2..f413f331af17 100644 --- a/xen/common/shutdown.c +++ b/xen/common/shutdown.c @@ -2,6 +2,7 @@ #include #include #include +#include #include #include #include diff --git a/xen/common/spinlock.c b/xen/common/spinlock.c index 28c6e9d3ac60..0b877384451d 100644 --- a/xen/common/spinlock.c +++ b/xen/common/spinlock.c @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include diff --git a/xen/common/timer.c b/xen/common/timer.c index a21798b76f38..da0d069cc674 100644 --- a/xen/common/timer.c +++ b/xen/common/timer.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include diff --git a/xen/common/version.c b/xen/common/version.c index 80869430fc7c..b7d7d515a3dc 100644 --- a/xen/common/version.c +++ b/xen/common/version.c @@ -3,14 +3,13 @@ #include #include #include +#include #include #include #include #include #include -#include - const char *xen_compile_date(void) { return XEN_COMPILE_DATE; diff --git a/xen/common/virtual_region.c b/xen/common/virtual_region.c index 52405d84b25c..1dc2e9f592ed 100644 --- a/xen/common/virtual_region.c +++ b/xen/common/virtual_region.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include diff --git a/xen/common/vmap.c b/xen/common/vmap.c index 966a7e763f0f..b3b4ddf65311 100644 --- a/xen/common/vmap.c +++ b/xen/common/vmap.c @@ -1,6 +1,6 @@ #ifdef VMAP_VIRT_START #include -#include +#include #include #include #include diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index 3a3a97bcbe3a..7da8c5296f3b 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -32,6 +32,7 @@ #include #include #include +#include #ifdef CONFIG_X86 #include diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c index 8f76bbe676bc..eaeb0e09d01e 100644 --- a/xen/drivers/char/ns16550.c +++ b/xen/drivers/char/ns16550.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include diff --git a/xen/drivers/char/serial.c b/xen/drivers/char/serial.c index f28d8557c0a5..591a00900869 100644 --- a/xen/drivers/char/serial.c +++ b/xen/drivers/char/serial.c @@ -10,8 +10,8 @@ #include #include #include +#include #include -#include #include diff --git a/xen/include/xen/cache.h b/xen/include/xen/cache.h index 82a3ba38e3e7..a19942fd63ef 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) || defined(CONFIG_PPC64) +#if defined(CONFIG_ARM) || defined(CONFIG_X86) /* 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/hypfs.h b/xen/include/xen/hypfs.h index 1b65a9188c6c..d8fcac23b46b 100644 --- a/xen/include/xen/hypfs.h +++ b/xen/include/xen/hypfs.h @@ -4,6 +4,7 @@ #ifdef CONFIG_HYPFS #include #include +#include #include #include -- 2.39.2