From nobody Tue Feb 10 03:39:49 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1768224540; cv=none; d=zohomail.com; s=zohoarc; b=dUnWp+xdSEPAwMl3TDkUTitpOqOMClyQ86pBunRMFUUgsIFesKqRUOIT8fu/fbfNMNftcGevOLD+ldXR6A1Tr+U1tQyPwkHe96bTAwUYf2GyF8FOVdjhcHxN/Zmv9NTq45O22lZ+ydf77uoZuJmik/g5p8OSsMxHz52QmcC67aI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768224540; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=R3yLZr09LM7NcHBXvWZBPJETGaPkzhIYY875mEyeZ3w=; b=MHIUfRiQqJ+P0HqX5AREOvTytKGxd1+yiboGmtVFWzsjq0UAAdKIRGwbJnGnm/gNCoPrPvJSJNlHq8MW3ONy3tVByvWlNIidtLD3eh5/yNV5HasANkk91B2WXzDGeNOQlNwmsSzZbmDKLsgI+qyqqjsV1O27eVOyNbHXEOpAez4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 176822454080279.27859190421634; Mon, 12 Jan 2026 05:29:00 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vfHw3-0006V4-W3; Mon, 12 Jan 2026 08:26:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vfHud-0004Wt-2O for qemu-devel@nongnu.org; Mon, 12 Jan 2026 08:24:51 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vfHua-0003u1-6X for qemu-devel@nongnu.org; Mon, 12 Jan 2026 08:24:50 -0500 Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-517-5cN7QkOsNzmnKIvLlXICow-1; Mon, 12 Jan 2026 08:24:46 -0500 Received: by mail-pf1-f199.google.com with SMTP id d2e1a72fcca58-81d9b88caf2so2205439b3a.1 for ; Mon, 12 Jan 2026 05:24:46 -0800 (PST) Received: from rhel9-box.lan ([110.227.88.119]) by smtp.googlemail.com with ESMTPSA id 41be03b00d2f7-c4cc05cd87asm17544771a12.15.2026.01.12.05.24.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jan 2026 05:24:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1768224287; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=R3yLZr09LM7NcHBXvWZBPJETGaPkzhIYY875mEyeZ3w=; b=GqV6KkozqJ6LOp3Wj46kwSz5T+Qa3QEYGQi8KRVmYyv0nNmvEYMrU7fKxXJyDLPg4+GEoD n3V2YbyvGAPOSPwzyjXxODUMHdPsDiDwo/w1LxBjCfg+5Fh/55N0rgOU3Bj5mDNO6xdH1N Ewm1OdcXkPJeIN5ucjtmrwUI/I5BzSI= X-MC-Unique: 5cN7QkOsNzmnKIvLlXICow-1 X-Mimecast-MFC-AGG-ID: 5cN7QkOsNzmnKIvLlXICow_1768224285 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1768224285; x=1768829085; darn=nongnu.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=R3yLZr09LM7NcHBXvWZBPJETGaPkzhIYY875mEyeZ3w=; b=JIhw07sKRzcgWV+AATZ5DgGTWp90MKLapyjOSanSfNlpB2tbNWY2fDTVAb9VHZ41gq HdZ7K4op9APsw0FOWWOj1Sv1RthC/ppFPXdUwV8NXmn5ATraclH/uHdnkXlwyDd/4y+i d2aqPJHzSSqOQADETMs7Jqx2RJgZRRqoz4ZgdfrZmNpalxbVKgWCe2xpEfvwMrX2TKqB 75javuspcILCMc6TWCay9Y+r/2ncPfmqGfgllNn4p8gs1Buj6wptxinRwwoNaAd3yPnD 0ofsiYmDLA30AM8R+1Phaarph/GYv/cZwMeGC/LMAWfbWM89/xzpo7e5t/H/S0QIiGaO 2F2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768224285; x=1768829085; 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=R3yLZr09LM7NcHBXvWZBPJETGaPkzhIYY875mEyeZ3w=; b=BTmBO29Ve0QY209ah43k68T+n7YlslJHMGylMasxgBdndtPK0rNmVVKYEdiObSDuZo d9Ujxa+mGSMW9FfkLT6SKopktCEzRtD6DnXUlaFeRDSzU54w52SRorNlXj4WEVNiBbtZ JzYMwxT0e+OEuGC+6Di74nJofVWiDbIRwnyypYQmAAFheMqAsrWWaGp0dhL+ylUCr7xc rK/y3i1X7M+XRnJQUJkZp6XF/y7r96beGrLo4uxKmkVFBMa7CGLLbkKskF9/uH1LtMui uU3fEmRPfs+nopbH+iNqdcmDUkF0jxsmcpblHcLZCVr57S9WbttJVFBInApPScUDVnwz Z7Yw== X-Forwarded-Encrypted: i=1; AJvYcCUxi30udMyTZV8IbbIeBV78T/p5ZI/HjbBJH0cc2LIyytD697Z85lP6BAr2+a9mRi7hLEzvGtRxGrZw@nongnu.org X-Gm-Message-State: AOJu0YwKO39XOSG1AHQ43yxecrD6A1vO7eG9RD+wNNd4dpLurEAJnCYG 9BXzU+8lb2chLfKSwLZ+KcE3sb9AwIcCvA010rd84XuWm28JBP6sIT3KeZ6Wc5m45IubmaloYmm To1FFUWOIb1ompcHt+4W+vMDf9VIe8feqHlRVI0m3ECJ9dG9QGTcZyywv X-Gm-Gg: AY/fxX74Ox3jHLqezq2dRaqAeiDI8rJigD2b1Ia2bNFMPtN372F32/9wEnbnWvY29Ii Nl5K3CeBUDI3jB4R9vlagVrk2+JNGxJ2pegJ1XttVZ4kJpO9lwtohzM1GkMm2YGJ0B+8c2/xQqW UG15NHCSENooDfqDMej1+YbFvgiGqTjIKh3oma5mjJM4//ZiIkZK9iI3K3OWYKN+cRzPW/NORds wP0Zv2yjtuSJ2Pgru7FQRXhMBPt+tRstJrotokrBOt7fl2VPxspLVZZFxD3mlwOLMbkHxTzrkyD 7m36OdhqyVYvqXMiAVhyzXaweQB04xf7IBwV3O0G5L9eAE1lmPDdIdrJ7zejZGfuw3u6y62gp5q SZ+41zFmWDQcQQG5KkK6vhk4J7xIoi8R2eIk9j/ZwNok= X-Received: by 2002:a05:6a21:6d81:b0:35f:5896:85a4 with SMTP id adf61e73a8af0-3898f8f4941mr16340406637.5.1768224285046; Mon, 12 Jan 2026 05:24:45 -0800 (PST) X-Google-Smtp-Source: AGHT+IENZVaQihKztvKwVH4oiegG/ElvAOEgRUUxrkglVrWtZMNggg7a3/AjWI6vJu3QeTLgEewAGA== X-Received: by 2002:a05:6a21:6d81:b0:35f:5896:85a4 with SMTP id adf61e73a8af0-3898f8f4941mr16340385637.5.1768224284679; Mon, 12 Jan 2026 05:24:44 -0800 (PST) From: Ani Sinha To: "Michael S. Tsirkin" , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson , Eduardo Habkost Cc: Ani Sinha , qemu-devel@nongnu.org Subject: [PATCH v2 30/32] kvm/clock: add support for confidential guest reset Date: Mon, 12 Jan 2026 18:52:43 +0530 Message-ID: <20260112132259.76855-31-anisinha@redhat.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20260112132259.76855-1-anisinha@redhat.com> References: <20260112132259.76855-1-anisinha@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=anisinha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1768224542609158500 Content-Type: text/plain; charset="utf-8" Confidential guests change the KVM VM file descriptor upon reset and also c= reate new VCPU file descriptors against the new KVM VM file descriptor. We need to save the clock state from kvm before KVM VM file descriptor changes and res= tore it after. Also after VCPU file descriptors changed, we must call KVM_KVMCLOCK_CTRL on the VCPU file descriptor to inform KVM that the VCPU is in paused state. Signed-off-by: Ani Sinha --- hw/i386/kvm/clock.c | 56 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/hw/i386/kvm/clock.c b/hw/i386/kvm/clock.c index aba6842a22..fb0f500b7f 100644 --- a/hw/i386/kvm/clock.c +++ b/hw/i386/kvm/clock.c @@ -50,6 +50,9 @@ struct KVMClockState { /* whether the 'clock' value was obtained in a host with * reliable KVM_GET_CLOCK */ bool clock_is_reliable; + + NotifierWithReturn kvmclock_vcpufd_change_notifier; + NotifierWithReturn kvmclock_vmfd_pre_change_notifier; }; =20 struct pvclock_vcpu_time_info { @@ -63,6 +66,9 @@ struct pvclock_vcpu_time_info { uint8_t pad[2]; } __attribute__((__packed__)); /* 32 bytes */ =20 +static int kvmclock_set_clock(NotifierWithReturn *notifier, + void *data, Error** errp); + static uint64_t kvmclock_current_nsec(KVMClockState *s) { CPUState *cpu =3D first_cpu; @@ -219,6 +225,51 @@ static void kvmclock_vm_state_change(void *opaque, boo= l running, } } =20 +static int kvmclock_save_clock(NotifierWithReturn *notifier, + void *data, Error** errp) +{ + KVMClockState *s =3D container_of(notifier, KVMClockState, + kvmclock_vmfd_pre_change_notifier); + kvm_update_clock(s); + return 0; +} + +static int kvmclock_set_clock(NotifierWithReturn *notifier, + void *data, Error** errp) +{ + struct kvm_clock_data clock_data =3D {}; + CPUState *cpu; + int ret; + KVMClockState *s =3D container_of(notifier, KVMClockState, + kvmclock_vcpufd_change_notifier); + int cap_clock_ctrl =3D kvm_check_extension(kvm_state, KVM_CAP_KVMCLOCK= _CTRL); + + if (!s->clock_is_reliable) { + uint64_t pvclock_via_mem =3D kvmclock_current_nsec(s); + /* saved clock value before vmfd change is not reliable */ + if (pvclock_via_mem) { + s->clock =3D pvclock_via_mem; + } + } + + clock_data.clock =3D s->clock; + ret =3D kvm_vm_ioctl(kvm_state, KVM_SET_CLOCK, &clock_data); + if (ret < 0) { + fprintf(stderr, "KVM_SET_CLOCK failed: %s\n", strerror(-ret)); + abort(); + } + + if (!cap_clock_ctrl) { + return 0; + } + CPU_FOREACH(cpu) { + run_on_cpu(cpu, do_kvmclock_ctrl, RUN_ON_CPU_NULL); + } + + return 0; +} + + static void kvmclock_realize(DeviceState *dev, Error **errp) { KVMClockState *s =3D KVM_CLOCK(dev); @@ -230,7 +281,12 @@ static void kvmclock_realize(DeviceState *dev, Error *= *errp) =20 kvm_update_clock(s); =20 + s->kvmclock_vcpufd_change_notifier.notify =3D kvmclock_set_clock; + s->kvmclock_vmfd_pre_change_notifier.notify =3D kvmclock_save_clock; + qemu_add_vm_change_state_handler(kvmclock_vm_state_change, s); + kvm_vcpufd_add_change_notifier(&s->kvmclock_vcpufd_change_notifier); + kvm_vmfd_add_pre_change_notifier(&s->kvmclock_vmfd_pre_change_notifier= ); } =20 static bool kvmclock_clock_is_reliable_needed(void *opaque) --=20 2.42.0