From nobody Tue Apr 30 20:16:11 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1583999510; cv=none; d=zohomail.com; s=zohoarc; b=aWiw8BWDU8hBaB/9DSqPkyQuszrUtCsrOku2hPz48rJcT71MX90oHpYPYzcaMxLzQrg0vIZcRALJHSNBJzbawj1x4WObfeJ5z236eAbn512g8VFchXeuiuJBXBWeFg7MrzWSzDRR/5km/99l/9b1i1LdHNom8hGxD/o7Bb05iEs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583999510; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=S9/asJ0NOKLSQHCQ3T0gUtjDgn/AlZuIf8Jps7mCVBk=; b=NxMZzsOzHYMsQQRaxOWGZ5djq6OAstGYg7DaJAfK0pU9LQ6IdOXAxZD33G35DSeva0Z7zFsEUwQyVUa/KZ5PRbJAHsAwie8sQNuJgazW1ngaWlXW2B/nTUA4QzNj/Dq04K2RuBDftt6YuwSHa7VoUfMPFAyr4k6FopukquQnDUk= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 1583999510007877.7242461659448; Thu, 12 Mar 2020 00:51:50 -0700 (PDT) Received: from localhost ([::1]:37166 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCIdB-0003mF-2N for importer@patchew.org; Thu, 12 Mar 2020 03:51:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40433) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCIcE-0002VI-Qd for qemu-devel@nongnu.org; Thu, 12 Mar 2020 03:50:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jCIcD-0003jf-Dp for qemu-devel@nongnu.org; Thu, 12 Mar 2020 03:50:50 -0400 Received: from out4436.biz.mail.alibaba.com ([47.88.44.36]:58871) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jCIcD-0003iq-1u for qemu-devel@nongnu.org; Thu, 12 Mar 2020 03:50:49 -0400 Received: from localhost(mailfrom:teawaterz@linux.alibaba.com fp:SMTPD_---0TsNBE7I_1583999424) by smtp.aliyun-inc.com(127.0.0.1); Thu, 12 Mar 2020 15:50:28 +0800 X-Alimail-AntiSpam: AC=PASS; BC=-1|-1; BR=01201311R141e4; CH=green; DM=||false|; DS=||; FP=0|-1|-1|-1|0|-1|-1|-1; HT=e01f04396; MF=teawaterz@linux.alibaba.com; NM=1; PH=DS; RN=12; SR=0; TI=SMTPD_---0TsNBE7I_1583999424; From: Hui Zhu To: mst@redhat.com, jasowang@redhat.com, akpm@linux-foundation.org, pagupta@redhat.com, mojha@codeaurora.org, david@redhat.com, namit@vmware.com, virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org, qemu-devel@nongnu.org Subject: [RFC for QEMU] virtio-balloon: Add option thp-order to set VIRTIO_BALLOON_F_THP_ORDER Date: Thu, 12 Mar 2020 15:49:55 +0800 Message-Id: <1583999395-9131-2-git-send-email-teawater@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1583999395-9131-1-git-send-email-teawater@gmail.com> References: <1583999395-9131-1-git-send-email-teawater@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 47.88.44.36 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: Hui Zhu , Hui Zhu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" If the guest kernel has many fragmentation pages, use virtio_balloon will split THP of QEMU when it calls MADV_DONTNEED madvise to release the balloon pages. Set option thp-order to on will open flags VIRTIO_BALLOON_F_THP_ORDER. It will set balloon size to THP size to handle the THP split issue. Signed-off-by: Hui Zhu --- hw/virtio/virtio-balloon.c | 67 ++++++++++++++++-----= ---- include/standard-headers/linux/virtio_balloon.h | 4 ++ 2 files changed, 47 insertions(+), 24 deletions(-) diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c index a4729f7..cfe86b0 100644 --- a/hw/virtio/virtio-balloon.c +++ b/hw/virtio/virtio-balloon.c @@ -340,37 +340,49 @@ static void virtio_balloon_handle_output(VirtIODevice= *vdev, VirtQueue *vq) while (iov_to_buf(elem->out_sg, elem->out_num, offset, &pfn, 4) = =3D=3D 4) { unsigned int p =3D virtio_ldl_p(vdev, &pfn); hwaddr pa; + size_t handle_size =3D BALLOON_PAGE_SIZE; =20 pa =3D (hwaddr) p << VIRTIO_BALLOON_PFN_SHIFT; offset +=3D 4; =20 - section =3D memory_region_find(get_system_memory(), pa, - BALLOON_PAGE_SIZE); - if (!section.mr) { - trace_virtio_balloon_bad_addr(pa); - continue; - } - if (!memory_region_is_ram(section.mr) || - memory_region_is_rom(section.mr) || - memory_region_is_romd(section.mr)) { - trace_virtio_balloon_bad_addr(pa); - memory_region_unref(section.mr); - continue; - } + if (virtio_has_feature(s->host_features, + VIRTIO_BALLOON_F_THP_ORDER)) + handle_size =3D BALLOON_PAGE_SIZE << VIRTIO_BALLOON_THP_OR= DER; + + while (handle_size > 0) { + section =3D memory_region_find(get_system_memory(), pa, + BALLOON_PAGE_SIZE); + if (!section.mr) { + trace_virtio_balloon_bad_addr(pa); + continue; + } + if (!memory_region_is_ram(section.mr) || + memory_region_is_rom(section.mr) || + memory_region_is_romd(section.mr)) { + trace_virtio_balloon_bad_addr(pa); + memory_region_unref(section.mr); + continue; + } =20 - trace_virtio_balloon_handle_output(memory_region_name(section.= mr), - pa); - if (!qemu_balloon_is_inhibited()) { - if (vq =3D=3D s->ivq) { - balloon_inflate_page(s, section.mr, - section.offset_within_region, &pb= p); - } else if (vq =3D=3D s->dvq) { - balloon_deflate_page(s, section.mr, section.offset_wit= hin_region); - } else { - g_assert_not_reached(); + trace_virtio_balloon_handle_output(memory_region_name(sect= ion.mr), + pa); + if (!qemu_balloon_is_inhibited()) { + if (vq =3D=3D s->ivq) { + balloon_inflate_page(s, section.mr, + section.offset_within_region, + &pbp); + } else if (vq =3D=3D s->dvq) { + balloon_deflate_page(s, section.mr, + section.offset_within_region); + } else { + g_assert_not_reached(); + } } + memory_region_unref(section.mr); + + pa +=3D BALLOON_PAGE_SIZE; + handle_size -=3D BALLOON_PAGE_SIZE; } - memory_region_unref(section.mr); } =20 virtqueue_push(vq, elem, offset); @@ -693,6 +705,8 @@ static void virtio_balloon_set_config(VirtIODevice *vde= v, =20 memcpy(&config, config_data, virtio_balloon_config_size(dev)); dev->actual =3D le32_to_cpu(config.actual); + if (virtio_has_feature(vdev->host_features, VIRTIO_BALLOON_F_THP_ORDER= )) + dev->actual <<=3D VIRTIO_BALLOON_THP_ORDER; if (dev->actual !=3D oldactual) { qapi_event_send_balloon_change(vm_ram_size - ((ram_addr_t) dev->actual << VIRTIO_BALLOON_PFN_SH= IFT)); @@ -728,6 +742,9 @@ static void virtio_balloon_to_target(void *opaque, ram_= addr_t target) } if (target) { dev->num_pages =3D (vm_ram_size - target) >> VIRTIO_BALLOON_PFN_SH= IFT; + if (virtio_has_feature(dev->host_features, + VIRTIO_BALLOON_F_THP_ORDER)) + dev->num_pages >>=3D VIRTIO_BALLOON_THP_ORDER; virtio_notify_config(vdev); } trace_virtio_balloon_to_target(target, dev->num_pages); @@ -916,6 +933,8 @@ static Property virtio_balloon_properties[] =3D { VIRTIO_BALLOON_F_DEFLATE_ON_OOM, false), DEFINE_PROP_BIT("free-page-hint", VirtIOBalloon, host_features, VIRTIO_BALLOON_F_FREE_PAGE_HINT, false), + DEFINE_PROP_BIT("thp-order", VirtIOBalloon, host_features, + VIRTIO_BALLOON_F_THP_ORDER, false), /* QEMU 4.0 accidentally changed the config size even when free-page-h= int * is disabled, resulting in QEMU 3.1 migration incompatibility. This * property retains this quirk for QEMU 4.1 machine types. diff --git a/include/standard-headers/linux/virtio_balloon.h b/include/stan= dard-headers/linux/virtio_balloon.h index 9375ca2..f54d613 100644 --- a/include/standard-headers/linux/virtio_balloon.h +++ b/include/standard-headers/linux/virtio_balloon.h @@ -36,10 +36,14 @@ #define VIRTIO_BALLOON_F_DEFLATE_ON_OOM 2 /* Deflate balloon on OOM */ #define VIRTIO_BALLOON_F_FREE_PAGE_HINT 3 /* VQ to report free pages */ #define VIRTIO_BALLOON_F_PAGE_POISON 4 /* Guest is using page poisoning */ +#define VIRTIO_BALLOON_F_THP_ORDER 5 /* Set balloon page order to thp orde= r */ =20 /* Size of a PFN in the balloon interface. */ #define VIRTIO_BALLOON_PFN_SHIFT 12 =20 +/* The order of the balloon page */ +#define VIRTIO_BALLOON_THP_ORDER 9 + #define VIRTIO_BALLOON_CMD_ID_STOP 0 #define VIRTIO_BALLOON_CMD_ID_DONE 1 struct virtio_balloon_config { --=20 2.7.4