From patchwork Tue Jan 9 11:10:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxime Coquelin X-Patchwork-Id: 186320 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2411:b0:101:2151:f287 with SMTP id m17csp35749dyi; Tue, 9 Jan 2024 03:11:40 -0800 (PST) X-Google-Smtp-Source: AGHT+IFYsyCA0z9YBiqyP4iXVJqJeEzhtCA1jajjD4q7fkXKz5qnGBmxZAeei2O48mcKFSiZibi9 X-Received: by 2002:a05:6a20:9483:b0:199:6496:290f with SMTP id hs3-20020a056a20948300b001996496290fmr5014599pzb.73.1704798700626; Tue, 09 Jan 2024 03:11:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704798700; cv=none; d=google.com; s=arc-20160816; b=fH5mIZ+SYMC5HjAN47iS0Tl2lN5XwFnroIitVo04L9qGhLOKrbJrO7WU5JuW23EJ3G VpqX39ljsFFM9L9KRcmLK7L9h01fO346lA6KZHHYvRSGjwer9HUsHnbOfmhiZAhs//ug o7iCHAN5AcrWhnpfSL+ObF9JyDfu77NwnG/BDqlJrVKBJP5m9OnmJ+zOiu5oukX7180C j+1EZPCvqFlUbiZ+u+Iu2OEsEtX+uiXsBFBoHfqtSsVrFkqCwkeLt3fzwIHLtpLEpo0J 5iOVaypT3S/J3hD0NTX6xABriTccfWZ1ww1Vfk8nQYbi0F29+Qdml3obIgI/HRGnUjy1 T2og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=BtHMmViNUHkBlyTq+yA+WPFdZXCFstzRWGlzClhIP3k=; fh=PsGcTskB5yyh6wdt5mtIwU0t1QS6fyE7OUFROq1ott8=; b=K8K0t5/QyTh9BfEOZjk/0KHjSg3yoQLr73ukizk6D/b1v0YgonZ5QFGxA1Wa6RWtGR qx91n5tBcuWoOL/oc/3ywmAyX+bW/OyTtd9Y/lJocaA9sj8A4sXhYwikLMNKt3hMWebM 9mYJaETB46GH+h0vDlBj+qKZjuy+HKRUz02fY/StApXKmA94nctokAtX9/vMa+y8Aa+n EGHhzH3aJva07bOiCSFU0DAWZAYpJDiaruqQML5fZ99G3rkNRzBYl/sWx0NyM2EpKfAl dTCgL2nf6utYkPfuXNYXDYqWuGRj3CKUETt/Nt7umV67nDaoCgwMWEy2vwTslETcpFea rIpw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=PQQ+FcLb; spf=pass (google.com: domain of linux-kernel+bounces-20746-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-20746-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id l27-20020a635b5b000000b005ce0b70d2b0si1256763pgm.102.2024.01.09.03.11.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jan 2024 03:11:40 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-20746-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=PQQ+FcLb; spf=pass (google.com: domain of linux-kernel+bounces-20746-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-20746-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id B4F0BB232A2 for ; Tue, 9 Jan 2024 11:11:10 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id AC0363717D; Tue, 9 Jan 2024 11:10:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="PQQ+FcLb" 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 AB4EA36B09 for ; Tue, 9 Jan 2024 11:10:37 +0000 (UTC) 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1704798636; 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=BtHMmViNUHkBlyTq+yA+WPFdZXCFstzRWGlzClhIP3k=; b=PQQ+FcLbHwkJG6CNAgPZ5klHmYh9NWAsoMhD0iY+kxTvzgz31sLMMANCnGJ5MALLydrU9X fAkllvPTa0pEFNigmdBH0y0L+pSNLbM5ciWLlU3mEGDLbgDA8+S+3e/mtVF1ev5Nakzr6r 1xjYFB8SJtHoQUAUTSXbOeOV0TojwzA= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-417-wdiVT_Z_ML2xKOwrFtk9Cw-1; Tue, 09 Jan 2024 06:10:33 -0500 X-MC-Unique: wdiVT_Z_ML2xKOwrFtk9Cw-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1AE47106CFF5; Tue, 9 Jan 2024 11:10:33 +0000 (UTC) Received: from max-p1.redhat.com (unknown [10.39.208.21]) by smtp.corp.redhat.com (Postfix) with ESMTP id 194B4492BE6; Tue, 9 Jan 2024 11:10:30 +0000 (UTC) From: Maxime Coquelin To: mst@redhat.com, jasowang@redhat.com, xuanzhuo@linux.alibaba.com, xieyongji@bytedance.com, virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org, david.marchand@redhat.com, lulu@redhat.com Cc: Maxime Coquelin , =?utf-8?q?Eugenio_P=C3=A9r?= =?utf-8?q?ez?= Subject: [PATCH v7 1/3] vduse: validate block features only with block devices Date: Tue, 9 Jan 2024 12:10:23 +0100 Message-ID: <20240109111025.1320976-2-maxime.coquelin@redhat.com> In-Reply-To: <20240109111025.1320976-1-maxime.coquelin@redhat.com> References: <20240109111025.1320976-1-maxime.coquelin@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1787611001768768264 X-GMAIL-MSGID: 1787611001768768264 This patch is preliminary work to enable network device type support to VDUSE. As VIRTIO_BLK_F_CONFIG_WCE shares the same value as VIRTIO_NET_F_HOST_TSO4, we need to restrict its check to Virtio-blk device type. Acked-by: Jason Wang Reviewed-by: Xie Yongji Reviewed-by: Eugenio Pérez Signed-off-by: Maxime Coquelin --- drivers/vdpa/vdpa_user/vduse_dev.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/vdpa/vdpa_user/vduse_dev.c b/drivers/vdpa/vdpa_user/vduse_dev.c index 0ddd4b8abecb..a5af6d4077b8 100644 --- a/drivers/vdpa/vdpa_user/vduse_dev.c +++ b/drivers/vdpa/vdpa_user/vduse_dev.c @@ -1671,13 +1671,14 @@ static bool device_is_allowed(u32 device_id) return false; } -static bool features_is_valid(u64 features) +static bool features_is_valid(struct vduse_dev_config *config) { - if (!(features & (1ULL << VIRTIO_F_ACCESS_PLATFORM))) + if (!(config->features & BIT_ULL(VIRTIO_F_ACCESS_PLATFORM))) return false; /* Now we only support read-only configuration space */ - if (features & (1ULL << VIRTIO_BLK_F_CONFIG_WCE)) + if ((config->device_id == VIRTIO_ID_BLOCK) && + (config->features & BIT_ULL(VIRTIO_BLK_F_CONFIG_WCE))) return false; return true; @@ -1704,7 +1705,7 @@ static bool vduse_validate_config(struct vduse_dev_config *config) if (!device_is_allowed(config->device_id)) return false; - if (!features_is_valid(config->features)) + if (!features_is_valid(config)) return false; return true;