From: Doug Oucharek <doucharek@cray.com>
To: NeilBrown <neilb@suse.com>
Cc: Doug Oucharek <dougso@me.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
"devel@driverdev.osuosl.org" <devel@driverdev.osuosl.org>,
Oleg Drokin <oleg.drokin@intel.com>,
"Andreas Dilger" <andreas.dilger@intel.com>,
James Simmons <jsimmons@infradead.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
"Lustre Development List" <lustre-devel@lists.lustre.org>
Subject: Re: [lustre-devel] [PATCH] staging: lustre: o2iblnd: Fix crash in kiblnd_handle_early_rxs()
Date: Fri, 11 May 2018 02:30:25 +0000 [thread overview]
Message-ID: <43C26C25-BF67-4CDA-90FA-65F3208FD274@cray.com> (raw)
In-Reply-To: <87a7t79fnk.fsf@notabene.neil.brown.name>
[-- Attachment #1: Type: text/plain, Size: 2529 bytes --]
I did a v2 of this patch already.
Changing to the safe version of the list macros is a mixed bag.
Doug
On May 10, 2018, at 5:53 PM, NeilBrown <neilb@suse.com<mailto:neilb@suse.com>> wrote:
On Wed, May 09 2018, Doug Oucharek wrote:
Under upstream staging commit 5a2ca43fa54f561c252c2, the list handling
code in kiblnd_handle_early_rxs() got changed to list_for_each_safe().
That protects against the current thread from deleting the current entry
it is looking at. It does not protect against another thread from deleting
the next item in the list (which the tmp variable points to). The way this
routine holds then releases a lock opens the door to other threads doing
just that.
This patch reverts this commit on this routine.
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-9886
Signed-off-by: Doug Oucharek <dougso@me.com<mailto:dougso@me.com>>
---
drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c
index 32fa8ca..6148fbb 100644
--- a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c
+++ b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c
@@ -1965,13 +1965,14 @@ static int kiblnd_resolve_addr(struct rdma_cm_id *cmid,
{
unsigned long flags;
struct kib_rx *rx;
- struct kib_rx *tmp;
LASSERT(!in_interrupt());
LASSERT(conn->ibc_state >= IBLND_CONN_ESTABLISHED);
write_lock_irqsave(&kiblnd_data.kib_global_lock, flags);
- list_for_each_entry_safe(rx, tmp, &conn->ibc_early_rxs, rx_list) {
+ while (!list_empty(&conn->ibc_early_rxs)) {
+ rx = list_entry(conn->ibc_early_rxs.next,
+ kib_rx_t, rx_list);
Should be:
struct kib_tx
Otherwise,
Reviewed-by: NeilBrown <neilb@suse.com<mailto:neilb@suse.com>>
Those "convert lots of list_for_each" things really do need
careful review, don't they :-(
Thanks,
NeilBrown
list_del(&rx->rx_list);
write_unlock_irqrestore(&kiblnd_data.kib_global_lock, flags);
--
1.8.3.1
_______________________________________________
lustre-devel mailing list
lustre-devel@lists.lustre.org<mailto:lustre-devel@lists.lustre.org>
http://lists.lustre.org/listinfo.cgi/lustre-devel-lustre.org
_______________________________________________
lustre-devel mailing list
lustre-devel@lists.lustre.org<mailto:lustre-devel@lists.lustre.org>
http://lists.lustre.org/listinfo.cgi/lustre-devel-lustre.org
[-- Attachment #2: Type: text/html, Size: 16027 bytes --]
prev parent reply other threads:[~2018-05-11 2:30 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-10 5:37 [PATCH] staging: lustre: o2iblnd: Fix crash in kiblnd_handle_early_rxs() Doug Oucharek
2018-05-10 17:39 ` kbuild test robot
2018-05-10 19:15 ` kbuild test robot
2018-05-11 0:53 ` [lustre-devel] " NeilBrown
2018-05-11 2:30 ` Doug Oucharek [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=43C26C25-BF67-4CDA-90FA-65F3208FD274@cray.com \
--to=doucharek@cray.com \
--cc=andreas.dilger@intel.com \
--cc=devel@driverdev.osuosl.org \
--cc=dougso@me.com \
--cc=gregkh@linuxfoundation.org \
--cc=jsimmons@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lustre-devel@lists.lustre.org \
--cc=neilb@suse.com \
--cc=oleg.drokin@intel.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).