From patchwork Wed Sep 27 13:20:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 114367 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp5034010qgf; Wed, 27 Sep 2017 06:20:29 -0700 (PDT) X-Received: by 10.99.116.90 with SMTP id e26mr1335488pgn.290.1506518429296; Wed, 27 Sep 2017 06:20:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506518429; cv=none; d=google.com; s=arc-20160816; b=m8SubIeAarGRFWoGfhYxt2FGIYv1ztjV6aCvku0He1zYLas0AHEirrBgrXOEvsTRYw +kjD66c7oqMIkbVs2ZbHqV/ojDEvW29bsh4V0z7tnE67YfUaYlzviBfPNjiY334NAtNA lJksIMHbkwetdKh7C+x7p4YDUU7370nWj//Nar+n1KQLTWuXcewpXZMApQwU+SGB6A58 aqqtVXPh7QvAZyKKSoYy1LdEc60S+y+9YaoaFB6H7kqLOghDk9EJoEA4W2GVD10nApZ+ MSBCOWI9+xMoxqDgf4XLmekOP/ATV71BXuIikhrac4UxQsz26US6l1NH8xvbuGfQWg4/ xfHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:cc:references:in-reply-to:message-id:date :subject:to:from:dkim-signature:delivered-to :arc-authentication-results; bh=Tih3zP9oeBeLGdJoTaAppQ+k9LY/2OHhHTRIVR7IDgg=; b=HeCJQAroym1FllAvSA7LHDvNbEz64h2XcfoMeSC8bNUYX49zfLykK6OseZagTzHXxg 3RWFpayw0oSSDqyt9cFXrdsaHQ9nw665BErw3rj5FuydRdx0+8KitBtlDBFLeShcpWii EfuzWnKNkS4Knb1egF8Wsafe6qsJMmJUXAMeec/GbWNfz+0VMja27YZ5PKmM7SVZVg3o XuiwAmHsTUprQe/z1AFbj4QGfyi/y2cNM4AkAlG6VwW+0ifcqExWtSPsgdGZMtmg7nAO 5nn+Or36uske+wfvdHSeQm7tCisA2GBBBMFgVLYLh/yalSHOSDSdAR5ubSZTPUv5f1Zt IEZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=SoOEsPhn; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id j21si7595626pgn.554.2017.09.27.06.20.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Sep 2017 06:20:29 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=SoOEsPhn; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7A5CB6E729; Wed, 27 Sep 2017 13:20:28 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x22a.google.com (mail-wm0-x22a.google.com [IPv6:2a00:1450:400c:c09::22a]) by gabe.freedesktop.org (Postfix) with ESMTPS id 990E26E729 for ; Wed, 27 Sep 2017 13:20:25 +0000 (UTC) Received: by mail-wm0-x22a.google.com with SMTP id b195so18188604wmb.5 for ; Wed, 27 Sep 2017 06:20:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=oJLN7IWa0xZbyefapxbZ/xtJ7Re176vlbbopZgYfJgA=; b=SoOEsPhnwcH2BLEibDcHW2IBnvEcae0ySjGbpX5k+dX5i28LEercDpZYeiVFq6uk7P RAZrgjyhk8ipFanitJHFoe0/jgU76HUszPmjeouJe4nDkfa9bdM/+L280v2UitVFMcIk MXStlsBpfiVWFqEYf1Z3i903/LfrHhv47C8tg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=oJLN7IWa0xZbyefapxbZ/xtJ7Re176vlbbopZgYfJgA=; b=aQmuOat0AA0zjwqWIs3wSxdkmojH/9r9WJVogTvVI5S5QTt2vRMa8nhvAFUoVbSnXQ 8KbMhBE1YQ0YEAvg2wVgGnbH1VXULoe5EHAcmwaqUbqiysJumXLG0R4IOcIKEImumkp8 93JtqwFZgP+0AoFigWKTFxR3mTKMbGiRZNMlFid7HhYSrR29buli8fu2iveUoD1299// LpYpR/Qlzzqx5sYXeRLj/JVoXnJkaKEXjH60EX9GwfS3a2i1gZaq8rVed+oAE2K1AHEs VA7UkEoFTwh4q0X0nnF25Uud7CORF7L0ca7V6XMSvV7sYLDsI0yZLj8IWQFul1XhJXzG H3OQ== X-Gm-Message-State: AHPjjUizmd6COZSgZGxyvG8eyjWCrVG9EnmosKs4DlHXEcQkgpFUzbRX 635ZyfAwnVdU4F/7RYg1JOBMOQ== X-Google-Smtp-Source: AOwi7QBjDNVzJW4fSQvknWfiYdhiNUI+jGClkBusyw+kFHDhxP2nBtUi5m5s9MDS6ITNEtaWVZLK7A== X-Received: by 10.28.9.130 with SMTP id 124mr229558wmj.65.1506518424052; Wed, 27 Sep 2017 06:20:24 -0700 (PDT) Received: from lmecxl0911.lme.st.com ([80.215.129.76]) by smtp.gmail.com with ESMTPSA id 110sm6886002wra.39.2017.09.27.06.20.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 27 Sep 2017 06:20:23 -0700 (PDT) From: Benjamin Gaignard To: labbott@redhat.com, sumit.semwal@linaro.org, gregkh@linuxfoundation.org, arve@android.com, riandrews@android.com, broonie@kernel.org, dan.carpenter@oracle.com Subject: [PATCH v5 2/2] staging: ion: create one device entry per heap Date: Wed, 27 Sep 2017 15:20:09 +0200 Message-Id: <1506518409-16887-3-git-send-email-benjamin.gaignard@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1506518409-16887-1-git-send-email-benjamin.gaignard@linaro.org> References: <1506518409-16887-1-git-send-email-benjamin.gaignard@linaro.org> Cc: devel@driverdev.osuosl.org, linux-api@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org 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" Instead a getting only one common device "/dev/ion" for all the heaps this patch allow to create one device entry ("/dev/ionX") per heap. Getting an entry per heap could allow to set security rules per heap and global ones for all heaps. Allocation requests will be only allowed if the mask_id match with device minor. Query request could be done on any of the devices. Signed-off-by: Benjamin Gaignard --- version 5: - create a configuration flag to keep legacy Ion misc device version 4: - add a configuration flag to switch between legacy Ion misc device and one device per heap version. version 3: - change ion_device_add_heap prototype to return a possible error. version 2: - simplify ioctl check like propose by Dan - make sure that we don't register more than ION_DEV_MAX heaps. drivers/staging/android/TODO | 1 - drivers/staging/android/ion/Kconfig | 7 +++++++ drivers/staging/android/ion/ion-ioctl.c | 18 ++++++++++++++++-- drivers/staging/android/ion/ion.c | 31 ++++++++++++++++++++++++++++++- drivers/staging/android/ion/ion.h | 15 +++++++++++++-- 5 files changed, 66 insertions(+), 6 deletions(-) diff --git a/drivers/staging/android/TODO b/drivers/staging/android/TODO index 5f14247..d770ffa 100644 --- a/drivers/staging/android/TODO +++ b/drivers/staging/android/TODO @@ -9,7 +9,6 @@ TODO: ion/ - Add dt-bindings for remaining heaps (chunk and carveout heaps). This would involve putting appropriate bindings in a memory node for Ion to find. - - Split /dev/ion up into multiple nodes (e.g. /dev/ion/heap0) - Better test framework (integration with VGEM was suggested) Please send patches to Greg Kroah-Hartman and Cc: diff --git a/drivers/staging/android/ion/Kconfig b/drivers/staging/android/ion/Kconfig index a517b2d..cb4666e 100644 --- a/drivers/staging/android/ion/Kconfig +++ b/drivers/staging/android/ion/Kconfig @@ -10,6 +10,13 @@ menuconfig ION If you're not using Android its probably safe to say N here. +config ION_LEGACY_DEVICE_API + bool "Keep using Ion legacy misc device API" + depends on ION + help + Choose this option to keep using Ion legacy misc device API + i.e. /dev/ion + config ION_SYSTEM_HEAP bool "Ion system heap" depends on ION diff --git a/drivers/staging/android/ion/ion-ioctl.c b/drivers/staging/android/ion/ion-ioctl.c index e26b786..bb5c77b 100644 --- a/drivers/staging/android/ion/ion-ioctl.c +++ b/drivers/staging/android/ion/ion-ioctl.c @@ -25,7 +25,8 @@ union ion_ioctl_arg { struct ion_heap_query query; }; -static int validate_ioctl_arg(unsigned int cmd, union ion_ioctl_arg *arg) +static int validate_ioctl_arg(struct file *filp, + unsigned int cmd, union ion_ioctl_arg *arg) { switch (cmd) { case ION_IOC_HEAP_QUERY: @@ -34,6 +35,19 @@ static int validate_ioctl_arg(unsigned int cmd, union ion_ioctl_arg *arg) arg->query.reserved2 ) return -EINVAL; break; + + case ION_IOC_ALLOC: + { + int mask = 1 << iminor(filp->f_inode); + +#ifdef CONFIG_ION_LEGACY_DEVICE_API + if (imajor(filp->f_inode) == MISC_MAJOR) + return 0; +#endif + if (!(arg->allocation.heap_id_mask & mask)) + return -EINVAL; + break; + } default: break; } @@ -69,7 +83,7 @@ long ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) if (copy_from_user(&data, (void __user *)arg, _IOC_SIZE(cmd))) return -EFAULT; - ret = validate_ioctl_arg(cmd, &data); + ret = validate_ioctl_arg(filp, cmd, &data); if (WARN_ON_ONCE(ret)) return ret; diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c index 93e2c90..092b24c 100644 --- a/drivers/staging/android/ion/ion.c +++ b/drivers/staging/android/ion/ion.c @@ -40,6 +40,8 @@ #include "ion.h" +#define ION_DEV_MAX 32 + static struct ion_device *internal_dev; static int heap_id; @@ -537,15 +539,28 @@ static int debug_shrink_get(void *data, u64 *val) DEFINE_SIMPLE_ATTRIBUTE(debug_shrink_fops, debug_shrink_get, debug_shrink_set, "%llu\n"); -void ion_device_add_heap(struct ion_heap *heap) +int ion_device_add_heap(struct ion_heap *heap) { struct dentry *debug_file; struct ion_device *dev = internal_dev; + int ret = 0; if (!heap->ops->allocate || !heap->ops->free) pr_err("%s: can not add heap with invalid ops struct.\n", __func__); + if (heap_id >= ION_DEV_MAX) + return -EBUSY; + + heap->ddev.devt = MKDEV(MAJOR(dev->devt), heap_id); + dev_set_name(&heap->ddev, "ion%d", heap_id); + device_initialize(&heap->ddev); + cdev_init(&heap->chrdev, &ion_fops); + heap->chrdev.owner = THIS_MODULE; + ret = cdev_device_add(&heap->chrdev, &heap->ddev); + if (ret < 0) + return ret; + spin_lock_init(&heap->free_lock); heap->free_list_size = 0; @@ -583,6 +598,8 @@ void ion_device_add_heap(struct ion_heap *heap) dev->heap_cnt++; up_write(&dev->lock); + + return ret; } EXPORT_SYMBOL(ion_device_add_heap); @@ -595,6 +612,7 @@ static int ion_device_create(void) if (!idev) return -ENOMEM; +#ifdef CONFIG_ION_LEGACY_DEVICE_API idev->dev.minor = MISC_DYNAMIC_MINOR; idev->dev.name = "ion"; idev->dev.fops = &ion_fops; @@ -605,6 +623,17 @@ static int ion_device_create(void) kfree(idev); return ret; } +#endif + + ret = alloc_chrdev_region(&idev->devt, 0, ION_DEV_MAX, "ion"); + if (ret) { + pr_err("ion: unable to allocate device\n"); +#ifdef CONFIG_ION_LEGACY_DEVICE_API + misc_deregister(&idev->dev); +#endif + kfree(idev); + return ret; + } idev->debug_root = debugfs_create_dir("ion", NULL); if (!idev->debug_root) { diff --git a/drivers/staging/android/ion/ion.h b/drivers/staging/android/ion/ion.h index 621e5f7..2b00ccb 100644 --- a/drivers/staging/android/ion/ion.h +++ b/drivers/staging/android/ion/ion.h @@ -17,16 +17,19 @@ #ifndef _ION_H #define _ION_H +#include #include #include #include +#ifdef CONFIG_ION_LEGACY_DEVICE_API +#include +#endif #include #include #include #include #include #include -#include #include "../uapi/ion.h" @@ -91,12 +94,16 @@ void ion_buffer_destroy(struct ion_buffer *buffer); /** * struct ion_device - the metadata of the ion device node * @dev: the actual misc device + * @devt: Ion device * @buffers: an rb tree of all the existing buffers * @buffer_lock: lock protecting the tree of buffers * @lock: rwsem protecting the tree of heaps and clients */ struct ion_device { +#ifdef CONFIG_ION_LEGACY_DEVICE_API struct miscdevice dev; +#endif + dev_t devt; struct rb_root buffers; struct mutex buffer_lock; struct rw_semaphore lock; @@ -152,6 +159,8 @@ struct ion_heap_ops { * struct ion_heap - represents a heap in the system * @node: rb node to put the heap on the device's tree of heaps * @dev: back pointer to the ion_device + * @ddev: device structure + * @chrdev: associated character device * @type: type of heap * @ops: ops struct as above * @flags: flags @@ -176,6 +185,8 @@ struct ion_heap_ops { struct ion_heap { struct plist_node node; struct ion_device *dev; + struct device ddev; + struct cdev chrdev; enum ion_heap_type type; struct ion_heap_ops *ops; unsigned long flags; @@ -212,7 +223,7 @@ bool ion_buffer_fault_user_mappings(struct ion_buffer *buffer); * ion_device_add_heap - adds a heap to the ion device * @heap: the heap to add */ -void ion_device_add_heap(struct ion_heap *heap); +int ion_device_add_heap(struct ion_heap *heap); /** * some helpers for common operations on buffers using the sg_table