From patchwork Tue Mar 30 10:51:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sreekanth Reddy X-Patchwork-Id: 412421 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=-17.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,MIME_NO_TEXT, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 8D525C433DB for ; Tue, 30 Mar 2021 10:48:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 574DB61490 for ; Tue, 30 Mar 2021 10:48:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231770AbhC3Ks0 (ORCPT ); Tue, 30 Mar 2021 06:48:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53814 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231857AbhC3KsD (ORCPT ); Tue, 30 Mar 2021 06:48:03 -0400 Received: from mail-pj1-x102c.google.com (mail-pj1-x102c.google.com [IPv6:2607:f8b0:4864:20::102c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5E95BC061762 for ; Tue, 30 Mar 2021 03:48:03 -0700 (PDT) Received: by mail-pj1-x102c.google.com with SMTP id cl21-20020a17090af695b02900c61ac0f0e9so1107323pjb.1 for ; Tue, 30 Mar 2021 03:48:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:mime-version; bh=ekhA8tdKqLju1aGSp/kpdFTWf1JQS7q2orLyEXcjhVM=; b=VbRWziAG1IwtHmc8tsncvfWjYxiCFN0TmVGWKrCkEU/wcGRYUdTgSZ6QQa9lrUqMbb Wktt0TPerbh+QV6CpJBn/36hWeEaQQ0vzz60+JX0z7n28XHRkfQjw+tHMUFe0ErW/spt O8oozk1ofF9oj1vXHIpeljukYwP/cvQhU/nGU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version; bh=ekhA8tdKqLju1aGSp/kpdFTWf1JQS7q2orLyEXcjhVM=; b=DM3Y0B3fqj3wl1u8E0sJglKGNPgs/qFOvx5MtTxtciZULQABb8fuY3J+YusAnpY0Wf EwJ90RAyUGJ0I/G/pH7w4WPcOkVCGP/8WA4+/lcvYPqP7n4dQJsSmwuIMFSqvnAsqdoh EkiG8LjmIBoSFFYkaZc0zBkJ4A5ZxTRp1qnQhwfzWDTGypK7sURoku7pnuTbAZQOK96k 3BA0pV2dYuTX47mwAXpd29slDrH+QoRBZpGy7DqI7ngCSiT/IX0ASq6fOVrg8/m7MyPQ A2xiR3dRI/LF68stxCC6Wq8U8lv3I/38iDlY098FRVr2sDAG4IPbhUj1ZQhHmIFsUgzB O/OQ== X-Gm-Message-State: AOAM5301W27wK68DFR+RmYSshJZ64fhz356wz8wEffMAFISoyExMk9aD zh7ERoFhAR7lbQ72Zmom6xfaew== X-Google-Smtp-Source: ABdhPJxecfUoDK8ZCVyMZzfOMwxP/hKPXONENST2UZbgnx7+M9IqSAlH9jk6rkWuhVEcu3bftAibTw== X-Received: by 2002:a17:90a:e516:: with SMTP id t22mr3668624pjy.39.1617101282803; Tue, 30 Mar 2021 03:48:02 -0700 (PDT) Received: from dhcp-10-123-20-36.dhcp.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id i13sm19324912pgi.3.2021.03.30.03.47.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Mar 2021 03:48:02 -0700 (PDT) From: Sreekanth Reddy To: martin.petersen@oracle.com Cc: linux-scsi@vger.kernel.org, sathya.prakash@broadcom.com, suganath-prabu.subramani@broadcom.com, Sreekanth Reddy , stable@vger.kernel.org Subject: [PATCH] mpt3sas: Block PCI cfg access from userspace during reset Date: Tue, 30 Mar 2021 16:21:37 +0530 Message-Id: <20210330105137.20728-1-sreekanth.reddy@broadcom.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org While diag reset is in progress, there is short duration where all access to controller's PCI config space from the host needs to be blocked. This is due to a hardware limitation of IOC controllers. With this patch, driver will block all access to controller's config space from userland applications by calling pci_cfg_access_lock() while diag reset is in progress and unlocking after controller comes back to ready state. Cc: stable@vger.kernel.org #v5.4.108+ Signed-off-by: Sreekanth Reddy --- drivers/scsi/mpt3sas/mpt3sas_base.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c index ac0eef975f17..b6beacfd0f62 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_base.c +++ b/drivers/scsi/mpt3sas/mpt3sas_base.c @@ -7252,6 +7252,8 @@ _base_diag_reset(struct MPT3SAS_ADAPTER *ioc) ioc_info(ioc, "sending diag reset !!\n"); + pci_cfg_access_lock(ioc->pdev); + drsprintk(ioc, ioc_info(ioc, "clear interrupts\n")); count = 0; @@ -7342,10 +7344,12 @@ _base_diag_reset(struct MPT3SAS_ADAPTER *ioc) goto out; } + pci_cfg_access_unlock(ioc->pdev); ioc_info(ioc, "diag reset: SUCCESS\n"); return 0; out: + pci_cfg_access_unlock(ioc->pdev); ioc_err(ioc, "diag reset: FAILED\n"); return -EFAULT; }