From patchwork Thu Aug 11 13:53:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eugenio Perez Martin X-Patchwork-Id: 12941451 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A5FCBC19F2D for ; Thu, 11 Aug 2022 13:54:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235211AbiHKNyZ (ORCPT ); Thu, 11 Aug 2022 09:54:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36450 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235135AbiHKNyQ (ORCPT ); Thu, 11 Aug 2022 09:54:16 -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 2DBE865801 for ; Thu, 11 Aug 2022 06:54:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1660226054; 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=ZhGKF7+dCMLetRacbIFf8HUIdAhXW0qkVdcin2fPWSI=; b=CewZ5csfYlP1b2uxhI6OE+pXcifnqK9K4rDxm0ZIyO0IeWyBb9zlFYlUjzWp+G4KtWJ9WA lUmHacJ6nQN8p88nMNBnLCfvRF5wa8TUTCRDJdHNMzpUeA49lagKeZxW0oHPUll7vI+HOo 8Fi0FmB3Huj+BZTSqK/6wjiRiT9rEjM= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-644-BK5UrAvbNpOGfXyxE2r_8g-1; Thu, 11 Aug 2022 09:54:09 -0400 X-MC-Unique: BK5UrAvbNpOGfXyxE2r_8g-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1FBCE8117B0; Thu, 11 Aug 2022 13:54:08 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.192.231]) by smtp.corp.redhat.com (Postfix) with ESMTP id CD95D40D2827; Thu, 11 Aug 2022 13:54:02 +0000 (UTC) From: =?utf-8?q?Eugenio_P=C3=A9rez?= To: virtualization@lists.linux-foundation.org, Jason Wang , "Michael S. Tsirkin" , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Cc: ecree.xilinx@gmail.com, gautam.dawar@amd.com, Zhang Min , pabloc@xilinx.com, Piotr.Uminski@intel.com, Dan Carpenter , tanuj.kamde@amd.com, Zhu Lingshan , martinh@xilinx.com, Christophe JAILLET , lvivier@redhat.com, martinpo@xilinx.com, hanand@xilinx.com, Eli Cohen , lulu@redhat.com, habetsm.xilinx@gmail.com, Parav Pandit , Longpeng , Wu Zongyong , Si-Wei Liu , Stefano Garzarella , dinang@xilinx.com, Xie Yongji Subject: [PATCH v8 1/3] vdpa: delete unreachable branch on vdpasim_suspend Date: Thu, 11 Aug 2022 15:53:51 +0200 Message-Id: <20220811135353.2549658-2-eperezma@redhat.com> In-Reply-To: <20220811135353.2549658-1-eperezma@redhat.com> References: <20220811135353.2549658-1-eperezma@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org It was a leftover from previous versions. Signed-off-by: Eugenio Pérez Acked-by: Jason Wang --- drivers/vdpa/vdpa_sim/vdpa_sim.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim.c b/drivers/vdpa/vdpa_sim/vdpa_sim.c index 213883487f9b..79a50edf8998 100644 --- a/drivers/vdpa/vdpa_sim/vdpa_sim.c +++ b/drivers/vdpa/vdpa_sim/vdpa_sim.c @@ -509,16 +509,9 @@ static int vdpasim_reset(struct vdpa_device *vdpa) static int vdpasim_suspend(struct vdpa_device *vdpa) { struct vdpasim *vdpasim = vdpa_to_sim(vdpa); - int i; spin_lock(&vdpasim->lock); vdpasim->running = false; - 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; From patchwork Thu Aug 11 13:53:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eugenio Perez Martin X-Patchwork-Id: 12941452 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 508D3C19F2A for ; Thu, 11 Aug 2022 13:54:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235145AbiHKNyf (ORCPT ); Thu, 11 Aug 2022 09:54:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36770 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235166AbiHKNy3 (ORCPT ); Thu, 11 Aug 2022 09:54:29 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 2FB95760E4 for ; Thu, 11 Aug 2022 06:54:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1660226067; 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=7Qqan27qkIlEMWlFRm4oE0aMcqVLoB6Ybk+9lIy2V1I=; b=IHDfzQSBI+U3JM+DaqiETbYmdSGngP1WrOoDOfnAsYD8sgLpKia6fDteXMMJSgiRug9UhB NgPr/0CrnMvb5gkJaA+dTXjbuL6mbaD07W9gfIP8y8LEFYd8kegSVnEg19wzD8tQdGFunV jZfKSsXeF3Bn2BaBzUM74o+zYNP5v1s= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-221-pUYzMhu_Om-5Y3E5QtubUg-1; Thu, 11 Aug 2022 09:54:14 -0400 X-MC-Unique: pUYzMhu_Om-5Y3E5QtubUg-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 727F9811E84; Thu, 11 Aug 2022 13:54:13 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.192.231]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6E21640D2827; Thu, 11 Aug 2022 13:54:08 +0000 (UTC) From: =?utf-8?q?Eugenio_P=C3=A9rez?= To: virtualization@lists.linux-foundation.org, Jason Wang , "Michael S. Tsirkin" , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Cc: ecree.xilinx@gmail.com, gautam.dawar@amd.com, Zhang Min , pabloc@xilinx.com, Piotr.Uminski@intel.com, Dan Carpenter , tanuj.kamde@amd.com, Zhu Lingshan , martinh@xilinx.com, Christophe JAILLET , lvivier@redhat.com, martinpo@xilinx.com, hanand@xilinx.com, Eli Cohen , lulu@redhat.com, habetsm.xilinx@gmail.com, Parav Pandit , Longpeng , Wu Zongyong , Si-Wei Liu , Stefano Garzarella , dinang@xilinx.com, Xie Yongji Subject: [PATCH v8 2/3] vdpa: Remove wrong doc of VHOST_VDPA_SUSPEND ioctl Date: Thu, 11 Aug 2022 15:53:52 +0200 Message-Id: <20220811135353.2549658-3-eperezma@redhat.com> In-Reply-To: <20220811135353.2549658-1-eperezma@redhat.com> References: <20220811135353.2549658-1-eperezma@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org It was a leftover from previous versions. Signed-off-by: Eugenio Pérez Acked-by: Jason Wang --- include/linux/vdpa.h | 2 +- include/uapi/linux/vhost.h | 15 +++++---------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/include/linux/vdpa.h b/include/linux/vdpa.h index d282f464d2f1..6c4e6ea7f7eb 100644 --- a/include/linux/vdpa.h +++ b/include/linux/vdpa.h @@ -218,7 +218,7 @@ struct vdpa_map_file { * @reset: Reset device * @vdev: vdpa device * Returns integer: success (0) or error (< 0) - * @suspend: Suspend or resume the device (optional) + * @suspend: Suspend the device (optional) * @vdev: vdpa device * Returns integer: success (0) or error (< 0) * @get_config_size: Get the size of the configuration space includes diff --git a/include/uapi/linux/vhost.h b/include/uapi/linux/vhost.h index 6d9f45163155..89fcb2afe472 100644 --- a/include/uapi/linux/vhost.h +++ b/include/uapi/linux/vhost.h @@ -171,17 +171,12 @@ #define VHOST_VDPA_SET_GROUP_ASID _IOW(VHOST_VIRTIO, 0x7C, \ struct vhost_vring_state) -/* Suspend or resume a device so it does not process virtqueue requests anymore +/* Suspend a device so it does not process virtqueue requests anymore * - * After the return of ioctl with suspend != 0, the device must finish any - * pending operations like in flight requests. It must also preserve all the - * necessary state (the virtqueue vring base plus the possible device specific - * states) that is required for restoring in the future. The device must not - * change its configuration after that point. - * - * After the return of ioctl with suspend == 0, the device can continue - * processing buffers as long as typical conditions are met (vq is enabled, - * DRIVER_OK status bit is enabled, etc). + * After the return of ioctl the device must finish any pending operations. It + * must also preserve all the necessary state (the virtqueue vring base plus + * the possible device specific states) that is required for restoring in the + * future. The device must not change its configuration after that point. */ #define VHOST_VDPA_SUSPEND _IOW(VHOST_VIRTIO, 0x7D, int) From patchwork Thu Aug 11 13:53:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eugenio Perez Martin X-Patchwork-Id: 12941453 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 08BDEC19F2D for ; Thu, 11 Aug 2022 13:54:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235201AbiHKNyi (ORCPT ); Thu, 11 Aug 2022 09:54:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36582 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235204AbiHKNye (ORCPT ); Thu, 11 Aug 2022 09:54:34 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id BC4BD7E314 for ; Thu, 11 Aug 2022 06:54:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1660226068; 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=6inRrhICS2L+j8kFy9iUcAEGaJYSzOH4irG6UMt8jBk=; b=FL4kHDvV+InEfWeZYMe7W1SbYHbtJoolJPT0TmLcQppBxNVi1K0OWtBR+z+qZdyX1BEL92 ltnINXfHf/jwKE7IvWKnfcuuOF0eTM1MKM95ENs/5vcYJe+VNU1gDB8e2JECVG95xuzvb5 jUW7NlXMta2IoEdjBw2DNX+eOF2ys/Y= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-661-jpiI7v9WOoKMCts-OUNHog-1; Thu, 11 Aug 2022 09:54:22 -0400 X-MC-Unique: jpiI7v9WOoKMCts-OUNHog-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C99898032F6; Thu, 11 Aug 2022 13:54:19 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.192.231]) by smtp.corp.redhat.com (Postfix) with ESMTP id BA43240D282E; Thu, 11 Aug 2022 13:54:13 +0000 (UTC) From: =?utf-8?q?Eugenio_P=C3=A9rez?= To: virtualization@lists.linux-foundation.org, Jason Wang , "Michael S. Tsirkin" , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Cc: ecree.xilinx@gmail.com, gautam.dawar@amd.com, Zhang Min , pabloc@xilinx.com, Piotr.Uminski@intel.com, Dan Carpenter , tanuj.kamde@amd.com, Zhu Lingshan , martinh@xilinx.com, Christophe JAILLET , lvivier@redhat.com, martinpo@xilinx.com, hanand@xilinx.com, Eli Cohen , lulu@redhat.com, habetsm.xilinx@gmail.com, Parav Pandit , Longpeng , Wu Zongyong , Si-Wei Liu , Stefano Garzarella , dinang@xilinx.com, Xie Yongji Subject: [PATCH v8 3/3] vhost: Remove invalid parameter of VHOST_VDPA_SUSPEND ioctl Date: Thu, 11 Aug 2022 15:53:53 +0200 Message-Id: <20220811135353.2549658-4-eperezma@redhat.com> In-Reply-To: <20220811135353.2549658-1-eperezma@redhat.com> References: <20220811135353.2549658-1-eperezma@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org It was a leftover from previous versions. Signed-off-by: Eugenio Pérez Acked-by: Jason Wang --- Note that I'm not sure this removal is valid. The ioctl is not in master branch by the send date of this patch, but there are commits on vhost branch that do have it. --- include/uapi/linux/vhost.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/uapi/linux/vhost.h b/include/uapi/linux/vhost.h index 89fcb2afe472..768ec46a88bf 100644 --- a/include/uapi/linux/vhost.h +++ b/include/uapi/linux/vhost.h @@ -178,6 +178,6 @@ * the possible device specific states) that is required for restoring in the * future. The device must not change its configuration after that point. */ -#define VHOST_VDPA_SUSPEND _IOW(VHOST_VIRTIO, 0x7D, int) +#define VHOST_VDPA_SUSPEND _IO(VHOST_VIRTIO, 0x7D) #endif