* [PATCH v2 0/3] rpmsg: Introduce RPMSG_CREATE_EPT_FD_IOCTL uAPI
@ 2025-05-09 15:59 Dawei Li
2025-05-09 15:59 ` [PATCH v2 1/3] rpmsg: char: Reuse eptdev logic for anon device Dawei Li
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Dawei Li @ 2025-05-09 15:59 UTC (permalink / raw)
To: andersson, mathieu.poirier
Cc: linux-remoteproc, linux-kernel, dawei.li, set_pte_at
Hi,
This is V2 of series which introduce new uAPI(RPMSG_CREATE_EPT_FD_IOCTL)
for rpmsg subsystem.
Current uAPI implementation for rpmsg ctrl & char device manipulation is
abstracted in procedures below:
- fd = open("/dev/rpmsg_ctrlX")
- ioctl(fd, RPMSG_CREATE_EPT_IOCTL, &info); /dev/rpmsgY devnode is
generated.
- fd_ep = open("/dev/rpmsgY", O_RDWR)
- operations on fd_ep(write, read, poll ioctl)
- ioctl(fd_ep, RPMSG_DESTROY_EPT_IOCTL)
- close(fd_ep)
- close(fd)
This /dev/rpmsgY abstraction is less favorable for:
- Performance issue: It's time consuming for some operations are
invovled:
- Device node creation.
Depends on specific config, especially CONFIG_DEVTMPFS, the overall
overhead is based on coordination between DEVTMPFS and userspace
tools such as udev and mdev.
- Extra kernel-space switch cost.
- Other major costs brought by heavy-weight logic like device_add().
- /dev/rpmsgY node can be opened only once. It doesn't make much sense
that a dynamically created device node can be opened only once.
- For some container application such as docker, a client can't access
host's dev unless specified explicitly. But in case of /dev/rpmsgY, which
is generated dynamically and whose existence is unknown for clients in
advance, this uAPI based on device node doesn't fit well.
An anon inode based approach is introduced to address the issues above.
Rather than generating device node and opening it, rpmsg code just make
a anon inode representing eptdev and return the fd to userspace.
# Performance demo
An simple C application is tested to verify performance of new uAPI.
$ cat test.c
#include <linux/rpmsg.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/ioctl.h>
#include <fcntl.h>
#include <string.h>
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
#include <errno.h>
#include <sys/time.h>
#define N (1 << 20)
int main(int argc, char *argv[])
{
int ret, fd, ep_fd, loop;
struct rpmsg_endpoint_info info;
struct rpmsg_endpoint_fd_info fd_info;
struct timeval start, end;
int i = 0;
double t1, t2;
fd = -1;
ep_fd = -1;
loop = N;
if (argc == 1) {
loop = N;
} else if (argc > 1) {
loop = atoi(argv[1]);
}
printf("loop[%d]\n", loop);
strcpy(info.name, "epx");
info.src = -1;
info.dst = -1;
strcpy(fd_info.name, "epx");
fd_info.src = -1;
fd_info.dst = -1;
fd_info.fd = -1;
while (fd < 0) {
fd = open("/dev/rpmsg_ctrl0", O_RDWR);
if (fd < 0) {
printf("open rpmsg_ctrl0 failed, fd[%d]\n", fd);
}
}
gettimeofday(&start, NULL);
while (loop--) {
ret = ioctl(fd, RPMSG_CREATE_EPT_IOCTL, &info);
if (ret < 0) {
printf("ioctl[RPMSG_CREATE_EPT_IOCTL] failed, ret[%d]\n", ret);
}
ep_fd = -1;
i = 0;
while (ep_fd < 0) {
ep_fd = open("/dev/rpmsg0", O_RDWR);
if (ep_fd < 0) {
i++;
printf("open rpmsg0 failed, epfd[%d]\n", ep_fd);
}
}
//printf("Number of open failed[%d]\n", i);
ret = ioctl(ep_fd, RPMSG_DESTROY_EPT_IOCTL, &info);
if (ret < 0) {
printf("old ioctl[RPMSG_DESTROY_EPT_IOCTL] failed, ret[%d], errno[%d]\n",
ret, errno);
}
close(ep_fd);
}
gettimeofday(&end, NULL);
printf("time for old way: [%ld] us\n", 1000000 * (end.tv_sec - start.tv_sec) + end.tv_usec - start.tv_usec);
t1 = 1000000 * (end.tv_sec - start.tv_sec) + end.tv_usec - start.tv_usec;
if (argc == 1) {
loop = N;
} else if (argc > 1) {
loop = atoi(argv[1]);
}
printf("loop[%d]\n", loop);
gettimeofday(&start, NULL);
while (loop--) {
fd_info.fd = -1;
ret = ioctl(fd, RPMSG_CREATE_EPT_FD_IOCTL, &fd_info);
if (ret < 0 || fd_info.fd < 0) {
printf("ioctl[RPMSG_CREATE_EPT_FD_IOCTL] failed, ret[%d]\n", ret);
}
ret = ioctl(fd_info.fd, RPMSG_DESTROY_EPT_IOCTL, &info);
if (ret < 0) {
printf("new ioctl[RPMSG_DESTROY_EPT_IOCTL] failed, ret[%d]\n", ret);
}
close(fd_info.fd);
}
gettimeofday(&end, NULL);
printf("time for new way: [%ld] us\n", 1000000 * (end.tv_sec - start.tv_sec) + end.tv_usec - start.tv_usec);
t2 = 1000000 * (end.tv_sec - start.tv_sec) + end.tv_usec - start.tv_usec;
printf("t1(old) / t2(new) = %f\n", t1 / t2);
close(fd);
}
# Performance benchmark
- Legacy means benchmark based on old uAPI
- New means benchmark based on new uAPI(the one this series introduce)
- Time are in units of us(10^-6 s)
Test loops Total time(legacy) Total time(new) legacy/new
1 1000 203227 2533 80.2
2 1000 196501 2384 82.4
3 1000 213619 2518 84.8
4 1000 215898 2515 85.8
5 1000 211340 2417 87.4
6 1000 217008 2545 85.2
7 1000 213591 2478 86.1
8 1000 214618 2351 91.2
9 1000 208021 2505 83.0
10 1000 217092 2716 79.9
11 10000 2040802 26765 76.2
12 10000 2027708 26867 75.4
13 10000 1986117 27151 73.1
14 10000 1992956 26301 75.7
15 10000 1980262 25808 76.7
16 10000 1925883 27926 68.9
17 10000 1957518 27100 72.2
18 10000 1980626 28020 70.6
19 10000 1990349 27351 72.7
20 10000 1979087 27563 71.8
21 100000 20266414 256170 79.1
22 100000 19732259 259883 75.9
23 100000 19878399 253710 78.3
24 100000 19788886 257199 76.9
25 100000 19937663 258865 77.0
26 100000 19602512 256771 76.3
27 100000 19599214 257088 76.2
28 100000 19795920 261488 75.7
29 100000 19719341 263299 74.8
30 100000 19871390 258465 76.8
# Changelog:
Changes in v2:
- Fix compilation error for !CONFIG_RPMSG_CHAR config(Test robot).
- Link to v1: https://lore.kernel.org/all/20250507141712.4276-1-dawei.li@linux.dev/
Dawei Li (3):
rpmsg: char: Reuse eptdev logic for anon device
rpmsg: char: Implement eptdev based on anon inode
rpmsg: ctrl: Introduce RPMSG_CREATE_EPT_FD_IOCTL uAPI
drivers/rpmsg/rpmsg_char.c | 124 ++++++++++++++++++++++++++++++-------
drivers/rpmsg/rpmsg_char.h | 19 ++++++
drivers/rpmsg/rpmsg_ctrl.c | 37 ++++++++---
include/uapi/linux/rpmsg.h | 19 ++++++
4 files changed, 167 insertions(+), 32 deletions(-)
---
base-commit: 92a09c47464d040866cf2b4cd052bc60555185fb
Thanks,
Dawei
--
2.25.1
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2 1/3] rpmsg: char: Reuse eptdev logic for anon device
2025-05-09 15:59 [PATCH v2 0/3] rpmsg: Introduce RPMSG_CREATE_EPT_FD_IOCTL uAPI Dawei Li
@ 2025-05-09 15:59 ` Dawei Li
2025-05-15 20:24 ` Mathieu Poirier
2025-05-09 15:59 ` [PATCH v2 2/3] rpmsg: char: Implement eptdev based on anon inode Dawei Li
2025-05-09 15:59 ` [PATCH v2 3/3] rpmsg: ctrl: Introduce RPMSG_CREATE_EPT_FD_IOCTL uAPI Dawei Li
2 siblings, 1 reply; 7+ messages in thread
From: Dawei Li @ 2025-05-09 15:59 UTC (permalink / raw)
To: andersson, mathieu.poirier
Cc: linux-remoteproc, linux-kernel, dawei.li, set_pte_at
Current uAPI implementation for rpmsg ctrl & char device manipulation is
abstracted in procedures below:
Current uAPI implementation for rpmsg ctrl & char device manipulation is
abstracted in procedures below:
- fd = open("/dev/rpmsg_ctrlX")
- ioctl(fd, RPMSG_CREATE_EPT_IOCTL, &info); /dev/rpmsgY devnode is
generated.
- fd_ep = open("/dev/rpmsgY", O_RDWR)
- operations on fd_ep(write, read, poll ioctl)
- ioctl(fd_ep, RPMSG_DESTROY_EPT_IOCTL)
- close(fd_ep)
- close(fd)
This /dev/rpmsgY abstraction is less favorable for:
- Performance issue: It's time consuming for some operations are
invovled:
- Device node creation.
Depends on specific config, especially CONFIG_DEVTMPFS, the overall
overhead is based on coordination between DEVTMPFS and userspace
tools such as udev and mdev.
- Extra kernel-space switch cost.
- Other major costs brought by heavy-weight logic like device_add().
- /dev/rpmsgY node can be opened only once. It doesn't make much sense
that a dynamically created device node can be opened only once.
- For some container application such as docker, a client can't access
host's dev unless specified explicitly. But in case of /dev/rpmsgY, which
is generated dynamically and whose existence is unknown for clients in
advance, this uAPI based on device node doesn't fit well.
An anon inode based approach is introduced to address the issues above.
Rather than generating device node and opening it, rpmsg code just make
a anon inode representing eptdev and return the fd to userspace.
The legacy abstraction based on struct dev and struct cdev is honored
for:
- Avoid legacy uAPI break(RPMSG_CREATE_EPT_IOCTL)
- Reuse existing logic:
-- dev_err() and friends.
-- Life cycle management of struct device.
Signed-off-by: Dawei Li <dawei.li@linux.dev>
---
drivers/rpmsg/rpmsg_char.c | 80 ++++++++++++++++++++++++++------------
1 file changed, 56 insertions(+), 24 deletions(-)
diff --git a/drivers/rpmsg/rpmsg_char.c b/drivers/rpmsg/rpmsg_char.c
index eec7642d2686..5b2a883d6236 100644
--- a/drivers/rpmsg/rpmsg_char.c
+++ b/drivers/rpmsg/rpmsg_char.c
@@ -91,7 +91,8 @@ int rpmsg_chrdev_eptdev_destroy(struct device *dev, void *data)
/* wake up any blocked readers */
wake_up_interruptible(&eptdev->readq);
- cdev_device_del(&eptdev->cdev, &eptdev->dev);
+ if (eptdev->dev.devt)
+ cdev_device_del(&eptdev->cdev, &eptdev->dev);
put_device(&eptdev->dev);
return 0;
@@ -132,21 +133,17 @@ static int rpmsg_ept_flow_cb(struct rpmsg_device *rpdev, void *priv, bool enable
return 0;
}
-static int rpmsg_eptdev_open(struct inode *inode, struct file *filp)
+static int __rpmsg_eptdev_open(struct rpmsg_eptdev *eptdev)
{
- struct rpmsg_eptdev *eptdev = cdev_to_eptdev(inode->i_cdev);
struct rpmsg_endpoint *ept;
struct rpmsg_device *rpdev = eptdev->rpdev;
struct device *dev = &eptdev->dev;
- mutex_lock(&eptdev->ept_lock);
if (eptdev->ept) {
- mutex_unlock(&eptdev->ept_lock);
return -EBUSY;
}
if (!eptdev->rpdev) {
- mutex_unlock(&eptdev->ept_lock);
return -ENETRESET;
}
@@ -164,21 +161,32 @@ static int rpmsg_eptdev_open(struct inode *inode, struct file *filp)
if (!ept) {
dev_err(dev, "failed to open %s\n", eptdev->chinfo.name);
put_device(dev);
- mutex_unlock(&eptdev->ept_lock);
return -EINVAL;
}
ept->flow_cb = rpmsg_ept_flow_cb;
eptdev->ept = ept;
- filp->private_data = eptdev;
- mutex_unlock(&eptdev->ept_lock);
return 0;
}
-static int rpmsg_eptdev_release(struct inode *inode, struct file *filp)
+static int rpmsg_eptdev_open(struct inode *inode, struct file *filp)
{
struct rpmsg_eptdev *eptdev = cdev_to_eptdev(inode->i_cdev);
+ int ret;
+
+ mutex_lock(&eptdev->ept_lock);
+ ret = __rpmsg_eptdev_open(eptdev);
+ if (!ret)
+ filp->private_data = eptdev;
+ mutex_unlock(&eptdev->ept_lock);
+
+ return ret;
+}
+
+static int rpmsg_eptdev_release(struct inode *inode, struct file *filp)
+{
+ struct rpmsg_eptdev *eptdev = filp->private_data;
struct device *dev = &eptdev->dev;
/* Close the endpoint, if it's not already destroyed by the parent */
@@ -400,12 +408,13 @@ static void rpmsg_eptdev_release_device(struct device *dev)
struct rpmsg_eptdev *eptdev = dev_to_eptdev(dev);
ida_free(&rpmsg_ept_ida, dev->id);
- ida_free(&rpmsg_minor_ida, MINOR(eptdev->dev.devt));
+ if (eptdev->dev.devt)
+ ida_free(&rpmsg_minor_ida, MINOR(eptdev->dev.devt));
kfree(eptdev);
}
-static struct rpmsg_eptdev *rpmsg_chrdev_eptdev_alloc(struct rpmsg_device *rpdev,
- struct device *parent)
+static struct rpmsg_eptdev *__rpmsg_chrdev_eptdev_alloc(struct rpmsg_device *rpdev,
+ struct device *parent, bool cdev)
{
struct rpmsg_eptdev *eptdev;
struct device *dev;
@@ -428,33 +437,50 @@ static struct rpmsg_eptdev *rpmsg_chrdev_eptdev_alloc(struct rpmsg_device *rpdev
dev->groups = rpmsg_eptdev_groups;
dev_set_drvdata(dev, eptdev);
- cdev_init(&eptdev->cdev, &rpmsg_eptdev_fops);
- eptdev->cdev.owner = THIS_MODULE;
+ if (cdev) {
+ cdev_init(&eptdev->cdev, &rpmsg_eptdev_fops);
+ eptdev->cdev.owner = THIS_MODULE;
+ }
return eptdev;
}
-static int rpmsg_chrdev_eptdev_add(struct rpmsg_eptdev *eptdev, struct rpmsg_channel_info chinfo)
+static struct rpmsg_eptdev *rpmsg_chrdev_eptdev_alloc(struct rpmsg_device *rpdev,
+ struct device *parent)
+{
+ return __rpmsg_chrdev_eptdev_alloc(rpdev, parent, true);
+}
+
+static int __rpmsg_chrdev_eptdev_add(struct rpmsg_eptdev *eptdev,
+ struct rpmsg_channel_info chinfo, bool cdev)
{
struct device *dev = &eptdev->dev;
int ret;
eptdev->chinfo = chinfo;
- ret = ida_alloc_max(&rpmsg_minor_ida, RPMSG_DEV_MAX - 1, GFP_KERNEL);
- if (ret < 0)
- goto free_eptdev;
- dev->devt = MKDEV(MAJOR(rpmsg_major), ret);
+ if (cdev) {
+ ret = ida_alloc_max(&rpmsg_minor_ida, RPMSG_DEV_MAX - 1, GFP_KERNEL);
+ if (ret < 0)
+ goto free_eptdev;
+ dev->devt = MKDEV(MAJOR(rpmsg_major), ret);
+ }
+
+ /* Anon inode device still need dev name for dev_err() and friends */
ret = ida_alloc(&rpmsg_ept_ida, GFP_KERNEL);
if (ret < 0)
goto free_minor_ida;
dev->id = ret;
dev_set_name(dev, "rpmsg%d", ret);
- ret = cdev_device_add(&eptdev->cdev, &eptdev->dev);
- if (ret)
- goto free_ept_ida;
+ ret = 0;
+
+ if (cdev) {
+ ret = cdev_device_add(&eptdev->cdev, &eptdev->dev);
+ if (ret)
+ goto free_ept_ida;
+ }
/* We can now rely on the release function for cleanup */
dev->release = rpmsg_eptdev_release_device;
@@ -464,7 +490,8 @@ static int rpmsg_chrdev_eptdev_add(struct rpmsg_eptdev *eptdev, struct rpmsg_cha
free_ept_ida:
ida_free(&rpmsg_ept_ida, dev->id);
free_minor_ida:
- ida_free(&rpmsg_minor_ida, MINOR(dev->devt));
+ if (cdev)
+ ida_free(&rpmsg_minor_ida, MINOR(dev->devt));
free_eptdev:
put_device(dev);
kfree(eptdev);
@@ -472,6 +499,11 @@ static int rpmsg_chrdev_eptdev_add(struct rpmsg_eptdev *eptdev, struct rpmsg_cha
return ret;
}
+static int rpmsg_chrdev_eptdev_add(struct rpmsg_eptdev *eptdev, struct rpmsg_channel_info chinfo)
+{
+ return __rpmsg_chrdev_eptdev_add(eptdev, chinfo, true);
+}
+
int rpmsg_chrdev_eptdev_create(struct rpmsg_device *rpdev, struct device *parent,
struct rpmsg_channel_info chinfo)
{
--
2.25.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v2 2/3] rpmsg: char: Implement eptdev based on anon inode
2025-05-09 15:59 [PATCH v2 0/3] rpmsg: Introduce RPMSG_CREATE_EPT_FD_IOCTL uAPI Dawei Li
2025-05-09 15:59 ` [PATCH v2 1/3] rpmsg: char: Reuse eptdev logic for anon device Dawei Li
@ 2025-05-09 15:59 ` Dawei Li
2025-05-15 20:25 ` Mathieu Poirier
2025-05-09 15:59 ` [PATCH v2 3/3] rpmsg: ctrl: Introduce RPMSG_CREATE_EPT_FD_IOCTL uAPI Dawei Li
2 siblings, 1 reply; 7+ messages in thread
From: Dawei Li @ 2025-05-09 15:59 UTC (permalink / raw)
To: andersson, mathieu.poirier
Cc: linux-remoteproc, linux-kernel, dawei.li, set_pte_at
Introduce new eptdev abstraction based on anon inode. The new API is
exactly same with legacy one except:
- It's anonymous and devnode/path free.
- Its fops->open() is empty.
Signed-off-by: Dawei Li <dawei.li@linux.dev>
---
drivers/rpmsg/rpmsg_char.c | 44 ++++++++++++++++++++++++++++++++++++++
drivers/rpmsg/rpmsg_char.h | 19 ++++++++++++++++
2 files changed, 63 insertions(+)
diff --git a/drivers/rpmsg/rpmsg_char.c b/drivers/rpmsg/rpmsg_char.c
index 5b2a883d6236..b0ec05f88013 100644
--- a/drivers/rpmsg/rpmsg_char.c
+++ b/drivers/rpmsg/rpmsg_char.c
@@ -13,6 +13,7 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+#include <linux/anon_inodes.h>
#include <linux/cdev.h>
#include <linux/device.h>
#include <linux/fs.h>
@@ -517,6 +518,49 @@ int rpmsg_chrdev_eptdev_create(struct rpmsg_device *rpdev, struct device *parent
}
EXPORT_SYMBOL(rpmsg_chrdev_eptdev_create);
+static const struct file_operations rpmsg_eptdev_anon_fops = {
+ .owner = THIS_MODULE,
+ .release = rpmsg_eptdev_release,
+ .read_iter = rpmsg_eptdev_read_iter,
+ .write_iter = rpmsg_eptdev_write_iter,
+ .poll = rpmsg_eptdev_poll,
+ .unlocked_ioctl = rpmsg_eptdev_ioctl,
+ .compat_ioctl = compat_ptr_ioctl,
+};
+
+int rpmsg_eptdev_create(struct rpmsg_device *rpdev, struct device *parent,
+ struct rpmsg_channel_info chinfo, int *pfd)
+{
+ struct rpmsg_eptdev *eptdev;
+ int ret, fd;
+
+ eptdev = __rpmsg_chrdev_eptdev_alloc(rpdev, parent, false);
+ if (IS_ERR(eptdev))
+ return PTR_ERR(eptdev);
+
+ ret = __rpmsg_chrdev_eptdev_add(eptdev, chinfo, false);
+ if (ret) {
+ dev_err(&eptdev->dev, "failed to add %s\n", eptdev->chinfo.name);
+ return ret;
+ }
+
+ fd = anon_inode_getfd("rpmsg-eptdev", &rpmsg_eptdev_anon_fops, eptdev, O_RDWR | O_CLOEXEC);
+ if (fd < 0) {
+ put_device(&eptdev->dev);
+ return fd;
+ }
+
+ mutex_lock(&eptdev->ept_lock);
+ ret = __rpmsg_eptdev_open(eptdev);
+ mutex_unlock(&eptdev->ept_lock);
+
+ if (!ret)
+ *pfd = fd;
+
+ return ret;
+}
+EXPORT_SYMBOL(rpmsg_eptdev_create);
+
static int rpmsg_chrdev_probe(struct rpmsg_device *rpdev)
{
struct rpmsg_channel_info chinfo;
diff --git a/drivers/rpmsg/rpmsg_char.h b/drivers/rpmsg/rpmsg_char.h
index 117d9cbc52f0..8cc2c14537da 100644
--- a/drivers/rpmsg/rpmsg_char.h
+++ b/drivers/rpmsg/rpmsg_char.h
@@ -19,6 +19,19 @@
int rpmsg_chrdev_eptdev_create(struct rpmsg_device *rpdev, struct device *parent,
struct rpmsg_channel_info chinfo);
+/**
+ * rpmsg_eptdev_create() - register ep device and its associated fd based on an endpoint
+ * @rpdev: prepared rpdev to be used for creating endpoints
+ * @parent: parent device
+ * @chinfo: associated endpoint channel information.
+ * @pfd: fd in represent of endpoint device
+ *
+ * This function create a new rpmsg endpoint device and its associated fd to instantiate a new
+ * endpoint based on chinfo information.
+ */
+int rpmsg_eptdev_create(struct rpmsg_device *rpdev, struct device *parent,
+ struct rpmsg_channel_info chinfo, int *pfd);
+
/**
* rpmsg_chrdev_eptdev_destroy() - destroy created char device endpoint.
* @data: private data associated to the endpoint device
@@ -36,6 +49,12 @@ static inline int rpmsg_chrdev_eptdev_create(struct rpmsg_device *rpdev, struct
return -ENXIO;
}
+static inline int rpmsg_eptdev_create(struct rpmsg_device *rpdev, struct device *parent,
+ struct rpmsg_channel_info chinfo, int *pfd)
+{
+ return -ENXIO;
+}
+
static inline int rpmsg_chrdev_eptdev_destroy(struct device *dev, void *data)
{
return -ENXIO;
--
2.25.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v2 3/3] rpmsg: ctrl: Introduce RPMSG_CREATE_EPT_FD_IOCTL uAPI
2025-05-09 15:59 [PATCH v2 0/3] rpmsg: Introduce RPMSG_CREATE_EPT_FD_IOCTL uAPI Dawei Li
2025-05-09 15:59 ` [PATCH v2 1/3] rpmsg: char: Reuse eptdev logic for anon device Dawei Li
2025-05-09 15:59 ` [PATCH v2 2/3] rpmsg: char: Implement eptdev based on anon inode Dawei Li
@ 2025-05-09 15:59 ` Dawei Li
2 siblings, 0 replies; 7+ messages in thread
From: Dawei Li @ 2025-05-09 15:59 UTC (permalink / raw)
To: andersson, mathieu.poirier
Cc: linux-remoteproc, linux-kernel, dawei.li, set_pte_at
Implement RPMSG_CREATE_EPT_FD_IOCTL, new uAPI for rpmsg ctrl, which
shares most of operations of RPMSG_CREATE_EPT_IOCTL except that it
returns fd representing eptdev to userspace directly.
Possible calling procedures for userspace are:
- fd = open("/dev/rpmsg_ctrlX")
- ioctl(fd, RPMSG_CREATE_EPT_FD_IOCTL, &info);
- fd_ep = info.fd
- operations on fd_ep(write, read, poll ioctl)
- ioctl(fd_ep, RPMSG_DESTROY_EPT_IOCTL)
- close(fd_ep)
- close(fd)
Signed-off-by: Dawei Li <dawei.li@linux.dev>
---
drivers/rpmsg/rpmsg_ctrl.c | 37 +++++++++++++++++++++++++++++--------
include/uapi/linux/rpmsg.h | 19 +++++++++++++++++++
2 files changed, 48 insertions(+), 8 deletions(-)
diff --git a/drivers/rpmsg/rpmsg_ctrl.c b/drivers/rpmsg/rpmsg_ctrl.c
index 28f57945ccd9..c2cfdf46ccc6 100644
--- a/drivers/rpmsg/rpmsg_ctrl.c
+++ b/drivers/rpmsg/rpmsg_ctrl.c
@@ -75,19 +75,32 @@ static long rpmsg_ctrldev_ioctl(struct file *fp, unsigned int cmd,
unsigned long arg)
{
struct rpmsg_ctrldev *ctrldev = fp->private_data;
+ struct rpmsg_endpoint_fd_info ept_fd_info;
void __user *argp = (void __user *)arg;
struct rpmsg_endpoint_info eptinfo;
struct rpmsg_channel_info chinfo;
struct rpmsg_device *rpdev;
int ret = 0;
-
- if (copy_from_user(&eptinfo, argp, sizeof(eptinfo)))
- return -EFAULT;
-
- memcpy(chinfo.name, eptinfo.name, RPMSG_NAME_SIZE);
- chinfo.name[RPMSG_NAME_SIZE - 1] = '\0';
- chinfo.src = eptinfo.src;
- chinfo.dst = eptinfo.dst;
+ int fd = -1;
+
+ if (cmd == RPMSG_CREATE_EPT_IOCTL || cmd == RPMSG_CREATE_DEV_IOCTL ||
+ cmd == RPMSG_RELEASE_DEV_IOCTL) {
+ if (copy_from_user(&eptinfo, argp, sizeof(eptinfo)))
+ return -EFAULT;
+
+ memcpy(chinfo.name, eptinfo.name, RPMSG_NAME_SIZE);
+ chinfo.name[RPMSG_NAME_SIZE - 1] = '\0';
+ chinfo.src = eptinfo.src;
+ chinfo.dst = eptinfo.dst;
+ } else if (cmd == RPMSG_CREATE_EPT_FD_IOCTL) {
+ if (copy_from_user(&ept_fd_info, argp, sizeof(ept_fd_info)))
+ return -EFAULT;
+
+ memcpy(chinfo.name, ept_fd_info.name, RPMSG_NAME_SIZE);
+ chinfo.name[RPMSG_NAME_SIZE - 1] = '\0';
+ chinfo.src = ept_fd_info.src;
+ chinfo.dst = ept_fd_info.dst;
+ }
mutex_lock(&ctrldev->ctrl_lock);
switch (cmd) {
@@ -110,6 +123,14 @@ static long rpmsg_ctrldev_ioctl(struct file *fp, unsigned int cmd,
chinfo.name, ret);
break;
+ case RPMSG_CREATE_EPT_FD_IOCTL:
+ ret = rpmsg_eptdev_create(ctrldev->rpdev, &ctrldev->dev, chinfo, &fd);
+ if (!ret) {
+ ept_fd_info.fd = fd;
+ ret = copy_to_user(argp, &ept_fd_info, sizeof(ept_fd_info));
+ }
+ break;
+
default:
ret = -EINVAL;
}
diff --git a/include/uapi/linux/rpmsg.h b/include/uapi/linux/rpmsg.h
index f0c8da2b185b..934c0e76bfe3 100644
--- a/include/uapi/linux/rpmsg.h
+++ b/include/uapi/linux/rpmsg.h
@@ -53,4 +53,23 @@ struct rpmsg_endpoint_info {
*/
#define RPMSG_SET_INCOMING_FLOWCONTROL _IOR(0xb5, 0x6, int)
+/**
+ * struct rpmsg_endpoint_fd_info - endpoint & fd info representation
+ * @name: name of service
+ * @src: local address. To set to RPMSG_ADDR_ANY if not used.
+ * @dst: destination address. To set to RPMSG_ADDR_ANY if not used.
+ * @fd: fd returned from driver
+ */
+struct rpmsg_endpoint_fd_info {
+ char name[32];
+ __u32 src;
+ __u32 dst;
+ __s32 fd;
+};
+
+/**
+ * Instantiate a new rmpsg endpoint which is represented by fd
+ */
+#define RPMSG_CREATE_EPT_FD_IOCTL _IOWR(0xb5, 0x7, struct rpmsg_endpoint_fd_info)
+
#endif
--
2.25.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v2 1/3] rpmsg: char: Reuse eptdev logic for anon device
2025-05-09 15:59 ` [PATCH v2 1/3] rpmsg: char: Reuse eptdev logic for anon device Dawei Li
@ 2025-05-15 20:24 ` Mathieu Poirier
2025-05-16 12:07 ` Dawei Li
0 siblings, 1 reply; 7+ messages in thread
From: Mathieu Poirier @ 2025-05-15 20:24 UTC (permalink / raw)
To: Dawei Li; +Cc: andersson, linux-remoteproc, linux-kernel, set_pte_at
Hi,
On Fri, May 09, 2025 at 11:59:25PM +0800, Dawei Li wrote:
> Current uAPI implementation for rpmsg ctrl & char device manipulation is
> abstracted in procedures below:
>
> Current uAPI implementation for rpmsg ctrl & char device manipulation is
> abstracted in procedures below:
> - fd = open("/dev/rpmsg_ctrlX")
> - ioctl(fd, RPMSG_CREATE_EPT_IOCTL, &info); /dev/rpmsgY devnode is
> generated.
> - fd_ep = open("/dev/rpmsgY", O_RDWR)
> - operations on fd_ep(write, read, poll ioctl)
> - ioctl(fd_ep, RPMSG_DESTROY_EPT_IOCTL)
> - close(fd_ep)
> - close(fd)
>
> This /dev/rpmsgY abstraction is less favorable for:
> - Performance issue: It's time consuming for some operations are
> invovled:
> - Device node creation.
> Depends on specific config, especially CONFIG_DEVTMPFS, the overall
> overhead is based on coordination between DEVTMPFS and userspace
> tools such as udev and mdev.
>
> - Extra kernel-space switch cost.
>
> - Other major costs brought by heavy-weight logic like device_add().
>
> - /dev/rpmsgY node can be opened only once. It doesn't make much sense
> that a dynamically created device node can be opened only once.
>
> - For some container application such as docker, a client can't access
> host's dev unless specified explicitly. But in case of /dev/rpmsgY, which
> is generated dynamically and whose existence is unknown for clients in
> advance, this uAPI based on device node doesn't fit well.
>
> An anon inode based approach is introduced to address the issues above.
> Rather than generating device node and opening it, rpmsg code just make
> a anon inode representing eptdev and return the fd to userspace.
Please change occurences of "anon" for "anonyous". "Anon" was used to avoid
writing "anonymous" all the time in the code, but description should not use the
shorthand. In the title, this patch and all other patches.
>
> The legacy abstraction based on struct dev and struct cdev is honored
> for:
> - Avoid legacy uAPI break(RPMSG_CREATE_EPT_IOCTL)
> - Reuse existing logic:
> -- dev_err() and friends.
> -- Life cycle management of struct device.
>
> Signed-off-by: Dawei Li <dawei.li@linux.dev>
> ---
> drivers/rpmsg/rpmsg_char.c | 80 ++++++++++++++++++++++++++------------
> 1 file changed, 56 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/rpmsg/rpmsg_char.c b/drivers/rpmsg/rpmsg_char.c
> index eec7642d2686..5b2a883d6236 100644
> --- a/drivers/rpmsg/rpmsg_char.c
> +++ b/drivers/rpmsg/rpmsg_char.c
> @@ -91,7 +91,8 @@ int rpmsg_chrdev_eptdev_destroy(struct device *dev, void *data)
> /* wake up any blocked readers */
> wake_up_interruptible(&eptdev->readq);
>
> - cdev_device_del(&eptdev->cdev, &eptdev->dev);
> + if (eptdev->dev.devt)
> + cdev_device_del(&eptdev->cdev, &eptdev->dev);
> put_device(&eptdev->dev);
>
> return 0;
> @@ -132,21 +133,17 @@ static int rpmsg_ept_flow_cb(struct rpmsg_device *rpdev, void *priv, bool enable
> return 0;
> }
>
> -static int rpmsg_eptdev_open(struct inode *inode, struct file *filp)
> +static int __rpmsg_eptdev_open(struct rpmsg_eptdev *eptdev)
> {
> - struct rpmsg_eptdev *eptdev = cdev_to_eptdev(inode->i_cdev);
> struct rpmsg_endpoint *ept;
> struct rpmsg_device *rpdev = eptdev->rpdev;
> struct device *dev = &eptdev->dev;
>
> - mutex_lock(&eptdev->ept_lock);
> if (eptdev->ept) {
> - mutex_unlock(&eptdev->ept_lock);
> return -EBUSY;
> }
>
> if (!eptdev->rpdev) {
> - mutex_unlock(&eptdev->ept_lock);
> return -ENETRESET;
> }
>
> @@ -164,21 +161,32 @@ static int rpmsg_eptdev_open(struct inode *inode, struct file *filp)
> if (!ept) {
> dev_err(dev, "failed to open %s\n", eptdev->chinfo.name);
> put_device(dev);
> - mutex_unlock(&eptdev->ept_lock);
> return -EINVAL;
> }
>
> ept->flow_cb = rpmsg_ept_flow_cb;
> eptdev->ept = ept;
> - filp->private_data = eptdev;
> - mutex_unlock(&eptdev->ept_lock);
>
> return 0;
> }
>
> -static int rpmsg_eptdev_release(struct inode *inode, struct file *filp)
> +static int rpmsg_eptdev_open(struct inode *inode, struct file *filp)
> {
> struct rpmsg_eptdev *eptdev = cdev_to_eptdev(inode->i_cdev);
> + int ret;
> +
> + mutex_lock(&eptdev->ept_lock);
> + ret = __rpmsg_eptdev_open(eptdev);
> + if (!ret)
> + filp->private_data = eptdev;
> + mutex_unlock(&eptdev->ept_lock);
> +
> + return ret;
> +}
> +
> +static int rpmsg_eptdev_release(struct inode *inode, struct file *filp)
> +{
> + struct rpmsg_eptdev *eptdev = filp->private_data;
> struct device *dev = &eptdev->dev;
>
> /* Close the endpoint, if it's not already destroyed by the parent */
> @@ -400,12 +408,13 @@ static void rpmsg_eptdev_release_device(struct device *dev)
> struct rpmsg_eptdev *eptdev = dev_to_eptdev(dev);
>
> ida_free(&rpmsg_ept_ida, dev->id);
> - ida_free(&rpmsg_minor_ida, MINOR(eptdev->dev.devt));
> + if (eptdev->dev.devt)
> + ida_free(&rpmsg_minor_ida, MINOR(eptdev->dev.devt));
> kfree(eptdev);
> }
>
> -static struct rpmsg_eptdev *rpmsg_chrdev_eptdev_alloc(struct rpmsg_device *rpdev,
> - struct device *parent)
> +static struct rpmsg_eptdev *__rpmsg_chrdev_eptdev_alloc(struct rpmsg_device *rpdev,
> + struct device *parent, bool cdev)
I would simply rename this rpmsg_eptdev_alloc() and then use is in
rpmsg_chrdev_eptdev_alloc() and rpmsg_anonynous_eptdev_alloc()
> {
> struct rpmsg_eptdev *eptdev;
> struct device *dev;
> @@ -428,33 +437,50 @@ static struct rpmsg_eptdev *rpmsg_chrdev_eptdev_alloc(struct rpmsg_device *rpdev
> dev->groups = rpmsg_eptdev_groups;
> dev_set_drvdata(dev, eptdev);
>
> - cdev_init(&eptdev->cdev, &rpmsg_eptdev_fops);
> - eptdev->cdev.owner = THIS_MODULE;
> + if (cdev) {
> + cdev_init(&eptdev->cdev, &rpmsg_eptdev_fops);
> + eptdev->cdev.owner = THIS_MODULE;
> + }
>
> return eptdev;
> }
>
> -static int rpmsg_chrdev_eptdev_add(struct rpmsg_eptdev *eptdev, struct rpmsg_channel_info chinfo)
> +static struct rpmsg_eptdev *rpmsg_chrdev_eptdev_alloc(struct rpmsg_device *rpdev,
> + struct device *parent)
> +{
> + return __rpmsg_chrdev_eptdev_alloc(rpdev, parent, true);
> +}
> +
> +static int __rpmsg_chrdev_eptdev_add(struct rpmsg_eptdev *eptdev,
> + struct rpmsg_channel_info chinfo, bool cdev)
Same here, rpmsg_eptdev_add()
> {
> struct device *dev = &eptdev->dev;
> int ret;
>
> eptdev->chinfo = chinfo;
>
> - ret = ida_alloc_max(&rpmsg_minor_ida, RPMSG_DEV_MAX - 1, GFP_KERNEL);
> - if (ret < 0)
> - goto free_eptdev;
> - dev->devt = MKDEV(MAJOR(rpmsg_major), ret);
> + if (cdev) {
> + ret = ida_alloc_max(&rpmsg_minor_ida, RPMSG_DEV_MAX - 1, GFP_KERNEL);
> + if (ret < 0)
> + goto free_eptdev;
>
> + dev->devt = MKDEV(MAJOR(rpmsg_major), ret);
> + }
> +
> + /* Anon inode device still need dev name for dev_err() and friends */
> ret = ida_alloc(&rpmsg_ept_ida, GFP_KERNEL);
> if (ret < 0)
> goto free_minor_ida;
> dev->id = ret;
> dev_set_name(dev, "rpmsg%d", ret);
>
> - ret = cdev_device_add(&eptdev->cdev, &eptdev->dev);
> - if (ret)
> - goto free_ept_ida;
> + ret = 0;
> +
> + if (cdev) {
> + ret = cdev_device_add(&eptdev->cdev, &eptdev->dev);
> + if (ret)
> + goto free_ept_ida;
> + }
>
> /* We can now rely on the release function for cleanup */
> dev->release = rpmsg_eptdev_release_device;
> @@ -464,7 +490,8 @@ static int rpmsg_chrdev_eptdev_add(struct rpmsg_eptdev *eptdev, struct rpmsg_cha
> free_ept_ida:
> ida_free(&rpmsg_ept_ida, dev->id);
> free_minor_ida:
> - ida_free(&rpmsg_minor_ida, MINOR(dev->devt));
> + if (cdev)
> + ida_free(&rpmsg_minor_ida, MINOR(dev->devt));
> free_eptdev:
> put_device(dev);
> kfree(eptdev);
> @@ -472,6 +499,11 @@ static int rpmsg_chrdev_eptdev_add(struct rpmsg_eptdev *eptdev, struct rpmsg_cha
> return ret;
> }
>
> +static int rpmsg_chrdev_eptdev_add(struct rpmsg_eptdev *eptdev, struct rpmsg_channel_info chinfo)
> +{
> + return __rpmsg_chrdev_eptdev_add(eptdev, chinfo, true);
> +}
> +
> int rpmsg_chrdev_eptdev_create(struct rpmsg_device *rpdev, struct device *parent,
> struct rpmsg_channel_info chinfo)
> {
> --
> 2.25.1
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2 2/3] rpmsg: char: Implement eptdev based on anon inode
2025-05-09 15:59 ` [PATCH v2 2/3] rpmsg: char: Implement eptdev based on anon inode Dawei Li
@ 2025-05-15 20:25 ` Mathieu Poirier
0 siblings, 0 replies; 7+ messages in thread
From: Mathieu Poirier @ 2025-05-15 20:25 UTC (permalink / raw)
To: Dawei Li; +Cc: andersson, linux-remoteproc, linux-kernel, set_pte_at
On Fri, May 09, 2025 at 11:59:26PM +0800, Dawei Li wrote:
> Introduce new eptdev abstraction based on anon inode. The new API is
> exactly same with legacy one except:
>
> - It's anonymous and devnode/path free.
> - Its fops->open() is empty.
>
> Signed-off-by: Dawei Li <dawei.li@linux.dev>
> ---
> drivers/rpmsg/rpmsg_char.c | 44 ++++++++++++++++++++++++++++++++++++++
> drivers/rpmsg/rpmsg_char.h | 19 ++++++++++++++++
> 2 files changed, 63 insertions(+)
>
> diff --git a/drivers/rpmsg/rpmsg_char.c b/drivers/rpmsg/rpmsg_char.c
> index 5b2a883d6236..b0ec05f88013 100644
> --- a/drivers/rpmsg/rpmsg_char.c
> +++ b/drivers/rpmsg/rpmsg_char.c
> @@ -13,6 +13,7 @@
>
> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
>
> +#include <linux/anon_inodes.h>
> #include <linux/cdev.h>
> #include <linux/device.h>
> #include <linux/fs.h>
> @@ -517,6 +518,49 @@ int rpmsg_chrdev_eptdev_create(struct rpmsg_device *rpdev, struct device *parent
> }
> EXPORT_SYMBOL(rpmsg_chrdev_eptdev_create);
>
> +static const struct file_operations rpmsg_eptdev_anon_fops = {
> + .owner = THIS_MODULE,
> + .release = rpmsg_eptdev_release,
> + .read_iter = rpmsg_eptdev_read_iter,
> + .write_iter = rpmsg_eptdev_write_iter,
> + .poll = rpmsg_eptdev_poll,
> + .unlocked_ioctl = rpmsg_eptdev_ioctl,
> + .compat_ioctl = compat_ptr_ioctl,
> +};
> +
> +int rpmsg_eptdev_create(struct rpmsg_device *rpdev, struct device *parent,
> + struct rpmsg_channel_info chinfo, int *pfd)
rpmsg_anonymous_eptdev_create()
> +{
> + struct rpmsg_eptdev *eptdev;
> + int ret, fd;
> +
> + eptdev = __rpmsg_chrdev_eptdev_alloc(rpdev, parent, false);
> + if (IS_ERR(eptdev))
> + return PTR_ERR(eptdev);
> +
> + ret = __rpmsg_chrdev_eptdev_add(eptdev, chinfo, false);
> + if (ret) {
> + dev_err(&eptdev->dev, "failed to add %s\n", eptdev->chinfo.name);
> + return ret;
> + }
> +
> + fd = anon_inode_getfd("rpmsg-eptdev", &rpmsg_eptdev_anon_fops, eptdev, O_RDWR | O_CLOEXEC);
> + if (fd < 0) {
> + put_device(&eptdev->dev);
> + return fd;
> + }
> +
> + mutex_lock(&eptdev->ept_lock);
> + ret = __rpmsg_eptdev_open(eptdev);
> + mutex_unlock(&eptdev->ept_lock);
> +
> + if (!ret)
> + *pfd = fd;
> +
> + return ret;
> +}
> +EXPORT_SYMBOL(rpmsg_eptdev_create);
> +
> static int rpmsg_chrdev_probe(struct rpmsg_device *rpdev)
> {
> struct rpmsg_channel_info chinfo;
> diff --git a/drivers/rpmsg/rpmsg_char.h b/drivers/rpmsg/rpmsg_char.h
> index 117d9cbc52f0..8cc2c14537da 100644
> --- a/drivers/rpmsg/rpmsg_char.h
> +++ b/drivers/rpmsg/rpmsg_char.h
> @@ -19,6 +19,19 @@
> int rpmsg_chrdev_eptdev_create(struct rpmsg_device *rpdev, struct device *parent,
> struct rpmsg_channel_info chinfo);
>
> +/**
> + * rpmsg_eptdev_create() - register ep device and its associated fd based on an endpoint
> + * @rpdev: prepared rpdev to be used for creating endpoints
> + * @parent: parent device
> + * @chinfo: associated endpoint channel information.
> + * @pfd: fd in represent of endpoint device
> + *
> + * This function create a new rpmsg endpoint device and its associated fd to instantiate a new
> + * endpoint based on chinfo information.
> + */
> +int rpmsg_eptdev_create(struct rpmsg_device *rpdev, struct device *parent,
> + struct rpmsg_channel_info chinfo, int *pfd);
> +
> /**
> * rpmsg_chrdev_eptdev_destroy() - destroy created char device endpoint.
> * @data: private data associated to the endpoint device
> @@ -36,6 +49,12 @@ static inline int rpmsg_chrdev_eptdev_create(struct rpmsg_device *rpdev, struct
> return -ENXIO;
> }
>
> +static inline int rpmsg_eptdev_create(struct rpmsg_device *rpdev, struct device *parent,
> + struct rpmsg_channel_info chinfo, int *pfd)
> +{
> + return -ENXIO;
> +}
> +
> static inline int rpmsg_chrdev_eptdev_destroy(struct device *dev, void *data)
> {
> return -ENXIO;
> --
> 2.25.1
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2 1/3] rpmsg: char: Reuse eptdev logic for anon device
2025-05-15 20:24 ` Mathieu Poirier
@ 2025-05-16 12:07 ` Dawei Li
0 siblings, 0 replies; 7+ messages in thread
From: Dawei Li @ 2025-05-16 12:07 UTC (permalink / raw)
To: Mathieu Poirier
Cc: andersson, linux-remoteproc, linux-kernel, set_pte_at, dawei.li
Hi Mathieu,
Thanks for reviewing.
On Thu, May 15, 2025 at 02:24:04PM -0600, Mathieu Poirier wrote:
> Hi,
>
> On Fri, May 09, 2025 at 11:59:25PM +0800, Dawei Li wrote:
> > Current uAPI implementation for rpmsg ctrl & char device manipulation is
> > abstracted in procedures below:
> >
> > Current uAPI implementation for rpmsg ctrl & char device manipulation is
> > abstracted in procedures below:
> > - fd = open("/dev/rpmsg_ctrlX")
> > - ioctl(fd, RPMSG_CREATE_EPT_IOCTL, &info); /dev/rpmsgY devnode is
> > generated.
> > - fd_ep = open("/dev/rpmsgY", O_RDWR)
> > - operations on fd_ep(write, read, poll ioctl)
> > - ioctl(fd_ep, RPMSG_DESTROY_EPT_IOCTL)
> > - close(fd_ep)
> > - close(fd)
> >
> > This /dev/rpmsgY abstraction is less favorable for:
> > - Performance issue: It's time consuming for some operations are
> > invovled:
> > - Device node creation.
> > Depends on specific config, especially CONFIG_DEVTMPFS, the overall
> > overhead is based on coordination between DEVTMPFS and userspace
> > tools such as udev and mdev.
> >
> > - Extra kernel-space switch cost.
> >
> > - Other major costs brought by heavy-weight logic like device_add().
> >
> > - /dev/rpmsgY node can be opened only once. It doesn't make much sense
> > that a dynamically created device node can be opened only once.
> >
> > - For some container application such as docker, a client can't access
> > host's dev unless specified explicitly. But in case of /dev/rpmsgY, which
> > is generated dynamically and whose existence is unknown for clients in
> > advance, this uAPI based on device node doesn't fit well.
> >
> > An anon inode based approach is introduced to address the issues above.
> > Rather than generating device node and opening it, rpmsg code just make
> > a anon inode representing eptdev and return the fd to userspace.
>
> Please change occurences of "anon" for "anonyous". "Anon" was used to avoid
> writing "anonymous" all the time in the code, but description should not use the
> shorthand. In the title, this patch and all other patches.
Acked.
>
> >
> > The legacy abstraction based on struct dev and struct cdev is honored
> > for:
> > - Avoid legacy uAPI break(RPMSG_CREATE_EPT_IOCTL)
> > - Reuse existing logic:
> > -- dev_err() and friends.
> > -- Life cycle management of struct device.
> >
> > Signed-off-by: Dawei Li <dawei.li@linux.dev>
> > ---
> > drivers/rpmsg/rpmsg_char.c | 80 ++++++++++++++++++++++++++------------
> > 1 file changed, 56 insertions(+), 24 deletions(-)
> >
> > diff --git a/drivers/rpmsg/rpmsg_char.c b/drivers/rpmsg/rpmsg_char.c
> > index eec7642d2686..5b2a883d6236 100644
> > --- a/drivers/rpmsg/rpmsg_char.c
> > +++ b/drivers/rpmsg/rpmsg_char.c
> > @@ -91,7 +91,8 @@ int rpmsg_chrdev_eptdev_destroy(struct device *dev, void *data)
> > /* wake up any blocked readers */
> > wake_up_interruptible(&eptdev->readq);
> >
> > - cdev_device_del(&eptdev->cdev, &eptdev->dev);
> > + if (eptdev->dev.devt)
> > + cdev_device_del(&eptdev->cdev, &eptdev->dev);
> > put_device(&eptdev->dev);
> >
> > return 0;
> > @@ -132,21 +133,17 @@ static int rpmsg_ept_flow_cb(struct rpmsg_device *rpdev, void *priv, bool enable
> > return 0;
> > }
> >
> > -static int rpmsg_eptdev_open(struct inode *inode, struct file *filp)
> > +static int __rpmsg_eptdev_open(struct rpmsg_eptdev *eptdev)
> > {
> > - struct rpmsg_eptdev *eptdev = cdev_to_eptdev(inode->i_cdev);
> > struct rpmsg_endpoint *ept;
> > struct rpmsg_device *rpdev = eptdev->rpdev;
> > struct device *dev = &eptdev->dev;
> >
> > - mutex_lock(&eptdev->ept_lock);
> > if (eptdev->ept) {
> > - mutex_unlock(&eptdev->ept_lock);
> > return -EBUSY;
> > }
> >
> > if (!eptdev->rpdev) {
> > - mutex_unlock(&eptdev->ept_lock);
> > return -ENETRESET;
> > }
> >
> > @@ -164,21 +161,32 @@ static int rpmsg_eptdev_open(struct inode *inode, struct file *filp)
> > if (!ept) {
> > dev_err(dev, "failed to open %s\n", eptdev->chinfo.name);
> > put_device(dev);
> > - mutex_unlock(&eptdev->ept_lock);
> > return -EINVAL;
> > }
> >
> > ept->flow_cb = rpmsg_ept_flow_cb;
> > eptdev->ept = ept;
> > - filp->private_data = eptdev;
> > - mutex_unlock(&eptdev->ept_lock);
> >
> > return 0;
> > }
> >
> > -static int rpmsg_eptdev_release(struct inode *inode, struct file *filp)
> > +static int rpmsg_eptdev_open(struct inode *inode, struct file *filp)
> > {
> > struct rpmsg_eptdev *eptdev = cdev_to_eptdev(inode->i_cdev);
> > + int ret;
> > +
> > + mutex_lock(&eptdev->ept_lock);
> > + ret = __rpmsg_eptdev_open(eptdev);
> > + if (!ret)
> > + filp->private_data = eptdev;
> > + mutex_unlock(&eptdev->ept_lock);
> > +
> > + return ret;
> > +}
> > +
> > +static int rpmsg_eptdev_release(struct inode *inode, struct file *filp)
> > +{
> > + struct rpmsg_eptdev *eptdev = filp->private_data;
> > struct device *dev = &eptdev->dev;
> >
> > /* Close the endpoint, if it's not already destroyed by the parent */
> > @@ -400,12 +408,13 @@ static void rpmsg_eptdev_release_device(struct device *dev)
> > struct rpmsg_eptdev *eptdev = dev_to_eptdev(dev);
> >
> > ida_free(&rpmsg_ept_ida, dev->id);
> > - ida_free(&rpmsg_minor_ida, MINOR(eptdev->dev.devt));
> > + if (eptdev->dev.devt)
> > + ida_free(&rpmsg_minor_ida, MINOR(eptdev->dev.devt));
> > kfree(eptdev);
> > }
> >
> > -static struct rpmsg_eptdev *rpmsg_chrdev_eptdev_alloc(struct rpmsg_device *rpdev,
> > - struct device *parent)
> > +static struct rpmsg_eptdev *__rpmsg_chrdev_eptdev_alloc(struct rpmsg_device *rpdev,
> > + struct device *parent, bool cdev)
>
>
> I would simply rename this rpmsg_eptdev_alloc() and then use is in
> rpmsg_chrdev_eptdev_alloc() and rpmsg_anonynous_eptdev_alloc()
Agreed. rpmsg_eptdev_alloc() is much better.
>
> > {
> > struct rpmsg_eptdev *eptdev;
> > struct device *dev;
> > @@ -428,33 +437,50 @@ static struct rpmsg_eptdev *rpmsg_chrdev_eptdev_alloc(struct rpmsg_device *rpdev
> > dev->groups = rpmsg_eptdev_groups;
> > dev_set_drvdata(dev, eptdev);
> >
> > - cdev_init(&eptdev->cdev, &rpmsg_eptdev_fops);
> > - eptdev->cdev.owner = THIS_MODULE;
> > + if (cdev) {
> > + cdev_init(&eptdev->cdev, &rpmsg_eptdev_fops);
> > + eptdev->cdev.owner = THIS_MODULE;
> > + }
> >
> > return eptdev;
> > }
> >
> > -static int rpmsg_chrdev_eptdev_add(struct rpmsg_eptdev *eptdev, struct rpmsg_channel_info chinfo)
> > +static struct rpmsg_eptdev *rpmsg_chrdev_eptdev_alloc(struct rpmsg_device *rpdev,
> > + struct device *parent)
> > +{
> > + return __rpmsg_chrdev_eptdev_alloc(rpdev, parent, true);
> > +}
> > +
> > +static int __rpmsg_chrdev_eptdev_add(struct rpmsg_eptdev *eptdev,
> > + struct rpmsg_channel_info chinfo, bool cdev)
>
> Same here, rpmsg_eptdev_add()
Acked.
All the issues above, including those for patch 2/3, will be fixed in
V3.
Thanks,
Dawei
>
> > {
> > struct device *dev = &eptdev->dev;
> > int ret;
> >
> > eptdev->chinfo = chinfo;
> >
> > - ret = ida_alloc_max(&rpmsg_minor_ida, RPMSG_DEV_MAX - 1, GFP_KERNEL);
> > - if (ret < 0)
> > - goto free_eptdev;
> > - dev->devt = MKDEV(MAJOR(rpmsg_major), ret);
> > + if (cdev) {
> > + ret = ida_alloc_max(&rpmsg_minor_ida, RPMSG_DEV_MAX - 1, GFP_KERNEL);
> > + if (ret < 0)
> > + goto free_eptdev;
> >
> > + dev->devt = MKDEV(MAJOR(rpmsg_major), ret);
> > + }
> > +
> > + /* Anon inode device still need dev name for dev_err() and friends */
> > ret = ida_alloc(&rpmsg_ept_ida, GFP_KERNEL);
> > if (ret < 0)
> > goto free_minor_ida;
> > dev->id = ret;
> > dev_set_name(dev, "rpmsg%d", ret);
> >
> > - ret = cdev_device_add(&eptdev->cdev, &eptdev->dev);
> > - if (ret)
> > - goto free_ept_ida;
> > + ret = 0;
> > +
> > + if (cdev) {
> > + ret = cdev_device_add(&eptdev->cdev, &eptdev->dev);
> > + if (ret)
> > + goto free_ept_ida;
> > + }
> >
> > /* We can now rely on the release function for cleanup */
> > dev->release = rpmsg_eptdev_release_device;
> > @@ -464,7 +490,8 @@ static int rpmsg_chrdev_eptdev_add(struct rpmsg_eptdev *eptdev, struct rpmsg_cha
> > free_ept_ida:
> > ida_free(&rpmsg_ept_ida, dev->id);
> > free_minor_ida:
> > - ida_free(&rpmsg_minor_ida, MINOR(dev->devt));
> > + if (cdev)
> > + ida_free(&rpmsg_minor_ida, MINOR(dev->devt));
> > free_eptdev:
> > put_device(dev);
> > kfree(eptdev);
> > @@ -472,6 +499,11 @@ static int rpmsg_chrdev_eptdev_add(struct rpmsg_eptdev *eptdev, struct rpmsg_cha
> > return ret;
> > }
> >
> > +static int rpmsg_chrdev_eptdev_add(struct rpmsg_eptdev *eptdev, struct rpmsg_channel_info chinfo)
> > +{
> > + return __rpmsg_chrdev_eptdev_add(eptdev, chinfo, true);
> > +}
> > +
> > int rpmsg_chrdev_eptdev_create(struct rpmsg_device *rpdev, struct device *parent,
> > struct rpmsg_channel_info chinfo)
> > {
> > --
> > 2.25.1
> >
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2025-05-16 12:07 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-05-09 15:59 [PATCH v2 0/3] rpmsg: Introduce RPMSG_CREATE_EPT_FD_IOCTL uAPI Dawei Li
2025-05-09 15:59 ` [PATCH v2 1/3] rpmsg: char: Reuse eptdev logic for anon device Dawei Li
2025-05-15 20:24 ` Mathieu Poirier
2025-05-16 12:07 ` Dawei Li
2025-05-09 15:59 ` [PATCH v2 2/3] rpmsg: char: Implement eptdev based on anon inode Dawei Li
2025-05-15 20:25 ` Mathieu Poirier
2025-05-09 15:59 ` [PATCH v2 3/3] rpmsg: ctrl: Introduce RPMSG_CREATE_EPT_FD_IOCTL uAPI Dawei Li
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).