[dpdk-dev] [PATCH 17/22] net/ena: support SMP for mz alloc counter

[Michal Krawczyk]

From: Stanislaw Kardach <k...@semihalf.com>

Introduce a memory area for ENA driver shared between all the processes
of a same prefix (memzone backed).
Move the memzone allocation counter for ENA_MEM_ALLOC_COHERENT there so
that all processes may utilize it.

Signed-off-by: Stanislaw Kardach <k...@semihalf.com>
Reviewed-by: Michal Krawczyk <m...@semihalf.com>
Reviewed-by: Igor Chauskin <igo...@amazon.com>
Reviewed-by: Shay Agroskin <shay...@amazon.com>
---
 drivers/net/ena/base/ena_plat_dpdk.h |  6 ++--
 drivers/net/ena/ena_ethdev.c         | 46 +++++++++++++++++++++++++++-
 drivers/net/ena/ena_ethdev.h         |  8 +++++
 3 files changed, 56 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ena/base/ena_plat_dpdk.h 
b/drivers/net/ena/base/ena_plat_dpdk.h
index 2e2cd0736c..1282c05f59 100644
--- a/drivers/net/ena/base/ena_plat_dpdk.h
+++ b/drivers/net/ena/base/ena_plat_dpdk.h
@@ -206,7 +206,7 @@ typedef struct {
  * Each rte_memzone should have unique name.
  * To satisfy it, count number of allocations and add it to name.
  */
-extern rte_atomic64_t ena_alloc_cnt;
+extern rte_atomic64_t *ena_alloc_cnt;
 
 #define ENA_MEM_ALLOC_COHERENT_ALIGNED(                                        
       \
        dmadev, size, virt, phys, mem_handle, alignment)                       \
@@ -216,7 +216,7 @@ extern rte_atomic64_t ena_alloc_cnt;
                if (size > 0) {                                                \
                        char z_name[RTE_MEMZONE_NAMESIZE];                     \
                        snprintf(z_name, sizeof(z_name), "ena_alloc_%"PRIi64"",\
-                               rte_atomic64_add_return(&ena_alloc_cnt, 1));   \
+                               rte_atomic64_add_return(ena_alloc_cnt, 1));    \
                        mz = rte_memzone_reserve_aligned(z_name, size,         \
                                        SOCKET_ID_ANY, RTE_MEMZONE_IOVA_CONTIG,\
                                        alignment);                            \
@@ -246,7 +246,7 @@ extern rte_atomic64_t ena_alloc_cnt;
                if (size > 0) {                                                \
                        char z_name[RTE_MEMZONE_NAMESIZE];                     \
                        snprintf(z_name, sizeof(z_name), "ena_alloc_%"PRIi64"",\
-                               rte_atomic64_add_return(&ena_alloc_cnt, 1));   \
+                               rte_atomic64_add_return(ena_alloc_cnt, 1));    \
                        mz = rte_memzone_reserve_aligned(z_name, size,         \
                                node, RTE_MEMZONE_IOVA_CONTIG, alignment);     \
                        mem_handle = mz;                                       \
diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c
index 5d107775f4..0780e2fee2 100644
--- a/drivers/net/ena/ena_ethdev.c
+++ b/drivers/net/ena/ena_ethdev.c
@@ -83,11 +83,15 @@ struct ena_stats {
 /* Device arguments */
 #define ENA_DEVARG_LARGE_LLQ_HDR "large_llq_hdr"
 
+#define ENA_MZ_SHARED_DATA "ena_shared_data"
+
 /*
  * Each rte_memzone should have unique name.
  * To satisfy it, count number of allocation and add it to name.
  */
-rte_atomic64_t ena_alloc_cnt;
+rte_atomic64_t *ena_alloc_cnt;
+
+struct ena_shared_data *ena_shared_data;
 
 static const struct ena_stats ena_stats_global_strings[] = {
        ENA_STAT_GLOBAL_ENTRY(wd_expired),
@@ -1752,6 +1756,42 @@ static uint32_t ena_calc_max_io_queue_num(struct 
ena_com_dev *ena_dev,
        return max_num_io_queues;
 }
 
+static void ena_prepare_shared_data(struct ena_shared_data *shared_data)
+{
+       memset(shared_data, 0, sizeof(*shared_data));
+}
+
+static int ena_shared_data_init(void)
+{
+       const struct rte_memzone *mz;
+
+       if (ena_shared_data != NULL)
+               return 0;
+
+       if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
+               /* Allocate shared memory. */
+               mz = rte_memzone_reserve(ENA_MZ_SHARED_DATA,
+                                        sizeof(*ena_shared_data),
+                                        SOCKET_ID_ANY, 0);
+               if (mz == NULL) {
+                       PMD_INIT_LOG(CRIT, "Cannot allocate ena shared data");
+                       return -rte_errno;
+               }
+               ena_prepare_shared_data(mz->addr);
+       } else {
+               /* Lookup allocated shared memory. */
+               mz = rte_memzone_lookup(ENA_MZ_SHARED_DATA);
+               if (mz == NULL) {
+                       PMD_INIT_LOG(CRIT, "Cannot attach ena shared data");
+                       return -rte_errno;
+               }
+       }
+       ena_shared_data = mz->addr;
+       /* Setup ENA_MEM memzone name counter. */
+       ena_alloc_cnt = &ena_shared_data->mz_alloc_cnt;
+       return 0;
+}
+
 static int eth_ena_dev_init(struct rte_eth_dev *eth_dev)
 {
        struct ena_calc_queue_size_ctx calc_queue_ctx = { 0 };
@@ -1773,6 +1813,10 @@ static int eth_ena_dev_init(struct rte_eth_dev *eth_dev)
        eth_dev->tx_pkt_burst = &eth_ena_xmit_pkts;
        eth_dev->tx_pkt_prepare = &eth_ena_prep_pkts;
 
+       rc = ena_shared_data_init();
+       if (rc != 0)
+               return rc;
+
        if (rte_eal_process_type() != RTE_PROC_PRIMARY)
                return 0;
 
diff --git a/drivers/net/ena/ena_ethdev.h b/drivers/net/ena/ena_ethdev.h
index ae235897ee..e8858c6118 100644
--- a/drivers/net/ena/ena_ethdev.h
+++ b/drivers/net/ena/ena_ethdev.h
@@ -207,6 +207,14 @@ struct ena_offloads {
        bool rx_csum_supported;
 };
 
+/* Holds data shared between all instances of ENA PMD. */
+struct ena_shared_data {
+       /* Each rte_memzone should have unique name.
+        * To satisfy it, count number of allocation and add it to name.
+        */
+       rte_atomic64_t mz_alloc_cnt;
+};
+
 /* board specific private data structure */
 struct ena_adapter {
        /* OS defined structs */
-- 
2.25.1