From: Jason Wang <jasowang@redhat.com> To: Zhu Lingshan <lingshan.zhu@linux.intel.com>, Zhu Lingshan <lingshan.zhu@intel.com>, mst@redhat.com, lulu@redhat.com, leonro@nvidia.com Cc: virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 2/3] vDPA/ifcvf: enable Intel C5000X-PL virtio-block for vDPA Date: Thu, 15 Apr 2021 14:31:34 +0800 [thread overview] Message-ID: <c90a923f-7c8d-9a32-ce14-2370f85f1ba4@redhat.com> (raw) In-Reply-To: <1a1f9f50-dc92-ced3-759d-e600abca3138@linux.intel.com> 在 2021/4/15 下午1:55, Zhu Lingshan 写道: > > > On 4/15/2021 11:34 AM, Jason Wang wrote: >> >> 在 2021/4/14 下午5:18, Zhu Lingshan 写道: >>> This commit enabled Intel FPGA SmartNIC C5000X-PL virtio-block >>> for vDPA. >>> >>> Signed-off-by: Zhu Lingshan <lingshan.zhu@intel.com> >>> --- >>> drivers/vdpa/ifcvf/ifcvf_base.h | 17 ++++++++++++++++- >>> drivers/vdpa/ifcvf/ifcvf_main.c | 10 +++++++++- >>> 2 files changed, 25 insertions(+), 2 deletions(-) >>> >>> diff --git a/drivers/vdpa/ifcvf/ifcvf_base.h >>> b/drivers/vdpa/ifcvf/ifcvf_base.h >>> index 1c04cd256fa7..8b403522bf06 100644 >>> --- a/drivers/vdpa/ifcvf/ifcvf_base.h >>> +++ b/drivers/vdpa/ifcvf/ifcvf_base.h >>> @@ -15,6 +15,7 @@ >>> #include <linux/pci_regs.h> >>> #include <linux/vdpa.h> >>> #include <uapi/linux/virtio_net.h> >>> +#include <uapi/linux/virtio_blk.h> >>> #include <uapi/linux/virtio_config.h> >>> #include <uapi/linux/virtio_pci.h> >>> @@ -28,7 +29,12 @@ >>> #define C5000X_PL_SUBSYS_VENDOR_ID 0x8086 >>> #define C5000X_PL_SUBSYS_DEVICE_ID 0x0001 >>> -#define IFCVF_SUPPORTED_FEATURES \ >>> +#define C5000X_PL_BLK_VENDOR_ID 0x1AF4 >>> +#define C5000X_PL_BLK_DEVICE_ID 0x1001 >>> +#define C5000X_PL_BLK_SUBSYS_VENDOR_ID 0x8086 >>> +#define C5000X_PL_BLK_SUBSYS_DEVICE_ID 0x0002 >>> + >>> +#define IFCVF_NET_SUPPORTED_FEATURES \ >>> ((1ULL << VIRTIO_NET_F_MAC) | \ >>> (1ULL << VIRTIO_F_ANY_LAYOUT) | \ >>> (1ULL << VIRTIO_F_VERSION_1) | \ >>> @@ -37,6 +43,15 @@ >>> (1ULL << VIRTIO_F_ACCESS_PLATFORM) | \ >>> (1ULL << VIRTIO_NET_F_MRG_RXBUF)) >>> +#define IFCVF_BLK_SUPPORTED_FEATURES \ >>> + ((1ULL << VIRTIO_BLK_F_SIZE_MAX) | \ >>> + (1ULL << VIRTIO_BLK_F_SEG_MAX) | \ >>> + (1ULL << VIRTIO_BLK_F_BLK_SIZE) | \ >>> + (1ULL << VIRTIO_BLK_F_TOPOLOGY) | \ >>> + (1ULL << VIRTIO_BLK_F_MQ) | \ >>> + (1ULL << VIRTIO_F_VERSION_1) | \ >>> + (1ULL << VIRTIO_F_ACCESS_PLATFORM)) >> >> >> I think we've discussed this sometime in the past but what's the >> reason for such whitelist consider there's already a get_features() >> implemention? >> >> E.g Any reason to block VIRTIO_BLK_F_WRITE_ZEROS or >> VIRTIO_F_RING_PACKED? >> >> Thanks > The reason is some feature bits are supported in the device but not > supported by the driver, e.g, for virtio-net, mq & cq implementation > is not ready in the driver. I understand the case of virtio-net but I wonder why we need this for block where we don't vq cvq. Thanks > > Thanks! > >> >> >>> + >>> /* Only one queue pair for now. */ >>> #define IFCVF_MAX_QUEUE_PAIRS 1 >>> diff --git a/drivers/vdpa/ifcvf/ifcvf_main.c >>> b/drivers/vdpa/ifcvf/ifcvf_main.c >>> index 99b0a6b4c227..9b6a38b798fa 100644 >>> --- a/drivers/vdpa/ifcvf/ifcvf_main.c >>> +++ b/drivers/vdpa/ifcvf/ifcvf_main.c >>> @@ -171,7 +171,11 @@ static u64 ifcvf_vdpa_get_features(struct >>> vdpa_device *vdpa_dev) >>> struct ifcvf_hw *vf = vdpa_to_vf(vdpa_dev); >>> u64 features; >>> - features = ifcvf_get_features(vf) & IFCVF_SUPPORTED_FEATURES; >>> + if (vf->dev_type == VIRTIO_ID_NET) >>> + features = ifcvf_get_features(vf) & >>> IFCVF_NET_SUPPORTED_FEATURES; >>> + >>> + if (vf->dev_type == VIRTIO_ID_BLOCK) >>> + features = ifcvf_get_features(vf) & >>> IFCVF_BLK_SUPPORTED_FEATURES; >>> return features; >>> } >>> @@ -509,6 +513,10 @@ static struct pci_device_id ifcvf_pci_ids[] = { >>> C5000X_PL_DEVICE_ID, >>> C5000X_PL_SUBSYS_VENDOR_ID, >>> C5000X_PL_SUBSYS_DEVICE_ID) }, >>> + { PCI_DEVICE_SUB(C5000X_PL_BLK_VENDOR_ID, >>> + C5000X_PL_BLK_DEVICE_ID, >>> + C5000X_PL_BLK_SUBSYS_VENDOR_ID, >>> + C5000X_PL_BLK_SUBSYS_DEVICE_ID) }, >>> { 0 }, >>> }; >> >
WARNING: multiple messages have this Message-ID (diff)
From: Jason Wang <jasowang@redhat.com> To: Zhu Lingshan <lingshan.zhu@linux.intel.com>, Zhu Lingshan <lingshan.zhu@intel.com>, mst@redhat.com, lulu@redhat.com, leonro@nvidia.com Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, virtualization@lists.linux-foundation.org Subject: Re: [PATCH 2/3] vDPA/ifcvf: enable Intel C5000X-PL virtio-block for vDPA Date: Thu, 15 Apr 2021 14:31:34 +0800 [thread overview] Message-ID: <c90a923f-7c8d-9a32-ce14-2370f85f1ba4@redhat.com> (raw) In-Reply-To: <1a1f9f50-dc92-ced3-759d-e600abca3138@linux.intel.com> 在 2021/4/15 下午1:55, Zhu Lingshan 写道: > > > On 4/15/2021 11:34 AM, Jason Wang wrote: >> >> 在 2021/4/14 下午5:18, Zhu Lingshan 写道: >>> This commit enabled Intel FPGA SmartNIC C5000X-PL virtio-block >>> for vDPA. >>> >>> Signed-off-by: Zhu Lingshan <lingshan.zhu@intel.com> >>> --- >>> drivers/vdpa/ifcvf/ifcvf_base.h | 17 ++++++++++++++++- >>> drivers/vdpa/ifcvf/ifcvf_main.c | 10 +++++++++- >>> 2 files changed, 25 insertions(+), 2 deletions(-) >>> >>> diff --git a/drivers/vdpa/ifcvf/ifcvf_base.h >>> b/drivers/vdpa/ifcvf/ifcvf_base.h >>> index 1c04cd256fa7..8b403522bf06 100644 >>> --- a/drivers/vdpa/ifcvf/ifcvf_base.h >>> +++ b/drivers/vdpa/ifcvf/ifcvf_base.h >>> @@ -15,6 +15,7 @@ >>> #include <linux/pci_regs.h> >>> #include <linux/vdpa.h> >>> #include <uapi/linux/virtio_net.h> >>> +#include <uapi/linux/virtio_blk.h> >>> #include <uapi/linux/virtio_config.h> >>> #include <uapi/linux/virtio_pci.h> >>> @@ -28,7 +29,12 @@ >>> #define C5000X_PL_SUBSYS_VENDOR_ID 0x8086 >>> #define C5000X_PL_SUBSYS_DEVICE_ID 0x0001 >>> -#define IFCVF_SUPPORTED_FEATURES \ >>> +#define C5000X_PL_BLK_VENDOR_ID 0x1AF4 >>> +#define C5000X_PL_BLK_DEVICE_ID 0x1001 >>> +#define C5000X_PL_BLK_SUBSYS_VENDOR_ID 0x8086 >>> +#define C5000X_PL_BLK_SUBSYS_DEVICE_ID 0x0002 >>> + >>> +#define IFCVF_NET_SUPPORTED_FEATURES \ >>> ((1ULL << VIRTIO_NET_F_MAC) | \ >>> (1ULL << VIRTIO_F_ANY_LAYOUT) | \ >>> (1ULL << VIRTIO_F_VERSION_1) | \ >>> @@ -37,6 +43,15 @@ >>> (1ULL << VIRTIO_F_ACCESS_PLATFORM) | \ >>> (1ULL << VIRTIO_NET_F_MRG_RXBUF)) >>> +#define IFCVF_BLK_SUPPORTED_FEATURES \ >>> + ((1ULL << VIRTIO_BLK_F_SIZE_MAX) | \ >>> + (1ULL << VIRTIO_BLK_F_SEG_MAX) | \ >>> + (1ULL << VIRTIO_BLK_F_BLK_SIZE) | \ >>> + (1ULL << VIRTIO_BLK_F_TOPOLOGY) | \ >>> + (1ULL << VIRTIO_BLK_F_MQ) | \ >>> + (1ULL << VIRTIO_F_VERSION_1) | \ >>> + (1ULL << VIRTIO_F_ACCESS_PLATFORM)) >> >> >> I think we've discussed this sometime in the past but what's the >> reason for such whitelist consider there's already a get_features() >> implemention? >> >> E.g Any reason to block VIRTIO_BLK_F_WRITE_ZEROS or >> VIRTIO_F_RING_PACKED? >> >> Thanks > The reason is some feature bits are supported in the device but not > supported by the driver, e.g, for virtio-net, mq & cq implementation > is not ready in the driver. I understand the case of virtio-net but I wonder why we need this for block where we don't vq cvq. Thanks > > Thanks! > >> >> >>> + >>> /* Only one queue pair for now. */ >>> #define IFCVF_MAX_QUEUE_PAIRS 1 >>> diff --git a/drivers/vdpa/ifcvf/ifcvf_main.c >>> b/drivers/vdpa/ifcvf/ifcvf_main.c >>> index 99b0a6b4c227..9b6a38b798fa 100644 >>> --- a/drivers/vdpa/ifcvf/ifcvf_main.c >>> +++ b/drivers/vdpa/ifcvf/ifcvf_main.c >>> @@ -171,7 +171,11 @@ static u64 ifcvf_vdpa_get_features(struct >>> vdpa_device *vdpa_dev) >>> struct ifcvf_hw *vf = vdpa_to_vf(vdpa_dev); >>> u64 features; >>> - features = ifcvf_get_features(vf) & IFCVF_SUPPORTED_FEATURES; >>> + if (vf->dev_type == VIRTIO_ID_NET) >>> + features = ifcvf_get_features(vf) & >>> IFCVF_NET_SUPPORTED_FEATURES; >>> + >>> + if (vf->dev_type == VIRTIO_ID_BLOCK) >>> + features = ifcvf_get_features(vf) & >>> IFCVF_BLK_SUPPORTED_FEATURES; >>> return features; >>> } >>> @@ -509,6 +513,10 @@ static struct pci_device_id ifcvf_pci_ids[] = { >>> C5000X_PL_DEVICE_ID, >>> C5000X_PL_SUBSYS_VENDOR_ID, >>> C5000X_PL_SUBSYS_DEVICE_ID) }, >>> + { PCI_DEVICE_SUB(C5000X_PL_BLK_VENDOR_ID, >>> + C5000X_PL_BLK_DEVICE_ID, >>> + C5000X_PL_BLK_SUBSYS_VENDOR_ID, >>> + C5000X_PL_BLK_SUBSYS_DEVICE_ID) }, >>> { 0 }, >>> }; >> > _______________________________________________ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/virtualization
next prev parent reply other threads:[~2021-04-15 6:31 UTC|newest] Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-04-14 9:18 [PATCH 0/3] vDPA/ifcvf: enables Intel C5000X-PL virtio-blk Zhu Lingshan 2021-04-14 9:18 ` [PATCH 1/3] vDPA/ifcvf: deduce VIRTIO device ID when probe Zhu Lingshan 2021-04-15 3:30 ` Jason Wang 2021-04-15 3:30 ` Jason Wang 2021-04-15 5:52 ` Zhu Lingshan 2021-04-15 5:52 ` Zhu Lingshan 2021-04-15 6:30 ` Jason Wang 2021-04-15 6:30 ` Jason Wang 2021-04-15 6:36 ` Zhu Lingshan 2021-04-15 6:36 ` Zhu Lingshan 2021-04-15 7:16 ` Jason Wang 2021-04-15 7:16 ` Jason Wang 2021-04-15 7:23 ` Zhu Lingshan 2021-04-15 7:23 ` Zhu Lingshan 2021-04-14 9:18 ` [PATCH 2/3] vDPA/ifcvf: enable Intel C5000X-PL virtio-block for vDPA Zhu Lingshan 2021-04-15 3:34 ` Jason Wang 2021-04-15 3:34 ` Jason Wang 2021-04-15 5:55 ` Zhu Lingshan 2021-04-15 5:55 ` Zhu Lingshan 2021-04-15 6:31 ` Jason Wang [this message] 2021-04-15 6:31 ` Jason Wang 2021-04-15 6:41 ` Zhu Lingshan 2021-04-15 6:41 ` Zhu Lingshan 2021-04-15 7:17 ` Jason Wang 2021-04-15 7:17 ` Jason Wang 2021-04-15 7:23 ` Zhu Lingshan 2021-04-15 7:23 ` Zhu Lingshan 2021-04-14 9:18 ` [PATCH 3/3] vDPA/ifcvf: get_config_size should return dev specific config size Zhu Lingshan 2021-04-15 3:36 ` Jason Wang 2021-04-15 3:36 ` Jason Wang 2021-04-15 8:12 ` Stefano Garzarella 2021-04-15 8:12 ` Stefano Garzarella 2021-04-15 8:16 ` Jason Wang 2021-04-15 8:16 ` Jason Wang 2021-04-15 8:23 ` Zhu Lingshan 2021-04-15 8:33 ` Stefano Garzarella
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=c90a923f-7c8d-9a32-ce14-2370f85f1ba4@redhat.com \ --to=jasowang@redhat.com \ --cc=kvm@vger.kernel.org \ --cc=leonro@nvidia.com \ --cc=lingshan.zhu@intel.com \ --cc=lingshan.zhu@linux.intel.com \ --cc=linux-kernel@vger.kernel.org \ --cc=lulu@redhat.com \ --cc=mst@redhat.com \ --cc=netdev@vger.kernel.org \ --cc=virtualization@lists.linux-foundation.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.