From mboxrd@z Thu Jan 1 00:00:00 1970 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 340781C36 for ; Wed, 11 Jun 2025 00:10:46 +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=1749600649; cv=none; b=t1DXgAbxoGqs//YvheYSOlENyfvHYntqlzimPD3/a/aUpa98Zeh+EToXL3eRjlRW+7rwjgnGTLjRSSIjC+iKng+lNFpzpLnT0gY3X9kMb6gR2sSHY9hzcPYbIRCRuL74KcI70Cokz7+9+GHJtwTjDJYVjWQix4naAD00kih/xEE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749600649; c=relaxed/simple; bh=JQfMhNtkMh4Eskn6e+JLGabT20zk6Rt1P/kcDLiyXww=; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Content-Type; b=VqeviuHthI1x2ybQXCT9myAsUBWPmKKJnSCjtYsQRymA44AqAjUv8Scf14J2AFIBKqZ2kajweirIzBLK3AE5PjlffpcvBGF28cxYAuW6Uu0j+aYut06J/vfEmOrhjX6maGXS9kaMSwwCopIYmGboDrLX0h4WDlM7exKMxbFEUVw= 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=mN6DCx0Z; 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="mN6DCx0Z" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-3139c0001b5so1650301a91.2 for ; Tue, 10 Jun 2025 17:10:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1749600645; x=1750205445; darn=lists.linux.dev; h=cc:to:from:subject:message-id:mime-version:date:reply-to:from:to:cc :subject:date:message-id:reply-to; bh=KeHmPmMyMKJKT4alX9Roe+NB+CyhbaLAdm3PrWL3iJM=; b=mN6DCx0ZFGR1xOWI0MeHn9zmGfhuN7WRJSoyv455JCy0UPJGrhmiseQA7a7PTDL+jx UQ4e698t5DlXNV8JyOl/OOVkUGULkoo8GFvLVlyJyEdGpJvaY/lkx5DWKHEvTlrJjDcC HZYqWwVBngF+yFWP4XjRLPk0t7cxNh0MVTw9OZHRSLeVoIDDmbnfKPgSlsCm3fP5pC7t WuLoN6RR0B+wwNCxQEz7cyLYKLnA51awah6X2QTWl3OeHFgo5JzVrR8VNIIJ6lJ/1lZv qze/AIpqfBqTXmvFgDj10Xc0F2zPUrYmvLcqYjnZ50j//xze9zHOhreZEO1oZPEWZZtJ NP0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749600645; x=1750205445; h=cc:to:from:subject:message-id:mime-version:date:reply-to :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=KeHmPmMyMKJKT4alX9Roe+NB+CyhbaLAdm3PrWL3iJM=; b=Rc+rgHY9Vvjlq1Li+eDikcua+0fhNKulU0MuOagx9PW1cdIxR45/9zcAE2fbKev0fT iOnW9xxm2lN4QthuZFBGwneIK0UPf+8QHFU9Cs3mTnj+rYzEM8H1YyqAWQdfvcjUeHNI iI1yuH4L7gxJcaHzLWPf13O0eYvjamfYH3TnJqFosFfQJwYV3VdgkrE1UOCaH8LKNq3o boH9fvSpUmYSjgdGSHu9WVeNzuY/6jOedzlScflZQWrIkNl4hxHviQh9t+gBk09SBYMm YYOxtr2Mkuzta2oFkTuOpX+gXV6AzAWD2gAXAZyRDxblrPMMnJQE+jUQbUJv0s7elCmd Fq7Q== X-Forwarded-Encrypted: i=1; AJvYcCVFLINVzEK6l1qk/FGpQZjA5BdPMZbnEKr3I6IuOUJz8f5AgdflQkBbFCtNlXW4gQIjh+Oz9/A=@lists.linux.dev X-Gm-Message-State: AOJu0Yx4JN3u15XGonii/cQkNlQOenWAa6mxBHG84LqnyNrdIKRtmNBK NtfOsLv2CiiHEBUOVDvP5SOazIomIwoURLk4MiQurbL56VzgOi7YWGpS1LkV3WD9r6F9DIhqVzG 45RobSw== X-Google-Smtp-Source: AGHT+IF8oABFbuTKJ9GcUMp/LE7xUGa2l9YHKCqeYYF9+w27QVhniGaieMvIcJ7joDnc4dA30O9QnXDBack= X-Received: from pjz3.prod.google.com ([2002:a17:90b:56c3:b0:312:e914:4548]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:3ec4:b0:311:9c9a:58d7 with SMTP id 98e67ed59e1d1-313b1fbe6admr808960a91.19.1749600645461; Tue, 10 Jun 2025 17:10:45 -0700 (PDT) Reply-To: Sean Christopherson Date: Tue, 10 Jun 2025 17:10:34 -0700 Precedence: bulk X-Mailing-List: kvmarm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Mailer: git-send-email 2.50.0.rc0.642.g800a2b2222-goog Message-ID: <20250611001042.170501-1-seanjc@google.com> Subject: [PATCH 0/8] KVM: Remove include/kvm, standardize includes 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-Type: text/plain; charset="UTF-8" Kill off include/kvm (through file moves/renames), and standardize the set of KVM includes across all architectures. This conflicts with Colton's partioned PMU series[1], but this should work as a nice prepatory cleanup for the partitioned PMU work (and hopefully can land sooner). Note, these patches were originally posted as part of a much larger and more agressive RFC[1]. We've effectively abandoned upstreaming the multi-KVM idea, but I'm trying to (slowly) upstream the bits and pieces that I think/hope are generally beneficial. [1] https://lore.kernel.org/all/20250602192702.2125115-1-coltonlewis@google.com [2] https://lore.kernel.org/all/20230916003118.2540661-1-seanjc@google.com Anish Ghulati (1): KVM: arm64: Move arm_{psci,hypercalls}.h to an internal KVM path Sean Christopherson (7): KVM: arm64: Include KVM headers to get forward declarations KVM: arm64: Move ARM specific headers in include/kvm to arch directory KVM: Move include/kvm/iodev.h to include/linux as kvm_iodev.h KVM: MIPS: Stop adding virt/kvm to the arch include path KVM: PPC: Stop adding virt/kvm to the arch include path KVM: s390: Stop adding virt/kvm to the arch include path KVM: Standardize include paths across all architectures MAINTAINERS | 1 - .../arm64/include/asm/kvm_arch_timer.h | 2 ++ arch/arm64/include/asm/kvm_host.h | 7 +++---- include/kvm/arm_pmu.h => arch/arm64/include/asm/kvm_pmu.h | 2 ++ .../kvm/arm_vgic.h => arch/arm64/include/asm/kvm_vgic.h | 2 +- arch/arm64/kvm/Makefile | 2 -- arch/arm64/kvm/arch_timer.c | 5 ++--- arch/arm64/kvm/arm.c | 6 +++--- {include => arch/arm64}/kvm/arm_hypercalls.h | 0 {include => 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/pmu-emul.c | 4 ++-- arch/arm64/kvm/psci.c | 4 ++-- arch/arm64/kvm/pvtime.c | 2 +- arch/arm64/kvm/reset.c | 3 +-- arch/arm64/kvm/trace_arm.h | 2 +- arch/arm64/kvm/trng.c | 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 | 4 ++-- arch/arm64/kvm/vgic/vgic-mmio-v3.c | 4 ++-- arch/arm64/kvm/vgic/vgic-mmio.c | 6 +++--- 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 +- 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/mips/kvm/Makefile | 2 -- arch/powerpc/kvm/Makefile | 2 -- arch/powerpc/kvm/mpic.c | 2 +- arch/riscv/kvm/Makefile | 2 -- arch/riscv/kvm/aia_aplic.c | 2 +- arch/riscv/kvm/aia_imsic.c | 2 +- arch/s390/kvm/Makefile | 2 -- arch/x86/kvm/Makefile | 1 - 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 => linux/kvm_iodev.h} | 0 virt/kvm/Makefile.kvm | 2 ++ virt/kvm/coalesced_mmio.c | 3 +-- virt/kvm/eventfd.c | 2 +- virt/kvm/kvm_main.c | 3 +-- 54 files changed, 64 insertions(+), 77 deletions(-) rename include/kvm/arm_arch_timer.h => arch/arm64/include/asm/kvm_arch_timer.h (98%) rename include/kvm/arm_pmu.h => arch/arm64/include/asm/kvm_pmu.h (99%) rename include/kvm/arm_vgic.h => arch/arm64/include/asm/kvm_vgic.h (99%) rename {include => arch/arm64}/kvm/arm_hypercalls.h (100%) rename {include => arch/arm64}/kvm/arm_psci.h (100%) rename include/{kvm/iodev.h => linux/kvm_iodev.h} (100%) base-commit: 61374cc145f4a56377eaf87c7409a97ec7a34041 -- 2.50.0.rc0.642.g800a2b2222-goog