Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp26828pxk; Tue, 15 Sep 2020 16:46:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwmSAQ2p1V/OHiMpWBNtLYe4zizuDEwZYOcm3qrHOMzQA4Sco1c9aW3Q3NvVxzjyYT9o1yg X-Received: by 2002:a50:f199:: with SMTP id x25mr24246454edl.347.1600213597646; Tue, 15 Sep 2020 16:46:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600213597; cv=none; d=google.com; s=arc-20160816; b=FuGFHl0KzXMZO0wwniG48BCGhSPJbO524b8Ec2WrbFK8BKkeEgaSdJ5ImuuqP5xb25 WylPp7OaIRAgvE+1aXDU8y7P4WfB0TPWvAPEtsk0qoAvA94rgy3OMQx0p52N4OQa+Yax YvZGaw23D9QHz2gKIKUkjxjpnK3KeIrdYT9vJa0XUda3i4pBXtrtg/KydtJMZOV6VkWO ephwCSPKbct1EmwLVTErR1QGta5dbeXV41hMdi09nkAvZvT3wtjD0mMfqkncNId0pXVj 7ZrUlxmHuFjKpQ09wESeOGLb/jqIfe5ZGSAQC32MLr5W5mWlTqDzeBjQ3WkKMJ0NWw8C 0ByA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=kcBvZocLGQn/go3O4QsvYmfG8flINCtFV1gFNuQSjkQ=; b=DKX4Ue1ESV648HllEDN8g7ytSyCjwYmID3vjlkVo+UlT4yH+OtzNCje9mHGXHxKJ5o kAE9ye724NJJ6eJKH1ziH0/FdR8Tu6v6C2heWEPf2PAE1nrsUJrCi25s88OKPf5TYKOq YkqhE9DPCyd7dSyyG0OpPvp0IeZD0HzXB3TIw0f1SFeuN/vjh8Cl65ee27uD270iA4ZD fqqK6q34vr0++VTOYQgzjSa1dD0q2zG0NZXRzmfa1ujm3jmHz3U1Tb44QmFPEk14uZDV Fj2DBCqRs/4lKps6UzA525wAhMWwuPL/kkAeL93aC/HfCs01ZEGlbwteI9G6TupwploS dEmw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ki3DBXnW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b7si10395189edr.520.2020.09.15.16.46.15; Tue, 15 Sep 2020 16:46:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ki3DBXnW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727517AbgIOXnT (ORCPT + 99 others); Tue, 15 Sep 2020 19:43:19 -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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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); -- 2.25.1