From nobody Mon Feb 9 10:28:14 2026 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (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 754E72F5A01 for ; Sat, 3 Jan 2026 09:46:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767433576; cv=none; b=cQPEjXgr3fanhEHBwgaeg0jRiB14/yEXCpmRKmSaIDpHyc/36wCFjUzxl5SiLLsPbMv5TNakjwy7ZuKS9/lJpuULruE6jgtx2rdfZ7Egui3VCCCVnBlBaUoPE7q7wpkwsa9A1H2VcgLqHz9i+MOSUu9Jf6Up9r+4BUoq+XeyqzY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767433576; c=relaxed/simple; bh=yc4wocHubhJNjuOJ923K2RmiU09pvoJT7Cjlm+DcU+I=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=RA1azMH1NIr8lto6/NkcuPvcfsIS/4OVbfC7xrWFm5YpLf/zoiMj4PfljQcVKNcLc57eNB2IfE8IWR1u/thhHLgPL9AAI4f2t6Iqlh3jp+fB8e0MjtVHNqGcPeOu3gqGBJsM8kwABnjjArkPAii2TDWCO+oAQHNWdcptQbuscLw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=CpbiXT3u; arc=none smtp.client-ip=209.85.214.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="CpbiXT3u" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-2a12ebe4b74so226666145ad.0 for ; Sat, 03 Jan 2026 01:46:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1767433575; x=1768038375; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lxjRzDH8YfA2CgJ8ukRlCUfNc/bMZBLM3ftExUQvlc8=; b=CpbiXT3ul96SlIlEKAVPFONPB0ilsaJ8ZF9177y3PFMkzapnX6j+L17C54PbJT/Rdj G/avRhjj327eWzEfu/T0imsPH63MEGqVE9Tdm8Aw8o5TTSsFVoEV/iYMjVmCv2P4+FEw 5cr+GC7N6AVKkkEVB/p1LTLbmcLNoqqnzlQoYRz+kw/S+CYSz271ZVnH3VeYiY5BgmVm 2QXsLNHH+JIv9yCLYVKvLZdl1AxbOvanLkLD+uWXpPOhgrxy1VILLWcikHAN0HEOXUfQ 1kkWDCZ7aSYf/S1LvpmrPENqt+CqxItZYorPudMW2EYDimxRAiJ/0kKOZRYrVAPEIIM0 FkAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767433575; x=1768038375; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=lxjRzDH8YfA2CgJ8ukRlCUfNc/bMZBLM3ftExUQvlc8=; b=ocSyD+h2f41cVh/J9XpEkJvzshFDPEkFIJnYT3rzh/qPMiiDdRFwof3UyABk2a0biB m7sH92OgM/AV5TFHih7TH1oTZ0bveBsPywA8vbLvVir4dKNAmfFFvktMd+Dy4tft8eFe 7UfKZOTZCXqDbI31fTD69rWs7MWy/PphKvxYWmA9ff4W80CYwYxyMvQSdT8XHWco+cQQ OcLoWlBgxxSh6Z3t5TdvH1Sib4zSNTifTNBYBFmZyUAyVh3CueoC7gvVY82jmD6Hl5Je nMRSnB9Ah+Tdtcg9pmZU4MMNBXFe8jMPvnKegsUjUGqtekwAkCg+rmx3dRL6dIkT8Kzp BJAg== X-Forwarded-Encrypted: i=1; AJvYcCXj6KKYQdLOpVtYQKVW96rBFa0ZbdqEWXvYC7owpWIi62z6ZNAKmPf5IJCU8c/Ppzi1x6nTtg5UwGMPju4=@vger.kernel.org X-Gm-Message-State: AOJu0YwougDf6ZawEB79aV/eylAko2tCL93cwIltTtwOl+2hD2I8bbF6 vUAqfkRhCFOX5UAzqj50B7bKc02ohowxLt8YZTKoLoAlgExQ+T1SjJji X-Gm-Gg: AY/fxX78WGazgfGCdcVt1G7Di+e2+FrBKtR1sRDAOTjzAJfj9hm5APvJTNu5ck9pFcg WSW34rbgycN0AECu9tvBYDguKMbtOvMBUvXEP9vjIBGySSXu5OYknrwyIWYaPl+iQaYlmWDj28H fv9IhQ1xfL+CnsXdUN+9de5i0bkIOHtAsqWdiRH67hX4/w8BCmwIRIJBJC2UeKFcJo2bYg1sTrs fkIMCI68sYupXqba0KSzdoQSuViUGEAokVaRnEn6PSlB/Ekrus0V2aCymQkI3Oo6Ds2zy0OgKZ5 qzE145Aaa1l0KFVOYEkEhHY46TBj/ffbxHM1GXNQWqKjwqiqkUijuPvpExZLjyHGYL9CoD3G6LF +s7V2mgo02HRblJOSFi8yvAvNEx8FBSY6SiEoRsod7KcuQyBFzoBOeY9rz8DqTj3suN+385Aza/ kYBQNrj0tRmz0LaHTZ8y4rR83ZWKkQxC1lPSJwAE/shH87u7B2We7Jj146IDIhHUjw X-Google-Smtp-Source: AGHT+IEkB956+B9xGmx9cTGzL/pONpKgSLBP8lNFvd+0O3zkG68Mte459jHa1jjHCkA3n/rN8fRFsg== X-Received: by 2002:a17:903:290:b0:2a1:e19:ff5 with SMTP id d9443c01a7336-2a2f273818fmr480811265ad.38.1767433574809; Sat, 03 Jan 2026 01:46:14 -0800 (PST) Received: from localhost.localdomain (123-48-16-240.area55c.commufa.jp. [123.48.16.240]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a2f3d4cbdasm403124315ad.65.2026.01.03.01.46.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Jan 2026 01:46:14 -0800 (PST) From: Naohiko Shimizu To: pjw@kernel.org, palmer@dabbelt.com, aou@eecs.berkeley.edu Cc: alex@ghiti.fr, anup@brainfault.org, atish.patra@linux.dev, daniel.lezcano@linaro.org, tglx@linutronix.de, nick.hu@sifive.com, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, Naohiko Shimizu Subject: [PATCH 2/3] riscv: kvm: Fix vstimecmp update hazard on RV32 Date: Sat, 3 Jan 2026 18:45:00 +0900 Message-Id: <20260103094501.5625-3-naohiko.shimizu@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20260103094501.5625-1-naohiko.shimizu@gmail.com> References: <20260103094501.5625-1-naohiko.shimizu@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Signed-off-by: Naohiko Shimizu --- arch/riscv/kvm/vcpu_timer.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/riscv/kvm/vcpu_timer.c b/arch/riscv/kvm/vcpu_timer.c index 85a7262115e1..f36247e4c783 100644 --- a/arch/riscv/kvm/vcpu_timer.c +++ b/arch/riscv/kvm/vcpu_timer.c @@ -72,8 +72,9 @@ static int kvm_riscv_vcpu_timer_cancel(struct kvm_vcpu_ti= mer *t) static int kvm_riscv_vcpu_update_vstimecmp(struct kvm_vcpu *vcpu, u64 ncyc= les) { #if defined(CONFIG_32BIT) - ncsr_write(CSR_VSTIMECMP, ncycles & 0xFFFFFFFF); + ncsr_write(CSR_VSTIMECMP, ULONG_MAX); ncsr_write(CSR_VSTIMECMPH, ncycles >> 32); + ncsr_write(CSR_VSTIMECMP, (u32)ncycles); #else ncsr_write(CSR_VSTIMECMP, ncycles); #endif @@ -307,8 +308,9 @@ void kvm_riscv_vcpu_timer_restore(struct kvm_vcpu *vcpu) return; =20 #if defined(CONFIG_32BIT) - ncsr_write(CSR_VSTIMECMP, (u32)t->next_cycles); + ncsr_write(CSR_VSTIMECMP, ULONG_MAX); ncsr_write(CSR_VSTIMECMPH, (u32)(t->next_cycles >> 32)); + ncsr_write(CSR_VSTIMECMP, (u32)(t->next_cycles)); #else ncsr_write(CSR_VSTIMECMP, t->next_cycles); #endif --=20 2.39.5