From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a17:906:ae84:b0:982:368b:d395 with SMTP id md4csp597790ejb; Tue, 13 Jun 2023 08:06:09 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5DCuQNiTgjtPZuY8h+TXQxZXmgeO+6tqsClzv25kW6Ke95NWjnrQARyHLBKO+LiO5C9DHr X-Received: by 2002:a05:620a:22f4:b0:75d:50bb:b173 with SMTP id p20-20020a05620a22f400b0075d50bbb173mr10900002qki.16.1686668769398; Tue, 13 Jun 2023 08:06:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686668769; cv=none; d=google.com; s=arc-20160816; b=zG/JdGdyp2y0bXSoz6D2D6bi51oz68AfJcu8w8E1cC7jV6koL7oQWMM/QiZtgzyp5n pC0NZXjsNkMn6ZFdca+abTPmT522X6gfR0KWWq2/DxalD7XQCTkSse6myhXjyogYCQzV LM/hfiBKDBUCsAaJhDezFNT9sGKjEEfe5pNW3aDwdVPy2bLItpV8GFxI9M9cry/V0GIc L6X4jGsNmbVEysgrQ3vFWrP+61RC2+RNeDzDce12YaLsswLhQSiLlR6FHqIp0NqJK8xO 5VQIUg+F+d3kKJ0kN0afrigr/M3QRH4tqyH65Y0An9s8nw20/ijmO1uwFJ84ET4GVmFG X4NQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=C3q1VOCi3VSeulPig7kmaGVgtQD3yY/HQD0PCA5v3u8=; b=znDVrkWIEXG7fr9iSQuVfXd1QR+lDF3znfgL1Y1+HSynzdfQqAQJfz25LARn7nNDvH v9QLMhrhq59J4+1wY2SApMkw3e8ee+giXRz2ZWcyyfpkfG90l8lBhBPV/UZa/uQahvTR 3e6iIZp7RzFKRN2ogxJmK4y06eayrt+ALrKqUqUDoRK6xOVxR6uhROaiz23oXxyVbH9m BMXx5hMJNdHSpLbO5ryEtjmwWMwcmK3yWtKJ23R6LcJ4VrO27Y3AY8u3vF9s8eVQF8I+ k9cksC1L9s2uPgBIZSUubwhKai7445uuXoKhPOm+dhJrRJzYYhyljyXQWYgmbk2qjdmi Fo7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=MYRauKCN; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d23-20020a05620a141700b0075f146120e5si4671257qkj.62.2023.06.13.08.06.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 Jun 2023 08:06:09 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=MYRauKCN; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q95Z0-0005VW-Ds; Tue, 13 Jun 2023 11:04:06 -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 1q95Y3-0003v1-Go for qemu-arm@nongnu.org; Tue, 13 Jun 2023 11:03:11 -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 1q95XW-0008U8-Ai for qemu-arm@nongnu.org; Tue, 13 Jun 2023 11:02:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1686668551; 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=C3q1VOCi3VSeulPig7kmaGVgtQD3yY/HQD0PCA5v3u8=; b=MYRauKCNx8v4RbRA7p2Zyj61lBIHWKy+RuGd4EhoSRt5evc/xAVBQ5DMThDJEF7O3wbkui nvJW3yE5I4MfGpFQa2c1i2T8A1Xv4yH62Dmp0tdl75q17Gh48rIrwB3/t5ZyuLq5+yTJW3 StlD937s88mqqtgvQXTQmzeHtiw+B3c= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-623-DNgGdphGP1WvPmgYP5F72w-1; Tue, 13 Jun 2023 11:02:15 -0400 X-MC-Unique: DNgGdphGP1WvPmgYP5F72w-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8F85080349B; Tue, 13 Jun 2023 15:02:14 +0000 (UTC) Received: from t480s.fritz.box (unknown [10.39.192.249]) by smtp.corp.redhat.com (Postfix) with ESMTP id E66A140B4CD6; Tue, 13 Jun 2023 15:02:12 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Cc: David Hildenbrand , Peter Maydell , Paolo Bonzini , Richard Henderson , Eduardo Habkost , "Michael S. Tsirkin" , Marcel Apfelbaum , Igor Mammedov , qemu-arm@nongnu.org, Gavin Shan Subject: [PATCH v1 1/5] pc: Properly handle unplug of virtio based memory devices Date: Tue, 13 Jun 2023 17:02:06 +0200 Message-Id: <20230613150210.449406-2-david@redhat.com> In-Reply-To: <20230613150210.449406-1-david@redhat.com> References: <20230613150210.449406-1-david@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 Received-SPF: pass client-ip=170.10.129.124; envelope-from=david@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, 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-arm@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-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org X-TUID: qb0ulKRVo0eM While we fence unplug requests from the outside, the VM can still trigger unplug of virtio based memory devices, for example, in Linux doing: # echo 0 > /sys/bus/pci/slots/3/power While doing that is not really expected to work without harming the guest OS (e.g., removing a virtio-mem device while it still provides memory), let's make sure that we properly handle it on the QEMU side. We'll support unplugging of virtio-mem devices in some configurations next. Signed-off-by: David Hildenbrand --- hw/i386/pc.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index fc52772fdd..fdd7062929 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1559,7 +1559,25 @@ static void pc_virtio_md_pci_unplug_request(HotplugHandler *hotplug_dev, static void pc_virtio_md_pci_unplug(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp) { - /* We don't support hot unplug of virtio based memory devices */ + HotplugHandler *hotplug_dev2 = qdev_get_bus_hotplug_handler(dev); + Error *local_err = NULL; + + /* Unplug the memory device while it is still realized. */ + memory_device_unplug(MEMORY_DEVICE(dev), MACHINE(hotplug_dev)); + + if (hotplug_dev2) { + hotplug_handler_unplug(hotplug_dev2, dev, &local_err); + if (local_err) { + /* Not expected to fail ... but still try to recover. */ + memory_device_plug(MEMORY_DEVICE(dev), MACHINE(hotplug_dev)); + error_propagate(errp, local_err); + return; + } + } else { + /* Very unexpected, but let's just try to do the right thing. */ + warn_report("Unexpected unplug of virtio based memory device"); + qdev_unrealize(dev); + } } static void pc_machine_device_pre_plug_cb(HotplugHandler *hotplug_dev, -- 2.40.1