From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752001AbaHMLFj (ORCPT ); Wed, 13 Aug 2014 07:05:39 -0400 Received: from mail-we0-f171.google.com ([74.125.82.171]:56921 "EHLO mail-we0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751317AbaHMLFg (ORCPT ); Wed, 13 Aug 2014 07:05:36 -0400 From: Antonios Motakis To: alex.williamson@redhat.com, kvmarm@lists.cs.columbia.edu, iommu@lists.linux-foundation.org Cc: tech@virtualopensystems.com, a.rigo@virtualopensystems.com, kvm@vger.kernel.org, christoffer.dall@linaro.org, will.deacon@arm.com, kim.phillips@freescale.com, stuart.yoder@freescale.com, eric.auger@linaro.org, marc.zyngier@arm.com, Antonios Motakis , linux-kernel@vger.kernel.org (open list) Subject: [PATCH 3/4] VFIO: PLATFORM: DEVTREE: Access property as a list of strings Date: Wed, 13 Aug 2014 13:02:18 +0200 Message-Id: <1407927740-14993-4-git-send-email-a.motakis@virtualopensystems.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1407927740-14993-1-git-send-email-a.motakis@virtualopensystems.com> References: <1407927740-14993-1-git-send-email-a.motakis@virtualopensystems.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Certain device tree properties (e.g. the device node name, the compatible string), are available as a list of strings (separated by the null terminating character). Let the VFIO user query this type of properties. Signed-off-by: Antonios Motakis --- drivers/vfio/platform/devtree.c | 60 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/drivers/vfio/platform/devtree.c b/drivers/vfio/platform/devtree.c index b8fd4138..80c60d4 100644 --- a/drivers/vfio/platform/devtree.c +++ b/drivers/vfio/platform/devtree.c @@ -61,6 +61,43 @@ static int devtree_get_prop_names(struct device_node *np, void __user *datap, return ret; } +static int devtree_get_strings(struct device_node *np, char *name, + void __user *datap, unsigned long datasz) +{ + struct property *prop; + int len; + + prop = of_find_property(np, name, &len); + + if (!prop) + return -EINVAL; + + if (len > datasz) + return -EAGAIN; + + if (copy_to_user(datap, prop->value, len)) + return -EFAULT; + else + return 0; +} + +static int devtree_get_full_name(struct device_node *np, void __user *datap, + unsigned long datasz, int *lenp) +{ + int len = strlen(np->full_name) + 1; + + if (lenp) + *lenp = len; + + if (len > datasz) + return -EAGAIN; + + if (copy_to_user(datap, np->full_name, len)) + return -EFAULT; + + return 0; +} + long vfio_platform_devtree_ioctl(struct vfio_platform_device *vdev, unsigned long arg) { @@ -68,6 +105,7 @@ long vfio_platform_devtree_ioctl(struct vfio_platform_device *vdev, unsigned long minsz = offsetofend(struct vfio_devtree_info, length); void __user *datap = (void __user *) arg + minsz; unsigned long int datasz; + char *name; int ret = -EINVAL; if (!vfio_platform_has_devtree(vdev)) @@ -84,8 +122,30 @@ long vfio_platform_devtree_ioctl(struct vfio_platform_device *vdev, if (info.type == VFIO_DEVTREE_PROP_NAMES) { ret = devtree_get_prop_names(vdev->of_node, datap, datasz, &info.length); + goto out; } + name = kzalloc(datasz, GFP_KERNEL); + if (!name) + return -ENOMEM; + if (copy_from_user(name, datap, datasz)) + return -EFAULT; + + if (!of_find_property(vdev->of_node, name, &info.length)) { + /* special case full_name as a property that is not on the fdt, + * but we wish to return to the user as it includes the full + * path of the device */ + if (!strcmp(name, "full_name") && + (info.type == VFIO_DEVTREE_ARR_TYPE_STRING)) + ret = devtree_get_full_name(vdev->of_node, datap, + datasz, &info.length); + + } else if (info.type == VFIO_DEVTREE_ARR_TYPE_STRING) + ret = devtree_get_strings(vdev->of_node, name, datap, datasz); + + kfree(name); + +out: if (copy_to_user((void __user *)arg, &info, minsz)) ret = -EFAULT; -- 1.8.3.2