Received: by 2002:a05:6602:18e:0:0:0:0 with SMTP id m14csp1647496ioo; Sun, 22 May 2022 22:56:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJygSUc+c+J31cjl+yBcPNa0DBUQW1JnKqLOfVn656O7GE0CZbxkKgq/Gf9EziRM1iWIr3SE X-Received: by 2002:a17:90b:4b05:b0:1df:db8a:1fcb with SMTP id lx5-20020a17090b4b0500b001dfdb8a1fcbmr22097390pjb.54.1653285367527; Sun, 22 May 2022 22:56:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653285367; cv=none; d=google.com; s=arc-20160816; b=Ix5u6wtKDGf+S52A5+5FMQLjsM8C0Ymrm3Y4O+KT+hJimLQRt3qnLEVcVDAy3bY5CY v8HdE+k/SNcZMOot2R95gfR4lcpKwwyh2XbIzzXZ/E05ROQVUYHrpIAeZXlNF4/eCzJ0 RJsxgfuitl+Wszn5vtuivpDt3CMf34Yax1Yh/hSjWasNEy58+gjTzpcRtx5hBO4ppTEC m50youoJ0PLL4DrfLpmek61hSSRRxqQJwSsFeLSdZl5F9tmIrI50Sq92P+FGzYdqDeAY 8k58TnCbwpt7DuhuKLNAQ9+BHmN+tcyPaLThwOo5EIkwet67rp1z27P4clJawLKMQlMs 5xzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=gYH/NUhzkxrP57zXUu9Uxksnhmmb/sb8odVLZkBLfH4=; b=jJXmfiVvNEO+/Kf0Q2RiNKJFR5xUtmJI68Aa9dXY2w0QXBthvgURMgSPdneDb3iE/o CTCVEM8IrZDXSYNOjFgRxa25hzat1PRtVifg45dfuCDAqcXnIFgT2+ZqImq4J5EDnfGm Sz8/laFuzRtScZlubo3HLKTT4awvnPp6Jk1kvG8+bTdaujFeSM6U3xlkIbHkBv0OPM+g x18cEGVy6ck8Kf3+TuaMf8yGzhRMbIl/G5byMYcEmPY7eY3UnC8VGFkEzNFjX1Fi0bVf DnLYo57Z/LTBstYndNtxdHTjn4fvFhhcZGyZ9gNCFf3ScqQtz4T6ap9WY6ldkyr0GagC tUwg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=gcniS5fV; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id a17-20020a170902ee9100b0016180e07230si8841755pld.459.2022.05.22.22.56.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 May 2022 22:56:07 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=gcniS5fV; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id C4857EE14; Sun, 22 May 2022 22:52:18 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243525AbiETRY2 (ORCPT + 99 others); Fri, 20 May 2022 13:24:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34668 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1352253AbiETRYI (ORCPT ); Fri, 20 May 2022 13:24:08 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id A0A1318AA96 for ; Fri, 20 May 2022 10:23:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1653067436; 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=gYH/NUhzkxrP57zXUu9Uxksnhmmb/sb8odVLZkBLfH4=; b=gcniS5fVJCGVXQ3ca5mdAa68bZYSDX6sle8LLYgSxmqhFKVODec+jSpoegBS/yRB821PQo TDvLuIWfZS54LVran4p3UY/rjMRp6xkXX7CqGFeY/M5/Rg3mlXmgltCEHkG+Lc+zSBAsEg qyScBVYWx1dypaSPWqDqqLwBU9kKkMU= 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-582-6Ra87wuJMh2PFoLJ_6M15A-1; Fri, 20 May 2022 13:23:53 -0400 X-MC-Unique: 6Ra87wuJMh2PFoLJ_6M15A-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 50F5C29A9CC9; Fri, 20 May 2022 17:23:52 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.192.124]) by smtp.corp.redhat.com (Postfix) with ESMTP id D17AB401E9D; Fri, 20 May 2022 17:23:47 +0000 (UTC) From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: virtualization@lists.linux-foundation.org, Jason Wang , kvm@vger.kernel.org, "Michael S. Tsirkin" , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Stefano Garzarella , Longpeng , Zhu Lingshan , martinh@xilinx.com, hanand@xilinx.com, Si-Wei Liu , dinang@xilinx.com, Eli Cohen , lvivier@redhat.com, pabloc@xilinx.com, gautam.dawar@amd.com, Xie Yongji , habetsm.xilinx@gmail.com, Christophe JAILLET , tanuj.kamde@amd.com, eperezma@redhat.com, Wu Zongyong , martinpo@xilinx.com, lulu@redhat.com, ecree.xilinx@gmail.com, Parav Pandit , Dan Carpenter , Zhang Min Subject: [PATCH 4/4] vdpa_sim: Implement stop vdpa op Date: Fri, 20 May 2022 19:23:25 +0200 Message-Id: <20220520172325.980884-5-eperezma@redhat.com> In-Reply-To: <20220520172325.980884-1-eperezma@redhat.com> References: <20220520172325.980884-1-eperezma@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.85 on 10.11.54.10 X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Implement stop operation for vdpa_sim devices, so vhost-vdpa will offer that backend feature and userspace can effectively stop the device. This is a must before get virtqueue indexes (base) for live migration, since the device could modify them after userland gets them. There are individual ways to perform that action for some devices (VHOST_NET_SET_BACKEND, VHOST_VSOCK_SET_RUNNING, ...) but there was no way to perform it for any vhost device (and, in particular, vhost-vdpa). Signed-off-by: Eugenio PĂ©rez --- drivers/vdpa/vdpa_sim/vdpa_sim.c | 21 +++++++++++++++++++++ drivers/vdpa/vdpa_sim/vdpa_sim.h | 1 + drivers/vdpa/vdpa_sim/vdpa_sim_net.c | 3 +++ 3 files changed, 25 insertions(+) diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim.c b/drivers/vdpa/vdpa_sim/vdpa_sim.c index 50d721072beb..0515cf314bed 100644 --- a/drivers/vdpa/vdpa_sim/vdpa_sim.c +++ b/drivers/vdpa/vdpa_sim/vdpa_sim.c @@ -107,6 +107,7 @@ static void vdpasim_do_reset(struct vdpasim *vdpasim) for (i = 0; i < vdpasim->dev_attr.nas; i++) vhost_iotlb_reset(&vdpasim->iommu[i]); + vdpasim->running = true; spin_unlock(&vdpasim->iommu_lock); vdpasim->features = 0; @@ -505,6 +506,24 @@ static int vdpasim_reset(struct vdpa_device *vdpa) return 0; } +static int vdpasim_stop(struct vdpa_device *vdpa, bool stop) +{ + struct vdpasim *vdpasim = vdpa_to_sim(vdpa); + int i; + + spin_lock(&vdpasim->lock); + vdpasim->running = !stop; + if (vdpasim->running) { + /* Check for missed buffers */ + for (i = 0; i < vdpasim->dev_attr.nvqs; ++i) + vdpasim_kick_vq(vdpa, i); + + } + spin_unlock(&vdpasim->lock); + + return 0; +} + static size_t vdpasim_get_config_size(struct vdpa_device *vdpa) { struct vdpasim *vdpasim = vdpa_to_sim(vdpa); @@ -694,6 +713,7 @@ static const struct vdpa_config_ops vdpasim_config_ops = { .get_status = vdpasim_get_status, .set_status = vdpasim_set_status, .reset = vdpasim_reset, + .stop = vdpasim_stop, .get_config_size = vdpasim_get_config_size, .get_config = vdpasim_get_config, .set_config = vdpasim_set_config, @@ -726,6 +746,7 @@ static const struct vdpa_config_ops vdpasim_batch_config_ops = { .get_status = vdpasim_get_status, .set_status = vdpasim_set_status, .reset = vdpasim_reset, + .stop = vdpasim_stop, .get_config_size = vdpasim_get_config_size, .get_config = vdpasim_get_config, .set_config = vdpasim_set_config, diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim.h b/drivers/vdpa/vdpa_sim/vdpa_sim.h index 622782e92239..061986f30911 100644 --- a/drivers/vdpa/vdpa_sim/vdpa_sim.h +++ b/drivers/vdpa/vdpa_sim/vdpa_sim.h @@ -66,6 +66,7 @@ struct vdpasim { u32 generation; u64 features; u32 groups; + bool running; /* spinlock to synchronize iommu table */ spinlock_t iommu_lock; }; diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim_net.c b/drivers/vdpa/vdpa_sim/vdpa_sim_net.c index 5125976a4df8..886449e88502 100644 --- a/drivers/vdpa/vdpa_sim/vdpa_sim_net.c +++ b/drivers/vdpa/vdpa_sim/vdpa_sim_net.c @@ -154,6 +154,9 @@ static void vdpasim_net_work(struct work_struct *work) spin_lock(&vdpasim->lock); + if (!vdpasim->running) + goto out; + if (!(vdpasim->status & VIRTIO_CONFIG_S_DRIVER_OK)) goto out; -- 2.27.0