From patchwork Mon Apr 25 07:59:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda Delgado X-Patchwork-Id: 8923901 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 40BFFBF29F for ; Mon, 25 Apr 2016 07:59:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 55623201D3 for ; Mon, 25 Apr 2016 07:59:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E6423201BB for ; Mon, 25 Apr 2016 07:59:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753888AbcDYH7T (ORCPT ); Mon, 25 Apr 2016 03:59:19 -0400 Received: from mail-lb0-f180.google.com ([209.85.217.180]:33237 "EHLO mail-lb0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753512AbcDYH7R (ORCPT ); Mon, 25 Apr 2016 03:59:17 -0400 Received: by mail-lb0-f180.google.com with SMTP id jj5so22828093lbc.0; Mon, 25 Apr 2016 00:59:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=nK6WA+JPV74rAYllSAK+dAw6o03G1YP5mwoE6oVUl/8=; b=Qd5VnCNgadrYElpCUgz/vFV3skiS5zsHWo/k1p6JfNc8VGGKC5m1fPJGDsVW+QZ6FY I1vl8jYbVvV/ZSUUxyOEOWSaiOyHG0TE7s1SJSmHz4kswkeqpgAS39zjOHCm7B/o+GUm LR1YTt+i0Z6RlMnmUlJ+b3OAvC0GsTBEJxl7VGkOrC5I5dsCud6qP/Y5vlBRaOfhJYJL 1HtwvdEa/b8D34gO2YBRrbWYx0FMdzPLRxiOstwZxMGa4Fcr/Zn7U38iXNpyzk90aTjv R7s9r1J3lKQNxJ8YZkgMnSDId2wNm5uFAwMw5E56NIGQDVja6oTGWxtJTjxH7qoZTMJk B6AA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=nK6WA+JPV74rAYllSAK+dAw6o03G1YP5mwoE6oVUl/8=; b=Kdmq9Tx++delGST1S/CNOIwiVxSbv7SA05OENwTLcS0grK1ld3mLu6DJfuI6puiymF uR+WEpuyRiYtJ+fVzXDGSjXSzx6zNhdbFEZvep2d6Y8ECgiKY/WNniCnINqgEYK6ZSJ/ O0KauYPQUkL45uT/qeqeB7SvR7/3WRaLqbhlRlamZyPES6TYVPTTmgmpiDIiZJPVUUZx Px0RMLGFqKTkG/FJMBqiLbGh2FiLsriw4e4f3gpjtO6vYY1F8Sth0EI3lx1KkdVTAkEC sHHcV+j4nU1Pk9Kjdqps0k87hDda3Rh9xbGFvuCafpquZ+t2LGYalsJRIBaYw9nEvrj5 iMJw== X-Gm-Message-State: AOPr4FV1gFkbux4JfxTIps2TzJNiAsf/8jfC83Qe3nuy1wCbp/jd26PBUewR60r2a6awxQ== X-Received: by 10.112.65.102 with SMTP id w6mr13348720lbs.100.1461571154898; Mon, 25 Apr 2016 00:59:14 -0700 (PDT) Received: from neopili.qtec.com (cpe.xe-3-0-1-778.vbrnqe10.dk.customer.tdc.net. [80.197.57.18]) by smtp.gmail.com with ESMTPSA id a197sm4269479lfe.23.2016.04.25.00.59.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 25 Apr 2016 00:59:13 -0700 (PDT) From: Ricardo Ribalda Delgado To: Pawel Osciak , Marek Szyprowski , Kyungmin Park , Mauro Carvalho Chehab , Hans Verkuil , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ricardo Ribalda Delgado , Junghak Sung , stable@vger.kernel.org Subject: [PATCH v2] media: vb2: Fix regression on poll() for RW mode Date: Mon, 25 Apr 2016 09:59:11 +0200 Message-Id: <1461571151-25848-1-git-send-email-ricardo.ribalda@gmail.com> X-Mailer: git-send-email 2.8.0.rc3 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When using a device is read/write mode, vb2 does not handle properly the first select/poll operation. The reason for this, is that when this code has been refactored, some of the operations have changed their order, and now fileio emulator is not started. The reintroduced check to the core is enabled by a quirk flag, that avoids this check by other subsystems like DVB. Reported-by: Dimitrios Katsaros Cc: Junghak Sung Fixes: 49d8ab9feaf2 ("media] media: videobuf2: Separate vb2_poll()") Cc: stable@vger.kernel.org Signed-off-by: Ricardo Ribalda Delgado --- v2: By Hans Verkuil and Mauro Carvalho Chehab : Add a quirk bit to enable this behaviour on the core. drivers/media/v4l2-core/videobuf2-core.c | 9 +++++++++ drivers/media/v4l2-core/videobuf2-v4l2.c | 9 +-------- include/media/videobuf2-core.h | 4 ++++ 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/drivers/media/v4l2-core/videobuf2-core.c b/drivers/media/v4l2-core/videobuf2-core.c index 5d016f496e0e..58eb9be13510 100644 --- a/drivers/media/v4l2-core/videobuf2-core.c +++ b/drivers/media/v4l2-core/videobuf2-core.c @@ -2298,6 +2298,15 @@ unsigned int vb2_core_poll(struct vb2_queue *q, struct file *file, return POLLERR; /* + * For compatibility with vb1: if QBUF hasn't been called yet, then + * return POLLERR as well. This only affects capture queues, output + * queues will always initialize waiting_for_buffers to false. + */ + if (q->quirk_poll_must_check_waiting_for_buffers && + q->waiting_for_buffers && (req_events & (POLLIN | POLLRDNORM))) + return POLLERR; + + /* * For output streams you can call write() as long as there are fewer * buffers queued than there are buffers available. */ diff --git a/drivers/media/v4l2-core/videobuf2-v4l2.c b/drivers/media/v4l2-core/videobuf2-v4l2.c index 91f552124050..3e649adf85ef 100644 --- a/drivers/media/v4l2-core/videobuf2-v4l2.c +++ b/drivers/media/v4l2-core/videobuf2-v4l2.c @@ -765,6 +765,7 @@ int vb2_queue_init(struct vb2_queue *q) q->is_output = V4L2_TYPE_IS_OUTPUT(q->type); q->copy_timestamp = (q->timestamp_flags & V4L2_BUF_FLAG_TIMESTAMP_MASK) == V4L2_BUF_FLAG_TIMESTAMP_COPY; + q->quirk_poll_must_check_waiting_for_buffers = true; return vb2_core_queue_init(q); } @@ -818,14 +819,6 @@ unsigned int vb2_poll(struct vb2_queue *q, struct file *file, poll_table *wait) poll_wait(file, &fh->wait, wait); } - /* - * For compatibility with vb1: if QBUF hasn't been called yet, then - * return POLLERR as well. This only affects capture queues, output - * queues will always initialize waiting_for_buffers to false. - */ - if (q->waiting_for_buffers && (req_events & (POLLIN | POLLRDNORM))) - return POLLERR; - return res | vb2_core_poll(q, file, wait); } EXPORT_SYMBOL_GPL(vb2_poll); diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h index 8a0f55b6c2ba..3a1620946068 100644 --- a/include/media/videobuf2-core.h +++ b/include/media/videobuf2-core.h @@ -400,6 +400,9 @@ struct vb2_buf_ops { * @fileio_read_once: report EOF after reading the first buffer * @fileio_write_immediately: queue buffer after each write() call * @allow_zero_bytesused: allow bytesused == 0 to be passed to the driver + * @quirk_poll_must_check_waiting_for_buffers: Return POLLERR at poll when QBUF + * has not been called. This is a vb1 idiom that has been adopted + * also by vb2. * @lock: pointer to a mutex that protects the vb2_queue struct. The * driver can set this to a mutex to let the v4l2 core serialize * the queuing ioctls. If the driver wants to handle locking @@ -463,6 +466,7 @@ struct vb2_queue { unsigned fileio_read_once:1; unsigned fileio_write_immediately:1; unsigned allow_zero_bytesused:1; + unsigned quirk_poll_must_check_waiting_for_buffers:1; struct mutex *lock; void *owner;