DPDK patches and discussions
 help / color / mirror / Atom feed
From: David Marchand <david.marchand@redhat.com>
To: dev@dpdk.org
Cc: thomas@monjalon.net, Vijay Kumar Srivastava <vsrivast@xilinx.com>
Subject: [PATCH v3 13/16] vdpa/sfc: inherit lock annotations
Date: Tue,  4 Apr 2023 14:48:37 +0200	[thread overview]
Message-ID: <20230404124840.1898-14-david.marchand@redhat.com> (raw)
In-Reply-To: <20230404124840.1898-1-david.marchand@redhat.com>

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.marchand@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 e88c7eeaa6..f63af7d478 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


  parent reply	other threads:[~2023-04-04 12:50 UTC|newest]

Thread overview: 76+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-24  8:16 [PATCH 00/14] Enable lock annotations on most libraries and drivers David Marchand
2023-02-24  8:16 ` [PATCH 01/14] malloc: rework heap lock handling David Marchand
2023-02-24  8:16 ` [PATCH 02/14] mem: rework malloc heap init David Marchand
2023-02-24  8:16 ` [PATCH 03/14] mem: annotate shared memory config locks David Marchand
2023-02-24  8:16 ` [PATCH 04/14] hash: annotate cuckoo hash lock David Marchand
2023-02-24  8:16 ` [PATCH 05/14] graph: annotate graph lock David Marchand
2023-02-24  8:16 ` [PATCH 06/14] drivers: inherit lock annotations for Intel drivers David Marchand
2023-02-24  8:16 ` [PATCH 07/14] net/cxgbe: inherit lock annotations David Marchand
2023-02-24  8:16 ` [PATCH 08/14] net/fm10k: annotate mailbox lock David Marchand
2023-02-24  8:16 ` [PATCH 09/14] net/sfc: rework locking in proxy code David Marchand
2023-02-24  8:16 ` [PATCH 10/14] net/sfc: inherit lock annotations David Marchand
2023-02-24  8:16 ` [PATCH 11/14] net/virtio: annotate lock for guest announce David Marchand
2023-02-24  8:16 ` [PATCH 12/14] raw/ifpga: inherit lock annotations David Marchand
2023-02-24  8:16 ` [PATCH 13/14] vdpa/sfc: " David Marchand
2023-02-24  8:16 ` [PATCH 14/14] enable lock check David Marchand
2023-02-24 15:11 ` [PATCH v2 00/20] Enable lock annotations on most libraries and drivers David Marchand
2023-02-24 15:11   ` [PATCH v2 01/20] malloc: rework heap lock handling David Marchand
2023-02-24 15:11   ` [PATCH v2 02/20] mem: rework malloc heap init David Marchand
2023-02-24 15:11   ` [PATCH v2 03/20] mem: annotate shared memory config locks David Marchand
2023-02-24 15:11   ` [PATCH v2 04/20] hash: annotate cuckoo hash lock David Marchand
2023-02-24 15:11   ` [PATCH v2 05/20] graph: annotate graph lock David Marchand
2023-02-24 15:11   ` [PATCH v2 06/20] drivers: inherit lock annotations for Intel drivers David Marchand
2023-02-24 15:11   ` [PATCH v2 07/20] net/cxgbe: inherit lock annotations David Marchand
2023-02-24 15:11   ` [PATCH v2 08/20] net/fm10k: annotate mailbox lock David Marchand
2023-02-24 15:11   ` [PATCH v2 09/20] net/sfc: rework locking in proxy code David Marchand
2023-02-24 15:11   ` [PATCH v2 10/20] net/sfc: inherit lock annotations David Marchand
2023-02-24 15:11   ` [PATCH v2 11/20] net/virtio: annotate lock for guest announce David Marchand
2023-02-27  2:05     ` Xia, Chenbo
2023-02-27  8:24       ` David Marchand
2023-02-27 16:28         ` Maxime Coquelin
2023-02-28  2:45           ` Xia, Chenbo
2023-03-02  9:26           ` David Marchand
2023-03-02  9:28             ` Maxime Coquelin
2023-03-02 12:35               ` David Marchand
2023-02-24 15:11   ` [PATCH v2 12/20] raw/ifpga: inherit lock annotations David Marchand
2023-02-27  6:29     ` Xu, Rosen
2023-02-27  7:15       ` Huang, Wei
2023-02-24 15:11   ` [PATCH v2 13/20] vdpa/sfc: " David Marchand
2023-02-24 15:11   ` [PATCH v2 14/20] ipc: annotate pthread mutex David Marchand
2023-02-24 15:11   ` [PATCH v2 15/20] ethdev: " David Marchand
2023-02-24 15:11   ` [PATCH v2 16/20] net/failsafe: fix mutex locking David Marchand
2023-02-24 15:35     ` Gaëtan Rivet
2023-02-24 15:11   ` [PATCH v2 17/20] net/failsafe: annotate pthread mutex David Marchand
2023-02-24 15:11   ` [PATCH v2 18/20] net/hinic: " David Marchand
2023-02-24 15:11   ` [PATCH v2 19/20] eal/windows: disable lock check on alarm code David Marchand
2023-02-24 15:11   ` [PATCH v2 20/20] enable lock check David Marchand
2023-02-27  2:32     ` Xia, Chenbo
2023-02-24 15:58   ` [PATCH v2 00/20] Enable lock annotations on most libraries and drivers Gaëtan Rivet
2023-02-25 10:16     ` David Marchand
2023-02-27 16:12       ` Gaëtan Rivet
2023-03-02  8:52         ` David Marchand
2023-04-03 10:52           ` David Marchand
2023-04-03 15:03             ` Tyler Retzlaff
2023-04-03 15:36             ` Tyler Retzlaff
2023-04-04  7:45               ` David Marchand
2023-04-04 12:48 ` [PATCH v3 00/16] " David Marchand
2023-04-04 12:48   ` [PATCH v3 01/16] malloc: rework heap destroy David Marchand
2023-04-04 12:48   ` [PATCH v3 02/16] mem: rework malloc heap init David Marchand
2023-04-04 12:48   ` [PATCH v3 03/16] mem: annotate shared memory config locks David Marchand
2023-04-04 12:48   ` [PATCH v3 04/16] hash: annotate cuckoo hash lock David Marchand
2023-04-04 12:48   ` [PATCH v3 05/16] graph: annotate graph lock David Marchand
2023-04-04 12:48   ` [PATCH v3 06/16] drivers: inherit lock annotations for Intel drivers David Marchand
2023-04-04 12:48   ` [PATCH v3 07/16] net/cxgbe: inherit lock annotations David Marchand
2023-04-04 12:48   ` [PATCH v3 08/16] net/fm10k: annotate mailbox lock David Marchand
2023-04-04 12:48   ` [PATCH v3 09/16] net/sfc: rework locking in proxy code David Marchand
2023-04-04 12:48   ` [PATCH v3 10/16] net/sfc: inherit lock annotations David Marchand
2023-04-04 12:48   ` [PATCH v3 11/16] net/virtio: rework guest announce notify helper David Marchand
2023-04-04 12:48   ` [PATCH v3 12/16] raw/ifpga: inherit lock annotations David Marchand
2023-04-04 12:48   ` David Marchand [this message]
2023-04-04 12:48   ` [PATCH v3 14/16] net/failsafe: fix mutex locking David Marchand
2023-04-04 12:48   ` [PATCH v3 15/16] eal/windows: disable lock check on alarm code David Marchand
2023-04-04 16:08     ` Tyler Retzlaff
2023-04-04 21:02     ` Dmitry Kozlyuk
2023-04-04 12:48   ` [PATCH v3 16/16] enable lock check David Marchand
2023-04-11  3:21     ` Sachin Saxena (OSS)
2023-04-23 20:09   ` [PATCH v3 00/16] Enable lock annotations on most libraries and drivers Thomas Monjalon

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230404124840.1898-14-david.marchand@redhat.com \
    --to=david.marchand@redhat.com \
    --cc=dev@dpdk.org \
    --cc=thomas@monjalon.net \
    --cc=vsrivast@xilinx.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).