From nobody Fri Dec 19 17:19:37 2025 Received: from invmail4.hynix.com (exvmail4.skhynix.com [166.125.252.92]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B3DC5281524; Mon, 19 May 2025 09:19:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=166.125.252.92 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747646348; cv=none; b=jlJvgaOBrw/b1Y7WVgW83aDrhrBPvBsk1nUzJq0Z0Zm5qBXzqvjZhiNMenpFKCsyDVyoZbLF3UQHp0EBWPhRdWkfOd9b6/iij2A5xQb0qaZIBgRqiFkRcb7BLS8pYXr/zSKXUiw0ObwfsgJ8GiGTLxwLqsJvl6pWKN+nkizZhSs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747646348; c=relaxed/simple; bh=YrWBIIAMqnF09k3CiHle1jkWmEk31GBWH5LYnj+OH1k=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=CqA5D5BRLyBiafDWoFt3IKuE73yP36YigYhTZJFWA/FExFrh34yYv7R2ql5snnXUkoUoIw+Be/xSI8MGKNK9kt9NbcA0KFUpVBGaR3BOq/7gNFY1+CNVFyPwc9/x2X9nUbYrAwcJ9yVdBJr4CP5w9IN3LKr+oYqBt4HVRRjJjEQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sk.com; spf=pass smtp.mailfrom=sk.com; arc=none smtp.client-ip=166.125.252.92 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sk.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sk.com X-AuditID: a67dfc5b-669ff7000002311f-07-682af7708f43 From: Byungchul Park To: linux-kernel@vger.kernel.org Cc: kernel_team@skhynix.com, torvalds@linux-foundation.org, damien.lemoal@opensource.wdc.com, linux-ide@vger.kernel.org, adilger.kernel@dilger.ca, linux-ext4@vger.kernel.org, mingo@redhat.com, peterz@infradead.org, will@kernel.org, tglx@linutronix.de, rostedt@goodmis.org, joel@joelfernandes.org, sashal@kernel.org, daniel.vetter@ffwll.ch, duyuyang@gmail.com, johannes.berg@intel.com, tj@kernel.org, tytso@mit.edu, willy@infradead.org, david@fromorbit.com, amir73il@gmail.com, gregkh@linuxfoundation.org, kernel-team@lge.com, linux-mm@kvack.org, akpm@linux-foundation.org, mhocko@kernel.org, minchan@kernel.org, hannes@cmpxchg.org, vdavydov.dev@gmail.com, sj@kernel.org, jglisse@redhat.com, dennis@kernel.org, cl@linux.com, penberg@kernel.org, rientjes@google.com, vbabka@suse.cz, ngupta@vflare.org, linux-block@vger.kernel.org, josef@toxicpanda.com, linux-fsdevel@vger.kernel.org, jack@suse.cz, jlayton@kernel.org, dan.j.williams@intel.com, hch@infradead.org, djwong@kernel.org, dri-devel@lists.freedesktop.org, rodrigosiqueiramelo@gmail.com, melissa.srw@gmail.com, hamohammed.sa@gmail.com, harry.yoo@oracle.com, chris.p.wilson@intel.com, gwan-gyeong.mun@intel.com, max.byungchul.park@gmail.com, boqun.feng@gmail.com, longman@redhat.com, yskelg@gmail.com, yunseong.kim@ericsson.com, yeoreum.yun@arm.com, netdev@vger.kernel.org, matthew.brost@intel.com, her0gyugyu@gmail.com Subject: [PATCH v16 36/42] dept: assign unique dept_key to each distinct wait_for_completion() caller Date: Mon, 19 May 2025 18:18:20 +0900 Message-Id: <20250519091826.19752-37-byungchul@sk.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20250519091826.19752-1-byungchul@sk.com> References: <20250519091826.19752-1-byungchul@sk.com> X-Brightmail-Tracker: H4sIAAAAAAAAAzWSeUiTcRjH+723y9XLut4ySAZd2qVYPYFFRdQLEUX1R9gfNvKtLeeqaR5B oDnDNM0OtUxtWSyZU9fWYdbMtGxqh+XyXF5FZW1a2laaHZvRPw8fni/fz/PPw+ASKzmLUahi BLVKppRSIkLk9C1afPh7gHxZ/9hkcH1LJSC/3EBBU1kJAsPNJAz6H2+CVrcDwc9nL3DIzW5C cKX3DQ4367oQWIqPU9D8bhLYXIMU1GenU5B8tZyCl5/HMLDnnMWgxLQFunXvCWjMKsIgt5+C S7nJmGd8xGBEp6dBlzgX+orzaBjrDYL6rhYSLB2BcLHQTsF9Sz0BdRV9GDRX5lPQZfhDQmOd lQB3ph80nckgoXSgiILPbh0OOtcgDa+qtRjUaaeDUeMRnhj+TcKTjGoMTly7gYGt/R6CqtQe DEyGFgpqXQ4MzKZsHEavP0bQl+mkIeXUCA2XkjIRpKfkEKCxL4efPzyXC74FQdJlIwGlv1rQ 2tW8odCA+FrHIM5rzHH8qOs1xVvcWoJvKOL4u3lvaF5T1UHzWtMR3lwcwF+934/xV4ZcJG/S n6R409BZmk9z2jB+4PlzetvsMFFohKBUxArqpWv2iOTWznvYoSRVvCa5gUhEp8PSkA/DsSHc 2/JK+j/fdn+lvEyx87m2thHcy1NZf86c8Z5MQyIGZ1smcq0F7cgbTGEF7o7lOOllgp3LtVpr x1nMruCGG3vxf9I5XImxepx9PPuO9NrxroRdztlKCgmvlGMv+3AFuizyX2Em97C4jchCYi2a oEcShSo2SqZQhiyRJ6gU8Uv2HowyIc9/6Y6N7a5AQ007ahDLIKmv2GhZKJeQstjohKgaxDG4 dKpYb14gl4gjZAlHBfXBcPURpRBdg/wYQjpDHOyOi5Cw+2UxQqQgHBLU/1OM8ZmViArnbfR3 99m+7EyFms3U4IcbMY/C1YntK19W9OCjvj3hvvS0u7ueZQY27FEccIZZI+vTzm91BJ97vbP5 ov7WtQNkT1lnSt4ZfH1kx4UNygvDnyqZCr+BzXHOp8eqAuO39uZdPxq6rjs0vrPNf2hfVP6i afYH59rtIfTaYOP2nFXdjv1SIlouCwrA1dGyvxQramJbAwAA X-Brightmail-Tracker: H4sIAAAAAAAAAzWSa0xTdxjG/f/PlbriSW30RJnOMrxgvJAM9yYzxOs8MZHwwWTGeKHRo22A QlphYGKkUlFArkklQ8FSTEdKHdgaxEuVUEVuIpfKpQIOtpg1oN2QVhG8FBa/PPnlefI+75eH JWRWahmr1pwStRplooKWkJLYn7I2pLyLVG0eMm8A/9RFEq7W2mjo+qMGge2WHoP38R7oD0wg mHn6jIBSYxeCytFhAm41jyBwVp+joffvUHD7fTS0GvNoyKqqpaF7fBbD0OUSDDX2ffDS8oqE 9iIzhlIvDVdKs3BQ/sEwbbEyYMmMgLHqMgZmR6OgdaSPAld5KwVOz3r4rWKIhvvOVhKaG8Yw 9N69SsOI7TMF7c0tJAQKlkNXcT4FN96YaRgPWAiw+H0M9DSaMDSblkCdIdia/fYTBU/yGzFk X7+JwT14D8GDi39isNv6aHD5JzA47EYCPvz+GMFYwWsGzl+aZuCKvgBB3vnLJBiGomHmffBz +VQU6K/VkXDjYx/aFiPYKmxIcE34CMHg+FX44H9OC86AiRTazLxwp2yYEQwPPIxgsqcKjupI oeq+FwuVk35KsFtzaME+WcIIua/dWHjT2cnEfXtQsvW4mKhOE7WbYuIlqpYX93CKXpNuyGoj M1HhwVwUwvLcD3x94D96jmluDT8wME3MsZz7jnfkv6JykYQluL6FfH/5IJoLFnMif9t5jppj kovg+1tc8yzltvBv20eJ/0tX8jV1jfMcEvQ9ea75WxkXzbtrKsgiJDGhBVYkV2vSkpTqxOiN ugRVhkadvvFYcpIdBRdkOTNb3ICmevc0IY5Fim+kdc51KhmlTNNlJDUhniUUcqnVsVYlkx5X ZpwWtclHtamJoq4JLWdJxVLp3l/EeBl3UnlKTBDFFFH7NcVsyLJMlPwxyhedXXzpR7Mjb8df Ky80DK6I8/68PfRTnLuTrH+4dhdbktTzYtW49d+pnX6vQa+L3f/kzGR4TH/YAc+sM4c1qpQR 070dZ4/JT8QcdoStKuloTKj9/kjOAs2huwM7wxcdGA6rWF1Yv8gX3mTs8nS/kz8qyt5v2B0/ gwtDF54uoxSkTqWMiiS0OuUXaFdiZj0DAAA= X-CFilter-Loop: Reflected Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" wait_for_completion() can be used at various points in the code and it's very hard to distinguish wait_for_completion()s between different usages. Using a single dept_key for all the wait_for_completion()s could trigger false positive reports. Assign unique dept_key to each distinct wait_for_completion() caller to avoid false positive reports. Signed-off-by: Byungchul Park --- include/linux/completion.h | 100 +++++++++++++++++++++++++++++++------ kernel/sched/completion.c | 60 +++++++++++----------- 2 files changed, 115 insertions(+), 45 deletions(-) diff --git a/include/linux/completion.h b/include/linux/completion.h index 3200b741de28..4d8fb1d95c0a 100644 --- a/include/linux/completion.h +++ b/include/linux/completion.h @@ -27,12 +27,10 @@ struct completion { unsigned int done; struct swait_queue_head wait; - struct dept_map dmap; }; =20 #define init_completion(x) \ do { \ - sdt_map_init(&(x)->dmap); \ __init_completion(x); \ } while (0) =20 @@ -43,17 +41,14 @@ do { \ =20 static inline void complete_acquire(struct completion *x, long timeout) { - sdt_might_sleep_start_timeout(&x->dmap, timeout); } =20 static inline void complete_release(struct completion *x) { - sdt_might_sleep_end(); } =20 #define COMPLETION_INITIALIZER(work) \ - { 0, __SWAIT_QUEUE_HEAD_INITIALIZER((work).wait), \ - .dmap =3D DEPT_MAP_INITIALIZER(work, NULL), } + { 0, __SWAIT_QUEUE_HEAD_INITIALIZER((work).wait), } =20 #define COMPLETION_INITIALIZER_ONSTACK_MAP(work, map) \ (*({ init_completion_map(&(work), &(map)); &(work); })) @@ -119,18 +114,18 @@ static inline void reinit_completion(struct completio= n *x) x->done =3D 0; } =20 -extern void wait_for_completion(struct completion *); -extern void wait_for_completion_io(struct completion *); -extern int wait_for_completion_interruptible(struct completion *x); -extern int wait_for_completion_killable(struct completion *x); -extern int wait_for_completion_state(struct completion *x, unsigned int st= ate); -extern unsigned long wait_for_completion_timeout(struct completion *x, +extern void __wait_for_completion(struct completion *); +extern void __wait_for_completion_io(struct completion *); +extern int __wait_for_completion_interruptible(struct completion *x); +extern int __wait_for_completion_killable(struct completion *x); +extern int __wait_for_completion_state(struct completion *x, unsigned int = state); +extern unsigned long __wait_for_completion_timeout(struct completion *x, unsigned long timeout); -extern unsigned long wait_for_completion_io_timeout(struct completion *x, +extern unsigned long __wait_for_completion_io_timeout(struct completion *x, unsigned long timeout); -extern long wait_for_completion_interruptible_timeout( +extern long __wait_for_completion_interruptible_timeout( struct completion *x, unsigned long timeout); -extern long wait_for_completion_killable_timeout( +extern long __wait_for_completion_killable_timeout( struct completion *x, unsigned long timeout); extern bool try_wait_for_completion(struct completion *x); extern bool completion_done(struct completion *x); @@ -139,4 +134,79 @@ extern void complete(struct completion *); extern void complete_on_current_cpu(struct completion *x); extern void complete_all(struct completion *); =20 +#define wait_for_completion(x) \ +({ \ + sdt_might_sleep_start_timeout(NULL, -1L); \ + __wait_for_completion(x); \ + sdt_might_sleep_end(); \ +}) +#define wait_for_completion_io(x) \ +({ \ + sdt_might_sleep_start_timeout(NULL, -1L); \ + __wait_for_completion_io(x); \ + sdt_might_sleep_end(); \ +}) +#define wait_for_completion_interruptible(x) \ +({ \ + int __ret; \ + \ + sdt_might_sleep_start_timeout(NULL, -1L); \ + __ret =3D __wait_for_completion_interruptible(x); \ + sdt_might_sleep_end(); \ + __ret; \ +}) +#define wait_for_completion_killable(x) \ +({ \ + int __ret; \ + \ + sdt_might_sleep_start_timeout(NULL, -1L); \ + __ret =3D __wait_for_completion_killable(x); \ + sdt_might_sleep_end(); \ + __ret; \ +}) +#define wait_for_completion_state(x, s) \ +({ \ + int __ret; \ + \ + sdt_might_sleep_start_timeout(NULL, -1L); \ + __ret =3D __wait_for_completion_state(x, s); \ + sdt_might_sleep_end(); \ + __ret; \ +}) +#define wait_for_completion_timeout(x, t) \ +({ \ + unsigned long __ret; \ + \ + sdt_might_sleep_start_timeout(NULL, t); \ + __ret =3D __wait_for_completion_timeout(x, t); \ + sdt_might_sleep_end(); \ + __ret; \ +}) +#define wait_for_completion_io_timeout(x, t) \ +({ \ + unsigned long __ret; \ + \ + sdt_might_sleep_start_timeout(NULL, t); \ + __ret =3D __wait_for_completion_io_timeout(x, t); \ + sdt_might_sleep_end(); \ + __ret; \ +}) +#define wait_for_completion_interruptible_timeout(x, t) \ +({ \ + long __ret; \ + \ + sdt_might_sleep_start_timeout(NULL, t); \ + __ret =3D __wait_for_completion_interruptible_timeout(x, t); \ + sdt_might_sleep_end(); \ + __ret; \ +}) +#define wait_for_completion_killable_timeout(x, t) \ +({ \ + long __ret; \ + \ + sdt_might_sleep_start_timeout(NULL, t); \ + __ret =3D __wait_for_completion_killable_timeout(x, t); \ + sdt_might_sleep_end(); \ + __ret; \ +}) #endif diff --git a/kernel/sched/completion.c b/kernel/sched/completion.c index 499b1fee9dc1..247169b26d81 100644 --- a/kernel/sched/completion.c +++ b/kernel/sched/completion.c @@ -4,7 +4,7 @@ * Generic wait-for-completion handler; * * It differs from semaphores in that their default case is the opposite, - * wait_for_completion default blocks whereas semaphore default non-block.= The + * __wait_for_completion default blocks whereas semaphore default non-bloc= k. The * interface also makes it easy to 'complete' multiple waiting threads, * something which isn't entirely natural for semaphores. * @@ -37,7 +37,7 @@ void complete_on_current_cpu(struct completion *x) * This will wake up a single thread waiting on this completion. Threads w= ill be * awakened in the same order in which they were queued. * - * See also complete_all(), wait_for_completion() and related routines. + * See also complete_all(), __wait_for_completion() and related routines. * * If this function wakes up a task, it executes a full memory barrier bef= ore * accessing the task state. @@ -134,23 +134,23 @@ wait_for_common_io(struct completion *x, long timeout= , int state) } =20 /** - * wait_for_completion: - waits for completion of a task + * __wait_for_completion: - waits for completion of a task * @x: holds the state of this particular completion * * This waits to be signaled for completion of a specific task. It is NOT * interruptible and there is no timeout. * - * See also similar routines (i.e. wait_for_completion_timeout()) with tim= eout + * See also similar routines (i.e. __wait_for_completion_timeout()) with t= imeout * and interrupt capability. Also see complete(). */ -void __sched wait_for_completion(struct completion *x) +void __sched __wait_for_completion(struct completion *x) { wait_for_common(x, MAX_SCHEDULE_TIMEOUT, TASK_UNINTERRUPTIBLE); } -EXPORT_SYMBOL(wait_for_completion); +EXPORT_SYMBOL(__wait_for_completion); =20 /** - * wait_for_completion_timeout: - waits for completion of a task (w/timeou= t) + * __wait_for_completion_timeout: - waits for completion of a task (w/time= out) * @x: holds the state of this particular completion * @timeout: timeout value in jiffies * @@ -162,28 +162,28 @@ EXPORT_SYMBOL(wait_for_completion); * till timeout) if completed. */ unsigned long __sched -wait_for_completion_timeout(struct completion *x, unsigned long timeout) +__wait_for_completion_timeout(struct completion *x, unsigned long timeout) { return wait_for_common(x, timeout, TASK_UNINTERRUPTIBLE); } -EXPORT_SYMBOL(wait_for_completion_timeout); +EXPORT_SYMBOL(__wait_for_completion_timeout); =20 /** - * wait_for_completion_io: - waits for completion of a task + * __wait_for_completion_io: - waits for completion of a task * @x: holds the state of this particular completion * * This waits to be signaled for completion of a specific task. It is NOT * interruptible and there is no timeout. The caller is accounted as waiti= ng * for IO (which traditionally means blkio only). */ -void __sched wait_for_completion_io(struct completion *x) +void __sched __wait_for_completion_io(struct completion *x) { wait_for_common_io(x, MAX_SCHEDULE_TIMEOUT, TASK_UNINTERRUPTIBLE); } -EXPORT_SYMBOL(wait_for_completion_io); +EXPORT_SYMBOL(__wait_for_completion_io); =20 /** - * wait_for_completion_io_timeout: - waits for completion of a task (w/tim= eout) + * __wait_for_completion_io_timeout: - waits for completion of a task (w/t= imeout) * @x: holds the state of this particular completion * @timeout: timeout value in jiffies * @@ -196,14 +196,14 @@ EXPORT_SYMBOL(wait_for_completion_io); * till timeout) if completed. */ unsigned long __sched -wait_for_completion_io_timeout(struct completion *x, unsigned long timeout) +__wait_for_completion_io_timeout(struct completion *x, unsigned long timeo= ut) { return wait_for_common_io(x, timeout, TASK_UNINTERRUPTIBLE); } -EXPORT_SYMBOL(wait_for_completion_io_timeout); +EXPORT_SYMBOL(__wait_for_completion_io_timeout); =20 /** - * wait_for_completion_interruptible: - waits for completion of a task (w/= intr) + * __wait_for_completion_interruptible: - waits for completion of a task (= w/intr) * @x: holds the state of this particular completion * * This waits for completion of a specific task to be signaled. It is @@ -211,7 +211,7 @@ EXPORT_SYMBOL(wait_for_completion_io_timeout); * * Return: -ERESTARTSYS if interrupted, 0 if completed. */ -int __sched wait_for_completion_interruptible(struct completion *x) +int __sched __wait_for_completion_interruptible(struct completion *x) { long t =3D wait_for_common(x, MAX_SCHEDULE_TIMEOUT, TASK_INTERRUPTIBLE); =20 @@ -219,10 +219,10 @@ int __sched wait_for_completion_interruptible(struct = completion *x) return t; return 0; } -EXPORT_SYMBOL(wait_for_completion_interruptible); +EXPORT_SYMBOL(__wait_for_completion_interruptible); =20 /** - * wait_for_completion_interruptible_timeout: - waits for completion (w/(t= o,intr)) + * __wait_for_completion_interruptible_timeout: - waits for completion (w/= (to,intr)) * @x: holds the state of this particular completion * @timeout: timeout value in jiffies * @@ -233,15 +233,15 @@ EXPORT_SYMBOL(wait_for_completion_interruptible); * or number of jiffies left till timeout) if completed. */ long __sched -wait_for_completion_interruptible_timeout(struct completion *x, +__wait_for_completion_interruptible_timeout(struct completion *x, unsigned long timeout) { return wait_for_common(x, timeout, TASK_INTERRUPTIBLE); } -EXPORT_SYMBOL(wait_for_completion_interruptible_timeout); +EXPORT_SYMBOL(__wait_for_completion_interruptible_timeout); =20 /** - * wait_for_completion_killable: - waits for completion of a task (killabl= e) + * __wait_for_completion_killable: - waits for completion of a task (killa= ble) * @x: holds the state of this particular completion * * This waits to be signaled for completion of a specific task. It can be @@ -249,7 +249,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible_timeout= ); * * Return: -ERESTARTSYS if interrupted, 0 if completed. */ -int __sched wait_for_completion_killable(struct completion *x) +int __sched __wait_for_completion_killable(struct completion *x) { long t =3D wait_for_common(x, MAX_SCHEDULE_TIMEOUT, TASK_KILLABLE); =20 @@ -257,9 +257,9 @@ int __sched wait_for_completion_killable(struct complet= ion *x) return t; return 0; } -EXPORT_SYMBOL(wait_for_completion_killable); +EXPORT_SYMBOL(__wait_for_completion_killable); =20 -int __sched wait_for_completion_state(struct completion *x, unsigned int s= tate) +int __sched __wait_for_completion_state(struct completion *x, unsigned int= state) { long t =3D wait_for_common(x, MAX_SCHEDULE_TIMEOUT, state); =20 @@ -267,10 +267,10 @@ int __sched wait_for_completion_state(struct completi= on *x, unsigned int state) return t; return 0; } -EXPORT_SYMBOL(wait_for_completion_state); +EXPORT_SYMBOL(__wait_for_completion_state); =20 /** - * wait_for_completion_killable_timeout: - waits for completion of a task = (w/(to,killable)) + * __wait_for_completion_killable_timeout: - waits for completion of a tas= k (w/(to,killable)) * @x: holds the state of this particular completion * @timeout: timeout value in jiffies * @@ -282,12 +282,12 @@ EXPORT_SYMBOL(wait_for_completion_state); * or number of jiffies left till timeout) if completed. */ long __sched -wait_for_completion_killable_timeout(struct completion *x, +__wait_for_completion_killable_timeout(struct completion *x, unsigned long timeout) { return wait_for_common(x, timeout, TASK_KILLABLE); } -EXPORT_SYMBOL(wait_for_completion_killable_timeout); +EXPORT_SYMBOL(__wait_for_completion_killable_timeout); =20 /** * try_wait_for_completion - try to decrement a completion without blocking @@ -329,7 +329,7 @@ EXPORT_SYMBOL(try_wait_for_completion); * completion_done - Test to see if a completion has any waiters * @x: completion structure * - * Return: 0 if there are waiters (wait_for_completion() in progress) + * Return: 0 if there are waiters (__wait_for_completion() in progress) * 1 if there are no waiters. * * Note, this will always return true if complete_all() was called on @X. --=20 2.17.1