From patchwork Mon Apr 25 08:49:05 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: 8924521 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 C2330BF29F for ; Mon, 25 Apr 2016 08:49:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9152E201D3 for ; Mon, 25 Apr 2016 08:49:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 906C120166 for ; Mon, 25 Apr 2016 08:49:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754207AbcDYItM (ORCPT ); Mon, 25 Apr 2016 04:49:12 -0400 Received: from mail-lf0-f53.google.com ([209.85.215.53]:36619 "EHLO mail-lf0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754142AbcDYItK (ORCPT ); Mon, 25 Apr 2016 04:49:10 -0400 Received: by mail-lf0-f53.google.com with SMTP id u64so12258610lff.3; Mon, 25 Apr 2016 01:49:08 -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=WJoNLqMVdVnkEzyQEi1I/AlI8AoyIOQbRpVVhDQ8AwE=; b=N1cOKzynsdCdXw5x0S8VgEsvMC88JqjNqFoM9kZzPNrYmYUVGhDQ4H8nOgQriT58IN n9guosZPPVt8euWrgf6gtvhBSyNR7zxjHdadD2RRPtz/YpU/DMha03gtXqABiK5Vw9ex 0IThf/nhTuv8mBcF9BN5OiX5y+eupVNYpK1/GMz/+cvf/qiq+t79T8MIgLEzeBABY0Wo qX20liyjisGSOkDMt6tVlrNyrvBuzIVOLrA2x1SX1p9ZSgi75woyWAVuTzIwnGmDxbJm M3CMpCS/o1xS8CeNrAw1TOcg6ix1xoVDfdwZFH2ECjcHstGjSOd6tJbxQblXGxAeYSVm 7g3g== 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=WJoNLqMVdVnkEzyQEi1I/AlI8AoyIOQbRpVVhDQ8AwE=; b=LVJgrZvbctptwtz8oPrdosnJ5ZY7mue1m9zQTjug58DAEEgwQD4AEAXPcqyykEXrNo SHaB1sHRkA1YggD13AEmFsMpnHCCRBTN8vyFXkviJE2fBtFaXEhCcOZOsuD283zobFu7 LbTpv0hKhrUlvgLIgsVMCE+kdVOPOEiIfrD657ywVIK7mZQyvV1FTQ7gUlwt0UQdZ1Gg jbCgKMeIUlhsmhzzq3vgz3j2ACLNzKTIOfFbfvYUAmCg0j17GO9M+gP61GV41sLDNSwb qJ8cpxkZkOlM+NLkxzwhf+eCMBqenXvXLTdh7w04JbTHN5cYhQB/2U3PxEEwRD9GC0hY ijEw== X-Gm-Message-State: AOPr4FU3VOALa5SiH6qlPLVAzxvwty9foav1ja+gcNFj1Aogpd3SVtN2ZLs4nJLuxG+Zyw== X-Received: by 10.25.153.69 with SMTP id b66mr803052lfe.138.1461574147754; Mon, 25 Apr 2016 01:49:07 -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 ez1sm4115070lbc.29.2016.04.25.01.49.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 25 Apr 2016 01:49:06 -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 v3] media: vb2: Fix regression on poll() for RW mode Date: Mon, 25 Apr 2016 10:49:05 +0200 Message-Id: <1461574145-27260-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 --- v3: By Hans Verkuil Reorder comment. drivers/media/v4l2-core/videobuf2-core.c | 4 ++++ drivers/media/v4l2-core/videobuf2-v4l2.c | 15 +++++++-------- include/media/videobuf2-core.h | 4 ++++ 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/drivers/media/v4l2-core/videobuf2-core.c b/drivers/media/v4l2-core/videobuf2-core.c index 5d016f496e0e..05ad744504ce 100644 --- a/drivers/media/v4l2-core/videobuf2-core.c +++ b/drivers/media/v4l2-core/videobuf2-core.c @@ -2297,6 +2297,10 @@ unsigned int vb2_core_poll(struct vb2_queue *q, struct file *file, if (!vb2_is_streaming(q) || q->error) return POLLERR; + 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..e46754b5610e 100644 --- a/drivers/media/v4l2-core/videobuf2-v4l2.c +++ b/drivers/media/v4l2-core/videobuf2-v4l2.c @@ -765,6 +765,13 @@ 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; + /* + * If this quirk is set and 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. + * This quirk is set by V4L2 for backwards compatibility reasons. + */ + q->quirk_poll_must_check_waiting_for_buffers = true; return vb2_core_queue_init(q); } @@ -818,14 +825,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;