From patchwork Wed Mar 2 19:52:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Padovan X-Patchwork-Id: 8485051 Return-Path: X-Original-To: patchwork-dri-devel@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 8FFE2C0553 for ; Wed, 2 Mar 2016 19:52:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A3F8320382 for ; Wed, 2 Mar 2016 19:52:45 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id C42162037C for ; Wed, 2 Mar 2016 19:52:44 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 84E446E989; Wed, 2 Mar 2016 19:52:43 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-yw0-f194.google.com (mail-yw0-f194.google.com [209.85.161.194]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7E8EE6E989 for ; Wed, 2 Mar 2016 19:52:39 +0000 (UTC) Received: by mail-yw0-f194.google.com with SMTP id u200so11662235ywf.2 for ; Wed, 02 Mar 2016 11:52:39 -0800 (PST) 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:in-reply-to :references; bh=lPmAJVnJ8xFk/aBquTI/KljbYYrSnhOU1wwnkjc9vCo=; b=G+fPGdrNJs8oSh4FzkVQnYnTSpfVwRumUsYxG8iueORgtFOnnKMflwO850wwulZ1NK xy5cC33m5uyfqV7CIGj1aGyIhPzEbjtdoBFJrQ6TintJmHvDUzBQDwyBKpJL5ipVoP0y JT57kmQHTL6izzxAKfqsdvBdi/4UuobpWtMuv6sNFmIc3+sgmBJbJ9idf5pVN0BPGTo9 x2NHgRIPeOfK/x1wCg2CXq108FStImDI0S+AzknJ49p8FRhhU978qnK8CEInS4KYjWJB dxN6HPwl3Lko0E7CBlsn7gytNITQfFy6XFXK/CGR+vJzjHugQyG7MoDF0hWfRmjcwxzh tWvw== X-Gm-Message-State: AD7BkJIE3NWj+GczZ+ZOy9b2s8Vd3OLGFGqGHqSIf570rUEkdy1dkXJW0r0juC4yvgyqOQ== X-Received: by 10.129.2.136 with SMTP id 130mr16106979ywc.340.1456948358145; Wed, 02 Mar 2016 11:52:38 -0800 (PST) Received: from jade.localdomain ([177.194.47.65]) by smtp.gmail.com with ESMTPSA id x129sm29695860ywd.19.2016.03.02.11.52.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Mar 2016 11:52:37 -0800 (PST) From: Gustavo Padovan To: Greg Kroah-Hartman Subject: [PATCH v6 6/6] staging/android: add flags member to sync ioctl structs Date: Wed, 2 Mar 2016 16:52:11 -0300 Message-Id: <1456948331-7300-6-git-send-email-gustavo@padovan.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1456948331-7300-1-git-send-email-gustavo@padovan.org> References: <1456948331-7300-1-git-send-email-gustavo@padovan.org> Cc: devel@driverdev.osuosl.org, Daniel Stone , Daniel Vetter , Riley Andrews , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= , Gustavo Padovan , John Harrison X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00, RCVD_IN_BL_SPAMCOP_NET, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, 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 From: Gustavo Padovan Play safe and add flags member to all structs. So we don't need to break API or create new IOCTL in the future if new features that requires flags arises. v2: check if flags are valid (zero, in this case) v3: return -EINVAL if flags are not zero'ed v4: add padding for 64-bit alignment Signed-off-by: Gustavo Padovan --- drivers/staging/android/sync.c | 8 ++++++++ drivers/staging/android/uapi/sync.h | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c index 3604e453..e635e6e 100644 --- a/drivers/staging/android/sync.c +++ b/drivers/staging/android/sync.c @@ -445,6 +445,11 @@ static long sync_file_ioctl_merge(struct sync_file *sync_file, goto err_put_fd; } + if (data.flags) { + err = -EINVAL; + goto err_put_fd; + } + fence2 = sync_file_fdget(data.fd2); if (!fence2) { err = -ENOENT; @@ -504,6 +509,9 @@ static long sync_file_ioctl_fence_info(struct sync_file *sync_file, if (copy_from_user(&in, (void __user *)arg, sizeof(in))) return -EFAULT; + if (in.flags || in.pad) + return -EINVAL; + info = kzalloc(sizeof(*info), GFP_KERNEL); if (!info) return -ENOMEM; diff --git a/drivers/staging/android/uapi/sync.h b/drivers/staging/android/uapi/sync.h index f064923..4b4d079 100644 --- a/drivers/staging/android/uapi/sync.h +++ b/drivers/staging/android/uapi/sync.h @@ -19,11 +19,13 @@ * @name: name of new fence * @fd2: file descriptor of second fence * @fence: returns the fd of the new fence to userspace + * @flags: merge_data flags */ struct sync_merge_data { char name[32]; __s32 fd2; __s32 fence; + __u32 flags; }; /** @@ -31,12 +33,14 @@ struct sync_merge_data { * @obj_name: name of parent sync_timeline * @driver_name: name of driver implementing the parent * @status: status of the fence 0:active 1:signaled <0:error + * @flags: fence_info flags * @timestamp_ns: timestamp of status change in nanoseconds */ struct sync_fence_info { char obj_name[32]; char driver_name[32]; __s32 status; + __u32 flags; __u64 timestamp_ns; }; @@ -44,14 +48,18 @@ struct sync_fence_info { * struct sync_file_info - data returned from fence info ioctl * @name: name of fence * @status: status of fence. 1: signaled 0:active <0:error + * @flags: sync_file_info flags * @num_fences number of fences in the sync_file + * @pad padding for 64-bit alignment, should always be zero * @sync_fence_info: pointer to array of structs sync_fence_info with all * fences in the sync_file */ struct sync_file_info { char name[32]; __s32 status; + __u32 flags; __u32 num_fences; + __u32 pad; __u64 sync_fence_info; };