From patchwork Thu Oct 25 17:44:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Derrick X-Patchwork-Id: 10656303 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DB05613A9 for ; Thu, 25 Oct 2018 17:52:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CE56D2C2A6 for ; Thu, 25 Oct 2018 17:52:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C274F2C2AC; Thu, 25 Oct 2018 17:52:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 723E32C2A6 for ; Thu, 25 Oct 2018 17:52:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727615AbeJZC0L (ORCPT ); Thu, 25 Oct 2018 22:26:11 -0400 Received: from mga05.intel.com ([192.55.52.43]:1799 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727439AbeJZC0L (ORCPT ); Thu, 25 Oct 2018 22:26:11 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Oct 2018 10:52:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,425,1534834800"; d="scan'208";a="84468283" Received: from unknown (HELO localhost.localdomain.localdomain) ([10.232.117.194]) by orsmga008.jf.intel.com with ESMTP; 25 Oct 2018 10:52:24 -0700 From: Jon Derrick To: Cc: Bjorn Helgaas , Lorenzo Pieralisi , Jon Derrick Subject: [PATCH] PCI/MSI: Prevent MSI/X masking IO to a removed device Date: Thu, 25 Oct 2018 11:44:49 -0600 Message-Id: <1540489489-2622-1-git-send-email-jonathan.derrick@intel.com> X-Mailer: git-send-email 1.8.3.1 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP A removed device won't be able to accept mmio or config cycles setting or clearing MSI/X mask bits. Shortcut this path by preventing the writes and subsequent reads which may result in unsupported requests or completer abort. Signed-off-by: Jon Derrick --- drivers/pci/msi.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index af24ed5..3a41024 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -227,6 +227,14 @@ static void msi_set_mask_bit(struct irq_data *data, u32 flag) { struct msi_desc *desc = irq_data_get_msi_desc(data); + /* + * Prevent non-posted IO to the device if it has been removed and is in + * the process of removal cleanup, in order to prevent unsupported + * requests or completer aborts or other issues. + */ + if (pci_dev_is_disconnected(msi_desc_to_pci_dev(desc))) + return; + if (desc->msi_attrib.is_msix) { msix_mask_irq(desc, flag); readl(desc->mask_base); /* Flush write to device */