From patchwork Thu Mar 3 19:40:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Padovan X-Patchwork-Id: 8495811 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 3559CC0553 for ; Thu, 3 Mar 2016 19:41:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 58CF22037C for ; Thu, 3 Mar 2016 19:41:18 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 2E34420396 for ; Thu, 3 Mar 2016 19:41:17 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 938476EAFD; Thu, 3 Mar 2016 19:41:15 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-yw0-f169.google.com (mail-yw0-f169.google.com [209.85.161.169]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8E55A6EAFD for ; Thu, 3 Mar 2016 19:41:12 +0000 (UTC) Received: by mail-yw0-f169.google.com with SMTP id i131so13424580ywc.3 for ; Thu, 03 Mar 2016 11:41:12 -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=uQ7M7QKkldQmQry4CAkBQEhqa7bY16b+/SXJrhPEIDU=; b=bUaMDGbDQ2x51BN1EBQXr3wOj5CnQkhJa8JTzvBDtUwEEKOMcCBcZk39BlBhzrU17c P8JPkYXqpg1Boc8yudmGQZurHVqwCfQBhC5D72s18smgoQzy85dnnCRn90Hms4RloW5M EPu9un14XTqRKXQ1tsnUHbJBSazptLACZL8p+6bJAbIvYE828pcD1x5bre5Cq2NN0ANM Gt2OQEoR2KBWYUeNNE9cJRa/rx7q9NW83zW+j9Hd8E+ZB75+n57kqs967F2dKhOhYqC+ T7GBkCMcVtUcPbfTRQ1IdKLe0/FJTaBhPMUKUNNjC1dx15qL/wiKVLGBzvK7i/amgrj0 PpXQ== X-Gm-Message-State: AD7BkJIKrDQgvVo0S4ceSYDUxpYxGvbPcFL1Q1OPEGGi28Mj9m95p9gsNEYS6oxXv3W4zw== X-Received: by 10.13.243.5 with SMTP id c5mr2281708ywf.296.1457034071405; Thu, 03 Mar 2016 11:41:11 -0800 (PST) Received: from jade.localdomain ([177.194.47.65]) by smtp.gmail.com with ESMTPSA id f186sm28850ywa.6.2016.03.03.11.41.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 03 Mar 2016 11:41:10 -0800 (PST) From: Gustavo Padovan To: Greg Kroah-Hartman Subject: [PATCH v7 5/5] staging/android: add flags member to sync ioctl structs Date: Thu, 3 Mar 2016 16:40:46 -0300 Message-Id: <1457034046-27678-5-git-send-email-gustavo@padovan.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1457034046-27678-1-git-send-email-gustavo@padovan.org> References: <1457034046-27678-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=-4.2 required=5.0 tests=BAYES_00, 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. Signed-off-by: Gustavo Padovan Reviewed-by: Maarten Lankhorst --- 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 v5: rebase to use only stacked sync_file_info --- drivers/staging/android/sync.c | 8 ++++++++ drivers/staging/android/uapi/sync.h | 14 ++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c index 48ee175..ae81c95 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 || data.pad) { + 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(&info, (void __user *)arg, sizeof(info))) return -EFAULT; + if (info.flags || info.pad) + return -EINVAL; + /* * Passing num_fences = 0 means that userspace doesn't want to * retrieve any sync_fence_info. If num_fences = 0 we skip filling diff --git a/drivers/staging/android/uapi/sync.h b/drivers/staging/android/uapi/sync.h index a122bb5..859977c 100644 --- a/drivers/staging/android/uapi/sync.h +++ b/drivers/staging/android/uapi/sync.h @@ -16,14 +16,18 @@ /** * struct sync_merge_data - data passed to merge ioctl - * @fd2: file descriptor of second fence * @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 + * @pad: padding for 64-bit alignment, should always be zero */ struct sync_merge_data { - __s32 fd2; char name[32]; + __s32 fd2; __s32 fence; + __u32 flags; + __u32 pad; }; /** @@ -31,12 +35,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 +50,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; };