RFC: [PATCH] resource: ensure MMIO exclusivity for device drivers
Subsystems (5)
From: Arjan van de Ven <[email protected]>
Date: Wed, 22 Oct 2008 19:55:31 -0700
Subject: [PATCH] resource: ensure MMIO exclusivity for device drivers
Device drivers that use pci_request_regions() (and similar APIs) have a reasonable expectation that they are the only ones accessing their device. As part of the e1000e hunt, we were afraid that some userland (X or some bootsplash stuff) was mapping the MMIO region that the driver thought it had exclusively via /dev/mem or via various sysfs resource mappings.
This patch adds the option for device drivers to cause their reserved regions to be on the "banned from /dev/mem use" list, so now both kernel memory and device-exclusive MMIO regions are banned.
NOTE: This is only active when CONFIG_STRICT_DEVMEM is set.
In addition to the config option, a kernel parameter iomem=relaxed is provided for the cases where developers want to diagnose, in the field, drivers issues from userspace despite the drivers explicit request.
--- Documentation/kernel-parameters.txt | 4 + arch/x86/mm/init_32.c | 2 + arch/x86/mm/init_64.c | 2 + drivers/net/e1000e/netdev.c | 2 +- drivers/pci/pci-sysfs.c | 3 + drivers/pci/pci.c | 107 +++++++++++++++++++++++++++++++---- include/linux/ioport.h | 11 +++- include/linux/pci.h | 3 + kernel/resource.c | 61 +++++++++++++++++++- 9 files changed, 176 insertions(+), 19 deletions(-)
Documentation/kernel-parameters.txt +4 -0
@@ -886,6 +886,10 @@ and is between 256 and 4096 characters. It is defined in the file inttest= [IA64] + iomem= Disable strict checking of access to MMIO memory + strict regions from userspace. + relaxed + iommu= [x86] off force
arch/x86/mm/init_32.c +2 -0
@@ -329,6 +329,8 @@ int devmem_is_allowed(unsigned long pagenr) {if (pagenr <=256 )return 1 ; +if (iomem_is_exclusive (pagenr <<PAGE_SHIFT )) +return 0 ;if (!page_is_ram (pagenr))return 1 ;return 0 ;
arch/x86/mm/init_64.c +2 -0
@@ -866,6 +866,8 @@ int devmem_is_allowed(unsigned long pagenr) {if (pagenr <=256 )return 1 ; +if (iomem_is_exclusive (pagenr <<PAGE_SHIFT )) +return 0 ;if (!page_is_ram (pagenr))return 1 ;return 0 ;
drivers/net/e1000e/netdev.c +1 -1
@@ -4742,7 +4742,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev, } } - err =pci_request_selected_regions (pdev, + err =pci_request_selected_regions_exclusive (pdev,pci_select_bars (pdev,IORESOURCE_MEM ), e1000e_driver_name);if (err)
drivers/pci/pci-sysfs.c +3 -0
@@ -620,6 +620,9 @@ pci_mmap_resource(struct kobject *kobj, struct bin_attribute *attr, vma->vm_pgoff += start >>PAGE_SHIFT ; mmap_type = res->flags &IORESOURCE_MEM ? pci_mmap_mem : pci_mmap_io; +if (res->flags &IORESOURCE_MEM &&iomem_is_exclusive (start)) +return -EINVAL ; +return pci_mmap_page_range (pdev, vma, mmap_type, write_combine); }
drivers/pci/pci.c +95 -12
158 lines not on this page · raw message
include/linux/ioport.h +8 -3
@@ -49,6 +49,7 @@ struct resource_list {#define IORESOURCE_SIZEALIGN 0x00020000/* size indicates alignment */ #define IORESOURCE_STARTALIGN 0x00040000/* start field is alignment */ +#define IORESOURCE_EXCLUSIVE 0x08000000/* Userland may not map this resource */ #define IORESOURCE_DISABLED 0x10000000#define IORESOURCE_UNSET 0x20000000#define IORESOURCE_AUTO 0x40000000
@@ -133,13 +134,16 @@ static inline unsigned long resource_type(struct resource *res) }/* Convenience shorthand with allocation */ -#define request_region (start,n,name) __request_region(&ioport_resource, (start), (n), (name)) -#define request_mem_region (start,n,name) __request_region(&iomem_resource, (start), (n), (name)) +#define request_region (start,n,name) __request_region(&ioport_resource, (start), (n), (name), 0) +#define __request_mem_region (start,n,name, excl) __request_region(&iomem_resource, (start), (n), (name), excl) +#define request_mem_region (start,n,name) __request_region(&iomem_resource, (start), (n), (name), 0) +#define request_mem_region_exclusive (start,n,name) \ + __request_region(&iomem_resource, (start), (n), (name), IORESOURCE_EXCLUSIVE)#define rename_region (region, newname) do { (region)->name = (newname); } while (0)extern struct resource *__request_region (struct resource *,resource_size_t start, -resource_size_t n,const char *name); +resource_size_t n,const char *name,int relaxed);/* Compatibility cruft */ #define release_region (start,n) __release_region(&ioport_resource, (start), (n))
@@ -175,6 +179,7 @@ extern struct resource * __devm_request_region(struct device *dev,extern void __devm_release_region (struct device *dev,struct resource *parent,resource_size_t start,resource_size_t n);extern int iomem_map_sanity_check (resource_size_t addr,unsigned long size); +extern int iomem_is_exclusive (u64 addr);#endif /* __ASSEMBLY__ */ #endif /* _LINUX_IOPORT_H */
include/linux/pci.h +3 -0
@@ -665,10 +665,13 @@ void pci_fixup_irqs(u8 (*)(struct pci_dev *, u8 *), int (*)(struct pci_dev *, u8, u8));#define HAVE_PCI_REQ_REGIONS 2int __must_check pci_request_regions (struct pci_dev *,const char *); +int __must_check pci_request_regions_exclusive (struct pci_dev *,const char *);void pci_release_regions (struct pci_dev *);int __must_check pci_request_region (struct pci_dev *,int ,const char *); +int __must_check pci_request_region_exclusive (struct pci_dev *,int ,const char *);void pci_release_region (struct pci_dev *,int );int pci_request_selected_regions (struct pci_dev *,int ,const char *); +int pci_request_selected_regions_exclusive (struct pci_dev *,int ,const char *);void pci_release_selected_regions (struct pci_dev *,int );/* drivers/pci/bus.c */
kernel/resource.c +58 -3
88 lines not on this page · raw message
Signature · 8 lines
1.5.5.1 -- Arjan van de Ven Intel Open Source Technology Centre For development, discussion and tips for power savings, visit http://www.lesswatts.org
Quoted 16 lines · Arjan van de Ven
From: Arjan van de Ven <[email protected]>
Date: Wed, 22 Oct 2008 19:55:31 -0700
Subject: [PATCH] resource: ensure MMIO exclusivity for device driversDevice drivers that use
pci_request_regions()(and similar APIs) have a reasonable expectation that they are the only ones accessing their device. As part of the e1000e hunt, we were afraid that some userland (X or some bootsplash stuff) was mapping the MMIO region that the driver thought it had exclusively via/dev/memor via various sysfs resource mappings.This patch adds the option for device drivers to cause their reserved regions to be on the "banned from
/dev/memuse" list, so now both kernel memory and device-exclusive MMIO regions are banned.
NOTE: This is only active whenCONFIG_STRICT_DEVMEMis set.
Quoted 5 lines
In addition to the config option, a kernel parameter iomem=relaxed is provided for the cases where developers want to diagnose, in the field, drivers issues from userspace despite the drivers explicit request.
Signed-off-by Arjan van de Ven <[email protected]>
the concept looks fine to me - the stricter we are in this area the better IMO. Unless there are objections, i guess it's best to do this via the PCI tree?
Ingo