From patchwork Thu Aug 3 17:12:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Williamson X-Patchwork-Id: 130788 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp1334076vqx; Thu, 3 Aug 2023 11:34:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHhHFIS822Pi59Iwf00GnyWe7nmZvvDnyPE6/y4KwkDzblmARsGlXXEb8WGc/uIJpw5H7Z4 X-Received: by 2002:a17:906:cc13:b0:99c:5625:f6c9 with SMTP id ml19-20020a170906cc1300b0099c5625f6c9mr5210271ejb.14.1691087683113; Thu, 03 Aug 2023 11:34:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691087683; cv=none; d=google.com; s=arc-20160816; b=hFP4xTGBmE5dXIr96ki6HidXLY5Gw9UeSN1aBW4zgElBDZy7XUR8LKVeUIXk8owVWe aTpy0YP2pUDyXpbOEMgFPfcXTxSmfsSBWSMO/9U47DMvJ7sUPK+0wMe5rJkqtQZNPvU1 02IIaRGolzFcG/2b+IMHXrkF2Bs0DVP8ZBKZEXHhs8k2AwJ2FL0/qIYQeyi46d6b0PjC 2N4QVQT5+ReX6jnp2JlGTkT5jzXlrw3C6bme5GDkgDD4QEzZxgUqN/F0j0rsugYGtvYp z0LEI+T6r1zKVgG96KQwEHls1YH6+raFuI+m+Mw/qEff7IlHI+uXjExxnrDcpl9BDgnf bbVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=/vpgghRxsUnXsE3t1IVpXcHF3Kir76KUPEpQodsytdc=; fh=EkXd9mulaEwhN/gYQbLN171OqS+TkA74SfbkC4a6Z8Y=; b=ffwMgzaRmNC+3Dgfib/Mz5M5gVDJKZGL8FKIQMvhz/K4+Hcl9GVO/0ukyFFpMIq1QB oZkNgsAVLISlLsPMruTAj2RouzaiPLSz6Fa6pBUNs4ZhFfkUsZzrSDSva7Yy2OJaPOr+ R2+KP3cYwPQXsAwCkTYV6dk74gzAAj3BPYmno0kAB1r277iz4fDalJNQY+lH4NZTCPpP LAOK728EeTHRA8cq2oNl4EwJG5oZwUC0wv/ydeUBGoYLGhXJitXveB38R5C472S5JKUs Hfv110IrjBuKWcuWu4i4cbubapE/+0uYIaoGPxw0PjDbhuHxNB3eqNA+SgNSVRcBghn8 LAzw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=NsmqH78j; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ga26-20020a170906b85a00b0099bd5ad1e95si235461ejb.498.2023.08.03.11.34.19; Thu, 03 Aug 2023 11:34:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=NsmqH78j; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233913AbjHCRNx (ORCPT + 99 others); Thu, 3 Aug 2023 13:13:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36118 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234638AbjHCRNl (ORCPT ); Thu, 3 Aug 2023 13:13:41 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2B63F2D5F for ; Thu, 3 Aug 2023 10:12:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1691082769; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/vpgghRxsUnXsE3t1IVpXcHF3Kir76KUPEpQodsytdc=; b=NsmqH78jpg/M3rRrs4+S1a55smeZ9aYafA9UcqQMmE8VcpGxuTpIzFoJiXoN+vCkcR5aHM 4exFztDNlUcGK+ASCggOkjC1X5VcwSf6N/+Mw/rJ7FQrr1I6h+pV7ml1/MyP3O3o4LK2WD pIrSa4yq16YO59nnHhwdtsnMwqm0jeM= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-133-4v-D9ERYOlCrWtZJWtpaRg-1; Thu, 03 Aug 2023 13:12:43 -0400 X-MC-Unique: 4v-D9ERYOlCrWtZJWtpaRg-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7423F8870D1; Thu, 3 Aug 2023 17:12:43 +0000 (UTC) Received: from omen.home.shazbot.org (unknown [10.22.10.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0D7894021C9; Thu, 3 Aug 2023 17:12:42 +0000 (UTC) From: Alex Williamson To: bhelgaas@google.com Cc: Alex Williamson , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, eric.auger@redhat.com Subject: [PATCH v2 1/2] PCI/VPD: Add runtime power management to sysfs interface Date: Thu, 3 Aug 2023 11:12:32 -0600 Message-Id: <20230803171233.3810944-2-alex.williamson@redhat.com> In-Reply-To: <20230803171233.3810944-1-alex.williamson@redhat.com> References: <20230803171233.3810944-1-alex.williamson@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773233958428206616 X-GMAIL-MSGID: 1773233958428206616 Unlike default access to config space through sysfs, the vpd read and write function don't actively manage the runtime power management state of the device during access. Since commit 7ab5e10eda02 ("vfio/pci: Move the unused device into low power state with runtime PM"), the vfio-pci driver will use runtime power management and release unused devices to make use of low power states. Attempting to access VPD information in this low power state can result in incorrect information or kernel crashes depending on the system behavior. Wrap the vpd read/write bin attribute handlers in runtime PM and take into account the potential quirk to select the correct device to wake. Signed-off-by: Alex Williamson --- drivers/pci/vpd.c | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/drivers/pci/vpd.c b/drivers/pci/vpd.c index a4fc4d0690fe..81217dd4789f 100644 --- a/drivers/pci/vpd.c +++ b/drivers/pci/vpd.c @@ -275,8 +275,23 @@ static ssize_t vpd_read(struct file *filp, struct kobject *kobj, size_t count) { struct pci_dev *dev = to_pci_dev(kobj_to_dev(kobj)); + struct pci_dev *vpd_dev = dev; + ssize_t ret; + + if (dev->dev_flags & PCI_DEV_FLAGS_VPD_REF_F0) { + vpd_dev = pci_get_func0_dev(dev); + if (!vpd_dev) + return -ENODEV; + } + + pci_config_pm_runtime_get(vpd_dev); + ret = pci_read_vpd(vpd_dev, off, count, buf); + pci_config_pm_runtime_put(vpd_dev); + + if (dev != vpd_dev) + pci_dev_put(vpd_dev); - return pci_read_vpd(dev, off, count, buf); + return ret; } static ssize_t vpd_write(struct file *filp, struct kobject *kobj, @@ -284,8 +299,23 @@ static ssize_t vpd_write(struct file *filp, struct kobject *kobj, size_t count) { struct pci_dev *dev = to_pci_dev(kobj_to_dev(kobj)); + struct pci_dev *vpd_dev = dev; + ssize_t ret; + + if (dev->dev_flags & PCI_DEV_FLAGS_VPD_REF_F0) { + vpd_dev = pci_get_func0_dev(dev); + if (!vpd_dev) + return -ENODEV; + } + + pci_config_pm_runtime_get(vpd_dev); + ret = pci_write_vpd(vpd_dev, off, count, buf); + pci_config_pm_runtime_put(vpd_dev); + + if (dev != vpd_dev) + pci_dev_put(vpd_dev); - return pci_write_vpd(dev, off, count, buf); + return ret; } static BIN_ATTR(vpd, 0600, vpd_read, vpd_write, 0); From patchwork Thu Aug 3 17:12:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Williamson X-Patchwork-Id: 130802 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp1341354vqx; Thu, 3 Aug 2023 11:50:32 -0700 (PDT) X-Google-Smtp-Source: APBJJlE7CGvxhIs4RZAnadyMW9IBAOYUuX9DWmBRqBDbZuowDV4nu7QK3I6fhJJnQHa7XwzTFKRF X-Received: by 2002:a05:6358:2619:b0:139:bbae:1f3 with SMTP id l25-20020a056358261900b00139bbae01f3mr10528707rwc.3.1691088632431; Thu, 03 Aug 2023 11:50:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691088632; cv=none; d=google.com; s=arc-20160816; b=vx6zteQUgAly0HGRj2veouB3mpP8yAlT2jr9+eoPPx4VsumiXJ4nCSBaTSD0dFtIuH AC0HQxKJLVSZJT9LiRZ6IIkIN5AB8sjq7UV8SgMW21fDwX7DY20MqgmMFmztALYa+5Wf Re59PJXJYzV9VWL7NhA4kKLSNi1aWKbgeexsWfAiuqrEb1pCIVUDeQkvUIitB28BFDh0 DaJk5BYwvauWZOPspU8JEpfel1sHY0d5lCf9IsFPWhYQoY6LXu69MAh/AkZtqCxCbiIW Ll+KaW9NhblZbEbQj5RcnPd1Qvkv5H434uySGAgOa36F6B2aNycgA4+SahSG+2Vu8PLi o0/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=i4rNHvY4SBHV3GZTxHfmC+xvKSqh+4xt/RUop3WDQyg=; fh=EkXd9mulaEwhN/gYQbLN171OqS+TkA74SfbkC4a6Z8Y=; b=Z5Cx77qh91tbmhzYPtA4Y/I6mm956bfh34FYR1VgeZBdP1tWUpFka08TkaXfvw5Gso 6+r1bK65q+9xPWpRKlFm/J/O6PlOtoCtxOlpg2GHB9PQBq/YX8b3krqCCju35MQWTYRE Rh64foEqXTvlBLOHv645gx7FjqW7c5bcrWelyb+HQljYh3qL7ydcDET5wYIt1QD69sFv RXB9tK+fo5l00a4RoB/oTG+yujGV11/78aymW5qJnTXsOshoxLf37F71km0g2237SeKt CxxHA7YEkjH5K1kSjFuNQgmeZvGimxr9ceTWUJ4WJf+2fy6NEyJJy4ZDNJ+Mi+ulwaOl fgVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ZfQFNF+e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a73-20020a63904c000000b00563fbc00003si418538pge.264.2023.08.03.11.50.18; Thu, 03 Aug 2023 11:50:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ZfQFNF+e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234389AbjHCRNt (ORCPT + 99 others); Thu, 3 Aug 2023 13:13:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36150 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234587AbjHCRNk (ORCPT ); Thu, 3 Aug 2023 13:13:40 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6F7A62D43 for ; Thu, 3 Aug 2023 10:12:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1691082767; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=i4rNHvY4SBHV3GZTxHfmC+xvKSqh+4xt/RUop3WDQyg=; b=ZfQFNF+eZLx1ZVVljYzBUsUDoCpEiRAXNzADmTbTWBX5G7LSqW3YIOZmCDzxFilBACBT5E Ce9PWqdE8eWcrtVlAjoXqI0YdFIVhWfEABol3DY7XZfo6ztWqyfoDPJzZ+MrLXyOGcioVc KRNPyxPSgyIIbIGGLsB4sm77orUedEk= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-241-it8Yw8nBOjSFtKIOfzR0Dg-1; Thu, 03 Aug 2023 13:12:45 -0400 X-MC-Unique: it8Yw8nBOjSFtKIOfzR0Dg-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 02099104458B; Thu, 3 Aug 2023 17:12:44 +0000 (UTC) Received: from omen.home.shazbot.org (unknown [10.22.10.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8C1004021CE; Thu, 3 Aug 2023 17:12:43 +0000 (UTC) From: Alex Williamson To: bhelgaas@google.com Cc: Alex Williamson , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, eric.auger@redhat.com Subject: [PATCH v2 2/2] PCI: Fix runtime PM race with PME polling Date: Thu, 3 Aug 2023 11:12:33 -0600 Message-Id: <20230803171233.3810944-3-alex.williamson@redhat.com> In-Reply-To: <20230803171233.3810944-1-alex.williamson@redhat.com> References: <20230803171233.3810944-1-alex.williamson@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773234953974029639 X-GMAIL-MSGID: 1773234953974029639 Testing that a device is not currently in a low power state provides no guarantees that the device is not immenently transitioning to such a state. We need to increment the PM usage counter before accessing the device. Since we don't wish to wake the device for PME polling, do so only if the device is already active by using pm_runtime_get_if_active(). Signed-off-by: Alex Williamson --- drivers/pci/pci.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 60230da957e0..bc266f290b2c 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -2415,10 +2415,13 @@ static void pci_pme_list_scan(struct work_struct *work) mutex_lock(&pci_pme_list_mutex); list_for_each_entry_safe(pme_dev, n, &pci_pme_list, list) { - if (pme_dev->dev->pme_poll) { - struct pci_dev *bridge; + struct pci_dev *pdev = pme_dev->dev; + + if (pdev->pme_poll) { + struct pci_dev *bridge = pdev->bus->self; + struct device *dev = &pdev->dev; + int pm_status; - bridge = pme_dev->dev->bus->self; /* * If bridge is in low power state, the * configuration space of subordinate devices @@ -2426,14 +2429,20 @@ static void pci_pme_list_scan(struct work_struct *work) */ if (bridge && bridge->current_state != PCI_D0) continue; + /* - * If the device is in D3cold it should not be - * polled either. + * If the device is in a low power state it + * should not be polled either. */ - if (pme_dev->dev->current_state == PCI_D3cold) + pm_status = pm_runtime_get_if_active(dev, true); + if (!pm_status) continue; - pci_pme_wakeup(pme_dev->dev, NULL); + if (pdev->current_state != PCI_D3cold) + pci_pme_wakeup(pdev, NULL); + + if (pm_status > 0) + pm_runtime_put(dev); } else { list_del(&pme_dev->list); kfree(pme_dev);