From: Yongji Xie <xyjxie@linux.vnet.ibm.com>
To: Gavin Shan <gwshan@linux.vnet.ibm.com>
Cc: linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org,
linuxppc-dev@lists.ozlabs.org, linux-doc@vger.kernel.org,
bhelgaas@google.com, alex.williamson@redhat.com, aik@ozlabs.ru,
benh@kernel.crashing.org, paulus@samba.org, mpe@ellerman.id.au,
corbet@lwn.net, warrier@linux.vnet.ibm.com,
zhong@linux.vnet.ibm.com, nikunj@linux.vnet.ibm.com
Subject: Re: [PATCH v3 4/7] PCI: Add a new option for resource_alignment to reassign alignment
Date: Fri, 1 Jul 2016 14:53:16 +0800 [thread overview]
Message-ID: <83859fc2-1c49-0f13-e91d-f0f5e3da7c5e@linux.vnet.ibm.com> (raw)
In-Reply-To: <20160701022503.GA6739@gwshan>
Hi Gavin,
On 2016/7/1 10:25, Gavin Shan wrote:
> On Thu, Jun 30, 2016 at 06:53:10PM +0800, Yongji Xie wrote:
>> When using resource_alignment kernel parameter, the current
>> implement reassigns the alignment by changing resources' size
>> which can potentially break some drivers. For example, the driver
>> uses the size to locate some register whose length is related
>> to the size.
>>
>> This patch adds a new option "noresize" for the parameter to
>> solve this problem.
>>
>> Signed-off-by: Yongji Xie <xyjxie@linux.vnet.ibm.com>
> Reviewed-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
>
>> ---
>> Documentation/kernel-parameters.txt | 5 ++++-
>> drivers/pci/pci.c | 35 +++++++++++++++++++++++++----------
>> 2 files changed, 29 insertions(+), 11 deletions(-)
>>
>> diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
>> index 82b42c9..c4802f5 100644
>> --- a/Documentation/kernel-parameters.txt
>> +++ b/Documentation/kernel-parameters.txt
>> @@ -2997,13 +2997,16 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
>> window. The default value is 64 megabytes.
>> resource_alignment=
>> Format:
>> - [<order of align>@][<domain>:]<bus>:<slot>.<func>[; ...]
>> + [<order of align>@][<domain>:]<bus>:<slot>.<func>
>> + [:noresize][; ...]
>> Specifies alignment and device to reassign
>> aligned memory resources.
>> If <order of align> is not specified,
>> PAGE_SIZE is used as alignment.
>> PCI-PCI bridge can be specified, if resource
>> windows need to be expanded.
>> + noresize: Don't change the resources' sizes when
>> + reassigning alignment.
>> ecrc= Enable/disable PCIe ECRC (transaction layer
>> end-to-end CRC checking).
>> bios: Use BIOS/firmware settings. This is the
>> diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
>> index 6241cfc..1d80a94 100644
>> --- a/drivers/pci/pci.c
>> +++ b/drivers/pci/pci.c
>> @@ -4748,11 +4748,13 @@ static DEFINE_SPINLOCK(resource_alignment_lock);
>> /**
>> * pci_specified_resource_alignment - get resource alignment specified by user.
>> * @dev: the PCI device to get
>> + * @resize: whether or not to change resources' size when reassigning alignment
>> *
>> * RETURNS: Resource alignment if it is specified.
>> * Zero if it is not specified.
>> */
>> -static resource_size_t pci_specified_resource_alignment(struct pci_dev *dev)
>> +static resource_size_t pci_specified_resource_alignment(struct pci_dev *dev,
>> + bool *resize)
>> {
>> int seg, bus, slot, func, align_order, count;
>> resource_size_t align = 0;
>> @@ -4787,6 +4789,11 @@ static resource_size_t pci_specified_resource_alignment(struct pci_dev *dev)
>> }
>> }
>> p += count;
>> + if (!strncmp(p, ":noresize", 9)) {
>> + *resize = false;
>> + p += 9;
>> + } else
>> + *resize = true;
>> if (seg == pci_domain_nr(dev->bus) &&
>> bus == dev->bus->number &&
>> slot == PCI_SLOT(dev->devfn) &&
>> @@ -4819,6 +4826,7 @@ void pci_reassigndev_resource_alignment(struct pci_dev *dev)
>> {
>> int i;
>> struct resource *r;
>> + bool resize = true;
>> resource_size_t align, size;
>>
>> /* We should never try to reassign VF's alignment */
>> @@ -4826,7 +4834,7 @@ void pci_reassigndev_resource_alignment(struct pci_dev *dev)
>> return;
>>
>> /* check if specified PCI is target device to reassign */
>> - align = pci_specified_resource_alignment(dev);
>> + align = pci_specified_resource_alignment(dev, &resize);
>> if (!align)
>> return;
>>
>> @@ -4848,15 +4856,22 @@ void pci_reassigndev_resource_alignment(struct pci_dev *dev)
>> continue;
>> }
>> size = resource_size(r);
>> - if (size < align) {
>> - size = align;
>> - dev_info(&dev->dev,
>> - "Rounding up size of resource #%d to %#llx.\n",
>> - i, (unsigned long long)size);
>> + if (resize) {
>> + if (size < align) {
>> + size = align;
>> + dev_info(&dev->dev,
>> + "Rounding up size of resource #%d to %#llx.\n",
>> + i, (unsigned long long)size);
>> + }
>> + r->flags |= IORESOURCE_UNSET;
>> + r->end = size - 1;
>> + r->start = 0;
>> + } else {
>> + r->flags &= ~IORESOURCE_SIZEALIGN;
>> + r->flags |= IORESOURCE_STARTALIGN | IORESOURCE_UNSET;
> f->flags |= (IORESOURCE_STARTALIGN | IORESOURCE_UNSET);
>
> Yongji, one quick question - when IORESOURCE_UNSET is cleared? If it's not
> cleared, is there any unexpected side effects? Thanks.
PCI core will clear this flag in pci_assign_resource() when the BAR
has been assigned properly. If it's not cleared, the driver will fail in
binding the device because pci_enable_resources() will check this flag.
Thanks,
Yongji
next prev parent reply other threads:[~2016-07-01 6:53 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-30 10:53 [PATCH v3 0/7] PCI: Add support for enforcing all MMIO BARs not to share PAGE_SIZE Yongji Xie
2016-06-30 10:53 ` [PATCH v3 1/7] PCI: Ignore enforced alignment when kernel uses existing firmware setup Yongji Xie
2016-07-01 0:28 ` Gavin Shan
2016-07-01 4:49 ` Yongji Xie
2016-06-30 10:53 ` [PATCH v3 2/7] PCI: Ignore enforced alignment to VF BARs Yongji Xie
2016-07-01 0:39 ` Gavin Shan
2016-07-01 5:27 ` Yongji Xie
2016-07-01 6:05 ` Gavin Shan
2016-07-01 6:40 ` Yongji Xie
2016-07-02 0:31 ` Gavin Shan
2016-06-30 10:53 ` [PATCH v3 3/7] PCI: Do not disable memory decoding in pci_reassigndev_resource_alignment() Yongji Xie
2016-07-01 0:50 ` Gavin Shan
2016-07-01 6:35 ` Yongji Xie
2016-06-30 10:53 ` [PATCH v3 4/7] PCI: Add a new option for resource_alignment to reassign alignment Yongji Xie
2016-07-01 2:25 ` Gavin Shan
2016-07-01 6:53 ` Yongji Xie [this message]
2016-06-30 10:53 ` [PATCH v3 5/7] PCI: Do not use IORESOURCE_STARTALIGN to identify bridge resources Yongji Xie
2016-07-01 2:34 ` Gavin Shan
2016-07-01 7:04 ` Yongji Xie
2016-07-02 0:37 ` Gavin Shan
2016-06-30 10:53 ` [PATCH v3 6/7] PCI: Add support for enforcing all MMIO BARs to be page aligned Yongji Xie
2016-06-30 10:53 ` [PATCH v3 7/7] PCI: Add a macro to set default alignment for all PCI devices Yongji Xie
2016-07-12 5:09 ` [PATCH v3 0/7] PCI: Add support for enforcing all MMIO BARs not to share PAGE_SIZE Yongji Xie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=83859fc2-1c49-0f13-e91d-f0f5e3da7c5e@linux.vnet.ibm.com \
--to=xyjxie@linux.vnet.ibm.com \
--cc=aik@ozlabs.ru \
--cc=alex.williamson@redhat.com \
--cc=benh@kernel.crashing.org \
--cc=bhelgaas@google.com \
--cc=corbet@lwn.net \
--cc=gwshan@linux.vnet.ibm.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=nikunj@linux.vnet.ibm.com \
--cc=paulus@samba.org \
--cc=warrier@linux.vnet.ibm.com \
--cc=zhong@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).