From mboxrd@z Thu Jan 1 00:00:00 1970 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 smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (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 C9697C43334 for ; Tue, 28 Jun 2022 06:17:35 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 5DD8C82EF1; Tue, 28 Jun 2022 06:17:35 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 5DD8C82EF1 Authentication-Results: smtp1.osuosl.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Yjpn1jCk X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id k6GlM3eBcs6m; Tue, 28 Jun 2022 06:17:34 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp1.osuosl.org (Postfix) with ESMTPS id 8C2F0819D1; Tue, 28 Jun 2022 06:17:33 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 8C2F0819D1 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 5DEC4C0039; Tue, 28 Jun 2022 06:17:33 +0000 (UTC) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) by lists.linuxfoundation.org (Postfix) with ESMTP id 4D30EC002D for ; Tue, 28 Jun 2022 06:17:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 1C6CF4155B for ; Tue, 28 Jun 2022 06:17:32 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 1C6CF4155B Authentication-Results: smtp4.osuosl.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Yjpn1jCk X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id UKeGRo51jLLZ for ; Tue, 28 Jun 2022 06:17:30 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 8CDD5411C6 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by smtp4.osuosl.org (Postfix) with ESMTPS id 8CDD5411C6 for ; Tue, 28 Jun 2022 06:17:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1656397049; 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: in-reply-to:in-reply-to:references:references; bh=OhoqRfg2MXBrZxgC7cHU5udJurpNt9gNTV/G4aIXyy4=; b=Yjpn1jCkWFlVzpvto11upioqJY6xSMSnUYn3Kilzlc+Dp65ybP4IxuA6zvQSH1Q7bFvz+n goBXkfAYxrk5OkR731RfH+17nXEF7bVas0vAL8PZP1VIqGWj2PfQI7/tgPyTjR7zA+dDH+ XyWqthhy9pUKuF+mhMJZ2tN/ZfsdcOE= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-635-OVi5OiW1N3SqIK4guFTPOw-1; Tue, 28 Jun 2022 02:17:26 -0400 X-MC-Unique: OVi5OiW1N3SqIK4guFTPOw-1 Received: by mail-wm1-f72.google.com with SMTP id h125-20020a1c2183000000b003a0374f1eb8so7319849wmh.8 for ; Mon, 27 Jun 2022 23:17:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=OhoqRfg2MXBrZxgC7cHU5udJurpNt9gNTV/G4aIXyy4=; b=3C3gMqKn6PL9q+tQ3NDeiZSn6BkPSg0QbL/bvjBiIs7edbSQqt3TaB0FIEfII+CmF1 50nYd3HwvaaPYlarfTBE+UfXF/1o/KnN/v42Mt55wnOWOkZ8BMrEnoMwiTY7GEt2eE3X nBqL9AL8/WHbytu+amtDCo1lVv0SE/odxB2kwJMG2HtaRuMb06+KwA1TNS/vCewOm3jp +LQXuGcwNQY2qt5z/LhNITY7eWIOr2J+Uk1WXCQFa5d1c1VNGFRgrVnBJJTNXCxZjiMF NrrQyIlSUPuthGgxpaLEAEtRiYlaT96tVyWka7Vh2i14vywRT5fhJzf12+Duw/3qq1AY QRSw== X-Gm-Message-State: AJIora8mqBQmkCA02m2EPXzrfLNmOKGnVBTr7nltySMjivrZ8qzijlgs yjM3yNkEM2SL64uTqLKzUOjWVelaad6GUH0Mj9MfsSJJxyBb/09SCs5/o4+u3OASnIDHp82suN+ +njBctQQ8PQTB5epI3DQMNRx+kgDNEeSWoKWkEKOGDw== X-Received: by 2002:a05:6000:178d:b0:20f:e84c:2f46 with SMTP id e13-20020a056000178d00b0020fe84c2f46mr16407118wrg.646.1656397045144; Mon, 27 Jun 2022 23:17:25 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tXHq9GR8941iyyGKifEBuEyOnppA3bsjiomzAq4X0nsRYW4fuV1jOr+FXKdO3fC4jb+Ts/lQ== X-Received: by 2002:a05:6000:178d:b0:20f:e84c:2f46 with SMTP id e13-20020a056000178d00b0020fe84c2f46mr16407097wrg.646.1656397044920; Mon, 27 Jun 2022 23:17:24 -0700 (PDT) Received: from redhat.com ([2.52.23.204]) by smtp.gmail.com with ESMTPSA id i8-20020a5d5588000000b002102f2fac37sm12540273wrv.51.2022.06.27.23.17.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jun 2022 23:17:24 -0700 (PDT) Date: Tue, 28 Jun 2022 02:17:21 -0400 From: "Michael S. Tsirkin" To: Jason Wang Subject: Re: [PATCH v3 1/2] vhost: Add rbtree vdpa_mem_tree to saved the counted mem Message-ID: <20220628021443-mutt-send-email-mst@kernel.org> References: <20220626090409.1011144-1-lulu@redhat.com> <20220626055420-mutt-send-email-mst@kernel.org> <20220627055826-mutt-send-email-mst@kernel.org> <20220628014642-mutt-send-email-mst@kernel.org> <20220628020622-mutt-send-email-mst@kernel.org> MIME-Version: 1.0 In-Reply-To: Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mst@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline Cc: linux-kernel , Cindy Lu , virtualization X-BeenThere: virtualization@lists.linux-foundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Linux virtualization List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: virtualization-bounces@lists.linux-foundation.org Sender: "Virtualization" On Tue, Jun 28, 2022 at 02:10:38PM +0800, Jason Wang wrote: > On Tue, Jun 28, 2022 at 2:07 PM Michael S. Tsirkin wrote: > > > > On Tue, Jun 28, 2022 at 02:03:38PM +0800, Jason Wang wrote: > > > On Tue, Jun 28, 2022 at 1:58 PM Michael S. Tsirkin wrote: > > > > > > > > On Tue, Jun 28, 2022 at 11:54:27AM +0800, Jason Wang wrote: > > > > > On Mon, Jun 27, 2022 at 6:01 PM Michael S. Tsirkin wrote: > > > > > > > > > > > > On Mon, Jun 27, 2022 at 04:12:57PM +0800, Cindy Lu wrote: > > > > > > > On Sun, Jun 26, 2022 at 6:01 PM Michael S. Tsirkin wrote: > > > > > > > > > > > > > > > > On Sun, Jun 26, 2022 at 05:04:08PM +0800, Cindy Lu wrote: > > > > > > > > > We count pinned_vm as follow in vhost-vDPA > > > > > > > > > > > > > > > > > > lock_limit = rlimit(RLIMIT_MEMLOCK) >> PAGE_SHIFT; > > > > > > > > > if (npages + atomic64_read(&dev->mm->pinned_vm) > lock_limit) { > > > > > > > > > ret = -ENOMEM; > > > > > > > > > goto unlock; > > > > > > > > > } > > > > > > > > > This means if we have two vDPA devices for the same VM the pages > > > > > > > > > would be counted twice. So we add a tree to save the page that > > > > > > > > > counted and we will not count it again. > > > > > > > > > > > > > > > > > > Add vdpa_mem_tree to saved the mem that already counted. > > > > > > > > > use a hlist to saved the root for vdpa_mem_tree. > > > > > > > > > > > > > > > > > > Signed-off-by: Cindy Lu > > > > > > > > > --- > > > > > > > > > drivers/vhost/vhost.c | 63 +++++++++++++++++++++++++++++++++++++++++++ > > > > > > > > > drivers/vhost/vhost.h | 1 + > > > > > > > > > 2 files changed, 64 insertions(+) > > > > > > > > > > > > > > > > > > diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c > > > > > > > > > index 40097826cff0..4ca8b1ed944b 100644 > > > > > > > > > --- a/drivers/vhost/vhost.c > > > > > > > > > +++ b/drivers/vhost/vhost.c > > > > > > > > > @@ -32,6 +32,8 @@ > > > > > > > > > #include > > > > > > > > > > > > > > > > > > #include "vhost.h" > > > > > > > > > +#include > > > > > > > > > +#include > > > > > > > > > > > > > > > > > > static ushort max_mem_regions = 64; > > > > > > > > > module_param(max_mem_regions, ushort, 0444); > > > > > > > > > @@ -49,6 +51,14 @@ enum { > > > > > > > > > #define vhost_used_event(vq) ((__virtio16 __user *)&vq->avail->ring[vq->num]) > > > > > > > > > #define vhost_avail_event(vq) ((__virtio16 __user *)&vq->used->ring[vq->num]) > > > > > > > > > > > > > > > > > > +struct vhost_vdpa_rbtree_node { > > > > > > > > > + struct hlist_node node; > > > > > > > > > + struct rb_root_cached vdpa_mem_tree; > > > > > > > > > + struct mm_struct *mm_using; > > > > > > > > > +}; > > > > > > > > > +static DECLARE_HASHTABLE(vhost_vdpa_rbtree_hlist, 8); > > > > > > > > > +int vhost_vdpa_rbtree_hlist_status; > > > > > > > > > + > > > > > > > > > #ifdef CONFIG_VHOST_CROSS_ENDIAN_LEGACY > > > > > > > > > static void vhost_disable_cross_endian(struct vhost_virtqueue *vq) > > > > > > > > > { > > > > > > > > > > > > > > > > Are you trying to save some per-mm information here? > > > > > > > > Can't we just add it to mm_struct? > > > > > > > > > > > > > > > yes, this is a per-mm information, but I have checked with jason before, > > > > > > > seems it maybe difficult to change the mm_struct in upstream > > > > > > > so I add an to add a hlist instead > > > > > > > Thanks > > > > > > > Cindy > > > > > > > > > > > > Difficult how? > > > > > > > > > > It is only useful for vDPA probably. Though it could be used by VFIO > > > > > as well, VFIO does pinning/accounting at the container level and it > > > > > has been there for years. > > > > > > > > Yes it's been there, I'm not sure this means it's perfect. > > > > Also, rdma guys might be interested too I guess? > > > > > > It looks to me they plan to go to iommufd as well. > > > > > > > > > > > > vDPA have an implicit "container" the > > > > > mm_struct, but the accounting is done per device right now. > > > > > > > > > > In the future, when vDPA switches to iommufd, it can be then solved at > > > > > iommufd level. > > > > > > > > So is it even worth fixing now? > > > > > > Not sure, but I guess it's better. (Or we need to teach the libvirt to > > > have special care on this). > > > > It already has to for existing kernels. Let's just move to iommufd > > faster then? > > This is fine, Cindy, any idea on this? > > > > > > > > > > > > And if we do this in mm, it will bring extra overheads. > > > > > > > > > > Thanks > > > > > > > > Pointer per mm, not too bad ... > > > > > > Unless we enable it unconditionally, it requires a lot of tree > > > operations at least. > > > > > > Thanks > > > > Not sure I understand. > > I mean in order to not count pinned pages multiple times we need to > keep track of the pages that are already pinned in an rbtree with > refcounts. This means we need to populate the tree when userspace > pin/unpin pages. > > Thanks Yep. In fact, if you are going to try and fix accounting you should probably find a way to fix a mix of vdpa and -realtime mlock=on as well as a mix of vfio and vdpa. > > > > > > > > > > > > You get more scrutiny if you try, for sure, > > > > > > and you need to need to generalize it enough that it looks > > > > > > useful outside the driver. But I guess that's good? > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > @@ -571,6 +581,51 @@ static void vhost_detach_mm(struct vhost_dev *dev) > > > > > > > > > dev->mm = NULL; > > > > > > > > > } > > > > > > > > > > > > > > > > > > +struct rb_root_cached *vhost_vdpa_get_mem_tree(struct mm_struct *mm) > > > > > > > > > +{ > > > > > > > > > + struct vhost_vdpa_rbtree_node *rbtree_root = NULL; > > > > > > > > > + struct rb_root_cached *vdpa_tree; > > > > > > > > > + u32 key; > > > > > > > > > + > > > > > > > > > + /* No hased table, init one */ > > > > > > > > > + if (vhost_vdpa_rbtree_hlist_status == 0) { > > > > > > > > > + hash_init(vhost_vdpa_rbtree_hlist); > > > > > > > > > + vhost_vdpa_rbtree_hlist_status = 1; > > > > > > > > > + } > > > > > > > > > + > > > > > > > > > + key = jhash_1word((u64)mm, JHASH_INITVAL); > > > > > > > > > + hash_for_each_possible(vhost_vdpa_rbtree_hlist, rbtree_root, node, > > > > > > > > > + key) { > > > > > > > > > + if (rbtree_root->mm_using == mm) > > > > > > > > > + return &(rbtree_root->vdpa_mem_tree); > > > > > > > > > + } > > > > > > > > > + rbtree_root = kmalloc(sizeof(*rbtree_root), GFP_KERNEL); > > > > > > > > > + if (!rbtree_root) > > > > > > > > > + return NULL; > > > > > > > > > + rbtree_root->mm_using = mm; > > > > > > > > > + rbtree_root->vdpa_mem_tree = RB_ROOT_CACHED; > > > > > > > > > + hash_add(vhost_vdpa_rbtree_hlist, &rbtree_root->node, key); > > > > > > > > > + vdpa_tree = &(rbtree_root->vdpa_mem_tree); > > > > > > > > > + return vdpa_tree; > > > > > > > > > +} > > > > > > > > > + > > > > > > > > > +void vhost_vdpa_relase_mem_tree(struct mm_struct *mm) > > > > > > > > > +{ > > > > > > > > > + struct vhost_vdpa_rbtree_node *rbtree_root = NULL; > > > > > > > > > + u32 key; > > > > > > > > > + > > > > > > > > > + key = jhash_1word((u64)mm, JHASH_INITVAL); > > > > > > > > > + > > > > > > > > > + /* No hased table, init one */ > > > > > > > > > + hash_for_each_possible(vhost_vdpa_rbtree_hlist, rbtree_root, node, > > > > > > > > > + key) { > > > > > > > > > + if (rbtree_root->mm_using == mm) { > > > > > > > > > + hash_del(&rbtree_root->node); > > > > > > > > > + kfree(rbtree_root); > > > > > > > > > + } > > > > > > > > > + } > > > > > > > > > +} > > > > > > > > > + > > > > > > > > > /* Caller should have device mutex */ > > > > > > > > > long vhost_dev_set_owner(struct vhost_dev *dev) > > > > > > > > > { > > > > > > > > > @@ -605,6 +660,11 @@ long vhost_dev_set_owner(struct vhost_dev *dev) > > > > > > > > > err = vhost_dev_alloc_iovecs(dev); > > > > > > > > > if (err) > > > > > > > > > goto err_cgroup; > > > > > > > > > + dev->vdpa_mem_tree = vhost_vdpa_get_mem_tree(dev->mm); > > > > > > > > > + if (dev->vdpa_mem_tree == NULL) { > > > > > > > > > + err = -ENOMEM; > > > > > > > > > + goto err_cgroup; > > > > > > > > > + } > > > > > > > > > > > > > > > > > > return 0; > > > > > > > > > err_cgroup: > > > > > > > > > @@ -613,6 +673,7 @@ long vhost_dev_set_owner(struct vhost_dev *dev) > > > > > > > > > dev->worker = NULL; > > > > > > > > > } > > > > > > > > > err_worker: > > > > > > > > > + vhost_vdpa_relase_mem_tree(dev->mm); > > > > > > > > > vhost_detach_mm(dev); > > > > > > > > > dev->kcov_handle = 0; > > > > > > > > > err_mm: > > > > > > > > > @@ -710,6 +771,8 @@ void vhost_dev_cleanup(struct vhost_dev *dev) > > > > > > > > > dev->worker = NULL; > > > > > > > > > dev->kcov_handle = 0; > > > > > > > > > } > > > > > > > > > + > > > > > > > > > + vhost_vdpa_relase_mem_tree(dev->mm); > > > > > > > > > vhost_detach_mm(dev); > > > > > > > > > } > > > > > > > > > EXPORT_SYMBOL_GPL(vhost_dev_cleanup); > > > > > > > > > diff --git a/drivers/vhost/vhost.h b/drivers/vhost/vhost.h > > > > > > > > > index d9109107af08..84de33de3abf 100644 > > > > > > > > > --- a/drivers/vhost/vhost.h > > > > > > > > > +++ b/drivers/vhost/vhost.h > > > > > > > > > @@ -160,6 +160,7 @@ struct vhost_dev { > > > > > > > > > int byte_weight; > > > > > > > > > u64 kcov_handle; > > > > > > > > > bool use_worker; > > > > > > > > > + struct rb_root_cached *vdpa_mem_tree; > > > > > > > > > int (*msg_handler)(struct vhost_dev *dev, u32 asid, > > > > > > > > > struct vhost_iotlb_msg *msg); > > > > > > > > > }; > > > > > > > > > -- > > > > > > > > > 2.34.3 > > > > > > > > > > > > > > > > > > > > _______________________________________________ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/virtualization