From patchwork Fri Jun 19 15:13:32 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 28914 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id 8CCB8B7205 for ; Sat, 20 Jun 2009 01:13:52 +1000 (EST) Received: by ozlabs.org (Postfix) id 73540DDDA0; Sat, 20 Jun 2009 01:13:52 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 03B2CDDD1C for ; Sat, 20 Jun 2009 01:13:52 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752100AbZFSPNm (ORCPT ); Fri, 19 Jun 2009 11:13:42 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751498AbZFSPNm (ORCPT ); Fri, 19 Jun 2009 11:13:42 -0400 Received: from smtp.wellnetcz.com ([212.24.148.102]:59882 "EHLO smtp.wellnetcz.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751428AbZFSPNl (ORCPT ); Fri, 19 Jun 2009 11:13:41 -0400 Received: from localhost.localdomain ([88.208.94.142]) by smtp.wellnetcz.com (8.14.1/8.14.1) with ESMTP id n5JFtIKm014123; Fri, 19 Jun 2009 17:55:19 +0200 From: Jiri Slaby To: linux-driver@qlogic.com Cc: davem@davemloft.net, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Jiri Slaby Subject: [PATCH 1/1] Net: qla3xxx, remove sleeping in atomic Date: Fri, 19 Jun 2009 17:13:32 +0200 Message-Id: <1245424412-15106-1-git-send-email-jirislaby@gmail.com> X-Mailer: git-send-email 1.6.3.2 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi, we've found this sleep-inside-spinlock. The fix below totally untested, please review carefully. --- We cannot sleep in ql_reset_work under spinlock, unlock before sleep, relock after. Signed-off-by: Jiri Slaby --- drivers/net/qla3xxx.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/net/qla3xxx.c b/drivers/net/qla3xxx.c index 8a823ec..bbc6d4d 100644 --- a/drivers/net/qla3xxx.c +++ b/drivers/net/qla3xxx.c @@ -3837,7 +3837,9 @@ static void ql_reset_work(struct work_struct *work) 16) | ISP_CONTROL_RI)); } + spin_unlock_irqrestore(&qdev->hw_lock, hw_flags); ssleep(1); + spin_lock_irqsave(&qdev->hw_lock, hw_flags); } while (--max_wait_time); spin_unlock_irqrestore(&qdev->hw_lock, hw_flags);