| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <4d6c79d5-b98e-52ab-4114-d7441e83ed76@st.com>
Date: Thu, 1 Oct 2020 18:14:19 +0200
From: Arnaud POULIQUEN <arnaud.pouliquen@...com>
To: Guennadi Liakhovetski <guennadi.liakhovetski@...ux.intel.com>,
Mathieu Poirier <mathieu.poirier@...aro.org>
CC: "ohad@...ery.com" <ohad@...ery.com>,
"bjorn.andersson@...aro.org" <bjorn.andersson@...aro.org>,
Loic PALLARDY <loic.pallardy@...com>,
"linux-remoteproc@...r.kernel.org" <linux-remoteproc@...r.kernel.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH 06/10] rpmsg: Turn name service into a stand alone driver
On 9/30/20 9:09 AM, Guennadi Liakhovetski wrote:
> On Mon, Sep 21, 2020 at 06:09:56PM -0600, Mathieu Poirier wrote:
>> From: Arnaud Pouliquen <arnaud.pouliquen@...com>
>>
>> Make the RPMSG name service announcement a stand alone driver so that it
>> can be reused by other subsystems. It is also the first step in making the
>> functionatlity transport independent, i.e that is not tied to virtIO.
>>
>> Signed-off-by: Arnaud Pouliquen <arnaud.pouliquen@...com>
>> Signed-off-by: Mathieu Poirier <mathieu.poirier@...aro.org>
>> ---
>> drivers/rpmsg/Kconfig | 8 +++
>> drivers/rpmsg/Makefile | 1 +
>> drivers/rpmsg/rpmsg_internal.h | 18 ++++++
>> drivers/rpmsg/rpmsg_ns.c | 110 +++++++++++++++++++++++++++++++++
>> 4 files changed, 137 insertions(+)
>> create mode 100644 drivers/rpmsg/rpmsg_ns.c
>>
>> diff --git a/drivers/rpmsg/Kconfig b/drivers/rpmsg/Kconfig
>> index f96716893c2a..c3fc75e6514b 100644
>> --- a/drivers/rpmsg/Kconfig
>> +++ b/drivers/rpmsg/Kconfig
>> @@ -15,6 +15,14 @@ config RPMSG_CHAR
>> in /dev. They make it possible for user-space programs to send and
>> receive rpmsg packets.
>>
>> +config RPMSG_NS
>> + tristate "RPMSG name service announcement"
>> + depends on RPMSG
>> + help
>> + Say Y here to enable the support of the name service announcement
>> + channel that probes the associated RPMsg device on remote endpoint
>> + service announcement.
>> +
>> config RPMSG_MTK_SCP
>> tristate "MediaTek SCP"
>> depends on MTK_SCP
>> diff --git a/drivers/rpmsg/Makefile b/drivers/rpmsg/Makefile
>> index ffe932ef6050..8d452656f0ee 100644
>> --- a/drivers/rpmsg/Makefile
>> +++ b/drivers/rpmsg/Makefile
>> @@ -1,6 +1,7 @@
>> # SPDX-License-Identifier: GPL-2.0
>> obj-$(CONFIG_RPMSG) += rpmsg_core.o
>> obj-$(CONFIG_RPMSG_CHAR) += rpmsg_char.o
>> +obj-$(CONFIG_RPMSG_NS) += rpmsg_ns.o
>> obj-$(CONFIG_RPMSG_MTK_SCP) += mtk_rpmsg.o
>> qcom_glink-objs := qcom_glink_native.o qcom_glink_ssr.o
>> obj-$(CONFIG_RPMSG_QCOM_GLINK) += qcom_glink.o
>> diff --git a/drivers/rpmsg/rpmsg_internal.h b/drivers/rpmsg/rpmsg_internal.h
>> index 3ea9cec26fc0..04e6cb287e18 100644
>> --- a/drivers/rpmsg/rpmsg_internal.h
>> +++ b/drivers/rpmsg/rpmsg_internal.h
>> @@ -15,6 +15,7 @@
>> #include <linux/idr.h>
>> #include <linux/mutex.h>
>> #include <linux/rpmsg.h>
>> +#include <linux/rpmsg_ns.h>
>> #include <linux/types.h>
>> #include <linux/virtio.h>
>> #include <linux/wait.h>
>> @@ -164,4 +165,21 @@ static inline int rpmsg_chrdev_register_device(struct rpmsg_device *rpdev)
>> return rpmsg_register_device(rpdev);
>> }
>>
>> +/**
>> + * rpmsg_ns_register_device() - register name service device based on rpdev
>> + * @rpdev: prepared rpdev to be used for creating endpoints
>> + *
>> + * This function wraps rpmsg_register_device() preparing the rpdev for use as
>> + * basis for the rpmsg name service device.
>> + */
>> +static inline int rpmsg_ns_register_device(struct rpmsg_device *rpdev)
>> +{
>> + strcpy(rpdev->id.name, "rpmsg_ns");
>> + rpdev->driver_override = "rpmsg_ns";
>> + rpdev->src = RPMSG_NS_ADDR;
>> + rpdev->dst = RPMSG_NS_ADDR;
>> +
>> + return rpmsg_register_device(rpdev);
>> +}
>> +
>> #endif
>> diff --git a/drivers/rpmsg/rpmsg_ns.c b/drivers/rpmsg/rpmsg_ns.c
>> new file mode 100644
>> index 000000000000..b3318bf84433
>> --- /dev/null
>> +++ b/drivers/rpmsg/rpmsg_ns.c
>> @@ -0,0 +1,110 @@
>> +// SPDX-License-Identifier: GPL-2.0
>> +/*
>> + * Copyright (C) STMicroelectronics 2020 - All Rights Reserved
>> + */
>> +#include <linux/device.h>
>> +#include <linux/kernel.h>
>> +#include <linux/module.h>
>> +#include <linux/slab.h>
>> +#include <linux/rpmsg.h>
>> +#include <linux/rpmsg_ns.h>
>> +#include <linux/virtio_config.h>
>> +#include "rpmsg_internal.h"
>> +
>> +/* Invoked when a name service announcement arrives */
>> +static int rpmsg_ns_cb(struct rpmsg_device *rpdev, void *data, int len,
>> + void *priv, u32 src)
>> +{
>> + struct rpmsg_ns_msg *msg = data;
>> + struct rpmsg_device *newch;
>> + struct rpmsg_channel_info chinfo;
>> + struct virtio_rpmsg_channel *vch = to_virtio_rpmsg_channel(rpdev);
>
> Let's not do this, non-VirtIO RPMsg drivers shouldn't need this struct.
Is this patch could be merged with the patch 10/10 to avoid this
temporay implementation?
Regards,
Arnaud
>
>> + struct virtproc_info *vrp = vch->vrp;
>> + struct device *dev = &vrp->vdev->dev;
>> + int ret;
>> +
>> +#if defined(CONFIG_DYNAMIC_DEBUG)
>> + dynamic_hex_dump("NS announcement: ", DUMP_PREFIX_NONE, 16, 1,
>> + data, len, true);
>> +#endif
>> +
>> + if (len != sizeof(*msg)) {
>> + dev_err(dev, "malformed ns msg (%d)\n", len);
>> + return -EINVAL;
>> + }
>> +
>> + /* Don't trust the remote processor for null terminating the name */
>> + msg->name[RPMSG_NAME_SIZE - 1] = '\0';
>> +
>> + strncpy(chinfo.name, msg->name, sizeof(chinfo.name));
>> + chinfo.src = RPMSG_ADDR_ANY;
>> + chinfo.dst = virtio32_to_cpu(vrp->vdev, msg->addr);
>> +
>> + dev_info(dev, "%sing channel %s addr 0x%x\n",
>> + virtio32_to_cpu(vrp->vdev, msg->flags) & RPMSG_NS_DESTROY ?
>> + "destroy" : "creat", msg->name, chinfo.dst);
>> +
>> + if (virtio32_to_cpu(vrp->vdev, msg->flags) & RPMSG_NS_DESTROY) {
>> + ret = rpmsg_release_channel(rpdev, &chinfo);
>> + if (ret)
>> + dev_err(dev, "rpmsg_destroy_channel failed: %d\n", ret);
>> + } else {
>> + newch = rpmsg_create_channel(rpdev, &chinfo);
>> + if (!newch)
>> + dev_err(dev, "rpmsg_create_channel failed\n");
>> + }
>> +
>> + return 0;
>> +}
>> +
>> +static int rpmsg_ns_probe(struct rpmsg_device *rpdev)
>> +{
>> + struct rpmsg_channel_info ns_chinfo;
>
> + struct rpmsg_channel_info ns_chinfo = {
> + .src = RPMSG_NS_ADDR,
> + .dst = RPMSG_NS_ADDR,
> + .name = "name_service",
> + };
>
> Thanks
> Guennadi
>
>> + struct rpmsg_endpoint *ns_ept;
>> +
>> + ns_chinfo.src = RPMSG_NS_ADDR;
>> + ns_chinfo.dst = RPMSG_NS_ADDR;
>> + strcpy(ns_chinfo.name, "name_service");
>> +
>> + /*
>> + * Create the NS announcement service endpoint associated to the RPMsg
>> + * device. The endpoint will be automatically destroyed when the RPMsg
>> + * device will be deleted.
>> + */
>> + ns_ept = rpmsg_create_ept(rpdev, rpmsg_ns_cb, NULL, ns_chinfo);
>> + if (!ns_ept) {
>> + dev_err(&rpdev->dev, "failed to create the ns ept\n");
>> + return -ENOMEM;
>> + }
>> + rpdev->ept = ns_ept;
>> +
>> + return 0;
>> +}
>> +
>> +static struct rpmsg_driver rpmsg_ns_driver = {
>> + .drv.name = "rpmsg_ns",
>> + .probe = rpmsg_ns_probe,
>> +};
>> +
>> +static int rpmsg_ns_init(void)
>> +{
>> + int ret;
>> +
>> + ret = register_rpmsg_driver(&rpmsg_ns_driver);
>> + if (ret < 0)
>> + pr_err("%s: Failed to register rpmsg driver\n", __func__);
>> +
>> + return ret;
>> +}
>> +postcore_initcall(rpmsg_ns_init);
>> +
>> +static void rpmsg_ns_exit(void)
>> +{
>> + unregister_rpmsg_driver(&rpmsg_ns_driver);
>> +}
>> +module_exit(rpmsg_ns_exit);
>> +
>> +MODULE_DESCRIPTION("Name service announcement rpmsg Driver");
>> +MODULE_AUTHOR("Arnaud Pouliquen <arnaud.pouliquen@...com>");
>> +MODULE_ALIAS("rpmsg_ns");
>> +MODULE_LICENSE("GPL v2");
>> --
>> 2.25.1
>>
Powered by blists - more mailing lists