android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "drivers: rpmsg: Increase priority of glink worker thread"

Browse Source
This commit is contained in:
qctecmdr 2023-10-02 23:57:33 -07:00 committed by Gerrit - the friendly Code Review server
commit 566e9790d6
2 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/rpmsg/qcom_glink_native.c
View File

@ -1069,7 +1069,7 @@ static int qcom_glink_rx_defer(struct qcom_glink *glink, size_t extra)
list_add_tail(&dcmd->node, &glink->rx_queue);
spin_unlock(&glink->rx_lock);
schedule_work(&glink->rx_work);
queue_work(system_highpri_wq, &glink->rx_work);
qcom_glink_rx_advance(glink, sizeof(dcmd->msg) + extra);
return 0;

45
net/qrtr/af_qrtr.c
View File

@ -232,6 +232,7 @@ static int qrtr_bcast_enqueue(struct qrtr_node *node, struct sk_buff *skb,
struct sockaddr_qrtr *to, unsigned int flags);
static struct qrtr_sock *qrtr_port_lookup(int port);
static void qrtr_port_put(struct qrtr_sock *ipc);
static void qrtr_handle_del_proc(struct qrtr_node *node, struct sk_buff *skb);
static void qrtr_log_tx_msg(struct qrtr_node *node, struct qrtr_hdr_v1 *hdr,
struct sk_buff *skb)
@ -320,6 +321,10 @@ static void qrtr_log_rx_msg(struct qrtr_node *node, struct sk_buff *skb)
QRTR_INFO(node->ilc,
"RX CTRL: cmd:0x%x node[0x%x]\n",
cb->type, cb->src_node);
else if (cb->type == QRTR_TYPE_DEL_PROC)
QRTR_INFO(node->ilc,
"RX CTRL: cmd:0x%x node[0x%x]\n",
cb->type, le32_to_cpu(pkt.proc.node));
}
}
@ -1287,6 +1292,8 @@ static void qrtr_node_rx_work(struct kthread_work *work)
} else if (cb->dst_node != qrtr_local_nid &&
cb->type == QRTR_TYPE_DATA) {
qrtr_fwd_pkt(skb, cb);
} else if (cb->type == QRTR_TYPE_DEL_PROC) {
qrtr_handle_del_proc(node, skb);
} else {
ipc = qrtr_port_lookup(cb->dst_port);
if (!ipc) {
@ -1299,6 +1306,44 @@ static void qrtr_node_rx_work(struct kthread_work *work)
}
}
static void qrtr_handle_del_proc(struct qrtr_node *node, struct sk_buff *skb)
{
struct sockaddr_qrtr src = {AF_QIPCRTR, 0, QRTR_PORT_CTRL};
struct sockaddr_qrtr dst = {AF_QIPCRTR, qrtr_local_nid, QRTR_PORT_CTRL};
struct qrtr_ctrl_pkt pkt = {0,};
struct qrtr_tx_flow_waiter *waiter;
struct qrtr_tx_flow_waiter *temp;
struct radix_tree_iter iter;
struct qrtr_tx_flow *flow;
unsigned long node_id;
void __rcu **slot;
skb_copy_bits(skb, 0, &pkt, sizeof(pkt));
src.sq_node = le32_to_cpu(pkt.proc.node);
/* Free tx flow counters */
mutex_lock(&node->qrtr_tx_lock);
radix_tree_for_each_slot(slot, &node->qrtr_tx_flow, &iter, 0) {
flow = rcu_dereference(*slot);
/* extract node id from the index key */
node_id = (iter.index & 0xFFFFFFFF00000000) >> 32;
if (node_id != src.sq_node)
continue;
list_for_each_entry_safe(waiter, temp, &flow->waiters, node) {
list_del(&waiter->node);
sock_put(waiter->sk);
kfree(waiter);
}
kfree(flow);
radix_tree_delete(&node->qrtr_tx_flow, iter.index);
}
mutex_unlock(&node->qrtr_tx_lock);
memset(&pkt, 0, sizeof(pkt));
pkt.cmd = cpu_to_le32(QRTR_TYPE_BYE);
skb_store_bits(skb, 0, &pkt, sizeof(pkt));
qrtr_local_enqueue(NULL, skb, QRTR_TYPE_BYE, &src, &dst, 0);
}
static void qrtr_hello_work(struct kthread_work *work)
{
struct sockaddr_qrtr from = {AF_QIPCRTR, 0, QRTR_PORT_CTRL};