From nobody Thu Mar 28 13:47:21 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=1631625749; cv=none; d=zohomail.com; s=zohoarc; b=BR0O50jyifE0QniEpLlU+7wD+DbwATdnkM01H1ukwymCJa0LOl8CilRudyriBDT38d4Y9eoSN+8D4efRN3CYfKFxHKbNQnl077cUnw7vUpGhCe6in/J1DTa+ASwX2NgaxNIEmiUgcXdN6EVGDkbCOWiFa7J7QtRdz8jMz6lewX0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631625749; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=SLvKeav5abcu16BZHpLmZ+FG0S8Fq8C31clQ43GdR0U=; b=TTJU1v5MqdcG3+G9wxNCkYSe4NFt35rDxaw/a2WVbesx4AEAbjOfHvaxob6YVYvVuY1ySPAy9v/cQuT80ZW//yoKYKQvfyF86eooKluqoXiyX17GO1ozZMp4G8l549A7iLbVgpcmVFCU2SxdNWY6+78zdNxnLzKQxfu2MfJAlqE= 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 1631625749162967.7930207507701; Tue, 14 Sep 2021 06:22:29 -0700 (PDT) Received: from localhost ([::1]:49242 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQ8OJ-0003GM-VF for importer@patchew.org; Tue, 14 Sep 2021 09:22:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42972) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQ8Jd-0004I1-JY for qemu-devel@nongnu.org; Tue, 14 Sep 2021 09:17:37 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:20015) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQ8Jb-0001EJ-Gz for qemu-devel@nongnu.org; Tue, 14 Sep 2021 09:17:36 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-441-_eAxuLIYNLWcgMXHM9MhHA-1; Tue, 14 Sep 2021 09:17:32 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 588469017C1 for ; Tue, 14 Sep 2021 13:17:31 +0000 (UTC) Received: from dgilbert-t580.localhost (unknown [10.39.195.29]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9C9EB102AE4B; Tue, 14 Sep 2021 13:17:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1631625453; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SLvKeav5abcu16BZHpLmZ+FG0S8Fq8C31clQ43GdR0U=; b=gG9l+r1TSN9V1Rg7DFO0RlsHSIYaljGkQhaCafxux9JiufzyRmlxoRURXyqw77vCbz+Ip/ XjktPgB56ykUEeLSWUsK6gOndBM8mx0MWyTsubYhDGvg7ZtfJhO/MBEpS/cD92r2LrCUam ODDWuQ+I73WaVrjqTOOI4hTM6bY0IQY= X-MC-Unique: _eAxuLIYNLWcgMXHM9MhHA-1 From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, mst@redhat.com, david@redhat.com Subject: [PATCH] virtio-balloon: Fix page-poison subsection name Date: Tue, 14 Sep 2021 14:17:16 +0100 Message-Id: <20210914131716.102851-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dgilbert@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=216.205.24.124; envelope-from=dgilbert@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.398, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: stefanha@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1631625750684100001 Content-Type: text/plain; charset="utf-8" From: "Dr. David Alan Gilbert" The subsection name for page-poison was typo'd as: vitio-balloon-device/page-poison Note the missing 'r' in virtio. When we have a machine type that enables page poison, and the guest enables it (which needs a new kernel), things fail rather unpredictably. The fallout from this is that most of the other subsections fail to load, including things like the feature bits in the device, one possible fallout is that the physical addresses of the queues then get aligned differently and we fail with an error about last_avail_idx being wrong. It's not obvious to me why this doesn't produce a more obvious failure, but virtio's vmstate loading is a bit open-coded. Fixes: 7483cbbaf82 ("virtio-balloon: Implement support for page poison repo= rting feature") bz: https://bugzilla.redhat.com/show_bug.cgi?id=3D1984401 Signed-off-by: Dr. David Alan Gilbert Reviewed-by: David Hildenbrand --- hw/virtio/virtio-balloon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c index 5a69dce35d..c6962fcbfe 100644 --- a/hw/virtio/virtio-balloon.c +++ b/hw/virtio/virtio-balloon.c @@ -852,7 +852,7 @@ static const VMStateDescription vmstate_virtio_balloon_= free_page_hint =3D { }; =20 static const VMStateDescription vmstate_virtio_balloon_page_poison =3D { - .name =3D "vitio-balloon-device/page-poison", + .name =3D "virtio-balloon-device/page-poison", .version_id =3D 1, .minimum_version_id =3D 1, .needed =3D virtio_balloon_page_poison_support, --=20 2.31.1