From patchwork Tue May 23 18:59:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13252801 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B95CDC77B75 for ; Tue, 23 May 2023 19:00:13 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q1XEC-00031M-Ap; Tue, 23 May 2023 14:59:24 -0400 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 1q1XEA-00030z-4K for qemu-devel@nongnu.org; Tue, 23 May 2023 14:59:22 -0400 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 1q1XE8-0001tZ-Cj for qemu-devel@nongnu.org; Tue, 23 May 2023 14:59:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684868359; 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=V6qht0XzJGQZQDaF9L5HUW/Xevjnka1+wXyHDn8KX98=; b=MHaO/EGYt8t9kblrx7DTZXv5EIs4IYY7DANZVPNHpaL/teiumx2OhUDel0i6W5Ln4Au3J9 canJ85u93/vMG0S8oz/3VPNvwy69f4FG8P+vi9ghyVeuGw8svwJj4YCb+dg7+ZOGNjmAYK /OaaaU6JZSgwYfTp/kFu1oASjoVFJKc= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-471-iUA_5qzaPdaZeRLfMY9SRQ-1; Tue, 23 May 2023 14:59:18 -0400 X-MC-Unique: iUA_5qzaPdaZeRLfMY9SRQ-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 03CB81C01E98; Tue, 23 May 2023 18:59:18 +0000 (UTC) Received: from t480s.fritz.box (unknown [10.39.194.191]) by smtp.corp.redhat.com (Postfix) with ESMTP id 261D4492B0B; Tue, 23 May 2023 18:59:15 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Cc: David Hildenbrand , "Michael S. Tsirkin" , Stefan Hajnoczi , Igor Mammedov , Paolo Bonzini , Peter Xu , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v4 0/3] vhost: memslot handling improvements Date: Tue, 23 May 2023 20:59:12 +0200 Message-Id: <20230523185915.540373-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 Received-SPF: pass client-ip=170.10.129.124; envelope-from=david@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Following up on my previous work to make virtio-mem consume multiple memslots dynamically [1] that requires precise accounting between used vs. reserved memslots, I realized that vhost makes this extra hard by filtering out some memory region sections (so they don't consume a memslot) in the vhost-user case, which messes up the whole memslot accounting. This series fixes what I found to be broken and prepares for more work on [1]. Further, it cleanes up the merge checks that I consider unnecessary. [1] https://lkml.kernel.org/r/20211027124531.57561-8-david@redhat.com Cc: "Michael S. Tsirkin" Cc: Stefan Hajnoczi Cc: Igor Mammedov Cc: Paolo Bonzini Cc: Peter Xu Cc: "Philippe Mathieu-Daudé" v3 -> v4: - Add RBs - "vhost: Rework memslot filtering and fix "used_memslot" tracking" -- Fix check for free memslots (> 1 vs > 0) v2 -> v3: - Add ACKs - "softmmu/physmem: Fixup qemu_ram_block_from_host() documentation" -- Fix typo in description v1 -> v2: - "vhost: Rework memslot filtering and fix "used_memslot" tracking" -- New approach: keep filtering, but make filtering less generic and track separately. This should keep any existing setups working. - "softmmu/physmem: Fixup qemu_ram_block_from_host() documentation" -- As requested by Igor David Hildenbrand (3): vhost: Rework memslot filtering and fix "used_memslot" tracking vhost: Remove vhost_backend_can_merge() callback softmmu/physmem: Fixup qemu_ram_block_from_host() documentation hw/virtio/vhost-user.c | 21 ++--------- hw/virtio/vhost-vdpa.c | 1 - hw/virtio/vhost.c | 62 ++++++++++++++++++++++++------- include/exec/cpu-common.h | 15 ++++++++ include/hw/virtio/vhost-backend.h | 9 +---- softmmu/physmem.c | 17 --------- 6 files changed, 68 insertions(+), 57 deletions(-)