Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4921fb20 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "net: ipc_router: Add support for blocking send"

parents d5716472 e6b4403d

include/linux/ipc_router.h

+1 −0
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ struct msm_ipc_port { 
	char rx_ws_name[MAX_WS_NAME_SZ];

	struct wakeup_source port_rx_ws;

	wait_queue_head_t port_rx_wait_q;

	wait_queue_head_t port_tx_wait_q;



	int restart_state;

	spinlock_t restart_lock;

net/ipc_router/ipc_router_core.c

+129 −35
Original line number Diff line number Diff line
@@ -146,6 +146,11 @@ struct ipc_router_conn_info { 
	uint32_t port_id;

};



enum {

	RESET = 0,

	VALID = 1,

};



#define RP_HASH_SIZE 32

struct msm_ipc_router_remote_port {

	struct list_head list;
@@ -153,6 +158,7 @@ struct msm_ipc_router_remote_port { 
	struct mutex rport_lock_lhb2;

	uint32_t node_id;

	uint32_t port_id;

	int status;

	uint32_t tx_quota_cnt;

	struct list_head resume_tx_port_list;

	struct list_head conn_info_list;
@@ -1061,6 +1067,7 @@ struct msm_ipc_port *msm_ipc_router_create_raw_port(void *endpoint, 
		 port_ptr->this_port.port_id,

		 current->comm);

	wakeup_source_init(&port_ptr->port_rx_ws, port_ptr->rx_ws_name);

	init_waitqueue_head(&port_ptr->port_tx_wait_q);

	kref_init(&port_ptr->ref);



	port_ptr->endpoint = endpoint;
@@ -1189,6 +1196,7 @@ static struct msm_ipc_router_remote_port *ipc_router_create_rport( 
	}

	rport_ptr->port_id = port_id;

	rport_ptr->node_id = node_id;

	rport_ptr->status = VALID;

	rport_ptr->sec_rule = NULL;

	rport_ptr->server = NULL;

	rport_ptr->tx_quota_cnt = 0;
@@ -1275,14 +1283,17 @@ static void post_resume_tx(struct msm_ipc_router_remote_port *rport_ptr, 
	list_for_each_entry_safe(rtx_port, tmp_rtx_port,

				&rport_ptr->resume_tx_port_list, list) {

		local_port = ipc_router_get_port_ref(rtx_port->port_id);

		if (local_port && local_port->notify)

		if (local_port && local_port->notify) {

			wake_up(&local_port->port_tx_wait_q);

			local_port->notify(IPC_ROUTER_CTRL_CMD_RESUME_TX, msg,

					   sizeof(*msg), local_port->priv);

		else if (local_port)

		} else if (local_port) {

			wake_up(&local_port->port_tx_wait_q);

			post_pkt_to_port(local_port, pkt, 1);

		else

		} else {

			IPC_RTR_ERR("%s: Local Port %d not Found",

				__func__, rtx_port->port_id);

		}

		if (local_port)

			kref_put(&local_port->ref, ipc_router_release_port);

		list_del(&rtx_port->list);
@@ -1290,6 +1301,33 @@ static void post_resume_tx(struct msm_ipc_router_remote_port *rport_ptr, 
	}

}



/**

 * signal_rport_exit() - Signal the local ports of remote port exit

 * @rport_ptr: Remote port that is exiting.

 *

 * This function is used to signal the local ports that are waiting

 * to resume transmission to a remote port that is exiting.

 */

static void signal_rport_exit(struct msm_ipc_router_remote_port *rport_ptr)

{

	struct msm_ipc_resume_tx_port *rtx_port, *tmp_rtx_port;

	struct msm_ipc_port *local_port;



	mutex_lock(&rport_ptr->rport_lock_lhb2);

	rport_ptr->status = RESET;

	list_for_each_entry_safe(rtx_port, tmp_rtx_port,

				 &rport_ptr->resume_tx_port_list, list) {

		local_port = ipc_router_get_port_ref(rtx_port->port_id);

		if (local_port) {

			wake_up(&local_port->port_tx_wait_q);

			kref_put(&local_port->ref, ipc_router_release_port);

		}

		list_del(&rtx_port->list);

		kfree(rtx_port);

	}

	mutex_unlock(&rport_ptr->rport_lock_lhb2);

}



/**

 * ipc_router_release_rport() - Cleanup and release the remote port

 * @ref: Reference to the remote port.
@@ -1329,6 +1367,7 @@ static void ipc_router_destroy_rport( 
	down_write(&rt_entry->lock_lha4);

	list_del(&rport_ptr->list);

	up_write(&rt_entry->lock_lha4);

	signal_rport_exit(rport_ptr);

	kref_put(&rport_ptr->ref, ipc_router_release_rport);

	kref_put(&rt_entry->ref, ipc_router_release_rtentry);

	return;
@@ -2591,39 +2630,33 @@ static int loopback_data(struct msm_ipc_port *src, 
	return pkt->hdr.size;

}



static int msm_ipc_router_write_pkt(struct msm_ipc_port *src,

static int ipc_router_tx_wait(struct msm_ipc_port *src,

			      struct msm_ipc_router_remote_port *rport_ptr,

				struct rr_packet *pkt)

			      uint32_t *set_confirm_rx,

			      long timeout)

{

	struct rr_header_v1 *hdr;

	struct msm_ipc_router_xprt_info *xprt_info;

	struct msm_ipc_routing_table_entry *rt_entry;

	struct msm_ipc_resume_tx_port *resume_tx_port;

	struct sk_buff *temp_skb;

	int xprt_option;

	int ret;

	int align_size;



	if (!rport_ptr || !src || !pkt)

	if (unlikely(!src || !rport_ptr))

		return -EINVAL;



	hdr = &(pkt->hdr);

	hdr->version = IPC_ROUTER_V1;

	hdr->type = IPC_ROUTER_CTRL_CMD_DATA;

	hdr->src_node_id = src->this_port.node_id;

	hdr->src_port_id = src->this_port.port_id;

	hdr->size = pkt->length;

	hdr->control_flag = 0;

	hdr->dst_node_id = rport_ptr->node_id;

	hdr->dst_port_id = rport_ptr->port_id;



	for (;;) {

		mutex_lock(&rport_ptr->rport_lock_lhb2);

	if (rport_ptr->tx_quota_cnt == IPC_ROUTER_DEFAULT_RX_QUOTA) {

		if (msm_ipc_router_lookup_resume_tx_port(

			rport_ptr, src->this_port.port_id)) {

		if (rport_ptr->status == RESET) {

			mutex_unlock(&rport_ptr->rport_lock_lhb2);

			return -EAGAIN;

			IPC_RTR_ERR("%s: RPort %08x:%08x is in reset state\n",

			    __func__, rport_ptr->node_id, rport_ptr->port_id);

			return -ENETRESET;

		}



		if (rport_ptr->tx_quota_cnt < IPC_ROUTER_DEFAULT_RX_QUOTA)

			break;



		if (msm_ipc_router_lookup_resume_tx_port(

			rport_ptr, src->this_port.port_id))

			goto check_timeo;



		resume_tx_port =

			kzalloc(sizeof(struct msm_ipc_resume_tx_port),

				GFP_KERNEL);
@@ -2638,13 +2671,73 @@ static int msm_ipc_router_write_pkt(struct msm_ipc_port *src, 
		resume_tx_port->node_id = src->this_port.node_id;

		list_add_tail(&resume_tx_port->list,

			      &rport_ptr->resume_tx_port_list);

check_timeo:

		mutex_unlock(&rport_ptr->rport_lock_lhb2);

		if (!timeout) {

			return -EAGAIN;

		} else if (timeout < 0) {

			ret = wait_event_interruptible(src->port_tx_wait_q,

					(rport_ptr->tx_quota_cnt !=

					 IPC_ROUTER_DEFAULT_RX_QUOTA ||

					 rport_ptr->status == RESET));

			if (ret)

				return ret;

		} else {

			ret = wait_event_interruptible_timeout(

					src->port_tx_wait_q,

					(rport_ptr->tx_quota_cnt !=

					 IPC_ROUTER_DEFAULT_RX_QUOTA ||

					 rport_ptr->status == RESET),

					msecs_to_jiffies(timeout));

			if (ret < 0) {

				return ret;

			} else if (ret == 0) {

				IPC_RTR_ERR("%s: Resume_tx Timeout %08x:%08x\n",

					__func__, rport_ptr->node_id,

					rport_ptr->port_id);

				return -ETIMEDOUT;

			}

		}

	}

	rport_ptr->tx_quota_cnt++;

	if (rport_ptr->tx_quota_cnt == IPC_ROUTER_DEFAULT_RX_QUOTA)

		hdr->control_flag |= CONTROL_FLAG_CONFIRM_RX;

		*set_confirm_rx = 1;

	mutex_unlock(&rport_ptr->rport_lock_lhb2);

	return 0;

}



static int msm_ipc_router_write_pkt(struct msm_ipc_port *src,

				struct msm_ipc_router_remote_port *rport_ptr,

				struct rr_packet *pkt,

				long timeout)

{

	struct rr_header_v1 *hdr;

	struct msm_ipc_router_xprt_info *xprt_info;

	struct msm_ipc_routing_table_entry *rt_entry;

	struct sk_buff *temp_skb;

	int xprt_option;

	int ret;

	int align_size;

	uint32_t set_confirm_rx = 0;



	if (!rport_ptr || !src || !pkt)

		return -EINVAL;



	hdr = &(pkt->hdr);

	hdr->version = IPC_ROUTER_V1;

	hdr->type = IPC_ROUTER_CTRL_CMD_DATA;

	hdr->src_node_id = src->this_port.node_id;

	hdr->src_port_id = src->this_port.port_id;

	hdr->size = pkt->length;

	hdr->control_flag = 0;

	hdr->dst_node_id = rport_ptr->node_id;

	hdr->dst_port_id = rport_ptr->port_id;



	ret = ipc_router_tx_wait(src, rport_ptr, &set_confirm_rx, timeout);

	if (ret < 0)

		return ret;

	if (set_confirm_rx)

		hdr->control_flag |= CONTROL_FLAG_CONFIRM_RX;



	if (hdr->dst_node_id == IPC_ROUTER_NID_LOCAL) {

		ret = loopback_data(src, hdr->dst_port_id, pkt);
@@ -2712,7 +2805,8 @@ out_write_pkt: 


int msm_ipc_router_send_to(struct msm_ipc_port *src,

			   struct sk_buff_head *data,

			   struct msm_ipc_addr *dest)

			   struct msm_ipc_addr *dest,

			   long timeout)

{

	uint32_t dst_node_id = 0, dst_port_id = 0;

	struct msm_ipc_server *server;
@@ -2786,7 +2880,7 @@ int msm_ipc_router_send_to(struct msm_ipc_port *src, 
		return -ENOMEM;

	}



	ret = msm_ipc_router_write_pkt(src, rport_ptr, pkt);

	ret = msm_ipc_router_write_pkt(src, rport_ptr, pkt, timeout);

	kref_put(&rport_ptr->ref, ipc_router_release_rport);

	if (ret < 0)

		pkt->pkt_fragment_q = NULL;
@@ -2808,7 +2902,7 @@ int msm_ipc_router_send_msg(struct msm_ipc_port *src, 
		return -EFAULT;

	}



	ret = msm_ipc_router_send_to(src, out_skb_head, dest);

	ret = msm_ipc_router_send_to(src, out_skb_head, dest, 0);

	if (ret < 0) {

		if (ret != -EAGAIN)

			IPC_RTR_ERR(

net/ipc_router/ipc_router_private.h

+3 −1
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 


#define IPC_ROUTER_INFINITY -1

#define DEFAULT_RCV_TIMEO IPC_ROUTER_INFINITY

#define DEFAULT_SND_TIMEO IPC_ROUTER_INFINITY



#define ALIGN_SIZE(x) ((4 - ((x) & 3)) & 3)
@@ -97,7 +98,8 @@ struct msm_ipc_port *msm_ipc_router_create_raw_port(void *endpoint, 
	void *priv);

int msm_ipc_router_send_to(struct msm_ipc_port *src,

			   struct sk_buff_head *data,

			   struct msm_ipc_addr *dest);

			   struct msm_ipc_addr *dest,

			   long timeout);

int msm_ipc_router_read(struct msm_ipc_port *port_ptr,

			struct rr_packet **pkt,

			size_t buf_len);

net/ipc_router/ipc_router_socket.c

+4 −1
Original line number Diff line number Diff line
@@ -291,6 +291,7 @@ static int msm_ipc_router_create(struct net *net, 
	sock->ops = &msm_ipc_proto_ops;

	sock_init_data(sock, sk);

	sk->sk_rcvtimeo = DEFAULT_RCV_TIMEO;

	sk->sk_sndtimeo = DEFAULT_SND_TIMEO;



	msm_ipc_sk(sk)->port = port_ptr;

	msm_ipc_sk(sk)->default_node_vote_info = NULL;
@@ -391,6 +392,7 @@ static int msm_ipc_router_sendmsg(struct kiocb *iocb, struct socket *sock, 
	struct sk_buff *ipc_buf;

	int ret;

	struct msm_ipc_addr dest_addr = {0};

	long timeout;



	if (dest) {

		if (m->msg_namelen < sizeof(*dest) ||
@@ -413,6 +415,7 @@ static int msm_ipc_router_sendmsg(struct kiocb *iocb, struct socket *sock, 
		return -EINVAL;



	lock_sock(sk);

	timeout = sock_sndtimeo(sk, m->msg_flags & MSG_DONTWAIT);

	msg = msm_ipc_router_build_msg(m->msg_iovlen, m->msg_iov, total_len);

	if (!msg) {

		IPC_RTR_ERR("%s: Msg build failure\n", __func__);
@@ -426,7 +429,7 @@ static int msm_ipc_router_sendmsg(struct kiocb *iocb, struct socket *sock, 
	ipc_buf = skb_peek(msg);

	if (ipc_buf)

		msm_ipc_router_ipc_log(IPC_SEND, ipc_buf, port_ptr);

	ret = msm_ipc_router_send_to(port_ptr, msg, &dest_addr);

	ret = msm_ipc_router_send_to(port_ptr, msg, &dest_addr, timeout);

	if (ret != total_len) {

		if (ret < 0) {

			if (ret != -EAGAIN)