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;