msm: ipc: Update the work item in the read path
IPC Message Router schedules a work item to read incoming messages
from the remote subsystems. Once a message is read, the work item
queues itself again in the workqueue. The queued work item performs
an uninterruptible wait for further messages. This causes the "loadavg"
to be consistently greater than 1. So refactor the read path such that
the read work item is queued only after the message has arrived.
CRs-Fixed: 383657
Change-Id: If532788de6377dd54574b57ec7a0779126d26e9b
Signed-off-by: Karthikeyan Ramasubramanian <kramasub@codeaurora.org>
diff --git a/arch/arm/mach-msm/ipc_router.c b/arch/arm/mach-msm/ipc_router.c
index c0bff63..7dc8d0f 100644
--- a/arch/arm/mach-msm/ipc_router.c
+++ b/arch/arm/mach-msm/ipc_router.c
@@ -130,7 +130,6 @@
uint32_t remote_node_id;
uint32_t initialized;
struct list_head pkt_list;
- wait_queue_head_t read_wait;
struct wake_lock wakelock;
struct mutex rx_lock;
struct mutex tx_lock;
@@ -262,16 +261,15 @@
return NULL;
mutex_lock(&xprt_info->rx_lock);
- while (!(xprt_info->abort_data_read) &&
- list_empty(&xprt_info->pkt_list)) {
- mutex_unlock(&xprt_info->rx_lock);
- wait_event(xprt_info->read_wait,
- ((xprt_info->abort_data_read) ||
- !list_empty(&xprt_info->pkt_list)));
- mutex_lock(&xprt_info->rx_lock);
- }
if (xprt_info->abort_data_read) {
mutex_unlock(&xprt_info->rx_lock);
+ pr_err("%s detected SSR & exiting now\n",
+ xprt_info->xprt->name);
+ return NULL;
+ }
+
+ if (list_empty(&xprt_info->pkt_list)) {
+ mutex_unlock(&xprt_info->rx_lock);
return NULL;
}
@@ -1364,144 +1362,135 @@
struct msm_ipc_router_xprt_info,
read_data);
- pkt = rr_read(xprt_info);
- if (!pkt) {
- pr_err("%s: rr_read failed\n", __func__);
- goto fail_io;
- }
+ while ((pkt = rr_read(xprt_info)) != NULL) {
+ if (pkt->length < IPC_ROUTER_HDR_SIZE ||
+ pkt->length > MAX_IPC_PKT_SIZE) {
+ pr_err("%s: Invalid pkt length %d\n",
+ __func__, pkt->length);
+ goto fail_data;
+ }
- if (pkt->length < IPC_ROUTER_HDR_SIZE ||
- pkt->length > MAX_IPC_PKT_SIZE) {
- pr_err("%s: Invalid pkt length %d\n", __func__, pkt->length);
- goto fail_data;
- }
+ head_skb = skb_peek(pkt->pkt_fragment_q);
+ if (!head_skb) {
+ pr_err("%s: head_skb is invalid\n", __func__);
+ goto fail_data;
+ }
- head_skb = skb_peek(pkt->pkt_fragment_q);
- if (!head_skb) {
- pr_err("%s: head_skb is invalid\n", __func__);
- goto fail_data;
- }
+ hdr = (struct rr_header *)(head_skb->data);
+ RR("- ver=%d type=%d src=%d:%08x crx=%d siz=%d dst=%d:%08x\n",
+ hdr->version, hdr->type, hdr->src_node_id, hdr->src_port_id,
+ hdr->confirm_rx, hdr->size, hdr->dst_node_id,
+ hdr->dst_port_id);
- hdr = (struct rr_header *)(head_skb->data);
- RR("- ver=%d type=%d src=%d:%08x crx=%d siz=%d dst=%d:%08x\n",
- hdr->version, hdr->type, hdr->src_node_id, hdr->src_port_id,
- hdr->confirm_rx, hdr->size, hdr->dst_node_id, hdr->dst_port_id);
- RAW_HDR("[r rr_h] "
- "ver=%i,type=%s,src_node_id=%08x,src_port_id=%08x,"
- "confirm_rx=%i,size=%3i,dst_node_id=%08x,dst_port_id=%08x\n",
- hdr->version, type_to_str(hdr->type), hdr->src_node_id,
- hdr->src_port_id, hdr->confirm_rx, hdr->size, hdr->dst_node_id,
- hdr->dst_port_id);
+ if (hdr->version != IPC_ROUTER_VERSION) {
+ pr_err("version %d != %d\n",
+ hdr->version, IPC_ROUTER_VERSION);
+ goto fail_data;
+ }
- if (hdr->version != IPC_ROUTER_VERSION) {
- pr_err("version %d != %d\n", hdr->version, IPC_ROUTER_VERSION);
- goto fail_data;
- }
+ if ((hdr->dst_node_id != IPC_ROUTER_NID_LOCAL) &&
+ ((hdr->type == IPC_ROUTER_CTRL_CMD_RESUME_TX) ||
+ (hdr->type == IPC_ROUTER_CTRL_CMD_DATA))) {
+ forward_msg(xprt_info, pkt);
+ release_pkt(pkt);
+ continue;
+ }
- if ((hdr->dst_node_id != IPC_ROUTER_NID_LOCAL) &&
- ((hdr->type == IPC_ROUTER_CTRL_CMD_RESUME_TX) ||
- (hdr->type == IPC_ROUTER_CTRL_CMD_DATA))) {
- forward_msg(xprt_info, pkt);
- release_pkt(pkt);
- goto done;
- }
-
- if ((hdr->dst_port_id == IPC_ROUTER_ADDRESS) ||
- (hdr->type == IPC_ROUTER_CTRL_CMD_HELLO)) {
- process_control_msg(xprt_info, pkt);
- release_pkt(pkt);
- goto done;
- }
+ if ((hdr->dst_port_id == IPC_ROUTER_ADDRESS) ||
+ (hdr->type == IPC_ROUTER_CTRL_CMD_HELLO)) {
+ process_control_msg(xprt_info, pkt);
+ release_pkt(pkt);
+ continue;
+ }
#if defined(CONFIG_MSM_SMD_LOGGING)
#if defined(DEBUG)
- if (msm_ipc_router_debug_mask & SMEM_LOG) {
- smem_log_event((SMEM_LOG_PROC_ID_APPS |
- SMEM_LOG_RPC_ROUTER_EVENT_BASE |
- IPC_ROUTER_LOG_EVENT_RX),
- (hdr->src_node_id << 24) |
- (hdr->src_port_id & 0xffffff),
- (hdr->dst_node_id << 24) |
- (hdr->dst_port_id & 0xffffff),
- (hdr->type << 24) | (hdr->confirm_rx << 16) |
- (hdr->size & 0xffff));
- }
+ if (msm_ipc_router_debug_mask & SMEM_LOG) {
+ smem_log_event((SMEM_LOG_PROC_ID_APPS |
+ SMEM_LOG_RPC_ROUTER_EVENT_BASE |
+ IPC_ROUTER_LOG_EVENT_RX),
+ (hdr->src_node_id << 24) |
+ (hdr->src_port_id & 0xffffff),
+ (hdr->dst_node_id << 24) |
+ (hdr->dst_port_id & 0xffffff),
+ (hdr->type << 24) | (hdr->confirm_rx << 16) |
+ (hdr->size & 0xffff));
+ }
#endif
#endif
- resume_tx = hdr->confirm_rx;
- resume_tx_node_id = hdr->dst_node_id;
- resume_tx_port_id = hdr->dst_port_id;
+ resume_tx = hdr->confirm_rx;
+ resume_tx_node_id = hdr->dst_node_id;
+ resume_tx_port_id = hdr->dst_port_id;
- rport_ptr = msm_ipc_router_lookup_remote_port(hdr->src_node_id,
+ rport_ptr = msm_ipc_router_lookup_remote_port(hdr->src_node_id,
hdr->src_port_id);
- mutex_lock(&local_ports_lock);
- port_ptr = msm_ipc_router_lookup_local_port(hdr->dst_port_id);
- if (!port_ptr) {
- pr_err("%s: No local port id %08x\n", __func__,
- hdr->dst_port_id);
- mutex_unlock(&local_ports_lock);
- release_pkt(pkt);
- goto process_done;
- }
-
- if (!rport_ptr) {
- rport_ptr = msm_ipc_router_create_remote_port(
- hdr->src_node_id,
- hdr->src_port_id);
- if (!rport_ptr) {
- pr_err("%s: Remote port %08x:%08x creation failed\n",
- __func__, hdr->src_node_id, hdr->src_port_id);
+ mutex_lock(&local_ports_lock);
+ port_ptr = msm_ipc_router_lookup_local_port(hdr->dst_port_id);
+ if (!port_ptr) {
+ pr_err("%s: No local port id %08x\n", __func__,
+ hdr->dst_port_id);
mutex_unlock(&local_ports_lock);
+ release_pkt(pkt);
goto process_done;
}
- }
- if (!port_ptr->notify) {
- mutex_lock(&port_ptr->port_rx_q_lock);
- wake_lock(&port_ptr->port_rx_wake_lock);
- list_add_tail(&pkt->list, &port_ptr->port_rx_q);
- wake_up(&port_ptr->port_rx_wait_q);
- mutex_unlock(&port_ptr->port_rx_q_lock);
- mutex_unlock(&local_ports_lock);
- } else {
- mutex_lock(&port_ptr->port_rx_q_lock);
- src_addr = kmalloc(sizeof(struct msm_ipc_port_addr),
- GFP_KERNEL);
- if (src_addr) {
- src_addr->node_id = hdr->src_node_id;
- src_addr->port_id = hdr->src_port_id;
+ if (!rport_ptr) {
+ rport_ptr = msm_ipc_router_create_remote_port(
+ hdr->src_node_id,
+ hdr->src_port_id);
+ if (!rport_ptr) {
+ pr_err("%s: Rmt Prt %08x:%08x create failed\n",
+ __func__, hdr->src_node_id,
+ hdr->src_port_id);
+ mutex_unlock(&local_ports_lock);
+ goto process_done;
+ }
}
- skb_pull(head_skb, IPC_ROUTER_HDR_SIZE);
- mutex_unlock(&local_ports_lock);
- port_ptr->notify(MSM_IPC_ROUTER_READ_CB, pkt->pkt_fragment_q,
- src_addr, port_ptr->priv);
- mutex_unlock(&port_ptr->port_rx_q_lock);
- pkt->pkt_fragment_q = NULL;
- src_addr = NULL;
- release_pkt(pkt);
- }
+
+ if (!port_ptr->notify) {
+ mutex_lock(&port_ptr->port_rx_q_lock);
+ wake_lock(&port_ptr->port_rx_wake_lock);
+ list_add_tail(&pkt->list, &port_ptr->port_rx_q);
+ wake_up(&port_ptr->port_rx_wait_q);
+ mutex_unlock(&port_ptr->port_rx_q_lock);
+ mutex_unlock(&local_ports_lock);
+ } else {
+ mutex_lock(&port_ptr->port_rx_q_lock);
+ src_addr = kmalloc(sizeof(struct msm_ipc_port_addr),
+ GFP_KERNEL);
+ if (src_addr) {
+ src_addr->node_id = hdr->src_node_id;
+ src_addr->port_id = hdr->src_port_id;
+ }
+ skb_pull(head_skb, IPC_ROUTER_HDR_SIZE);
+ mutex_unlock(&local_ports_lock);
+ port_ptr->notify(MSM_IPC_ROUTER_READ_CB,
+ pkt->pkt_fragment_q, src_addr, port_ptr->priv);
+ mutex_unlock(&port_ptr->port_rx_q_lock);
+ pkt->pkt_fragment_q = NULL;
+ src_addr = NULL;
+ release_pkt(pkt);
+ }
process_done:
- if (resume_tx) {
- union rr_control_msg msg;
+ if (resume_tx) {
+ union rr_control_msg msg;
- msg.cmd = IPC_ROUTER_CTRL_CMD_RESUME_TX;
- msg.cli.node_id = resume_tx_node_id;
- msg.cli.port_id = resume_tx_port_id;
+ msg.cmd = IPC_ROUTER_CTRL_CMD_RESUME_TX;
+ msg.cli.node_id = resume_tx_node_id;
+ msg.cli.port_id = resume_tx_port_id;
- RR("x RESUME_TX id=%d:%08x\n",
- msg.cli.node_id, msg.cli.port_id);
- msm_ipc_router_send_control_msg(xprt_info, &msg);
+ RR("x RESUME_TX id=%d:%08x\n",
+ msg.cli.node_id, msg.cli.port_id);
+ msm_ipc_router_send_control_msg(xprt_info, &msg);
+ }
+
}
-
-done:
- queue_work(xprt_info->workqueue, &xprt_info->read_data);
return;
fail_data:
release_pkt(pkt);
-fail_io:
pr_err("ipc_router has died\n");
}
@@ -2334,7 +2323,6 @@
xprt_info->initialized = 0;
xprt_info->remote_node_id = -1;
INIT_LIST_HEAD(&xprt_info->pkt_list);
- init_waitqueue_head(&xprt_info->read_wait);
mutex_init(&xprt_info->rx_lock);
mutex_init(&xprt_info->tx_lock);
wake_lock_init(&xprt_info->wakelock,
@@ -2368,8 +2356,6 @@
}
mutex_unlock(&routing_table_lock);
- queue_work(xprt_info->workqueue, &xprt_info->read_data);
-
xprt->priv = xprt_info;
return 0;
@@ -2382,8 +2368,9 @@
if (xprt && xprt->priv) {
xprt_info = xprt->priv;
+ mutex_lock(&xprt_info->rx_lock);
xprt_info->abort_data_read = 1;
- wake_up(&xprt_info->read_wait);
+ mutex_unlock(&xprt_info->rx_lock);
mutex_lock(&xprt_info_list_lock);
list_del(&xprt_info->list);
@@ -2481,8 +2468,8 @@
mutex_lock(&xprt_info->rx_lock);
list_add_tail(&pkt->list, &xprt_info->pkt_list);
wake_lock(&xprt_info->wakelock);
- wake_up(&xprt_info->read_wait);
mutex_unlock(&xprt_info->rx_lock);
+ queue_work(xprt_info->workqueue, &xprt_info->read_data);
}
static int modem_restart_notifier_cb(struct notifier_block *this,