summaryrefslogtreecommitdiff
path: root/net/core/sock_map.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2023-06-07 13:28:09 +0100
committerMark Brown <broonie@kernel.org>2023-06-07 13:28:09 +0100
commit30e15cb0fbb51513586a49d299798245a1c4a207 (patch)
treeec7e8a201c33d1ea8d3374178cd35412095b1f23 /net/core/sock_map.c
parent3b88f5fba24485e6cfa2883e155d78d330e2eabc (diff)
parent3a76c7ca9e77269dd10cf21465a055274cfa40c6 (diff)
spi-geni-qcom: Add new interfaces and utilise them
Merge series from Vijaya Krishna Nivarthi <quic_vnivarth@quicinc.com>: A "known issue" during implementation of SE DMA for spi geni driver was that it does DMA map/unmap internally instead of in spi framework. Current patches remove this hiccup and also clean up code a bit. Testing revealed no regressions and results with 1000 iterations of reading from EC showed no loss of performance. Results ======= Before - Iteration 999, min=5.10, max=5.17, avg=5.14, ints=25129 After - Iteration 999, min=5.10, max=5.20, avg=5.15, ints=25153
Diffstat (limited to 'net/core/sock_map.c')
-rw-r--r--net/core/sock_map.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/core/sock_map.c b/net/core/sock_map.c
index 7c189c2e2fbf..00afb66cd095 100644
--- a/net/core/sock_map.c
+++ b/net/core/sock_map.c
@@ -1644,9 +1644,10 @@ void sock_map_close(struct sock *sk, long timeout)
rcu_read_unlock();
sk_psock_stop(psock);
release_sock(sk);
- cancel_work_sync(&psock->work);
+ cancel_delayed_work_sync(&psock->work);
sk_psock_put(sk, psock);
}
+
/* Make sure we do not recurse. This is a bug.
* Leak the socket instead of crashing on a stack overflow.
*/