On Fri, Oct 22, 2021 at 10:44 AM Wu Zongyong <wuzongyong@xxxxxxxxxxxxxxxxx> wrote: > > This patch adds a new vDPA driver for Alibaba ENI(Elastic Network > Interface) which is build upon virtio 0.9.5 specification. > And this driver doesn't support to run on BE host. > > Signed-off-by: Wu Zongyong <wuzongyong@xxxxxxxxxxxxxxxxx> > --- > drivers/vdpa/Kconfig | 8 + > drivers/vdpa/Makefile | 1 + > drivers/vdpa/alibaba/Makefile | 3 + > drivers/vdpa/alibaba/eni_vdpa.c | 553 ++++++++++++++++++++++++++++++++ > 4 files changed, 565 insertions(+) > create mode 100644 drivers/vdpa/alibaba/Makefile > create mode 100644 drivers/vdpa/alibaba/eni_vdpa.c > > diff --git a/drivers/vdpa/Kconfig b/drivers/vdpa/Kconfig > index 3d91982d8371..c0232a2148a7 100644 > --- a/drivers/vdpa/Kconfig > +++ b/drivers/vdpa/Kconfig > @@ -78,4 +78,12 @@ config VP_VDPA > help > This kernel module bridges virtio PCI device to vDPA bus. > > +config ALIBABA_ENI_VDPA > + tristate "vDPA driver for Alibaba ENI" > + select VIRTIO_PCI_LEGACY_LIB > + depends on PCI_MSI && !CPU_BIG_ENDIAN > + help > + VDPA driver for Alibaba ENI(Elastic Network Interface) which is build upon > + virtio 0.9.5 specification. > + > endif # VDPA > diff --git a/drivers/vdpa/Makefile b/drivers/vdpa/Makefile > index f02ebed33f19..15665563a7f4 100644 > --- a/drivers/vdpa/Makefile > +++ b/drivers/vdpa/Makefile > @@ -5,3 +5,4 @@ obj-$(CONFIG_VDPA_USER) += vdpa_user/ > obj-$(CONFIG_IFCVF) += ifcvf/ > obj-$(CONFIG_MLX5_VDPA) += mlx5/ > obj-$(CONFIG_VP_VDPA) += virtio_pci/ > +obj-$(CONFIG_ALIBABA_ENI_VDPA) += alibaba/ > diff --git a/drivers/vdpa/alibaba/Makefile b/drivers/vdpa/alibaba/Makefile > new file mode 100644 > index 000000000000..ef4aae69f87a > --- /dev/null > +++ b/drivers/vdpa/alibaba/Makefile > @@ -0,0 +1,3 @@ > +# SPDX-License-Identifier: GPL-2.0 > +obj-$(CONFIG_ALIBABA_ENI_VDPA) += eni_vdpa.o > + > diff --git a/drivers/vdpa/alibaba/eni_vdpa.c b/drivers/vdpa/alibaba/eni_vdpa.c > new file mode 100644 > index 000000000000..6a09f157d810 > --- /dev/null > +++ b/drivers/vdpa/alibaba/eni_vdpa.c > @@ -0,0 +1,553 @@ > +// SPDX-License-Identifier: GPL-2.0-only > +/* > + * vDPA bridge driver for Alibaba ENI(Elastic Network Interface) > + * > + * Copyright (c) 2021, Alibaba Inc. All rights reserved. > + * Author: Wu Zongyong <wuzongyong@xxxxxxxxxxxxxxxxx> > + * > + */ > + > +#include "linux/bits.h" > +#include <linux/interrupt.h> > +#include <linux/module.h> > +#include <linux/pci.h> > +#include <linux/vdpa.h> > +#include <linux/virtio.h> > +#include <linux/virtio_config.h> > +#include <linux/virtio_ring.h> > +#include <linux/virtio_pci.h> > +#include <linux/virtio_pci_legacy.h> > +#include <uapi/linux/virtio_net.h> > + > +#define ENI_MSIX_NAME_SIZE 256 > + > +#define ENI_ERR(pdev, fmt, ...) \ > + dev_err(&pdev->dev, "%s"fmt, "eni_vdpa: ", ##__VA_ARGS__) > +#define ENI_DBG(pdev, fmt, ...) \ > + dev_dbg(&pdev->dev, "%s"fmt, "eni_vdpa: ", ##__VA_ARGS__) > +#define ENI_INFO(pdev, fmt, ...) \ > + dev_info(&pdev->dev, "%s"fmt, "eni_vdpa: ", ##__VA_ARGS__) > + > +struct eni_vring { > + void __iomem *notify; > + char msix_name[ENI_MSIX_NAME_SIZE]; > + struct vdpa_callback cb; > + int irq; > +}; > + > +struct eni_vdpa { > + struct vdpa_device vdpa; > + struct virtio_pci_legacy_device ldev; > + struct eni_vring *vring; > + struct vdpa_callback config_cb; > + char msix_name[ENI_MSIX_NAME_SIZE]; > + int config_irq; > + int queues; > + int vectors; > +}; > + > +static struct eni_vdpa *vdpa_to_eni(struct vdpa_device *vdpa) > +{ > + return container_of(vdpa, struct eni_vdpa, vdpa); > +} > + > +static struct virtio_pci_legacy_device *vdpa_to_ldev(struct vdpa_device *vdpa) > +{ > + struct eni_vdpa *eni_vdpa = vdpa_to_eni(vdpa); > + > + return &eni_vdpa->ldev; > +} > + > +static u64 eni_vdpa_get_features(struct vdpa_device *vdpa) > +{ > + struct virtio_pci_legacy_device *ldev = vdpa_to_ldev(vdpa); > + u64 features = vp_legacy_get_features(ldev); > + > + features |= BIT_ULL(VIRTIO_F_ACCESS_PLATFORM); > + features |= BIT_ULL(VIRTIO_F_ORDER_PLATFORM); > + > + return features; > +} > + > +static int eni_vdpa_set_features(struct vdpa_device *vdpa, u64 features) > +{ > + struct virtio_pci_legacy_device *ldev = vdpa_to_ldev(vdpa); > + > + if (!(features & BIT_ULL(VIRTIO_NET_F_MRG_RXBUF)) && features) { > + ENI_ERR(ldev->pci_dev, > + "VIRTIO_NET_F_MRG_RXBUF is not negotiated\n"); > + return -EINVAL; > + } > + > + vp_legacy_set_features(ldev, (u32)features); > + > + return 0; > +} > + So my comments have not been addressed since v4. Please address or answer the questions before posting a new version. Thanks > +static u64 eni_vdpa_get_features(struct vdpa_device *vdpa) > +{ > + struct virtio_pci_legacy_device *ldev = vdpa_to_ldev(vdpa); > + u64 features = vp_legacy_get_features(ldev); > + > + features |= BIT_ULL(VIRTIO_F_ACCESS_PLATFORM); > + features |= BIT_ULL(VIRTIO_F_ORDER_PLATFORM); VERSION_1 is also needed? > + > + return features; > +} > + > +static int eni_vdpa_set_features(struct vdpa_device *vdpa, u64 features) > +{ > + struct virtio_pci_legacy_device *ldev = vdpa_to_ldev(vdpa); > + > + if (!(features & BIT_ULL(VIRTIO_NET_F_MRG_RXBUF)) && features) { > + ENI_ERR(ldev->pci_dev, > + "VIRTIO_NET_F_MRG_RXBUF is not negotiated\n"); > + return -EINVAL; Do we need to make sure FEATURE_OK is not set in this case or the ENI can do this for us? Other looks good. Thanks _______________________________________________ Virtualization mailing list Virtualization@xxxxxxxxxxxxxxxxxxxxxxxxxx https://lists.linuxfoundation.org/mailman/listinfo/virtualization