From nobody Mon Feb 9 20:34:19 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1543986661851676.8819606227306; Tue, 4 Dec 2018 21:11:01 -0800 (PST) Received: from localhost ([::1]:60070 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gUPSZ-0004KM-SX for importer@patchew.org; Wed, 05 Dec 2018 00:10:55 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49256) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gUPOj-0008LF-56 for qemu-devel@nongnu.org; Wed, 05 Dec 2018 00:06:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gUPOi-0004RG-0u for qemu-devel@nongnu.org; Wed, 05 Dec 2018 00:06:56 -0500 Received: from ozlabs.org ([203.11.71.1]:35039) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gUPOg-0004Mt-Ue; Wed, 05 Dec 2018 00:06:55 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 438mtF4WnSz9sCr; Wed, 5 Dec 2018 16:06:45 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1543986405; bh=brOTXMxkhPk+ENVg+Ls2uCWUIUWYjxkrC7oP2Y5RVKU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oXLt53bn6L92SKRbJkAR5ib+CK2rSiNybmCdKX3suka+mNEEzTicwbfuEumTXCN0I 4xc+ofk+ryyC0OhPvhNsSpfnnAGk8SbCK0zdMfD23r5yL5Gcs9LF/I94skahG/pRRm 5+cGWkW522W0M2zfI7M8ieoIG5LOJz7jGP8F9t/Y= From: David Gibson To: dhildenb@redhat.com, imammedo@redhat.com, ehabkost@redhat.com Date: Wed, 5 Dec 2018 16:06:39 +1100 Message-Id: <20181205050641.864-4-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181205050641.864-1-david@gibson.dropbear.id.au> References: <20181205050641.864-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 203.11.71.1 Subject: [Qemu-devel] [RFCv2 for-4.0 3/5] virtio-balloon: Rework ballon_page() interface X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, David Gibson , qemu-ppc@nongnu.org, qemu-devel@nongnu.org, mst@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" This replaces the balloon_page() internal interface with ballon_inflate_page(), with a slightly different interface. The new interface will make future alterations simpler. Signed-off-by: David Gibson Reviewed-by: David Hildenbrand Reviewed-by: Michael S. Tsirkin --- hw/virtio/virtio-balloon.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c index e8611aab0e..c3a19aa27d 100644 --- a/hw/virtio/virtio-balloon.c +++ b/hw/virtio/virtio-balloon.c @@ -33,11 +33,12 @@ =20 #define BALLOON_PAGE_SIZE (1 << VIRTIO_BALLOON_PFN_SHIFT) =20 -static void balloon_page(void *addr, int deflate) +static void balloon_inflate_page(VirtIOBalloon *balloon, + MemoryRegion *mr, hwaddr offset) { - if (!qemu_balloon_is_inhibited() && !deflate) { - qemu_madvise(addr, BALLOON_PAGE_SIZE, QEMU_MADV_DONTNEED); - } + void *addr =3D memory_region_get_ram_ptr(mr) + offset; + + qemu_madvise(addr, BALLOON_PAGE_SIZE, QEMU_MADV_DONTNEED); } =20 static const char *balloon_stat_names[] =3D { @@ -222,7 +223,6 @@ static void virtio_balloon_handle_output(VirtIODevice *= vdev, VirtQueue *vq) =20 while (iov_to_buf(elem->out_sg, elem->out_num, offset, &pfn, 4) = =3D=3D 4) { hwaddr pa; - hwaddr addr; int p =3D virtio_ldl_p(vdev, &pfn); =20 pa =3D (hwaddr) p << VIRTIO_BALLOON_PFN_SHIFT; @@ -244,11 +244,9 @@ static void virtio_balloon_handle_output(VirtIODevice = *vdev, VirtQueue *vq) =20 trace_virtio_balloon_handle_output(memory_region_name(section.= mr), pa); - /* Using memory_region_get_ram_ptr is bending the rules a bit,= but - should be OK because we only want a single page. */ - addr =3D section.offset_within_region; - balloon_page(memory_region_get_ram_ptr(section.mr) + addr, - !!(vq =3D=3D s->dvq)); + if (!qemu_balloon_is_inhibited() && vq !=3D s->dvq) { + balloon_inflate_page(s, section.mr, section.offset_within_= region); + } memory_region_unref(section.mr); } =20 --=20 2.19.2