From ae865766b334572f114d25c7519984ef8223678f Mon Sep 17 00:00:00 2001 From: Ziyang Xuan Date: Fri, 5 Jul 2019 14:47:47 +0800 Subject: [PATCH] net/hinic: replace spinlock with mutex Using spin lock to protect critical resources of sending mgmt messages. This will make high CPU usage for rte_delay_ms when sending mgmt messages frequently. We can use mutex to protect the critical resources and usleep to reduce CPU usage while keep functioning properly. Signed-off-by: Ziyang Xuan --- drivers/net/hinic/Makefile | 1 + drivers/net/hinic/base/hinic_compat.h | 25 +++++++++++++++++++++++++ drivers/net/hinic/base/hinic_pmd_mgmt.c | 19 ++++++++++++------- drivers/net/hinic/base/hinic_pmd_mgmt.h | 6 ++---- 4 files changed, 40 insertions(+), 11 deletions(-) diff --git a/drivers/net/hinic/Makefile b/drivers/net/hinic/Makefile index 123a6263dc..42b4a78744 100644 --- a/drivers/net/hinic/Makefile +++ b/drivers/net/hinic/Makefile @@ -20,6 +20,7 @@ endif LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring LDLIBS += -lrte_ethdev -lrte_net -lrte_hash LDLIBS += -lrte_bus_pci +LDLIBS += -lpthread EXPORT_MAP := rte_pmd_hinic_version.map diff --git a/drivers/net/hinic/base/hinic_compat.h b/drivers/net/hinic/base/hinic_compat.h index 48643c8d24..f5999477f4 100644 --- a/drivers/net/hinic/base/hinic_compat.h +++ b/drivers/net/hinic/base/hinic_compat.h @@ -7,6 +7,8 @@ #include #include +#include +#include #include #include #include @@ -253,4 +255,27 @@ static inline void hinic_be32_to_cpu(void *data, u32 len) } } +static inline int hinic_mutex_init(pthread_mutex_t *pthreadmutex, + const pthread_mutexattr_t *mattr) +{ + int err; + + err = pthread_mutex_init(pthreadmutex, mattr); + if (unlikely(err)) + PMD_DRV_LOG(ERR, "Fail to initialize mutex, error: %d", err); + + return err; +} + +static inline int hinic_mutex_destroy(pthread_mutex_t *pthreadmutex) +{ + int err; + + err = pthread_mutex_destroy(pthreadmutex); + if (unlikely(err)) + PMD_DRV_LOG(ERR, "Fail to destroy mutex, error: %d", err); + + return err; +} + #endif /* _HINIC_COMPAT_H_ */ diff --git a/drivers/net/hinic/base/hinic_pmd_mgmt.c b/drivers/net/hinic/base/hinic_pmd_mgmt.c index bc18765ff3..a18e567b04 100644 --- a/drivers/net/hinic/base/hinic_pmd_mgmt.c +++ b/drivers/net/hinic/base/hinic_pmd_mgmt.c @@ -342,8 +342,9 @@ static int hinic_pf_to_mgmt_init(struct hinic_hwdev *hwdev) hwdev->pf_to_mgmt = pf_to_mgmt; pf_to_mgmt->hwdev = hwdev; - spin_lock_init(&pf_to_mgmt->async_msg_lock); - spin_lock_init(&pf_to_mgmt->sync_msg_lock); + err = hinic_mutex_init(&pf_to_mgmt->sync_msg_lock, NULL); + if (err) + goto mutex_init_err; err = alloc_msg_buf(pf_to_mgmt); if (err) { @@ -363,6 +364,9 @@ api_cmd_init_err: free_msg_buf(pf_to_mgmt); alloc_msg_buf_err: + hinic_mutex_destroy(&pf_to_mgmt->sync_msg_lock); + +mutex_init_err: kfree(pf_to_mgmt); return err; @@ -378,6 +382,7 @@ static void hinic_pf_to_mgmt_free(struct hinic_hwdev *hwdev) hinic_api_cmd_free(pf_to_mgmt->cmd_chain); free_msg_buf(pf_to_mgmt); + hinic_mutex_destroy(&pf_to_mgmt->sync_msg_lock); kfree(pf_to_mgmt); } @@ -391,7 +396,7 @@ hinic_pf_to_mgmt_sync(struct hinic_hwdev *hwdev, u32 timeo; int err, i; - spin_lock(&pf_to_mgmt->sync_msg_lock); + pthread_mutex_lock(&pf_to_mgmt->sync_msg_lock); SYNC_MSG_ID_INC(pf_to_mgmt); recv_msg = &pf_to_mgmt->recv_resp_msg_from_mgmt; @@ -450,7 +455,7 @@ hinic_pf_to_mgmt_sync(struct hinic_hwdev *hwdev, unlock_sync_msg: if (err && out_size) *out_size = 0; - spin_unlock(&pf_to_mgmt->sync_msg_lock); + pthread_mutex_unlock(&pf_to_mgmt->sync_msg_lock); return err; } @@ -497,13 +502,13 @@ int hinic_msg_to_mgmt_no_ack(void *hwdev, enum hinic_mod_type mod, u8 cmd, return err; } - spin_lock(&pf_to_mgmt->sync_msg_lock); + pthread_mutex_lock(&pf_to_mgmt->sync_msg_lock); err = send_msg_to_mgmt_sync(pf_to_mgmt, mod, cmd, buf_in, in_size, HINIC_MSG_NO_ACK, HINIC_MSG_DIRECT_SEND, MSG_NO_RESP); - spin_unlock(&pf_to_mgmt->sync_msg_lock); + pthread_mutex_unlock(&pf_to_mgmt->sync_msg_lock); return err; } @@ -713,7 +718,7 @@ int hinic_aeq_poll_msg(struct hinic_eq *eq, u32 timeout, void *param) } if (timeout != 0) - rte_delay_ms(1); + usleep(1000); } while (time_before(jiffies, end)); if (err != HINIC_OK) /*poll time out*/ diff --git a/drivers/net/hinic/base/hinic_pmd_mgmt.h b/drivers/net/hinic/base/hinic_pmd_mgmt.h index 23951cb7ec..7804708a77 100644 --- a/drivers/net/hinic/base/hinic_pmd_mgmt.h +++ b/drivers/net/hinic/base/hinic_pmd_mgmt.h @@ -81,10 +81,8 @@ enum comm_pf_to_mgmt_event_state { struct hinic_msg_pf_to_mgmt { struct hinic_hwdev *hwdev; - /* Async cmd can not be scheduling */ - spinlock_t async_msg_lock; - /* spinlock for sync message */ - spinlock_t sync_msg_lock; + /* mutex for sync message */ + pthread_mutex_t sync_msg_lock; void *async_msg_buf; void *sync_msg_buf; -- 2.20.1