From patchwork Tue May 24 16:47:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sakari Ailus X-Patchwork-Id: 9133907 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 5AECA607D5 for ; Tue, 24 May 2016 16:51:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4F0932823B for ; Tue, 24 May 2016 16:51:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 43A872829D; Tue, 24 May 2016 16:51:00 +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 BF7802823B for ; Tue, 24 May 2016 16:50:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756077AbcEXQu5 (ORCPT ); Tue, 24 May 2016 12:50:57 -0400 Received: from mga11.intel.com ([192.55.52.93]:36539 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752967AbcEXQu5 (ORCPT ); Tue, 24 May 2016 12:50:57 -0400 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP; 24 May 2016 09:50:57 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.26,360,1459839600"; d="scan'208";a="973628997" Received: from paasikivi.fi.intel.com ([10.237.72.42]) by fmsmga001.fm.intel.com with ESMTP; 24 May 2016 09:50:54 -0700 Received: from nauris.fi.intel.com (nauris.localdomain [192.168.240.2]) by paasikivi.fi.intel.com (Postfix) with ESMTP id EF6F820B82; Tue, 24 May 2016 19:50:53 +0300 (EEST) Received: by nauris.fi.intel.com (Postfix, from userid 1000) id E85FA2020F; Tue, 24 May 2016 19:47:40 +0300 (EEST) From: Sakari Ailus To: linux-media@vger.kernel.org Cc: laurent.pinchart@ideasonboard.com, hverkuil@xs4all.nl, mchehab@osg.samsung.com Subject: [RFC v2 04/21] media: Only requests in IDLE state may be deleted Date: Tue, 24 May 2016 19:47:14 +0300 Message-Id: <1464108451-28142-5-git-send-email-sakari.ailus@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1464108451-28142-1-git-send-email-sakari.ailus@linux.intel.com> References: <1464108451-28142-1-git-send-email-sakari.ailus@linux.intel.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 Prevent deleting queued requests. Also mark deleted requests as such by adding a new state for them. Signed-off-by: Sakari Ailus --- drivers/media/media-device.c | 21 +++++++++++++++++---- include/media/media-device.h | 1 + 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c index 247587b..a89d046 100644 --- a/drivers/media/media-device.c +++ b/drivers/media/media-device.c @@ -41,6 +41,7 @@ static char *__request_state[] = { "IDLE", "QUEUED", + "DELETED", }; #define request_state(i) \ @@ -168,12 +169,22 @@ out_ida_simple_remove: return ret; } -static void media_device_request_delete(struct media_device *mdev, - struct media_device_request *req) +static int media_device_request_delete(struct media_device *mdev, + struct media_device_request *req) { unsigned long flags; spin_lock_irqsave(&mdev->req_lock, flags); + + if (req->state != MEDIA_DEVICE_REQUEST_STATE_IDLE) { + spin_unlock_irqrestore(&mdev->req_lock, flags); + dev_dbg(mdev->dev, "request: can't delete %u, state %s\n", + req->id, request_state(req->state)); + return -EINVAL; + } + + req->state = MEDIA_DEVICE_REQUEST_STATE_DELETED; + if (req->filp) { /* * If the file handle is gone by now the @@ -184,9 +195,12 @@ static void media_device_request_delete(struct media_device *mdev, list_del(&req->fh_list); req->filp = NULL; } + spin_unlock_irqrestore(&mdev->req_lock, flags); media_device_request_put(req); + + return 0; } static int media_device_request_queue_apply( @@ -252,8 +266,7 @@ static long media_device_request_cmd(struct media_device *mdev, break; case MEDIA_REQ_CMD_DELETE: - media_device_request_delete(mdev, req); - ret = 0; + ret = media_device_request_delete(mdev, req); break; case MEDIA_REQ_CMD_APPLY: diff --git a/include/media/media-device.h b/include/media/media-device.h index 893e10b..df4afeb 100644 --- a/include/media/media-device.h +++ b/include/media/media-device.h @@ -268,6 +268,7 @@ struct media_device; enum media_device_request_state { MEDIA_DEVICE_REQUEST_STATE_IDLE, MEDIA_DEVICE_REQUEST_STATE_QUEUED, + MEDIA_DEVICE_REQUEST_STATE_DELETED, }; /**