From patchwork Tue Jul 4 16:40:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Coquelin X-Patchwork-Id: 115854 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp1343354vqx; Tue, 4 Jul 2023 09:43:01 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ56zJcOUUg8D9rj1WOA4+ZmQLbbq/FdCbjHAihcDPBA1ez5YiV2S7wJ/wndPYbiDxU+epKp X-Received: by 2002:a17:90a:db85:b0:262:ea3e:e248 with SMTP id h5-20020a17090adb8500b00262ea3ee248mr26920638pjv.7.1688488981257; Tue, 04 Jul 2023 09:43:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688488981; cv=none; d=google.com; s=arc-20160816; b=e8NgQXhzKDNZyuRG0EVtXK1BPdj0Ck0fA3f7fWOCrvV/5XFNXTD2fpZCzQMI9Tmmgm 35/vIJHZauQzfMJP2QEXrpJmSJt/VpW4RLkqGeXKpY6V61tICI+98SEgLVG3Bot4XuzA h/D1yL+TgS7OSmQqX1fQf0cKZtzejwL4PrGuLOyt3lxs1ZeUJAT8UqWPzpFoiu0BJOFG MrxvnlO25Jex83YAc77yJ2h1jqOJM2WRD3lQqdrxWV9q5NqKjlyE6tiCO6l6ICuy3J+a 4CSJkEeq3BChZ6nqYgCds0WvLP5CIVrqWdKJh5MhU8FyZPyql5Wa5wenK+B2XGifCa+U 24Uw== 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=ZEEgjTVF9ob0iUf+PbGSGnuQoV1ZTJ330EoiYkZKizQ=; fh=S1rZK6DPg0mAED4KjNm0cP4EEY87q6FXHFEeosELg0E=; b=0ek5FesE+i3MAGgEZB5T28lE2dbQI1LXVDRKot9hir1+6Bmmn9d8DEBN0nmif1miN7 wTeN3O06vz/o70kZuu+dUeuioSVyL3CAIQy3FYv0Ab55UTbCq1itCU30vfIoGkBAgNy3 88LIjj6RZPYxSDbpKwBDr0xOpx0XAQn2jwKzCoBgRaysqxvk2kOB2VKhF9DJhN/ua5eX o9WpG4wMZdtlkUpklYs27e8RmJ55rwR1Jila6Dd1pnlmBS43CKDBbezMTTWHZ8QMPGmD 6pR6GdSGDFHscly7zYom+wcfgTsDCvgrpV6N0N4Kr9LygjVAum5Pf0UzfHKPlW3LfmGq Z6Bw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Owzo+jCw; 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 w8-20020a63f508000000b0055b1327cd9asi14961538pgh.175.2023.07.04.09.42.45; Tue, 04 Jul 2023 09:43:01 -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=Owzo+jCw; 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 S231304AbjGDQlp (ORCPT + 99 others); Tue, 4 Jul 2023 12:41:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45202 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231542AbjGDQlo (ORCPT ); Tue, 4 Jul 2023 12:41: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 8B81A10D3 for ; Tue, 4 Jul 2023 09:40:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1688488855; 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=ZEEgjTVF9ob0iUf+PbGSGnuQoV1ZTJ330EoiYkZKizQ=; b=Owzo+jCwaQ3k3JwkUZXReUxdunVc3mAylXNPHG9/+i7OnnQ2jpOm9pJ5RhcDb7E1YHhoJp DwREyO2yLIP3OklHDrX/DrvLONvnBL2Iv5f/KYgTdHV8MN2/AD6PO+TNqInzmr/aBK6kzt TWesE4pCgL2MOdXK6zodk79MzIcfrVM= 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-524-ZSOeXPj3Ng6Ee5SgFPRQ2Q-1; Tue, 04 Jul 2023 12:40:54 -0400 X-MC-Unique: ZSOeXPj3Ng6Ee5SgFPRQ2Q-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 22BC3101A529; Tue, 4 Jul 2023 16:40:54 +0000 (UTC) Received: from max-t490s.redhat.com (unknown [10.39.208.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id DEA77492B02; Tue, 4 Jul 2023 16:40:51 +0000 (UTC) From: Maxime Coquelin To: xieyongji@bytedance.com, jasowang@redhat.com, mst@redhat.com, david.marchand@redhat.com, lulu@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: [PATCH v2 1/3] vduse: validate block features only with block devices Date: Tue, 4 Jul 2023 18:40:43 +0200 Message-ID: <20230704164045.39119-2-maxime.coquelin@redhat.com> In-Reply-To: <20230704164045.39119-1-maxime.coquelin@redhat.com> References: <20230704164045.39119-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_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=ham 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?1770509021970016673?= X-GMAIL-MSGID: =?utf-8?q?1770509021970016673?= 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 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 dc38ed21319d..ff9fdd6783fe 100644 --- a/drivers/vdpa/vdpa_user/vduse_dev.c +++ b/drivers/vdpa/vdpa_user/vduse_dev.c @@ -1662,13 +1662,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; @@ -1695,7 +1696,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 Tue Jul 4 16:40:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Coquelin X-Patchwork-Id: 115859 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp1347671vqx; Tue, 4 Jul 2023 09:51:49 -0700 (PDT) X-Google-Smtp-Source: APBJJlHHodh0Zg+gCwaz0WaaCKSqIP/vMlXvxxSUE06bGl7iAYUbcCG58SmHL02jJl9BUJKJd2yZ X-Received: by 2002:a05:6a20:7489:b0:12e:be7b:a3e with SMTP id p9-20020a056a20748900b0012ebe7b0a3emr4819647pzd.55.1688489509636; Tue, 04 Jul 2023 09:51:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688489509; cv=none; d=google.com; s=arc-20160816; b=T8xcfMhmHkujLoatGORV/thvMfICKmS3zUN8B5geK3qXAam4y8lv53B722Iu0JkhQ+ bchy/T9zYwvJlRRYogqZgde2SmRnAvJnNvovo6ehxxvABoxtnTfwn9qvGYwt+osEwZck PMt+wWWoJ9HISnQhdsHmCWrc7oUKHZAH0tTNSBvt2cS+BSr+NYg2tfIGtIy6DOIWkt7y ZMaWEcNBTLBRX4/TYBU+qHY6QDElKHtFibdTAhYh1IHjov5kyxoM5vkVbLP5U+RtUXpB ozCa9/UpQBvtPOZg4nLJEfTjDTuBbBMBqxlN12bQ4ReL6i+pKneC1uglgiKy2XoU8bY4 5O5Q== 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=Iud4Ecey6anqNBpQug6H+pW6me9r94dCbe9UYyq8Yto=; fh=S1rZK6DPg0mAED4KjNm0cP4EEY87q6FXHFEeosELg0E=; b=o2P97DHTxMLwpMRscuw8ZA0BDFu/YJ0EjcqM3aVrCqZfu+2h4qAFJbsamuds25UBBd K0UsHUEPZs6ElwXXM7s9Kof7y3+e4Bvsoh8ZaVVu2DXBoJqhZa45Eo7MPc+/KL0ntCCz tHEjG+gacO9i+8b62AZYAipn7xbABq+fYDJX5rIqqcgr0jW8eRmgChtBjKHm//FT8BrJ 4JP90yQC3q8HqRgIGW0NI7Tvbo1c04R9UOW4qAdUhotjiDNOJF6M3aGARNzxesg0uOaj cVR1e8oqu8wZGWpyF7vFZ3FlAn6FBsntDjae+BvEvuGalgUSCtTuQHbJHztnefadwDRJ smFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=MXp3KB8l; 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 x124-20020a636382000000b0054f9f9b333csi23485338pgb.686.2023.07.04.09.51.35; Tue, 04 Jul 2023 09:51:49 -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=MXp3KB8l; 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 S231778AbjGDQlu (ORCPT + 99 others); Tue, 4 Jul 2023 12:41:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45228 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231542AbjGDQlq (ORCPT ); Tue, 4 Jul 2023 12:41:46 -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 ESMTPS id 826A110D9 for ; Tue, 4 Jul 2023 09:41:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1688488860; 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=Iud4Ecey6anqNBpQug6H+pW6me9r94dCbe9UYyq8Yto=; b=MXp3KB8l18E8BbXQFopfgTr+LIe4pcjQ0+jo8Y5gNUf5TRXjKA4Ep5KFKjdUnncAEvmU8M wk95s0fNMXbmfGj03IC5ObYcNmUs17qxQHUP4rUlcsVqDh3OMGs8HarAea2csZE/jvsThL Cz+RpGe4DQ9lw8AP++tRNLFN3+MQRxY= 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-587-yND8ajmSMUih4BgGEC2E9w-1; Tue, 04 Jul 2023 12:40:57 -0400 X-MC-Unique: yND8ajmSMUih4BgGEC2E9w-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 A5F9E86F122; Tue, 4 Jul 2023 16:40:56 +0000 (UTC) Received: from max-t490s.redhat.com (unknown [10.39.208.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6E9E4492B02; Tue, 4 Jul 2023 16:40:54 +0000 (UTC) From: Maxime Coquelin To: xieyongji@bytedance.com, jasowang@redhat.com, mst@redhat.com, david.marchand@redhat.com, lulu@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: [PATCH v2 2/3] vduse: enable Virtio-net device type Date: Tue, 4 Jul 2023 18:40:44 +0200 Message-ID: <20230704164045.39119-3-maxime.coquelin@redhat.com> In-Reply-To: <20230704164045.39119-1-maxime.coquelin@redhat.com> References: <20230704164045.39119-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_H4,RCVD_IN_MSPIKE_WL,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?1770509575872551631?= X-GMAIL-MSGID: =?utf-8?q?1770509575872551631?= This patch adds Virtio-net device type to the supported devices types. Initialization fails if the device does not support VIRTIO_F_VERSION_1 feature, in order to guarantee the configuration space is read-only. Acked-by: Jason Wang Reviewed-by: Xie Yongji Signed-off-by: Maxime Coquelin --- drivers/vdpa/vdpa_user/vduse_dev.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/vdpa/vdpa_user/vduse_dev.c b/drivers/vdpa/vdpa_user/vduse_dev.c index ff9fdd6783fe..1271c9796517 100644 --- a/drivers/vdpa/vdpa_user/vduse_dev.c +++ b/drivers/vdpa/vdpa_user/vduse_dev.c @@ -142,6 +142,7 @@ static struct workqueue_struct *vduse_irq_bound_wq; static u32 allowed_device_id[] = { VIRTIO_ID_BLOCK, + VIRTIO_ID_NET, }; static inline struct vduse_dev *vdpa_to_vduse(struct vdpa_device *vdpa) @@ -1672,6 +1673,10 @@ static bool features_is_valid(struct vduse_dev_config *config) (config->features & (1ULL << VIRTIO_BLK_F_CONFIG_WCE))) return false; + if ((config->device_id == VIRTIO_ID_NET) && + !(config->features & (1ULL << VIRTIO_F_VERSION_1))) + return false; + return true; } @@ -2027,6 +2032,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 }, }; From patchwork Tue Jul 4 16:40:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Coquelin X-Patchwork-Id: 115862 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp1348011vqx; Tue, 4 Jul 2023 09:52:46 -0700 (PDT) X-Google-Smtp-Source: APBJJlETBBD4vqxRDJh0gFCmAB94NausXzfmNrNa1ZfvNN+0IlcpWhp/IhmmK4bJJb7Kjf8nl0Fu X-Received: by 2002:a17:90a:db87:b0:262:ecd3:990c with SMTP id h7-20020a17090adb8700b00262ecd3990cmr14883313pjv.47.1688489566274; Tue, 04 Jul 2023 09:52:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688489566; cv=none; d=google.com; s=arc-20160816; b=MRzu5nwU8MAGEr+lC+z9SMs43d7zunWhgOJWQFOAk55cfmiPiCaALGNHydjGySPjiB y/8Cy0zZ55ueeulgryDQsCLtxzHgd+Yf1j4ZO5Se8kmX599CFlyqRK0LqLVuLKTnt7bM 8lngMio8dqqxwPbiSrFFkq8PX2atx1RWbmK1G/c7hVaaPp1Dxr0hCFsPgosuwgY7bWM9 /tAEFXeIK4ZZLRf7dMtd0sS/45kpb8ywuttLxjx0oWJpmvpWmb75kUwjHDdxoQYqiwso b4sB+0TO8j7Eb40DGtUtIimVghHQLjuKVZTBGe3DkD+TZZdUewC67LAD1wct2Y6Qqkwh Ga2w== 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=h3fmV53fwhiWk7sQEChyplGv7CVi08pMxUVWbzUrLYY=; fh=S1rZK6DPg0mAED4KjNm0cP4EEY87q6FXHFEeosELg0E=; b=w1NajABiU30PNoaPUCFR0i3m9NPp9nqtS9enj08FTrfT5DIpeCGKup19gHvmcWB1XX dbXWBB1+0QTSk5l0lmHto2cFhR/Wi/HijX3f9AYp3neF41RTVYUzWt5ww6+uyuP2bnqK ISjx5e3SsJiY+R7jPOIQ7D2BOp4p0Iu+VZ3YLJsihF30NhfTpYZM22IIkl9s9G/9xCzH jYXUn1mwuPTR1iwjaFzWvUmcriTggqdB9YqW/KnzQOP0v/tqC+HoVKprx1ROm1ZytvU7 /335OYnbwHUtRrHx7tj/ZuudGh8Tpf8T3LFL90Kghl1WMX9OewfFUjrPJwhWO3reKBwV 41BQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=SQD7+wgt; 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 z12-20020a17090acb0c00b00263860e1f4csi9446057pjt.16.2023.07.04.09.52.31; Tue, 04 Jul 2023 09:52:46 -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=SQD7+wgt; 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 S231542AbjGDQmI (ORCPT + 99 others); Tue, 4 Jul 2023 12:42:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45254 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231794AbjGDQly (ORCPT ); Tue, 4 Jul 2023 12:41:54 -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 ESMTPS id 8CB2910D8 for ; Tue, 4 Jul 2023 09:41:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1688488863; 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=h3fmV53fwhiWk7sQEChyplGv7CVi08pMxUVWbzUrLYY=; b=SQD7+wgtnB08hvcp5lUn9+VuXakI+kxin56HYjkAD/jbUUB9ReSu/SL6egDQa5+ADC/aGi 0Z5rhilu43C5TSTqvayTpwB/xMfrW3oVkDLWiVQEKx2hoSaAqC+Nrl0hsR3ucBFGhENH7A 5XGtFL2XpGYC3vr7mLx/4mZP702ReV4= 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-261-eJ42uQqnNNqHjT5-jlVUrw-1; Tue, 04 Jul 2023 12:40:59 -0400 X-MC-Unique: eJ42uQqnNNqHjT5-jlVUrw-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 2B6FE38008B2; Tue, 4 Jul 2023 16:40:59 +0000 (UTC) Received: from max-t490s.redhat.com (unknown [10.39.208.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id F0A1E492B02; Tue, 4 Jul 2023 16:40:56 +0000 (UTC) From: Maxime Coquelin To: xieyongji@bytedance.com, jasowang@redhat.com, mst@redhat.com, david.marchand@redhat.com, lulu@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: [PATCH v2 3/3] vduse: Temporarily disable control queue features Date: Tue, 4 Jul 2023 18:40:45 +0200 Message-ID: <20230704164045.39119-4-maxime.coquelin@redhat.com> In-Reply-To: <20230704164045.39119-1-maxime.coquelin@redhat.com> References: <20230704164045.39119-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_H4,RCVD_IN_MSPIKE_WL,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?1770509484681444595?= X-GMAIL-MSGID: =?utf-8?q?1770509634927471098?= Virtio-net driver control queue implementation is not safe when used with VDUSE. If the VDUSE application does not reply to control queue messages, it currently ends up hanging the kernel thread sending this command. Some work is on-going to make the control queue implementation robust with VDUSE. Until it is completed, let's disable control virtqueue and features that depend on it. Signed-off-by: Maxime Coquelin --- drivers/vdpa/vdpa_user/vduse_dev.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/drivers/vdpa/vdpa_user/vduse_dev.c b/drivers/vdpa/vdpa_user/vduse_dev.c index 1271c9796517..04367a53802b 100644 --- a/drivers/vdpa/vdpa_user/vduse_dev.c +++ b/drivers/vdpa/vdpa_user/vduse_dev.c @@ -1778,6 +1778,25 @@ static struct attribute *vduse_dev_attrs[] = { ATTRIBUTE_GROUPS(vduse_dev); +static void vduse_dev_features_fixup(struct vduse_dev_config *config) +{ + if (config->device_id == VIRTIO_ID_NET) { + /* + * Temporarily disable control virtqueue and features that + * depend on it while CVQ is being made more robust for VDUSE. + */ + config->features &= ~((1ULL << VIRTIO_NET_F_CTRL_VQ) | + (1ULL << VIRTIO_NET_F_CTRL_RX) | + (1ULL << VIRTIO_NET_F_CTRL_VLAN) | + (1ULL << VIRTIO_NET_F_GUEST_ANNOUNCE) | + (1ULL << VIRTIO_NET_F_MQ) | + (1ULL << VIRTIO_NET_F_CTRL_MAC_ADDR) | + (1ULL << VIRTIO_NET_F_RSS) | + (1ULL << VIRTIO_NET_F_HASH_REPORT) | + (1ULL << VIRTIO_NET_F_NOTF_COAL)); + } +} + static int vduse_create_dev(struct vduse_dev_config *config, void *config_buf, u64 api_version) { @@ -1793,6 +1812,8 @@ static int vduse_create_dev(struct vduse_dev_config *config, if (!dev) goto err; + vduse_dev_features_fixup(config); + dev->api_version = api_version; dev->device_features = config->features; dev->device_id = config->device_id;