From patchwork Thu Feb 27 02:18:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 13993556 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) (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 DB1F91A0730 for ; Thu, 27 Feb 2025 02:19:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740622764; cv=none; b=sYA7tf7dirSj95kFtTcmDESShImj4aatmT/rj6vpVIL7WDt/1BTqvtyrXIUBozAVet9hWuNKH4RIuhBwmJ0gJ9yYq3pMsFHib7Lj20rnsTJmWqd4RU05rT1ZXMyg3/M8OBMsW3fBVqcMg1tu5UEdHwZ7I0HIVrnX1lE0husWX60= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740622764; c=relaxed/simple; bh=YBBFB7GmxuAVG9YiGJjI2SvbfrD7XwOfpFXbtpwvuc8=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=fcRVqTnQYqZ3yBVr18OjRy/2s6lEDxYO3YxiVKpWvL9WW3e1HHR5l2r6WmtCJM4YL4yPERJ3tvS8PMzHTHfIGZVRCHGbl+9YqM2DwHvWtFnTgpd+rO2JGbVBv1JfXLe3jI3Id74O3Rg8iyz7u6QQxnaOT4CQAV0ciLCbqajjPmY= 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=Mfl5tOLB; arc=none smtp.client-ip=209.85.216.73 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="Mfl5tOLB" Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-2fc3e239675so1565643a91.0 for ; Wed, 26 Feb 2025 18:19:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1740622762; x=1741227562; 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=yPGNLLFa/vXB2a0UM8EIYJpWd3IhBx8wcQJSj3RCAHc=; b=Mfl5tOLBxPPbZBxbuE6j27RikeaJMT8bJZcimZRek0AKjVfDveP7flohhWlEDHUCyl j0KsuPelGvo+36ZpDb/YCo0BwozOYknCCdKWkVXMRrNxweDfHuCbvm1XuN06Ak1Zkz9w blLrd7kaGYs7b6at1rblABhB6uZtnQvD2LUsQwVTFmUU+8+MHxPf7ftMmhHT1kJOzPdD m3S8bfaI1lB4xobOmyvZfiEiB1vh0V+DyKNmgB5Cc2zIFrBIVFQjNX2XvQcy9f6hJ3XJ bxGbSP5Mq1oIn5gQs3epb/NuKczYDNh1zwiE6OtGS5cBIIV6bO9bgopTtBMS1aO0nSUI iLjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740622762; x=1741227562; 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=yPGNLLFa/vXB2a0UM8EIYJpWd3IhBx8wcQJSj3RCAHc=; b=Ipv0ftBcqe/Eydw5VciSZEYcaKd2o5I4ldEHNVvurjSKu4MFd2VJszCHL/UuDETHDH QmyAgyuFf04coUU/T206u1cZe5IPKWV5eE8cLImhFy2ZGfBHSLnlrju2lfsuvpml1kvg duIXhBrw+5JncpdBF0iOJnYI5TNCEFNk1LcEqlPGCfdO1sMqI9UZHhV+A26HT2Wl2tyR Rtw7xUnKD/2JCx6Nd3cMBbwTJ6M31XKwkCN4+n+X4BCrilAMcXujdNSWWuHSwfa+g8Cy zw3qSuSu9u3nG/jXccasEOW2pfh0YlaKB7o1kH/ZUap54mEMTbd+Cv0Ln3BKD17zgy/p Y05w== X-Forwarded-Encrypted: i=1; AJvYcCUIgtIW7+aE/HBXCgCL3EiTeM4cdswjyyUFib3y32wMQ27ONek9qIAryV3OeB5Jtn6PWOE=@vger.kernel.org X-Gm-Message-State: AOJu0Yx58fcJZkVktKq/hHW2nWCca3rnlzUG4v+mJsl9OzYQ3FoU0Q1S C+BGwoOoDOWXjRdr7t3Ijd0p1qOZvPPHZuchlL4rl29/skNFNtMzolnAYZMK+CqkFPwA5orKbk/ vQw== X-Google-Smtp-Source: AGHT+IGTG4bhtwk6xF9NkwSwRr4MZ0JMu1OW/uXbFyNTNSUBj4feLwfxPugt+I59qi4711mZsSVJuOvx1D0= X-Received: from pjbqn3.prod.google.com ([2002:a17:90b:3d43:b0:2ea:5469:76c2]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90a:fa14:b0:2fe:84d6:cdfc with SMTP id 98e67ed59e1d1-2fe84d6cf88mr6952534a91.35.1740622762299; Wed, 26 Feb 2025 18:19:22 -0800 (PST) Reply-To: Sean Christopherson Date: Wed, 26 Feb 2025 18:18:27 -0800 In-Reply-To: <20250227021855.3257188-1-seanjc@google.com> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250227021855.3257188-1-seanjc@google.com> X-Mailer: git-send-email 2.48.1.711.g2feabab25a-goog Message-ID: <20250227021855.3257188-12-seanjc@google.com> Subject: [PATCH v2 11/38] x86/kvmclock: Setup kvmclock for secondary CPUs iff CONFIG_SMP=y From: Sean Christopherson To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "Kirill A. Shutemov" , Paolo Bonzini , Sean Christopherson , Juergen Gross , "K. Y. Srinivasan" , Haiyang Zhang , Wei Liu , Dexuan Cui , Ajay Kaher , Jan Kiszka , Andy Lutomirski , Peter Zijlstra , Daniel Lezcano , John Stultz Cc: linux-kernel@vger.kernel.org, linux-coco@lists.linux.dev, kvm@vger.kernel.org, virtualization@lists.linux.dev, linux-hyperv@vger.kernel.org, xen-devel@lists.xenproject.org, Tom Lendacky , Nikunj A Dadhania 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. 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 b898b95a7d50..80d1a06609c8 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"); @@ -324,7 +324,7 @@ void __init kvmclock_init(void) 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;