From nobody Sun Apr 12 06:09:25 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=1771415218; cv=none; d=zohomail.com; s=zohoarc; b=j3fDqwCs7EYV539YZDQuxKIMKcna36o9tobJ4aNW1gMqu3gfIZUnLX3HLzx+VKOaWU70gdrUMP9JsA4Tg4DDo9maQHlpK3pG13iJeO4XdlFV/zIff4Kg4NJl3IMkvTrSIRSKk6I9FPfITA7mUEYTZQXakKoAxMZhMyhyaqC1g+M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771415218; 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=ampkMXpvZM0Uh9Dio1wYKLx68wPyoO/FMFpvVez+X64=; b=kx3VP3uWI6TbdqwSkmbR5Fl8ZYPH9jAP5x6OsUjFiAROzhNgxDwaGwpm7AhPa0VVb9CTLc9h76XucJscpFum9QrwKCpha8j8+rInGCGR7cE7QUmjGN7qidyh2bG0pJxPl0dj1yd9V9YBTkNnTy8H6qsKQeP6WbWRJ0idZxox+9A= 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 1771415218839307.58699586948967; Wed, 18 Feb 2026 03:46:58 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vsfzE-0005ZY-Q2; Wed, 18 Feb 2026 06:44:56 -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 1vsfyh-0004LW-RO for qemu-devel@nongnu.org; Wed, 18 Feb 2026 06:44:28 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vsfyg-0008FN-6Z for qemu-devel@nongnu.org; Wed, 18 Feb 2026 06:44:23 -0500 Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-642-pn--tvHNMgWLULHWhS-CoQ-1; Wed, 18 Feb 2026 06:44:19 -0500 Received: by mail-pl1-f200.google.com with SMTP id d9443c01a7336-2a8fc061ce1so300799355ad.0 for ; Wed, 18 Feb 2026 03:44:19 -0800 (PST) Received: from rhel9-box.lan ([117.99.83.54]) by smtp.googlemail.com with ESMTPSA id d9443c01a7336-2ad1aaeab38sm127803425ad.82.2026.02.18.03.44.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Feb 2026 03:44:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1771415061; 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=ampkMXpvZM0Uh9Dio1wYKLx68wPyoO/FMFpvVez+X64=; b=OblQk9wnRNfRb1tSjsID7OnL4IY1Kf0cPAsJecMLpiWPd0HeOK/OEitke7nSkT7wNxglLj XPfgaY0jtpuXMqm7zt6PZKf0EZFFHYBL9Aam9aHH8vfjnGtpduIVVBxioA7pPSrFGdqh2g y8+jqru6ehv9BNjTjepIRevr2VwMSU4= X-MC-Unique: pn--tvHNMgWLULHWhS-CoQ-1 X-Mimecast-MFC-AGG-ID: pn--tvHNMgWLULHWhS-CoQ_1771415059 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1771415059; x=1772019859; 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=ampkMXpvZM0Uh9Dio1wYKLx68wPyoO/FMFpvVez+X64=; b=QTE5LJiVUiQ0ThqlmORHzv0TtWegP/NIOC6PZOVUnFEMs/IsgL3t/P9A4H/QufDAp8 hrlDrQP7wUiP33dSnG6t0ROh/gHdWzBQjYXRMRK94PX+b/iqP7sTlFSjYIXDdQCeqloo XAN+DgzAZbQuOjRbEnK70Yf/l1fP+EW7mkVNHWXpw9OLXdKlW7kUqv8P3jmQRnEfX4J0 6rXfiSiRFvhmykzuRXA0onmzpTS5pXanF/DHloQxIZ1JvslMyPGXvpSrTFt4Nw33s1cr ebowGOaGftH7tuAt87U/m8zqJOjgKjdXn4PB8/ieXoGvwLG5+KEVsS4bq5ybkv6rOTt7 PKfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771415059; x=1772019859; 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=ampkMXpvZM0Uh9Dio1wYKLx68wPyoO/FMFpvVez+X64=; b=NXB1n/KGMN3giVOYjdLIPPopr7yRy9q4XquiBUkg9suYNtldGtCPBwJ2uTsrD0mPMS VoXhf332+9fDXJElgJXhlF9bOgEWq1W3nti3o0u/KeMKv86JS5ShW5jon5mlcKkY6UQu JxX2XM/Xwufl1yvX/87BgF6/3D2FsRDmOsDxVNPLXQ/NJfJYwc0RsbR8Srm5r/kkXcJP b3wLsXRvZyrbst8HQgwdUI9QcDYBr4QeuGX2tQGdr9UncNMCISpqKVrTYNVeR7F9pLHI u7/dH5RJKh33XITpCYUeKpaK4cWPN2SEamgQhMDnmy69MBYrg+/zc/zbURvXRsKahlX0 a5Yw== X-Forwarded-Encrypted: i=1; AJvYcCVNYEIYl9Uz0A9deHkDWWsAhmQYEAzS8JUjhyr7QQOM0gbRcoYMt8EnFBsIaWDZrVOLmGSBxj7BxVIU@nongnu.org X-Gm-Message-State: AOJu0YxXg40Fcu/ne536h405vx1FVI/jf5dWpp2yFm7wOrHjvUp5Xs9F dq05kRkXOsFTm7JSUMAn42RKrRaD1ybrEZiVhMq3IcDUEDRhpScJqNQrMI24Lo5iKFIXY3QFHcU 1S/M0NBEiCqF6bSXGUgnFobFwyWHkFQSqw6X8OOi463EptuRlzViilnX3 X-Gm-Gg: AZuq6aIipv18UZEiQkuXo23faELasDhA3xyoR9qStqdQZzPGaj5dD6WmtelXn4ZY62G QhE5zYd/Hc15yw5IjBzbCYmYNaEnfJVEVtpij5CWt822CXNi+pY46DXajL1buRzgofuxZ9kQVAt bpstOR2T1/8Ajc9khrH8cIjE1OFGuuiykWcoPsOnAd7T8oCJRozErPOgGH27TQqwlZ93ml4Py+9 a9X45A3OZH3drAiGJe839KvxELfaym/tsAEtN0cftpA6IMywrCmXPFg36XsWsCwYl0+W4De0zsY VzYjFmxvyUL9MeLtRs1xe1IyYvAwgDc8caPHoNcIbb5sl4fjEpv/f3frjNNkBUWrKOsr0YYI6o4 +4VNl0He16/6vY6GfyMPj7ImjOm9387qKJggSAwnVDgtc6gHWtRDZ X-Received: by 2002:a17:902:f68a:b0:2aa:f9d7:689c with SMTP id d9443c01a7336-2ab4cfa78a0mr167225765ad.22.1771415058895; Wed, 18 Feb 2026 03:44:18 -0800 (PST) X-Received: by 2002:a17:902:f68a:b0:2aa:f9d7:689c with SMTP id d9443c01a7336-2ab4cfa78a0mr167225625ad.22.1771415058526; Wed, 18 Feb 2026 03:44:18 -0800 (PST) From: Ani Sinha To: "Michael S. Tsirkin" , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson , Eduardo Habkost Cc: Ani Sinha , kraxel@redhat.com, qemu-devel@nongnu.org Subject: [PATCH v5 30/34] kvm/clock: add support for confidential guest reset Date: Wed, 18 Feb 2026 17:12:23 +0530 Message-ID: <20260218114233.266178-31-anisinha@redhat.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20260218114233.266178-1-anisinha@redhat.com> References: <20260218114233.266178-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 client-ip=170.10.133.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.043, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_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: 1771415220668158500 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 | 59 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/hw/i386/kvm/clock.c b/hw/i386/kvm/clock.c index aba6842a22..10d34254f0 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_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,54 @@ static void kvmclock_vm_state_change(void *opaque, boo= l running, } } =20 +static int kvmclock_save_clock(NotifierWithReturn *notifier, + void *data, Error** errp) +{ + if (!((VmfdChangeNotifier *)data)->pre) { + return 0; + } + KVMClockState *s =3D container_of(notifier, KVMClockState, + kvmclock_vmfd_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 +284,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_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_change_notifier(&s->kvmclock_vmfd_change_notifier); } =20 static bool kvmclock_clock_is_reliable_needed(void *opaque) --=20 2.42.0