From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750878AbcIORyW (ORCPT ); Thu, 15 Sep 2016 13:54:22 -0400 Received: from mxout1.idt.com ([157.165.5.25]:50265 "EHLO mxout1.idt.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750772AbcIORyO (ORCPT ); Thu, 15 Sep 2016 13:54:14 -0400 From: Alexandre Bounine To: Andrew Morton Cc: Alexandre Bounine , Alexey Khoroshilov , linux-kernel@vger.kernel.org Subject: [PATCH 1/1] rapidio/rio_cm: avoid GFP_KERNEL in atomic context Date: Thu, 15 Sep 2016 13:54:02 -0400 Message-Id: <20160915175402.10122-1-alexandre.bounine@idt.com> X-Mailer: git-send-email 2.9.0 X-TM-AS-MML: disable Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org As reported by Alexey Khoroshilov (see https://lkml.org/lkml/2016/9/9/737): riocm_send_close() is called from rio_cm_shutdown() under spin_lock_bh(idr_lock), but riocm_send_close() uses a GFP_KERNEL allocation. Fix by taking riocm_send_close() outside of spinlock protected code. Reported-by: Alexey Khoroshilov Cc: Alexey Khoroshilov Cc: linux-kernel@vger.kernel.org Signed-off-by: Alexandre Bounine --- drivers/rapidio/rio_cm.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/drivers/rapidio/rio_cm.c b/drivers/rapidio/rio_cm.c index 3226983..0e91335 100644 --- a/drivers/rapidio/rio_cm.c +++ b/drivers/rapidio/rio_cm.c @@ -2242,17 +2242,31 @@ static int rio_cm_shutdown(struct notifier_block *nb, unsigned long code, { struct rio_channel *ch; unsigned int i; + LIST_HEAD(list); riocm_debug(EXIT, "."); + /* + * If there are any channels left in connected state send + * close notification to the connection partner. + * First build a list of channels that require a closing + * notification because function riocm_send_close() should + * be called outside of spinlock protected code. + */ spin_lock_bh(&idr_lock); idr_for_each_entry(&ch_idr, ch, i) { - riocm_debug(EXIT, "close ch %d", ch->id); - if (ch->state == RIO_CM_CONNECTED) - riocm_send_close(ch); + if (ch->state == RIO_CM_CONNECTED) { + riocm_debug(EXIT, "close ch %d", ch->id); + idr_remove(&ch_idr, ch->id); + list_add(&ch->ch_node, &list); + } } spin_unlock_bh(&idr_lock); + if (!list_empty(&list)) + list_for_each_entry(ch, &list, ch_node) + riocm_send_close(ch); + return NOTIFY_DONE; } -- 2.9.0