From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-186.mta0.migadu.com (out-186.mta0.migadu.com [91.218.175.186]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6A7C619755B for ; Mon, 9 Jun 2025 15:16:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.186 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749482162; cv=none; b=iD6tXPvxZjap3Q3/KIE3pWP/DEgZQN0relmfcsr1ovPkcJljFmk8qz35oimzN/MRuE+KY9dY6fxj16NJbNb8Rt9XbqexWxsf/at+4gpVNJehF6k8xNB6vU3e9slnVHtMAgh8qjXtl8VoVWKdR14BEPIp76qg1Fo2C+9+5EouUmA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749482162; c=relaxed/simple; bh=a9xKhDk+BGtJ4JiaTrGo1b0mvMJxDoS0zpI5Gu5pD4Q=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=BKp+puK6EsXaLKRllKAnRndn72flHaoyLLwKVn1Fm4RRjtL1ZQ5GBv2qnUwDnR6biIlXJk+c9RH71GmlzY6Qw/8CWBRYrmIQjpMa6YdBCcmGE3V8yuzlP7EG6Rq+VlOimUKLQY8L3pXva5C10v4xKrMuyv2Xh3VV0lcs5i559n4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=KTguZMSY; arc=none smtp.client-ip=91.218.175.186 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="KTguZMSY" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1749482158; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FSAoHN+I0q5gvwL07/+w9FpvcidtI68SZ5LkGFNNr6w=; b=KTguZMSYidtATqWgaAMbSionSaoSmZingtDAFxQgVJt5jBf/rDa284F4BWsyfagpMnfYXJ ndgQ9he05E7MkFXgxG12D34MYQSdmfwHhghfuoJf65xx+C5bv8tRReVDSjmiAv7j1HsILD Eue9zAtLJWDdG8bEdHagm7oVR5Nu9lY= From: Dawei Li To: andersson@kernel.org, mathieu.poirier@linaro.org Cc: linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org, dawei.li@linux.dev, set_pte_at@outlook.com Subject: [PATCH v4 3/3] rpmsg: ctrl: Introduce RPMSG_CREATE_EPT_FD_IOCTL uAPI Date: Mon, 9 Jun 2025 23:15:31 +0800 Message-Id: <20250609151531.22621-4-dawei.li@linux.dev> In-Reply-To: <20250609151531.22621-1-dawei.li@linux.dev> References: <20250609151531.22621-1-dawei.li@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT 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 --- drivers/rpmsg/rpmsg_ctrl.c | 35 ++++++++++++++++++++++++++++------- include/uapi/linux/rpmsg.h | 27 ++++++++++++++++++++++++++- 2 files changed, 54 insertions(+), 8 deletions(-) diff --git a/drivers/rpmsg/rpmsg_ctrl.c b/drivers/rpmsg/rpmsg_ctrl.c index 28f57945ccd9..efb207506e5c 100644 --- a/drivers/rpmsg/rpmsg_ctrl.c +++ b/drivers/rpmsg/rpmsg_ctrl.c @@ -75,19 +75,30 @@ 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; + 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; + } else { + 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; + } mutex_lock(&ctrldev->ctrl_lock); switch (cmd) { @@ -110,6 +121,16 @@ static long rpmsg_ctrldev_ioctl(struct file *fp, unsigned int cmd, chinfo.name, ret); break; + case RPMSG_CREATE_EPT_FD_IOCTL: + ret = rpmsg_anonymous_eptdev_create(ctrldev->rpdev, &ctrldev->dev, chinfo, + ept_fd_info.flags, &ept_fd_info.fd); + if (ret) + break; + + if (copy_to_user(argp, &ept_fd_info, sizeof(ept_fd_info))) + ret = -EFAULT; + break; + default: ret = -EINVAL; } diff --git a/include/uapi/linux/rpmsg.h b/include/uapi/linux/rpmsg.h index f0c8da2b185b..02befb298f71 100644 --- a/include/uapi/linux/rpmsg.h +++ b/include/uapi/linux/rpmsg.h @@ -29,7 +29,8 @@ struct rpmsg_endpoint_info { #define RPMSG_CREATE_EPT_IOCTL _IOW(0xb5, 0x1, struct rpmsg_endpoint_info) /** - * Destroy a rpmsg char device endpoint created by the RPMSG_CREATE_EPT_IOCTL. + * Destroy a rpmsg char device endpoint created by the RPMSG_CREATE_EPT_IOCTL + * or RPMSG_CREATE_EPT_FD_IOCTL. */ #define RPMSG_DESTROY_EPT_IOCTL _IO(0xb5, 0x2) @@ -53,4 +54,28 @@ 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. + * @flags: file flags of endpoint device, valid flags: + * O_RDONLY/O_WRONLY/O_RDWR + * O_NONBLOCK + * O_CLOEXEC + * @fd: fd returned from driver + */ +struct rpmsg_endpoint_fd_info { + char name[32]; + __u32 src; + __u32 dst; + __u32 flags; + __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