From: Yinghai Lu <yinghai@kernel.org>
To: Bjorn Helgaas <helgaas@kernel.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Bjorn Helgaas <bhelgaas@google.com>,
David Miller <davem@davemloft.net>,
Linus Torvalds <torvalds@linux-foundation.org>,
Wei Yang <weiyang@linux.vnet.ibm.com>, TJ <linux@iam.tj>,
Yijing Wang <wangyijing@huawei.com>,
Khalid Aziz <khalid.aziz@oracle.com>,
"linux-pci@vger.kernel.org" <linux-pci@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Michael Ellerman <mpe@ellerman.id.au>
Subject: Re: [PATCH v11 04/60] sparc/PCI: Use correct offset for bus address to resource
Date: Tue, 3 May 2016 22:52:33 -0700 [thread overview]
Message-ID: <CAE9FiQV19OUsSL34GzDXYtVG=Xs724CpwHNfu3HCmYMUqbmrqQ@mail.gmail.com> (raw)
In-Reply-To: <CAE9FiQU=e2bf=+KDrOETf_T-KPLQsSDiG5GqVFqgtvSWXwUz4w@mail.gmail.com>
On Tue, May 3, 2016 at 10:08 PM, Yinghai Lu <yinghai@kernel.org> wrote:
> On Tue, May 3, 2016 at 6:25 PM, Bjorn Helgaas <helgaas@kernel.org> wrote:
>> I did not propose changing any user-visible ABI. To recap what I did
>> propose:
>
> I want to avoid introduce one strange pci_user_to_resource.
>
>>
>> - The sysfs path uses offsets between 0 and BAR size on all arches.
>> It uses pci_resource_to_user() today, but I think it should not.
>>
>> - The procfs path uses offsets of resource values (CPU physical
>> addresses) on most architectures, but uses something else, e.g.,
>> BAR values, on others. pci_resource_to_user() does this
>> translation. The procfs path does not use pci_resource_to_user()
>> today, but I think it should.
>
> current powerpc pci_resource_to_user is strange:
> it will return resource start for io mem.
> but will return BAR (?) start for io port.
>
> sparc pci_resource_to_user does return BAR value for iomem.
>
>>
>> - This implies that pci_mmap_page_range() should deal with resource
>> values (CPU physical addresses), and proc_bus_pci_mmap() should do
>> any necessary arch-specific translation from BAR values to
>> resource values.
>
> so will need one different version pci_user_to_resource.
> and can not use pcibios_bus_to_resource directly, and will be another mess.
looks like we can avoid that pci_user_to_resource() via trying out.
Please check it:
Subject: [RFC PATCH] PCI: Let pci_mmap_page_range() take resource addr
Some arch where cpu address (resource value) is not same as pci bus address
(BAR value in pci BAR registers), include sparc, powerpc, microblaze.
In 8c05cd08a7 ("PCI: fix offset check for sysfs mmapped files"), try
to check exposed value with resource start/end in proc mmap path.
| start = vma->vm_pgoff;
| size = ((pci_resource_len(pdev, resno) - 1) >> PAGE_SHIFT) + 1;
| pci_start = (mmap_api == PCI_MMAP_PROCFS) ?
| pci_resource_start(pdev, resno) >> PAGE_SHIFT : 0;
| if (start >= pci_start && start < pci_start + size &&
| start + nr <= pci_start + size)
That would break sparc that exposed value is still BAR value.
According to Bjorn, we could just pass resource addr instead of BAR.
In the patch:
1. in proc path: proc_bus_pci_mmap, try convert back to resource
before calling pci_mmap_page_range
2. in sysfs path: pci_mmap_resource will just offset with resource start.
3. all pci_mmap_page_range will all have vma->vm_pgoff with in resource range
instead of BAR value.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
arch/microblaze/pci/pci-common.c | 14 ++++----------
arch/powerpc/kernel/pci-common.c | 14 ++++----------
arch/sparc/kernel/pci.c | 27 +++++++++------------------
arch/xtensa/kernel/pci.c | 11 ++++-------
drivers/pci/pci-sysfs.c | 8 +-------
drivers/pci/proc.c | 13 +++++++++++++
6 files changed, 35 insertions(+), 52 deletions(-)
Index: linux-2.6/arch/microblaze/pci/pci-common.c
===================================================================
--- linux-2.6.orig/arch/microblaze/pci/pci-common.c
+++ linux-2.6/arch/microblaze/pci/pci-common.c
@@ -169,23 +169,16 @@ static struct resource *__pci_mmap_make_
enum pci_mmap_state mmap_state)
{
struct pci_controller *hose = pci_bus_to_host(dev->bus);
- unsigned long io_offset = 0;
int i, res_bit;
if (!hose)
return NULL; /* should never happen */
/* If memory, add on the PCI bridge address offset */
- if (mmap_state == pci_mmap_mem) {
-#if 0 /* See comment in pci_resource_to_user() for why this is disabled */
- *offset += hose->pci_mem_offset;
-#endif
+ if (mmap_state == pci_mmap_mem)
res_bit = IORESOURCE_MEM;
- } else {
- io_offset = (unsigned long)hose->io_base_virt - _IO_BASE;
- *offset += io_offset;
+ else
res_bit = IORESOURCE_IO;
- }
/*
* Check that the offset requested corresponds to one of the
@@ -209,7 +202,8 @@ static struct resource *__pci_mmap_make_
/* found it! construct the final physical address */
if (mmap_state == pci_mmap_io)
- *offset += hose->io_base_phys - io_offset;
+ *offset += hose->io_base_phys -
+ ((unsigned long)hose->io_base_virt - _IO_BASE);
return rp;
}
Index: linux-2.6/arch/powerpc/kernel/pci-common.c
===================================================================
--- linux-2.6.orig/arch/powerpc/kernel/pci-common.c
+++ linux-2.6/arch/powerpc/kernel/pci-common.c
@@ -308,23 +308,16 @@ static struct resource *__pci_mmap_make_
enum pci_mmap_state mmap_state)
{
struct pci_controller *hose = pci_bus_to_host(dev->bus);
- unsigned long io_offset = 0;
int i, res_bit;
if (hose == NULL)
return NULL; /* should never happen */
/* If memory, add on the PCI bridge address offset */
- if (mmap_state == pci_mmap_mem) {
-#if 0 /* See comment in pci_resource_to_user() for why this is disabled */
- *offset += hose->pci_mem_offset;
-#endif
+ if (mmap_state == pci_mmap_mem)
res_bit = IORESOURCE_MEM;
- } else {
- io_offset = (unsigned long)hose->io_base_virt - _IO_BASE;
- *offset += io_offset;
+ else
res_bit = IORESOURCE_IO;
- }
/*
* Check that the offset requested corresponds to one of the
@@ -348,7 +341,8 @@ static struct resource *__pci_mmap_make_
/* found it! construct the final physical address */
if (mmap_state == pci_mmap_io)
- *offset += hose->io_base_phys - io_offset;
+ *offset += hose->io_base_phys -
+ ((unsigned long)hose->io_base_virt - _IO_BASE);
return rp;
}
Index: linux-2.6/arch/sparc/kernel/pci.c
===================================================================
--- linux-2.6.orig/arch/sparc/kernel/pci.c
+++ linux-2.6/arch/sparc/kernel/pci.c
@@ -743,30 +743,21 @@ static int __pci_mmap_make_offset_bus(st
enum pci_mmap_state mmap_state)
{
struct pci_pbm_info *pbm = pdev->dev.archdata.host_controller;
- unsigned long space_size, user_offset, user_size;
+ unsigned long start, end;
+ struct resource *res;
- if (mmap_state == pci_mmap_io) {
- space_size = resource_size(&pbm->io_space);
- } else {
- space_size = resource_size(&pbm->mem_space);
- }
+ if (mmap_state == pci_mmap_io)
+ res = &pbm->io_space;
+ else
+ res = &pbm->mem_space;
/* Make sure the request is in range. */
- user_offset = vma->vm_pgoff << PAGE_SHIFT;
- user_size = vma->vm_end - vma->vm_start;
+ start = vma->vm_pgoff << PAGE_SHIFT;
+ end = vma->vm_end - vma->vm_start + start - 1;
- if (user_offset >= space_size ||
- (user_offset + user_size) > space_size)
+ if (!((res->start <= start) && (res->end >= end)))
return -EINVAL;
- if (mmap_state == pci_mmap_io) {
- vma->vm_pgoff = (pbm->io_space.start +
- user_offset) >> PAGE_SHIFT;
- } else {
- vma->vm_pgoff = (pbm->mem_space.start +
- user_offset) >> PAGE_SHIFT;
- }
-
return 0;
}
Index: linux-2.6/arch/xtensa/kernel/pci.c
===================================================================
--- linux-2.6.orig/arch/xtensa/kernel/pci.c
+++ linux-2.6/arch/xtensa/kernel/pci.c
@@ -288,20 +288,16 @@ __pci_mmap_make_offset(struct pci_dev *d
{
struct pci_controller *pci_ctrl = (struct pci_controller*) dev->sysdata;
unsigned long offset = vma->vm_pgoff << PAGE_SHIFT;
- unsigned long io_offset = 0;
int i, res_bit;
if (pci_ctrl == 0)
return -EINVAL; /* should never happen */
/* If memory, add on the PCI bridge address offset */
- if (mmap_state == pci_mmap_mem) {
+ if (mmap_state == pci_mmap_mem)
res_bit = IORESOURCE_MEM;
- } else {
- io_offset = (unsigned long)pci_ctrl->io_space.base;
- offset += io_offset;
+ else
res_bit = IORESOURCE_IO;
- }
/*
* Check that the offset requested corresponds to one of the
@@ -325,7 +321,8 @@ __pci_mmap_make_offset(struct pci_dev *d
/* found it! construct the final physical address */
if (mmap_state == pci_mmap_io)
- offset += pci_ctrl->io_space.start - io_offset;
+ offset += pci_ctrl->io_space.start -
+ pci_ctrl->io_space.base;
vma->vm_pgoff = offset >> PAGE_SHIFT;
return 0;
}
Index: linux-2.6/drivers/pci/pci-sysfs.c
===================================================================
--- linux-2.6.orig/drivers/pci/pci-sysfs.c
+++ linux-2.6/drivers/pci/pci-sysfs.c
@@ -999,7 +999,6 @@ static int pci_mmap_resource(struct kobj
struct pci_dev *pdev = to_pci_dev(kobj_to_dev(kobj));
struct resource *res = attr->private;
enum pci_mmap_state mmap_type;
- resource_size_t start, end;
int i;
for (i = 0; i < PCI_ROM_RESOURCE; i++)
@@ -1020,12 +1019,7 @@ static int pci_mmap_resource(struct kobj
return -EINVAL;
}
- /* pci_mmap_page_range() expects the same kind of entry as coming
- * from /proc/bus/pci/ which is a "user visible" value. If this is
- * different from the resource itself, arch will do necessary fixup.
- */
- pci_resource_to_user(pdev, i, res, &start, &end);
- vma->vm_pgoff += start >> PAGE_SHIFT;
+ vma->vm_pgoff += res->start >> PAGE_SHIFT;
mmap_type = res->flags & IORESOURCE_MEM ? pci_mmap_mem : pci_mmap_io;
return pci_mmap_page_range(pdev, vma, mmap_type, write_combine);
}
Index: linux-2.6/drivers/pci/proc.c
===================================================================
--- linux-2.6.orig/drivers/pci/proc.c
+++ linux-2.6/drivers/pci/proc.c
@@ -231,13 +231,26 @@ static int proc_bus_pci_mmap(struct file
{
struct pci_dev *dev = PDE_DATA(file_inode(file));
struct pci_filp_private *fpriv = file->private_data;
+ resource_size_t start, end, offset;
+ struct resource *res;
int i, ret;
if (!capable(CAP_SYS_RAWIO))
return -EPERM;
+ offset = vma->vm_pgoff << PAGE_SHIFT;
+
/* Make sure the caller is mapping a real resource for this device */
for (i = 0; i < PCI_ROM_RESOURCE; i++) {
+ res = &dev->resource[i];
+ if (!res->flags)
+ continue;
+
+ pci_resource_to_user(dev, i, res, &start, &end);
+ if (!(offset >= start && offset <= end))
+ continue;
+
+ vma->vm_pgoff = (res->start + (offset - start)) >> PAGE_SHIFT;
if (pci_mmap_fits(dev, i, vma, PCI_MMAP_PROCFS))
break;
}
next prev parent reply other threads:[~2016-05-04 5:52 UTC|newest]
Thread overview: 86+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-08 0:15 [PATCH v11 00/60] PCI: Resource allocation cleanup for v4.7 Yinghai Lu
2016-04-08 0:15 ` [PATCH v11 01/60] PCI: Fix iomem_is_exclusive() checking in pci_mmap_resource() Yinghai Lu
2016-04-08 0:15 ` [PATCH v11 02/60] alpha/PCI: Only check iomem_is_exclusive() for IORESOURCE_MEM, not IORESOURCE_IO Yinghai Lu
2016-04-25 21:01 ` Bjorn Helgaas
2016-04-08 0:15 ` [PATCH v11 03/60] PCI: Add pci_find_bus_resource() Yinghai Lu
2016-04-08 0:15 ` [PATCH v11 04/60] sparc/PCI: Use correct offset for bus address to resource Yinghai Lu
2016-04-22 20:49 ` Bjorn Helgaas
2016-04-28 4:55 ` Yinghai Lu
2016-04-28 13:56 ` Bjorn Helgaas
2016-04-29 7:19 ` Yinghai Lu
2016-05-03 22:52 ` Yinghai Lu
2016-05-04 0:37 ` Benjamin Herrenschmidt
2016-05-04 1:25 ` Bjorn Helgaas
2016-05-04 5:08 ` Yinghai Lu
2016-05-04 5:52 ` Yinghai Lu [this message]
2016-05-04 15:17 ` Bjorn Helgaas
2016-05-04 18:46 ` Yinghai Lu
2016-05-05 0:25 ` Yinghai Lu
2016-05-05 15:53 ` Yinghai Lu
2016-05-05 22:02 ` Benjamin Herrenschmidt
2016-05-06 0:56 ` Yinghai Lu
2016-05-06 4:18 ` Yinghai Lu
2016-05-06 18:26 ` Bjorn Helgaas
2016-05-10 6:18 ` Yinghai Lu
2016-05-04 4:17 ` David Miller
2016-04-08 0:15 ` [PATCH v11 05/60] sparc/PCI: Reserve legacy mmio after PCI mmio Yinghai Lu
2016-04-08 0:15 ` [PATCH v11 06/60] sparc/PCI: Add IORESOURCE_MEM_64 for 64-bit resource in OF parsing Yinghai Lu
2016-04-08 0:15 ` [PATCH v11 07/60] sparc/PCI: Keep resource idx order with bridge register number Yinghai Lu
2016-04-08 0:15 ` [PATCH v11 08/60] PCI: Kill wrong quirk about M7101 Yinghai Lu
2016-04-08 0:15 ` [PATCH v11 09/60] powerpc/PCI: Keep resource idx order with bridge register number Yinghai Lu
2016-04-08 0:15 ` [PATCH v11 10/60] powerpc/PCI: Add IORESOURCE_MEM_64 for 64-bit resource in OF parsing Yinghai Lu
2016-04-08 0:15 ` [PATCH v11 11/60] OF/PCI: Add IORESOURCE_MEM_64 for 64-bit resource Yinghai Lu
2016-04-08 0:15 ` [PATCH v11 12/60] PCI: Check pref compatible bit for mem64 resource of PCIe device Yinghai Lu
2016-04-08 0:15 ` [PATCH v11 13/60] PCI: Only treat non-pref mmio64 as pref if all bridges have MEM_64 Yinghai Lu
2016-04-08 0:15 ` [PATCH v11 14/60] PCI: Add has_mem64 for struct host_bridge Yinghai Lu
2016-04-08 0:15 ` [PATCH v11 15/60] PCI: Only treat non-pref mmio64 as pref if host bridge has mmio64 Yinghai Lu
2016-04-08 0:15 ` [PATCH v11 16/60] PCI: Restore pref MMIO allocation logic for host bridge without mmio64 Yinghai Lu
2016-04-08 0:15 ` [PATCH v11 17/60] PCI: Don't release fixed resource for realloc Yinghai Lu
2016-04-08 0:15 ` [PATCH v11 18/60] PCI: Claim fixed resource during remove/rescan path Yinghai Lu
2016-04-08 0:15 ` [PATCH v11 19/60] PCI: Set resource to FIXED for LSI devices Yinghai Lu
2016-04-08 0:15 ` [PATCH v11 20/60] PCI: Separate realloc list checking after allocation Yinghai Lu
2016-04-08 0:15 ` [PATCH v11 21/60] PCI: Treat optional as required in first try for bridge rescan Yinghai Lu
2016-04-08 0:15 ` [PATCH v11 22/60] PCI: Get new realloc size for bridge for last try Yinghai Lu
2016-04-08 0:15 ` [PATCH v11 23/60] PCI: Don't release sibling bridge resources during hotplug Yinghai Lu
2016-04-08 0:15 ` [PATCH v11 24/60] PCI: Cleanup res_to_dev_res() printout Yinghai Lu
2016-04-08 0:15 ` [PATCH v11 25/60] PCI: Reuse res_to_dev_res() in reassign_resources_sorted() Yinghai Lu
2016-04-08 0:15 ` [PATCH v11 26/60] PCI: Use correct align for optional only resources during sorting Yinghai Lu
2016-04-08 0:15 ` [PATCH v11 27/60] PCI: Optimize bus min_align/size calculation during sizing Yinghai Lu
2016-04-08 0:15 ` [PATCH v11 28/60] PCI: Optimize bus align/size calculation for optional " Yinghai Lu
2016-04-08 0:15 ` [PATCH v11 29/60] PCI: Don't add too much optional size for hotplug bridge MMIO Yinghai Lu
2016-04-08 0:15 ` [PATCH v11 30/60] PCI: Reorder resources list for required/optional resources Yinghai Lu
2016-04-08 0:15 ` [PATCH v11 31/60] PCI: Remove duplicated code for resource sorting Yinghai Lu
2016-04-08 0:15 ` [PATCH v11 32/60] PCI: Rename pdev_sort_resources() to pdev_assign_resources_prepare() Yinghai Lu
2016-04-08 0:15 ` [PATCH v11 33/60] PCI: Treat ROM resource as optional during realloc Yinghai Lu
2016-04-08 0:15 ` [PATCH v11 34/60] PCI: Add debug printout during releasing partial assigned resources Yinghai Lu
2016-04-08 0:15 ` [PATCH v11 35/60] PCI: Simplify res reference using in __assign_resources_sorted() Yinghai Lu
2016-04-08 0:15 ` [PATCH v11 36/60] PCI: Add __add_to_list() Yinghai Lu
2016-04-08 0:15 ` [PATCH v11 37/60] PCI: Cache window alignment value during bus sizing Yinghai Lu
2016-04-08 0:15 ` [PATCH v11 38/60] PCI: Check if resource is allocated before trying to assign one Yinghai Lu
2016-04-08 0:15 ` [PATCH v11 39/60] PCI: Separate out save_resources()/restore_resources() Yinghai Lu
2016-04-08 0:15 ` [PATCH v11 40/60] PCI: Move comment to pci_need_to_release() Yinghai Lu
2016-04-08 0:15 ` [PATCH v11 41/60] PCI: Separate required+optional assigning to another function Yinghai Lu
2016-04-08 0:15 ` [PATCH v11 42/60] PCI: Skip required+optional if there is no optional Yinghai Lu
2016-04-08 0:15 ` [PATCH v11 43/60] PCI: Move saved required resource list out of required+optional assigning Yinghai Lu
2016-04-08 0:15 ` [PATCH v11 44/60] PCI: Add alt_size ressource allocation support Yinghai Lu
2016-04-08 0:56 ` Linus Torvalds
2016-04-08 5:50 ` Yinghai Lu
2016-04-08 6:24 ` Benjamin Herrenschmidt
2016-04-08 0:15 ` [PATCH v11 45/60] PCI: Add support for more than two alt_size entries under same bridge Yinghai Lu
2016-04-08 0:15 ` [PATCH v11 46/60] PCI: Fix size calculation with old_size on rescan path Yinghai Lu
2016-04-08 0:16 ` [PATCH v11 47/60] PCI: Don't add too much optional size for hotplug bridge io Yinghai Lu
2016-04-08 0:16 ` [PATCH v11 48/60] PCI: Move ISA io port align out of calculate_iosize() Yinghai Lu
2016-04-08 0:16 ` [PATCH v11 49/60] PCI: Don't add too much io port for hotplug bridge with old size Yinghai Lu
2016-04-08 0:16 ` [PATCH v11 50/60] PCI: Unify calculate_size() for io port and MMIO Yinghai Lu
2016-04-08 0:16 ` [PATCH v11 51/60] PCI: Allow bridge optional only io port resource required size to be 0 Yinghai Lu
2016-04-08 0:16 ` [PATCH v11 52/60] PCI: Unify skip_ioresource_align() Yinghai Lu
2016-04-08 0:16 ` [PATCH v11 53/60] PCI: Kill macro checking for bus io port sizing Yinghai Lu
2016-04-08 0:16 ` [PATCH v11 54/60] resources: Make allocate_resource() return best fit resource Yinghai Lu
2016-04-08 0:16 ` [PATCH v11 55/60] PCI, x86: Allocate from high in available window for MMIO Yinghai Lu
2016-04-08 0:16 ` [PATCH v11 56/60] PCI: Add debug print out for min_align and alt_size Yinghai Lu
2016-04-08 0:16 ` [PATCH v11 57/60] PCI, x86: Add pci=assign_pref_bars to reallocate pref BARs Yinghai Lu
2016-04-08 0:16 ` [PATCH v11 58/60] PCI: Introduce resource_disabled() Yinghai Lu
2016-04-08 0:16 ` [PATCH v11 59/60] PCI: Don't set flags to 0 when assign resource fail Yinghai Lu
2016-04-08 0:16 ` [PATCH v11 60/60] PCI: Only try to assign io port only for root bus that support it Yinghai Lu
2016-04-08 0:51 ` [PATCH v11 00/60] PCI: Resource allocation cleanup for v4.7 Linus Torvalds
2016-04-09 5:29 ` Yinghai Lu
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='CAE9FiQV19OUsSL34GzDXYtVG=Xs724CpwHNfu3HCmYMUqbmrqQ@mail.gmail.com' \
--to=yinghai@kernel.org \
--cc=benh@kernel.crashing.org \
--cc=bhelgaas@google.com \
--cc=davem@davemloft.net \
--cc=helgaas@kernel.org \
--cc=khalid.aziz@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux@iam.tj \
--cc=mpe@ellerman.id.au \
--cc=torvalds@linux-foundation.org \
--cc=wangyijing@huawei.com \
--cc=weiyang@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).