sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

usersock: Add driver with type of rpmsg interface

Browse Source 
move usrsock rpmsg driver from userspace to kernel to reduce extra
context switch for usrsock operations

Signed-off-by: liangchaozhong <liangchaozhong@xiaomi.com>
This commit is contained in:
liangchaozhong 2022-09-16 13:37:13 +08:00 committed by Xiang Xiao
parent 09bb292fa2
commit f9a9a02e3e
6 changed files with 320 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
boards/sim/sim/sim/README.txt
View File

@ -1073,12 +1073,12 @@ rpserver
4.Rpmsg Net
Source:
$(CONFIG_APPS_DIR)/system/usrsock_rpmsg/usrsock_rpmsg.h
$(CONFIG_APPS_DIR)/system/usrsock_rpmsg/usrsock_rpmsg_server.c
$(CONFIG_APPS_DIR)/system/usrsock_rpmsg/usrsock_rpmsg_client.c
include/nuttx/net/rpmsg.h
include/nuttx/net/rpmsgdrv.h
drivers/net/rpmsgdrv.c
drivers/usrsock/usrsock_rpmsg.h
drivers/usrsock/usrsock_rpmsg.c
$(CONFIG_APPS_DIR)/system/usrsock_rpmsg/usrsock_rpmsg_server.c
Describe:
1)Rpmsg UsrSock client
2)Rpmsg UsrSock server
@ -1134,7 +1134,6 @@ rpserver
0 0 0 FIFO Kthread N-- Ready 00000000 000000 Idle Task
1 1 224 FIFO Kthread --- Waiting Signal 00000000 002032 hpwork
3 3 100 FIFO Task --- Running 00000000 004080 init
4 4 224 FIFO Kthread --- Waiting Signal 00000002 002000 rptun server 0x5671e900
3>RpmsgFS:
Mount the remote file system via RPMSGFS, cu to proxy first:
@ -1169,21 +1168,9 @@ rpserver
3 3 224 FIFO Kthread --- Waiting Signal 00000002 002000 rptun proxy 0x56634fa0
12 3 80 FIFO Task --- Waiting Semaphore 00000000 002032 usrsock
cu to proxy and start the rpmsg usrsock client:
server> cu
proxy> usrsock server &
usrsock [5:80]
proxy> ps
PID GROUP PRI POLICY TYPE NPX STATE EVENT SIGMASK STACK COMMAND
0 0 0 FIFO Kthread N-- Ready 00000000 000000 Idle Task
1 1 224 FIFO Kthread --- Waiting Signal 00000000 002032 hpwork
3 3 100 FIFO Task --- Running 00000000 004080 init
4 4 224 FIFO Kthread --- Waiting Signal 00000002 002000 rptun server 0x5671e900
5 4 80 FIFO Task --- Waiting Semaphore 00000000 002016 usrsock server
send ICMP ping to network server via rpmsg usrsock:
server> cu
proxy> ping 127.0.0.1
PING 127.0.0.1 56 bytes of data
56 bytes from 127.0.0.1: icmp_seq=0 time=20 ms

3
boards/sim/sim/sim/configs/rpproxy/defconfig
View File

@ -37,13 +37,14 @@ CONFIG_NETDB_DNSCLIENT=y
CONFIG_NETDB_DNSCLIENT_MAXRESPONSE=176
CONFIG_NETDB_DNSCLIENT_RECV_TIMEOUT=3
CONFIG_NETDB_DNSSERVER_IPv4ADDR=0x771d1d1d
CONFIG_NETUTILS_USRSOCK_RPMSG=y
CONFIG_NET_ICMP_NO_STACK=y
CONFIG_NET_RPMSG=y
CONFIG_NET_TCP_NO_STACK=y
CONFIG_NET_UDP_NO_STACK=y
CONFIG_NET_USRSOCK=y
CONFIG_NET_USRSOCK_OTHER=y
CONFIG_NET_USRSOCK_RPMSG=y
CONFIG_NET_USRSOCK_RPMSG_CPUNAME="server"
CONFIG_NET_USRSOCK_TCP=y
CONFIG_NET_USRSOCK_UDP=y
CONFIG_NSH_ARCHINIT=y

9
drivers/usrsock/Kconfig
View File

@ -16,6 +16,11 @@ config NET_USRSOCK_DEVICE
---help---
Will export /dev/usrsock device node for usrsock request/response operations
config NET_USRSOCK_RPMSG
bool "rpmsg transport"
---help---
Will send usrsock request or receive usrsock response via rpmsg channel directly
config NET_USRSOCK_CUSTOM
bool "Customerized interface"
---help---
@ -23,6 +28,10 @@ config NET_USRSOCK_CUSTOM
endchoice
config NET_USRSOCK_RPMSG_CPUNAME
string "The cpuname on which the rpmsg server runs"
depends on NET_USRSOCK_RPMSG
endmenu
endif # NET_USRSOCK

4
drivers/usrsock/Make.defs
View File

@ -26,6 +26,10 @@ ifeq ($(CONFIG_NET_USRSOCK_DEVICE),y)
CSRCS += usrsock_dev.c
endif
ifeq ($(CONFIG_NET_USRSOCK_RPMSG),y)
CSRCS += usrsock_rpmsg.c
endif
# Include User Socket Driver build support
DEPPATH += --dep-path usrsock

240
drivers/usrsock/usrsock_rpmsg.c Normal file
View File

@ -0,0 +1,240 @@
/****************************************************************************
* drivers/usrsock/usrsock_rpmsg.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership. The
* ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
*
****************************************************************************/
/****************************************************************************
* Included Files
****************************************************************************/
#include <nuttx/net/dns.h>
#include <nuttx/rptun/openamp.h>
#include <nuttx/semaphore.h>
#include "usrsock_rpmsg.h"
/****************************************************************************
* Private Types
****************************************************************************/
struct usrsock_rpmsg_s
{
sem_t wait;
struct rpmsg_endpoint ept;
};
/****************************************************************************
* Private Function Prototypes
****************************************************************************/
#ifdef CONFIG_NETDB_DNSCLIENT
static int usrsock_rpmsg_send_dns_request(FAR void *arg,
FAR struct sockaddr *addr,
socklen_t addrlen);
#endif
static void usrsock_rpmsg_ns_bound(FAR struct rpmsg_endpoint *ept);
static void usrsock_rpmsg_ns_unbind(FAR struct rpmsg_endpoint *ept);
static int usrsock_rpmsg_dns_handler(FAR struct rpmsg_endpoint *ept,
FAR struct usrsock_rpmsg_dns_event_s *dns);
static int usrsock_rpmsg_ept_cb(FAR struct rpmsg_endpoint *ept,
FAR void *data, size_t len,
uint32_t src, FAR void *priv);
static void usrsock_rpmsg_device_created(FAR struct rpmsg_device *rdev,
FAR void *priv_);
static void usrsock_rpmsg_device_destroy(FAR struct rpmsg_device *rdev,
FAR void *priv_);
/****************************************************************************
* Private Data
****************************************************************************/
static struct usrsock_rpmsg_s g_usrsock_rpmsg =
{
NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE)
};
/****************************************************************************
* Private Functions
****************************************************************************/
#ifdef CONFIG_NETDB_DNSCLIENT
static int usrsock_rpmsg_send_dns_request(FAR void *arg,
FAR struct sockaddr *addr,
socklen_t addrlen)
{
FAR struct usrsock_rpmsg_s *priv = arg;
FAR struct rpmsg_endpoint *ept = &priv->ept;
FAR struct usrsock_rpmsg_dns_request_s *dns;
uint32_t len;
dns = rpmsg_get_tx_payload_buffer(ept, &len, true);
if (dns == NULL)
{
return -ENOMEM;
}
dns->head.reqid = USRSOCK_RPMSG_DNS_REQUEST;
dns->head.xid = 0;
dns->head.reserved = 0;
dns->addrlen = addrlen;
memcpy(dns + 1, addr, addrlen);
return rpmsg_send_nocopy(ept, dns, sizeof(*dns) + addrlen);
}
#endif
static void usrsock_rpmsg_ns_bound(FAR struct rpmsg_endpoint *ept)
{
FAR struct usrsock_rpmsg_s *priv = ept->priv;
#ifdef CONFIG_NETDB_DNSCLIENT
dns_register_notify(usrsock_rpmsg_send_dns_request, priv);
#endif
nxsem_post(&priv->wait);
}
static void usrsock_rpmsg_ns_unbind(FAR struct rpmsg_endpoint *ept)
{
FAR struct usrsock_rpmsg_s *priv = ept->priv;
#ifdef CONFIG_NETDB_DNSCLIENT
dns_unregister_notify(usrsock_rpmsg_send_dns_request, priv);
#endif
nxsem_wait_uninterruptible(&priv->wait);
}
static int usrsock_rpmsg_dns_handler(FAR struct rpmsg_endpoint *ept,
FAR struct usrsock_rpmsg_dns_event_s *dns)
{
#ifdef CONFIG_NETDB_DNSCLIENT
dns_add_nameserver((FAR struct sockaddr *)(dns + 1), dns->addrlen);
#endif
return 0;
}
static int usrsock_rpmsg_ept_cb(FAR struct rpmsg_endpoint *ept,
FAR void *data, size_t len,
uint32_t src, FAR void *priv)
{
FAR struct usrsock_message_common_s *common = data;
if (common->msgid == USRSOCK_RPMSG_DNS_EVENT)
{
return usrsock_rpmsg_dns_handler(ept, data);
}
else
{
return usrsock_response(data, len, NULL);
}
}
static void usrsock_rpmsg_device_created(FAR struct rpmsg_device *rdev,
FAR void *priv_)
{
FAR struct usrsock_rpmsg_s *priv = priv_;
if (!strcmp(CONFIG_NET_USRSOCK_RPMSG_CPUNAME, rpmsg_get_cpuname(rdev)))
{
priv->ept.priv = priv;
priv->ept.ns_bound_cb = usrsock_rpmsg_ns_bound;
rpmsg_create_ept(&priv->ept, rdev, USRSOCK_RPMSG_EPT_NAME,
RPMSG_ADDR_ANY, RPMSG_ADDR_ANY,
usrsock_rpmsg_ept_cb, usrsock_rpmsg_ns_unbind);
}
}
static void usrsock_rpmsg_device_destroy(FAR struct rpmsg_device *rdev,
FAR void *priv_)
{
FAR struct usrsock_rpmsg_s *priv = priv_;
if (!strcmp(CONFIG_NET_USRSOCK_RPMSG_CPUNAME, rpmsg_get_cpuname(rdev)))
{
rpmsg_destroy_ept(&priv->ept);
}
}
/****************************************************************************
* Public Functions
****************************************************************************/
/****************************************************************************
* Name: usrsock_request
****************************************************************************/
int usrsock_request(FAR struct iovec *iov, unsigned int iovcnt)
{
FAR struct usrsock_rpmsg_s *priv = &g_usrsock_rpmsg;
size_t pos = 0;
int ret = 0;
nxsem_get_value(&priv->wait, &ret);
if (ret <= 0)
{
net_lockedwait_uninterruptible(&priv->wait);
nxsem_post(&priv->wait);
}
for (; ; )
{
FAR void *buf;
uint32_t len;
bool done;
buf = rpmsg_get_tx_payload_buffer(&priv->ept, &len, true);
if (buf == NULL)
{
ret = -ENOMEM;
break;
}
ret = usrsock_iovec_get(buf, len, iov, iovcnt, pos, &done);
if (ret < 0)
{
break;
}
pos += ret;
ret = rpmsg_send_nocopy(&priv->ept, buf, ret);
if (ret < 0)
{
break;
}
if (done)
{
break;
}
}
return ret;
}
void usrsock_register(void)
{
rpmsg_register_callback(&g_usrsock_rpmsg,
usrsock_rpmsg_device_created,
usrsock_rpmsg_device_destroy,
NULL,
NULL);
}

61
drivers/usrsock/usrsock_rpmsg.h Normal file
View File

@ -0,0 +1,61 @@
/****************************************************************************
* drivers/usrsock/usrsock_rpmsg.h
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership. The
* ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
*
****************************************************************************/
#ifndef __DRIVERS_USRSOCK_USRSOCK_RPMSG_H
#define __DRIVERS_USRSOCK_USRSOCK_RPMSG_H
/****************************************************************************
* Included Files
****************************************************************************/
#include <nuttx/net/usrsock.h>
/****************************************************************************
* Pre-processor definitions
****************************************************************************/
#define USRSOCK_RPMSG_EPT_NAME "rpmsg-usrsock"
#define USRSOCK_RPMSG_DNS_REQUEST USRSOCK_REQUEST__MAX
#define USRSOCK_RPMSG_DNS_EVENT 127
/****************************************************************************
* Public Types
****************************************************************************/
/* DNS request message */
begin_packed_struct struct usrsock_rpmsg_dns_request_s
{
struct usrsock_request_common_s head;
uint16_t addrlen;
} end_packed_struct;
/* DNS event message */
begin_packed_struct struct usrsock_rpmsg_dns_event_s
{
struct usrsock_message_common_s head;
uint16_t addrlen;
} end_packed_struct;
#endif /* __DRIVERS_USRSOCK_USRSOCK_RPMSG_H */