From patchwork Tue Jun 6 06:09:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ding Tianhong X-Patchwork-Id: 9768083 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.web.codeaurora.org (Postfix) with ESMTP id 7838060352 for ; Tue, 6 Jun 2017 06:22:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6AB1D28397 for ; Tue, 6 Jun 2017 06:22:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5DC5F28445; Tue, 6 Jun 2017 06:22:04 +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=-6.9 required=2.0 tests=BAYES_00,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 743D928429 for ; Tue, 6 Jun 2017 06:22:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751184AbdFFGVf (ORCPT ); Tue, 6 Jun 2017 02:21:35 -0400 Received: from szxga03-in.huawei.com ([45.249.212.189]:6944 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750881AbdFFGVd (ORCPT ); Tue, 6 Jun 2017 02:21:33 -0400 Received: from 172.30.72.57 (EHLO DGGEML402-HUB.china.huawei.com) ([172.30.72.57]) by dggrg03-dlp.huawei.com (MOS 4.4.6-GA FastPath queued) with ESMTP id AOX20462; Tue, 06 Jun 2017 14:09:52 +0800 (CST) Received: from [127.0.0.1] (10.177.23.32) by DGGEML402-HUB.china.huawei.com (10.3.17.38) with Microsoft SMTP Server id 14.3.301.0; Tue, 6 Jun 2017 14:09:41 +0800 Subject: Re: [PATCH v2 2/3] PCI: Enable PCIe Relaxed Ordering if supported To: Alexander Duyck References: <1496462647-7632-1-git-send-email-dingtianhong@huawei.com> <1496462647-7632-3-git-send-email-dingtianhong@huawei.com> <0853b74b-6c0e-68e9-225b-621d833615e4@huawei.com> CC: Casey Leedom , Ashok Raj , "Bjorn Helgaas" , Michael Werner , "Ganesh Goudar" , Asit K Mallick , Patrick J Cramer , Suravee Suthikulpanit , Bob Shaw , h , Amir Ancel , Gabriele Paoloni , David Laight , "Jeff Kirsher" , Catalin Marinas , Will Deacon , Mark Rutland , Robin Murphy , David Miller , , Netdev , "linux-pci@vger.kernel.org" , "linux-kernel@vger.kernel.org" From: Ding Tianhong Message-ID: Date: Tue, 6 Jun 2017 14:09:31 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.4.0 MIME-Version: 1.0 In-Reply-To: X-Originating-IP: [10.177.23.32] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020206.59364732.00FD, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2014-11-16 11:51:01, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 471d206dc2812dec936657145a56a830 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 On 2017/6/6 8:28, Alexander Duyck wrote: > On Mon, Jun 5, 2017 at 6:33 AM, Ding Tianhong wrote: >> >> >> On 2017/6/4 2:19, Alexander Duyck wrote: >>> On Fri, Jun 2, 2017 at 9:04 PM, Ding Tianhong wrote: >>>> The PCIe Device Control Register use the bit 4 to indicate that >>>> whether the device is permitted to enable relaxed ordering or not. >>>> But relaxed ordering is not safe for some platform which could only >>>> use strong write ordering, so devices are allowed (but not required) >>>> to enable relaxed ordering bit by default. >>>> >>>> If a platform support relaxed ordering but does not enable it by >>>> default, enable it in the PCIe configuration. This allows some device >>>> to send TLPs with the relaxed ordering attributes set, which may >>>> improve the performance. >>>> >>>> Signed-off-by: Ding Tianhong >>>> --- >>>> drivers/pci/pci.c | 42 ++++++++++++++++++++++++++++++++++++++++++ >>>> drivers/pci/probe.c | 11 +++++++++++ >>>> include/linux/pci.h | 3 +++ >>>> 3 files changed, 56 insertions(+) >>>> >>>> diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c >>>> index b01bd5b..f57a374 100644 >>>> --- a/drivers/pci/pci.c >>>> +++ b/drivers/pci/pci.c >>>> @@ -4878,6 +4878,48 @@ int pcie_set_mps(struct pci_dev *dev, int mps) >>>> EXPORT_SYMBOL(pcie_set_mps); >>>> >>>> /** >>>> + * pcie_set_relaxed_ordering - set PCI Express relexed ordering bit >>>> + * @dev: PCI device to query >>>> + * >>>> + * If possible sets relaxed ordering >>>> + */ >>>> +int pcie_set_relaxed_ordering(struct pci_dev *dev) >>>> +{ >>>> + return pcie_capability_set_word(dev, PCI_EXP_DEVCTL, PCI_EXP_DEVCTL_RELAX_EN); >>>> +} >>>> +EXPORT_SYMBOL(pcie_set_relaxed_ordering); >>>> + >>>> +/** >>>> + * pcie_clear_relaxed_ordering - clear PCI Express relexed ordering bit >>>> + * @dev: PCI device to query >>>> + * >>>> + * If possible clear relaxed ordering >>>> + */ >>>> +int pcie_clear_relaxed_ordering(struct pci_dev *dev) >>>> +{ >>>> + return pcie_capability_clear_word(dev, PCI_EXP_DEVCTL, PCI_EXP_DEVCTL_RELAX_EN); >>>> +} >>>> +EXPORT_SYMBOL(pcie_clear_relaxed_ordering); >>>> + >>>> +/** >>>> + * pcie_get_relaxed_ordering - check PCI Express relexed ordering bit >>>> + * @dev: PCI device to query >>>> + * >>>> + * Returns true if relaxed ordering is been set >>>> + */ >>>> +int pcie_get_relaxed_ordering(struct pci_dev *dev) >>>> +{ >>>> + u16 v; >>>> + >>>> + pcie_capability_read_word(dev, PCI_EXP_DEVCTL, &v); >>>> + >>>> + return (v & PCI_EXP_DEVCTL_RELAX_EN) >> 4; >>>> +} >>>> +EXPORT_SYMBOL(pcie_get_relaxed_ordering); >>>> + >>>> +/** >>>> + * pcie_set_mps - set PCI Express maximum payload size >>>> +/** >>>> * pcie_get_minimum_link - determine minimum link settings of a PCI device >>>> * @dev: PCI device to query >>>> * @speed: storage for minimum speed >>>> diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c >>>> index 19c8950..aeb22b5 100644 >>>> --- a/drivers/pci/probe.c >>>> +++ b/drivers/pci/probe.c >>>> @@ -1701,6 +1701,16 @@ static void pci_configure_extended_tags(struct pci_dev *dev) >>>> PCI_EXP_DEVCTL_EXT_TAG); >>>> } >>>> >>>> +static void pci_configure_relaxed_ordering(struct pci_dev *dev) >>>> +{ >>>> + int ret; >>>> + >>>> + if (dev && (dev->dev_flags & PCI_DEV_FLAGS_NO_RELAXED_ORDERING)) >>> >>> So there is a minor issue here. The problem is this is only trying to >>> modify relaxed ordering for the device itself. That isn't what we >>> want. What we want is to modify it on all of the upstream port >>> interfaces where there is something the path to the root complex that >>> has an issue. So if the root complex has to set the >>> NO_RELAXED_ORDERING flag on a root port, all of the interfaces below >>> it that would be pushing traffic toward it should not have the relaxed >>> ordering bit set. >>> >>> Also I am pretty sure this is a PCIe capability, not a PCI capability. >>> You probably need to make sure you code is making this distinction >>> which I don't know if it currently is. If you need an example of the >>> kind of checks I am suggesting just take a look at >>> pcie_configure_mps(). It is verifying the function is PCIe before >>> attempting to make any updates. In your case you will probably also >>> need to make sure there is a bus for you to walk up the chain of. >>> Otherwise this shouldn't apply. >>> >>> >>>> + pcie_set_relaxed_ordering(dev); >>>> + else >>>> + pcie_clear_relaxed_ordering(dev); >>>> +} >>> >>> Also I am not a fan of the way this is handled currently. If you don't >>> have relaxed ordering set then you don't need to do anything else, if >>> you do have it set but there is no bus to walk up you shouldn't change >>> it, and if there is a bus to walk up and you find that the root >>> complex on that bus has the NO_RELAXED_ORDERING set you should clear >>> it. Right now this code seems to be enabling relaxed ordering if the >>> NO_RELAXED_ORDERING flag is set. >>> >> >> Hi Alexander: >> >> I reconsidered your suggestion and found I miss something here, >> decide to modify the configure police as your solution, I think >> it is close to our goal. >> >> Thanks >> Ding >> >> diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c >> index 19c8950..68dee05 100644 >> --- a/drivers/pci/probe.c >> +++ b/drivers/pci/probe.c >> @@ -1701,6 +1701,45 @@ static void pci_configure_extended_tags(struct pci_dev *dev) >> PCI_EXP_DEVCTL_EXT_TAG); >> } >> >> +static int pcie_clearing_relaxed_ordering(struct pci_dev *dev, void *data) >> +{ >> + int origin_ero; >> + >> + if (!pci_is_pcie(dev)) >> + return 0; >> + >> + origin_ero = pcie_get_relaxed_ordering(dev); >> + >> + /* If the releaxed ordering enable bit is not set, do nothing. */ >> + if (!origin_ero) >> + return 0; >> + >> + pcie_clear_relaxed_ordering(dev); >> + >> + dev_info(&dev->dev, "Disable Relaxed Ordering\n"); >> + >> + return 0; >> +} >> + >> +static void pci_configure_relaxed_ordering(struct pci_dev *dev) >> +{ >> + int origin_ero; >> + >> + if (!pci_is_pcie(dev)) >> + return; >> + >> + origin_ero = pcie_get_relaxed_ordering(dev); >> + /* If the releaxed ordering enable bit is not set, do nothing. */ >> + if (!origin_ero) >> + return; >> + >> + if (dev->dev_flags & PCI_DEV_FLAGS_NO_RELAXED_ORDERING) { >> + pcie_clear_relaxed_ordering(dev); >> + pci_walk_bus(dev->bus, pcie_clearing_relaxed_ordering, NULL); >> + dev_info(&dev->dev, "Disable Relaxed Ordering\n"); >> + } >> +} >> + > > This is kind of backwards from what I was thinking. Basically what I > would like to see is at probe time we should work our way up the PCIe > buses checking to see if any device has > PCI_DEV_FLAGS_NO_RELAXED_ORDERING set. The assumption is if we can't > use relaxed ordering with the downstream facing port we probably > shouldn't be enabling it on our upstream facing port. We don't want to > be writing to other devices and such since we don't know what they > need, we will only know what our device needs and if the root complex > reports that it can't support relaxed ordering we should disable it > for the device we are initializing and move on. > > You might use pcie_get_minimum_link as an example of what I am > thinking. Basically what we should do is add a function that will > return true if any of the devices above us do not support relaxed > ordering, otherwise return false. Then based on that result if we get > a return that indicates that relaxed ordering is not supported we > should update our device to disable relaxed ordering. If the device > above us doesn't exist, or isn't PCIe we should just exit and skip > updating relaxed ordering since we are probably running in a guest. > I think I understand what you mean this time, if no obviously problem, I will send next version base on this code, thanks. >> { >> struct hotplug_params hpp; >> @@ -1708,6 +1747,7 @@ static void pci_configure_device(struct pci_dev *dev) >> >> pci_configure_mps(dev); >> pci_configure_extended_tags(dev); >> + pci_configure_relaxed_ordering(dev); >> >> memset(&hpp, 0, sizeof(hpp)); >> ret = pci_get_hp_params(dev, &hpp); >> diff --git a/include/linux/pci.h b/include/linux/pci.h >> >> >> >>>> + >>>> static void pci_configure_device(struct pci_dev *dev) >>>> { >>>> struct hotplug_params hpp; >>>> @@ -1708,6 +1718,7 @@ static void pci_configure_device(struct pci_dev *dev) >>>> >>>> pci_configure_mps(dev); >>>> pci_configure_extended_tags(dev); >>>> + pci_configure_relaxed_ordering(dev); >>>> >>>> memset(&hpp, 0, sizeof(hpp)); >>>> ret = pci_get_hp_params(dev, &hpp); >>>> diff --git a/include/linux/pci.h b/include/linux/pci.h >>>> index e1e8428..84bd6af 100644 >>>> --- a/include/linux/pci.h >>>> +++ b/include/linux/pci.h >>>> @@ -1105,6 +1105,9 @@ int __pci_enable_wake(struct pci_dev *dev, pci_power_t state, >>>> void pci_pme_wakeup_bus(struct pci_bus *bus); >>>> void pci_d3cold_enable(struct pci_dev *dev); >>>> void pci_d3cold_disable(struct pci_dev *dev); >>>> +int pcie_set_relaxed_ordering(struct pci_dev *dev); >>>> +int pcie_clear_relaxed_ordering(struct pci_dev *dev); >>>> +int pcie_get_relaxed_ordering(struct pci_dev *dev); >>>> >>>> static inline int pci_enable_wake(struct pci_dev *dev, pci_power_t state, >>>> bool enable) >>>> -- >>>> 1.9.0 >>>> >>>> >>> >>> . >>> >> > > . > diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 19c8950..777fe5c 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1701,6 +1701,48 @@ static void pci_configure_extended_tags(struct pci_dev *dev) PCI_EXP_DEVCTL_EXT_TAG); } +/** + * pci_dev_relaxed_ordering_disabled - check if the PCI device + * should disable the relaxed ordering attribute. + * @dev: PCI device + * + * Return true if any of the PCI devices above us do not support + * relaxed ordering. + */ +static int pcie_check_relaxed_ordering_status(struct pci_dev *dev) +{ + int ro_disabled = 0; + + while(dev) { + if (dev->dev_flags & PCI_DEV_FLAGS_NO_RELAXED_ORDERING) { + ro_disabled = 1; + break; + } + dev = dev->bus->self; + } + + return ro_disabled; +} + +static void pci_configure_relaxed_ordering(struct pci_dev *dev) +{ + struct pci_dev *bridge = pci_upstream_bridge(dev); + int origin_ero; + + if (!pci_is_pcie(dev) || !bridge || !pci_is_pcie(bridge)) + return; + + origin_ero = pcie_get_relaxed_ordering(dev); + /* If the releaxed ordering enable bit is not set, do nothing. */ + if (!origin_ero) + return; + + if (pcie_check_relaxed_ordering_status(dev)) { + pcie_clear_relaxed_ordering(dev); + dev_info(&dev->dev, "Disable Relaxed Ordering\n"); + } +} + >> static void pci_configure_device(struct pci_dev *dev)