From nobody Sun Nov 24 13:55:20 2024 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=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1723563643; cv=none; d=zohomail.com; s=zohoarc; b=Xk0RynnCw7deFepPt0ENzDn2zwkLzv5jtrBpYP45dPHNFHZVwGfpqSQ4f5HO7WGd1ezHA88rF5q86TM+sPb4AVnoCi400R2m+knnnTeAF8tRlEQzGMSSeveUDwz+WKt/kaESNeMVPAMkauRONoRUMQTofRmBlvnE7BlcjZxlvYY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1723563643; 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=RBfTLrt0IJ3bIc4wcoVt1ra0+tOl5RxGmL3k9Bo2YpY=; b=PJyNqhTC7+p0X/ZxZZy1eQph3ei8jvpekLnGQPaugnhCjbtVK4cNlSet7RnnLd5dhLS3Z3EkFT0/yKZEOqmCw9ARkhkWTSbhmxmt7RCfS7bP8gRu7edQhGf1h6N/4bWNHJd749c+Gt0zZcadVOrkfF+b7MTu5HMVlbHz6S07iXI= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1723563643444117.2310583889838; Tue, 13 Aug 2024 08:40:43 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sdtcv-0002hP-Kf; Tue, 13 Aug 2024 11:40:01 -0400 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 1sdtcu-0002gi-B5 for qemu-devel@nongnu.org; Tue, 13 Aug 2024 11:40:00 -0400 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 1sdtcr-0007PT-LO for qemu-devel@nongnu.org; Tue, 13 Aug 2024 11:40:00 -0400 Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-81-IOzfPOHcMcmxF8CQaVaYSA-1; Tue, 13 Aug 2024 11:39:53 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 319201954207; Tue, 13 Aug 2024 15:39:52 +0000 (UTC) Received: from rh-jmarcin.redhat.com (unknown [10.45.226.69]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1F5DD300019C; Tue, 13 Aug 2024 15:39:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1723563596; 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=RBfTLrt0IJ3bIc4wcoVt1ra0+tOl5RxGmL3k9Bo2YpY=; b=Ghi+EeVa4G27rXUGy+GoBUFg86VmeAtaMFzQqhIXmKn9tfGfCMei474UthM641m6uRjRi9 ijEdtQZcSkuJ8ABbYYFiPbQZqDtJyCntTMOMTeriMXLxO7SOyRAQ4NQVt2iBuVEAkV09Oi njKdIn8DVBMRIlrbVTT3uh423v5pI9c= X-MC-Unique: IOzfPOHcMcmxF8CQaVaYSA-1 From: Juraj Marcin To: qemu-devel@nongnu.org Cc: Juraj Marcin , Peter Maydell , David Hildenbrand Subject: [PATCH v2 4/4] virtio-mem: Add support for suspend+wake-up with plugged memory Date: Tue, 13 Aug 2024 17:39:20 +0200 Message-ID: <20240813153922.311788-5-jmarcin@redhat.com> In-Reply-To: <20240813153922.311788-1-jmarcin@redhat.com> References: <20240813153922.311788-1-jmarcin@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 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=jmarcin@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.125, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: 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: 1723563644770116600 Content-Type: text/plain; charset="utf-8" Before, the virtio-mem device would unplug all the memory with any reset of the device, including during the wake-up of the guest from a suspended state. Due to this, the virtio-mem driver in the Linux kernel disallowed suspend-to-ram requests in the guest when the VIRTIO_MEM_F_PERSISTENT_SUSPEND feature is not exposed by QEMU. This patch adds the code to skip the reset on wake-up and exposes theVIRTIO_MEM_F_PERSISTENT_SUSPEND feature to the guest kernel driver when suspending is possible in QEMU (currently only x86). Signed-off-by: Juraj Marcin Reviewed-by: David Hildenbrand --- hw/virtio/virtio-mem.c | 10 ++++++++++ hw/virtio/virtio-qmp.c | 3 +++ 2 files changed, 13 insertions(+) diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c index aeee381eb2..ce228da369 100644 --- a/hw/virtio/virtio-mem.c +++ b/hw/virtio/virtio-mem.c @@ -883,6 +883,9 @@ static uint64_t virtio_mem_get_features(VirtIODevice *v= dev, uint64_t features, if (vmem->unplugged_inaccessible =3D=3D ON_OFF_AUTO_ON) { virtio_add_feature(&features, VIRTIO_MEM_F_UNPLUGGED_INACCESSIBLE); } + if (qemu_wakeup_suspend_enabled()) { + virtio_add_feature(&features, VIRTIO_MEM_F_PERSISTENT_SUSPEND); + } return features; } =20 @@ -1841,6 +1844,13 @@ static void virtio_mem_system_reset_hold(Object *obj= , ResetType type) { VirtIOMEM *vmem =3D VIRTIO_MEM(obj); =20 + /* + * When waking up from standby/suspend-to-ram, do not unplug any memor= y. + */ + if (type =3D=3D RESET_TYPE_WAKEUP) { + return; + } + /* * During usual resets, we will unplug all memory and shrink the usable * region size. This is, however, not possible in all scenarios. Then, diff --git a/hw/virtio/virtio-qmp.c b/hw/virtio/virtio-qmp.c index 1dd96ed20f..cccc6fe761 100644 --- a/hw/virtio/virtio-qmp.c +++ b/hw/virtio/virtio-qmp.c @@ -450,6 +450,9 @@ static const qmp_virtio_feature_map_t virtio_mem_featur= e_map[] =3D { FEATURE_ENTRY(VIRTIO_MEM_F_UNPLUGGED_INACCESSIBLE, \ "VIRTIO_MEM_F_UNPLUGGED_INACCESSIBLE: Unplugged memory cannot = be " "accessed"), + FEATURE_ENTRY(VIRTIO_MEM_F_PERSISTENT_SUSPEND, \ + "VIRTIO_MEM_F_PERSISTENT_SUSPND: Plugged memory will remain " + "plugged when suspending+resuming"), { -1, "" } }; #endif --=20 2.46.0