From: Olivier Langlois Date: Mon, 12 Aug 2024 00:34:46 +0000 (-0400) Subject: io_uring/napi: remove duplicate io_napi_entry timeout assignation X-Git-Tag: v6.11-rc4~18^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=48cc7ecd3a68e0fbfa281ef1ed6f6b6cb7638390;p=thirdparty%2Fkernel%2Flinux.git io_uring/napi: remove duplicate io_napi_entry timeout assignation io_napi_entry() has 2 calling sites. One of them is unlikely to find an entry and if it does, the timeout should arguable not be updated. The other io_napi_entry() calling site is overwriting the update made by io_napi_entry() so the io_napi_entry() timeout value update has no or little value and therefore is removed. Signed-off-by: Olivier Langlois Link: https://lore.kernel.org/r/145b54ff179f87609e20dffaf5563c07cdbcad1a.1723423275.git.olivier@trillion01.com Signed-off-by: Jens Axboe --- diff --git a/io_uring/napi.c b/io_uring/napi.c index 73c4159e8405b..1de1d4d629254 100644 --- a/io_uring/napi.c +++ b/io_uring/napi.c @@ -26,7 +26,6 @@ static struct io_napi_entry *io_napi_hash_find(struct hlist_head *hash_list, hlist_for_each_entry_rcu(e, hash_list, node) { if (e->napi_id != napi_id) continue; - e->timeout = jiffies + NAPI_TIMEOUT; return e; }