From patchwork Fri Mar 9 10:09:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Kocialkowski X-Patchwork-Id: 10270295 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id AC91D605CE for ; Fri, 9 Mar 2018 10:10:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 909FC28D11 for ; Fri, 9 Mar 2018 10:10:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8517229D82; Fri, 9 Mar 2018 10:10:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EE40329D7E for ; Fri, 9 Mar 2018 10:10:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750954AbeCIKKp (ORCPT ); Fri, 9 Mar 2018 05:10:45 -0500 Received: from mail.bootlin.com ([62.4.15.54]:49675 "EHLO mail.bootlin.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750966AbeCIKKl (ORCPT ); Fri, 9 Mar 2018 05:10:41 -0500 Received: by mail.bootlin.com (Postfix, from userid 110) id DAC162077B; Fri, 9 Mar 2018 11:10:38 +0100 (CET) Received: from localhost.localdomain (LStLambert-657-1-97-87.w90-63.abo.wanadoo.fr [90.63.216.87]) by mail.bootlin.com (Postfix) with ESMTPSA id 5914E20379; Fri, 9 Mar 2018 11:10:38 +0100 (CET) From: Paul Kocialkowski To: linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-sunxi@googlegroups.com Cc: Icenowy Zheng , Florent Revest , Alexandre Courbot , Hans Verkuil , Laurent Pinchart , Sakari Ailus , Maxime Ripard , Thomas van Kleef , "Signed-off-by : Bob Ham" , Thomas Petazzoni , Chen-Yu Tsai , Paul Kocialkowski Subject: [PATCH 2/9] media: videobuf2-v4l2: Copy planes when needed in request qbuf Date: Fri, 9 Mar 2018 11:09:26 +0100 Message-Id: <20180309100933.15922-3-paul.kocialkowski@bootlin.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180309100933.15922-1-paul.kocialkowski@bootlin.com> References: <20180309100933.15922-1-paul.kocialkowski@bootlin.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Multiplanar formats require an extra planes array in their buffers, that is copied from userspace by the video_usercopy function prior to dispatching the ioctl request. This wrapper also frees the allocated planes array after the ioctl handler has returned. In the context of the V4L2 request API, we need to keep this planes array around so that it can be used when submitting the request later. Thus, allocate the array and copy its contents when adding the buffer to the request-specific queue. Signed-off-by: Paul Kocialkowski --- drivers/media/common/videobuf2/videobuf2-v4l2.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/drivers/media/common/videobuf2/videobuf2-v4l2.c b/drivers/media/common/videobuf2/videobuf2-v4l2.c index 0627c3339572..c14528d4a518 100644 --- a/drivers/media/common/videobuf2/videobuf2-v4l2.c +++ b/drivers/media/common/videobuf2/videobuf2-v4l2.c @@ -592,6 +592,7 @@ int vb2_qbuf_request(struct vb2_queue *q, struct v4l2_buffer *b, struct media_request *req; struct vb2_buffer *vb; int ret = 0; + int i; if (b->request_fd <= 0) return vb2_qbuf(q, b); @@ -657,6 +658,17 @@ int vb2_qbuf_request(struct vb2_queue *q, struct v4l2_buffer *b, qb->pre_req_state = vb->state; qb->queue = q; memcpy(&qb->v4l2_buf, b, sizeof(*b)); + + if (V4L2_TYPE_IS_MULTIPLANAR(b->type) && b->length > 0) { + qb->v4l2_buf.m.planes = kcalloc(b->length, + sizeof(struct v4l2_plane), + GFP_KERNEL); + + for (i = 0; i < b->length; i++) + memcpy(&qb->v4l2_buf.m.planes[i], &b->m.planes[i], + sizeof(struct v4l2_plane)); + } + vb->request = req; vb->state = VB2_BUF_STATE_QUEUED; list_add_tail(&qb->node, &data->queued_buffers); @@ -672,6 +684,7 @@ EXPORT_SYMBOL_GPL(vb2_qbuf_request); int vb2_request_submit(struct v4l2_request_entity_data *data) { struct v4l2_vb2_request_buffer *qb, *n; + int i; /* v4l2 requests require at least one buffer to reach the device */ if (list_empty(&data->queued_buffers)) { @@ -686,6 +699,12 @@ int vb2_request_submit(struct v4l2_request_entity_data *data) list_del(&qb->node); vb->state = qb->pre_req_state; ret = vb2_core_qbuf(q, vb->index, &qb->v4l2_buf); + + if (V4L2_TYPE_IS_MULTIPLANAR(qb->v4l2_buf.type) && + qb->v4l2_buf.length > 0) + for (i = 0; i < qb->v4l2_buf.length; i++) + kfree(&qb->v4l2_buf.m.planes[i]); + kfree(qb); if (ret) return ret;