search for: map_cap

...oo much. The spec says: > The drivers SHOULD only map part of configuration structure large enough > for device operation. We don't map it here though. We just reserve what belongs to virtio according to the capabilities. > I think you should limit this to PAGE_SIZE like we do for map_capability. notify is much larger than PAGE_SIZE. > > err = -EINVAL; > > vp_dev->common = map_capability(pci_dev, common, > > sizeof(struct virtio_pci_common_cfg), 4, > > map_capability has a bunch of checks in place to validate the capability > structure. Wit...

...oo much. The spec says: > The drivers SHOULD only map part of configuration structure large enough > for device operation. We don't map it here though. We just reserve what belongs to virtio according to the capabilities. > I think you should limit this to PAGE_SIZE like we do for map_capability. notify is much larger than PAGE_SIZE. > > err = -EINVAL; > > vp_dev->common = map_capability(pci_dev, common, > > sizeof(struct virtio_pci_common_cfg), 4, > > map_capability has a bunch of checks in place to validate the capability > structure. Wit...

..._dword(dev, off + offsetof(struct virtio_pci_cap, offset), + &offset); + pci_read_config_dword(dev, off + offsetof(struct virtio_pci_cap, length), + &length); + + return request_mem_region(pci_resource_start(dev, bar) + offset, + length, name); +} + static void __iomem *map_capability(struct pci_dev *dev, int off, size_t minlen, u32 align, @@ -131,10 +149,12 @@ static void __iomem *map_capability(struct pci_dev *dev, int off, } p = pci_iomap_range(dev, bar, offset, length); - if (!p) + if (!p) { dev_err(&dev->dev, "virtio_pci: un...

..._dword(dev, off + offsetof(struct virtio_pci_cap, offset), + &offset); + pci_read_config_dword(dev, off + offsetof(struct virtio_pci_cap, length), + &length); + + return request_mem_region(pci_resource_start(dev, bar) + offset, + length, name); +} + static void __iomem *map_capability(struct pci_dev *dev, int off, size_t minlen, u32 align, @@ -131,10 +149,12 @@ static void __iomem *map_capability(struct pci_dev *dev, int off, } p = pci_iomap_range(dev, bar, offset, length); - if (!p) + if (!p) { dev_err(&dev->dev, "virtio_pci: un...

...ci_resource_len(dev, bar)); > > + return NULL; > > + } > > + > > + if (limit && length > limit) > > + length = limit; > > + > > I'll have to review the above carefully. Hopefully next week. > Any reason you didn't just move code out map_capability to a helper, > without changes? Would have made review easier. Doesn't work that easily as there are different things to check. request_capability verifies the capability itself only, map_capability has a bunch of additional range checks because it supports partial maps. > I don...

...ci_resource_len(dev, bar)); > > + return NULL; > > + } > > + > > + if (limit && length > limit) > > + length = limit; > > + > > I'll have to review the above carefully. Hopefully next week. > Any reason you didn't just move code out map_capability to a helper, > without changes? Would have made review easier. Doesn't work that easily as there are different things to check. request_capability verifies the capability itself only, map_capability has a bunch of additional range checks because it supports partial maps. > I don...

...ar %i length %lu\n", + length, offset, bar, + (unsigned long)pci_resource_len(dev, bar)); + return NULL; + } + + if (limit && length > limit) + length = limit; + + return request_mem_region(pci_resource_start(dev, bar) + offset, + length, name); +} + static void __iomem *map_capability(struct pci_dev *dev, int off, size_t minlen, u32 align, @@ -131,10 +162,12 @@ static void __iomem *map_capability(struct pci_dev *dev, int off, } p = pci_iomap_range(dev, bar, offset, length); - if (!p) + if (!p) { dev_err(&dev->dev, "virtio_pci: un...

...ar %i length %lu\n", + length, offset, bar, + (unsigned long)pci_resource_len(dev, bar)); + return NULL; + } + + if (limit && length > limit) + length = limit; + + return request_mem_region(pci_resource_start(dev, bar) + offset, + length, name); +} + static void __iomem *map_capability(struct pci_dev *dev, int off, size_t minlen, u32 align, @@ -131,10 +162,12 @@ static void __iomem *map_capability(struct pci_dev *dev, int off, } p = pci_iomap_range(dev, bar, offset, length); - if (!p) + if (!p) { dev_err(&dev->dev, "virtio_pci: un...

...pci_resource_start(dev, bar) + offset, > + length, name); > +} > + For device config, this might request too much. The spec says: The drivers SHOULD only map part of configuration structure large enough for device operation. I think you should limit this to PAGE_SIZE like we do for map_capability. > static void __iomem *map_capability(struct pci_dev *dev, int off, > size_t minlen, > u32 align, > @@ -131,10 +149,12 @@ static void __iomem *map_capability(struct pci_dev *dev, int off, > } > > p = pci_iomap_range(dev, bar, offset, length); &...

...ength, offset, bar, > + (unsigned long)pci_resource_len(dev, bar)); > + return NULL; > + } > + > + if (limit && length > limit) > + length = limit; > + I'll have to review the above carefully. Hopefully next week. Any reason you didn't just move code out map_capability to a helper, without changes? Would have made review easier. I don't see reasons to request regions that we aren't going to claim ... > + return request_mem_region(pci_resource_start(dev, bar) + offset, > + length, name); Hmm this seems wrong, resource can be IO, not...

Hi all: This series introduce basic functionality of doorbell mapping support for vhost-vDPA. Userspace program may use mmap() to map a the doorbell of a specific virtqueue into its address space. This is help to reudce the syscall or vmexit overhead. A new vdpa_config_ops was introduced to report the location of the doorbell, vhost_vdpa may then choose to map the doorbell when: - The doorbell

Hi all: This series introduce basic functionality of doorbell mapping support for vhost-vDPA. Userspace program may use mmap() to map a the doorbell of a specific virtqueue into its address space. This is help to reudce the syscall or vmexit overhead. A new vdpa_config_ops was introduced to report the location of the doorbell, vhost_vdpa may then choose to map the doorbell when: - The doorbell

...ic data (non-legacy mode) */ + void __iomem *device; + /* Base of vq notifications (non-legacy mode). */ + void __iomem *notify_base; + + /* So we can sanity-check accesses. */ + size_t notify_len; + size_t device_len; + + /* Capability for when we need to map notifications per-vq. */ + int notify_map_cap; + + /* Multiply queue_notify_off by this value. (non-legacy mode). */ + u32 notify_offset_multiplier; + + /* Legacy only field */ /* the IO mapping for the PCI config space */ void __iomem *ioaddr; - /* the IO mapping for ISR operation */ - void __iomem *isr; - /* a list of queues so we ca...

...ic data (non-legacy mode) */ + void __iomem *device; + /* Base of vq notifications (non-legacy mode). */ + void __iomem *notify_base; + + /* So we can sanity-check accesses. */ + size_t notify_len; + size_t device_len; + + /* Capability for when we need to map notifications per-vq. */ + int notify_map_cap; + + /* Multiply queue_notify_off by this value. (non-legacy mode). */ + u32 notify_offset_multiplier; + + /* Legacy only field */ /* the IO mapping for the PCI config space */ void __iomem *ioaddr; - /* the IO mapping for ISR operation */ - void __iomem *isr; - /* a list of queues so we ca...

...if (pci_resource_len(dev, bar) && >> + pci_resource_flags(dev, bar) & ioresource_types) { >> + *bars |= (1 << bar); >> + return pos; >> + } >> + } >> + } >> + return 0; >> +} >> + >> +static void __iomem *map_capability(struct vp_vdpa *vp_vdpa, int off, >> + resource_size_t *pa) >> +{ >> + struct pci_dev *pdev = vp_vdpa->pdev; >> + u32 offset; >> + u8 bar; >> + >> + pci_read_config_byte(pdev, >> + off + offsetof(struct virtio_pci_cap, bar), &g...

...if (pci_resource_len(dev, bar) && >> + pci_resource_flags(dev, bar) & ioresource_types) { >> + *bars |= (1 << bar); >> + return pos; >> + } >> + } >> + } >> + return 0; >> +} >> + >> +static void __iomem *map_capability(struct vp_vdpa *vp_vdpa, int off, >> + resource_size_t *pa) >> +{ >> + struct pci_dev *pdev = vp_vdpa->pdev; >> + u32 offset; >> + u8 bar; >> + >> + pci_read_config_byte(pdev, >> + off + offsetof(struct virtio_pci_cap, bar), &g...

...nline void vp_iowrite8(u8 value, u8 __iomem *addr) +{ + iowrite8(value, addr); +} + +static inline void vp_iowrite16(u16 value, u16 __iomem *addr) +{ + iowrite16(value, addr); +} + +static inline void vp_iowrite32(u32 value, u32 __iomem *addr) +{ + iowrite16(value, addr); +} + static void __iomem *map_capability(struct pci_dev *dev, int off, size_t minlen, u32 align, -- MST

...nline void vp_iowrite8(u8 value, u8 __iomem *addr) +{ + iowrite8(value, addr); +} + +static inline void vp_iowrite16(u16 value, u16 __iomem *addr) +{ + iowrite16(value, addr); +} + +static inline void vp_iowrite32(u32 value, u32 __iomem *addr) +{ + iowrite16(value, addr); +} + static void __iomem *map_capability(struct pci_dev *dev, int off, size_t minlen, u32 align, -- MST

...cture, in bytes. */ }; #define VIRTIO_PCI_CAP_BAR_SHIFT 5 diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c index e2f41c9..a3d8101 100644 --- a/drivers/virtio/virtio_pci_modern.c +++ b/drivers/virtio/virtio_pci_modern.c @@ -26,13 +26,13 @@ static void __iomem *map_capability(struct pci_dev *dev, int off, u32 start, u32 size, size_t *len) { - u8 type_and_bar, bar; + u8 bar; u32 offset, length; void __iomem *p; pci_read_config_byte(dev, off + offsetof(struct virtio_pci_cap, - type_and_bar), - &type_and_bar); + bar)...

...cture, in bytes. */ }; #define VIRTIO_PCI_CAP_BAR_SHIFT 5 diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c index e2f41c9..a3d8101 100644 --- a/drivers/virtio/virtio_pci_modern.c +++ b/drivers/virtio/virtio_pci_modern.c @@ -26,13 +26,13 @@ static void __iomem *map_capability(struct pci_dev *dev, int off, u32 start, u32 size, size_t *len) { - u8 type_and_bar, bar; + u8 bar; u32 offset, length; void __iomem *p; pci_read_config_byte(dev, off + offsetof(struct virtio_pci_cap, - type_and_bar), - &type_and_bar); + bar)...