Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1243550

RE: [PATCH 6/6] staging: comedi: don't use mutex when polling file

Show all headers | View raw

On Friday, October 09, 2015 4:27 AM, Ian Abbott wrote:
> The main mutex in a comedi device can get held for quite a while when
> processing comedi instructions, so for performance reasons, the "read"
> and "write" file operations do not use it; they use use the
> `attach_lock` rwsemaphore to protect against the comedi device becoming
> detached at an inopportune moment.  Do the same for the "poll" file
> operation.
>
> Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
> ---
>  drivers/staging/comedi/comedi_fops.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
> index 07bb197..88e9334 100644
> --- a/drivers/staging/comedi/comedi_fops.c
> +++ b/drivers/staging/comedi/comedi_fops.c
> @@ -2264,7 +2264,7 @@ static unsigned int comedi_poll(struct file *file, poll_table *wait)
>  	struct comedi_device *dev = cfp->dev;
>  	struct comedi_subdevice *s, *s_read;
>  
> -	mutex_lock(&dev->mutex);
> +	down_read(&dev->attach_lock);
>  
>  	if (!dev->attached) {
>  		dev_dbg(dev->class_dev, "no driver attached\n");
> @@ -2294,7 +2294,7 @@ static unsigned int comedi_poll(struct file *file, poll_table *wait)
>  	}
>  
>  done:
> -	mutex_unlock(&dev->mutex);
> +	up_read(&dev->attach_lock);
>  	return mask;
>  }

Ian,

No issues with this patch, just a comment:

checkpatch.pl reports some issue about the spinlock_t and mutex definitions
in comedidev.h:

CHECK: spinlock_t definition without comment
#177: FILE: drivers/staging/comedi/comedidev.h:177:
+       spinlock_t spin_lock;

CHECK: spinlock_t definition without comment
#540: FILE: drivers/staging/comedi/comedidev.h:540:
+       spinlock_t spinlock;

CHECK: struct mutex definition without comment
#541: FILE: drivers/staging/comedi/comedidev.h:541:
+       struct mutex mutex;

I know these are documented in the docbook comment for the structs but would
you mind adding some comments to the definitions to quiet checkpatch.pl?

Thanks,
Hartley


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/6] staging: comedi: fix some minor issues with file poll op Ian Abbott <abbotti@mev.co.uk> - 2015-10-09 13:30 +0200
  [PATCH 5/6] staging: comedi: check command started by file being polled Ian Abbott <abbotti@mev.co.uk> - 2015-10-09 13:30 +0200
  [PATCH 6/6] staging: comedi: don't use mutex when polling file Ian Abbott <abbotti@mev.co.uk> - 2015-10-09 13:30 +0200
    RE: [PATCH 6/6] staging: comedi: don't use mutex when polling file Hartley Sweeten <HartleyS@visionengravers.com> - 2015-10-09 19:30 +0200
  [PATCH 1/6] staging: comedi: don't poll_wait on same subdevice twice Ian Abbott <abbotti@mev.co.uk> - 2015-10-09 13:30 +0200
  RE: [PATCH 0/6] staging: comedi: fix some minor issues with file poll  op Hartley Sweeten <HartleyS@visionengravers.com> - 2015-10-09 19:30 +0200

csiph-web