net/virtio: move vring alignment to generic header

This patch moves vring alignment define to the generic
Virtio header.

Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Reviewed-by: Chenbo Xia <chenbo.xia@intel.com>
Reviewed-by: David Marchand <david.marchand@redhat.com>

diff --git a/drivers/net/virtio/virtio.h b/drivers/net/virtio/virtio.h
index a7629ad..21d5490 100644 (file)
--- a/drivers/net/virtio/virtio.h
+++ b/drivers/net/virtio/virtio.h
@@ -131,6 +131,9 @@
 /* Vector value used to disable MSI for queue. */
 #define VIRTIO_MSI_NO_VECTOR 0xFFFF
 
+/* The alignment to use between consumer and producer parts of vring. */
+#define VIRTIO_VRING_ALIGN 4096
+
 /*
  * This structure is just a reference to read net device specific
  * config space; it is just a shadow structure.

diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c
index d8c0435..b6eb9d6 100644 (file)
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -407,12 +407,12 @@ virtio_init_vring(struct virtqueue *vq)
        memset(vq->vq_descx, 0, sizeof(struct vq_desc_extra) * vq->vq_nentries);
        if (virtio_with_packed_queue(vq->hw)) {
                vring_init_packed(&vq->vq_packed.ring, ring_mem,
-                                 VIRTIO_PCI_VRING_ALIGN, size);
+                                 VIRTIO_VRING_ALIGN, size);
                vring_desc_init_packed(vq, size);
        } else {
                struct vring *vr = &vq->vq_split.ring;
 
-               vring_init_split(vr, ring_mem, VIRTIO_PCI_VRING_ALIGN, size);
+               vring_init_split(vr, ring_mem, VIRTIO_VRING_ALIGN, size);
                vring_desc_init_split(vr->desc, size);
        }
        /*
@@ -497,14 +497,14 @@ virtio_init_queue(struct rte_eth_dev *dev, uint16_t vtpci_queue_idx)
        /*
         * Reserve a memzone for vring elements
         */
-       size = vring_size(hw, vq_size, VIRTIO_PCI_VRING_ALIGN);
-       vq->vq_ring_size = RTE_ALIGN_CEIL(size, VIRTIO_PCI_VRING_ALIGN);
+       size = vring_size(hw, vq_size, VIRTIO_VRING_ALIGN);
+       vq->vq_ring_size = RTE_ALIGN_CEIL(size, VIRTIO_VRING_ALIGN);
        PMD_INIT_LOG(DEBUG, "vring_size: %d, rounded_vring_size: %d",
                     size, vq->vq_ring_size);
 
        mz = rte_memzone_reserve_aligned(vq_name, vq->vq_ring_size,
                        numa_node, RTE_MEMZONE_IOVA_CONTIG,
-                       VIRTIO_PCI_VRING_ALIGN);
+                       VIRTIO_VRING_ALIGN);
        if (mz == NULL) {
                if (rte_errno == EEXIST)
                        mz = rte_memzone_lookup(vq_name);

diff --git a/drivers/net/virtio/virtio_pci.c b/drivers/net/virtio/virtio_pci.c
index 905534a..d27e9eb 100644 (file)
--- a/drivers/net/virtio/virtio_pci.c
+++ b/drivers/net/virtio/virtio_pci.c
@@ -492,7 +492,7 @@ modern_setup_queue(struct virtio_hw *hw, struct virtqueue *vq)
        avail_addr = desc_addr + vq->vq_nentries * sizeof(struct vring_desc);
        used_addr = RTE_ALIGN_CEIL(avail_addr + offsetof(struct vring_avail,
                                                         ring[vq->vq_nentries]),
-                                  VIRTIO_PCI_VRING_ALIGN);
+                                  VIRTIO_VRING_ALIGN);
 
        rte_write16(vq->vq_queue_index, &dev->common_cfg->queue_select);
 

diff --git a/drivers/net/virtio/virtio_pci.h b/drivers/net/virtio/virtio_pci.h
index 7d2f8aa..57596e4 100644 (file)
--- a/drivers/net/virtio/virtio_pci.h
+++ b/drivers/net/virtio/virtio_pci.h
@@ -122,9 +122,6 @@ struct virtio_pci_dev {
  */
 #define VIRTIO_PCI_QUEUE_ADDR_SHIFT 12
 
-/* The alignment to use between consumer and producer parts of vring. */
-#define VIRTIO_PCI_VRING_ALIGN 4096
-
 /*
  * Function declaration from virtio_pci.c
  */

diff --git a/drivers/net/virtio/virtio_user_ethdev.c b/drivers/net/virtio/virtio_user_ethdev.c
index add9774..093f244 100644 (file)
--- a/drivers/net/virtio/virtio_user_ethdev.c
+++ b/drivers/net/virtio/virtio_user_ethdev.c
@@ -388,7 +388,7 @@ virtio_user_setup_queue_packed(struct virtqueue *vq,
                sizeof(struct vring_packed_desc);
        used_addr = RTE_ALIGN_CEIL(avail_addr +
                           sizeof(struct vring_packed_desc_event),
-                          VIRTIO_PCI_VRING_ALIGN);
+                          VIRTIO_VRING_ALIGN);
        vring->num = vq->vq_nentries;
        vring->desc = (void *)(uintptr_t)desc_addr;
        vring->driver = (void *)(uintptr_t)avail_addr;
@@ -410,7 +410,7 @@ virtio_user_setup_queue_split(struct virtqueue *vq, struct virtio_user_dev *dev)
        avail_addr = desc_addr + vq->vq_nentries * sizeof(struct vring_desc);
        used_addr = RTE_ALIGN_CEIL(avail_addr + offsetof(struct vring_avail,
                                                         ring[vq->vq_nentries]),
-                                  VIRTIO_PCI_VRING_ALIGN);
+                                  VIRTIO_VRING_ALIGN);
 
        dev->vrings[queue_idx].num = vq->vq_nentries;
        dev->vrings[queue_idx].desc = (void *)(uintptr_t)desc_addr;