From nobody Mon Feb 9 20:30:26 2026 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 3507332277B for ; Thu, 13 Nov 2025 20:51:24 +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=1763067086; cv=none; b=VDMBkyFJPH0dA6HECKs0tdvsMWUXaKsATA3NfGHvMbzZsxSyQTKyYQQgiMl4nF2nBJ8k3vbIsDvNueVB9f3/WcIfUAATWhh8QwOscdRJ7TsKEQGGL0iAHhFpzeChvb7L3OLSD0N7Bzgf8QIjJTAsQaiWSML7a3fpRXZtcNwu+aU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763067086; c=relaxed/simple; bh=eAhyJbLqUXlwQlucntSBQU+UA5T0/Z2bvA4Pjea03G0=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=ivY/hzs25JHbgeWW3W41G9ej2gnt0NdnuEW1RVfNqHpCDWkkMsaNp3uv2r6nn55MLabHC2j7uDIiJDxhSi2Hte0IRPQS3Jomg6fBKNEutNuLqj2Hi4lS5qoCGaUz02edvK3FdY2dT4qJDNQ/zmq/IbFkmtPNN+1D4XGGSKF4qUQ= 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=B0MPILvC; 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="B0MPILvC" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-29846a9efa5so30409525ad.0 for ; Thu, 13 Nov 2025 12:51:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1763067084; x=1763671884; 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=C7fYJA4HWXsvtk3lehp2/p12kOlA15qEdCD6I2JDssg=; b=B0MPILvC44cJuscNyamdQu+kKF0fqGhkMkip9WS7b0do7Hm+0CRS87MfZgAYJqdzgB 1ZqORR7WMPmtMrhCP+LsHR5RDtXEJBpU5iSkjhHy6o9TwnHsVzDazwCX5aYkZ8wGCMEl gnxkk/m5DPadMK3CsMrlgaMpqDrSAmxrybiey/qcbaYIAmIcpmGmw9xmq1aNozNIHvtW Vf2r6dBJRhXq/+0PvcYu1D51z4M8oNt2MQcQjQgssYuwa6u4xjo4UtXQqd9n8Fc1yJu2 aE5+QN0UomNpOJiuGTDJm8i1dv0mHEVBAYUCIeRxAbaG17Xx6DEcNp+zbCe1FSggjtYJ bS+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763067084; x=1763671884; 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=C7fYJA4HWXsvtk3lehp2/p12kOlA15qEdCD6I2JDssg=; b=a4Beayfrz4Mp3hCavkKOfM9hu+I9SUgqNJCfdZpNAwM63e4igmFDYutWIvXA2poPj5 +bRqzvJhxkD+qT2RXPmEltYwE/0mRKGzK+XG7OUETYqU1GXfey345TOiuu2wZvTFVEZf MFJwHZBt5BalzJVacrTivapQGXsslfqv2azUqIV12Rk85J4rL2Xfptv14GJlh2JLmLZB yFS+CQs/kUe13NGdOgih8SwrfpL8prQr3goolnfpG6+/wnqn7NRTbrxn+cjrvL2ctPyA Fry3pq6X5Wc+Fvvxn8CutmsgkYhnToArGBpwoXHi7iqUGTpY78wQZxjd9Oq6j179Yw5c OFaw== X-Forwarded-Encrypted: i=1; AJvYcCWQ+cMkt6F/KZNmTwbp6pZZldy8emq+vQqpA5Y0JNZKRRUyWKeReYn1N8nF9wmuMNr3pyPcIpA0nGVQNR0=@vger.kernel.org X-Gm-Message-State: AOJu0YyETkTKw4QD0K1wNHdi+uYixP6c+RsHE4st7Kwe+M0Gp/d7smir TMFkKYf5cpUsoXSZGZgAq10Eb1nJFUs0SDAxvOwNFjnyXYByMJi+pcM1+8zybWXWG1S8U496l4e CH6rOlg== X-Google-Smtp-Source: AGHT+IFcKCPvjnTbeCT8KN8m2AR8BSXmhvS7vXQLw6Thu8ciwldiBuq98W7UYmI82opbMJksxR+2zZr76OU= X-Received: from plau6.prod.google.com ([2002:a17:903:3046:b0:258:dc43:b015]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:b0d:b0:295:4d50:aab8 with SMTP id d9443c01a7336-2986a6c3747mr3264535ad.24.1763067084383; Thu, 13 Nov 2025 12:51:24 -0800 (PST) Reply-To: Sean Christopherson Date: Thu, 13 Nov 2025 12:51:14 -0800 In-Reply-To: <20251113205114.1647493-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: <20251113205114.1647493-1-seanjc@google.com> X-Mailer: git-send-email 2.52.0.rc1.455.g30608eb744-goog Message-ID: <20251113205114.1647493-5-seanjc@google.com> Subject: [PATCH v6 4/4] KVM: x86: Grab lapic_timer in a local variable to cleanup periodic code From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, fuqiang wang Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Stash apic->lapic_timer in a local "ktimer" variable in advance_periodic_target_expiration() to eliminate a few unaligned wraps, and to make the code easier to read overall. No functional change intended. Signed-off-by: Sean Christopherson --- arch/x86/kvm/lapic.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index 8b6ec3304100..1597dd0b0cc6 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -2126,6 +2126,7 @@ static bool set_target_expiration(struct kvm_lapic *a= pic, u32 count_reg) =20 static void advance_periodic_target_expiration(struct kvm_lapic *apic) { + struct kvm_timer *ktimer =3D &apic->lapic_timer; ktime_t now =3D ktime_get(); u64 tscl =3D rdtsc(); ktime_t delta; @@ -2137,9 +2138,8 @@ static void advance_periodic_target_expiration(struct= kvm_lapic *apic) * over time as differences in the periods accumulate, e.g. due to * differences in the underlying clocks or numerical approximation errors. */ - apic->lapic_timer.target_expiration =3D - ktime_add_ns(apic->lapic_timer.target_expiration, - apic->lapic_timer.period); + ktimer->target_expiration =3D ktime_add_ns(ktimer->target_expiration, + ktimer->period); =20 /* * If the new expiration is in the past, e.g. because userspace stopped @@ -2150,17 +2150,17 @@ static void advance_periodic_target_expiration(stru= ct kvm_lapic *apic) * past will do nothing more than waste host cycles, and can even lead * to a hard lockup in extreme cases. */ - if (ktime_before(apic->lapic_timer.target_expiration, now)) - apic->lapic_timer.target_expiration =3D now; + if (ktime_before(ktimer->target_expiration, now)) + ktimer->target_expiration =3D now; =20 /* * Note, ensuring the expiration isn't in the past also prevents delta * from going negative, which could cause the TSC deadline to become * excessively large due to it an unsigned value. */ - delta =3D ktime_sub(apic->lapic_timer.target_expiration, now); - apic->lapic_timer.tscdeadline =3D kvm_read_l1_tsc(apic->vcpu, tscl) + - nsec_to_cycles(apic->vcpu, delta); + delta =3D ktime_sub(ktimer->target_expiration, now); + ktimer->tscdeadline =3D kvm_read_l1_tsc(apic->vcpu, tscl) + + nsec_to_cycles(apic->vcpu, delta); } =20 static void start_sw_period(struct kvm_lapic *apic) --=20 2.52.0.rc1.455.g30608eb744-goog