From: Amol Grover <frextrite@gmail.com>
To: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: "Paul E . McKenney" <paulmck@kernel.org>,
linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org,
target-devel@vger.kernel.org,
Joel Fernandes <joel@joelfernandes.org>,
linux-kernel-mentees@lists.linuxfoundation.org
Subject: [Linux-kernel-mentees] [PATCH v2 3/3] drivers: target: tcm_fc: tfc_sess: Pass lockdep expression to RCU lists
Date: Fri, 10 Jan 2020 22:35:59 +0530 [thread overview]
Message-ID: <20200110170558.23466-3-frextrite@gmail.com> (raw)
In-Reply-To: <20200110170558.23466-1-frextrite@gmail.com>
head is traversed with hlist_for_each_entry_rcu
outside an RCU read-side critical section but under the
protection of ft_lport_lock.
Hence, add the corresponding lockdep expression to the list traversal
primitive to silence false-positive lockdep warnings, and
harden RCU lists.
Add macro for the corresponding lockdep expression to make the code
clean and concise.
Signed-off-by: Amol Grover <frextrite@gmail.com>
---
drivers/target/tcm_fc/tfc_sess.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/drivers/target/tcm_fc/tfc_sess.c b/drivers/target/tcm_fc/tfc_sess.c
index 4fd6a1de947c..8e9598010fb9 100644
--- a/drivers/target/tcm_fc/tfc_sess.c
+++ b/drivers/target/tcm_fc/tfc_sess.c
@@ -32,6 +32,9 @@
(lport)->host->host_no, \
(lport)->port_id, ##args )
+#define ft_lport_lock_held() \
+ lockdep_is_held(&ft_lport_lock)
+
static void ft_sess_delete_all(struct ft_tport *);
/*
@@ -45,7 +48,7 @@ static struct ft_tport *ft_tport_get(struct fc_lport *lport)
int i;
tport = rcu_dereference_protected(lport->prov[FC_TYPE_FCP],
- lockdep_is_held(&ft_lport_lock));
+ ft_lport_lock_held());
if (tport && tport->tpg)
return tport;
@@ -170,7 +173,7 @@ static struct ft_sess *ft_sess_get(struct fc_lport *lport, u32 port_id)
}
head = &tport->hash[ft_sess_hash(port_id)];
- hlist_for_each_entry_rcu(sess, head, hash) {
+ hlist_for_each_entry_rcu(sess, head, hash, ft_lport_lock_held()) {
if (sess->port_id == port_id) {
kref_get(&sess->kref);
rcu_read_unlock();
@@ -215,7 +218,7 @@ static struct ft_sess *ft_sess_create(struct ft_tport *tport, u32 port_id,
ft_format_wwn(&initiatorname[0], TRANSPORT_IQN_LEN, rdata->ids.port_name);
head = &tport->hash[ft_sess_hash(port_id)];
- hlist_for_each_entry_rcu(sess, head, hash)
+ hlist_for_each_entry_rcu(sess, head, hash, ft_lport_lock_held())
if (sess->port_id == port_id)
return sess;
@@ -264,7 +267,7 @@ static struct ft_sess *ft_sess_delete(struct ft_tport *tport, u32 port_id)
struct ft_sess *sess;
head = &tport->hash[ft_sess_hash(port_id)];
- hlist_for_each_entry_rcu(sess, head, hash) {
+ hlist_for_each_entry_rcu(sess, head, hash, ft_lport_lock_held()) {
if (sess->port_id == port_id) {
ft_sess_unhash(sess);
return sess;
@@ -291,7 +294,7 @@ static void ft_sess_delete_all(struct ft_tport *tport)
for (head = tport->hash;
head < &tport->hash[FT_SESS_HASH_SIZE]; head++) {
- hlist_for_each_entry_rcu(sess, head, hash) {
+ hlist_for_each_entry_rcu(sess, head, hash, ft_lport_lock_held()) {
ft_sess_unhash(sess);
ft_close_sess(sess); /* release from table */
}
@@ -454,7 +457,7 @@ static void ft_prlo(struct fc_rport_priv *rdata)
mutex_lock(&ft_lport_lock);
tport = rcu_dereference_protected(rdata->local_port->prov[FC_TYPE_FCP],
- lockdep_is_held(&ft_lport_lock));
+ ft_lport_lock_held());
if (!tport) {
mutex_unlock(&ft_lport_lock);
--
2.24.1
_______________________________________________
Linux-kernel-mentees mailing list
Linux-kernel-mentees@lists.linuxfoundation.org
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
prev parent reply other threads:[~2020-01-10 17:07 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-10 17:05 [Linux-kernel-mentees] [PATCH v2 1/3] drivers: target: target_core_device: Pass lockdep expression to RCU lists Amol Grover
2020-01-10 17:05 ` [Linux-kernel-mentees] [PATCH v2 2/3] drivers: target: target_core_tpg: " Amol Grover
2020-01-10 17:05 ` Amol Grover [this message]
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=20200110170558.23466-3-frextrite@gmail.com \
--to=frextrite@gmail.com \
--cc=joel@joelfernandes.org \
--cc=linux-kernel-mentees@lists.linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=paulmck@kernel.org \
--cc=target-devel@vger.kernel.org \
/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).