net/hinic: fix crash in secondary process

Some apps, such as fstack, will use secondary process to access the
memory of eth_dev_ops, and they want to get the info of dev, but hinic
driver does not initialized it when in secondary process.

Fixes: 66f64dd6dc86 ("net/hinic: fix secondary process")
Cc: stable@dpdk.org
Signed-off-by: Guoyang Zhou <zhouguoyang@huawei.com>

diff --git a/drivers/net/hinic/base/hinic_compat.h b/drivers/net/hinic/base/hinic_compat.h
index 6dd210e..aea3320 100644 (file)
--- a/drivers/net/hinic/base/hinic_compat.h
+++ b/drivers/net/hinic/base/hinic_compat.h
@@ -171,6 +171,7 @@ static inline u32 readl(const volatile void *addr)
 #else
 #define CLOCK_TYPE CLOCK_MONOTONIC
 #endif
+#define HINIC_MUTEX_TIMEOUT  10
 
 static inline unsigned long clock_gettime_ms(void)
 {
@@ -225,24 +226,14 @@ static inline int hinic_mutex_destroy(pthread_mutex_t *pthreadmutex)
 static inline int hinic_mutex_lock(pthread_mutex_t *pthreadmutex)
 {
        int err;
+       struct timespec tout;
 
-       err = pthread_mutex_lock(pthreadmutex);
-       if (!err) {
-               return err;
-       } else if (err == EOWNERDEAD) {
-               PMD_DRV_LOG(ERR, "Mutex lock failed. (ErrorNo=%d)", errno);
-#if defined(__GLIBC__)
-#if __GLIBC_PREREQ(2, 12)
-               (void)pthread_mutex_consistent(pthreadmutex);
-#else
-               (void)pthread_mutex_consistent_np(pthreadmutex);
-#endif
-#else
-               (void)pthread_mutex_consistent(pthreadmutex);
-#endif
-       } else {
-               PMD_DRV_LOG(ERR, "Mutex lock failed. (ErrorNo=%d)", errno);
-       }
+       (void)clock_gettime(CLOCK_TYPE, &tout);
+
+       tout.tv_sec += HINIC_MUTEX_TIMEOUT;
+       err = pthread_mutex_timedlock(pthreadmutex, &tout);
+       if (err)
+               PMD_DRV_LOG(ERR, "Mutex lock failed. (ErrorNo=%d)", err);
 
        return err;
 }

diff --git a/drivers/net/hinic/hinic_pmd_ethdev.c b/drivers/net/hinic/hinic_pmd_ethdev.c
index 2352dd1..b5a36a8 100644 (file)
--- a/drivers/net/hinic/hinic_pmd_ethdev.c
+++ b/drivers/net/hinic/hinic_pmd_ethdev.c
@@ -3063,6 +3063,10 @@ static const struct eth_dev_ops hinic_pmd_vf_ops = {
        .flow_ops_get                  = hinic_dev_flow_ops_get,
 };
 
+static const struct eth_dev_ops hinic_dev_sec_ops = {
+       .dev_infos_get                 = hinic_dev_infos_get,
+};
+
 static int hinic_func_init(struct rte_eth_dev *eth_dev)
 {
        struct rte_pci_device *pci_dev;
@@ -3077,6 +3081,7 @@ static int hinic_func_init(struct rte_eth_dev *eth_dev)
 
        /* EAL is SECONDARY and eth_dev is already created */
        if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
+               eth_dev->dev_ops = &hinic_dev_sec_ops;
                PMD_DRV_LOG(INFO, "Initialize %s in secondary process",
                            eth_dev->data->name);