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 C479941C8FE for ; Wed, 1 Jul 2026 19:33:01 +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=1782934384; cv=none; b=jMvHUMQfZ7U2Ft60U07+DuterehVbUFWVMrxXIBPNnjlDAyb+rAyHl2JOPNFuY2LcCryEMotoI/XXkW6v/4yCJUAbOxAxeMJuICc+3fDFbv/8JVppymfNSdYjWd7MlPHtf7er1xRx0EGeG0EJApX/8Nci+/938fUWJ0t0Ba6Th8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782934384; c=relaxed/simple; bh=7ECvDpVYy24rqoUPVQpDZNfw6Aqt7A7i1akOyN+Prss=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=nrQ9wwirInCsCbSHM+f4YpxHpLKykYiIXMF+feUU5rJsdWXo7NPeQuLyhdiolYwogxquAI5lwvD8Wk2tDnix0eo6EkFoUCQqUsMgYEqkZb7pFWUk4SmROwu3xbpxt4ERd9ge4MFAXNFGC209zwpiCEwdgvstVHzx5VtyS4JbKvM= 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=FwFScT8+; 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="FwFScT8+" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-2ca3b3141a6so13432035ad.1 for ; Wed, 01 Jul 2026 12:33:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1782934381; x=1783539181; 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=IHAlzrllQ2SIWnv0fCfBsaTBNv7ymljQujJZvblLIYE=; b=FwFScT8+OiwEGBK952uermUzhiWGkW6NMRbc63IKBa53bFmIdPxZBd8PNrtictgwJW yiEjsvSHh8GJeIfkyyZHIyyTBl8nHMEIHYmNbG5UN8ocdjTzxCV55cD0J1Dn/tzIYxa+ y1SigXDQ0Kj0oZv5EF5+sujyD6Wi2R/LMK/TINUWm35NGaTKo/EKi7bAU59EzzAXK6/m LtH/ccdlOtKbTfpXOBHzyyfCgP6bsd5hfENmiZ2VfEdTKmiYzGA3+uqVBB3NRD/5Oa2n VI0uPMW0HNE4UoWtm+0K5VkWwQw1oHdCe9RJzNAxWA5SyPD3wVY67H1s/gGB2wCUmuPk lIMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782934381; x=1783539181; 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=IHAlzrllQ2SIWnv0fCfBsaTBNv7ymljQujJZvblLIYE=; b=PH435jrFekn2MXfo9JOBfzCjLmnhWtOuPTSaOHZae3Zm0JTjaAqfQlVr7lBGOXtHFU wCKsG98hxKBP+MELwFTXJm37yvepQoGaYVDMtXuqRS0aS9/BYVtVQOwH7B0KAO2/OIke t/OnZLTLe74437azE2o/z70Bnyen3UzsiNxdKYWr/weGpz6YhUF7VHAArltsz9enbJaH Y1XsJa5Nt46cPwR6XnkWKKAebhUc6UH4vK8gHVi/1lB+o5xzRCibOBOFNR35Z89qucje mQG1rmZUXHADlvcXlMr0fir+NYXUDkHolXY8sQNsBe0t3qE/666ZEGLKWoumo8mVYPs7 7NRg== X-Forwarded-Encrypted: i=1; AHgh+RqOIo/vCJymPDAz+hPcN65/jgFURGTG98iBXIeM3YmX3K0zRKw7gZHrNmdd0Rchl3bhOFVU4V63lqEa@lists.linux.dev X-Gm-Message-State: AOJu0YwxKqM1JqmyOkbgYYuljSGHJcXbXwu2FEBU/Tb/0yB11lX932we FLl4f+jDv61C/ETsYg1PVtXeX2vRpZTuqQSvkC2h++nfKsRLhMJhIjq5gFcP34gjGvTnYjurn5t fXW23EA== X-Received: from plblk15.prod.google.com ([2002:a17:903:8cf:b0:2c7:f338:5690]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:41c7:b0:2ca:de3:15e2 with SMTP id d9443c01a7336-2ca7e561189mr31594705ad.0.1782934380474; Wed, 01 Jul 2026 12:33:00 -0700 (PDT) Reply-To: Sean Christopherson Date: Wed, 1 Jul 2026 12:31:49 -0700 In-Reply-To: <20260701193212.749551-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: <20260701193212.749551-1-seanjc@google.com> X-Mailer: git-send-email 2.55.0.rc0.799.gd6f94ed593-goog Message-ID: <20260701193212.749551-29-seanjc@google.com> Subject: [PATCH v5 28/51] x86/kvmclock: Setup kvmclock for secondary CPUs iff CONFIG_SMP=y From: Sean Christopherson To: Jonathan Corbet , Paolo Bonzini , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, Kiryl Shutsemau , Rick Edgecombe , 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: Shuah Khan , "H. Peter Anvin" , Vitaly Kuznetsov , Broadcom internal kernel review list , Boris Ostrovsky , Stephen Boyd , linux-doc@vger.kernel.org, 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, Tom Lendacky , Nikunj A Dadhania , David Woodhouse , 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 2e7ab54cb9dc..b0c871ba8232 100644 --- a/arch/x86/kernel/kvmclock.c +++ b/arch/x86/kernel/kvmclock.c @@ -208,7 +208,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"); @@ -348,7 +348,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.55.0.rc0.799.gd6f94ed593-goog