From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) (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 BF98C1EB5E9 for ; Thu, 27 Feb 2025 02:19:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740622771; cv=none; b=QCnr7LizZ9YyQwzWPl7zTjVTpE2mWyb5k5BH8XGG+qzYxcuR6plSTqy+j18stzszS0b5At8bj8R5awNhIHEG9tUDF7lL0eSWLGjuw6aMpzouLKdlBEVhkAAQaFmcdbEl0JPcjcIVg6WAGDyYr+2R/1Mm5X1nBUrM77Vgvva32x4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740622771; c=relaxed/simple; bh=qrmPmOcptAmLgQCle3N1kl8WrTK3PJ1AWETKMFIpJ6A=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=KUm5J6hR/GyyDyqhD1TM0GxKKS5eGsRCHGkwyxMiZXNA+QH4S8ugjATWO1LSEUWRWChB/5bgzZR0flB5H8uIKt2pF2BAl84K+12vGgFl6J8femOmPk3GmvyQXrys6YXyubaqLUoDLqTC9EZ6Yi12j4WVn6CWSYN7Gv5s3Hdiq5w= 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=dvt+tKtZ; arc=none smtp.client-ip=209.85.216.74 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="dvt+tKtZ" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-2fbff6426f5so1023099a91.3 for ; Wed, 26 Feb 2025 18:19:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1740622769; x=1741227569; 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=4/yyaam3CnBmuwJ2ykq85CXFFo+ZsEjkVRvpD/uHncQ=; b=dvt+tKtZZpt/MFv2ooD/+cCM6bsmfmFdGqhG1k60gJKiAOpIjnAlwMjylkvQtFJrDW 6aRoWE3w5M/ItrL2x19vNSV0r5UOwUeoOBnzaL2UZ9j7mCVKZTzSEShMB3VvZyC7JwiZ e5rKgzDIZAue5A0mzNY4lq1nxF8ukRXRa+rkGupMmvQBbY3B/QVtu53cH8zTdhFPqHUT UlBEO+9GX7uatQqKSI8TgsVH0M8gSkU5EKBJLAGPGq0e5luVvYKWHKzfFM0LVUM1B7Ei PAmD4l/vVTvvAom1FqGk0QXq/9RkWGAOHZ897qmJq3GPmziB2Ubf93B97f2HBbnRhAh2 nLIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740622769; x=1741227569; 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=4/yyaam3CnBmuwJ2ykq85CXFFo+ZsEjkVRvpD/uHncQ=; b=wD/lOpSseTrqhKO6emin6FJEs/XIwXJdK5YUs8Nyr2iYBZZE5fCREHJ0ChyN9b5dPJ h9tjfQBthdtCm87bkwLLOa0oxLeeO5M9ApbecZlwXFSKnbq3brkF2G/zM327I7Wa+/rZ pA8AUD4sJZjAmvrJc8Xzlu4WOzBBJI6ATKjXMEI3wb++Fvk5E9gW0BavjN3vUQ2y/AXz yi8knaWMgegGn4STcX5HLnwUsjVea1QjflyyeCkvrjAhIkViuZswfqCRziJglMugMVES qEWEH2m+eAguKs8Rn3tQzvPPTHaFY9HH4SI3dFwKIZSLD6x6B+htWxg8pVtcRxm5gZU/ Y1cg== X-Forwarded-Encrypted: i=1; AJvYcCX7828VjUeldqeqJxauZ6DnZLD9hZgXTzhnsaThsxbyFRuzbc1NG9olp7vYgOmlJ1u4CYVoow/R+S16CN17MA==@lists.linux.dev X-Gm-Message-State: AOJu0Yx9WRUQiMDwb8CGioW+u2GvfV2qa7PRbsFILT/ROY0kf6pbT7OQ PilmBwGhJ7Nn08uiqc8ZROUWxGZsu7UBvHVYKZ4LA+GCmGSldjLe/Zjfn0ErIGGENI1VAQWSqyS z3w== X-Google-Smtp-Source: AGHT+IHB6t2yNhuRRLSjnQcCsiQss9r1P7c1nIVM64h4xrkl38FU8N4jisiF+hTwqGE4B/+REyTZDinhF2Y= X-Received: from pjbqb10.prod.google.com ([2002:a17:90b:280a:b0:2e0:915d:d594]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:280c:b0:2ee:5bc9:75c7 with SMTP id 98e67ed59e1d1-2fe68ac9330mr14041142a91.5.1740622769336; Wed, 26 Feb 2025 18:19:29 -0800 (PST) Reply-To: Sean Christopherson Date: Wed, 26 Feb 2025 18:18:31 -0800 In-Reply-To: <20250227021855.3257188-1-seanjc@google.com> Precedence: bulk X-Mailing-List: virtualization@lists.linux.dev 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-16-seanjc@google.com> Subject: [PATCH v2 15/38] x86/xen/time: Nullify x86_platform's sched_clock save/restore hooks 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 Content-Type: text/plain; charset="UTF-8" Nullify the x86_platform sched_clock save/restore hooks when setting up Xen's PV clock to make it somewhat obvious the hooks aren't used when running as a Xen guest (Xen uses a paravirtualized suspend/resume flow). Signed-off-by: Sean Christopherson --- arch/x86/xen/time.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c index 9e2e900dc0c7..51eba986cd18 100644 --- a/arch/x86/xen/time.c +++ b/arch/x86/xen/time.c @@ -565,6 +565,12 @@ static void __init xen_init_time_common(void) xen_sched_clock_offset = xen_clocksource_read(); static_call_update(pv_steal_clock, xen_steal_clock); paravirt_set_sched_clock(xen_sched_clock); + /* + * Xen has paravirtualized suspend/resume and so doesn't use the common + * x86 sched_clock save/restore hooks. + */ + x86_platform.save_sched_clock_state = NULL; + x86_platform.restore_sched_clock_state = NULL; tsc_register_calibration_routines(xen_tsc_khz, NULL); x86_platform.get_wallclock = xen_get_wallclock; -- 2.48.1.711.g2feabab25a-goog