From nobody Mon Feb 9 09:52:10 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1591973804; cv=none; d=zohomail.com; s=zohoarc; b=HwQC1dRLhSwg687m5OpOSiTGlbighiMN39bYEOWsuBFhQXWJL/ypXL36l2zS2cRaH1zYrX/cJWX5ouVYD8VqBsuuM9+qXu6ibDwcm6FzCGVAAQFKAHuD+C/GUlLHP5QycBk6lMDMUjmqn3GmDsWHR5r0HN9YA+3kDAyOleoEPtM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591973804; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=NgqF724ZlpYDgxpsvGgomKXglTKeYnsN1WEfd42scpg=; b=DbzEx88odkyS3BcWdVpQJrSNLdvE0LK+A1ovmIL1CI6Ac/UjYE4WXY9jSN2pRBqniYf0Uhkeu34gt09jRyh9U198ox7hlHwXhLD7APj3v5LCfH8h66XbSHM6qbKJN3ANhNWL9vRz80CC1Zk01bNbFCt3k8OYzr46InpHfwe8KRs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 159197380486544.966582881541854; Fri, 12 Jun 2020 07:56:44 -0700 (PDT) Received: from localhost ([::1]:55040 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jjl6p-00077V-JL for importer@patchew.org; Fri, 12 Jun 2020 10:56:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50014) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jjl2H-0006jt-Dn for qemu-devel@nongnu.org; Fri, 12 Jun 2020 10:52:02 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:57353 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jjl2D-0001S3-Il for qemu-devel@nongnu.org; Fri, 12 Jun 2020 10:52:01 -0400 Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-322-wPwPLDA6MZ2vO67S_WECWg-1; Fri, 12 Jun 2020 10:51:54 -0400 Received: by mail-wr1-f72.google.com with SMTP id w16so3976208wru.18 for ; Fri, 12 Jun 2020 07:51:54 -0700 (PDT) Received: from redhat.com (bzq-79-178-18-124.red.bezeqint.net. [79.178.18.124]) by smtp.gmail.com with ESMTPSA id o18sm9407093wme.19.2020.06.12.07.51.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jun 2020 07:51:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591973516; 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: in-reply-to:in-reply-to:references:references; bh=NgqF724ZlpYDgxpsvGgomKXglTKeYnsN1WEfd42scpg=; b=VNyOHpfAObih3Q60mgSthocDRqwfPocxyMOpRpiixxHq+7kXxX5AfbUpkjNsh0ft7YgqY/ lpULqZUwJdFItO9qVGbtvT1MqgM9wISJvZMvQptCpnCLyucP3gAqytKU1lt9Q+MWO9Y+F9 G/d+xNZcnLW+Pasjv5sJGWIgn2D1wjs= X-MC-Unique: wPwPLDA6MZ2vO67S_WECWg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to; bh=NgqF724ZlpYDgxpsvGgomKXglTKeYnsN1WEfd42scpg=; b=ojbUNp3/pPMXkDsSyV3xNMIskCNFsdZQ42SwTuLJ+at02IkEubvcSGiYmrq4YskQ05 6YVrXQk5I8vxd60BFe4wlgmH/vHT15+4OmPtwVLg80/kOdYj0JYrjYfjEF/VD2EVUmSl ws5jXuS9pFAWmBbdK0D5d/syOo/GUOCnL5JBgqwBirZc6TtRJHTElZVQqQZL1fTrH8Zb L1CiOjcHZT7Z+Jd1jFL7A3wHA8DWbe5Ow+1YZvDbkS5HWWwrWOUFgiAwJ/gKm3zyq++O Y0xgYJlGwZd1XkKqnyhd/0HYItXCZN1B6Hbj3sP/NnSRQRKKEF9EUw73Pcv8BSPIyp+L lgLw== X-Gm-Message-State: AOAM531Ee0m/IXV2gTdaFBXSwShTwmvFQepiUGRRyfaLTz6rEPQIR+mF lC3jGunMMIMmWyyVxFqk8Ve673pBXvE/l3StM4CsyBizqi76dCmkQV6KlN1Bep/ZjbsHJw5dcim VsPv6Wb0Jh8dbVZ8= X-Received: by 2002:a1c:c904:: with SMTP id f4mr13775290wmb.69.1591973513430; Fri, 12 Jun 2020 07:51:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzKGK6kZ7bJZt+ZRB9Ra7NjW85+BqxOmHfzGKkZXtXQhVBBOpwtN7uQeoTnx6kp4Fdh7EABRA== X-Received: by 2002:a1c:c904:: with SMTP id f4mr13775267wmb.69.1591973513175; Fri, 12 Jun 2020 07:51:53 -0700 (PDT) Date: Fri, 12 Jun 2020 10:51:51 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL v2 22/58] virtio-balloon: fix free page hinting without an iothread Message-ID: <20200612141917.9446-23-mst@redhat.com> References: <20200612141917.9446-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20200612141917.9446-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline 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=205.139.110.120; envelope-from=mst@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/12 08:00:42 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, 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_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: Peter Maydell , David Hildenbrand , qemu-stable@nongnu.org, Alexander Duyck , Alexander Bulekov , Wei Wang , Alexander Duyck , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: David Hildenbrand In case we don't have an iothread, we mark the feature as abscent but still add the queue. 'free_page_bh' remains set to NULL. qemu-system-i386 \ -M microvm \ -nographic \ -device virtio-balloon-device,free-page-hint=3Dtrue \ -nographic \ -display none \ -monitor none \ -serial none \ -qtest stdio Doing a "write 0xc0000e30 0x24 0x030000000300000003000000030000000300000003000000030000000300000003000000" We will trigger a SEGFAULT. Let's move the check and bail out. While at it, move the static initializations to instance_init(). free_page_report_status and block_iothread are implicitly set to the right values (0/false) already, so drop the initialization. Reviewed-by: Alexander Duyck Reviewed-by: Philippe Mathieu-Daud=C3=A9 Fixes: c13c4153f76d ("virtio-balloon: VIRTIO_BALLOON_F_FREE_PAGE_HINT") Reported-by: Alexander Bulekov Cc: qemu-stable@nongnu.org Cc: Wei Wang Cc: Michael S. Tsirkin Cc: Philippe Mathieu-Daud=C3=A9 Cc: Alexander Duyck Signed-off-by: David Hildenbrand Message-Id: <20200520100439.19872-2-david@redhat.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/virtio/virtio-balloon.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c index 065cd450f1..7ff6a7aa7c 100644 --- a/hw/virtio/virtio-balloon.c +++ b/hw/virtio/virtio-balloon.c @@ -789,6 +789,13 @@ static void virtio_balloon_device_realize(DeviceState = *dev, Error **errp) return; } =20 + if (virtio_has_feature(s->host_features, VIRTIO_BALLOON_F_FREE_PAGE_HI= NT) && + !s->iothread) { + error_setg(errp, "'free-page-hint' requires 'iothread' to be set"); + virtio_cleanup(vdev); + return; + } + s->ivq =3D virtio_add_queue(vdev, 128, virtio_balloon_handle_output); s->dvq =3D virtio_add_queue(vdev, 128, virtio_balloon_handle_output); s->svq =3D virtio_add_queue(vdev, 128, virtio_balloon_receive_stats); @@ -797,24 +804,11 @@ static void virtio_balloon_device_realize(DeviceState= *dev, Error **errp) VIRTIO_BALLOON_F_FREE_PAGE_HINT)) { s->free_page_vq =3D virtio_add_queue(vdev, VIRTQUEUE_MAX_SIZE, virtio_balloon_handle_free_page= _vq); - s->free_page_report_status =3D FREE_PAGE_REPORT_S_STOP; - s->free_page_report_cmd_id =3D - VIRTIO_BALLOON_FREE_PAGE_REPORT_CMD_ID_MIN; - s->free_page_report_notify.notify =3D - virtio_balloon_free_page_report_not= ify; precopy_add_notifier(&s->free_page_report_notify); - if (s->iothread) { - object_ref(OBJECT(s->iothread)); - s->free_page_bh =3D aio_bh_new(iothread_get_aio_context(s->iot= hread), - virtio_ballloon_get_free_page_hints= , s); - qemu_mutex_init(&s->free_page_lock); - qemu_cond_init(&s->free_page_cond); - s->block_iothread =3D false; - } else { - /* Simply disable this feature if the iothread wasn't created.= */ - s->host_features &=3D ~(1 << VIRTIO_BALLOON_F_FREE_PAGE_HINT); - virtio_error(vdev, "iothread is missing"); - } + + object_ref(OBJECT(s->iothread)); + s->free_page_bh =3D aio_bh_new(iothread_get_aio_context(s->iothrea= d), + virtio_ballloon_get_free_page_hints, = s); } reset_stats(s); } @@ -892,6 +886,11 @@ static void virtio_balloon_instance_init(Object *obj) { VirtIOBalloon *s =3D VIRTIO_BALLOON(obj); =20 + qemu_mutex_init(&s->free_page_lock); + qemu_cond_init(&s->free_page_cond); + s->free_page_report_cmd_id =3D VIRTIO_BALLOON_FREE_PAGE_REPORT_CMD_ID_= MIN; + s->free_page_report_notify.notify =3D virtio_balloon_free_page_report_= notify; + object_property_add(obj, "guest-stats", "guest statistics", balloon_stats_get_all, NULL, NULL, s); =20 --=20 MST