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

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

Merge "soc: qcom: ipc_router: Improve IPC attribution"

parents d81d1be0 3ad5fe3d

include/linux/ipc_router.h

+1 −0
Original line number Diff line number Diff line
@@ -144,6 +144,7 @@ struct msm_ipc_port { 
	uint32_t num_rx;

	unsigned long num_tx_bytes;

	unsigned long num_rx_bytes;

	uint32_t last_served_svc_id;

	void *priv;

};

net/ipc_router/ipc_router_core.c

+10 −4
Original line number Diff line number Diff line
@@ -363,6 +363,8 @@ static void ipc_router_log_msg(void *log_ctx, u32 xchng_type, 
			svc_id = rport_ptr->server->name.service;

			svc_ins = rport_ptr->server->name.instance;

			port_type = CLIENT_PORT;

			port_ptr->last_served_svc_id =

					rport_ptr->server->name.service;

		} else if (port_ptr && (port_ptr->type == SERVER_PORT)) {

			svc_id = port_ptr->port_name.service;

			svc_ins = port_ptr->port_name.instance;
@@ -1330,8 +1332,9 @@ msm_ipc_router_create_raw_port(void *endpoint, 
	mutex_init(&port_ptr->port_rx_q_lock_lhc3);

	init_waitqueue_head(&port_ptr->port_rx_wait_q);

	snprintf(port_ptr->rx_ws_name, MAX_WS_NAME_SZ,

		 "ipc%08x_%s",

		 "ipc%08x_%d_%s",

		 port_ptr->this_port.port_id,

		 task_pid_nr(current),

		 current->comm);

	port_ptr->port_rx_ws = wakeup_source_register(port_ptr->rx_ws_name);

	if (!port_ptr->port_rx_ws) {
@@ -3847,15 +3850,18 @@ static void dump_local_ports(struct seq_file *s) 
	int j;

	struct msm_ipc_port *port_ptr;



	seq_printf(s, "%-11s|%-11s|\n", "Node_id", "Port_id");

	seq_printf(s, "%-11s|%-11s|%-32s|%-11s|\n",

		   "Node_id", "Port_id", "Wakelock", "Last SVCID");

	seq_puts(s, "------------------------------------------------------------\n");

	down_read(&local_ports_lock_lhc2);

	for (j = 0; j < LP_HASH_SIZE; j++) {

		list_for_each_entry(port_ptr, &local_ports[j], list) {

			mutex_lock(&port_ptr->port_lock_lhc3);

			seq_printf(s, "0x%08x |0x%08x |\n",

			seq_printf(s, "0x%08x |0x%08x |%-32s|0x%08x |\n",

				   port_ptr->this_port.node_id,

				   port_ptr->this_port.port_id);

				   port_ptr->this_port.port_id,

				   port_ptr->rx_ws_name,

				   port_ptr->last_served_svc_id);

			mutex_unlock(&port_ptr->port_lock_lhc3);

		}

	}