From 2c4496446168b1c97b148f146af4e8c5856f3364 Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Thu, 5 Sep 2019 15:53:11 +0100 Subject: [PATCH] crypto/virtio: fix global variable multiple definitions 'virtio_hw_internal' global variable is defined in both 'crypto/virtio' and 'net/virtio' PMDs. This means they share same storage when application linked with static DPDK library, which is not the intention. Fixing by adding 'crypto_' prefix to the 'crypto/virtio' driver. Issue has been detected by '-fno-common' gcc flag. Fixes: 25500d4b8076 ("crypto/virtio: support device init") Cc: stable@dpdk.org Signed-off-by: Ferruh Yigit --- drivers/crypto/virtio/virtio_pci.c | 4 ++-- drivers/crypto/virtio/virtio_pci.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/crypto/virtio/virtio_pci.c b/drivers/crypto/virtio/virtio_pci.c index 8137b3c5ac..f490f6e289 100644 --- a/drivers/crypto/virtio/virtio_pci.c +++ b/drivers/crypto/virtio/virtio_pci.c @@ -31,7 +31,7 @@ #define VIRTIO_PCI_CONFIG(hw) \ (((hw)->use_msix == VIRTIO_MSIX_ENABLED) ? 24 : 20) -struct virtio_hw_internal virtio_hw_internal[RTE_MAX_VIRTIO_CRYPTO]; +struct virtio_hw_internal crypto_virtio_hw_internal[RTE_MAX_VIRTIO_CRYPTO]; static inline int check_vq_phys_addr_ok(struct virtqueue *vq) @@ -452,7 +452,7 @@ vtpci_cryptodev_init(struct rte_pci_device *dev, struct virtio_crypto_hw *hw) */ if (virtio_read_caps(dev, hw) == 0) { VIRTIO_CRYPTO_INIT_LOG_INFO("modern virtio pci detected."); - virtio_hw_internal[hw->dev_id].vtpci_ops = + crypto_virtio_hw_internal[hw->dev_id].vtpci_ops = &virtio_crypto_modern_ops; hw->modern = 1; return 0; diff --git a/drivers/crypto/virtio/virtio_pci.h b/drivers/crypto/virtio/virtio_pci.h index 604ec36623..d9a214dfd0 100644 --- a/drivers/crypto/virtio/virtio_pci.h +++ b/drivers/crypto/virtio/virtio_pci.h @@ -201,10 +201,10 @@ struct virtio_hw_internal { struct rte_pci_ioport io; }; -#define VTPCI_OPS(hw) (virtio_hw_internal[(hw)->dev_id].vtpci_ops) -#define VTPCI_IO(hw) (&virtio_hw_internal[(hw)->dev_id].io) +#define VTPCI_OPS(hw) (crypto_virtio_hw_internal[(hw)->dev_id].vtpci_ops) +#define VTPCI_IO(hw) (&crypto_virtio_hw_internal[(hw)->dev_id].io) -extern struct virtio_hw_internal virtio_hw_internal[RTE_MAX_VIRTIO_CRYPTO]; +extern struct virtio_hw_internal crypto_virtio_hw_internal[RTE_MAX_VIRTIO_CRYPTO]; /* * How many bits to shift physical queue address written to QUEUE_PFN. -- 2.20.1