From nobody Sat Oct 11 08:27:33 2025 Received: from mail-pg1-f202.google.com (mail-pg1-f202.google.com [209.85.215.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DD3DF28FD for ; Wed, 11 Jun 2025 00:10:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749600649; cv=none; b=N+pXlsmZTrVtoMG+T0K+qVyczeFH4JGGGbyNC6LJOHMeMJQLG8xdfFKSjXg5YLz1kWZGbNCJcUTJZb82hO8OER8qucodbT6v08jng8aHF3etRRvA954hxoVq+hNNEAyIW+IlBpmMRFxF7LmxwnVGpq7OCRVn4CY11O+l4NC1xu4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749600649; c=relaxed/simple; bh=cgO6vD3DDYOorXGrSYxtut2nAefUtVb1kMw8GMCdCTU=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Rrc6aVtY9Z3xRXGBA4T82nIGQxW0E7/Ctq3OlshAYKjhFXaPfMUCLkJZ4T0OJkpy3bzcDmlYstQmkY9ZMnxUbSxL6MGyywSoEeQQ4BE+rEtzz/86UO2xI1nphQYA+MYuaFZ45+CISso2nusRWT4C5iirCfkrj5vbXbmJ3b6wk+U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=Alhps4R6; arc=none smtp.client-ip=209.85.215.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Alhps4R6" Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-b2eb60594e8so3489062a12.1 for ; Tue, 10 Jun 2025 17:10:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1749600647; x=1750205447; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=T9v9a40eFZn9R1EW7cZiJp8oFw/IePLxWs4fhJywAPc=; b=Alhps4R61oHMWXRWi2hRUY5T77sF3wqpGtd1eGLGiOUk2I7EE673Rshly/brR3wGkn IwREaJHpk7fMbWjJy24/taWvykfmQSjpcGC1haDie4GQGcyuvlRf8nkopu97msjczkO2 O5UsyoUq7QhiDhiLiQtu/nMsAgq/v6e3JoXppq0WLS2o1oGNAeLq5dbo4nlTPkg5FGGi aH5jJXkQsGOX0z/0gHsavhECuiNJ/p7VgcW0s/10ykiQ/wKHCUeB34hskkw7j3UJ/f/K i2qe9Fetf8tBUzkhZNEpJ50GZCxlA3XZgwVj5hqBcmCGNYb2lszN5xU0120qOpGS9Iet 9ACw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749600647; x=1750205447; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=T9v9a40eFZn9R1EW7cZiJp8oFw/IePLxWs4fhJywAPc=; b=KJx7q4m0DvRXHS+6tF7NtqHC/nx1X0OO3pkzPEYKZqrl3QMxWaTiv1XLMAZo/TA6bx lGIm0lPR80tJvlIWQ97aOoZQfdEf65HG/ze6tYIZxeANSxWs/q3/cJLAYwRHOXAgDisS MO60sptT23T9Sd7s6uaoM79FfRW3PY68fVL4TXIetYw4ZCJdsY5a5nPQpihN2FNNf+C3 MGO9FtvTGKh0t//B0N9nGMxC4sJO1gYQsgIIi1WYtMVS9oX4TnAEgNejRSX8lQkDrGG2 WQGMJeEoiF85ODF+Bdq33y3n5tWsjOGDr7lodJYbdcwzAAVWM8ZeMuSNuhG8c99b2/Oy apSQ== X-Forwarded-Encrypted: i=1; AJvYcCU02JscTaUmAglxwuyY6ba2cNC4m9EJi2mtq146YLLQu1fED3AaykaD5jqUNuV9zyz21yXR2wnffER4MQs=@vger.kernel.org X-Gm-Message-State: AOJu0YyUpf/zWnJUS/iEO82v/5mzok2IvPBvB+3KCDPX+2aAMjwK96bY eNu5XxWHTgIFe5o8zd4oXUHbA/gvU7Ko+yEuBSN5oflJljQ935TFWrjJ9NhjaxSMAE5hhDQBNo5 7VTvmAQ== X-Google-Smtp-Source: AGHT+IEV2ehh3DZ0P6laELJQUxxjOzAbGJYmk59KPIK2LrFdETO4qOTGt38spkCAI0j7nNaUnHVLjxXIt54= X-Received: from pjbpl16.prod.google.com ([2002:a17:90b:2690:b0:311:e9bb:f8d4]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:3a86:b0:311:df4b:4b7a with SMTP id 98e67ed59e1d1-313af23ff12mr1868472a91.29.1749600646996; Tue, 10 Jun 2025 17:10:46 -0700 (PDT) Reply-To: Sean Christopherson Date: Tue, 10 Jun 2025 17:10:35 -0700 In-Reply-To: <20250611001042.170501-1-seanjc@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250611001042.170501-1-seanjc@google.com> X-Mailer: git-send-email 2.50.0.rc0.642.g800a2b2222-goog Message-ID: <20250611001042.170501-2-seanjc@google.com> Subject: [PATCH 1/8] KVM: arm64: Move arm_{psci,hypercalls}.h to an internal KVM path From: Sean Christopherson To: Marc Zyngier , Oliver Upton , Tianrui Zhao , Bibo Mao , Huacai Chen , Madhavan Srinivasan , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , Christian Borntraeger , Janosch Frank , Claudio Imbrenda , Sean Christopherson , Paolo Bonzini Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, kvm@vger.kernel.org, loongarch@lists.linux.dev, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Anish Ghulati , Colton Lewis , Thomas Huth Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Anish Ghulati Move arm_hypercalls.h and arm_psci.h into arch/arm64/kvm now that KVM no longer supports 32-bit ARM, i.e. now that there's no reason to make the hypercall and PSCI APIs "public". Signed-off-by: Anish Ghulati [sean: squash into one patch, write changelog] Signed-off-by: Sean Christopherson Acked-by: Oliver Upton --- arch/arm64/kvm/arm.c | 5 +++-- {include =3D> arch/arm64}/kvm/arm_hypercalls.h | 0 {include =3D> arch/arm64}/kvm/arm_psci.h | 0 arch/arm64/kvm/guest.c | 2 +- arch/arm64/kvm/handle_exit.c | 2 +- arch/arm64/kvm/hyp/Makefile | 6 +++--- arch/arm64/kvm/hyp/include/hyp/switch.h | 4 ++-- arch/arm64/kvm/hyp/nvhe/switch.c | 4 ++-- arch/arm64/kvm/hyp/vhe/switch.c | 4 ++-- arch/arm64/kvm/hypercalls.c | 4 ++-- arch/arm64/kvm/psci.c | 4 ++-- arch/arm64/kvm/pvtime.c | 2 +- arch/arm64/kvm/trng.c | 2 +- 13 files changed, 20 insertions(+), 19 deletions(-) rename {include =3D> arch/arm64}/kvm/arm_hypercalls.h (100%) rename {include =3D> arch/arm64}/kvm/arm_psci.h (100%) diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index de2b4e9c9f9f..017c95c7bd03 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -42,9 +42,10 @@ #include #include =20 -#include #include -#include + +#include "arm_hypercalls.h" +#include "arm_psci.h" =20 #include "sys_regs.h" =20 diff --git a/include/kvm/arm_hypercalls.h b/arch/arm64/kvm/arm_hypercalls.h similarity index 100% rename from include/kvm/arm_hypercalls.h rename to arch/arm64/kvm/arm_hypercalls.h diff --git a/include/kvm/arm_psci.h b/arch/arm64/kvm/arm_psci.h similarity index 100% rename from include/kvm/arm_psci.h rename to arch/arm64/kvm/arm_psci.h diff --git a/arch/arm64/kvm/guest.c b/arch/arm64/kvm/guest.c index 2196979a24a3..699a2f975350 100644 --- a/arch/arm64/kvm/guest.c +++ b/arch/arm64/kvm/guest.c @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include @@ -27,6 +26,7 @@ #include #include =20 +#include "arm_hypercalls.h" #include "trace.h" =20 const struct _kvm_stats_desc kvm_vm_stats_desc[] =3D { diff --git a/arch/arm64/kvm/handle_exit.c b/arch/arm64/kvm/handle_exit.c index 453266c96481..32a7b7c22924 100644 --- a/arch/arm64/kvm/handle_exit.c +++ b/arch/arm64/kvm/handle_exit.c @@ -22,7 +22,7 @@ #include #include =20 -#include +#include "arm_hypercalls.h" =20 #define CREATE_TRACE_POINTS #include "trace_handle_exit.h" diff --git a/arch/arm64/kvm/hyp/Makefile b/arch/arm64/kvm/hyp/Makefile index d61e44642f98..b1a4884446c6 100644 --- a/arch/arm64/kvm/hyp/Makefile +++ b/arch/arm64/kvm/hyp/Makefile @@ -3,8 +3,8 @@ # Makefile for Kernel-based Virtual Machine module, HYP part # =20 -incdir :=3D $(src)/include -subdir-asflags-y :=3D -I$(incdir) -subdir-ccflags-y :=3D -I$(incdir) +hyp_includes :=3D -I$(src)/include -I$(srctree)/arch/arm64/kvm +subdir-asflags-y :=3D $(hyp_includes) +subdir-ccflags-y :=3D $(hyp_includes) =20 obj-$(CONFIG_KVM) +=3D vhe/ nvhe/ pgtable.o diff --git a/arch/arm64/kvm/hyp/include/hyp/switch.h b/arch/arm64/kvm/hyp/i= nclude/hyp/switch.h index bb9f2eecfb67..340a57e0ed7c 100644 --- a/arch/arm64/kvm/hyp/include/hyp/switch.h +++ b/arch/arm64/kvm/hyp/include/hyp/switch.h @@ -16,8 +16,6 @@ #include #include =20 -#include - #include #include #include @@ -32,6 +30,8 @@ #include #include =20 +#include "arm_psci.h" + struct kvm_exception_table_entry { int insn, fixup; }; diff --git a/arch/arm64/kvm/hyp/nvhe/switch.c b/arch/arm64/kvm/hyp/nvhe/swi= tch.c index 73affe1333a4..e0610cf683ab 100644 --- a/arch/arm64/kvm/hyp/nvhe/switch.c +++ b/arch/arm64/kvm/hyp/nvhe/switch.c @@ -13,8 +13,6 @@ #include #include =20 -#include - #include #include #include @@ -28,6 +26,8 @@ =20 #include =20 +#include "arm_psci.h" + /* Non-VHE specific context */ DEFINE_PER_CPU(struct kvm_host_data, kvm_host_data); DEFINE_PER_CPU(struct kvm_cpu_context, kvm_hyp_ctxt); diff --git a/arch/arm64/kvm/hyp/vhe/switch.c b/arch/arm64/kvm/hyp/vhe/switc= h.c index c9b330dc2066..96be652caf3a 100644 --- a/arch/arm64/kvm/hyp/vhe/switch.c +++ b/arch/arm64/kvm/hyp/vhe/switch.c @@ -13,8 +13,6 @@ #include #include =20 -#include - #include #include #include @@ -28,6 +26,8 @@ #include #include =20 +#include "arm_psci.h" + /* VHE specific context */ DEFINE_PER_CPU(struct kvm_host_data, kvm_host_data); DEFINE_PER_CPU(struct kvm_cpu_context, kvm_hyp_ctxt); diff --git a/arch/arm64/kvm/hypercalls.c b/arch/arm64/kvm/hypercalls.c index 569941eeb3fe..002f4c593e90 100644 --- a/arch/arm64/kvm/hypercalls.c +++ b/arch/arm64/kvm/hypercalls.c @@ -6,8 +6,8 @@ =20 #include =20 -#include -#include +#include "arm_hypercalls.h" +#include "arm_psci.h" =20 #define KVM_ARM_SMCCC_STD_FEATURES \ GENMASK(KVM_REG_ARM_STD_BMAP_BIT_COUNT - 1, 0) diff --git a/arch/arm64/kvm/psci.c b/arch/arm64/kvm/psci.c index 3b5dbe9a0a0e..0566b5907497 100644 --- a/arch/arm64/kvm/psci.c +++ b/arch/arm64/kvm/psci.c @@ -13,8 +13,8 @@ #include #include =20 -#include -#include +#include "arm_hypercalls.h" +#include "arm_psci.h" =20 /* * This is an implementation of the Power State Coordination Interface diff --git a/arch/arm64/kvm/pvtime.c b/arch/arm64/kvm/pvtime.c index 4ceabaa4c30b..b07d250d223c 100644 --- a/arch/arm64/kvm/pvtime.c +++ b/arch/arm64/kvm/pvtime.c @@ -8,7 +8,7 @@ #include #include =20 -#include +#include "arm_hypercalls.h" =20 void kvm_update_stolen_time(struct kvm_vcpu *vcpu) { diff --git a/arch/arm64/kvm/trng.c b/arch/arm64/kvm/trng.c index 99bdd7103c9c..b5dc0f09797a 100644 --- a/arch/arm64/kvm/trng.c +++ b/arch/arm64/kvm/trng.c @@ -6,7 +6,7 @@ =20 #include =20 -#include +#include "arm_hypercalls.h" =20 #define ARM_SMCCC_TRNG_VERSION_1_0 0x10000UL =20 --=20 2.50.0.rc0.642.g800a2b2222-goog From nobody Sat Oct 11 08:27:33 2025 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3E17333F7 for ; Wed, 11 Jun 2025 00:10:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749600650; cv=none; b=eDHEUErbuUv2rAKEa+bTIqFUe5F03JwMLgwkxJgmp59r/p2ERb286uHgM3OL7/gmpcDFmd1xulk+UqNkIIjjP9+YF55xszFFYC6P9tTs0BJXazv0GPU2B6JTi/Sfnkz1GAXd/l6015w+P+hrFKkfxqvvI0Q7IhBTHQYuWO6rR34= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749600650; c=relaxed/simple; bh=PdsO7KmCqCXh1u0m3hplmJorUCeZc5tHsh93uffqrb4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=mcGWXzV1T4aUi6Ez1AXiuJ1uJj8jE5x74GUiKGnR0NxYbOedOLh6Uwj3O+weV4qsz6Le2Q6hB7O1NT50zR7yN92VSpNMupvODzXA3TVK6IIZgI+0/HAx+XFyoSOlVvIt2B9GyW15BTP3uB45dCbosoKyIIjCJKKIR69vqgsIGDA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=YHmd2QqU; arc=none smtp.client-ip=209.85.216.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="YHmd2QqU" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-3139c0001b5so1650349a91.2 for ; Tue, 10 Jun 2025 17:10:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1749600649; x=1750205449; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=6JPxC6M/8C78oUmZk1MgMr9DeqlObfjqst+28w3sGNI=; b=YHmd2QqUlhUDunt+zqNDaAmvpE7XLaovrTC/HxZU0HcdaS39edc5bh6ep24AYAxGfF wEtBH4rvgKI0UzgNCA/jBNzvqon3jZoV4rgci3RS1LBa+x7M1pmfu8vU9PuTnXunexKT tqkrVQcbNSyRL7bxqRd1DdVnKYf5rzTyBXoNg1/anqmF2odvBjGTDe06tJDdncoYNLvn teEExX1lkFxqMDGCqnIS7Lkmz/zCzpn9iIiKUqrkhiliJ1GqzIPwTiYltOkuLr3k3Rc9 187Y81pdQbmGkpS8PIRUKPUHLk1dagJT7X58npykdHB+v+SmjlodgSZ94w3Yf5c/QCST Fqtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749600649; x=1750205449; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=6JPxC6M/8C78oUmZk1MgMr9DeqlObfjqst+28w3sGNI=; b=TWGfcbOm5q6AipTpZZXTm3N1qKUFbd/HG67gr5v4c3RFMKYInSXT7WZHgFXtwuWNM0 USC1voJK8B913f0bU5127SnCMUsbqyRI6RcILngZWzN13ueygOYKVrUiSmrL7zUoH4ri Z88J4RRiEagW20R0+g3AtuS6egIJCQqJ6IPxOW88ynLQBByIB7hvcTxZQ+UuymXn7r26 RWvBS44FnNpk02TqzcMUyaZarPEmYJ5VmiyiVKnNhQlgB2jQdW/nE1qvG39CPGR3jvZH 7DpZsQq4q/ZSGvdqsw8+6SnBJa8ZVwcsWjYvpJ0zasgPRV/K+QUc0CyTzFpez35AVt/H mH1A== X-Forwarded-Encrypted: i=1; AJvYcCXEVzsV3eLsOLoCHdduTbaYMuWznNgVW3nMgHFcUyFoQZkP2bwYnkIEEJG4GNdbFH3NXLwy3vvKaK1St5Q=@vger.kernel.org X-Gm-Message-State: AOJu0YwH2lrFzRkAI5zOOdO2G2bke4U4ioE+/h4/ciTlGjnHt0INMHTn spMrUK0Obef7ArUVBwDzYn7a9CPh6l7kqPJ15iu7jHCGPgwSsNck4tJawQP/IF22tt2NmwGL0HR gCnofTQ== X-Google-Smtp-Source: AGHT+IH8G3icYEi+L3rUhxMgi7kY7xVjk4t0ltvPAXoSgaLu6NXS+iOsy9Z0A/wrYNq1F2Q9c5lqhoRbAbQ= X-Received: from pjbsm18.prod.google.com ([2002:a17:90b:2e52:b0:311:c7f9:ca1c]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:52:b0:311:b0ec:1360 with SMTP id 98e67ed59e1d1-313b1ff8de6mr923707a91.29.1749600648794; Tue, 10 Jun 2025 17:10:48 -0700 (PDT) Reply-To: Sean Christopherson Date: Tue, 10 Jun 2025 17:10:36 -0700 In-Reply-To: <20250611001042.170501-1-seanjc@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250611001042.170501-1-seanjc@google.com> X-Mailer: git-send-email 2.50.0.rc0.642.g800a2b2222-goog Message-ID: <20250611001042.170501-3-seanjc@google.com> Subject: [PATCH 2/8] KVM: arm64: Include KVM headers to get forward declarations From: Sean Christopherson To: Marc Zyngier , Oliver Upton , Tianrui Zhao , Bibo Mao , Huacai Chen , Madhavan Srinivasan , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , Christian Borntraeger , Janosch Frank , Claudio Imbrenda , Sean Christopherson , Paolo Bonzini Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, kvm@vger.kernel.org, loongarch@lists.linux.dev, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Anish Ghulati , Colton Lewis , Thomas Huth Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Include include/uapi/linux/kvm.h and include/linux/kvm_types.h in ARM's public arm_arch_timer.h and arm_pmu.h headers to get forward declarations of things like "struct kvm_vcpu" and "struct kvm_device_attr", which are referenced but never declared (neither file includes *any* KVM headers). The missing includes don't currently cause problems because of the order of includes in parent files, but that order is largely arbitrary and is subject to change, e.g. a future commit will move the ARM specific headers to arch/arm64/include/asm and reorder parent includes to maintain alphabetic ordering. Reported-by: kernel test robot Signed-off-by: Sean Christopherson Acked-by: Oliver Upton --- include/kvm/arm_arch_timer.h | 2 ++ include/kvm/arm_pmu.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/include/kvm/arm_arch_timer.h b/include/kvm/arm_arch_timer.h index 681cf0c8b9df..22cce6843e9a 100644 --- a/include/kvm/arm_arch_timer.h +++ b/include/kvm/arm_arch_timer.h @@ -7,6 +7,8 @@ #ifndef __ASM_ARM_KVM_ARCH_TIMER_H #define __ASM_ARM_KVM_ARCH_TIMER_H =20 +#include +#include #include #include =20 diff --git a/include/kvm/arm_pmu.h b/include/kvm/arm_pmu.h index 96754b51b411..baf028d19dfc 100644 --- a/include/kvm/arm_pmu.h +++ b/include/kvm/arm_pmu.h @@ -7,6 +7,8 @@ #ifndef __ASM_ARM_KVM_PMU_H #define __ASM_ARM_KVM_PMU_H =20 +#include +#include #include #include =20 --=20 2.50.0.rc0.642.g800a2b2222-goog From nobody Sat Oct 11 08:27:33 2025 Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0DD161A285 for ; Wed, 11 Jun 2025 00:10:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749600653; cv=none; b=OG3Mafd+2pjL4JH583UBAJHLi1Bf8a1DNWqjFdcroTLlrdI3BvEUz3h7o6tMDEZv3ze9WLfL7cBfQGZuhR/BIIURCN/y/g+VrCkaWTUE273fyBKkhvU+TynQ2swwjXV6HA11mEZ6puQLQpFWeeR1Kr33Jk5sFuMIKaE/8HJlNPE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749600653; c=relaxed/simple; bh=ul+BqD3/UAqkxf/sHfpARJUGF1v8V5p1dbDDJToOT0s=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=fqgnjP/8J97iIblhZu23DejrQ7Ac26e8NvEyJhhuoMMsVO02Ztnk1y5EGx7FTnbIIarPG+aHbo05ZNCOMBK6GvdyNIck5La3mHH/vS2Y3kuNiYkLOiPFsu8WBoy5hMaNsef1TebZ1udEzUS+KnoJZGipF+ZvxVWYPIJqVMbQ380= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=mIGsyBLo; arc=none smtp.client-ip=209.85.210.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="mIGsyBLo" Received: by mail-pf1-f202.google.com with SMTP id d2e1a72fcca58-7377139d8b1so4958118b3a.0 for ; Tue, 10 Jun 2025 17:10:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1749600650; x=1750205450; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=Epbf5uosqx6jz5XzFrguC8xd0TfTxmvXTHNlC1WjEX8=; b=mIGsyBLoV+Gm0Vg0E6vgFyov/SVyRSZ3ROLdbYu4ICirKqiAC73G/BBhQSILjvw6I3 /7iZ/sMeH/LGz50xHvgo86ORjM8qFB8mNdmXF5L1TJVoMjGa6ctiyy5sy3oFM5LKE+Tq jhGP9g/BtEjlwFQ6f7E8j0DpkJ3pAwymRm300Ev0WC8oRUtrGchu0HpKQpGGfkBbX3XZ UZFsMM22dOEq6NTAfTleyn+cbYCxX/Cq7Y5NdavtXggLYRfBSMItpt6mJCAKJ94K0Qhk nE6QHcOpy+83fhhrd6i/pxkbA0dAZ+etQUjKfyWRrXV47GSU3EyZTr/tRPk6dEkUR2Hd 8/mw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749600650; x=1750205450; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Epbf5uosqx6jz5XzFrguC8xd0TfTxmvXTHNlC1WjEX8=; b=O/VyJvgemv7OI8IhxBcqHoEztpcEIpl7A+Dq/wsZMGf27FLbMAa/74fVoplN/sOtgY eI2BHqNlHeobRQzu+5jrDrFqo0p+qVBjhQadLshjAuyljyn1w6zS1IZj8Td7YeiQ7pAG 3X0hCH414KWYdzZG9ZAqH5rhqOWdqIxUGHtZxXsh/cjqn660Pv1/pJoV7zjgiLkUdXnq FkK0h+ToU9Zmue+F93q64QjO6EJBEvgTR6SaWmGJmDnjWSTg0Gippe/pwOM+Pgq0mXxV sZ9RgOchWMpdOfFOwL+hj/ujm847gfG1xbQVTBkKK2oqxBdkvBTCgIYOoJhJYb96GF3K U9Ug== X-Forwarded-Encrypted: i=1; AJvYcCVLa1s6EqsIQysVWrQxj9545P7xNJvRrIx+rqAMc6mZuK1GhwCcvOk5KxMdtWmE12SsLeFi3JVASPXJJEo=@vger.kernel.org X-Gm-Message-State: AOJu0Yw20Lc1AZ6SiXxWl+mKppiWEZ+3Hgd3R3m5A7L6dptdAkV3rvbH xFCArbgoL9QvnXDK2Ww51FlV8xZNem4o8XAp1AK/VYVjnj7lrDHp+kOVyIdoDsL7HaHsMs3dyD0 1L0d+dA== X-Google-Smtp-Source: AGHT+IEhyHjusvTVUOtqS0yfSdyCwB4Bf/WQ+mHd5WIpUrUJN5V4Vw3g9p2jvZWjX31+M9mXEgcJGfWPdog= X-Received: from pfbhj1.prod.google.com ([2002:a05:6a00:8701:b0:747:b76c:ab92]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:c8e:b0:742:a0cf:7753 with SMTP id d2e1a72fcca58-7486cb59a9amr2115667b3a.3.1749600650364; Tue, 10 Jun 2025 17:10:50 -0700 (PDT) Reply-To: Sean Christopherson Date: Tue, 10 Jun 2025 17:10:37 -0700 In-Reply-To: <20250611001042.170501-1-seanjc@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250611001042.170501-1-seanjc@google.com> X-Mailer: git-send-email 2.50.0.rc0.642.g800a2b2222-goog Message-ID: <20250611001042.170501-4-seanjc@google.com> Subject: [PATCH 3/8] KVM: arm64: Move ARM specific headers in include/kvm to arch directory From: Sean Christopherson To: Marc Zyngier , Oliver Upton , Tianrui Zhao , Bibo Mao , Huacai Chen , Madhavan Srinivasan , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , Christian Borntraeger , Janosch Frank , Claudio Imbrenda , Sean Christopherson , Paolo Bonzini Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, kvm@vger.kernel.org, loongarch@lists.linux.dev, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Anish Ghulati , Colton Lewis , Thomas Huth Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Move kvm/arm_{arch_timer,pmu,vgic}.h to arch/arm64/include/asm and drop the "arm" prefix from all file names. Now that KVM no longer supports 32-bit ARM, there is no reason to expose ARM specific headers to other architectures beyond arm64. Cc: Colton Lewis Signed-off-by: Sean Christopherson Acked-by: Oliver Upton --- .../arm64/include/asm/kvm_arch_timer.h | 0 arch/arm64/include/asm/kvm_host.h | 7 +++---- include/kvm/arm_pmu.h =3D> arch/arm64/include/asm/kvm_pmu.h | 0 .../kvm/arm_vgic.h =3D> arch/arm64/include/asm/kvm_vgic.h | 0 arch/arm64/kvm/arch_timer.c | 5 ++--- arch/arm64/kvm/arm.c | 3 +-- arch/arm64/kvm/pmu-emul.c | 4 ++-- arch/arm64/kvm/reset.c | 3 +-- arch/arm64/kvm/trace_arm.h | 2 +- arch/arm64/kvm/vgic/vgic-debug.c | 2 +- arch/arm64/kvm/vgic/vgic-init.c | 2 +- arch/arm64/kvm/vgic/vgic-irqfd.c | 2 +- arch/arm64/kvm/vgic/vgic-kvm-device.c | 2 +- arch/arm64/kvm/vgic/vgic-mmio-v2.c | 2 +- arch/arm64/kvm/vgic/vgic-mmio-v3.c | 2 +- arch/arm64/kvm/vgic/vgic-mmio.c | 4 ++-- arch/arm64/kvm/vgic/vgic-v2.c | 2 +- arch/arm64/kvm/vgic/vgic-v3-nested.c | 3 +-- arch/arm64/kvm/vgic/vgic-v3.c | 2 +- 19 files changed, 21 insertions(+), 26 deletions(-) rename include/kvm/arm_arch_timer.h =3D> arch/arm64/include/asm/kvm_arch_t= imer.h (100%) rename include/kvm/arm_pmu.h =3D> arch/arm64/include/asm/kvm_pmu.h (100%) rename include/kvm/arm_vgic.h =3D> arch/arm64/include/asm/kvm_vgic.h (100%) diff --git a/include/kvm/arm_arch_timer.h b/arch/arm64/include/asm/kvm_arch= _timer.h similarity index 100% rename from include/kvm/arm_arch_timer.h rename to arch/arm64/include/asm/kvm_arch_timer.h diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm= _host.h index 6ce2c5173482..b8f910d5bdfa 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -26,17 +26,16 @@ #include #include #include +#include #include +#include +#include #include =20 #define __KVM_HAVE_ARCH_INTC_INITIALIZED =20 #define KVM_HALT_POLL_NS_DEFAULT 500000 =20 -#include -#include -#include - #define KVM_MAX_VCPUS VGIC_V3_MAX_CPUS =20 #define KVM_VCPU_MAX_FEATURES 9 diff --git a/include/kvm/arm_pmu.h b/arch/arm64/include/asm/kvm_pmu.h similarity index 100% rename from include/kvm/arm_pmu.h rename to arch/arm64/include/asm/kvm_pmu.h diff --git a/include/kvm/arm_vgic.h b/arch/arm64/include/asm/kvm_vgic.h similarity index 100% rename from include/kvm/arm_vgic.h rename to arch/arm64/include/asm/kvm_vgic.h diff --git a/arch/arm64/kvm/arch_timer.c b/arch/arm64/kvm/arch_timer.c index fdbc8beec930..d61b0450cbf9 100644 --- a/arch/arm64/kvm/arch_timer.c +++ b/arch/arm64/kvm/arch_timer.c @@ -14,12 +14,11 @@ =20 #include #include +#include #include #include #include - -#include -#include +#include =20 #include "trace.h" =20 diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index 017c95c7bd03..e452aba1a3b2 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -39,11 +39,10 @@ #include #include #include +#include #include #include =20 -#include - #include "arm_hypercalls.h" #include "arm_psci.h" =20 diff --git a/arch/arm64/kvm/pmu-emul.c b/arch/arm64/kvm/pmu-emul.c index 25c29107f13f..47a518f6a393 100644 --- a/arch/arm64/kvm/pmu-emul.c +++ b/arch/arm64/kvm/pmu-emul.c @@ -12,8 +12,8 @@ #include #include #include -#include -#include +#include +#include =20 #define PERF_ATTR_CFG1_COUNTER_64BIT BIT(0) =20 diff --git a/arch/arm64/kvm/reset.c b/arch/arm64/kvm/reset.c index 959532422d3a..bae367638741 100644 --- a/arch/arm64/kvm/reset.c +++ b/arch/arm64/kvm/reset.c @@ -17,12 +17,11 @@ #include #include =20 -#include - #include #include #include #include +#include #include #include #include diff --git a/arch/arm64/kvm/trace_arm.h b/arch/arm64/kvm/trace_arm.h index 9c60f6465c78..8fc8178e21a7 100644 --- a/arch/arm64/kvm/trace_arm.h +++ b/arch/arm64/kvm/trace_arm.h @@ -3,7 +3,7 @@ #define _TRACE_ARM_ARM64_KVM_H =20 #include -#include +#include #include =20 #undef TRACE_SYSTEM diff --git a/arch/arm64/kvm/vgic/vgic-debug.c b/arch/arm64/kvm/vgic/vgic-de= bug.c index 2684f273d9e1..0eba9dc78e6f 100644 --- a/arch/arm64/kvm/vgic/vgic-debug.c +++ b/arch/arm64/kvm/vgic/vgic-debug.c @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include "vgic.h" =20 diff --git a/arch/arm64/kvm/vgic/vgic-init.c b/arch/arm64/kvm/vgic/vgic-ini= t.c index eb1205654ac8..5a4205fd78b2 100644 --- a/arch/arm64/kvm/vgic/vgic-init.c +++ b/arch/arm64/kvm/vgic/vgic-init.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include #include "vgic.h" diff --git a/arch/arm64/kvm/vgic/vgic-irqfd.c b/arch/arm64/kvm/vgic/vgic-ir= qfd.c index c314c016659a..b73401c34f29 100644 --- a/arch/arm64/kvm/vgic/vgic-irqfd.c +++ b/arch/arm64/kvm/vgic/vgic-irqfd.c @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include "vgic.h" =20 /* diff --git a/arch/arm64/kvm/vgic/vgic-kvm-device.c b/arch/arm64/kvm/vgic/vg= ic-kvm-device.c index f9ae790163fb..f542479ceb11 100644 --- a/arch/arm64/kvm/vgic/vgic-kvm-device.c +++ b/arch/arm64/kvm/vgic/vgic-kvm-device.c @@ -6,7 +6,7 @@ * Author: Marc Zyngier */ #include -#include +#include #include #include #include diff --git a/arch/arm64/kvm/vgic/vgic-mmio-v2.c b/arch/arm64/kvm/vgic/vgic-= mmio-v2.c index f25fccb1f8e6..d00c8a74fad6 100644 --- a/arch/arm64/kvm/vgic/vgic-mmio-v2.c +++ b/arch/arm64/kvm/vgic/vgic-mmio-v2.c @@ -9,7 +9,7 @@ #include =20 #include -#include +#include =20 #include "vgic.h" #include "vgic-mmio.h" diff --git a/arch/arm64/kvm/vgic/vgic-mmio-v3.c b/arch/arm64/kvm/vgic/vgic-= mmio-v3.c index ae4c0593d114..505d4e389885 100644 --- a/arch/arm64/kvm/vgic/vgic-mmio-v3.c +++ b/arch/arm64/kvm/vgic/vgic-mmio-v3.c @@ -9,11 +9,11 @@ #include #include #include -#include =20 #include #include #include +#include =20 #include "vgic.h" #include "vgic-mmio.h" diff --git a/arch/arm64/kvm/vgic/vgic-mmio.c b/arch/arm64/kvm/vgic/vgic-mmi= o.c index e416e433baff..ec1b13abc728 100644 --- a/arch/arm64/kvm/vgic/vgic-mmio.c +++ b/arch/arm64/kvm/vgic/vgic-mmio.c @@ -10,8 +10,8 @@ #include #include #include -#include -#include +#include +#include =20 #include "vgic.h" #include "vgic-mmio.h" diff --git a/arch/arm64/kvm/vgic/vgic-v2.c b/arch/arm64/kvm/vgic/vgic-v2.c index 381673f03c39..780afb7aad06 100644 --- a/arch/arm64/kvm/vgic/vgic-v2.c +++ b/arch/arm64/kvm/vgic/vgic-v2.c @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include =20 #include "vgic.h" diff --git a/arch/arm64/kvm/vgic/vgic-v3-nested.c b/arch/arm64/kvm/vgic/vgi= c-v3-nested.c index 4f6954c30674..bdee42a8be17 100644 --- a/arch/arm64/kvm/vgic/vgic-v3-nested.c +++ b/arch/arm64/kvm/vgic/vgic-v3-nested.c @@ -7,11 +7,10 @@ #include #include =20 -#include - #include #include #include +#include =20 #include "vgic.h" =20 diff --git a/arch/arm64/kvm/vgic/vgic-v3.c b/arch/arm64/kvm/vgic/vgic-v3.c index b9ad7c42c5b0..a22fe73ca538 100644 --- a/arch/arm64/kvm/vgic/vgic-v3.c +++ b/arch/arm64/kvm/vgic/vgic-v3.c @@ -7,10 +7,10 @@ #include #include #include -#include #include #include #include +#include =20 #include "vgic.h" =20 --=20 2.50.0.rc0.642.g800a2b2222-goog From nobody Sat Oct 11 08:27:33 2025 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7E94832C8B for ; Wed, 11 Jun 2025 00:10:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749600654; cv=none; b=Kq23PyRh/9GaIOoumSrXK3Ex3UfvbQqSM98ew8VGGS+qK+NGue9DEEWPfXGmJo+lpWD0pH/jjH1Sj6CaoCJS5B6B2IYCpoiki+0CjCrSwsbOmZrbekeFe/xPh3MuHOHD8gzrmnLMxPzkNB3sNKyOXDLotoHosYdwdIjAskJYvR0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749600654; c=relaxed/simple; bh=DpElpv38Km3z88hWj7L7ltQkAiroQboKh3ua23RYJns=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=cd2+0gE/rXMvMP9aCKygLsejzNpAxaY8KbygHugbHP1gLMRnSEsTOLPH42ptsHxufWaEOlWDFlSe38aCniH3Sf7fo0nASpvWnQmfK09b+/v5T31AYG2xNDwC5mLC8TVoL8GdZan7FTkiG7nfmuNeZO0Gt/4o3logUPhm1DAuP24= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=HRJNnWok; arc=none smtp.client-ip=209.85.216.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="HRJNnWok" Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-311ae2b6647so4603656a91.0 for ; Tue, 10 Jun 2025 17:10:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1749600652; x=1750205452; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=2yZMyl9DsHgqKNlFS7xPspHEMiNKaL3c340/uFTvPNQ=; b=HRJNnWokiNxA+oSoz5xpwZFj6zjCZPCDx8INqKLIQsrmgQsl75pv61QUTtTw4LLeYl kDaEOmvE/Hxjhonx3OBmYfwdiXCQ1LTDPMis/4hoadTY/uw7w0h1E7vlCmljZrJ3XlMB yDo5Uo6p8V1/iFy+jojWmy5r9EJsOTCbv7EsifrHzhzPxrfDlGkXnnYL+DEZ96WveXyE XGiXT/iq3tjA/giN6LoBO0p0Fzfc/bpkDsLqqFiNhkxF2HyL602gvzuJL/aADSZGTko3 KMDn7FG0cPhvWi54kGcuuL7k7daGs5QoXI9ClpHa5Q/RlZ5RdV7uoBAXL0CgbWwP6uVu HeOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749600652; x=1750205452; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=2yZMyl9DsHgqKNlFS7xPspHEMiNKaL3c340/uFTvPNQ=; b=ZXwvswUMg+zOu/hCkUPHXGIQ2TCeyaN8S4Gy0pd/MOl2I4lClrmUlZRRnNguBfHGZR b1lFlrgU3QEm9d1w2Ephlr5bDMt9MYsKkAOd4XBvEiJ2kTDiWkair3be95KcXuVC4UtF RGkltkuqso6Lkd3dAPAqywaP9OUCV80gfMRpLmxMaB+z6E24gE3wHz5ulXENCKe3yOj+ F633GGoHpLpuaVa12romTiBK4KSBcE70lGcilOnuQKfQcStSfX2nlNmYHqJR6m3RLDzO Tb/qU1gHu180wp/Ws4cYYBgEWWf6Rz04Z4nFdHh7QhDqs8c3+1l/5MhbuG3d5HTQbZiN W7Lg== X-Forwarded-Encrypted: i=1; AJvYcCWR1h8IuCppvn8jxtGx3Q959c2k3jQ8le9Q2TcFYYXIy0G5cj/5+0lUG8Esiq0isO8WxkJ0gKt4x/raw7M=@vger.kernel.org X-Gm-Message-State: AOJu0YxZnUTuGOUYpVRKDBILx0UnLAPD4Y1Ye18tPeiBiVrsCY84wISE iyFxujqMdXOWYhrUNrGpAXsEbvADqxS6QgLFusVhJM6MWlN3vh9X4MNpZNyUdbdnMA5P7IsdWsC DzjlHVw== X-Google-Smtp-Source: AGHT+IEQs2JsVTUXveb/V9I06jm4zaYAh3wZWMzb/QDiH8+SAZVfaf+ke/+9FbLvW15z7wPEbMAuKp579iM= X-Received: from pjboh5.prod.google.com ([2002:a17:90b:3a45:b0:2fb:fa85:1678]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:2dc1:b0:313:28e7:af14 with SMTP id 98e67ed59e1d1-313b1fdabadmr842732a91.19.1749600651929; Tue, 10 Jun 2025 17:10:51 -0700 (PDT) Reply-To: Sean Christopherson Date: Tue, 10 Jun 2025 17:10:38 -0700 In-Reply-To: <20250611001042.170501-1-seanjc@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250611001042.170501-1-seanjc@google.com> X-Mailer: git-send-email 2.50.0.rc0.642.g800a2b2222-goog Message-ID: <20250611001042.170501-5-seanjc@google.com> Subject: [PATCH 4/8] KVM: Move include/kvm/iodev.h to include/linux as kvm_iodev.h From: Sean Christopherson To: Marc Zyngier , Oliver Upton , Tianrui Zhao , Bibo Mao , Huacai Chen , Madhavan Srinivasan , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , Christian Borntraeger , Janosch Frank , Claudio Imbrenda , Sean Christopherson , Paolo Bonzini Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, kvm@vger.kernel.org, loongarch@lists.linux.dev, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Anish Ghulati , Colton Lewis , Thomas Huth Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Move iodev.h, the last remaining holdout in include/kvm, to the standard include/linux directory as kvm_iodev.h and delete include/kvm. Acked-by: Anup Patel Signed-off-by: Sean Christopherson Acked-by: Oliver Upton Reviewed-by: Bibo Mao --- MAINTAINERS | 1 - arch/arm64/include/asm/kvm_vgic.h | 2 +- arch/arm64/kvm/vgic/vgic-mmio-v2.c | 2 +- arch/arm64/kvm/vgic/vgic-mmio-v3.c | 2 +- arch/arm64/kvm/vgic/vgic-mmio.c | 2 +- arch/loongarch/include/asm/kvm_eiointc.h | 2 +- arch/loongarch/include/asm/kvm_ipi.h | 2 +- arch/loongarch/include/asm/kvm_pch_pic.h | 2 +- arch/mips/include/asm/kvm_host.h | 3 +-- arch/powerpc/kvm/mpic.c | 2 +- arch/riscv/kvm/aia_aplic.c | 2 +- arch/riscv/kvm/aia_imsic.c | 2 +- arch/x86/kvm/i8254.h | 2 +- arch/x86/kvm/ioapic.h | 2 +- arch/x86/kvm/irq.h | 2 +- arch/x86/kvm/lapic.h | 2 +- include/{kvm/iodev.h =3D> linux/kvm_iodev.h} | 0 virt/kvm/coalesced_mmio.c | 3 +-- virt/kvm/eventfd.c | 2 +- virt/kvm/kvm_main.c | 3 +-- 20 files changed, 18 insertions(+), 22 deletions(-) rename include/{kvm/iodev.h =3D> linux/kvm_iodev.h} (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 10cf54c8f727..a2cd432273e5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -13011,7 +13011,6 @@ W: http://www.linux-kvm.org T: git git://git.kernel.org/pub/scm/virt/kvm/kvm.git F: Documentation/virt/kvm/ F: include/asm-generic/kvm* -F: include/kvm/iodev.h F: include/linux/kvm* F: include/trace/events/kvm.h F: include/uapi/asm-generic/kvm* diff --git a/arch/arm64/include/asm/kvm_vgic.h b/arch/arm64/include/asm/kvm= _vgic.h index 4a34f7f0a864..09d7f628fa3b 100644 --- a/arch/arm64/include/asm/kvm_vgic.h +++ b/arch/arm64/include/asm/kvm_vgic.h @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include =20 diff --git a/arch/arm64/kvm/vgic/vgic-mmio-v2.c b/arch/arm64/kvm/vgic/vgic-= mmio-v2.c index d00c8a74fad6..889440a8b129 100644 --- a/arch/arm64/kvm/vgic/vgic-mmio-v2.c +++ b/arch/arm64/kvm/vgic/vgic-mmio-v2.c @@ -6,9 +6,9 @@ #include #include #include +#include #include =20 -#include #include =20 #include "vgic.h" diff --git a/arch/arm64/kvm/vgic/vgic-mmio-v3.c b/arch/arm64/kvm/vgic/vgic-= mmio-v3.c index 505d4e389885..db95d3ccbd14 100644 --- a/arch/arm64/kvm/vgic/vgic-mmio-v3.c +++ b/arch/arm64/kvm/vgic/vgic-mmio-v3.c @@ -7,8 +7,8 @@ #include #include #include +#include #include -#include =20 #include #include diff --git a/arch/arm64/kvm/vgic/vgic-mmio.c b/arch/arm64/kvm/vgic/vgic-mmi= o.c index ec1b13abc728..de689e0e881f 100644 --- a/arch/arm64/kvm/vgic/vgic-mmio.c +++ b/arch/arm64/kvm/vgic/vgic-mmio.c @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include =20 diff --git a/arch/loongarch/include/asm/kvm_eiointc.h b/arch/loongarch/incl= ude/asm/kvm_eiointc.h index a3a40aba8acf..0049b0b79477 100644 --- a/arch/loongarch/include/asm/kvm_eiointc.h +++ b/arch/loongarch/include/asm/kvm_eiointc.h @@ -6,7 +6,7 @@ #ifndef __ASM_KVM_EIOINTC_H #define __ASM_KVM_EIOINTC_H =20 -#include +#include =20 #define EIOINTC_IRQS 256 #define EIOINTC_ROUTE_MAX_VCPUS 256 diff --git a/arch/loongarch/include/asm/kvm_ipi.h b/arch/loongarch/include/= asm/kvm_ipi.h index 060163dfb4a3..3956b230f087 100644 --- a/arch/loongarch/include/asm/kvm_ipi.h +++ b/arch/loongarch/include/asm/kvm_ipi.h @@ -6,7 +6,7 @@ #ifndef __ASM_KVM_IPI_H #define __ASM_KVM_IPI_H =20 -#include +#include =20 #define LARCH_INT_IPI 12 =20 diff --git a/arch/loongarch/include/asm/kvm_pch_pic.h b/arch/loongarch/incl= ude/asm/kvm_pch_pic.h index e6df6a4c1c70..4b37e3134e52 100644 --- a/arch/loongarch/include/asm/kvm_pch_pic.h +++ b/arch/loongarch/include/asm/kvm_pch_pic.h @@ -6,7 +6,7 @@ #ifndef __ASM_KVM_PCH_PIC_H #define __ASM_KVM_PCH_PIC_H =20 -#include +#include =20 #define PCH_PIC_SIZE 0x3e8 =20 diff --git a/arch/mips/include/asm/kvm_host.h b/arch/mips/include/asm/kvm_h= ost.h index c14b10821817..0d7dd89ca5bf 100644 --- a/arch/mips/include/asm/kvm_host.h +++ b/arch/mips/include/asm/kvm_host.h @@ -16,6 +16,7 @@ #include #include #include +#include #include #include #include @@ -24,8 +25,6 @@ #include #include =20 -#include - /* MIPS KVM register ids */ #define MIPS_CP0_32(_R, _S) \ (KVM_REG_MIPS_CP0 | KVM_REG_SIZE_U32 | (8 * (_R) + (_S))) diff --git a/arch/powerpc/kvm/mpic.c b/arch/powerpc/kvm/mpic.c index 23e9c2bd9f27..b25a03251544 100644 --- a/arch/powerpc/kvm/mpic.c +++ b/arch/powerpc/kvm/mpic.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -33,7 +34,6 @@ #include #include #include -#include =20 #define MAX_CPU 32 #define MAX_SRC 256 diff --git a/arch/riscv/kvm/aia_aplic.c b/arch/riscv/kvm/aia_aplic.c index f59d1c0c8c43..bf163724aec5 100644 --- a/arch/riscv/kvm/aia_aplic.c +++ b/arch/riscv/kvm/aia_aplic.c @@ -9,10 +9,10 @@ =20 #include #include +#include #include #include #include -#include =20 struct aplic_irq { raw_spinlock_t lock; diff --git a/arch/riscv/kvm/aia_imsic.c b/arch/riscv/kvm/aia_imsic.c index 29ef9c2133a9..ae3c0807baa9 100644 --- a/arch/riscv/kvm/aia_imsic.c +++ b/arch/riscv/kvm/aia_imsic.c @@ -11,10 +11,10 @@ #include #include #include +#include #include #include #include -#include #include =20 #define IMSIC_MAX_EIX (IMSIC_MAX_ID / BITS_PER_TYPE(u64)) diff --git a/arch/x86/kvm/i8254.h b/arch/x86/kvm/i8254.h index a768212ba821..4de7a0b88e4f 100644 --- a/arch/x86/kvm/i8254.h +++ b/arch/x86/kvm/i8254.h @@ -4,7 +4,7 @@ =20 #include =20 -#include +#include =20 struct kvm_kpit_channel_state { u32 count; /* can be 65536 */ diff --git a/arch/x86/kvm/ioapic.h b/arch/x86/kvm/ioapic.h index aa8cb4ac0479..cb36c36affd3 100644 --- a/arch/x86/kvm/ioapic.h +++ b/arch/x86/kvm/ioapic.h @@ -3,7 +3,7 @@ #define __KVM_IO_APIC_H =20 #include -#include +#include #include "irq.h" =20 struct kvm; diff --git a/arch/x86/kvm/irq.h b/arch/x86/kvm/irq.h index 76d46b2f41dd..b21b03aa2ee7 100644 --- a/arch/x86/kvm/irq.h +++ b/arch/x86/kvm/irq.h @@ -13,9 +13,9 @@ #include #include #include +#include #include =20 -#include #include "lapic.h" =20 #define PIC_NUM_PINS 16 diff --git a/arch/x86/kvm/lapic.h b/arch/x86/kvm/lapic.h index 4ce30db65828..43ffbded5f72 100644 --- a/arch/x86/kvm/lapic.h +++ b/arch/x86/kvm/lapic.h @@ -2,7 +2,7 @@ #ifndef __KVM_X86_LAPIC_H #define __KVM_X86_LAPIC_H =20 -#include +#include =20 #include =20 diff --git a/include/kvm/iodev.h b/include/linux/kvm_iodev.h similarity index 100% rename from include/kvm/iodev.h rename to include/linux/kvm_iodev.h diff --git a/virt/kvm/coalesced_mmio.c b/virt/kvm/coalesced_mmio.c index 375d6285475e..d0f84e3611da 100644 --- a/virt/kvm/coalesced_mmio.c +++ b/virt/kvm/coalesced_mmio.c @@ -9,8 +9,7 @@ * */ =20 -#include - +#include #include #include #include diff --git a/virt/kvm/eventfd.c b/virt/kvm/eventfd.c index 11e5d1e3f12e..35786d59b233 100644 --- a/virt/kvm/eventfd.c +++ b/virt/kvm/eventfd.c @@ -26,7 +26,7 @@ #include #include =20 -#include +#include =20 #ifdef CONFIG_HAVE_KVM_IRQCHIP =20 diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index eec82775c5bf..a401ba32ecaa 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -10,9 +10,8 @@ * Yaniv Kamay */ =20 -#include - #include +#include #include #include #include --=20 2.50.0.rc0.642.g800a2b2222-goog From nobody Sat Oct 11 08:27:33 2025 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CBE8584D34 for ; Wed, 11 Jun 2025 00:10:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749600656; cv=none; b=mCUsuWR/2rxLA2/9r0fDWnPFBLRVpVhFWfbmMbdR/zG9+2Re2vMCbIPKpiSiubn3yrh9g92PPT2UNyQi3t6IjCspifnUls79kYtjyNqczKZskki84grabKFQpwi7ZWKGRldbJfbn+8HS5h/WVGOWmvHKAxoWYwUcZvNR5pFgYkQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749600656; c=relaxed/simple; bh=fi0POvxipHtqzuBmBtdO+vOuVF1CdKjDHYYgzms+PmI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=OXrkaM0Jnfb0RK78J/k3x54fdajhMAc9LG5HQ4HbE4qARdzNgH+cEcgRwVBtct268A62NT8D16Q3JJIn2NBFjLASfil4GcHycRIxNZu2GC/9QxXZ3SaoXMaBB+DxLSFggjetYPg/Fri9nInFeGgWIvUwu9+RmHUV3Fkb0v8PruA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=FBdYXLxU; arc=none smtp.client-ip=209.85.216.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="FBdYXLxU" Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-3138f5e8ff5so2369251a91.3 for ; Tue, 10 Jun 2025 17:10:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1749600654; x=1750205454; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=hBjwKNBikKgFeXvQ1q5Ivd9CecF6t6Q9MZtjOeYYky8=; b=FBdYXLxUjexGN9WeKSZ2ecIhfrizQ6wveOJNH+ZsAaIruwbgxCgjpsI0flq2xKfa98 11YaX4jgJfHh8uJMrMsyNQHFsguJvECRAOPURFonmQJOzrdqGH7IbAUN3c1UV5p4xGbF YyiYr5Pwb2S8XRcEHx5JjCk6sezF8NekBnj0Iu+KzCpULI2FnN0HuOfJaXNvYMIjepqF wh2EEpzu2IFPwVaFYTHP3l1QmLdszH/S7jMlItgsL8dWe917fSFxrYXJ6DKB6Ci/TkEh FxbREDhH/swhMb1LhQdHhjUYvmScvms3rSJz+YBCQ4+FZWCnHmSLLKe85WFCRT6Z0yia j4cA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749600654; x=1750205454; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=hBjwKNBikKgFeXvQ1q5Ivd9CecF6t6Q9MZtjOeYYky8=; b=cwVBYS3/4vj0eiouBlyKTEgm0KZTqKMAPVtd72liQuiZ436ENHEyTDayGMH58sow/c FXrBnC6IznVyR4wKEo04uRZfgwqiW7LQulSzN1bI23XihUiKnJJCeqqwZKaLtWNd4Exj ++IbsMo19kq4CVE3cBLqzIsdVdd9diFUzXQ03GF3YYbS1S0KGmldhov36sLO3rt71qQl 85PrwhAs1HWvoNW1R2qt7iMukVOajRaSrrG+mJLzbQ42nkl24qmldJdLCk0pj8ssufHn /rrvwWYS9pzOfBWjccYBQkxp06ttKs3wteRfSVDFTMnAt9u/U277m9Ptu2IovEucpIXV zZ+w== X-Forwarded-Encrypted: i=1; AJvYcCWM7mQ3S+iDO27lPlZQ7tKzYNxG7im2xNKEA7/4/tX7VdFTkO9BOob2ry1nT+wyO4xcQv+pefmLGxRv2+s=@vger.kernel.org X-Gm-Message-State: AOJu0YxH6CYfQML4kKQS6yphkF+MTG1UO4MHoulgKIS+0ItyuExXrNkc 45XiB5djJUomiZke5q3Z955lJdBDQrenzjbQPhrZyO1lkiuy1MhbNI26M8Utiy9jTqTkvzq2WT5 Ft/LGEA== X-Google-Smtp-Source: AGHT+IED4B4s7Ytoor8mnhgXxSS0ZKiCE28nENLHgtxurTVkQjPNLlNungxBpASYaT+z3Y4fvBlDrrKUUDc= X-Received: from pjh3.prod.google.com ([2002:a17:90b:3f83:b0:2fc:2c9c:880]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:4cc4:b0:312:26d9:d5b2 with SMTP id 98e67ed59e1d1-313b1d9c310mr956755a91.0.1749600653718; Tue, 10 Jun 2025 17:10:53 -0700 (PDT) Reply-To: Sean Christopherson Date: Tue, 10 Jun 2025 17:10:39 -0700 In-Reply-To: <20250611001042.170501-1-seanjc@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250611001042.170501-1-seanjc@google.com> X-Mailer: git-send-email 2.50.0.rc0.642.g800a2b2222-goog Message-ID: <20250611001042.170501-6-seanjc@google.com> Subject: [PATCH 5/8] KVM: MIPS: Stop adding virt/kvm to the arch include path From: Sean Christopherson To: Marc Zyngier , Oliver Upton , Tianrui Zhao , Bibo Mao , Huacai Chen , Madhavan Srinivasan , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , Christian Borntraeger , Janosch Frank , Claudio Imbrenda , Sean Christopherson , Paolo Bonzini Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, kvm@vger.kernel.org, loongarch@lists.linux.dev, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Anish Ghulati , Colton Lewis , Thomas Huth Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Don't add virt/kvm to KVM MIPS' include path, the headers in virt/kvm are intended to be used only by other code in virt/kvm, i.e. are "private" to the core KVM code. It's not clear that MIPS *ever* included a header from virt/kvm, i.e. odds are good the "-Ivirt/kvm" was copied from a different architecture's Makefile when MIPS support was first added. Signed-off-by: Sean Christopherson Acked-by: Oliver Upton --- arch/mips/kvm/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/mips/kvm/Makefile b/arch/mips/kvm/Makefile index 805aeea2166e..96a7cd21b140 100644 --- a/arch/mips/kvm/Makefile +++ b/arch/mips/kvm/Makefile @@ -4,7 +4,7 @@ =20 include $(srctree)/virt/kvm/Makefile.kvm =20 -ccflags-y +=3D -Ivirt/kvm -Iarch/mips/kvm +ccflags-y +=3D -Iarch/mips/kvm =20 kvm-$(CONFIG_CPU_HAS_MSA) +=3D msa.o =20 --=20 2.50.0.rc0.642.g800a2b2222-goog From nobody Sat Oct 11 08:27:33 2025 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3563713F434 for ; Wed, 11 Jun 2025 00:10:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749600657; cv=none; b=l2N5JV6C/baGMXzpKzgQOs7XYFASMaORwUn3dBvvtNr3/RmXIsCNttYuGIn3I5uSjn/JXNbpWEP8dhTQZvd+xfrcWCfxSIBPd46RPM6TfkTU/C0p2BoPomX6Myv//TOjIc3Th7ydlF5OJGxyPqX3ug1ouSowK4Hfo5qScQ1wnZ0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749600657; c=relaxed/simple; bh=tIVAjv0R6pUZqeCBUMOqA6Hwa6RH3vUVAalxmKoMGQM=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=L9rDn1bNT44nBJDPevYF7PavbmN6CzxjYGFdupwoEN8B0OLAIj9Wm9ZJ1JFygIjIj8WvgCOC7nVTUDxdi8e+YHzn/FXr9zSHl3rofp/yZnWoiCQPr6+E3D7oWMUAQyLaP4lHKyYeqgCLwySwyojn0z+8WsotsrovxWgvxh6pu9s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=UONvifDn; arc=none smtp.client-ip=209.85.216.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="UONvifDn" Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-3121cffd7e8so5032562a91.0 for ; Tue, 10 Jun 2025 17:10:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1749600655; x=1750205455; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=zss/ktKZQOB/zxYHcr8l4OJbiGy6+R3+c8NDOsBeWew=; b=UONvifDnMtjMIaxMJh9oZe3DF6FlKFGr4F//EyCbLN7vQx4FcCJF4Qlri85UcuhXvN tnSFwmKBPwrC59Fb1j9s4s/w/YhzzG8XaSVUoFlNDxt/uFuDTD0J2ZR8t9Ka2xm7HouS NgjNwqiW06s3RHXtO8LaH2264N0zMv1Cb2Tmk6Z1Z4o/uei3djKB0nbb0DuunwHlOmDn GZaGChPglu3v/ihuijZJgDZbX80b69xDeWWakRHKiXFWfE/PYgQq0v0QWTja6ldPEdBD 6I9n94e2xFImzSz8U085n3rggC0q/anXrqiGvsWEEJXtTd0vtnCh1jObNFz85PO3t4Vh 7FDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749600655; x=1750205455; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=zss/ktKZQOB/zxYHcr8l4OJbiGy6+R3+c8NDOsBeWew=; b=WLCSBD6uQ9SbB3V8yW32R7+rEfwriVdlt5cOfQgKm85dqxYAQr+fPjLhJ7ZC9XEXQ8 FG2+nb30PzExJN3/i1qBGjnf7AJu7gD38xK+uZ5cS0rujNC/w+XsuPBkBIPs8e27jYIz KqZMbrWFEIJGyXOLlvltdcmJIcOBtW2FsRIZx5O+tJdDqxpWLyDNgPcwP99zgUgC31Hc j+6ngv1GD5Q9fRHS2Hq4FxkNkA5UVyaFpk6yx95YcJELU17RvjwUGfyiIivVvMRsToeJ 6vdvw+mFbN9i7aZgJt4HRLBoqNqUB/QFeh+XEjMs1kVCyuXoVOUfV822uFAwJHHPdFa0 PxpQ== X-Forwarded-Encrypted: i=1; AJvYcCWmgghcJ5waVIDP23YonGr+DUsHwLMU6T5agQUHODtH4zsheqUmnvWdxiOMHAiehsJQ7qx5LHxtdjr7nlc=@vger.kernel.org X-Gm-Message-State: AOJu0YyDbMvAGsToTM31muz3wAZOukILolNmrNxCeoIreENCAB4BSodi 3efRlnReg7t22+q5GJlMqOU4TKLcOnAcfFGEASumt49eJbmWu7Qj7IditgqDgoA195BFfiyJkZB 5ikxyEw== X-Google-Smtp-Source: AGHT+IFPf4zAcxMmKYyJF/0q0QWOeyyNBeEfAEV8gqM1cGbYGy338sgO6izo7nZMoEiNEzX0yDZpDSCyFlg= X-Received: from pjbpx2.prod.google.com ([2002:a17:90b:2702:b0:313:230:89ed]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:384d:b0:311:f30b:c21 with SMTP id 98e67ed59e1d1-313af243a50mr1534626a91.26.1749600655513; Tue, 10 Jun 2025 17:10:55 -0700 (PDT) Reply-To: Sean Christopherson Date: Tue, 10 Jun 2025 17:10:40 -0700 In-Reply-To: <20250611001042.170501-1-seanjc@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250611001042.170501-1-seanjc@google.com> X-Mailer: git-send-email 2.50.0.rc0.642.g800a2b2222-goog Message-ID: <20250611001042.170501-7-seanjc@google.com> Subject: [PATCH 6/8] KVM: PPC: Stop adding virt/kvm to the arch include path From: Sean Christopherson To: Marc Zyngier , Oliver Upton , Tianrui Zhao , Bibo Mao , Huacai Chen , Madhavan Srinivasan , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , Christian Borntraeger , Janosch Frank , Claudio Imbrenda , Sean Christopherson , Paolo Bonzini Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, kvm@vger.kernel.org, loongarch@lists.linux.dev, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Anish Ghulati , Colton Lewis , Thomas Huth Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Don't add virt/kvm to KVM PPC's include path, the headers in virt/kvm are intended to be used only by other code in virt/kvm, i.e. are "private" to the core KVM code. It's not clear that PPC *ever* included a header from virt/kvm, i.e. odds are good the "-Ivirt/kvm" was copied from a different architecture's Makefile when PPC support was first added. Signed-off-by: Sean Christopherson Acked-by: Oliver Upton Reviewed-by: Gautam Menghani --- arch/powerpc/kvm/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/kvm/Makefile b/arch/powerpc/kvm/Makefile index 4bd9d1230869..1a575db2666e 100644 --- a/arch/powerpc/kvm/Makefile +++ b/arch/powerpc/kvm/Makefile @@ -3,7 +3,7 @@ # Makefile for Kernel-based Virtual Machine module # =20 -ccflags-y :=3D -Ivirt/kvm -Iarch/powerpc/kvm +ccflags-y :=3D -Iarch/powerpc/kvm =20 include $(srctree)/virt/kvm/Makefile.kvm =20 --=20 2.50.0.rc0.642.g800a2b2222-goog From nobody Sat Oct 11 08:27:33 2025 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A64DD1537C8 for ; Wed, 11 Jun 2025 00:10:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749600659; cv=none; b=l+0ZqBDGkEi4h5Z5Dr/PosRCyq35fMMoPr1Y7zgQeizs/jt7adiCFsCott7mKMatfnoa54czpAHNTaUhkwPP17H45V6zyy6obABQsw93Q8spjNatbFLFeD/6KNc/zypu0acN8fLeukXA8FV2Zik3kuvKSr+EKcRGG+ShtR4da+w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749600659; c=relaxed/simple; bh=KbvpWBmaAbSh8Vh7bcMGuAO93v+FYmozT636NWdRWts=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=ETdvnhlhspLs4pN6QXDVWpMAbB+5nMiGHjDTidCX/FbGt2sviDDtkJJOsMdzvq473PF5gzN6SuqWafMoBi4mKm3IVrdSWSdz4OJmtyUSNzXbo/hkeV8cQHMVVxQtBgyO807q0am5iUvzwB4X7woOKG84iVJIm3zD0LRCOlHu2H4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=lFy4PPMC; arc=none smtp.client-ip=209.85.216.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="lFy4PPMC" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-311a6b43ed7so5179180a91.1 for ; Tue, 10 Jun 2025 17:10:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1749600657; x=1750205457; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=VlZgeHA644QawbjAzxLvevk+0CPgkFNL80WvPP4oWa8=; b=lFy4PPMChNXXDTWtWIqS2PCjHXULZVQTDeur0OFhwhye3A37OpwxlA+BWEBn5GgTbH Su3fLJBIDF40xXd0ETY4WaSZXbvNMs/2oQa1rFwCn/QimUfmVwTis0JROJHr0tg649Sp VLuLu/Xt0km46L7sIkuL7k2t8iOyltddpfE5FbjeORITgg1TOJZiCMZ0Ww5s12Imu7jm Z4wT9LDGrBKJ56ozAduuPn9xK1xZBA20jwZfwLG99d1tL9lTkMuOR6wU+tE0GahVObOc oGz8C5Gk5moebua7oYLChm7eNFZlGfKlhjt9ycFHxZgVGDRDTVj2gNUn+xJ76uYW52fi JchQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749600657; x=1750205457; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=VlZgeHA644QawbjAzxLvevk+0CPgkFNL80WvPP4oWa8=; b=mS5WdwTt5LzISSEAx31Rm586o/PJ+q6jzTc7FHRGUTxuv0beKov+P+DOjPrZvZpr/o jxVneNTg5NzbGNxPRV1ma7h6TYKYTlDv8iSvL+h83tLW6VdAa87r85V5TBBDUgc9lETS wiCNgTMfa8a1ki0buVdwEaD8+k4nIiMx/zZMq4mejGIaxhC5vJB2pLg90AMg4+R/Z1+E HYHjqqqRc3bn4KANR14GuF9jvHmrHUiCuXVnPiGv9Ob82OnM4BHnUebKfTiPVOJ6mwXG fN1c2K1kMN3cJu5DRRqSrRPptoPIzIbyrJPvhLpZqreCW3in3u9waPKwW0jQK3bybKFm jSrA== X-Forwarded-Encrypted: i=1; AJvYcCVLPc/YXfy9aUlFsdRqxFrmI3KRu4UNn0c2tQZxQ8iF8xiZGMq5H+xl044lG/MToc//B2wTxAU7QLp3eA4=@vger.kernel.org X-Gm-Message-State: AOJu0YwCHmncodk8e+LolNp6+urJdjjWVSFDMsYSaCeSF5vEAkJhqt61 3O6KXMfWST35ydNOAnadH0N5WRQ+ymP3XlZHzg+swzsziOjJVJU72lvQfGewXMgPpzk9b/KDxrE JImo/ew== X-Google-Smtp-Source: AGHT+IEo+A1iKKp/d15/c3Y8CK62vwTvYQUmq5gUOhKzuXVKftWt1+9sRfxp1GZ6dnQl+d5j2tHzGoYEsqQ= X-Received: from pjboh5.prod.google.com ([2002:a17:90b:3a45:b0:2fb:fa85:1678]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:2643:b0:312:29e:9ec9 with SMTP id 98e67ed59e1d1-313af1dd043mr2232849a91.24.1749600657225; Tue, 10 Jun 2025 17:10:57 -0700 (PDT) Reply-To: Sean Christopherson Date: Tue, 10 Jun 2025 17:10:41 -0700 In-Reply-To: <20250611001042.170501-1-seanjc@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250611001042.170501-1-seanjc@google.com> X-Mailer: git-send-email 2.50.0.rc0.642.g800a2b2222-goog Message-ID: <20250611001042.170501-8-seanjc@google.com> Subject: [PATCH 7/8] KVM: s390: Stop adding virt/kvm to the arch include path From: Sean Christopherson To: Marc Zyngier , Oliver Upton , Tianrui Zhao , Bibo Mao , Huacai Chen , Madhavan Srinivasan , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , Christian Borntraeger , Janosch Frank , Claudio Imbrenda , Sean Christopherson , Paolo Bonzini Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, kvm@vger.kernel.org, loongarch@lists.linux.dev, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Anish Ghulati , Colton Lewis , Thomas Huth Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Don't add virt/kvm to KVM s390's include path, the headers in virt/kvm are intended to be used only by other code in virt/kvm, i.e. are "private" to the core KVM code. It's not clear that s390 *ever* included a header from virt/kvm, i.e. odds are good the "-Ivirt/kvm" was copied from a x86's Makefile when s390 support was first added. The only headers in virt/kvm at the time were the x86 specific ioapic.h, and iodev.h, neither of which shows up as an #include in the diff for the commit range 37817f2982d0f..e976a2b997fc4. Acked-by: Claudio Imbrenda Reviewed-by: Thomas Huth Signed-off-by: Sean Christopherson Acked-by: Oliver Upton Reviewed-by: Janosch Frank --- arch/s390/kvm/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/s390/kvm/Makefile b/arch/s390/kvm/Makefile index 9a723c48b05a..b742e08c036b 100644 --- a/arch/s390/kvm/Makefile +++ b/arch/s390/kvm/Makefile @@ -5,7 +5,7 @@ =20 include $(srctree)/virt/kvm/Makefile.kvm =20 -ccflags-y :=3D -Ivirt/kvm -Iarch/s390/kvm +ccflags-y :=3D -Iarch/s390/kvm =20 kvm-y +=3D kvm-s390.o intercept.o interrupt.o priv.o sigp.o kvm-y +=3D diag.o gaccess.o guestdbg.o vsie.o pv.o gmap-vsie.o --=20 2.50.0.rc0.642.g800a2b2222-goog From nobody Sat Oct 11 08:27:33 2025 Received: from mail-pf1-f201.google.com (mail-pf1-f201.google.com [209.85.210.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9B0181898E9 for ; Wed, 11 Jun 2025 00:10:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749600661; cv=none; b=T924ctJ94omm9Ezfy7BLRN6jUQ5JOkqx+JL43d+OMM40dnhHUbyfdnRHmZQ9f0vLvL48cStCSJA3/2xcPz3i5RXPwabo3izksq/ncv8sRkkYzyfRnd3HAlHxe5Hx5t5ujTOHbhPGkrvhJP4/5/ABteRwsNNJjRDTuk1rG+/B/zQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749600661; c=relaxed/simple; bh=AcY3H8bGfIWZWHawREnW4VSuG2ZvHv2SK1gbpEk3yi4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=AwaRFHcGcP0VEwfTso6bDXgIc6I1G7+L/Nb7thrChf05V992yjbkpvSm6x8oCtVCY/fQkaSgpM+vro5jxDSJD0f4twBSsxCiq7bXK4tgRT/ZIn3y5vzwF8Qq2U3/aWdypmJjPWGxeFRy8My+D08z5C3xjZx/1rGPPIojl5KTfcY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=mtw7h/hu; arc=none smtp.client-ip=209.85.210.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="mtw7h/hu" Received: by mail-pf1-f201.google.com with SMTP id d2e1a72fcca58-74834bc5d37so6092228b3a.0 for ; Tue, 10 Jun 2025 17:10:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1749600659; x=1750205459; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=t+Mj+r8r7UAjF4+0LNUZhsvI8NJHwfinPsCt24LIifo=; b=mtw7h/huIuU+Dojq7oaTp5DnWiKxzyUxE+gBVHjv85aTL3ZducZyuLoUYAUgdFFU9b Qn7ObnA/iJVFX5uKWlzdeujXMgt03FmD880lK3hB98uATPY68rCw8AgqaK0xWqBVsbX5 r1DM/oa8283rjsgINUS21bNMAzrrGSipU2Lj2+vlDqNB+TBdLtTu4dOEpg+ZdsICUFFK RBhfYzh/tBQTOHQ2uYjOXz3R3jM5KSuHvJOV14QTSSabiPWDNX97vBlCct+3s+yuaY4A O7O+8nLfWWS3kkWdJ10e/wKIkYusjF5qcEDhk3JT7e/o6SZy3bj73g6uYill5335sM5Y tsfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749600659; x=1750205459; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=t+Mj+r8r7UAjF4+0LNUZhsvI8NJHwfinPsCt24LIifo=; b=ennpYuIAqQnR4+3+hlm9JWq7FblImLUtRQhnBGubujm+CKLju1pxzzDO9sbAQPH0x0 fOa65gTFi0xL2B6yeVfx4rDp7KcVZfbdj1EfCtPj4R7vGUhluwzQyI+3hAlRx2g+uaow 50hHNO2KmHSGvtGt9dE3m6FHVjpD6bD+rK7f5tZJ6KVOAYmJ/G68aXyFD7NmoK9mF0d6 4pUHO2GmzNtMUMUqVBKAZeVSEa1efGyJUevxcxWNV4mWfXxHYqErNOB3YBMkgygzvHFX nrTt6o2YiNqJltU82ZhqLLT3eviMEYFekeY2QvE7/z2o4PoV3lpyPoh4vQuTjHw/6FUD RA4Q== X-Forwarded-Encrypted: i=1; AJvYcCVKBQyxHuNrGZid0vyfoNTE4C+0wCnS+iKUmSl39deOfYoQaG3Nu3zQNJXkHoYS36B+yeE/B4NzpMV72Kk=@vger.kernel.org X-Gm-Message-State: AOJu0Yxm3JveI+Zebzkwmzt2iKrTULd+KB1ncNqZ6QPwg3qCrqh39VI/ /g624oVoerGa3reMUuijp7biRECzXqoHKqCTfiKwx6tm+rzW1gHRqc5AYtYGdJCes5MGqDiqbn3 yg1iJjg== X-Google-Smtp-Source: AGHT+IHdKstC+XlYUus8Wdm0HR7HPxHMBlUy5ahB8xm3L+Y1hmecIZTBPJ5vhN4Gi0qdwz1eVbXtQ9xfH68= X-Received: from pgam16.prod.google.com ([2002:a05:6a02:2b50:b0:b2f:6348:f715]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:9012:b0:1f5:8f7f:8f19 with SMTP id adf61e73a8af0-21f8663f76dmr1960513637.10.1749600659002; Tue, 10 Jun 2025 17:10:59 -0700 (PDT) Reply-To: Sean Christopherson Date: Tue, 10 Jun 2025 17:10:42 -0700 In-Reply-To: <20250611001042.170501-1-seanjc@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250611001042.170501-1-seanjc@google.com> X-Mailer: git-send-email 2.50.0.rc0.642.g800a2b2222-goog Message-ID: <20250611001042.170501-9-seanjc@google.com> Subject: [PATCH 8/8] KVM: Standardize include paths across all architectures From: Sean Christopherson To: Marc Zyngier , Oliver Upton , Tianrui Zhao , Bibo Mao , Huacai Chen , Madhavan Srinivasan , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , Christian Borntraeger , Janosch Frank , Claudio Imbrenda , Sean Christopherson , Paolo Bonzini Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, kvm@vger.kernel.org, loongarch@lists.linux.dev, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Anish Ghulati , Colton Lewis , Thomas Huth Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Standardize KVM's include paths across all architectures by declaring the KVM-specific includes in the common Makefile.kvm. Having common KVM "own" the included paths reduces the temptation to unnecessarily add virt/kvm to arch include paths, and conversely if allowing arch code to grab headers from virt/kvm becomes desirable, virt/kvm can be added to all architecture's include path with a single line update. Having the common KVM makefile append to ccflags also provides a convenient location to append other things, e.g. KVM-specific #defines. Note, this changes the behavior of s390 and PPC, as s390 and PPC previously overwrote ccflags-y instead of adding on. There is no evidence that overwriting ccflags-y was necessary or even deliberate, as both s390 and PPC switched to the overwrite behavior without so much as a passing mention when EXTRA_CFLAGS was replaced with ccflags-y (commit c73028a02887 ("s390: change to new flag variable") and commit 4108d9ba9091 ("powerpc/Makefiles: Change to new flag variables")). Acked-by: Anup Patel Signed-off-by: Sean Christopherson Acked-by: Oliver Upton --- arch/arm64/kvm/Makefile | 2 -- arch/mips/kvm/Makefile | 2 -- arch/powerpc/kvm/Makefile | 2 -- arch/riscv/kvm/Makefile | 2 -- arch/s390/kvm/Makefile | 2 -- arch/x86/kvm/Makefile | 1 - virt/kvm/Makefile.kvm | 2 ++ 7 files changed, 2 insertions(+), 11 deletions(-) diff --git a/arch/arm64/kvm/Makefile b/arch/arm64/kvm/Makefile index 7c329e01c557..86035b311269 100644 --- a/arch/arm64/kvm/Makefile +++ b/arch/arm64/kvm/Makefile @@ -3,8 +3,6 @@ # Makefile for Kernel-based Virtual Machine module # =20 -ccflags-y +=3D -I $(src) - include $(srctree)/virt/kvm/Makefile.kvm =20 obj-$(CONFIG_KVM) +=3D kvm.o diff --git a/arch/mips/kvm/Makefile b/arch/mips/kvm/Makefile index 96a7cd21b140..d198e1addea7 100644 --- a/arch/mips/kvm/Makefile +++ b/arch/mips/kvm/Makefile @@ -4,8 +4,6 @@ =20 include $(srctree)/virt/kvm/Makefile.kvm =20 -ccflags-y +=3D -Iarch/mips/kvm - kvm-$(CONFIG_CPU_HAS_MSA) +=3D msa.o =20 kvm-y +=3D mips.o emulate.o entry.o \ diff --git a/arch/powerpc/kvm/Makefile b/arch/powerpc/kvm/Makefile index 1a575db2666e..6f12edd465df 100644 --- a/arch/powerpc/kvm/Makefile +++ b/arch/powerpc/kvm/Makefile @@ -3,8 +3,6 @@ # Makefile for Kernel-based Virtual Machine module # =20 -ccflags-y :=3D -Iarch/powerpc/kvm - include $(srctree)/virt/kvm/Makefile.kvm =20 common-objs-y +=3D powerpc.o emulate_loadstore.o diff --git a/arch/riscv/kvm/Makefile b/arch/riscv/kvm/Makefile index 4e0bba91d284..dbe61a398cc8 100644 --- a/arch/riscv/kvm/Makefile +++ b/arch/riscv/kvm/Makefile @@ -3,8 +3,6 @@ # Makefile for RISC-V KVM support # =20 -ccflags-y +=3D -I $(src) - include $(srctree)/virt/kvm/Makefile.kvm =20 obj-$(CONFIG_KVM) +=3D kvm.o diff --git a/arch/s390/kvm/Makefile b/arch/s390/kvm/Makefile index b742e08c036b..5cbcaa7f241a 100644 --- a/arch/s390/kvm/Makefile +++ b/arch/s390/kvm/Makefile @@ -5,8 +5,6 @@ =20 include $(srctree)/virt/kvm/Makefile.kvm =20 -ccflags-y :=3D -Iarch/s390/kvm - kvm-y +=3D kvm-s390.o intercept.o interrupt.o priv.o sigp.o kvm-y +=3D diag.o gaccess.o guestdbg.o vsie.o pv.o gmap-vsie.o =20 diff --git a/arch/x86/kvm/Makefile b/arch/x86/kvm/Makefile index a5d362c7b504..f78f11b582d2 100644 --- a/arch/x86/kvm/Makefile +++ b/arch/x86/kvm/Makefile @@ -1,6 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 =20 -ccflags-y +=3D -I $(srctree)/arch/x86/kvm ccflags-$(CONFIG_KVM_WERROR) +=3D -Werror =20 include $(srctree)/virt/kvm/Makefile.kvm diff --git a/virt/kvm/Makefile.kvm b/virt/kvm/Makefile.kvm index 724c89af78af..0e7ba49026fc 100644 --- a/virt/kvm/Makefile.kvm +++ b/virt/kvm/Makefile.kvm @@ -3,6 +3,8 @@ # Makefile for Kernel-based Virtual Machine module # =20 +ccflags-y +=3D -I$(src) + KVM ?=3D ../../../virt/kvm =20 kvm-y :=3D $(KVM)/kvm_main.o $(KVM)/eventfd.o $(KVM)/binary_stats.o --=20 2.50.0.rc0.642.g800a2b2222-goog