From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.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 167F33EEAC3 for ; Fri, 29 May 2026 14:45:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780065926; cv=none; b=a2H0ICBOGo1ouaUXCB0awNELlWyjBet3DiBtQoSppK33/X4Z+tfkc4wBi2kSxChIMKIyk7aEaiFPQ1VtLNqBv/xlQdZVrpQcPIUBSZosCL/wnAuskfzB6MkNleJ2Mkdh8xf4QT6o3xL18XZ1qTEzDRuvSHpi0qEBtwz5MxSTCc0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780065926; c=relaxed/simple; bh=fK2LI2CUeD0BDEX+PJXGpTUqY8RX3Vr+B1cVn7pLK3g=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=JwOHNhkt7m54JIu/+wxExsK8JtVPkOb9a84IIbl79RCnZrh/qO1c2RA/+oqne5aNHXal/uh4ufsnrFbnODocy07mL2wMbMoofDd59tTD0p0C133TeYZXKYLppabQeVS7LM9ycun8GAWfmxm/4I6q6yTAwp/wF1gksGhM3g1eVpY= 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=dn6P6I0d; arc=none smtp.client-ip=209.85.214.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="dn6P6I0d" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-2bd6aeb3637so312732585ad.2 for ; Fri, 29 May 2026 07:45:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780065923; x=1780670723; darn=lists.linux.dev; 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=n/IQNTw72HzXqO6AWPqeABL90E8LQ8oyD69HI8J1qOQ=; b=dn6P6I0d9GZegfDF9G7Uy3o/xvT0Sx6LQlp6cXQUXgONMOMJAZYhmCc2yLt6WCiHTP Wzt6ZxocOtpL85gCLlTgumu314LLHzs3hHpMUBT3nk7E96Yn9mNO0KnnfdIAXMWnOwja eUu7ewQ00bLnw0360+gaUuOzjVAFwexPqfqCBKHcko+W3UKFBQjjWJSQ+kVbbAK7Umyq DzllvCMrZowzejqNv2hX8rdRuUYsQXxk+/Ys3C6GIErtxIcF2ndUnjpkBdD6+zh14KsO 6zhRzytMIOa8V03cAZ8Jqo/l66Ut4k4DYza6FxQHv4NXQ6SM7e9aITM6EG9wB07oNzuu M0Wg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780065923; x=1780670723; 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=n/IQNTw72HzXqO6AWPqeABL90E8LQ8oyD69HI8J1qOQ=; b=Uw5LlIHIamoeUGKf4mJ3D+8qsTRKrgrILE7lzP9+C51PxTSlrHT5eqePkoa414zgij VWHQPVs8dzQ02Wu8NuzNOtCngEHft0bwI9d4NEKxGY/X8pDcZtEsoeQAIod0pI1FXVJD AoUzHLV8iXZ04FXfiqiPhxu0sDzoGoOaa2wm0gMRi5nhoHOcP1zyweBstZ1nemS0nWWe Wd2F60ioUvrlkZPZgv7AbmfU/lALcPxC0FNDiein9U05xHi9D5vCrNY2BzcUD1OddW3v 8+KQuaeOqlqsYEs7wTFpSBnmORYO0U4mcfoqQSK33R3fs8J98U+qclU+WchPyhZO8myV GmwQ== X-Forwarded-Encrypted: i=1; AFNElJ+PULxM2czyRVZFySoVwtcJIUcHuAkFh3L3NuBjkW5fmP5v4XP4k7YOvjHkbwYsqSoD1zzP8KHCcK9T@lists.linux.dev X-Gm-Message-State: AOJu0YzplGiLAo/IGu9ZgQ0rHGhX7Rk5FArI3aGgI7TbEeLI01GgbHba rgg0u4bkdQ57ZKW8NxmZJz7i624c8IZiOdP9ygnwaHoFTx/wj8BG0eaNFVVuSynnJNpobl9b5Wm GHxRSVQ== X-Received: from plbbj2.prod.google.com ([2002:a17:902:8502:b0:2bf:1b54:1fc4]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:906:b0:2bf:13b6:dafd with SMTP id d9443c01a7336-2bf367ddeecmr1314895ad.18.1780065921988; Fri, 29 May 2026 07:45:21 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 29 May 2026 07:44:12 -0700 In-Reply-To: <20260529144435.704127-1-seanjc@google.com> Precedence: bulk X-Mailing-List: linux-coco@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260529144435.704127-1-seanjc@google.com> X-Mailer: git-send-email 2.54.0.823.g6e5bcc1fc9-goog Message-ID: <20260529144435.704127-26-seanjc@google.com> Subject: [PATCH v4 25/47] x86/kvmclock: Setup kvmclock for secondary CPUs iff CONFIG_SMP=y From: Sean Christopherson To: Paolo Bonzini , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, Kiryl Shutsemau , Sean Christopherson , "K. Y. Srinivasan" , Haiyang Zhang , Wei Liu , Dexuan Cui , Long Li , Ajay Kaher , Alexey Makhalov , Jan Kiszka , Andy Lutomirski , Peter Zijlstra , Juergen Gross , Daniel Lezcano , John Stultz Cc: "H. Peter Anvin" , Rick Edgecombe , Vitaly Kuznetsov , Broadcom internal kernel review list , Boris Ostrovsky , Stephen Boyd , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-coco@lists.linux.dev, linux-hyperv@vger.kernel.org, virtualization@lists.linux.dev, xen-devel@lists.xenproject.org, David Woodhouse , Tom Lendacky , Nikunj A Dadhania , David Woodhouse , Michael Kelley , Thomas Gleixner Content-Type: text/plain; charset="UTF-8" Gate kvmclock's secondary CPU code on CONFIG_SMP, not CONFIG_X86_LOCAL_APIC. Originally, kvmclock piggybacked PV APIC ops to setup secondary CPUs. When that wart was fixed by commit df156f90a0f9 ("x86: Introduce x86_cpuinit.early_percpu_clock_init hook"), the dependency on a local APIC got carried forward unnecessarily. Reviewed-by: David Woodhouse Signed-off-by: Sean Christopherson --- arch/x86/kernel/kvmclock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c index 69a15fbfb779..13c728444e12 100644 --- a/arch/x86/kernel/kvmclock.c +++ b/arch/x86/kernel/kvmclock.c @@ -186,7 +186,7 @@ static void kvm_restore_sched_clock_state(void) kvm_register_clock("primary cpu clock, resume"); } -#ifdef CONFIG_X86_LOCAL_APIC +#ifdef CONFIG_SMP static void kvm_setup_secondary_clock(void) { kvm_register_clock("secondary cpu clock"); @@ -326,7 +326,7 @@ void __init kvmclock_init(bool prefer_tsc) x86_init.hyper.get_cpu_khz = kvmclock_get_tsc_khz; x86_platform.get_wallclock = kvm_get_wallclock; x86_platform.set_wallclock = kvm_set_wallclock; -#ifdef CONFIG_X86_LOCAL_APIC +#ifdef CONFIG_SMP x86_cpuinit.early_percpu_clock_init = kvm_setup_secondary_clock; #endif x86_platform.save_sched_clock_state = kvm_save_sched_clock_state; -- 2.54.0.823.g6e5bcc1fc9-goog