From patchwork Tue Sep 15 14:11:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 309644 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5D271C43461 for ; Tue, 15 Sep 2020 23:43:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1BBA12078D for ; Tue, 15 Sep 2020 23:43:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600213382; bh=rkonbVPsr0oZPYkcby95d+DG0vos/txgJ7Bkz/jsP48=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=xr/O+eDDsY1RZPjv+WkOORi05BJP74mx0BtY+HG8Q9/3bo41I1rP2bEtX+Q0r03Ba 78VoGXT0HkUZ//+d/OkI5BqHDjkuETPQp7hZ5AM4HNuzQ6rZY7g77gM6Bytdraa0Ds 6VfN/JObwz4iSEkx9KXfrJwewWW/N0WgvVbVCMy4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727507AbgIOXnA (ORCPT ); Tue, 15 Sep 2020 19:43:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:46456 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727053AbgIOOd4 (ORCPT ); Tue, 15 Sep 2020 10:33:56 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0FD0623C15; Tue, 15 Sep 2020 14:25:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600179908; bh=rkonbVPsr0oZPYkcby95d+DG0vos/txgJ7Bkz/jsP48=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ki3DBXnWPdBftQmCvw5tv+HsIlIFm43M44H9FDH6IHfzWcAMwPmS5xyePE6DCCMNZ 0z/ZO/q/mDChYWbDQQ1KVsBGhfGfI6BEGpqHxdam2ND+03AMXTPW7eX9X6H03TWGra b1BMHjxT9P0xIqWNk1IQnHrdGiarAoCM5HT+R89o= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tomas Henzl , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 5.8 033/177] scsi: mpt3sas: Dont call disable_irq from IRQ poll handler Date: Tue, 15 Sep 2020 16:11:44 +0200 Message-Id: <20200915140655.229076300@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200915140653.610388773@linuxfoundation.org> References: <20200915140653.610388773@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Tomas Henzl [ Upstream commit b614d55b970d08bcac5b0bc15a5526181b3e4459 ] disable_irq() might sleep, replace it with disable_irq_nosync(). For synchronisation 'irq_poll_scheduled' is sufficient Fixes: 320e77acb3 scsi: mpt3sas: Irq poll to avoid CPU hard lockups Link: https://lore.kernel.org/r/20200901145026.12174-1-thenzl@redhat.com Signed-off-by: Tomas Henzl Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/mpt3sas/mpt3sas_base.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c index 96b78fdc6b8a9..a85c9672c6ea3 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_base.c +++ b/drivers/scsi/mpt3sas/mpt3sas_base.c @@ -1732,7 +1732,7 @@ _base_irqpoll(struct irq_poll *irqpoll, int budget) reply_q = container_of(irqpoll, struct adapter_reply_queue, irqpoll); if (reply_q->irq_line_enable) { - disable_irq(reply_q->os_irq); + disable_irq_nosync(reply_q->os_irq); reply_q->irq_line_enable = false; } num_entries = _base_process_reply_queue(reply_q);