Due to clang limitation, inline helpers don't inherit lock annotations
from the EAL lock API.
Replace them with macros.
sfc_vdpa_ops.c was relying on an implicit cast of the dev_handle to a
vdpa adapter object. Add an explicit conversion.
Signed-off-by: David Marchand <david.march...@redhat.com>
---
drivers/vdpa/sfc/sfc_vdpa.h | 41 +++++----------------------------
drivers/vdpa/sfc/sfc_vdpa_ops.c | 14 +++++------
2 files changed, 13 insertions(+), 42 deletions(-)
diff --git a/drivers/vdpa/sfc/sfc_vdpa.h b/drivers/vdpa/sfc/sfc_vdpa.h
index b25eb3a5fe..2b843e563d 100644
--- a/drivers/vdpa/sfc/sfc_vdpa.h
+++ b/drivers/vdpa/sfc/sfc_vdpa.h
@@ -122,40 +122,11 @@ sfc_vdpa_adapter_by_dev_handle(void *dev_handle)
* Add wrapper functions to acquire/release lock to be able to remove or
* change the lock in one place.
*/
-static inline void
-sfc_vdpa_adapter_lock_init(struct sfc_vdpa_adapter *sva)
-{
- rte_spinlock_init(&sva->lock);
-}
-
-static inline int
-sfc_vdpa_adapter_is_locked(struct sfc_vdpa_adapter *sva)
-{
- return rte_spinlock_is_locked(&sva->lock);
-}
-
-static inline void
-sfc_vdpa_adapter_lock(struct sfc_vdpa_adapter *sva)
-{
- rte_spinlock_lock(&sva->lock);
-}
-
-static inline int
-sfc_vdpa_adapter_trylock(struct sfc_vdpa_adapter *sva)
-{
- return rte_spinlock_trylock(&sva->lock);
-}
-
-static inline void
-sfc_vdpa_adapter_unlock(struct sfc_vdpa_adapter *sva)
-{
- rte_spinlock_unlock(&sva->lock);
-}
-
-static inline void
-sfc_vdpa_adapter_lock_fini(__rte_unused struct sfc_vdpa_adapter *sva)
-{
- /* Just for symmetry of the API */
-}
+#define sfc_vdpa_adapter_lock_init(sva) rte_spinlock_init(&(sva)->lock)
+#define sfc_vdpa_adapter_is_locked(sva) rte_spinlock_is_locked(&(sva)->lock)
+#define sfc_vdpa_adapter_lock(sva) rte_spinlock_lock(&(sva)->lock)
+#define sfc_vdpa_adapter_trylock(sva) rte_spinlock_trylock(&(sva)->lock)
+#define sfc_vdpa_adapter_unlock(sva) rte_spinlock_unlock(&(sva)->lock)
+#define sfc_vdpa_adapter_lock_fini(sva) RTE_SET_USED(sva)
#endif /* _SFC_VDPA_H */
diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.c b/drivers/vdpa/sfc/sfc_vdpa_ops.c
index 6401d4e16f..afa6b7e8ef 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_ops.c
+++ b/drivers/vdpa/sfc/sfc_vdpa_ops.c
@@ -577,7 +577,7 @@ sfc_vdpa_notify_ctrl(void *arg)
if (ops_data == NULL)
return NULL;
- sfc_vdpa_adapter_lock(ops_data->dev_handle);
+
sfc_vdpa_adapter_lock(sfc_vdpa_adapter_by_dev_handle(ops_data->dev_handle));
vid = ops_data->vid;
@@ -586,7 +586,7 @@ sfc_vdpa_notify_ctrl(void *arg)
"vDPA (%s): Notifier could not get configured",
ops_data->vdpa_dev->device->name);
- sfc_vdpa_adapter_unlock(ops_data->dev_handle);
+
sfc_vdpa_adapter_unlock(sfc_vdpa_adapter_by_dev_handle(ops_data->dev_handle));
return NULL;
}
@@ -637,7 +637,7 @@ sfc_vdpa_dev_config(int vid)
ops_data->vid = vid;
- sfc_vdpa_adapter_lock(ops_data->dev_handle);
+
sfc_vdpa_adapter_lock(sfc_vdpa_adapter_by_dev_handle(ops_data->dev_handle));
sfc_vdpa_log_init(ops_data->dev_handle, "configuring");
rc = sfc_vdpa_configure(ops_data);
@@ -653,7 +653,7 @@ sfc_vdpa_dev_config(int vid)
if (rc != 0)
goto fail_vdpa_notify;
- sfc_vdpa_adapter_unlock(ops_data->dev_handle);
+
sfc_vdpa_adapter_unlock(sfc_vdpa_adapter_by_dev_handle(ops_data->dev_handle));
sfc_vdpa_log_init(ops_data->dev_handle, "done");
@@ -666,7 +666,7 @@ sfc_vdpa_dev_config(int vid)
sfc_vdpa_close(ops_data);
fail_vdpa_config:
- sfc_vdpa_adapter_unlock(ops_data->dev_handle);
+
sfc_vdpa_adapter_unlock(sfc_vdpa_adapter_by_dev_handle(ops_data->dev_handle));
return -1;
}
@@ -688,7 +688,7 @@ sfc_vdpa_dev_close(int vid)
return -1;
}
- sfc_vdpa_adapter_lock(ops_data->dev_handle);
+
sfc_vdpa_adapter_lock(sfc_vdpa_adapter_by_dev_handle(ops_data->dev_handle));
if (ops_data->is_notify_thread_started == true) {
void *status;
ret = pthread_cancel(ops_data->notify_tid);
@@ -710,7 +710,7 @@ sfc_vdpa_dev_close(int vid)
sfc_vdpa_stop(ops_data);
sfc_vdpa_close(ops_data);
- sfc_vdpa_adapter_unlock(ops_data->dev_handle);
+
sfc_vdpa_adapter_unlock(sfc_vdpa_adapter_by_dev_handle(ops_data->dev_handle));
return 0;
}
--
2.39.2
