From nobody Thu Dec 26 11:39:30 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=1732873625; cv=none; d=zohomail.com; s=zohoarc; b=VwUK4oE66yYEsONN+f0RKhBfca7AJUUkJX+9STBQkArdI0gUCu1M+nxtG8z88AKSZGEbnDsKgYo6c05iZbhFJ2KMGygUNquSkYh/tTt6SpTmD4ajKy39yFges1GgpyymovRHskPpfivauWxti32DzqzsgFjpF3jbKyQ2kDp44VA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1732873625; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=faMGH7MShKrFnYYm0brwaVi+mOe0w/HDkrEFu4ndVGI=; b=XHlFP1TGed5IKaWH9QC+x3hmiGaG91g5sv8FDPgdWJQbjUGsVl8NxUS9rrJNodMe+TAMA63qYBnWi2IuUaya2iu1NtG3t1MchYMYZRA/xWBO68ScjaTGCdvSIk4rYQj0Q2lqsPIQe/Nl9onlR/dp8joMpQ9a8UfIhIwzmYFBqNw= 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 173287362587610.085562958019295; Fri, 29 Nov 2024 01:47:05 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tGxZk-0001z0-0e; Fri, 29 Nov 2024 04:46:12 -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 1tGxZg-0001xp-5L for qemu-devel@nongnu.org; Fri, 29 Nov 2024 04:46:08 -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 1tGxZb-0006VA-6U for qemu-devel@nongnu.org; Fri, 29 Nov 2024 04:46:07 -0500 Received: from mx-prod-mc-05.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-583-aK1XQ-YRPSecmnqv6siwzQ-1; Fri, 29 Nov 2024 04:45:56 -0500 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id CE73F1964CCF for ; Fri, 29 Nov 2024 09:45:55 +0000 (UTC) Received: from toolbox.redhat.com (unknown [10.42.28.37]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 70687195605A; Fri, 29 Nov 2024 09:45:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1732873560; 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=faMGH7MShKrFnYYm0brwaVi+mOe0w/HDkrEFu4ndVGI=; b=CAQ2BZMtzb8j2i1XAhow1/oxUo52uNPluQsPUIYirnvnJE9uPdpeKUq+AVAWwX2DQ0zdVX 1nRIoC94QNBrxwBtmRFusFkGBpc3Thupb0uBHOc9xzuSueXI9d0Rwn2w+Dv8JjY1TrN7sN EfFF51/SRlSxHWfRmP5JAerIuGKI4XQ= X-MC-Unique: aK1XQ-YRPSecmnqv6siwzQ-1 X-Mimecast-MFC-AGG-ID: aK1XQ-YRPSecmnqv6siwzQ From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: "Richard W . M . Jones" , Martin Pitt , David Hildenbrand , "Michael S. Tsirkin" , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH for 9.2] hw/virtio: fix crash in processing balloon stats Date: Fri, 29 Nov 2024 09:45:51 +0000 Message-ID: <20241129094551.649339-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 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=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 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.932, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=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.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: 1732873627438019100 balloon_stats_get_all will iterate over guest stats upto the max VIRTIO_BALLOON_S_NR value, calling visit_type_uint64 to populate the QObject dict. The dict keys are obtained from the static array balloon_stat_names which is VIRTIO_BALLOON_S_NR in size. Unfortunately the way that array is declared results in any unassigned stats getting a NULL name, which will then cause visit_type_uint64 to trigger an assert in qobject_output_add_obj. The balloon_stat_names array was fortunately fully populated with names until recently: commit 0d2eeef77a33315187df8519491a900bde4a3d83 Author: Bibo Mao Date: Mon Oct 28 10:38:09 2024 +0800 linux-headers: Update to Linux v6.12-rc5 pulled a change to include/standard-headers/linux/virtio_balloon.h which increased VIRTIO_BALLOON_S_NR by 6, and failed to add the new names to balloon_stat_names. This commit fills in the missing names, and uses a static assert to guarantee that any future changes to VIRTIO_BALLOON_S_NR will cause a build failure until balloon_stat_names is updated. This problem was detected by the Cockpit Project's automated integration tests on QEMU 9.2.0-rc1. Fixes: 0d2eeef77a33315187df8519491a900bde4a3d83 Reported-by: Martin Pitt Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Richard W.M. Jones --- NB: this is a MUST FIX for 9.2, as a trivial guest triggerable crash regressing since 9.1 hw/virtio/virtio-balloon.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c index 609e39a821..afd2ad6dd6 100644 --- a/hw/virtio/virtio-balloon.c +++ b/hw/virtio/virtio-balloon.c @@ -167,19 +167,33 @@ static void balloon_deflate_page(VirtIOBalloon *ballo= on, } } =20 +/* + * All stats upto VIRTIO_BALLOON_S_NR /must/ have a + * non-NULL name declared here, since these are used + * as keys for populating the QDict with stats + */ static const char *balloon_stat_names[] =3D { [VIRTIO_BALLOON_S_SWAP_IN] =3D "stat-swap-in", [VIRTIO_BALLOON_S_SWAP_OUT] =3D "stat-swap-out", [VIRTIO_BALLOON_S_MAJFLT] =3D "stat-major-faults", [VIRTIO_BALLOON_S_MINFLT] =3D "stat-minor-faults", [VIRTIO_BALLOON_S_MEMFREE] =3D "stat-free-memory", + [VIRTIO_BALLOON_S_MEMTOT] =3D "stat-total-memory", [VIRTIO_BALLOON_S_AVAIL] =3D "stat-available-memory", [VIRTIO_BALLOON_S_CACHES] =3D "stat-disk-caches", [VIRTIO_BALLOON_S_HTLB_PGALLOC] =3D "stat-htlb-pgalloc", [VIRTIO_BALLOON_S_HTLB_PGFAIL] =3D "stat-htlb-pgfail", - [VIRTIO_BALLOON_S_NR] =3D NULL + + [VIRTIO_BALLOON_S_OOM_KILL] =3D "stat-oom-kills", + [VIRTIO_BALLOON_S_ALLOC_STALL] =3D "stat-alloc-stalls", + [VIRTIO_BALLOON_S_ASYNC_SCAN] =3D "stat-async-scans", + [VIRTIO_BALLOON_S_DIRECT_SCAN] =3D "stat-direct-scans", + [VIRTIO_BALLOON_S_ASYNC_RECLAIM] =3D "stat-async-reclaims", + + [VIRTIO_BALLOON_S_DIRECT_RECLAIM] =3D "stat-direct-reclaims", }; +G_STATIC_ASSERT(G_N_ELEMENTS(balloon_stat_names) =3D=3D VIRTIO_BALLOON_S_N= R); =20 /* * reset_stats - Mark all items in the stats array as unset --=20 2.46.0