From patchwork Tue Feb 6 14:51:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefano Garzarella X-Patchwork-Id: 13547406 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E55DF132C03 for ; Tue, 6 Feb 2024 14:52:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707231125; cv=none; b=Ey0Bv7VEpnOmA+UhYdI9dJd6p53xBXDOUAb+UkXGrVsJFdAfyw6/I+f+2jpZ1lOxXTVGDEk6gVhf30pvu+vpluUz2ZWjvE2GVqqzzCOBXaZEWHqVzd6d0C08bRPo1r6ZYmnvCiymcpR0gxxWi2zYW8RsH0yOIQpgVWdmeNHdIdw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707231125; c=relaxed/simple; bh=R/o5EP7C+JnoxFgZaYwDA4ls6GyyKFxMVhJAZddFp0Q=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-type; b=cMvYoZlqMceF1fjrgUdZfGHv/Nht4v3YyVcdtoXPLRdcySiHqQlY49dVKyBE6myvXyvrnadNjYmwePyn7kf9LzBlmVFZltyKK9VARIxBN7LMnIZxuo2TTc4/TwK3U3iWxILxZETrP6nzrMe0P9cBILEaJs5W9blyb/hOlOoIfdg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=dAzlcvC3; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="dAzlcvC3" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1707231122; 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=dQIKoNOJmX8VRVk5/I0n1vx+OMQlaoxl3aigw5zkfn8=; b=dAzlcvC35TgfNFyBjvZDYo6g0yJP7+J3odtecvBRwyIJHcutYWLFL0HzxDyWTsACZrXl+t 1A7p2WlhB/ES6R1vGMVl8SyUdZpmAzasBZNkZpH9b9ZQe0qihFvgQnomybgNA5I/UrHHaP D3iN33QTU8V0kzB0a/68wViH2kpySsA= Received: from mail-oa1-f71.google.com (mail-oa1-f71.google.com [209.85.160.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-401-E5QoQQnSPZKWxBTDEaTYrQ-1; Tue, 06 Feb 2024 09:51:59 -0500 X-MC-Unique: E5QoQQnSPZKWxBTDEaTYrQ-1 Received: by mail-oa1-f71.google.com with SMTP id 586e51a60fabf-219688c2d4cso4232833fac.1 for ; Tue, 06 Feb 2024 06:51:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707231119; x=1707835919; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=dQIKoNOJmX8VRVk5/I0n1vx+OMQlaoxl3aigw5zkfn8=; b=VDWCDJp2vjmDxpj7TGHNdORbdy8A9Q3r9p4O3wYJz6sUbC6XDNfzQL3OP/UWCWfMiC 1pLrCapo1Kfy9puA0rl84SKcaGnuqJ8+R8XD6jZCAX6KP2xvquMy3gKqvzGRGJnb7gkk Ga/NgikVh4IFbIvt5CAX35N+T4LX8oZOkmZGRpQcMtTQzEE6oFPXqKpsDnK0Xt1tnlzw R9CpEGaxY9KQiinx8ghh46Yc86DK7xiIQQVmz7vo2W1ulUtskac8HW+ilbdpWOzJZRSR NcH+Nb+1eDy0EdrsunvS+iS5lbtKfCnJ5e9K4nw5e98S53nLtpWvNnLxvbplHkb20f6m 21rQ== X-Gm-Message-State: AOJu0Ywg9Vq0MJH88wmfGW82pHjIdq8fmMio/7TMk6aWMaT+jEm6bBVz ytHpqtdz7VEUvGY527AMIFTHmM73ePi6M/5pedV362Y706Sp0oICnRuPVCdttAPXcJ2tRI0jvd0 x/9ninIKENIKbCKGVsiWYqiDInn0JvWrQkE4vP8txFV36xukoZA== X-Received: by 2002:a05:6870:164d:b0:210:8802:786a with SMTP id c13-20020a056870164d00b002108802786amr3275740oae.53.1707231118959; Tue, 06 Feb 2024 06:51:58 -0800 (PST) X-Google-Smtp-Source: AGHT+IFLCyho5u5y4dZMOsWQV1AaVbjSFpDdh6YZMYgsdjNzX2ck/ywfHH/5T/kc/2KHsZrayoPM0A== X-Received: by 2002:a05:6870:164d:b0:210:8802:786a with SMTP id c13-20020a056870164d00b002108802786amr3275728oae.53.1707231118721; Tue, 06 Feb 2024 06:51:58 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCV6YVTF3BXfxD7oGuNc/5i4fJi9lzUP0v2EuV9vQ2uYj3WVgVJCvsEX8TROSCzAqDs5ebrmUOfU/S/j7kp3jXPim8rxZSbJKSJVXStktmV2oqMTXILCaFK8Q7/Dm4SdzEV1oi2ax7XvIFESMcCV8iCOJSstM1x0ffCK9wzkBPAe4UiZZyES5vihMsa0sRYoqZu0wDySrdl+bWTxhpQjZZsre7Rw5ZHednIiXPP1W399e2EE8jsT8XU9D+7TeQhQE87br0/am75tATSNqLHpbPwm+dZTE8klIcCGRw== Received: from step1.redhat.com (host-87-12-25-87.business.telecomitalia.it. [87.12.25.87]) by smtp.gmail.com with ESMTPSA id k19-20020ac84793000000b0042a9b28733fsm930742qtq.89.2024.02.06.06.51.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Feb 2024 06:51:58 -0800 (PST) From: Stefano Garzarella To: virtualization@lists.linux.dev Cc: Shannon Nelson , =?utf-8?q?Eugenio_P=C3=A9rez?= , "Michael S. Tsirkin" , kvm@vger.kernel.org, Kevin Wolf , Jason Wang , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Stefano Garzarella Subject: [PATCH] vhost-vdpa: fail enabling virtqueue in certain conditions Date: Tue, 6 Feb 2024 15:51:54 +0100 Message-ID: <20240206145154.118044-1-sgarzare@redhat.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-type: text/plain If VHOST_BACKEND_F_ENABLE_AFTER_DRIVER_OK is not negotiated, we expect the driver to enable virtqueue before setting DRIVER_OK. If the driver tries anyway, better to fail right away as soon as we get the ioctl. Let's also update the documentation to make it clearer. We had a problem in QEMU for not meeting this requirement, see https://lore.kernel.org/qemu-devel/20240202132521.32714-1-kwolf@redhat.com/ Fixes: 9f09fd6171fe ("vdpa: accept VHOST_BACKEND_F_ENABLE_AFTER_DRIVER_OK backend feature") Cc: eperezma@redhat.com Signed-off-by: Stefano Garzarella Acked-by: Eugenio Pérez --- include/uapi/linux/vhost_types.h | 3 ++- drivers/vhost/vdpa.c | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/include/uapi/linux/vhost_types.h b/include/uapi/linux/vhost_types.h index d7656908f730..5df49b6021a7 100644 --- a/include/uapi/linux/vhost_types.h +++ b/include/uapi/linux/vhost_types.h @@ -182,7 +182,8 @@ struct vhost_vdpa_iova_range { /* Device can be resumed */ #define VHOST_BACKEND_F_RESUME 0x5 /* Device supports the driver enabling virtqueues both before and after - * DRIVER_OK + * DRIVER_OK. If this feature is not negotiated, the virtqueues must be + * enabled before setting DRIVER_OK. */ #define VHOST_BACKEND_F_ENABLE_AFTER_DRIVER_OK 0x6 /* Device may expose the virtqueue's descriptor area, driver area and diff --git a/drivers/vhost/vdpa.c b/drivers/vhost/vdpa.c index bc4a51e4638b..1fba305ba8c1 100644 --- a/drivers/vhost/vdpa.c +++ b/drivers/vhost/vdpa.c @@ -651,6 +651,10 @@ static long vhost_vdpa_vring_ioctl(struct vhost_vdpa *v, unsigned int cmd, case VHOST_VDPA_SET_VRING_ENABLE: if (copy_from_user(&s, argp, sizeof(s))) return -EFAULT; + if (!vhost_backend_has_feature(vq, + VHOST_BACKEND_F_ENABLE_AFTER_DRIVER_OK) && + (ops->get_status(vdpa) & VIRTIO_CONFIG_S_DRIVER_OK)) + return -EINVAL; ops->set_vq_ready(vdpa, idx, s.num); return 0; case VHOST_VDPA_GET_VRING_GROUP: