tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: virt: gunyah: Move send_lock around req and reply

Browse Source 
Gunyah resource manager has limited internal buffering to send messages
to VMs and it is possible to fill the buffer and cause RM to drop
replies. Prevent the "drop" scenario by serializing the entire
send/receive RPC flow.

Bug: 330201551
Change-Id: I65f2f6daf495eb24e1bc120a6a4d0b84c966e3cc
Signed-off-by: Elliot Berman <quic_eberman@quicinc.com>
Signed-off-by: Elliot Berman <elliot.berman@oss.qualcomm.com>
This commit is contained in:
Elliot Berman
2024-03-11 16:42:31 -07:00
committed by Treehugger Robot
parent 9ba3fe5688
commit 992a1eeed6
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/virt/gunyah/rsc_mgr.c
+2 -5
View File
@@ -537,10 +537,6 @@ static int gunyah_rm_send_request(struct gunyah_rm *rm, u32 message_id,
hdr_template.seq = cpu_to_le16(message->reply.seq);
hdr_template.msg_id = cpu_to_le32(message_id);
ret = mutex_lock_interruptible(&rm->send_lock);
if (ret)
return ret;
do {
*hdr = hdr_template;
@@ -562,7 +558,6 @@ static int gunyah_rm_send_request(struct gunyah_rm *rm, u32 message_id,
FIELD_PREP(RM_RPC_FRAGMENTS_MASK, cont_fragments);
} while (buf_size_remaining);
mutex_unlock(&rm->send_lock);
return ret;
}
@@ -610,6 +605,7 @@ int gunyah_rm_call(struct gunyah_rm *rm, u32 message_id, const void *req_buf,
return ret;
message.reply.seq = lower_16_bits(seq_id);
mutex_lock(&rm->send_lock);
/* Send the request to the Resource Manager */
ret = gunyah_rm_send_request(rm, message_id, req_buf, req_buf_size,
&message);
@@ -653,6 +649,7 @@ int gunyah_rm_call(struct gunyah_rm *rm, u32 message_id, const void *req_buf,
}
out:
mutex_unlock(&rm->send_lock);
xa_erase(&rm->call_xarray, message.reply.seq);
return ret;
}