staging: vme_user: provide DMA functionality
PATCH RESEND v4 1/1 staging: vme_user: provide DMA functionality
This introduces a new dma device that provides a single ioctl call that provides DMA read and write functionality to the user space.
---
In the last reply Martyn suggested a rework of this to make it use existing bus/vme/ctl instead of creating a new bus/vme/dma%i device and also dynamically allocate a dma resource in each request.
I think this doesn't need those adjustments. I think that dynamic allocation doesn't solve any practical problem that isn't caused by current kernel api. I also think that separate device is a good feature because it allows for discovery of dma capatibility from userspace. The interface with separate chardev also allows to provide DMA read() and write() syscalls that can come handy in pair with /bin/dd.
--- drivers/staging/vme/devices/vme_user.c | 201 ++++++++++++++++++++++++++++++++- drivers/staging/vme/devices/vme_user.h | 11 ++ 2 files changed, 209 insertions(+), 3 deletions(-)
drivers/staging/vme/devices/vme_user.c +198 -3
@@ -79,15 +79,18 @@ static unsigned int bus_num;* We shall support 4 masters and 4 slaves with this driver. */ #define VME_MAJOR 221/* VME Major Device Number */ -#define VME_DEVS 9/* Number of dev entries */ +#define VME_DEVS 10/* Number of dev entries */ #define MASTER_MINOR 0#define MASTER_MAX 3#define SLAVE_MINOR 4#define SLAVE_MAX 7#define CONTROL_MINOR 8 +#define DMA_MINOR 9 -#define PCI_BUF_SIZE 0x20000/* Size of one slave image buffer */ +#define PCI_BUF_SIZE 0x20000/* Size of one slave image buffer */ + +#define VME_MAX_DMA_LEN 0x4000000/* Maximal DMA transfer length */ /* * Structure to handle image related parameters.
@@ -112,7 +115,7 @@ static const int type[VME_DEVS] = { MASTER_MINOR, MASTER_MINOR,MASTER_MINOR ,MASTER_MINOR ,SLAVE_MINOR ,SLAVE_MINOR ,SLAVE_MINOR ,SLAVE_MINOR , -CONTROL_MINOR +CONTROL_MINOR ,DMA_MINOR }; struct vme_user_vma_priv {
@@ -343,6 +346,168 @@ static loff_t vme_user_llseek(struct file *file, loff_t off, int whence)return -EINVAL ; } +static int vme_user_sg_to_dma_list (const struct vme_dma_op *dma_op, +struct sg_table *sgt, +int sg_count,struct vme_dma_list *dma_list) +{ +ssize_t pos =0 ; +struct scatterlist *sg; +int i, ret; + +for_each_sg (sgt->sgl, sg, sg_count, i) { +struct vme_dma_attr *pci_attr, *vme_attr, *src, *dest; +dma_addr_t hw_address =sg_dma_address (sg); +unsigned int hw_len =sg_dma_len (sg); + + vme_attr =vme_dma_vme_attribute (dma_op->vme_addr + pos, + dma_op->aspace, + dma_op->cycle, + dma_op->dwidth); +if (!vme_attr) +return -ENOMEM ; + + pci_attr =vme_dma_pci_attribute (hw_address); +if (!pci_attr) { +vme_dma_free_attribute (vme_attr); +return -ENOMEM ; + } + +switch (dma_op->dir) { +case VME_DMA_MEM_TO_VME : + src = pci_attr; + dest = vme_attr; +break ; +case VME_DMA_VME_TO_MEM : + src = vme_attr; + dest = pci_attr; +break ; + } + + ret =vme_dma_list_add (dma_list, src, dest, hw_len); + +/* +* XXX VME API doesn't mention whether we should keep +* attributes around +*/ +vme_dma_free_attribute (vme_attr); +vme_dma_free_attribute (pci_attr); + +if (ret) +return ret; + + pos += hw_len; + } + +return 0 ; +} + +static enum dma_data_direction vme_dir_to_dma_dir (unsigned vme_dir) +{ +switch (vme_dir) { +case VME_DMA_VME_TO_MEM : +return DMA_FROM_DEVICE ; +case VME_DMA_MEM_TO_VME : +return DMA_TO_DEVICE ; + } + +return DMA_NONE ; +} + +static ssize_t vme_user_dma_ioctl (unsigned int minor, +const struct vme_dma_op *dma_op) +{ +unsigned int offset =offset_in_page (dma_op->buf_vaddr); +unsigned long nr_pages; +enum dma_data_direction dir; +struct vme_dma_list *dma_list; +struct sg_table *sgt =NULL ; +struct page **pages =NULL ; +long got_pages; +ssize_t count; +int retval, sg_count; + +/* Prevent WARN from dma_map_sg */ +if (dma_op->count ==0 ) +return 0 ; + +/* +* This is a voluntary limit to prevent huge allocation for pages +* array. VME_MAX_DMA_LEN is not a fundamental VME constraint. +*/ + count =min_t (size_t, dma_op->count,VME_MAX_DMA_LEN ); + nr_pages = (offset + count +PAGE_SIZE -1 ) >>PAGE_SHIFT ; + + dir =vme_dir_to_dma_dir (dma_op->dir); +if (dir ==DMA_NONE ) +return -EINVAL ; + + pages =kmalloc_array (nr_pages,sizeof (pages[0 ]),GFP_KERNEL ); +if (!pages) { + retval = -ENOMEM ; + goto free; + } + + sgt =kzalloc (sizeof (*sgt),GFP_KERNEL ); +if (!sgt) { + retval = -ENOMEM ; + goto free; + } + + dma_list =vme_new_dma_list (image[minor].resource); +if (!dma_list) { + retval = -ENOMEM ; + goto free; + } + + got_pages =get_user_pages_fast (dma_op->buf_vaddr, nr_pages, + dir ==DMA_FROM_DEVICE , pages); +if (got_pages != nr_pages) { +pr_debug ("Not all pages were pinned\n" ); + retval = (got_pages <0 ) ? got_pages : -EFAULT ; + goto release_pages; + } + + retval =sg_alloc_table_from_pages (sgt, pages, nr_pages, + offset, count,GFP_KERNEL ); +if (retval) + goto release_pages; + + sg_count =dma_map_sg (vme_user_bridge->dev.parent, + sgt->sgl, sgt->nents, dir); +if (!sg_count) { +pr_debug ("DMA mapping error\n" ); + retval = -EFAULT ; + goto free_sgt; + } + + retval =vme_user_sg_to_dma_list (dma_op, sgt, sg_count, dma_list); +if (retval) + goto dma_unmap; + + retval =vme_dma_list_exec (dma_list); + +dma_unmap: +dma_unmap_sg (vme_user_bridge->dev.parent, sgt->sgl, sgt->nents, dir); + +free_sgt: +sg_free_table (sgt); + +release_pages: +if (got_pages >0 ) +release_pages (pages, got_pages,0 ); + +vme_dma_list_free (dma_list); + +free: +kfree (sgt); +kfree (pages); + +if (retval) +return retval; + +return count; +} +/* * The ioctls provided by the old VME access method (the one at vmelinux.org) * are most certainly wrong as the effectively push the registers layout
@@ -359,6 +524,7 @@ static int vme_user_ioctl(struct inode *inode, struct file *file,struct vme_master master;struct vme_slave slave;struct vme_irq_id irq_req; +struct vme_dma_op dma_op;unsigned long copied;unsigned int minor =MINOR (inode->i_rdev);int retval;
@@ -467,6 +633,19 @@ static int vme_user_ioctl(struct inode *inode, struct file *file,break ; }break ; +case DMA_MINOR : +switch (cmd) { +case VME_DO_DMA : + copied =copy_from_user (&dma_op, argp, +sizeof (dma_op)); +if (copied !=0 ) { +pr_warn ("Partial copy from userspace\n" ); +return -EFAULT ; + } + +return vme_user_dma_ioctl (minor, &dma_op); + } +break ; }return -EINVAL ;
@@ -678,6 +857,15 @@ static int vme_user_probe(struct vme_dev *vdev) } } + image[DMA_MINOR ].resource =vme_dma_request (vme_user_bridge, +VME_DMA_VME_TO_MEM |VME_DMA_MEM_TO_VME ); +if (!image[DMA_MINOR ].resource) { +dev_warn (&vdev->dev, +"Unable to allocate dma resource\n" ); + err = -ENOMEM ; + goto err_master; + } +/* Create sysfs entries - on udev systems this creates the dev files */ vme_user_sysfs_class =class_create (THIS_MODULE , driver_name);if (IS_ERR (vme_user_sysfs_class)) {
@@ -700,6 +888,9 @@ static int vme_user_probe(struct vme_dev *vdev)case SLAVE_MINOR : name ="bus/vme/s%d" ;break ; +case DMA_MINOR : + name ="bus/vme/dma0" ; +break ;default : err = -EINVAL ; goto err_sysfs;
@@ -724,6 +915,8 @@ err_sysfs: }class_destroy (vme_user_sysfs_class); +vme_dma_free (image[DMA_MINOR ].resource); +/* Ensure counter set correcty to unalloc all master windows */ i =MASTER_MAX +1 ; err_master:
@@ -764,6 +957,8 @@ static int vme_user_remove(struct vme_dev *dev) }class_destroy (vme_user_sysfs_class); +vme_dma_free (image[DMA_MINOR ].resource); +for (i =MASTER_MINOR ; i < (MASTER_MAX +1 ); i++) {kfree (image[i].kern_buf);vme_master_free (image[i].resource);
drivers/staging/vme/devices/vme_user.h +11 -0
@@ -48,11 +48,22 @@ struct vme_irq_id { __u8 statid; }; +struct vme_dma_op { +__u64 vme_addr;/* Starting Address on the VMEbus */ +__u64 buf_vaddr;/* Pointer to userspace memory */ +__u32 count;/* Count of bytes to copy */ +__u32 aspace;/* Address Space */ +__u32 cycle;/* Cycle properties */ +__u32 dwidth;/* Data transfer width */ +__u32 dir;/* Transfer Direction */ +}; +#define VME_GET_SLAVE _IOR(VME_IOC_MAGIC, 1, struct vme_slave)#define VME_SET_SLAVE _IOW(VME_IOC_MAGIC, 2, struct vme_slave)#define VME_GET_MASTER _IOR(VME_IOC_MAGIC, 3, struct vme_master)#define VME_SET_MASTER _IOW(VME_IOC_MAGIC, 4, struct vme_master)#define VME_IRQ_GEN _IOW(VME_IOC_MAGIC, 5, struct vme_irq_id) +#define VME_DO_DMA _IOW(VME_IOC_MAGIC, 7, struct vme_dma_op)#endif /* _VME_USER_H_ */
Signature · 1 line
1.8.3.1
kbuild test robot
build botconfig: x86_64-randconfig-x010-201541 (attached as .config) reproduce:
Hi Dmitry,
[auto build test WARNING on driver-core/driver-core-next -- if it's inappropriate base, please ignore]
config: x86_64-randconfig-x010-201541 (attached as .config) reproduce:
# save the attached .config to linux build tree
make ARCH=x86_64 Note: it may well be a FALSE warning. FWIW you are at least aware of it now.
http://gcc.gnu.org/wiki/Better_Uninitialized_Warnings
All warnings (new ones prefixed by >>):
drivers/staging/vme/devices/vme_user.c: In function 'vme_user_ioctl.isra.4':
>> drivers/staging/vme/devices/vme_user.c:324:7: warning: 'dest' may be used uninitialized in this function [-Wmaybe-uninitialized]
ret = vme_dma_list_add(dma_list, src, dest, hw_len);
^
drivers/staging/vme/devices/vme_user.c:296:52: note: 'dest' was declared here
struct vme_dma_attr *pci_attr, *vme_attr, *src, *dest;
^
>> drivers/staging/vme/devices/vme_user.c:324:7: warning: 'src' may be used uninitialized in this function [-Wmaybe-uninitialized]
ret = vme_dma_list_add(dma_list, src, dest, hw_len);
^
drivers/staging/vme/devices/vme_user.c:296:46: note: 'src' was declared here
struct vme_dma_attr *pci_attr, *vme_attr, *src, *dest;
^vim +/dest +324 drivers/staging/vme/devices/vme_user.c
308 if (!pci_attr) {
309 vme_dma_free_attribute(vme_attr);
310 return -ENOMEM;
311 }
312
313 switch (dma_op->dir) {
314 case VME_DMA_MEM_TO_VME:
315 src = pci_attr;
316 dest = vme_attr;
317 break;
318 case VME_DMA_VME_TO_MEM:
319 src = vme_attr;
320 dest = pci_attr;
321 break;
322 }
323
> 324 ret = vme_dma_list_add(dma_list, src, dest, hw_len);
325
326 /*
327 * XXX VME API doesn't mention whether we should keep
328 * attributes around
329 */
330 vme_dma_free_attribute(vme_attr);
331 vme_dma_free_attribute(pci_attr);
332
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
PATCH v5 1/1 staging: vme_user: provide DMA functionality
This introduces a new dma device that provides a single ioctl call that provides DMA read and write functionality to the user space.
---
In the last reply Martyn suggested a rework of this to make it use existing bus/vme/ctl instead of creating a new bus/vme/dma%i device and also dynamically allocate a dma resource in each request.
I think this doesn't need those adjustments. I think that dynamic allocation doesn't solve any practical problem that isn't caused by current kernel api. I also think that separate device is a good feature because it allows for discovery of dma capatibility from userspace. The interface with separate chardev also allows to provide DMA read() and write() syscalls that can come handy in pair with /bin/dd.
v5:
Added a validation for dma_op argument in vme_user_sg_to_dma_list(). It is already checked in caller but we would like to silence a warning:
drivers/staging/vme/devices/vme_user.c: In function 'vme_user_ioctl.isra.4':
Quoted 1 line
Quoted 1 line
drivers/staging/vme/devices/vme_user.c:324:7: warning: 'dest' may be used uninitialized in this function [-Wmaybe-uninitialized]
ret = vme_dma_list_add(dma_list, src, dest, hw_len);
^
drivers/staging/vme/devices/vme_user.c:296:52: note: 'dest' was declared here
struct vme_dma_attr *pci_attr, *vme_attr, *src, *dest;
^Quoted 1 line
Quoted 1 line
drivers/staging/vme/devices/vme_user.c:324:7: warning: 'src' may be used uninitialized in this function [-Wmaybe-uninitialized]
ret = vme_dma_list_add(dma_list, src, dest, hw_len);
^
drivers/staging/vme/devices/vme_user.c:296:46: note: 'src' was declared here
struct vme_dma_attr *pci_attr, *vme_attr, *src, *dest;--- drivers/staging/vme/devices/vme_user.c | 205 ++++++++++++++++++++++++++++++++- drivers/staging/vme/devices/vme_user.h | 11 ++ 2 files changed, 213 insertions(+), 3 deletions(-)
drivers/staging/vme/devices/vme_user.c +202 -3
@@ -79,15 +79,18 @@ static unsigned int bus_num;* We shall support 4 masters and 4 slaves with this driver. */ #define VME_MAJOR 221/* VME Major Device Number */ -#define VME_DEVS 9/* Number of dev entries */ +#define VME_DEVS 10/* Number of dev entries */ #define MASTER_MINOR 0#define MASTER_MAX 3#define SLAVE_MINOR 4#define SLAVE_MAX 7#define CONTROL_MINOR 8 +#define DMA_MINOR 9 -#define PCI_BUF_SIZE 0x20000/* Size of one slave image buffer */ +#define PCI_BUF_SIZE 0x20000/* Size of one slave image buffer */ + +#define VME_MAX_DMA_LEN 0x4000000/* Maximal DMA transfer length */ /* * Structure to handle image related parameters.
@@ -112,7 +115,7 @@ static const int type[VME_DEVS] = { MASTER_MINOR, MASTER_MINOR,MASTER_MINOR ,MASTER_MINOR ,SLAVE_MINOR ,SLAVE_MINOR ,SLAVE_MINOR ,SLAVE_MINOR , -CONTROL_MINOR +CONTROL_MINOR ,DMA_MINOR }; struct vme_user_vma_priv {
@@ -281,6 +284,172 @@ static loff_t vme_user_llseek(struct file *file, loff_t off, int whence)return -EINVAL ; } +static int vme_user_sg_to_dma_list (const struct vme_dma_op *dma_op, +struct sg_table *sgt, +int sg_count,struct vme_dma_list *dma_list) +{ +ssize_t pos =0 ; +struct scatterlist *sg; +int i, ret; + +if ((dma_op->dir !=VME_DMA_MEM_TO_VME ) && + (dma_op->dir !=VME_DMA_VME_TO_MEM )) +return -EINVAL ; + +for_each_sg (sgt->sgl, sg, sg_count, i) { +struct vme_dma_attr *pci_attr, *vme_attr, *src, *dest; +dma_addr_t hw_address =sg_dma_address (sg); +unsigned int hw_len =sg_dma_len (sg); + + vme_attr =vme_dma_vme_attribute (dma_op->vme_addr + pos, + dma_op->aspace, + dma_op->cycle, + dma_op->dwidth); +if (!vme_attr) +return -ENOMEM ; + + pci_attr =vme_dma_pci_attribute (hw_address); +if (!pci_attr) { +vme_dma_free_attribute (vme_attr); +return -ENOMEM ; + } + +switch (dma_op->dir) { +case VME_DMA_MEM_TO_VME : + src = pci_attr; + dest = vme_attr; +break ; +case VME_DMA_VME_TO_MEM : + src = vme_attr; + dest = pci_attr; +break ; + } + + ret =vme_dma_list_add (dma_list, src, dest, hw_len); + +/* +* XXX VME API doesn't mention whether we should keep +* attributes around +*/ +vme_dma_free_attribute (vme_attr); +vme_dma_free_attribute (pci_attr); + +if (ret) +return ret; + + pos += hw_len; + } + +return 0 ; +} + +static enum dma_data_direction vme_dir_to_dma_dir (unsigned vme_dir) +{ +switch (vme_dir) { +case VME_DMA_VME_TO_MEM : +return DMA_FROM_DEVICE ; +case VME_DMA_MEM_TO_VME : +return DMA_TO_DEVICE ; + } + +return DMA_NONE ; +} + +static ssize_t vme_user_dma_ioctl (unsigned int minor, +const struct vme_dma_op *dma_op) +{ +unsigned int offset =offset_in_page (dma_op->buf_vaddr); +unsigned long nr_pages; +enum dma_data_direction dir; +struct vme_dma_list *dma_list; +struct sg_table *sgt =NULL ; +struct page **pages =NULL ; +long got_pages; +ssize_t count; +int retval, sg_count; + +/* Prevent WARN from dma_map_sg */ +if (dma_op->count ==0 ) +return 0 ; + +/* +* This is a voluntary limit to prevent huge allocation for pages +* array. VME_MAX_DMA_LEN is not a fundamental VME constraint. +*/ + count =min_t (size_t, dma_op->count,VME_MAX_DMA_LEN ); + nr_pages = (offset + count +PAGE_SIZE -1 ) >>PAGE_SHIFT ; + + dir =vme_dir_to_dma_dir (dma_op->dir); +if (dir ==DMA_NONE ) +return -EINVAL ; + + pages =kmalloc_array (nr_pages,sizeof (pages[0 ]),GFP_KERNEL ); +if (!pages) { + retval = -ENOMEM ; + goto free; + } + + sgt =kzalloc (sizeof (*sgt),GFP_KERNEL ); +if (!sgt) { + retval = -ENOMEM ; + goto free; + } + + dma_list =vme_new_dma_list (image[minor].resource); +if (!dma_list) { + retval = -ENOMEM ; + goto free; + } + + got_pages =get_user_pages_fast (dma_op->buf_vaddr, nr_pages, + dir ==DMA_FROM_DEVICE , pages); +if (got_pages != nr_pages) { +pr_debug ("Not all pages were pinned\n" ); + retval = (got_pages <0 ) ? got_pages : -EFAULT ; + goto release_pages; + } + + retval =sg_alloc_table_from_pages (sgt, pages, nr_pages, + offset, count,GFP_KERNEL ); +if (retval) + goto release_pages; + + sg_count =dma_map_sg (vme_user_bridge->dev.parent, + sgt->sgl, sgt->nents, dir); +if (!sg_count) { +pr_debug ("DMA mapping error\n" ); + retval = -EFAULT ; + goto free_sgt; + } + + retval =vme_user_sg_to_dma_list (dma_op, sgt, sg_count, dma_list); +if (retval) + goto dma_unmap; + + retval =vme_dma_list_exec (dma_list); + +dma_unmap: +dma_unmap_sg (vme_user_bridge->dev.parent, sgt->sgl, sgt->nents, dir); + +free_sgt: +sg_free_table (sgt); + +release_pages: +if (got_pages >0 ) +release_pages (pages, got_pages,0 ); + +vme_dma_list_free (dma_list); + +free: +kfree (sgt); +kfree (pages); + +if (retval) +return retval; + +return count; +} +/* * The ioctls provided by the old VME access method (the one at vmelinux.org) * are most certainly wrong as the effectively push the registers layout
@@ -297,6 +466,7 @@ static int vme_user_ioctl(struct inode *inode, struct file *file,struct vme_master master;struct vme_slave slave;struct vme_irq_id irq_req; +struct vme_dma_op dma_op;unsigned long copied;unsigned int minor =MINOR (inode->i_rdev);int retval;
@@ -406,6 +576,19 @@ static int vme_user_ioctl(struct inode *inode, struct file *file,break ; }break ; +case DMA_MINOR : +switch (cmd) { +case VME_DO_DMA : + copied =copy_from_user (&dma_op, argp, +sizeof (dma_op)); +if (copied !=0 ) { +pr_warn ("Partial copy from userspace\n" ); +return -EFAULT ; + } + +return vme_user_dma_ioctl (minor, &dma_op); + } +break ; }return -EINVAL ;
@@ -615,6 +798,15 @@ static int vme_user_probe(struct vme_dev *vdev) } } + image[DMA_MINOR ].resource =vme_dma_request (vme_user_bridge, +VME_DMA_VME_TO_MEM |VME_DMA_MEM_TO_VME ); +if (!image[DMA_MINOR ].resource) { +dev_warn (&vdev->dev, +"Unable to allocate dma resource\n" ); + err = -ENOMEM ; + goto err_master; + } +/* Create sysfs entries - on udev systems this creates the dev files */ vme_user_sysfs_class =class_create (THIS_MODULE , driver_name);if (IS_ERR (vme_user_sysfs_class)) {
@@ -637,6 +829,9 @@ static int vme_user_probe(struct vme_dev *vdev)case SLAVE_MINOR : name ="bus/vme/s%d" ;break ; +case DMA_MINOR : + name ="bus/vme/dma0" ; +break ;default : err = -EINVAL ; goto err_sysfs;
@@ -661,6 +856,8 @@ err_sysfs: }class_destroy (vme_user_sysfs_class); +vme_dma_free (image[DMA_MINOR ].resource); +/* Ensure counter set correcty to unalloc all master windows */ i =MASTER_MAX +1 ; err_master:
@@ -701,6 +898,8 @@ static int vme_user_remove(struct vme_dev *dev) }class_destroy (vme_user_sysfs_class); +vme_dma_free (image[DMA_MINOR ].resource); +for (i =MASTER_MINOR ; i < (MASTER_MAX +1 ); i++) {kfree (image[i].kern_buf);vme_master_free (image[i].resource);
drivers/staging/vme/devices/vme_user.h +11 -0
@@ -48,11 +48,22 @@ struct vme_irq_id { __u8 statid; }; +struct vme_dma_op { +__u64 vme_addr;/* Starting Address on the VMEbus */ +__u64 buf_vaddr;/* Pointer to userspace memory */ +__u32 count;/* Count of bytes to copy */ +__u32 aspace;/* Address Space */ +__u32 cycle;/* Cycle properties */ +__u32 dwidth;/* Data transfer width */ +__u32 dir;/* Transfer Direction */ +}; +#define VME_GET_SLAVE _IOR(VME_IOC_MAGIC, 1, struct vme_slave)#define VME_SET_SLAVE _IOW(VME_IOC_MAGIC, 2, struct vme_slave)#define VME_GET_MASTER _IOR(VME_IOC_MAGIC, 3, struct vme_master)#define VME_SET_MASTER _IOW(VME_IOC_MAGIC, 4, struct vme_master)#define VME_IRQ_GEN _IOW(VME_IOC_MAGIC, 5, struct vme_irq_id) +#define VME_DO_DMA _IOW(VME_IOC_MAGIC, 7, struct vme_dma_op)#endif /* _VME_USER_H_ */
Signature · 1 line
1.8.3.1
Greg Kroah-Hartman
maintainerQuoted 7 lines · Dmitry Kalinkin
This introduces a new dma device that provides a single ioctl call that provides DMA read and write functionality to the user space.
Signed-off-by Dmitry Kalinkin <[email protected]>Cc Igor Alekseev <[email protected]>---
Ugh, trailing whitespace hurts the eyes...
Anyway, I need an ack from Martyn before I can accept this type of thing.
thanks,
greg k-h
Quoted 12 lines · Greg Kroah-Hartman
Quoted 7 lines · Dmitry Kalinkin
This introduces a new dma device that provides a single ioctl call that provides DMA read and write functionality to the user space.
Signed-off-by Dmitry Kalinkin <[email protected]>Cc Igor Alekseev <[email protected]>---
Quoted 8 lines
Ugh, trailing whitespace hurts the eyes...
Anyway, I need an ack from Martyn before I can accept this type of thing.
thanks,
greg k-h
This fail is sponsored by vim :set colorcolumn=80 + clipboard copy-paste.
Quoted 5 lines · Dmitry Kalinkin
This introduces a new dma device that provides a single ioctl call that provides DMA read and write functionality to the user space.
Signed-off-by Dmitry Kalinkin <[email protected]>Cc Igor Alekseev <[email protected]>
Quoted 8 lines
---
In the last reply Martyn suggested a rework of this to make it use existing bus/vme/ctl instead of creating a new bus/vme/dma%i device and also dynamically allocate a dma resource in each request.
I think this doesn't need those adjustments. I think that dynamic allocation doesn't solve any practical problem that isn't caused by current kernel api.
That would depend on what resources had already been allocated to other drivers using the kernel api and what resources the underlying bridge had to make available. This driver will currently only load if all the resources it wishes to expose to user space are available. That said, such a modification is clearly separate from adding DMA support to user space, so the argument is rather academic.
Quoted 3 lines
I also think that separate device is a good feature because it allows for discovery of dma capatibility from userspace.
Given the current user space api, that's true.
Quoted 3 lines
The interface with separate
chardev also allows to provide DMAread()andwrite()syscalls that can come handy in pair with/bin/dd.
But this patch doesn't implement such a feature does it?
(Generally happy with this for now, however couple of comments below.)
Quoted 28 lines
v5:
Added a validation fordma_opargument invme_user_sg_to_dma_list(). It is already checked in caller but we would like to silence a warning:
drivers/staging/vme/devices/vme_user.c: In function 'vme_user_ioctl.isra.4':Quoted 1 line
Quoted 1 line
drivers/staging/vme/devices/vme_user.c:324:7: warning: 'dest' may be used uninitialized in this function [-Wmaybe-uninitialized]ret = vme_dma_list_add(dma_list, src, dest, hw_len); ^ drivers/staging/vme/devices/vme_user.c:296:52: note: 'dest' was declared here struct vme_dma_attr *pci_attr, *vme_attr, *src, *dest; ^Quoted 1 line
Quoted 1 line
drivers/staging/vme/devices/vme_user.c:324:7: warning: 'src' may be used uninitialized in this function [-Wmaybe-uninitialized]ret = vme_dma_list_add(dma_list, src, dest, hw_len); ^ drivers/staging/vme/devices/vme_user.c:296:46: note: 'src' was declared here struct vme_dma_attr *pci_attr, *vme_attr, *src, *dest;--- drivers/staging/vme/devices/vme_user.c | 205 ++++++++++++++++++++++++++++++++- drivers/staging/vme/devices/vme_user.h | 11 ++ 2 files changed, 213 insertions(+), 3 deletions(-)drivers/staging/vme/devices/vme_user.c +0
-0
drivers/staging/vme/devices/vme_user.c static unsigned int bus_num; · line 80
Quoted 2 lines
drivers/staging/vme/devices/vme_user.c +0
-0@@ -79,15 +79,18 @@ static unsigned int bus_num;* We shall support 4 masters and 4 slaves with this driver. */
The comment just above here (cropped in the patch) describes the interface that this driver exposes and what is documented in Documentation/devices.txt.
I think this comment either needs updating to reflect the changes introduced in this patch, or deleted.
(As an aside:
The interface in Docmentation/devices.txt is an interesting oddity - it existed before any VME drivers were present in the kernel. Given that the driver at vmelinux.org hasn't been updated since some time in the 2.4 kernel series and the lack of mainlined drivers other than this one using that interface, should we update that file to reflect the additions?
If we were to modify this driver sufficiently, so that chrdevs were dynamically allocated for example, should we delete that entry? )
Quoted 33 lines
drivers/staging/vme/devices/vme_user.c +8
-3#define VME_MAJOR 221/* VME Major Device Number */ -#define VME_DEVS 9/* Number of dev entries */ +#define VME_DEVS 10/* Number of dev entries */ #define MASTER_MINOR 0#define MASTER_MAX 3#define SLAVE_MINOR 4#define SLAVE_MAX 7#define CONTROL_MINOR 8 +#define DMA_MINOR 9 -#define PCI_BUF_SIZE 0x20000/* Size of one slave image buffer */ +#define PCI_BUF_SIZE 0x20000/* Size of one slave image buffer */ + +#define VME_MAX_DMA_LEN 0x4000000/* Maximal DMA transfer length */ /* * Structure to handle image related parameters. @@ -112,7 +115,7 @@ static const int type[VME_DEVS] = { MASTER_MINOR, MASTER_MINOR,MASTER_MINOR ,MASTER_MINOR ,SLAVE_MINOR ,SLAVE_MINOR ,SLAVE_MINOR ,SLAVE_MINOR , -CONTROL_MINOR +CONTROL_MINOR ,DMA_MINOR }; struct vme_user_vma_priv {@@ -281,6 +284,172 @@ static loff_t vme_user_llseek(struct file *file, loff_t off, int whence)return -EINVAL ; } +static int vme_user_sg_to_dma_list(const struct vme_dma_op *dma_op, + struct sg_table *sgt,
drivers/staging/vme/devices/vme_user.c static loff_t vme_user_llseek(struct file *file, loff_t off, int whence) · line 298
Quoted 10 lines
drivers/staging/vme/devices/vme_user.c +10
-0+ int sg_count, struct vme_dma_list *dma_list) +{ + ssize_t pos = 0; +struct scatterlist *sg; +int i, ret; + +if ((dma_op->dir !=VME_DMA_MEM_TO_VME ) && + (dma_op->dir !=VME_DMA_VME_TO_MEM )) +return -EINVAL ; +
Would this not be better implemented as a "default" case in the switch below?
Quoted 243 lines
drivers/staging/vme/devices/vme_user.c +184
-0+for_each_sg (sgt->sgl, sg, sg_count, i) { +struct vme_dma_attr *pci_attr, *vme_attr, *src, *dest; +dma_addr_t hw_address =sg_dma_address (sg); +unsigned int hw_len =sg_dma_len (sg); + + vme_attr =vme_dma_vme_attribute (dma_op->vme_addr + pos, + dma_op->aspace, + dma_op->cycle, + dma_op->dwidth); +if (!vme_attr) +return -ENOMEM ; + + pci_attr =vme_dma_pci_attribute (hw_address); +if (!pci_attr) { +vme_dma_free_attribute (vme_attr); +return -ENOMEM ; + } + +switch (dma_op->dir) { +case VME_DMA_MEM_TO_VME : + src = pci_attr; + dest = vme_attr; +break ; +case VME_DMA_VME_TO_MEM : + src = vme_attr; + dest = pci_attr; +break ; + } + + ret =vme_dma_list_add (dma_list, src, dest, hw_len); + +/* +* XXX VME API doesn't mention whether we should keep +* attributes around +*/ +vme_dma_free_attribute (vme_attr); +vme_dma_free_attribute (pci_attr); + +if (ret) +return ret; + + pos += hw_len; + } + +return 0 ; +} + +static enum dma_data_direction vme_dir_to_dma_dir (unsigned vme_dir) +{ +switch (vme_dir) { +case VME_DMA_VME_TO_MEM : +return DMA_FROM_DEVICE ; +case VME_DMA_MEM_TO_VME : +return DMA_TO_DEVICE ; + } + +return DMA_NONE ; +} + +static ssize_t vme_user_dma_ioctl (unsigned int minor, +const struct vme_dma_op *dma_op) +{ +unsigned int offset =offset_in_page (dma_op->buf_vaddr); +unsigned long nr_pages; +enum dma_data_direction dir; +struct vme_dma_list *dma_list; +struct sg_table *sgt =NULL ; +struct page **pages =NULL ; +long got_pages; +ssize_t count; +int retval, sg_count; + +/* Prevent WARN from dma_map_sg */ +if (dma_op->count ==0 ) +return 0 ; + +/* +* This is a voluntary limit to prevent huge allocation for pages +* array. VME_MAX_DMA_LEN is not a fundamental VME constraint. +*/ + count =min_t (size_t, dma_op->count,VME_MAX_DMA_LEN ); + nr_pages = (offset + count +PAGE_SIZE -1 ) >>PAGE_SHIFT ; + + dir =vme_dir_to_dma_dir (dma_op->dir); +if (dir ==DMA_NONE ) +return -EINVAL ; + + pages =kmalloc_array (nr_pages,sizeof (pages[0 ]),GFP_KERNEL ); +if (!pages) { + retval = -ENOMEM ; + goto free; + } + + sgt =kzalloc (sizeof (*sgt),GFP_KERNEL ); +if (!sgt) { + retval = -ENOMEM ; + goto free; + } + + dma_list =vme_new_dma_list (image[minor].resource); +if (!dma_list) { + retval = -ENOMEM ; + goto free; + } + + got_pages =get_user_pages_fast (dma_op->buf_vaddr, nr_pages, + dir ==DMA_FROM_DEVICE , pages); +if (got_pages != nr_pages) { +pr_debug ("Not all pages were pinned\n" ); + retval = (got_pages <0 ) ? got_pages : -EFAULT ; + goto release_pages; + } + + retval =sg_alloc_table_from_pages (sgt, pages, nr_pages, + offset, count,GFP_KERNEL ); +if (retval) + goto release_pages; + + sg_count =dma_map_sg (vme_user_bridge->dev.parent, + sgt->sgl, sgt->nents, dir); +if (!sg_count) { +pr_debug ("DMA mapping error\n" ); + retval = -EFAULT ; + goto free_sgt; + } + + retval =vme_user_sg_to_dma_list (dma_op, sgt, sg_count, dma_list); +if (retval) + goto dma_unmap; + + retval =vme_dma_list_exec (dma_list); + +dma_unmap: +dma_unmap_sg (vme_user_bridge->dev.parent, sgt->sgl, sgt->nents, dir); + +free_sgt: +sg_free_table (sgt); + +release_pages: +if (got_pages >0 ) +release_pages (pages, got_pages,0 ); + +vme_dma_list_free (dma_list); + +free: +kfree (sgt); +kfree (pages); + +if (retval) +return retval; + +return count; +} +/* * The ioctls provided by the old VME access method (the one at vmelinux.org) * are most certainly wrong as the effectively push the registers layout @@ -297,6 +466,7 @@ static int vme_user_ioctl(struct inode *inode, struct file *file,struct vme_master master;struct vme_slave slave;struct vme_irq_id irq_req; +struct vme_dma_op dma_op;unsigned long copied;unsigned int minor =MINOR (inode->i_rdev);int retval;@@ -406,6 +576,19 @@ static int vme_user_ioctl(struct inode *inode, struct file *file,break ; }break ; +case DMA_MINOR : +switch (cmd) { +case VME_DO_DMA : + copied =copy_from_user (&dma_op, argp, +sizeof (dma_op)); +if (copied !=0 ) { +pr_warn ("Partial copy from userspace\n" ); +return -EFAULT ; + } + +return vme_user_dma_ioctl (minor, &dma_op); + } +break ; }return -EINVAL ;@@ -615,6 +798,15 @@ static int vme_user_probe(struct vme_dev *vdev) } } + image[DMA_MINOR ].resource =vme_dma_request (vme_user_bridge, +VME_DMA_VME_TO_MEM |VME_DMA_MEM_TO_VME ); +if (!image[DMA_MINOR ].resource) { +dev_warn (&vdev->dev, +"Unable to allocate dma resource\n" ); + err = -ENOMEM ; + goto err_master; + } +/* Create sysfs entries - on udev systems this creates the dev files */ vme_user_sysfs_class =class_create (THIS_MODULE , driver_name);if (IS_ERR (vme_user_sysfs_class)) {@@ -637,6 +829,9 @@ static int vme_user_probe(struct vme_dev *vdev)case SLAVE_MINOR : name ="bus/vme/s%d" ;break ; +case DMA_MINOR : + name ="bus/vme/dma0" ; +break ;default : err = -EINVAL ; goto err_sysfs;@@ -661,6 +856,8 @@ err_sysfs: }class_destroy (vme_user_sysfs_class); +vme_dma_free (image[DMA_MINOR ].resource); +/* Ensure counter set correcty to unalloc all master windows */ i =MASTER_MAX +1 ; err_master:@@ -701,6 +898,8 @@ static int vme_user_remove(struct vme_dev *dev) }class_destroy (vme_user_sysfs_class); +vme_dma_free (image[DMA_MINOR ].resource); +for (i =MASTER_MINOR ; i < (MASTER_MAX +1 ); i++) {kfree (image[i].kern_buf);vme_master_free (image[i].resource);drivers/staging/vme/devices/vme_user.h +6
-0@@ -48,11 +48,22 @@ struct vme_irq_id {__u8 statid; }; +struct vme_dma_op { +__u64 vme_addr;/* Starting Address on the VMEbus */ +__u64 buf_vaddr;/* Pointer to userspace memory */ +__u32 count;/* Count of bytes to copy */ +__u32 aspace;/* Address Space */ +__u32 cycle;/* Cycle properties */
drivers/staging/vme/devices/vme_user.h struct vme_irq_id { · line 66
Quoted 10 lines
drivers/staging/vme/devices/vme_user.h +5
-0+__u32 dwidth;/* Data transfer width */ +__u32 dir;/* Transfer Direction */ +}; +#define VME_GET_SLAVE _IOR(VME_IOC_MAGIC, 1, struct vme_slave)#define VME_SET_SLAVE _IOW(VME_IOC_MAGIC, 2, struct vme_slave)#define VME_GET_MASTER _IOR(VME_IOC_MAGIC, 3, struct vme_master)#define VME_SET_MASTER _IOW(VME_IOC_MAGIC, 4, struct vme_master)#define VME_IRQ_GEN _IOW(VME_IOC_MAGIC, 5, struct vme_irq_id) +#define VME_DO_DMA _IOW(VME_IOC_MAGIC, 7, struct vme_dma_op)
Why not 6?
Quoted 3 lines
drivers/staging/vme/devices/vme_user.h +0
-0#endif /* _VME_USER_H_ */
Quoted 21 lines · Martyn Welch
Quoted 8 lines · Dmitry Kalinkin
This introduces a new dma device that provides a single ioctl call that provides DMA read and write functionality to the user space.
Signed-off-by Dmitry Kalinkin <[email protected]>Cc Igor Alekseev <[email protected]>---
Quoted 8 lines
In the last reply Martyn suggested a rework of this to make it use existing bus/vme/ctl instead of creating a new bus/vme/dma%i device and also dynamically
allocate a dma resource in each request.I think this doesn't need those adjustments. I think that dynamic allocation doesn't solve any practical problem that isn't caused by current kernel api.
Quoted 6 lines
That would depend on what resources had already been allocated to other drivers using the kernel api and what resources the underlying bridge had to make available. This driver will currently only load if all the resources it wishes to expose to user space are available. That said, such a modification is clearly separate from adding DMA support to user space, so the argument is rather academic.
Other drives meaning vme_pio, I don't see any others. All this time we are discussing how many GE PIO boards one can plug into a crate with or without vme_user. Most of people have zero of them. Also, VME DMA API has no users in kernel, we are just adding one now.
Quoted 6 lines
Quoted 4 lines
I also think that separate device is a good feature because it allows
for
discovery of dma capatibility from userspace.
Quoted 8 lines
Given the current user space api, that's true.
Quoted 3 lines
The interface with separate
chardev also allows to provide DMAread()andwrite()syscalls that can come handy in pair with/bin/dd.But this patch doesn't implement such a feature does it?
Actually, initial (never published) version of this patch exposed read(),write(),
and an ioctl to set the access cycle. It was working, but with subtlety for A64 addressing. I come across some problems when using large offsets that would not fit in signed long long. I was using FMODE_UNSIGNED_OFFSET to fix the kernel side of things, but it seemed like userspace didn't like the "negative" offsets. I've looked a bit at glibc sources and decided to give up.
Now that I remember this, my original argument is kind of busted.
Quoted 37 lines
(Generally happy with this for now, however couple of comments below.)
Quoted 33 lines
v5:
Added a validation fordma_opargument invme_user_sg_to_dma_list(). It is already checked in caller but we would like to silence a warning:
drivers/staging/vme/devices/vme_user.c: In function
'vme_user_ioctl.isra.4':Quoted 3 lines
Quoted 3 lines
drivers/staging/vme/devices/vme_user.c:324:7: warning: 'dest' may be used uninitialized in this function [-Wmaybe-uninitialized]ret = vme_dma_list_add(dma_list, src, dest, hw_len); ^ drivers/staging/vme/devices/vme_user.c:296:52: note: 'dest' was declared here struct vme_dma_attr *pci_attr, *vme_attr, *src, *dest; ^Quoted 3 lines
Quoted 3 lines
drivers/staging/vme/devices/vme_user.c:324:7: warning: 'src' may be used uninitialized in this function [-Wmaybe-uninitialized]ret = vme_dma_list_add(dma_list, src, dest, hw_len); ^ drivers/staging/vme/devices/vme_user.c:296:46: note: 'src' was declared here struct vme_dma_attr *pci_attr, *vme_attr, *src, *dest;--- drivers/staging/vme/devices/vme_user.c | 205 ++++++++++++++++++++++++++++++++- drivers/staging/vme/devices/vme_user.h | 11 ++ 2 files changed, 213 insertions(+), 3 deletions(-)
Quoted 13 lines
drivers/staging/vme/devices/vme_user.c static unsigned int bus_num; · line 80
Quoted 8 lines
drivers/staging/vme/devices/vme_user.c +0
-0@@ -79,15 +79,18 @@ static unsigned int bus_num;* We shall support 4 masters and 4 slaves with this driver. */ The comment just above here (cropped in the patch) describes the interface that this driver exposes and what is documented in
Documentation/devices.txt.
I've come across a long time ago and at the time I realized that this document is generally outdated and is not required to be updated. First, "Last revised: 6th April 2009"
Second, the device path information is long obsolete in the light of udev. Third, they want submissions on a separate list <[email protected]> Fourth, "20 block Hitachi CD-ROM (under development) 0 = /dev/hitcd" -- this is not for real.
Quoted 12 lines
I think this comment either needs updating to reflect the changes introduced in this patch, or deleted.
(As an aside:
The interface in
Docmentation/devices.txtis an interesting oddity - it existed before any VME drivers were present in the kernel. Given that the driver at vmelinux.org hasn't been updated since some time in the 2.4 kernel series and the lack of mainlined drivers other than this one using that interface, should we update that file to reflect the additions?
Quoted 3 lines
If we were to modify this driver sufficiently, so that chrdevs were dynamically allocated for example, should we delete that entry? )
Had same thoughts. I've concluded that it's not worth (see above).
Quoted 42 lines
Quoted 42 lines
drivers/staging/vme/devices/vme_user.c +5
-1#define VME_MAJOR 221/* VME Major Device Number */ -#define VME_DEVS 9/* Number of dev entries */ +#define VME_DEVS 10/* Number of dev entries */ #define MASTER_MINOR 0#define MASTER_MAX 3#define SLAVE_MINOR 4#define SLAVE_MAX 7#define CONTROL_MINOR 8 +#define DMA_MINOR 9 -#define PCI_BUF_SIZE 0x20000 /* Size of one slave image buffer*/ +#define PCI_BUF_SIZE 0x20000/* Size of one slave image buffer */ + +#define VME_MAX_DMA_LEN 0x4000000/* Maximal DMA transfer length */
/** Structure to handle image related parameters.
drivers/staging/vme/devices/vme_user.c +8
-1@@ -112,7 +115,7 @@ static const int type[VME_DEVS] = { MASTER_MINOR,MASTER_MINOR ,MASTER_MINOR ,MASTER_MINOR ,SLAVE_MINOR ,SLAVE_MINOR ,SLAVE_MINOR ,SLAVE_MINOR , -CONTROL_MINOR +CONTROL_MINOR ,DMA_MINOR }; struct vme_user_vma_priv {@@ -281,6 +284,172 @@ static loff_t vme_user_llseek(struct file *file, loff_t off, int whence) return -EINVAL; } +static int vme_user_sg_to_dma_list(const struct vme_dma_op *dma_op, +struct sg_table *sgt, +int sg_count,struct vme_dma_list *dma_list) +{ +ssize_t pos =0 ; +struct scatterlist *sg; +int i, ret; +
Quoted 8 lines
drivers/staging/vme/devices/vme_user.c static loff_t vme_user_llseek(struct file *file, loff_t off, int whence) · line 298
Quoted 4 lines
drivers/staging/vme/devices/vme_user.c +4
-0+if ((dma_op->dir !=VME_DMA_MEM_TO_VME ) && + (dma_op->dir !=VME_DMA_VME_TO_MEM )) +return -EINVAL ; +Would this not be better implemented as a "default" case in the switch below?
I preferred to exit early to not any cleanup.
Quoted 251 lines
Quoted 251 lines
drivers/staging/vme/devices/vme_user.c +154
-0+for_each_sg (sgt->sgl, sg, sg_count, i) { +struct vme_dma_attr *pci_attr, *vme_attr, *src, *dest; +dma_addr_t hw_address =sg_dma_address (sg); +unsigned int hw_len =sg_dma_len (sg); + + vme_attr =vme_dma_vme_attribute (dma_op->vme_addr + pos, + dma_op->aspace, + dma_op->cycle, + dma_op->dwidth); +if (!vme_attr) +return -ENOMEM ; + + pci_attr =vme_dma_pci_attribute (hw_address); +if (!pci_attr) { +vme_dma_free_attribute (vme_attr); +return -ENOMEM ; + } + +switch (dma_op->dir) { +case VME_DMA_MEM_TO_VME : + src = pci_attr; + dest = vme_attr; +break ; +case VME_DMA_VME_TO_MEM : + src = vme_attr; + dest = pci_attr; +break ; + } + + ret =vme_dma_list_add (dma_list, src, dest, hw_len); + +/* +* XXX VME API doesn't mention whether we should keep +* attributes around +*/ +vme_dma_free_attribute (vme_attr); +vme_dma_free_attribute (pci_attr); + +if (ret) +return ret; + + pos += hw_len; + } + +return 0 ; +} + +static enum dma_data_direction vme_dir_to_dma_dir (unsigned vme_dir) +{ +switch (vme_dir) { +case VME_DMA_VME_TO_MEM : +return DMA_FROM_DEVICE ; +case VME_DMA_MEM_TO_VME : +return DMA_TO_DEVICE ; + } + +return DMA_NONE ; +} + +static ssize_t vme_user_dma_ioctl (unsigned int minor, +const struct vme_dma_op *dma_op) +{ +unsigned int offset =offset_in_page (dma_op->buf_vaddr); +unsigned long nr_pages; +enum dma_data_direction dir; +struct vme_dma_list *dma_list; +struct sg_table *sgt =NULL ; +struct page **pages =NULL ; +long got_pages; +ssize_t count; +int retval, sg_count; + +/* Prevent WARN from dma_map_sg */ +if (dma_op->count ==0 ) +return 0 ; + +/* +* This is a voluntary limit to prevent huge allocation for pages +* array. VME_MAX_DMA_LEN is not a fundamental VME constraint. +*/ + count =min_t (size_t, dma_op->count,VME_MAX_DMA_LEN ); + nr_pages = (offset + count +PAGE_SIZE -1 ) >>PAGE_SHIFT ; + + dir =vme_dir_to_dma_dir (dma_op->dir); +if (dir ==DMA_NONE ) +return -EINVAL ; + + pages =kmalloc_array (nr_pages,sizeof (pages[0 ]),GFP_KERNEL ); +if (!pages) { + retval = -ENOMEM ; + goto free; + } + + sgt =kzalloc (sizeof (*sgt),GFP_KERNEL ); +if (!sgt) { + retval = -ENOMEM ; + goto free; + } + + dma_list =vme_new_dma_list (image[minor].resource); +if (!dma_list) { + retval = -ENOMEM ; + goto free; + } + + got_pages =get_user_pages_fast (dma_op->buf_vaddr, nr_pages, + dir ==DMA_FROM_DEVICE , pages); +if (got_pages != nr_pages) { +pr_debug ("Not all pages were pinned\n" ); + retval = (got_pages <0 ) ? got_pages : -EFAULT ; + goto release_pages; + } + + retval =sg_alloc_table_from_pages (sgt, pages, nr_pages, + offset, count,GFP_KERNEL ); +if (retval) + goto release_pages; + + sg_count =dma_map_sg (vme_user_bridge->dev.parent, + sgt->sgl, sgt->nents, dir); +if (!sg_count) { +pr_debug ("DMA mapping error\n" ); + retval = -EFAULT ; + goto free_sgt; + } + + retval =vme_user_sg_to_dma_list (dma_op, sgt, sg_count, dma_list); +if (retval) + goto dma_unmap; + + retval =vme_dma_list_exec (dma_list); + +dma_unmap: +dma_unmap_sg (vme_user_bridge->dev.parent, sgt->sgl, sgt->nents, dir); + +free_sgt: +sg_free_table (sgt); + +release_pages: +if (got_pages >0 ) +release_pages (pages, got_pages,0 ); + +vme_dma_list_free (dma_list); + +free: +kfree (sgt); +kfree (pages); + +if (retval) +return retval; + +return count; +} +/* * The ioctls provided by the old VME access method (the one at vmelinux.org)
* are most certainly wrong as the effectively push the registers layoutdrivers/staging/vme/devices/vme_user.c +1
-0@@ -297,6 +466,7 @@ static int vme_user_ioctl(struct inode *inode, structfile *file, struct vme_master master;struct vme_slave slave;struct vme_irq_id irq_req; +struct vme_dma_op dma_op;unsigned long copied;unsigned int minor =MINOR (inode->i_rdev);int retval;drivers/staging/vme/devices/vme_user.c +21
-0@@ -406,6 +576,19 @@ static int vme_user_ioctl(struct inode *inode, structfile *file, break; }break ; +case DMA_MINOR : +switch (cmd) { +case VME_DO_DMA : + copied =copy_from_user (&dma_op, argp, +sizeof (dma_op)); +if (copied !=0 ) { +pr_warn ("Partial copy from userspace\n" ); +return -EFAULT ; + } + +return vme_user_dma_ioctl (minor, &dma_op); + } +break ; }return -EINVAL ;@@ -615,6 +798,15 @@ static int vme_user_probe(struct vme_dev *vdev) } } + image[DMA_MINOR ].resource =vme_dma_request (vme_user_bridge, +VME_DMA_VME_TO_MEM |VME_DMA_MEM_TO_VME ); +if (!image[DMA_MINOR ].resource) { +dev_warn (&vdev->dev, +"Unable to allocate dma resource\n" ); + err = -ENOMEM ; + goto err_master; + } +/* Create sysfs entries - on udev systems this creates the dev files */
vme_user_sysfs_class = class_create(THIS_MODULE, driver_name); if (IS_ERR(vme_user_sysfs_class)) {drivers/staging/vme/devices/vme_user.c +5
-0@@ -637,6 +829,9 @@ static int vme_user_probe(struct vme_dev *vdev)case SLAVE_MINOR : name ="bus/vme/s%d" ;break ; +case DMA_MINOR : + name ="bus/vme/dma0" ; +break ;default : err = -EINVAL ; goto err_sysfs;@@ -661,6 +856,8 @@ err_sysfs: }class_destroy (vme_user_sysfs_class); +vme_dma_free (image[DMA_MINOR ].resource); +/* Ensure counter set correcty to unalloc all master windows */ i =MASTER_MAX +1 ; err_master:@@ -701,6 +898,8 @@ static int vme_user_remove(struct vme_dev *dev) }class_destroy (vme_user_sysfs_class); +vme_dma_free (image[DMA_MINOR ].resource); +for (i =MASTER_MINOR ; i < (MASTER_MAX +1 ); i++) {kfree (image[i].kern_buf);vme_master_free (image[i].resource);drivers/staging/vme/devices/vme_user.h +9
-0@@ -48,11 +48,22 @@ struct vme_irq_id {__u8 statid; }; +struct vme_dma_op { +__u64 vme_addr;/* Starting Address on the VMEbus */ +__u64 buf_vaddr;/* Pointer to userspace memory */ +__u32 count;/* Count of bytes to copy */ +__u32 aspace;/* Address Space */ +__u32 cycle;/* Cycle properties */ +__u32 dwidth;/* Data transfer width */ +__u32 dir;/* Transfer Direction */ +}; +#define VME_GET_SLAVE _IOR(VME_IOC_MAGIC, 1, struct vme_slave)
Quoted 8 lines
drivers/staging/vme/devices/vme_user.h struct vme_irq_id { · line 66
Quoted 5 lines
drivers/staging/vme/devices/vme_user.h +1
-0#define VME_SET_SLAVE _IOW(VME_IOC_MAGIC, 2, struct vme_slave)#define VME_GET_MASTER _IOR(VME_IOC_MAGIC, 3, struct vme_master)#define VME_SET_MASTER _IOW(VME_IOC_MAGIC, 4, struct vme_master)#define VME_IRQ_GEN _IOW(VME_IOC_MAGIC, 5, struct vme_irq_id) +#define VME_DO_DMA _IOW(VME_IOC_MAGIC, 7, struct vme_dma_op)Why not 6?
I wanted to reserve 6 for "VME_IRQ_WAIT" kind of operation. But, I guess, that is never coming around anyway.
Quoted 5 lines
Quoted 3 lines
drivers/staging/vme/devices/vme_user.h +0
-0#endif /* _VME_USER_H_ */
PATCH v6 1/1 staging: vme_user: provide DMA functionality
This introduces a new dma device that provides a single ioctl call that provides DMA read and write functionality to the user space.
---
v5:
Added a validation for dma_op argument in vme_user_sg_to_dma_list(). It is already checked in caller but we would like to silence a warning:
drivers/staging/vme/devices/vme_user.c: In function 'vme_user_ioctl.isra.4':
Quoted 1 line
Quoted 1 line
drivers/staging/vme/devices/vme_user.c:324:7: warning: 'dest' may be used uninitialized in this function [-Wmaybe-uninitialized]
ret = vme_dma_list_add(dma_list, src, dest, hw_len);
^
drivers/staging/vme/devices/vme_user.c:296:52: note: 'dest' was declared here
struct vme_dma_attr *pci_attr, *vme_attr, *src, *dest;
^Quoted 1 line
Quoted 1 line
drivers/staging/vme/devices/vme_user.c:324:7: warning: 'src' may be used uninitialized in this function [-Wmaybe-uninitialized]
ret = vme_dma_list_add(dma_list, src, dest, hw_len);
^
drivers/staging/vme/devices/vme_user.c:296:46: note: 'src' was declared here
struct vme_dma_attr *pci_attr, *vme_attr, *src, *dest;v6:
Changed dma ioctl id from 7 to 6
--- drivers/staging/vme/devices/vme_user.c | 205 ++++++++++++++++++++++++++++++++- drivers/staging/vme/devices/vme_user.h | 11 ++ 2 files changed, 213 insertions(+), 3 deletions(-)
drivers/staging/vme/devices/vme_user.c +202 -3
@@ -79,15 +79,18 @@ static unsigned int bus_num;* We shall support 4 masters and 4 slaves with this driver. */ #define VME_MAJOR 221/* VME Major Device Number */ -#define VME_DEVS 9/* Number of dev entries */ +#define VME_DEVS 10/* Number of dev entries */ #define MASTER_MINOR 0#define MASTER_MAX 3#define SLAVE_MINOR 4#define SLAVE_MAX 7#define CONTROL_MINOR 8 +#define DMA_MINOR 9 -#define PCI_BUF_SIZE 0x20000/* Size of one slave image buffer */ +#define PCI_BUF_SIZE 0x20000/* Size of one slave image buffer */ + +#define VME_MAX_DMA_LEN 0x4000000/* Maximal DMA transfer length */ /* * Structure to handle image related parameters.
@@ -112,7 +115,7 @@ static const int type[VME_DEVS] = { MASTER_MINOR, MASTER_MINOR,MASTER_MINOR ,MASTER_MINOR ,SLAVE_MINOR ,SLAVE_MINOR ,SLAVE_MINOR ,SLAVE_MINOR , -CONTROL_MINOR +CONTROL_MINOR ,DMA_MINOR }; struct vme_user_vma_priv {
@@ -281,6 +284,172 @@ static loff_t vme_user_llseek(struct file *file, loff_t off, int whence)return -EINVAL ; } +static int vme_user_sg_to_dma_list (const struct vme_dma_op *dma_op, +struct sg_table *sgt, +int sg_count,struct vme_dma_list *dma_list) +{ +ssize_t pos =0 ; +struct scatterlist *sg; +int i, ret; + +if ((dma_op->dir !=VME_DMA_MEM_TO_VME ) && + (dma_op->dir !=VME_DMA_VME_TO_MEM )) +return -EINVAL ; + +for_each_sg (sgt->sgl, sg, sg_count, i) { +struct vme_dma_attr *pci_attr, *vme_attr, *src, *dest; +dma_addr_t hw_address =sg_dma_address (sg); +unsigned int hw_len =sg_dma_len (sg); + + vme_attr =vme_dma_vme_attribute (dma_op->vme_addr + pos, + dma_op->aspace, + dma_op->cycle, + dma_op->dwidth); +if (!vme_attr) +return -ENOMEM ; + + pci_attr =vme_dma_pci_attribute (hw_address); +if (!pci_attr) { +vme_dma_free_attribute (vme_attr); +return -ENOMEM ; + } + +switch (dma_op->dir) { +case VME_DMA_MEM_TO_VME : + src = pci_attr; + dest = vme_attr; +break ; +case VME_DMA_VME_TO_MEM : + src = vme_attr; + dest = pci_attr; +break ; + } + + ret =vme_dma_list_add (dma_list, src, dest, hw_len); + +/* +* XXX VME API doesn't mention whether we should keep +* attributes around +*/ +vme_dma_free_attribute (vme_attr); +vme_dma_free_attribute (pci_attr); + +if (ret) +return ret; + + pos += hw_len; + } + +return 0 ; +} + +static enum dma_data_direction vme_dir_to_dma_dir (unsigned vme_dir) +{ +switch (vme_dir) { +case VME_DMA_VME_TO_MEM : +return DMA_FROM_DEVICE ; +case VME_DMA_MEM_TO_VME : +return DMA_TO_DEVICE ; + } + +return DMA_NONE ; +} + +static ssize_t vme_user_dma_ioctl (unsigned int minor, +const struct vme_dma_op *dma_op) +{ +unsigned int offset =offset_in_page (dma_op->buf_vaddr); +unsigned long nr_pages; +enum dma_data_direction dir; +struct vme_dma_list *dma_list; +struct sg_table *sgt =NULL ; +struct page **pages =NULL ; +long got_pages; +ssize_t count; +int retval, sg_count; + +/* Prevent WARN from dma_map_sg */ +if (dma_op->count ==0 ) +return 0 ; + +/* +* This is a voluntary limit to prevent huge allocation for pages +* array. VME_MAX_DMA_LEN is not a fundamental VME constraint. +*/ + count =min_t (size_t, dma_op->count,VME_MAX_DMA_LEN ); + nr_pages = (offset + count +PAGE_SIZE -1 ) >>PAGE_SHIFT ; + + dir =vme_dir_to_dma_dir (dma_op->dir); +if (dir ==DMA_NONE ) +return -EINVAL ; + + pages =kmalloc_array (nr_pages,sizeof (pages[0 ]),GFP_KERNEL ); +if (!pages) { + retval = -ENOMEM ; + goto free; + } + + sgt =kzalloc (sizeof (*sgt),GFP_KERNEL ); +if (!sgt) { + retval = -ENOMEM ; + goto free; + } + + dma_list =vme_new_dma_list (image[minor].resource); +if (!dma_list) { + retval = -ENOMEM ; + goto free; + } + + got_pages =get_user_pages_fast (dma_op->buf_vaddr, nr_pages, + dir ==DMA_FROM_DEVICE , pages); +if (got_pages != nr_pages) { +pr_debug ("Not all pages were pinned\n" ); + retval = (got_pages <0 ) ? got_pages : -EFAULT ; + goto release_pages; + } + + retval =sg_alloc_table_from_pages (sgt, pages, nr_pages, + offset, count,GFP_KERNEL ); +if (retval) + goto release_pages; + + sg_count =dma_map_sg (vme_user_bridge->dev.parent, + sgt->sgl, sgt->nents, dir); +if (!sg_count) { +pr_debug ("DMA mapping error\n" ); + retval = -EFAULT ; + goto free_sgt; + } + + retval =vme_user_sg_to_dma_list (dma_op, sgt, sg_count, dma_list); +if (retval) + goto dma_unmap; + + retval =vme_dma_list_exec (dma_list); + +dma_unmap: +dma_unmap_sg (vme_user_bridge->dev.parent, sgt->sgl, sgt->nents, dir); + +free_sgt: +sg_free_table (sgt); + +release_pages: +if (got_pages >0 ) +release_pages (pages, got_pages,0 ); + +vme_dma_list_free (dma_list); + +free: +kfree (sgt); +kfree (pages); + +if (retval) +return retval; + +return count; +} +/* * The ioctls provided by the old VME access method (the one at vmelinux.org) * are most certainly wrong as the effectively push the registers layout
@@ -297,6 +466,7 @@ static int vme_user_ioctl(struct inode *inode, struct file *file,struct vme_master master;struct vme_slave slave;struct vme_irq_id irq_req; +struct vme_dma_op dma_op;unsigned long copied;unsigned int minor =MINOR (inode->i_rdev);int retval;
@@ -406,6 +576,19 @@ static int vme_user_ioctl(struct inode *inode, struct file *file,break ; }break ; +case DMA_MINOR : +switch (cmd) { +case VME_DO_DMA : + copied =copy_from_user (&dma_op, argp, +sizeof (dma_op)); +if (copied !=0 ) { +pr_warn ("Partial copy from userspace\n" ); +return -EFAULT ; + } + +return vme_user_dma_ioctl (minor, &dma_op); + } +break ; }return -EINVAL ;
@@ -615,6 +798,15 @@ static int vme_user_probe(struct vme_dev *vdev) } } + image[DMA_MINOR ].resource =vme_dma_request (vme_user_bridge, +VME_DMA_VME_TO_MEM |VME_DMA_MEM_TO_VME ); +if (!image[DMA_MINOR ].resource) { +dev_warn (&vdev->dev, +"Unable to allocate dma resource\n" ); + err = -ENOMEM ; + goto err_master; + } +/* Create sysfs entries - on udev systems this creates the dev files */ vme_user_sysfs_class =class_create (THIS_MODULE , driver_name);if (IS_ERR (vme_user_sysfs_class)) {
@@ -637,6 +829,9 @@ static int vme_user_probe(struct vme_dev *vdev)case SLAVE_MINOR : name ="bus/vme/s%d" ;break ; +case DMA_MINOR : + name ="bus/vme/dma0" ; +break ;default : err = -EINVAL ; goto err_sysfs;
@@ -661,6 +856,8 @@ err_sysfs: }class_destroy (vme_user_sysfs_class); +vme_dma_free (image[DMA_MINOR ].resource); +/* Ensure counter set correcty to unalloc all master windows */ i =MASTER_MAX +1 ; err_master:
@@ -701,6 +898,8 @@ static int vme_user_remove(struct vme_dev *dev) }class_destroy (vme_user_sysfs_class); +vme_dma_free (image[DMA_MINOR ].resource); +for (i =MASTER_MINOR ; i < (MASTER_MAX +1 ); i++) {kfree (image[i].kern_buf);vme_master_free (image[i].resource);
drivers/staging/vme/devices/vme_user.h +11 -0
@@ -48,11 +48,22 @@ struct vme_irq_id { __u8 statid; }; +struct vme_dma_op { +__u64 vme_addr;/* Starting Address on the VMEbus */ +__u64 buf_vaddr;/* Pointer to userspace memory */ +__u32 count;/* Count of bytes to copy */ +__u32 aspace;/* Address Space */ +__u32 cycle;/* Cycle properties */ +__u32 dwidth;/* Data transfer width */ +__u32 dir;/* Transfer Direction */ +}; +#define VME_GET_SLAVE _IOR(VME_IOC_MAGIC, 1, struct vme_slave)#define VME_SET_SLAVE _IOW(VME_IOC_MAGIC, 2, struct vme_slave)#define VME_GET_MASTER _IOR(VME_IOC_MAGIC, 3, struct vme_master)#define VME_SET_MASTER _IOW(VME_IOC_MAGIC, 4, struct vme_master)#define VME_IRQ_GEN _IOW(VME_IOC_MAGIC, 5, struct vme_irq_id) +#define VME_DO_DMA _IOW(VME_IOC_MAGIC, 6, struct vme_dma_op)#endif /* _VME_USER_H_ */
Signature · 1 line
1.8.3.1
Quoted 25 lines · Dmitry Kalinkin
Quoted 18 lines · Martyn Welch
Quoted 7 lines · Dmitry Kalinkin
This introduces a new dma device that provides a single ioctl call that provides DMA read and write functionality to the user space.
Signed-off-by Dmitry Kalinkin <[email protected]>Cc Igor Alekseev <[email protected]>---
Quoted 8 lines
In the last reply Martyn suggested a rework of this to make it use existing bus/vme/ctl instead of creating a new bus/vme/dma%i device and also dynamically
allocate a dma resource in each request.I think this doesn't need those adjustments. I think that dynamic allocation doesn't solve any practical problem that isn't caused by current kernel api.
Quoted 6 lines
That would depend on what resources had already been allocated to other drivers using the kernel api and what resources the underlying bridge had to make available. This driver will currently only load if all the resources it wishes to expose to user space are available. That said, such a modification is clearly separate from adding DMA support to user space, so the argument is rather academic.
Quoted 4 lines
Other drives meaning
vme_pio, I don't see any others. All this time we are discussing how many GE PIO boards one can plug into a crate with or withoutvme_user. Most of people have zero of them. Also, VME DMA API has no users in kernel, we are just adding one now.
Unfortunately not all users of Linux upstream or even publicise their drivers. This is especially true of some industries where VME gets used. The number of VME windows is limited, so having a user space shim either hog or limit the number of resources available either in kernel space or user space is not an optimal solution.
Quoted 63 lines
Quoted 11 lines
Quoted 3 lines
I also think that separate device is a good feature because it allows
for
discovery of dma capatibility from userspace.Given the current user space api, that's true.
Quoted 3 lines
The interface with separate
chardev also allows to provide DMAread()andwrite()syscalls that can come handy in pair with/bin/dd.But this patch doesn't implement such a feature does it?
Actually, initial (never published) version of this patch exposed read(),write(),
and an ioctl to set the access cycle. It was working, but with subtlety for A64 addressing. I come across some problems when using large offsets that would not fit in signed long long. I was usingFMODE_UNSIGNED_OFFSETto fix the kernel side of things, but it seemed like userspace didn't like the "negative" offsets. I've looked a bit at glibc sources and decided to give up.
Now that I remember this, my original argument is kind of busted.Quoted 31 lines
(Generally happy with this for now, however couple of comments below.)
Quoted 28 lines
v5:
Added a validation fordma_opargument invme_user_sg_to_dma_list(). It is already checked in caller but we would like to silence a warning:
drivers/staging/vme/devices/vme_user.c: In function
'vme_user_ioctl.isra.4':Quoted 2 lines
Quoted 2 lines
drivers/staging/vme/devices/vme_user.c:324:7: warning: 'dest' may be used uninitialized in this function [-Wmaybe-uninitialized]ret = vme_dma_list_add(dma_list, src, dest, hw_len); ^ drivers/staging/vme/devices/vme_user.c:296:52: note: 'dest' was declared here struct vme_dma_attr *pci_attr, *vme_attr, *src, *dest; ^Quoted 2 lines
Quoted 2 lines
drivers/staging/vme/devices/vme_user.c:324:7: warning: 'src' may be used uninitialized in this function [-Wmaybe-uninitialized]ret = vme_dma_list_add(dma_list, src, dest, hw_len); ^ drivers/staging/vme/devices/vme_user.c:296:46: note: 'src' was declared here struct vme_dma_attr *pci_attr, *vme_attr, *src, *dest;--- drivers/staging/vme/devices/vme_user.c | 205 ++++++++++++++++++++++++++++++++- drivers/staging/vme/devices/vme_user.h | 11 ++ 2 files changed, 213 insertions(+), 3 deletions(-)Quoted 12 lines
drivers/staging/vme/devices/vme_user.c static unsigned int bus_num; · line 80
Quoted 8 lines
drivers/staging/vme/devices/vme_user.c +0
-0@@ -79,15 +79,18 @@ static unsigned int bus_num;* We shall support 4 masters and 4 slaves with this driver. */ The comment just above here (cropped in the patch) describes the interface that this driver exposes and what is documented in
Documentation/devices.txt.
Quoted 7 lines
I've come across a long time ago and at the time I realized that this document is generally outdated and is not required to be updated. First, "Last revised: 6th April 2009"
Second, the device path information is long obsolete in the light of udev. Third, they want submissions on a separate list <[email protected]> Fourth, "20 block Hitachi CD-ROM (under development) 0 =/dev/hitcd" -- this is not for real.
Yup, I agree, devices.txt is probably well out of date and is a product of long since deprecated practices.
That said, the comment in vme_user.c is at odds with what the code implements after this patch is applied and that is something we very much have control over.
Quoted 63 lines
Quoted 11 lines
I think this comment either needs updating to reflect the changes introduced in this patch, or deleted.
(As an aside:
The interface in
Docmentation/devices.txtis an interesting oddity - it existed before any VME drivers were present in the kernel. Given that the driver at vmelinux.org hasn't been updated since some time in the 2.4 kernel series and the lack of mainlined drivers other than this one using that interface, should we update that file to reflect the additions?Quoted 3 lines
If we were to modify this driver sufficiently, so that chrdevs were dynamically allocated for example, should we delete that entry? )
Had same thoughts. I've concluded that it's not worth (see above).
Quoted 40 lines
Quoted 40 lines
drivers/staging/vme/devices/vme_user.c +5
-1#define VME_MAJOR 221/* VME Major Device Number */ -#define VME_DEVS 9/* Number of dev entries */ +#define VME_DEVS 10/* Number of dev entries */ #define MASTER_MINOR 0#define MASTER_MAX 3#define SLAVE_MINOR 4#define SLAVE_MAX 7#define CONTROL_MINOR 8 +#define DMA_MINOR 9 -#define PCI_BUF_SIZE 0x20000 /* Size of one slave image buffer*/ +#define PCI_BUF_SIZE 0x20000/* Size of one slave image buffer */ + +#define VME_MAX_DMA_LEN 0x4000000/* Maximal DMA transfer length */
/*
* Structure to handle image related parameters.drivers/staging/vme/devices/vme_user.c +7
-1@@ -112,7 +115,7 @@ static const int type[VME_DEVS] = { MASTER_MINOR,MASTER_MINOR ,MASTER_MINOR ,MASTER_MINOR ,SLAVE_MINOR ,SLAVE_MINOR ,SLAVE_MINOR ,SLAVE_MINOR , -CONTROL_MINOR +CONTROL_MINOR ,DMA_MINOR }; struct vme_user_vma_priv {@@ -281,6 +284,172 @@ static loff_t vme_user_llseek(struct file *file, loff_t off, int whence) return -EINVAL; } +static int vme_user_sg_to_dma_list(const struct vme_dma_op *dma_op, +struct sg_table *sgt, +int sg_count,struct vme_dma_list *dma_list) +{ +ssize_t pos =0 ; +struct scatterlist *sg; +int i, ret;Quoted 8 lines
drivers/staging/vme/devices/vme_user.c static loff_t vme_user_llseek(struct file *file, loff_t off, int whence) · line 298
Quoted 5 lines
drivers/staging/vme/devices/vme_user.c +5
-0+ +if ((dma_op->dir !=VME_DMA_MEM_TO_VME ) && + (dma_op->dir !=VME_DMA_VME_TO_MEM )) +return -EINVAL ; +Would this not be better implemented as a "default" case in the switch below?
Quoted 1 line
I preferred to exit early to not any cleanup.
True, adding the default case would require extra code to clear up the attributes.
Quoted 262 lines
Quoted 249 lines
Quoted 249 lines
drivers/staging/vme/devices/vme_user.c +154
-0+for_each_sg (sgt->sgl, sg, sg_count, i) { +struct vme_dma_attr *pci_attr, *vme_attr, *src, *dest; +dma_addr_t hw_address =sg_dma_address (sg); +unsigned int hw_len =sg_dma_len (sg); + + vme_attr =vme_dma_vme_attribute (dma_op->vme_addr + pos, + dma_op->aspace, + dma_op->cycle, + dma_op->dwidth); +if (!vme_attr) +return -ENOMEM ; + + pci_attr =vme_dma_pci_attribute (hw_address); +if (!pci_attr) { +vme_dma_free_attribute (vme_attr); +return -ENOMEM ; + } + +switch (dma_op->dir) { +case VME_DMA_MEM_TO_VME : + src = pci_attr; + dest = vme_attr; +break ; +case VME_DMA_VME_TO_MEM : + src = vme_attr; + dest = pci_attr; +break ; + } + + ret =vme_dma_list_add (dma_list, src, dest, hw_len); + +/* +* XXX VME API doesn't mention whether we should keep +* attributes around +*/ +vme_dma_free_attribute (vme_attr); +vme_dma_free_attribute (pci_attr); + +if (ret) +return ret; + + pos += hw_len; + } + +return 0 ; +} + +static enum dma_data_direction vme_dir_to_dma_dir (unsigned vme_dir) +{ +switch (vme_dir) { +case VME_DMA_VME_TO_MEM : +return DMA_FROM_DEVICE ; +case VME_DMA_MEM_TO_VME : +return DMA_TO_DEVICE ; + } + +return DMA_NONE ; +} + +static ssize_t vme_user_dma_ioctl (unsigned int minor, +const struct vme_dma_op *dma_op) +{ +unsigned int offset =offset_in_page (dma_op->buf_vaddr); +unsigned long nr_pages; +enum dma_data_direction dir; +struct vme_dma_list *dma_list; +struct sg_table *sgt =NULL ; +struct page **pages =NULL ; +long got_pages; +ssize_t count; +int retval, sg_count; + +/* Prevent WARN from dma_map_sg */ +if (dma_op->count ==0 ) +return 0 ; + +/* +* This is a voluntary limit to prevent huge allocation for pages +* array. VME_MAX_DMA_LEN is not a fundamental VME constraint. +*/ + count =min_t (size_t, dma_op->count,VME_MAX_DMA_LEN ); + nr_pages = (offset + count +PAGE_SIZE -1 ) >>PAGE_SHIFT ; + + dir =vme_dir_to_dma_dir (dma_op->dir); +if (dir ==DMA_NONE ) +return -EINVAL ; + + pages =kmalloc_array (nr_pages,sizeof (pages[0 ]),GFP_KERNEL ); +if (!pages) { + retval = -ENOMEM ; + goto free; + } + + sgt =kzalloc (sizeof (*sgt),GFP_KERNEL ); +if (!sgt) { + retval = -ENOMEM ; + goto free; + } + + dma_list =vme_new_dma_list (image[minor].resource); +if (!dma_list) { + retval = -ENOMEM ; + goto free; + } + + got_pages =get_user_pages_fast (dma_op->buf_vaddr, nr_pages, + dir ==DMA_FROM_DEVICE , pages); +if (got_pages != nr_pages) { +pr_debug ("Not all pages were pinned\n" ); + retval = (got_pages <0 ) ? got_pages : -EFAULT ; + goto release_pages; + } + + retval =sg_alloc_table_from_pages (sgt, pages, nr_pages, + offset, count,GFP_KERNEL ); +if (retval) + goto release_pages; + + sg_count =dma_map_sg (vme_user_bridge->dev.parent, + sgt->sgl, sgt->nents, dir); +if (!sg_count) { +pr_debug ("DMA mapping error\n" ); + retval = -EFAULT ; + goto free_sgt; + } + + retval =vme_user_sg_to_dma_list (dma_op, sgt, sg_count, dma_list); +if (retval) + goto dma_unmap; + + retval =vme_dma_list_exec (dma_list); + +dma_unmap: +dma_unmap_sg (vme_user_bridge->dev.parent, sgt->sgl, sgt->nents, dir); + +free_sgt: +sg_free_table (sgt); + +release_pages: +if (got_pages >0 ) +release_pages (pages, got_pages,0 ); + +vme_dma_list_free (dma_list); + +free: +kfree (sgt); +kfree (pages); + +if (retval) +return retval; + +return count; +} +/* * The ioctls provided by the old VME access method (the one at vmelinux.org)
* are most certainly wrong as the effectively push the registers layoutdrivers/staging/vme/devices/vme_user.c +1
-0@@ -297,6 +466,7 @@ static int vme_user_ioctl(struct inode *inode, structfile *file, struct vme_master master;struct vme_slave slave;struct vme_irq_id irq_req; +struct vme_dma_op dma_op;unsigned long copied;unsigned int minor =MINOR (inode->i_rdev);int retval;drivers/staging/vme/devices/vme_user.c +21
-0@@ -406,6 +576,19 @@ static int vme_user_ioctl(struct inode *inode, structfile *file, break; }break ; +case DMA_MINOR : +switch (cmd) { +case VME_DO_DMA : + copied =copy_from_user (&dma_op, argp, +sizeof (dma_op)); +if (copied !=0 ) { +pr_warn ("Partial copy from userspace\n" ); +return -EFAULT ; + } + +return vme_user_dma_ioctl (minor, &dma_op); + } +break ; }return -EINVAL ;@@ -615,6 +798,15 @@ static int vme_user_probe(struct vme_dev *vdev) } } + image[DMA_MINOR ].resource =vme_dma_request (vme_user_bridge, +VME_DMA_VME_TO_MEM |VME_DMA_MEM_TO_VME ); +if (!image[DMA_MINOR ].resource) { +dev_warn (&vdev->dev, +"Unable to allocate dma resource\n" ); + err = -ENOMEM ; + goto err_master; + } +/* Create sysfs entries - on udev systems this creates the dev files */
vme_user_sysfs_class = class_create(THIS_MODULE, driver_name); if (IS_ERR(vme_user_sysfs_class)) {drivers/staging/vme/devices/vme_user.c +5
-0@@ -637,6 +829,9 @@ static int vme_user_probe(struct vme_dev *vdev)case SLAVE_MINOR : name ="bus/vme/s%d" ;break ; +case DMA_MINOR : + name ="bus/vme/dma0" ; +break ;default : err = -EINVAL ; goto err_sysfs;@@ -661,6 +856,8 @@ err_sysfs: }class_destroy (vme_user_sysfs_class); +vme_dma_free (image[DMA_MINOR ].resource); +/* Ensure counter set correcty to unalloc all master windows */ i =MASTER_MAX +1 ; err_master:@@ -701,6 +898,8 @@ static int vme_user_remove(struct vme_dev *dev) }class_destroy (vme_user_sysfs_class); +vme_dma_free (image[DMA_MINOR ].resource); +for (i =MASTER_MINOR ; i < (MASTER_MAX +1 ); i++) {kfree (image[i].kern_buf);vme_master_free (image[i].resource);drivers/staging/vme/devices/vme_user.h +9
-0@@ -48,11 +48,22 @@ struct vme_irq_id {__u8 statid; }; +struct vme_dma_op { +__u64 vme_addr;/* Starting Address on the VMEbus */ +__u64 buf_vaddr;/* Pointer to userspace memory */ +__u32 count;/* Count of bytes to copy */ +__u32 aspace;/* Address Space */ +__u32 cycle;/* Cycle properties */ +__u32 dwidth;/* Data transfer width */ +__u32 dir;/* Transfer Direction */ +}; +Quoted 8 lines
drivers/staging/vme/devices/vme_user.h struct vme_irq_id { · line 66
Quoted 6 lines
drivers/staging/vme/devices/vme_user.h +1
-0#define VME_GET_SLAVE _IOR(VME_IOC_MAGIC, 1, struct vme_slave)#define VME_SET_SLAVE _IOW(VME_IOC_MAGIC, 2, struct vme_slave)#define VME_GET_MASTER _IOR(VME_IOC_MAGIC, 3, struct vme_master)#define VME_SET_MASTER _IOW(VME_IOC_MAGIC, 4, struct vme_master)#define VME_IRQ_GEN _IOW(VME_IOC_MAGIC, 5, struct vme_irq_id) +#define VME_DO_DMA _IOW(VME_IOC_MAGIC, 7, struct vme_dma_op)Why not 6?
I wanted to reserve 6 for "
VME_IRQ_WAIT" kind of operation. But, I guess, that is never coming around anyway.Quoted 3 lines
Quoted 2 lines
drivers/staging/vme/devices/vme_user.h +0
-0#endif /* _VME_USER_H_ */
Hi,
Quoted 1 line · Martyn Welch
On 18/10/15 18:53, Dmitry Kalinkin wrote:
[...]
Quoted 11 lines
Quoted 4 lines
Other drives meaning
vme_pio, I don't see any others. All this time we are discussing how many GE PIO boards one can plug into a crate with or withoutvme_user. Most of people have zero of them. Also, VME DMA API has no users in kernel, we are just adding one now.Unfortunately not all users of Linux upstream or even publicise their drivers. This is especially true of some industries where VME gets used. The number of VME windows is limited, so having a user space shim either hog or limit the number of resources available either in kernel space or user space is not an optimal solution.
We aren't an industry but we are exactly in that position: we have a bunch of unpublished kernel driver for VME boards almost all built on top of the customized old vmelinux.org stack.
We already tried to port a driver to current stack but we stuck on the static resource management approach in particular for limited VME windows (when the customization of the old stack was made for handle VME windows dynamically).
Ciao,
Alessio
Quoted 31 lines · Martyn Welch
Quoted 25 lines · Dmitry Kalinkin
Quoted 24 lines · Martyn Welch
Quoted 7 lines · Dmitry Kalinkin
This introduces a new dma device that provides a single ioctl call that provides DMA read and write functionality to the user space.
Signed-off-by Dmitry Kalinkin <[email protected]>Cc Igor Alekseev <[email protected]>---
Quoted 8 lines
In the last reply Martyn suggested a rework of this to make it use existing bus/vme/ctl instead of creating a new bus/vme/dma%i device and also dynamically
allocate a dma resource in each request.I think this doesn't need those adjustments. I think that dynamic allocation doesn't solve any practical problem that isn't caused by current kernel api.
That would depend on what resources had already been allocated to other drivers using the kernel api and what resources the underlying bridge had to make available. This driver will currently only load if all the resources it wishes to expose to user space are available. That said, such a modification is clearly separate from adding DMA support to user space, so the argument is rather academic.
Quoted 6 lines
Quoted 4 lines
Other drives meaning
vme_pio, I don't see any others. All this time we are discussing how many GE PIO boards one can plug into a crate with or withoutvme_user. Most of people have zero of them. Also, VME DMA API has no users in kernel, we are just adding one now.Unfortunately not all users of Linux upstream or even publicise their drivers. This is especially true of some industries where VME gets used.
There is no optimal solution. In vanilla kernel you have just two drivers. You can either have 8 GE PIO2 boards or 4 GE PIO2 boards and any amount of boards potentially accessible through vme_user. None of this provides for the case when you have a crate with more than 8 GE PIO2 boards in it. Indeed, if you have built your little proprietary system around one or two drivers so it just fits using up all of the DMA resources and you somehow still need vme_user, this patch will surely break it for you. But if we really care about *all* users then there is no difference in how much resources are used by any driver, there is always a setup for which they won’t be enough.
Quoted 1 line
The number of VME windows is limited, so having a user space shim either hog or limit the number of resources available either in kernel space or user space is not an optimal solution.
How vme_user is different from proprietary driver A to deserve such discrimination? Would it be more optimal if proprietary driver A would take less resources that could have otherwise been exposed to the userspace?
I agree that due to the nature of vme_user it should have some knobs to tune it’s resource consumption, but I don’t think these should be some special ugly knobs that only a userspace driver gets. The solution could have been to use same kind of module params as in vme_pio2. But instead of implementing that, I spent my time unknowingly arguing over whether mainline kernel developers should be denied breaking certain proprietary systems lurking in the shadow of the VME subsystem. Wonderful.
Quoted 403 lines
Quoted 64 lines
Quoted 5 lines
Quoted 4 lines
I also think that separate device is a good feature because it allows
for
discovery of dma capatibility from userspace.Quoted 7 lines
Given the current user space api, that's true.
Quoted 3 lines
The interface with separate
chardev also allows to provide DMAread()andwrite()syscalls that can come handy in pair with/bin/dd.But this patch doesn't implement such a feature does it?
Actually, initial (never published) version of this patch exposed read(),write(),
and an ioctl to set the access cycle. It was working, but with subtlety for A64 addressing. I come across some problems when using large offsets that would not fit in signed long long. I was usingFMODE_UNSIGNED_OFFSETto fix the kernel side of things, but it seemed like userspace didn't like the "negative" offsets. I've looked a bit at glibc sources and decided to give up.
Now that I remember this, my original argument is kind of busted.Quoted 31 lines
(Generally happy with this for now, however couple of comments below.)
Quoted 28 lines
v5:
Added a validation fordma_opargument invme_user_sg_to_dma_list(). It is already checked in caller but we would like to silence a warning:
drivers/staging/vme/devices/vme_user.c: In function
'vme_user_ioctl.isra.4':Quoted 2 lines
Quoted 2 lines
drivers/staging/vme/devices/vme_user.c:324:7: warning: 'dest' may be used uninitialized in this function [-Wmaybe-uninitialized]ret = vme_dma_list_add(dma_list, src, dest, hw_len); ^ drivers/staging/vme/devices/vme_user.c:296:52: note: 'dest' was declared here struct vme_dma_attr *pci_attr, *vme_attr, *src, *dest; ^Quoted 2 lines
Quoted 2 lines
drivers/staging/vme/devices/vme_user.c:324:7: warning: 'src' may be used uninitialized in this function [-Wmaybe-uninitialized]ret = vme_dma_list_add(dma_list, src, dest, hw_len); ^ drivers/staging/vme/devices/vme_user.c:296:46: note: 'src' was declared here struct vme_dma_attr *pci_attr, *vme_attr, *src, *dest;--- drivers/staging/vme/devices/vme_user.c | 205 ++++++++++++++++++++++++++++++++- drivers/staging/vme/devices/vme_user.h | 11 ++ 2 files changed, 213 insertions(+), 3 deletions(-)Quoted 12 lines
drivers/staging/vme/devices/vme_user.c static unsigned int bus_num; · line 80
Quoted 8 lines
drivers/staging/vme/devices/vme_user.c +0
-0@@ -79,15 +79,18 @@ static unsigned int bus_num;* We shall support 4 masters and 4 slaves with this driver. */ The comment just above here (cropped in the patch) describes the interface that this driver exposes and what is documented in
Documentation/devices.txt.Quoted 7 lines
I've come across a long time ago and at the time I realized that this document is generally outdated and is not required to be updated. First, "Last revised: 6th April 2009"
Second, the device path information is long obsolete in the light of udev. Third, they want submissions on a separate list <[email protected]> Fourth, "20 block Hitachi CD-ROM (under development) 0 =/dev/hitcd" -- this is not for real.Yup, I agree, devices.txt is probably well out of date and is a product of long since deprecated practices.
That said, the comment in
vme_user.cis at odds with what the code implements after this patch is applied and that is something we very much have control over.Quoted 63 lines
Quoted 11 lines
I think this comment either needs updating to reflect the changes introduced in this patch, or deleted.
(As an aside:
The interface in
Docmentation/devices.txtis an interesting oddity - it existed before any VME drivers were present in the kernel. Given that the driver at vmelinux.org hasn't been updated since some time in the 2.4 kernel series and the lack of mainlined drivers other than this one using that interface, should we update that file to reflect the additions?Quoted 3 lines
If we were to modify this driver sufficiently, so that chrdevs were dynamically allocated for example, should we delete that entry? )
Had same thoughts. I've concluded that it's not worth (see above).
Quoted 40 lines
Quoted 40 lines
drivers/staging/vme/devices/vme_user.c +5
-1#define VME_MAJOR 221/* VME Major Device Number */ -#define VME_DEVS 9/* Number of dev entries */ +#define VME_DEVS 10/* Number of dev entries */ #define MASTER_MINOR 0#define MASTER_MAX 3#define SLAVE_MINOR 4#define SLAVE_MAX 7#define CONTROL_MINOR 8 +#define DMA_MINOR 9 -#define PCI_BUF_SIZE 0x20000 /* Size of one slave image buffer*/ +#define PCI_BUF_SIZE 0x20000/* Size of one slave image buffer */ + +#define VME_MAX_DMA_LEN 0x4000000/* Maximal DMA transfer length */
/** Structure to handle image related parameters.
drivers/staging/vme/devices/vme_user.c +7
-1@@ -112,7 +115,7 @@ static const int type[VME_DEVS] = { MASTER_MINOR,MASTER_MINOR ,MASTER_MINOR ,MASTER_MINOR ,SLAVE_MINOR ,SLAVE_MINOR ,SLAVE_MINOR ,SLAVE_MINOR , -CONTROL_MINOR +CONTROL_MINOR ,DMA_MINOR }; struct vme_user_vma_priv {@@ -281,6 +284,172 @@ static loff_t vme_user_llseek(struct file *file, loff_t off, int whence) return -EINVAL; } +static int vme_user_sg_to_dma_list(const struct vme_dma_op *dma_op, +struct sg_table *sgt, +int sg_count,struct vme_dma_list *dma_list) +{ +ssize_t pos =0 ; +struct scatterlist *sg; +int i, ret;Quoted 8 lines
drivers/staging/vme/devices/vme_user.c static loff_t vme_user_llseek(struct file *file, loff_t off, int whence) · line 298
Quoted 5 lines
drivers/staging/vme/devices/vme_user.c +5
-0+ +if ((dma_op->dir !=VME_DMA_MEM_TO_VME ) && + (dma_op->dir !=VME_DMA_VME_TO_MEM )) +return -EINVAL ; +Would this not be better implemented as a "default" case in the switch below?
Quoted 1 line
I preferred to exit early to not any cleanup.
True, adding the default case would require extra code to clear up the attributes.
Quoted 260 lines
Quoted 249 lines
Quoted 249 lines
drivers/staging/vme/devices/vme_user.c +154
-0+for_each_sg (sgt->sgl, sg, sg_count, i) { +struct vme_dma_attr *pci_attr, *vme_attr, *src, *dest; +dma_addr_t hw_address =sg_dma_address (sg); +unsigned int hw_len =sg_dma_len (sg); + + vme_attr =vme_dma_vme_attribute (dma_op->vme_addr + pos, + dma_op->aspace, + dma_op->cycle, + dma_op->dwidth); +if (!vme_attr) +return -ENOMEM ; + + pci_attr =vme_dma_pci_attribute (hw_address); +if (!pci_attr) { +vme_dma_free_attribute (vme_attr); +return -ENOMEM ; + } + +switch (dma_op->dir) { +case VME_DMA_MEM_TO_VME : + src = pci_attr; + dest = vme_attr; +break ; +case VME_DMA_VME_TO_MEM : + src = vme_attr; + dest = pci_attr; +break ; + } + + ret =vme_dma_list_add (dma_list, src, dest, hw_len); + +/* +* XXX VME API doesn't mention whether we should keep +* attributes around +*/ +vme_dma_free_attribute (vme_attr); +vme_dma_free_attribute (pci_attr); + +if (ret) +return ret; + + pos += hw_len; + } + +return 0 ; +} + +static enum dma_data_direction vme_dir_to_dma_dir (unsigned vme_dir) +{ +switch (vme_dir) { +case VME_DMA_VME_TO_MEM : +return DMA_FROM_DEVICE ; +case VME_DMA_MEM_TO_VME : +return DMA_TO_DEVICE ; + } + +return DMA_NONE ; +} + +static ssize_t vme_user_dma_ioctl (unsigned int minor, +const struct vme_dma_op *dma_op) +{ +unsigned int offset =offset_in_page (dma_op->buf_vaddr); +unsigned long nr_pages; +enum dma_data_direction dir; +struct vme_dma_list *dma_list; +struct sg_table *sgt =NULL ; +struct page **pages =NULL ; +long got_pages; +ssize_t count; +int retval, sg_count; + +/* Prevent WARN from dma_map_sg */ +if (dma_op->count ==0 ) +return 0 ; + +/* +* This is a voluntary limit to prevent huge allocation for pages +* array. VME_MAX_DMA_LEN is not a fundamental VME constraint. +*/ + count =min_t (size_t, dma_op->count,VME_MAX_DMA_LEN ); + nr_pages = (offset + count +PAGE_SIZE -1 ) >>PAGE_SHIFT ; + + dir =vme_dir_to_dma_dir (dma_op->dir); +if (dir ==DMA_NONE ) +return -EINVAL ; + + pages =kmalloc_array (nr_pages,sizeof (pages[0 ]),GFP_KERNEL ); +if (!pages) { + retval = -ENOMEM ; + goto free; + } + + sgt =kzalloc (sizeof (*sgt),GFP_KERNEL ); +if (!sgt) { + retval = -ENOMEM ; + goto free; + } + + dma_list =vme_new_dma_list (image[minor].resource); +if (!dma_list) { + retval = -ENOMEM ; + goto free; + } + + got_pages =get_user_pages_fast (dma_op->buf_vaddr, nr_pages, + dir ==DMA_FROM_DEVICE , pages); +if (got_pages != nr_pages) { +pr_debug ("Not all pages were pinned\n" ); + retval = (got_pages <0 ) ? got_pages : -EFAULT ; + goto release_pages; + } + + retval =sg_alloc_table_from_pages (sgt, pages, nr_pages, + offset, count,GFP_KERNEL ); +if (retval) + goto release_pages; + + sg_count =dma_map_sg (vme_user_bridge->dev.parent, + sgt->sgl, sgt->nents, dir); +if (!sg_count) { +pr_debug ("DMA mapping error\n" ); + retval = -EFAULT ; + goto free_sgt; + } + + retval =vme_user_sg_to_dma_list (dma_op, sgt, sg_count, dma_list); +if (retval) + goto dma_unmap; + + retval =vme_dma_list_exec (dma_list); + +dma_unmap: +dma_unmap_sg (vme_user_bridge->dev.parent, sgt->sgl, sgt->nents, dir); + +free_sgt: +sg_free_table (sgt); + +release_pages: +if (got_pages >0 ) +release_pages (pages, got_pages,0 ); + +vme_dma_list_free (dma_list); + +free: +kfree (sgt); +kfree (pages); + +if (retval) +return retval; + +return count; +} +/* * The ioctls provided by the old VME access method (the one at vmelinux.org)
* are most certainly wrong as the effectively push the registers layoutdrivers/staging/vme/devices/vme_user.c +1
-0@@ -297,6 +466,7 @@ static int vme_user_ioctl(struct inode *inode, structfile *file, struct vme_master master;struct vme_slave slave;struct vme_irq_id irq_req; +struct vme_dma_op dma_op;unsigned long copied;unsigned int minor =MINOR (inode->i_rdev);int retval;drivers/staging/vme/devices/vme_user.c +21
-0@@ -406,6 +576,19 @@ static int vme_user_ioctl(struct inode *inode, structfile *file, break; }break ; +case DMA_MINOR : +switch (cmd) { +case VME_DO_DMA : + copied =copy_from_user (&dma_op, argp, +sizeof (dma_op)); +if (copied !=0 ) { +pr_warn ("Partial copy from userspace\n" ); +return -EFAULT ; + } + +return vme_user_dma_ioctl (minor, &dma_op); + } +break ; }return -EINVAL ;@@ -615,6 +798,15 @@ static int vme_user_probe(struct vme_dev *vdev) } } + image[DMA_MINOR ].resource =vme_dma_request (vme_user_bridge, +VME_DMA_VME_TO_MEM |VME_DMA_MEM_TO_VME ); +if (!image[DMA_MINOR ].resource) { +dev_warn (&vdev->dev, +"Unable to allocate dma resource\n" ); + err = -ENOMEM ; + goto err_master; + } +/* Create sysfs entries - on udev systems this creates the dev files */
vme_user_sysfs_class = class_create(THIS_MODULE, driver_name); if (IS_ERR(vme_user_sysfs_class)) {drivers/staging/vme/devices/vme_user.c +5
-0@@ -637,6 +829,9 @@ static int vme_user_probe(struct vme_dev *vdev)case SLAVE_MINOR : name ="bus/vme/s%d" ;break ; +case DMA_MINOR : + name ="bus/vme/dma0" ; +break ;default : err = -EINVAL ; goto err_sysfs;@@ -661,6 +856,8 @@ err_sysfs: }class_destroy (vme_user_sysfs_class); +vme_dma_free (image[DMA_MINOR ].resource); +/* Ensure counter set correcty to unalloc all master windows */ i =MASTER_MAX +1 ; err_master:@@ -701,6 +898,8 @@ static int vme_user_remove(struct vme_dev *dev) }class_destroy (vme_user_sysfs_class); +vme_dma_free (image[DMA_MINOR ].resource); +for (i =MASTER_MINOR ; i < (MASTER_MAX +1 ); i++) {kfree (image[i].kern_buf);vme_master_free (image[i].resource);drivers/staging/vme/devices/vme_user.h +9
-0@@ -48,11 +48,22 @@ struct vme_irq_id {__u8 statid; }; +struct vme_dma_op { +__u64 vme_addr;/* Starting Address on the VMEbus */ +__u64 buf_vaddr;/* Pointer to userspace memory */ +__u32 count;/* Count of bytes to copy */ +__u32 aspace;/* Address Space */ +__u32 cycle;/* Cycle properties */ +__u32 dwidth;/* Data transfer width */ +__u32 dir;/* Transfer Direction */ +}; +Quoted 8 lines
drivers/staging/vme/devices/vme_user.h struct vme_irq_id { · line 66
Quoted 6 lines
drivers/staging/vme/devices/vme_user.h +1
-0#define VME_GET_SLAVE _IOR(VME_IOC_MAGIC, 1, struct vme_slave)#define VME_SET_SLAVE _IOW(VME_IOC_MAGIC, 2, struct vme_slave)#define VME_GET_MASTER _IOR(VME_IOC_MAGIC, 3, struct vme_master)#define VME_SET_MASTER _IOW(VME_IOC_MAGIC, 4, struct vme_master)#define VME_IRQ_GEN _IOW(VME_IOC_MAGIC, 5, struct vme_irq_id) +#define VME_DO_DMA _IOW(VME_IOC_MAGIC, 7, struct vme_dma_op)Why not 6?
I wanted to reserve 6 for "
VME_IRQ_WAIT" kind of operation. But, I guess, that is never coming around anyway.Quoted 1 line
Quoted 1 line
drivers/staging/vme/devices/vme_user.h +0
-0#endif /* _VME_USER_H_ */
Hi,
On 19 October 2015 at 11:19, Dmitry Kalinkin <[email protected]> wrote:
[...]
Quoted 14 lines
There is no optimal solution. In vanilla kernel you have just two drivers. You can either have 8 GE PIO2 boards or 4 GE PIO2 boards and any amount of boards potentially accessible through
vme_user. None of this provides for the case when you have a crate with more than 8 GE PIO2 boards in it. Indeed, if you have built your little proprietary system around one or two drivers so it just fits using up all of the DMA resources and you somehow still needvme_user, this patch will surely break it for you. But if we really care about *all* users then there is no difference in how much resources are used by any driver, there is always a setup for which they won’t be enough.Quoted 1 line
The number of VME windows is limited, so having a user space shim either hog or limit the number of resources available either in kernel space or user space is not an optimal solution.
How
vme_useris different from proprietary driver A to deserve such discrimination? Would it be more optimal if proprietary driver A would take less resources that could have otherwise been exposed to the userspace?
Quoted 7 lines
I agree that due to the nature of
vme_userit should have some knobs to tune it’s resource consumption, but I don’t think these should be some special ugly knobs that only a userspace driver gets. The solution could have been to use same kind of module params as invme_pio2. But instead of implementing that, I spent my time unknowingly arguing over whether mainline kernel developers should be denied breaking certain proprietary systems lurking in the shadow of the VME subsystem. Wonderful.
IMHO VME stack should handle bus resources dynamically not matter from where the requests come from (user-space or kernel-space).
Ciao,
Alessio