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 6296E47D928 for ; Fri, 29 May 2026 22:23:24 +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=1780093405; cv=none; b=DsRdpmMuS7HzIAIS1HQdmHKjv2QlxTBUSC3VRUnqpyhGMRqUHw3u6pQPZGaBVwsRL4iS96ImszaI6JR0wzTV9VHLpfUyeZtMmVk+xqx6drBvGH8LnY9DtcSEhif61iPbrwgMDeJHJFLICymlF6qxKYb2drcHkfcCVh6uGJZQRM8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780093405; c=relaxed/simple; bh=sM71/V/NEGLDRFoPFaHWGc/4+j5RVrXjbHZgs3jZqHk=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=khOJpSAxStGfI54MngOZM0RZ7zPlnKAT8N0SuIdXa90hiExb6p+28djPTxrSyeMwsP+Bc/WTfC0gqXNmbGZCostEBsPmSVHKWjpHCGsy04jq2mxGf9gsMLzWPheccqSmqsXyzi4/w2zBg9qebnGYJ0tScGr4HSRWMK+A2K3YYGc= 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=eDP2fdxo; 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="eDP2fdxo" Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-bce224720d8so7367450a12.1 for ; Fri, 29 May 2026 15:23:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780093403; x=1780698203; 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=OYRO9/6QUt8JjFWwLPnwN9Nibat8wZa6YMCn9yp2By4=; b=eDP2fdxoM4xwN1SlmEZp+kV4Pgb0NKOqEFMMg0aOCVvJhKvgtvoQ7T0gBCna5DDiS3 zIan811BECT5C1gUUnH3PtDEOQOXwF9yWAyE+DBFLhO6iKtKXBym/ymkrEJ4N+f94XWi Qrbkq1oyn5kTn3tiGLQ0sNidumlZbgGmS1n8CW76YLymFsHnlcNkydsLPO01RVOwnHj8 aKARKSlN8ekNSkVtNGF8fRMP/wGjMjoTcz0jyMnLU2oIcIfxNG8DJSjQ0ULCNvS2u8oU cO5iBm3ELWxwUFQbcPpFVbF1KgUXFpdOc6JCCNhoaaI4/J6Aqq2x/NfuZq6ZqGXpuDdh lN2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780093403; x=1780698203; 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=OYRO9/6QUt8JjFWwLPnwN9Nibat8wZa6YMCn9yp2By4=; b=NsfAMjd/Pg2LP6e+rv8hJONQrtvcfBy+oVeEYd+uGxmCOm7L8E7kzlf6Hg4XjHe9Al otW1actv6YoR9tHHmxjp41DVaOP/AtAmwq+eUI2aYTTo+YpiHhshI/hUc/BGnbf6oSt+ DfygJJiIXmRu5yVjKlsgLNdGPN6l1lZYyHOeBw80IiN3S7fnfuL4szgXDBPfFGR6cBXj bYV6pDo3HMsNsgryGMdWAz8K66dL8BZUlckAww4bNOU+buiqWJmCkzVBPv2L0X+gPtfH cVrLBzkLO29oIxQL0sAKu7rzLhRqeV3dzE1HQBxLyU2KbJYSFC7N2LIrF3658QoQn12V lyaA== X-Forwarded-Encrypted: i=1; AFNElJ8xaaok6/fxAK8BwbJClwEdVPFHzUaYP8pqSt+IcKDNhMn3l+tq5bl7A3F4Ye8DIZ4ch+RFSSx6aad9C9c=@vger.kernel.org X-Gm-Message-State: AOJu0Yy5whV8dS2k+2/kM026EJlvFNDgnGYoxCd4BH3nvbvSsgY6qEYk 5sNLZRACdY8imX29Hl7YLFrKkkUjaMDQRjwMdV+x7SYP9PBZOgmcZlf3LvDO0aM+THNbdDJAoqI D2Kgb/g== X-Received: from pgbs189.prod.google.com ([2002:a63:5ec6:0:b0:c79:89d2:43e8]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:9f17:b0:399:12d:41f with SMTP id adf61e73a8af0-3b427be7b60mr1372617637.7.1780093403446; Fri, 29 May 2026 15:23:23 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 29 May 2026 15:22:16 -0700 In-Reply-To: <20260529222223.870923-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: <20260529222223.870923-1-seanjc@google.com> X-Mailer: git-send-email 2.54.0.823.g6e5bcc1fc9-goog Message-ID: <20260529222223.870923-34-seanjc@google.com> Subject: [PATCH v3 33/40] KVM: x86: Move kvm_cpu_get_apicid() from kvm_host.h => avic.c From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini , Vitaly Kuznetsov , David Woodhouse , Paul Durrant Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Yosry Ahmed , Binbin Wu , David Woodhouse , Kai Huang Content-Type: text/plain; charset="UTF-8" Opportunistically drop the CONFIG_X86_LOCAL_APIC=n stub, as KVM hard depends on CONFIG_X86_LOCAL_APIC=y (the stub was there purely to deal with kvm_host.h being included by non-KVM code). No functional change intended. Signed-off-by: Sean Christopherson --- arch/x86/include/asm/kvm_host.h | 10 ---------- arch/x86/kvm/svm/avic.c | 5 +++++ 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 3e0884a862d7..989294c7501b 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -2427,16 +2427,6 @@ static inline void kvm_arch_vcpu_unblocking(struct kvm_vcpu *vcpu) kvm_x86_call(vcpu_unblocking)(vcpu); } -static inline int kvm_cpu_get_apicid(int mps_cpu) -{ -#ifdef CONFIG_X86_LOCAL_APIC - return default_cpu_present_to_apicid(mps_cpu); -#else - WARN_ON_ONCE(1); - return BAD_APICID; -#endif -} - int memslot_rmap_alloc(struct kvm_memory_slot *slot, unsigned long npages); #define KVM_CLOCK_VALID_FLAGS \ diff --git a/arch/x86/kvm/svm/avic.c b/arch/x86/kvm/svm/avic.c index b7083cd692ad..9264c8ef1fa1 100644 --- a/arch/x86/kvm/svm/avic.c +++ b/arch/x86/kvm/svm/avic.c @@ -146,6 +146,11 @@ static void avic_set_x2apic_msr_interception(struct vcpu_svm *svm, svm->x2avic_msrs_intercepted = intercept; } +static int kvm_cpu_get_apicid(int mps_cpu) +{ + return default_cpu_present_to_apicid(mps_cpu); +} + static u32 __avic_get_max_physical_id(struct kvm *kvm, struct kvm_vcpu *vcpu) { u32 arch_max; -- 2.54.0.823.g6e5bcc1fc9-goog