From mboxrd@z Thu Jan 1 00:00:00 1970 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 57CA8373C00 for ; Thu, 25 Jun 2026 22:05:03 +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=1782425111; cv=none; b=ZkIsur9ujBhkrXBNo95COz4Zn87iTpkoxgDCfw3COXOJydzrDMhNQ1paCpjXoY8qsSMXg1E9DbS2VrR9cDnwcxtpIgmYEflMMzkn6pSgBOEn9ZFlt2uBIUZuM/rVJDREaxGgKOE7VAeLC63lYVkUoR3pY1Uot7XB/7K3umF+yIw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782425111; c=relaxed/simple; bh=mD7qRJ4tWTYKul9nyqh7evQYsIh41idiEG4HedbvgB4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=jMX62Hz+6mltXylKqs7NSWdkgwMdV78Kxsd2fF9X9q4QdBVYsGj7mAQRCeUfiEzBlYUtxkOyX9ygNp20gOcSjL6OgnWZiTLysGEMBdj3U0UX+XFSCgrS8cHV7ljdxD0JXG+wvi+fsqaUH/ANmIGOLWv1QaftLbSi1O7Act7Qk4Q= 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=Dhu2DOfQ; 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="Dhu2DOfQ" Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-c889d1eedcdso163267a12.1 for ; Thu, 25 Jun 2026 15:05:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1782425103; x=1783029903; 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=HbM8iSooNI5ZtGNOvlQPJhXux6evN6doi/+axz0jSVg=; b=Dhu2DOfQty9I6ak+u2NASxtjjz27DPv3RvkbXTBrmtwUxGjUTA6a65u2c5eJYDBlI+ OM/2IGS35M7FyJPUrOXpEPD35ryvh9J9Bu6XD0m9EfYYy3L0kiolzc9EKXs4SPKxYLY0 O7t/FjIYkvtKKEtJOUBbYZQo6uKejdzf0KsBu4SrD+/CPy+PoOtZi08JGvKz9bhl+oTH 5qqwzH2UcYKXS5X+nzfKo4td/4i6GIPjYv484mRgmWMMvo+wnoKRylOZxDtDbry34wk2 kV5UqzE5avbgv0hyBGuqVehw3dpXaWA5gmFtvHG4EcYSWVbbOqe7Cd6L2OCGnICGhFSC /Wpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782425103; x=1783029903; 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=HbM8iSooNI5ZtGNOvlQPJhXux6evN6doi/+axz0jSVg=; b=my+P4Y+cA8Q0nEtUvLmpSmRILwL50LUpTf3ktv3jigOnfbEQRPRkC78xux1KcqMpqA rfeXtwokaxbEmCtwrULUcbu+8GZu/Fh2SuVG/NO0EJF7DlBAPq3zhAQ8eHdERB/hHRM/ iF5mXQy2Dk8v29tWQiFyfU8bnNDJdN/ANQxlH6bqPQESE8LOl/61wAJD3UszvGRqNBVq HEoQXg13XOvmKojjvrjEOH31+Hqj9cx2OJ4j+mqU8sUsakCz7+B2S8luBpggAygQJnQj 64GtfrYatazpXb8HBU7g25DU7YTABGMO5VH+LiRJUc5VB1HIuz20GIuK3EKZ9IXjenC+ Op8A== X-Forwarded-Encrypted: i=1; AFNElJ/X+nLJ/YCtQQrEBAa9uyLknVZHgsSs+DcobKIQUAfeuFgRZVqF3NlS3RA8cs4+0PJt5OYZkf0ibz87G0M=@vger.kernel.org X-Gm-Message-State: AOJu0Yy3HaOK9iS2T1aYp1nM2TjcpiDzrVWf72A7H8Kj6jDtaahXoWQs WhrLK9CgSErcb1qygb5qO+UP2KqvQtI2ioff8unBDpJcGhW/9v7v85AlJ6I0a1d/lcO2d5aTFfb /jMJzfg== X-Received: from pgbbq3.prod.google.com ([2002:a05:6a02:443:b0:c82:26d4:bb49]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:734c:b0:398:9379:d04d with SMTP id adf61e73a8af0-3bd4aec5a05mr4943479637.24.1782425102478; Thu, 25 Jun 2026 15:05:02 -0700 (PDT) Reply-To: Sean Christopherson Date: Thu, 25 Jun 2026 15:04:49 -0700 In-Reply-To: <20260625220450.3354415-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: <20260625220450.3354415-1-seanjc@google.com> X-Mailer: git-send-email 2.55.0.rc0.799.gd6f94ed593-goog Message-ID: <20260625220450.3354415-9-seanjc@google.com> Subject: [PATCH 8/9] KVM: x86: Move "struct kvm_apic_map" definition from kvm_host.h => lapic.h From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini , Vitaly Kuznetsov Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Binbin Wu , Kai Huang Content-Type: text/plain; charset="UTF-8" Move the definition of "struct kvm_apic_map", a.k.a. the optimized local APIC map, to lapic.h, as it is very nearly an implementation details that's internal to KVM's local APIC emulation (KVM also uses the map to do quick lookups when a vCPU is yielding to a different vCPU). No functional change intended. Suggested-by: Kai Huang Signed-off-by: Sean Christopherson --- arch/x86/include/asm/kvm_host.h | 35 ++------------------------------- arch/x86/kvm/lapic.h | 33 +++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 33 deletions(-) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index c7d53d46763b..90efc3c90b41 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -244,6 +244,8 @@ enum x86_intercept_stage; struct kvm_kernel_irqfd; struct kvm_kernel_irq_routing_entry; +struct kvm_apic_map; + struct kvm_x86_msr_filter; struct kvm_x86_pmu_event_filter; @@ -1122,39 +1124,6 @@ struct kvm_arch_memory_slot { unsigned short *gfn_write_track; }; -/* - * Track the mode of the optimized logical map, as the rules for decoding the - * destination vary per mode. Enabling the optimized logical map requires all - * software-enabled local APIs to be in the same mode, each addressable APIC to - * be mapped to only one MDA, and each MDA to map to at most one APIC. - */ -enum kvm_apic_logical_mode { - /* All local APICs are software disabled. */ - KVM_APIC_MODE_SW_DISABLED, - /* All software enabled local APICs in xAPIC cluster addressing mode. */ - KVM_APIC_MODE_XAPIC_CLUSTER, - /* All software enabled local APICs in xAPIC flat addressing mode. */ - KVM_APIC_MODE_XAPIC_FLAT, - /* All software enabled local APICs in x2APIC mode. */ - KVM_APIC_MODE_X2APIC, - /* - * Optimized map disabled, e.g. not all local APICs in the same logical - * mode, same logical ID assigned to multiple APICs, etc. - */ - KVM_APIC_MODE_MAP_DISABLED, -}; - -struct kvm_apic_map { - struct rcu_head rcu; - enum kvm_apic_logical_mode logical_mode; - u32 max_apic_id; - union { - struct kvm_lapic *xapic_flat_map[8]; - struct kvm_lapic *xapic_cluster_map[16][4]; - }; - struct kvm_lapic *phys_map[]; -}; - /* Hyper-V synthetic debugger (SynDbg)*/ struct kvm_hv_syndbg { struct { diff --git a/arch/x86/kvm/lapic.h b/arch/x86/kvm/lapic.h index 58dbb94f980d..bd1098c89d99 100644 --- a/arch/x86/kvm/lapic.h +++ b/arch/x86/kvm/lapic.h @@ -32,6 +32,39 @@ enum lapic_mode { LAPIC_MODE_X2APIC = MSR_IA32_APICBASE_ENABLE | X2APIC_ENABLE, }; +/* + * Track the mode of the optimized logical map, as the rules for decoding the + * destination vary per mode. Enabling the optimized logical map requires all + * software-enabled local APIs to be in the same mode, each addressable APIC to + * be mapped to only one MDA, and each MDA to map to at most one APIC. + */ +enum kvm_apic_logical_mode { + /* All local APICs are software disabled. */ + KVM_APIC_MODE_SW_DISABLED, + /* All software enabled local APICs in xAPIC cluster addressing mode. */ + KVM_APIC_MODE_XAPIC_CLUSTER, + /* All software enabled local APICs in xAPIC flat addressing mode. */ + KVM_APIC_MODE_XAPIC_FLAT, + /* All software enabled local APICs in x2APIC mode. */ + KVM_APIC_MODE_X2APIC, + /* + * Optimized map disabled, e.g. not all local APICs in the same logical + * mode, same logical ID assigned to multiple APICs, etc. + */ + KVM_APIC_MODE_MAP_DISABLED, +}; + +struct kvm_apic_map { + struct rcu_head rcu; + enum kvm_apic_logical_mode logical_mode; + u32 max_apic_id; + union { + struct kvm_lapic *xapic_flat_map[8]; + struct kvm_lapic *xapic_cluster_map[16][4]; + }; + struct kvm_lapic *phys_map[]; +}; + enum lapic_lvt_entry { LVT_TIMER, LVT_THERMAL_MONITOR, -- 2.55.0.rc0.799.gd6f94ed593-goog