Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8873EC4338F for ; Thu, 19 Aug 2021 04:10:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6E475610FA for ; Thu, 19 Aug 2021 04:10:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229630AbhHSEKl (ORCPT ); Thu, 19 Aug 2021 00:10:41 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:54304 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229529AbhHSEKk (ORCPT ); Thu, 19 Aug 2021 00:10:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629346204; 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=mAKFB523upMxo0+DwG+qMEdFT9ki0LjoFpTj11Nr6RM=; b=bD4krGlmqfPzIQHETCt7Nobja47o15jYKdoeuOhOOsUifXD935Bjz24BPEq6x5AdfunlPv PyF3AIUd28Xx9KxTqnUXz2D88WyV6MdEHrrBq/xvozv6TBLxv0CKtFL4YuxJmX2638mbQW at0MYBN4Aqs/1SVU6RIz/+614hg/AQY= Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-120-a_o-TZJhMYyXU5bcs07iXA-1; Thu, 19 Aug 2021 00:10:03 -0400 X-MC-Unique: a_o-TZJhMYyXU5bcs07iXA-1 Received: by mail-pf1-f198.google.com with SMTP id 71-20020a62144a0000b02903cde387cf77so2417771pfu.2 for ; Wed, 18 Aug 2021 21:10:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding :content-language; bh=mAKFB523upMxo0+DwG+qMEdFT9ki0LjoFpTj11Nr6RM=; b=BHIdxla0CFY5vhvt+u3ELYm6t7kLpQSXWaZJKCNTSLaF6fuqXV9IzNUVf+m/xHtotU qogS9DXbxG7N1euDZw4vXDCcABeh9wE+OZ8KisG/AVDmDGwWfT2tZEjRWzM6vUJp4zzO cRxpI9rvzKy5vxuSVHiZN9uSssBc7rZZK8AjccVn14SUQ31sC1u+PNV1MNpErfteNtGL c4pAgf4qSKFDJ08LPfu4DrBahLrLQ1DMqsqh60kQc+9sfdmweQAPh8uqi2FP2VjShk9N Hw5lSaKtlQ0u6R/hHboHB1ZTPu+pv9xBJJP2ylP6qjMwXhEka5EYx+ZGHdcyHlG4Nuku PO1A== X-Gm-Message-State: AOAM533MXU/0lAHhEFZgSvgi1adWGcJK3QbCruLyypZcgQjsEXzJRril ErA6UwXhIQ8wQT2D8jPdjg/whrxjaYUegUxJPqyHRGs0tnKjfdJ9WTvom/XgmHXg/J+n6Zk/Jac Y1ehR7+nx4bnvRgQq X-Received: by 2002:a17:902:a710:b029:12b:9b9f:c461 with SMTP id w16-20020a170902a710b029012b9b9fc461mr9934347plq.59.1629346202069; Wed, 18 Aug 2021 21:10:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzvJvKxjGvDP16m5jvYKL6UB/rB3oLFvT92PakF4jUj1koqC+slPZsHsy5c/+Dx1bYU8TY/Nw== X-Received: by 2002:a17:902:a710:b029:12b:9b9f:c461 with SMTP id w16-20020a170902a710b029012b9b9fc461mr9934329plq.59.1629346201878; Wed, 18 Aug 2021 21:10:01 -0700 (PDT) Received: from wangxiaodeMacBook-Air.local ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id g6sm1336541pfv.156.2021.08.18.21.09.59 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 18 Aug 2021 21:10:01 -0700 (PDT) Subject: Re: [PATCH 2/2] vDPA/ifcvf: enable multiqueue and control vq To: Zhu Lingshan , mst@redhat.com Cc: virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, kvm@vger.kernel.org References: <20210818095714.3220-1-lingshan.zhu@intel.com> <20210818095714.3220-3-lingshan.zhu@intel.com> From: Jason Wang Message-ID: Date: Thu, 19 Aug 2021 12:09:58 +0800 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 MIME-Version: 1.0 In-Reply-To: <20210818095714.3220-3-lingshan.zhu@intel.com> Content-Type: text/plain; charset=gbk; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org ÔÚ 2021/8/18 ÏÂÎç5:57, Zhu Lingshan дµÀ: > This commit enbales multi-queue and control vq > features for ifcvf > > Signed-off-by: Zhu Lingshan Acked-by: Jason Wang > --- > drivers/vdpa/ifcvf/ifcvf_base.h | 9 --------- > drivers/vdpa/ifcvf/ifcvf_main.c | 11 +++-------- > 2 files changed, 3 insertions(+), 17 deletions(-) > > diff --git a/drivers/vdpa/ifcvf/ifcvf_base.h b/drivers/vdpa/ifcvf/ifcvf_base.h > index 97d9019a3ec0..09918af3ecf8 100644 > --- a/drivers/vdpa/ifcvf/ifcvf_base.h > +++ b/drivers/vdpa/ifcvf/ifcvf_base.h > @@ -22,15 +22,6 @@ > #define N3000_DEVICE_ID 0x1041 > #define N3000_SUBSYS_DEVICE_ID 0x001A > > -#define IFCVF_NET_SUPPORTED_FEATURES \ > - ((1ULL << VIRTIO_NET_F_MAC) | \ > - (1ULL << VIRTIO_F_ANY_LAYOUT) | \ > - (1ULL << VIRTIO_F_VERSION_1) | \ > - (1ULL << VIRTIO_NET_F_STATUS) | \ > - (1ULL << VIRTIO_F_ORDER_PLATFORM) | \ > - (1ULL << VIRTIO_F_ACCESS_PLATFORM) | \ > - (1ULL << VIRTIO_NET_F_MRG_RXBUF)) > - > /* Max 8 data queue pairs(16 queues) and one control vq for now. */ > #define IFCVF_MAX_QUEUES 17 > > diff --git a/drivers/vdpa/ifcvf/ifcvf_main.c b/drivers/vdpa/ifcvf/ifcvf_main.c > index e34c2ec2b69b..b99283a98177 100644 > --- a/drivers/vdpa/ifcvf/ifcvf_main.c > +++ b/drivers/vdpa/ifcvf/ifcvf_main.c > @@ -174,17 +174,12 @@ static u64 ifcvf_vdpa_get_features(struct vdpa_device *vdpa_dev) > struct ifcvf_adapter *adapter = vdpa_to_adapter(vdpa_dev); > struct ifcvf_hw *vf = vdpa_to_vf(vdpa_dev); > struct pci_dev *pdev = adapter->pdev; > - > + u32 type = vf->dev_type; > u64 features; > > - switch (vf->dev_type) { > - case VIRTIO_ID_NET: > - features = ifcvf_get_features(vf) & IFCVF_NET_SUPPORTED_FEATURES; > - break; > - case VIRTIO_ID_BLOCK: > + if (type == VIRTIO_ID_NET || type == VIRTIO_ID_BLOCK) > features = ifcvf_get_features(vf); > - break; > - default: > + else { > features = 0; > IFCVF_ERR(pdev, "VIRTIO ID %u not supported\n", vf->dev_type); > }