From patchwork Wed Apr 19 13:43:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Coquelin X-Patchwork-Id: 85416 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp407017vqo; Wed, 19 Apr 2023 06:54:19 -0700 (PDT) X-Google-Smtp-Source: AKy350bCq+C2LeQD4jb6mTnq8Wd5fNW18NIm6qMemlD46tZmFB+1Fes/uBdWOjDXnksx+5XM3jB9 X-Received: by 2002:a05:6a20:2d13:b0:ec:60b9:c724 with SMTP id g19-20020a056a202d1300b000ec60b9c724mr3555937pzl.33.1681912459318; Wed, 19 Apr 2023 06:54:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681912459; cv=none; d=google.com; s=arc-20160816; b=Hb9GPIlGeA87iPuFzUgL1EEhRIwc3RvchyPFpxYbzYW3/p9doIL9MRWhm4DT/umgPw 2qo3aAV194SL2P8KHox2upBC84yRS2qKIK+vk3qdMXhoHT80RvAh7aY47dFIOIZUoyf+ aTgUCeCl9ThEzWU5VAcbj+CoN9TML6mts7zKjsHiTTU3eW8/blldyqum4kAWaEZuheE6 iPNdNKAqnZYKL2w6Jg5dcgkXjvvCUmJPq8TFFBydXpDBa8XPBothchT0yY3J7EXvAQoP npsMMHcXA691vt8110J5CVKLpaQ+EfCfTp218XCdR0dVavduptf1CDwh6nAs+/PQyaNT kI9w== 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=h5XlVJSNusP555gpOlPJndZg2Z6A77QK6nmKuaokq2o=; b=jRe+z7gcgY+BMCC+AuskJFM64M97H8W2TC93hmlFCm0WU6WnKsDoEiE5ox3HJPlwVO CZJLhnw6DM/3B6+1Sq1r+zPZ1MEv84WPyvAEyW33vaDIKHNJWJm9gFHgkVQ1lSNuAT/e uTm5gR3IIKZ8DdD0QBG/OQvVDN5lo55wLKCqUjx96tmHAwT2zkLMufbkFn4b6QwSo5Pk fGiEuMSCr+ox/jJOnO4gIU2zwl+6Vd8tzylv29DKeBx+vAqOS9/duAc/Fwh1CdD8ItiQ iXzUsZ/f1i9OcILH3jsDCRm9H6bVa8tCwXrwiZ/kkKlKJxGx7gpHtU55cU5Vk0aBVvCY pFBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ItfHxBQ1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v4-20020a63f204000000b004faf33e2755si16814683pgh.349.2023.04.19.06.54.05; Wed, 19 Apr 2023 06:54:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ItfHxBQ1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233500AbjDSNox (ORCPT + 99 others); Wed, 19 Apr 2023 09:44:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50376 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233416AbjDSNoq (ORCPT ); Wed, 19 Apr 2023 09:44:46 -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 ESMTPS id 666261544B for ; Wed, 19 Apr 2023 06:43:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1681911836; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=h5XlVJSNusP555gpOlPJndZg2Z6A77QK6nmKuaokq2o=; b=ItfHxBQ1WtAXiGkSh1C2QD3TTmxUWq/WDIaElPWXJnEQFVNLxpCBlavO5Ld8UfyRXz4/Ua BBZ2WxsXKChlTyXN4zFXLUPOxB8K8tohtOalJXAoY+7OyU9GZwH+yX8scNbW90aKa+8/yG VRxykeXEHtUpMAjjkf3OTuujRbEpvoc= 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-68-51sbPrY0NHyPNJncLVRN1g-1; Wed, 19 Apr 2023 09:43:52 -0400 X-MC-Unique: 51sbPrY0NHyPNJncLVRN1g-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 264A98996F3; Wed, 19 Apr 2023 13:43:52 +0000 (UTC) Received: from max-t490s.redhat.com (unknown [10.39.208.29]) by smtp.corp.redhat.com (Postfix) with ESMTP id 204D1492B04; Wed, 19 Apr 2023 13:43:49 +0000 (UTC) From: Maxime Coquelin To: xieyongji@bytedance.com, jasowang@redhat.com, mst@redhat.com, david.marchand@redhat.com Cc: linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, xuanzhuo@linux.alibaba.com, eperezma@redhat.com, Maxime Coquelin Subject: [RFC 1/2] vduse: validate block features only with block devices Date: Wed, 19 Apr 2023 15:43:28 +0200 Message-Id: <20230419134329.346825-2-maxime.coquelin@redhat.com> In-Reply-To: <20230419134329.346825-1-maxime.coquelin@redhat.com> References: <20230419134329.346825-1-maxime.coquelin@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763613039012549453?= X-GMAIL-MSGID: =?utf-8?q?1763613039012549453?= 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. 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 0c3b48616a9f..6fa598a03d8e 100644 --- a/drivers/vdpa/vdpa_user/vduse_dev.c +++ b/drivers/vdpa/vdpa_user/vduse_dev.c @@ -1416,13 +1416,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 & (1ULL << 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 & (1ULL << VIRTIO_BLK_F_CONFIG_WCE))) return false; return true; @@ -1446,7 +1447,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; From patchwork Wed Apr 19 13:43:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Coquelin X-Patchwork-Id: 85418 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp409507vqo; Wed, 19 Apr 2023 06:58:28 -0700 (PDT) X-Google-Smtp-Source: AKy350aqA73QlGx2UDiKOpDYz4FhruT36oaSOwhrWhGaxxVpgVecxqtMmEUjboP6c9Rw5TLV5x6Y X-Received: by 2002:a17:90b:3103:b0:23d:4229:f7cf with SMTP id gc3-20020a17090b310300b0023d4229f7cfmr2797804pjb.41.1681912708319; Wed, 19 Apr 2023 06:58:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681912708; cv=none; d=google.com; s=arc-20160816; b=i3apfSeKASs5sFlUl8dUkc5v/b5gvFjBE1wIDs+bcD0bqJTtMlsflHjZllO/hckHlq 4i9xS1xXF+QHUvDsqFltNc54IMi1GXMDUYWADcg/3FvQovaqcaqgjA+QkORvANY08VJb 6hpsBzd6ULWtemb3aS0Bq6KF5qaK3JNheJTivj4Q1i/XwQ+KSyrax+CGwA+z8vIip4S0 iTOb2ogMLURaKnBxplrYdsOIbZMkX0oNeB8Gw0mqxLSyK8TwVrq78OAu6eBJUbXUP7MZ 6xwpOijnpel0aKL64E34Ks95wLFw99Eg/TR0+s2DdPTuzzJrpmCA/JASs3Q4no7l5DHW MWKA== 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=rYvNSaw4DIPZZSRV3GLxKtPqCtnmJBLzCvzNgS/HImY=; b=d09E65GoSLIiXtpfSQKCEED1OIxrl5eEoMgWoPGGXFfM16jLLBEA/pv4Edq5w7ZyNb NAoFLL4b9TrXjE8XWvU878NL9k2G8Dmi4RGWfAcaS0Nyist3oZX+q16ql3+rhkTNyEil uh4kgFQ2m+02yCOrSfWOx3siBaHvdlSNdfyDcRzz/yCQ251T3Yr3NEd5EXj/rAheOxKH xB6V2aCDh7jAGdoUr2GrWRnDEKdtKMktj/YtuxHciI5VjnQGxcVTSbcHg8+J96Iy+BpF 7O+xEBQu8E4R2XagJyRpBi0gzeLYY+qyHisp29ybvfrMLQT8bBYt5ErFNKCWpTfWV8eU QP3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="LDRGq/ml"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l190-20020a6388c7000000b0051b8a81c5d0si1734898pgd.606.2023.04.19.06.58.15; Wed, 19 Apr 2023 06:58:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="LDRGq/ml"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233414AbjDSNo5 (ORCPT + 99 others); Wed, 19 Apr 2023 09:44:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50500 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233356AbjDSNoo (ORCPT ); Wed, 19 Apr 2023 09:44:44 -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 ESMTPS id 2C46C15A31 for ; Wed, 19 Apr 2023 06:43:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1681911838; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rYvNSaw4DIPZZSRV3GLxKtPqCtnmJBLzCvzNgS/HImY=; b=LDRGq/mldbqx43nbATJBiTOblebjTF2EW6M2tSSjyTEotQsObTNh842KdfJBhdBHlEKxBj HRF49QnlQngMQvPJSN0TZjSJfhHuLyWEJGJ7SiHXKdGmdHvP3mLTRSvAgLDGYZ37lPhLKQ lmCY2Luwp9/qCYqQTiZGRlIGehyLVaA= 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-272-G1sB8eICOOCKMUkCX4LzVg-1; Wed, 19 Apr 2023 09:43:54 -0400 X-MC-Unique: G1sB8eICOOCKMUkCX4LzVg-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7A79D811E7B; Wed, 19 Apr 2023 13:43:54 +0000 (UTC) Received: from max-t490s.redhat.com (unknown [10.39.208.29]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6BC9A492B04; Wed, 19 Apr 2023 13:43:52 +0000 (UTC) From: Maxime Coquelin To: xieyongji@bytedance.com, jasowang@redhat.com, mst@redhat.com, david.marchand@redhat.com Cc: linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, xuanzhuo@linux.alibaba.com, eperezma@redhat.com, Maxime Coquelin Subject: [RFC 2/2] vduse: enable Virtio-net device type Date: Wed, 19 Apr 2023 15:43:29 +0200 Message-Id: <20230419134329.346825-3-maxime.coquelin@redhat.com> In-Reply-To: <20230419134329.346825-1-maxime.coquelin@redhat.com> References: <20230419134329.346825-1-maxime.coquelin@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763613300255920361?= X-GMAIL-MSGID: =?utf-8?q?1763613300255920361?= This patch adds Virtio-net device type to the supported devices types. Signed-off-by: Maxime Coquelin --- drivers/vdpa/vdpa_user/vduse_dev.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/vdpa/vdpa_user/vduse_dev.c b/drivers/vdpa/vdpa_user/vduse_dev.c index 6fa598a03d8e..26b7e29cb900 100644 --- a/drivers/vdpa/vdpa_user/vduse_dev.c +++ b/drivers/vdpa/vdpa_user/vduse_dev.c @@ -131,6 +131,7 @@ static struct workqueue_struct *vduse_irq_wq; static u32 allowed_device_id[] = { VIRTIO_ID_BLOCK, + VIRTIO_ID_NET, }; static inline struct vduse_dev *vdpa_to_vduse(struct vdpa_device *vdpa) @@ -1738,6 +1739,7 @@ static const struct vdpa_mgmtdev_ops vdpa_dev_mgmtdev_ops = { static struct virtio_device_id id_table[] = { { VIRTIO_ID_BLOCK, VIRTIO_DEV_ANY_ID }, + { VIRTIO_ID_NET, VIRTIO_DEV_ANY_ID }, { 0 }, };