From nobody Wed Nov 27 11:51:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1699348975; cv=none; d=zohomail.com; s=zohoarc; b=cuGjf+zkkvEKfBQDqjjKbz8V60gszqAeuXR5JwVqXFvLteuPLIxLwcx65RaxcbQHH6rJBKAfXzFPwFSC7G/TweG93Oy4vt9nKq1udtf8OYitPBP3gW42jpYuwNXmpG9oeyFApCNRbTHGky+9Ea6wweRHEdzslEVJEDS4KZNL0YU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1699348975; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=V5wVtrx8UgxSKoOwvw8is7afApLiI289ZQm564mFLDc=; b=nfw7pJt3vV576/U4HyXGodi4F6URk1Y+uvdiAKAFXae998bqenYH/xwib8aLdxWjQrmgzHNd91thG9NROFFilMtETqhW5SmfAVSG9Bt0tdAS7x1d6yzI+72NkGMZQntbP/MoYBfZ+m8REP8b/Q6+nHMLAAqKc0EErC+o4YIn3u4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1699348975880207.8168707591816; Tue, 7 Nov 2023 01:22:55 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.628634.980310 (Exim 4.92) (envelope-from ) id 1r0IHu-0002Wr-8q; Tue, 07 Nov 2023 09:22:22 +0000 Received: by outflank-mailman (output) from mailman id 628634.980310; Tue, 07 Nov 2023 09:22:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1r0IHt-0002U9-Sc; Tue, 07 Nov 2023 09:22:21 +0000 Received: by outflank-mailman (input) for mailman id 628634; Tue, 07 Nov 2023 09:22:20 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1r0IHs-0001o6-NS for xen-devel@lists.xenproject.org; Tue, 07 Nov 2023 09:22:20 +0000 Received: from casper.infradead.org (casper.infradead.org [2001:8b0:10b:1236::1]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 212afb9a-7d4f-11ee-9b0e-b553b5be7939; Tue, 07 Nov 2023 10:22:11 +0100 (CET) Received: from [2001:8b0:10b:1::ebe] (helo=i7.infradead.org) by casper.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1r0IHN-00BPkI-86; Tue, 07 Nov 2023 09:21:50 +0000 Received: from dwoodhou by i7.infradead.org with local (Exim 4.96.2 #2 (Red Hat Linux)) id 1r0IHN-001hJu-1c; Tue, 07 Nov 2023 09:21:49 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list X-Inumbo-ID: 212afb9a-7d4f-11ee-9b0e-b553b5be7939 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc: To:From:Reply-To:Content-ID:Content-Description; bh=V5wVtrx8UgxSKoOwvw8is7afApLiI289ZQm564mFLDc=; b=clTzUXXVLN8HHynxbFTl5nUC2c LTq7FBlCH+K/ZXc7WSJTD2S55w1W8E+9stw7i0URoaQWirpU6ADloyFwc9b6CnMzIeVhwvODrNn7V r/qdCDiOrbhwbA7ULU2lyyKvW7/0vcfgdxeFL6lK97a8+8iRxcwlaDtu5vxKYRhNe1bti0o4oWhEt /7kj+D49LE7fo4DXnjz8VfJUJaVHrvIpBhVipOdo+OrQHsnbR7tlRUtrbGy6yYePoh1AZakMqrpxj TcoOzzUAgt2pRp+b+XpHVqURS1kP/lyIXl5Eyuet+Yt2OaVwM57nr3I/mM2QGAa1mx01zZBtH3Zyu Pz2xu1zw==; From: David Woodhouse To: qemu-devel@nongnu.org, Stefan Hajnoczi Cc: Kevin Wolf , Hanna Reitz , Stefano Stabellini , Anthony Perard , Paul Durrant , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , "Michael S. Tsirkin" , Marcel Apfelbaum , Richard Henderson , Eduardo Habkost , Jason Wang , Marcelo Tosatti , qemu-block@nongnu.org, xen-devel@lists.xenproject.org, kvm@vger.kernel.org Subject: [PULL 01/15] i386/xen: Ignore VCPU_SSHOTTMR_future flag in set_singleshot_timer() Date: Tue, 7 Nov 2023 09:21:33 +0000 Message-ID: <20231107092149.404842-2-dwmw2@infradead.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231107092149.404842-1-dwmw2@infradead.org> References: <20231107092149.404842-1-dwmw2@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: David Woodhouse X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org. See http://www.infradead.org/rpr.html X-ZohoMail-DKIM: pass (identity @infradead.org) X-ZM-MESSAGEID: 1699348977332100003 From: David Woodhouse Upstream Xen now ignores this flag=C2=B9, since the only guest kernel ever = to use it was buggy. =C2=B9 https://xenbits.xen.org/gitweb/?p=3Dxen.git;a=3Dcommitdiff;h=3D19c6c= bd909 Signed-off-by: David Woodhouse Reviewed-by: Paul Durrant --- target/i386/kvm/xen-emu.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/target/i386/kvm/xen-emu.c b/target/i386/kvm/xen-emu.c index 75b2c557b9..1dc9ab0d91 100644 --- a/target/i386/kvm/xen-emu.c +++ b/target/i386/kvm/xen-emu.c @@ -1077,17 +1077,13 @@ static int vcpuop_stop_periodic_timer(CPUState *tar= get) * Must always be called with xen_timers_lock held. */ static int do_set_singleshot_timer(CPUState *cs, uint64_t timeout_abs, - bool future, bool linux_wa) + bool linux_wa) { CPUX86State *env =3D &X86_CPU(cs)->env; int64_t now =3D kvm_get_current_ns(); int64_t qemu_now =3D qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); int64_t delta =3D timeout_abs - now; =20 - if (future && timeout_abs < now) { - return -ETIME; - } - if (linux_wa && unlikely((int64_t)timeout_abs < 0 || (delta > 0 && (uint32_t)(delta >> 50) !=3D 0)= )) { /* @@ -1129,9 +1125,13 @@ static int vcpuop_set_singleshot_timer(CPUState *cs,= uint64_t arg) } =20 QEMU_LOCK_GUARD(&X86_CPU(cs)->env.xen_timers_lock); - return do_set_singleshot_timer(cs, sst.timeout_abs_ns, - !!(sst.flags & VCPU_SSHOTTMR_future), - false); + + /* + * We ignore the VCPU_SSHOTTMR_future flag, just as Xen now does. + * The only guest that ever used it, got it wrong. + * https://xenbits.xen.org/gitweb/?p=3Dxen.git;a=3Dcommitdiff;h=3D19c6= cbd909 + */ + return do_set_singleshot_timer(cs, sst.timeout_abs_ns, false); } =20 static int vcpuop_stop_singleshot_timer(CPUState *cs) @@ -1156,7 +1156,7 @@ static bool kvm_xen_hcall_set_timer_op(struct kvm_xen= _exit *exit, X86CPU *cpu, err =3D vcpuop_stop_singleshot_timer(CPU(cpu)); } else { QEMU_LOCK_GUARD(&X86_CPU(cpu)->env.xen_timers_lock); - err =3D do_set_singleshot_timer(CPU(cpu), timeout, false, true); + err =3D do_set_singleshot_timer(CPU(cpu), timeout, true); } exit->u.hcall.result =3D err; return true; @@ -1844,7 +1844,7 @@ int kvm_put_xen_state(CPUState *cs) QEMU_LOCK_GUARD(&env->xen_timers_lock); if (env->xen_singleshot_timer_ns) { ret =3D do_set_singleshot_timer(cs, env->xen_singleshot_timer_= ns, - false, false); + false); if (ret < 0) { return ret; } --=20 2.41.0