From patchwork Fri Feb 15 20:24:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 158547 Delivered-To: patches@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp1112787jaa; Fri, 15 Feb 2019 12:24:19 -0800 (PST) X-Received: by 2002:a17:902:7c94:: with SMTP id y20mr9257323pll.215.1550262258966; Fri, 15 Feb 2019 12:24:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550262258; cv=none; d=google.com; s=arc-20160816; b=ID34Xe1IJW/KxMeIADYyPZkDRNvmyCPU2TBcnw+Ke6cewLvTLqcNi/mLVKQ2JFfIew 60mTGXI5R0JCYeSFYXmGVh0e26vqt+r+Z3dcKc/XbSotQTWEseOuTcWU+dtXuMw8yMJ0 0DtZji9287PsiILMiP1CgWSvAIxRjwcHBWJBGXuv65d4Y89HE6fZqRlLhbZG1FjWP12y JeLILwo/SSXgqIjgoC6L+Z7Anqx1QbxRmL9gNrqMUw1zYhs4TFiPpm/wkNV9vx11V3vS hu938qcjCW84HQ0VtRGN+fzprQAWL/2C8DvcpaY161p11mgoXoCTFAYuJpYGVaWbx5tM g7PA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=qgSoL3sPUhUXrm+KHH2TQxC/dij0S3K2jiUD0UBuiec=; b=Wdlo7hE1E/bFKMU/B1fn9vVl26EhQhdGVmIEUVQCTX+bFnGd0n0RJNJ/fJdl5ePzpz aCMtM2j8S3oFbKNfqX6AiqNnHNj902AsBXuejdji3Mg+wW/3YZTnTPjWrDo9JJDO8n4G mx7WnAQGzik3M/7h6jJfusKs90XX0whlytSaG7pEuh6rajlJj4zb2jMg4kXk2ssrDzCa q45vs5nT4I8Yo+ai5ovRXriq57fYszCiSainafk0//4tiqk4oJKeP9VMMeWGhJ+r82+X P+ERXYBanQkD2CyNBToJy3Sg9DtELUNBopBp4zF+kEc265cJkf99flWaNU3a9uaKPuDE OE/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xyT2Daga; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id b9sor10046882pgw.87.2019.02.15.12.24.18 for (Google Transport Security); Fri, 15 Feb 2019 12:24:18 -0800 (PST) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xyT2Daga; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org 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=qgSoL3sPUhUXrm+KHH2TQxC/dij0S3K2jiUD0UBuiec=; b=xyT2DagagGyByc7FoMJuoFKQ1YOXjHRdAtRQOYIvmOGjCtmtCX8p+tvm8qFMgQ40XP 8+OVuFjOfnCq3ubO/zie8qeS/APGuJCclzMGdRXIzETcjmoztHre+73VjKDE1nK7dXnf jSnqk6dpObuQwYI+ZXMP+jrjB7pxizohYJpFd7cHLb5Z7tMUshp9mqSRz2K1foR2nUfB PkrXCdm6+sHpg4h2Zf3QJs6qQ1nZCI4JBsyjIwSEdHhj8Y1qX2NlqlomJNqDgvafDrkw BWi3zuZksCfjlibKZhEY1AyymxUq4zLOi1c6rBPB2uO68cUGTUMVnY98nswcEZvfC7ac rdHQ== 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=qgSoL3sPUhUXrm+KHH2TQxC/dij0S3K2jiUD0UBuiec=; b=e6KwHKMRo262Tm/+IALV15GM1Jr4t7u5G/KEFD4rv2jSypK+poXdVcD4TxdXShtvsD /Lvl6fuioLK3ZWv99HmcGHq3qHsZCmslXmG9Hj3rCG5Nd/GFScgx2hpCYNWri0Y0npiI fS98d8lraI4DRWHFXFDROTK4GcFHkYEw32dx0GNPP9dss6+R22ADzsblyjq87/BXBtT8 yP8sFbQ5PzVEXLLn1SEC2NHBSOpzGJ0i9m7jLFeBnj2fY8ckt4xI0PZbIUsVnLtzN4iW uv+9TeMx9z1zHvolavWPcHdhn70Ss/FaKoWVJcGUdIlarYhBFqHEdElI/tIdU3Juw8kF 91Kg== X-Gm-Message-State: AHQUAub4UMDH3MV3GWiRIyZu2fBkqFjCmbsZOC5Nqwh8vADty0Q3mT3l fXo1AZ1OgfdxnnSCn/joCpfBTf+Y X-Google-Smtp-Source: AHgI3IabETWIuKQMQnYeypc6pgbawX8bsnEaBBLfbHArSSd43iihCGS5RxhuMS5vxUM8ZbmSsBHMrA== X-Received: by 2002:a63:e553:: with SMTP id z19mr7033729pgj.331.1550262258524; Fri, 15 Feb 2019 12:24:18 -0800 (PST) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id l2sm7593340pgn.52.2019.02.15.12.24.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 15 Feb 2019 12:24:17 -0800 (PST) From: John Stultz To: Laura Abbott Cc: John Stultz , Sumit Semwal , Liam Mark , Brian Starkey , "Andrew F . Davis" , Alistair Strachan , dri-devel@lists.freedesktop.org Subject: [EARLY RFC][PATCH 2/4] ion: Initial hack to create per heap devices Date: Fri, 15 Feb 2019 12:24:10 -0800 Message-Id: <1550262252-15558-3-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1550262252-15558-1-git-send-email-john.stultz@linaro.org> References: <1550262252-15558-1-git-send-email-john.stultz@linaro.org> One of the issues w/ the /dev/ion interface is that we have to provide the complexity of a heap query interface and we end up multiplexing all the heap access through that one interface via a bit mask (which currently limits the heaps to 32). There has been a long running todo to provide per-heap devices which would make the heap discovery/query interface "ls", and would allow for different heaps to have different permisisons and sepolicy rules. TODOs: * Android doesn't use udev so "ion_heaps/%s" names don't automatically create a /dev/ subdir. I need to rework from miscdev to creating a proper device class and add a "subsystem" entry for the DeviceHandler to match with * Each CMA region is exposed via a separate heap, not sure if this is desired or not, and we may need to improve the naming. Cc: Laura Abbott Cc: Sumit Semwal Cc: Liam Mark Cc: Brian Starkey Cc: Andrew F. Davis Cc: Alistair Strachan Cc: dri-devel@lists.freedesktop.org Signed-off-by: John Stultz --- drivers/staging/android/ion/ion-ioctl.c | 62 +++++++++++++++++++++++++++++++++ drivers/staging/android/ion/ion.c | 18 ++++++++++ drivers/staging/android/ion/ion.h | 2 ++ drivers/staging/android/uapi/ion.h | 28 +++++++++++++++ 4 files changed, 110 insertions(+) -- 2.7.4 diff --git a/drivers/staging/android/ion/ion-ioctl.c b/drivers/staging/android/ion/ion-ioctl.c index 458a9f2..ea8d263 100644 --- a/drivers/staging/android/ion/ion-ioctl.c +++ b/drivers/staging/android/ion/ion-ioctl.c @@ -12,6 +12,7 @@ union ion_ioctl_arg { struct ion_allocation_data allocation; + struct ion_heap_allocation_data heap_allocation; struct ion_heap_query query; u32 version; }; @@ -100,3 +101,64 @@ long ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) } return ret; } + +long ion_heap_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) +{ + int ret = 0; + unsigned int dir; + union ion_ioctl_arg data; + + dir = ion_ioctl_dir(cmd); + + if (_IOC_SIZE(cmd) > sizeof(data)) + return -EINVAL; + + /* + * The copy_from_user is unconditional here for both read and write + * to do the validate. If there is no write for the ioctl, the + * buffer is cleared + */ + if (copy_from_user(&data, (void __user *)arg, _IOC_SIZE(cmd))) + return -EFAULT; + + ret = validate_ioctl_arg(cmd, &data); + if (ret) { + pr_warn_once("%s: ioctl validate failed\n", __func__); + return ret; + } + + if (!(dir & _IOC_WRITE)) + memset(&data, 0, sizeof(data)); + + switch (cmd) { + case ION_IOC_HEAP_ALLOC: + { + struct miscdevice *miscdev = filp->private_data; + struct ion_heap *heap; + int fd; + + heap = container_of(miscdev, struct ion_heap, heap_dev); + + fd = ion_alloc(data.heap_allocation.len, + (1 << heap->id), + data.heap_allocation.flags); + if (fd < 0) + return fd; + + data.heap_allocation.fd = fd; + + break; + } + case ION_IOC_VERSION: + data.version = ION_VERSION; + break; + default: + return -ENOTTY; + } + + if (dir & _IOC_READ) { + if (copy_to_user((void __user *)arg, &data, _IOC_SIZE(cmd))) + return -EFAULT; + } + return ret; +} diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c index 6f5afab..1f7c893 100644 --- a/drivers/staging/android/ion/ion.c +++ b/drivers/staging/android/ion/ion.c @@ -492,6 +492,14 @@ int ion_query_heaps(struct ion_heap_query *query) return ret; } +static const struct file_operations ion_heap_fops = { + .owner = THIS_MODULE, + .unlocked_ioctl = ion_heap_ioctl, +#ifdef CONFIG_COMPAT + .compat_ioctl = ion_heap_ioctl, +#endif +}; + static const struct file_operations ion_fops = { .owner = THIS_MODULE, .unlocked_ioctl = ion_ioctl, @@ -540,12 +548,22 @@ void ion_device_add_heap(struct ion_heap *heap) struct ion_device *dev = internal_dev; int ret; struct dentry *heap_root; + char *heap_name; char debug_name[64]; if (!heap->ops->allocate || !heap->ops->free) pr_err("%s: can not add heap with invalid ops struct.\n", __func__); + heap_name = kasprintf(GFP_KERNEL, "ion_heaps/%s", heap->name); + heap->heap_dev.name = heap_name; + heap->heap_dev.minor = MISC_DYNAMIC_MINOR; + heap->heap_dev.fops = &ion_heap_fops; + heap->heap_dev.parent = NULL; + ret = misc_register(&heap->heap_dev); + if (ret) + pr_err("ion: failed to register misc device.\n"); + spin_lock_init(&heap->free_lock); spin_lock_init(&heap->stat_lock); heap->free_list_size = 0; diff --git a/drivers/staging/android/ion/ion.h b/drivers/staging/android/ion/ion.h index 439e682..7ed4a6a 100644 --- a/drivers/staging/android/ion/ion.h +++ b/drivers/staging/android/ion/ion.h @@ -170,6 +170,7 @@ struct ion_heap_ops { */ struct ion_heap { struct plist_node node; + struct miscdevice heap_dev; struct ion_device *dev; enum ion_heap_type type; struct ion_heap_ops *ops; @@ -333,6 +334,7 @@ int ion_page_pool_shrink(struct ion_page_pool *pool, gfp_t gfp_mask, int nr_to_scan); long ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg); +long ion_heap_ioctl(struct file *filp, unsigned int cmd, unsigned long arg); int ion_query_heaps(struct ion_heap_query *query); diff --git a/drivers/staging/android/uapi/ion.h b/drivers/staging/android/uapi/ion.h index c480448..20db09f 100644 --- a/drivers/staging/android/uapi/ion.h +++ b/drivers/staging/android/uapi/ion.h @@ -57,6 +57,25 @@ enum ion_heap_type { */ /** + * struct ion_heap_allocation_data - metadata passed from userspace for + * allocations + * @len: size of the allocation + * @heap_id_mask: mask of heap ids to allocate from + * @flags: flags passed to heap + * @handle: pointer that will be populated with a cookie to use to + * refer to this allocation + * + * Provided by userspace as an argument to the ioctl + */ +struct ion_heap_allocation_data { + __u64 len; + __u32 flags; + __u32 fd; + __u32 reserved0; + __u32 reserved1; +}; + +/** * struct ion_allocation_data - metadata passed from userspace for allocations * @len: size of the allocation * @heap_id_mask: mask of heap ids to allocate from @@ -131,4 +150,13 @@ struct ion_heap_query { */ #define ION_IOC_VERSION _IOR(ION_IOC_MAGIC, 9, u32) +/** + * DOC: ION_IOC_HEAP_ALLOC - allocate memory from heap + * + * Takes an ion_heap_allocation_data struct and returns it with the handle field + * populated with the opaque handle for the allocation. + */ +#define ION_IOC_HEAP_ALLOC _IOWR(ION_IOC_MAGIC, 10, \ + struct ion_heap_allocation_data) + #endif /* _UAPI_LINUX_ION_H */