From: Byungchul Park <byungchul.park@lge.com> To: torvalds@linux-foundation.org Cc: damien.lemoal@opensource.wdc.com, linux-ide@vger.kernel.org, adilger.kernel@dilger.ca, linux-ext4@vger.kernel.org, mingo@redhat.com, linux-kernel@vger.kernel.org, peterz@infradead.org, will@kernel.org, tglx@linutronix.de, rostedt@goodmis.org, joel@joelfernandes.org, sashal@kernel.org, daniel.vetter@ffwll.ch, chris@chris-wilson.co.uk, duyuyang@gmail.com, johannes.berg@intel.com, tj@kernel.org, tytso@mit.edu, willy@infradead.org, david@fromorbit.com, amir73il@gmail.com, bfields@fieldses.org, 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, paolo.valente@linaro.org, josef@toxicpanda.com, linux-fsdevel@vger.kernel.org, viro@zeniv.linux.org.uk, jack@suse.cz, jack@suse.com, jlayton@kernel.org, dan.j.williams@intel.com, hch@infradead.org, djwong@kernel.org, dri-devel@lists.freedesktop.org, airlied@linux.ie, rodrigosiqueiramelo@gmail.com, melissa.srw@gmail.com, hamohammed.sa@gmail.com Subject: [PATCH RFC v5 13/21] dept: Apply SDT to swait Date: Wed, 16 Mar 2022 11:26:25 +0900 [thread overview] Message-ID: <1647397593-16747-14-git-send-email-byungchul.park@lge.com> (raw) In-Reply-To: <1647397593-16747-1-git-send-email-byungchul.park@lge.com> Makes SDT able to track dependencies by swait. Signed-off-by: Byungchul Park <byungchul.park@lge.com> --- include/linux/swait.h | 4 ++++ kernel/sched/swait.c | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/include/linux/swait.h b/include/linux/swait.h index 6a8c22b..dbdf2ce 100644 --- a/include/linux/swait.h +++ b/include/linux/swait.h @@ -6,6 +6,7 @@ #include <linux/stddef.h> #include <linux/spinlock.h> #include <linux/wait.h> +#include <linux/dept_sdt.h> #include <asm/current.h> /* @@ -43,6 +44,7 @@ struct swait_queue_head { raw_spinlock_t lock; struct list_head task_list; + struct dept_map dmap; }; struct swait_queue { @@ -61,6 +63,7 @@ struct swait_queue { #define __SWAIT_QUEUE_HEAD_INITIALIZER(name) { \ .lock = __RAW_SPIN_LOCK_UNLOCKED(name.lock), \ .task_list = LIST_HEAD_INIT((name).task_list), \ + .dmap = DEPT_SDT_MAP_INIT(name), \ } #define DECLARE_SWAIT_QUEUE_HEAD(name) \ @@ -72,6 +75,7 @@ extern void __init_swait_queue_head(struct swait_queue_head *q, const char *name #define init_swait_queue_head(q) \ do { \ static struct lock_class_key __key; \ + sdt_map_init(&(q)->dmap); \ __init_swait_queue_head((q), #q, &__key); \ } while (0) diff --git a/kernel/sched/swait.c b/kernel/sched/swait.c index e1c655f..4ca7d6e 100644 --- a/kernel/sched/swait.c +++ b/kernel/sched/swait.c @@ -27,6 +27,7 @@ void swake_up_locked(struct swait_queue_head *q) return; curr = list_first_entry(&q->task_list, typeof(*curr), task_list); + sdt_event(&q->dmap); wake_up_process(curr->task); list_del_init(&curr->task_list); } @@ -69,6 +70,7 @@ void swake_up_all(struct swait_queue_head *q) while (!list_empty(&tmp)) { curr = list_first_entry(&tmp, typeof(*curr), task_list); + sdt_event(&q->dmap); wake_up_state(curr->task, TASK_NORMAL); list_del_init(&curr->task_list); @@ -97,6 +99,9 @@ void prepare_to_swait_exclusive(struct swait_queue_head *q, struct swait_queue * __prepare_to_swait(q, wait); set_current_state(state); raw_spin_unlock_irqrestore(&q->lock, flags); + + if (state & TASK_NORMAL) + sdt_wait_prepare(&q->dmap); } EXPORT_SYMBOL(prepare_to_swait_exclusive); @@ -119,12 +124,16 @@ long prepare_to_swait_event(struct swait_queue_head *q, struct swait_queue *wait } raw_spin_unlock_irqrestore(&q->lock, flags); + if (!ret && state & TASK_NORMAL) + sdt_wait_prepare(&q->dmap); + return ret; } EXPORT_SYMBOL(prepare_to_swait_event); void __finish_swait(struct swait_queue_head *q, struct swait_queue *wait) { + sdt_wait_finish(); __set_current_state(TASK_RUNNING); if (!list_empty(&wait->task_list)) list_del_init(&wait->task_list); @@ -134,6 +143,7 @@ void finish_swait(struct swait_queue_head *q, struct swait_queue *wait) { unsigned long flags; + sdt_wait_finish(); __set_current_state(TASK_RUNNING); if (!list_empty_careful(&wait->task_list)) { -- 1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: Byungchul Park <byungchul.park@lge.com> To: torvalds@linux-foundation.org Cc: hamohammed.sa@gmail.com, jack@suse.cz, peterz@infradead.org, daniel.vetter@ffwll.ch, amir73il@gmail.com, david@fromorbit.com, dri-devel@lists.freedesktop.org, chris@chris-wilson.co.uk, bfields@fieldses.org, linux-ide@vger.kernel.org, adilger.kernel@dilger.ca, joel@joelfernandes.org, cl@linux.com, will@kernel.org, duyuyang@gmail.com, sashal@kernel.org, paolo.valente@linaro.org, damien.lemoal@opensource.wdc.com, willy@infradead.org, hch@infradead.org, airlied@linux.ie, mingo@redhat.com, djwong@kernel.org, vdavydov.dev@gmail.com, rientjes@google.com, dennis@kernel.org, linux-ext4@vger.kernel.org, linux-mm@kvack.org, ngupta@vflare.org, johannes.berg@intel.com, jack@suse.com, dan.j.williams@intel.com, josef@toxicpanda.com, rostedt@goodmis.org, linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org, jglisse@redhat.com, viro@zeniv.linux.org.uk, tglx@linutronix.de, mhocko@kernel.org, vbabka@suse.cz, melissa.srw@gmail.com, sj@kernel.org, tytso@mit.edu, rodrigosiqueiramelo@gmail.com, kernel-team@lge.com, gregkh@linuxfoundation.org, jlayton@kernel.org, linux-kernel@vger.kernel.org, penberg@kernel.org, minchan@kernel.org, hannes@cmpxchg.org, tj@kernel.org, akpm@linux-foundation.org Subject: [PATCH RFC v5 13/21] dept: Apply SDT to swait Date: Wed, 16 Mar 2022 11:26:25 +0900 [thread overview] Message-ID: <1647397593-16747-14-git-send-email-byungchul.park@lge.com> (raw) In-Reply-To: <1647397593-16747-1-git-send-email-byungchul.park@lge.com> Makes SDT able to track dependencies by swait. Signed-off-by: Byungchul Park <byungchul.park@lge.com> --- include/linux/swait.h | 4 ++++ kernel/sched/swait.c | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/include/linux/swait.h b/include/linux/swait.h index 6a8c22b..dbdf2ce 100644 --- a/include/linux/swait.h +++ b/include/linux/swait.h @@ -6,6 +6,7 @@ #include <linux/stddef.h> #include <linux/spinlock.h> #include <linux/wait.h> +#include <linux/dept_sdt.h> #include <asm/current.h> /* @@ -43,6 +44,7 @@ struct swait_queue_head { raw_spinlock_t lock; struct list_head task_list; + struct dept_map dmap; }; struct swait_queue { @@ -61,6 +63,7 @@ struct swait_queue { #define __SWAIT_QUEUE_HEAD_INITIALIZER(name) { \ .lock = __RAW_SPIN_LOCK_UNLOCKED(name.lock), \ .task_list = LIST_HEAD_INIT((name).task_list), \ + .dmap = DEPT_SDT_MAP_INIT(name), \ } #define DECLARE_SWAIT_QUEUE_HEAD(name) \ @@ -72,6 +75,7 @@ extern void __init_swait_queue_head(struct swait_queue_head *q, const char *name #define init_swait_queue_head(q) \ do { \ static struct lock_class_key __key; \ + sdt_map_init(&(q)->dmap); \ __init_swait_queue_head((q), #q, &__key); \ } while (0) diff --git a/kernel/sched/swait.c b/kernel/sched/swait.c index e1c655f..4ca7d6e 100644 --- a/kernel/sched/swait.c +++ b/kernel/sched/swait.c @@ -27,6 +27,7 @@ void swake_up_locked(struct swait_queue_head *q) return; curr = list_first_entry(&q->task_list, typeof(*curr), task_list); + sdt_event(&q->dmap); wake_up_process(curr->task); list_del_init(&curr->task_list); } @@ -69,6 +70,7 @@ void swake_up_all(struct swait_queue_head *q) while (!list_empty(&tmp)) { curr = list_first_entry(&tmp, typeof(*curr), task_list); + sdt_event(&q->dmap); wake_up_state(curr->task, TASK_NORMAL); list_del_init(&curr->task_list); @@ -97,6 +99,9 @@ void prepare_to_swait_exclusive(struct swait_queue_head *q, struct swait_queue * __prepare_to_swait(q, wait); set_current_state(state); raw_spin_unlock_irqrestore(&q->lock, flags); + + if (state & TASK_NORMAL) + sdt_wait_prepare(&q->dmap); } EXPORT_SYMBOL(prepare_to_swait_exclusive); @@ -119,12 +124,16 @@ long prepare_to_swait_event(struct swait_queue_head *q, struct swait_queue *wait } raw_spin_unlock_irqrestore(&q->lock, flags); + if (!ret && state & TASK_NORMAL) + sdt_wait_prepare(&q->dmap); + return ret; } EXPORT_SYMBOL(prepare_to_swait_event); void __finish_swait(struct swait_queue_head *q, struct swait_queue *wait) { + sdt_wait_finish(); __set_current_state(TASK_RUNNING); if (!list_empty(&wait->task_list)) list_del_init(&wait->task_list); @@ -134,6 +143,7 @@ void finish_swait(struct swait_queue_head *q, struct swait_queue *wait) { unsigned long flags; + sdt_wait_finish(); __set_current_state(TASK_RUNNING); if (!list_empty_careful(&wait->task_list)) { -- 1.9.1
next prev parent reply other threads:[~2022-03-16 2:28 UTC|newest] Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-03-16 2:26 [PATCH RFC v5 00/21] DEPT(Dependency Tracker) Byungchul Park 2022-03-16 2:26 ` Byungchul Park 2022-03-16 2:26 ` [PATCH RFC v5 01/21] llist: Move llist_{head,node} definition to types.h Byungchul Park 2022-03-16 2:26 ` [PATCH RFC v5 01/21] llist: Move llist_{head, node} " Byungchul Park 2022-03-16 2:26 ` [PATCH RFC v5 02/21] dept: Implement Dept(Dependency Tracker) Byungchul Park 2022-03-16 2:26 ` Byungchul Park 2022-03-16 2:26 ` [PATCH RFC v5 03/21] dept: Embed Dept data in Lockdep Byungchul Park 2022-03-16 2:26 ` Byungchul Park 2022-03-16 2:26 ` [PATCH RFC v5 04/21] dept: Apply Dept to spinlock Byungchul Park 2022-03-16 2:26 ` Byungchul Park 2022-03-16 2:26 ` [PATCH RFC v5 05/21] dept: Apply Dept to mutex families Byungchul Park 2022-03-16 2:26 ` Byungchul Park 2022-03-16 2:26 ` [PATCH RFC v5 06/21] dept: Apply Dept to rwlock Byungchul Park 2022-03-16 2:26 ` Byungchul Park 2022-03-16 2:26 ` [PATCH RFC v5 07/21] dept: Apply Dept to wait_for_completion()/complete() Byungchul Park 2022-03-16 2:26 ` Byungchul Park 2022-03-16 2:26 ` [PATCH RFC v5 08/21] dept: Apply Dept to seqlock Byungchul Park 2022-03-16 2:26 ` Byungchul Park 2022-03-16 2:26 ` [PATCH RFC v5 09/21] dept: Apply Dept to rwsem Byungchul Park 2022-03-16 2:26 ` Byungchul Park 2022-03-16 2:26 ` [PATCH RFC v5 10/21] dept: Add proc knobs to show stats and dependency graph Byungchul Park 2022-03-16 2:26 ` Byungchul Park 2022-03-16 2:26 ` [PATCH RFC v5 11/21] dept: Introduce split map concept and new APIs for them Byungchul Park 2022-03-16 2:26 ` Byungchul Park 2022-03-16 2:26 ` [PATCH RFC v5 12/21] dept: Apply Dept to wait/event of PG_{locked,writeback} Byungchul Park 2022-03-16 2:26 ` [PATCH RFC v5 12/21] dept: Apply Dept to wait/event of PG_{locked, writeback} Byungchul Park 2022-03-16 2:26 ` Byungchul Park [this message] 2022-03-16 2:26 ` [PATCH RFC v5 13/21] dept: Apply SDT to swait Byungchul Park 2022-03-16 2:26 ` [PATCH RFC v5 14/21] dept: Apply SDT to wait(waitqueue) Byungchul Park 2022-03-16 2:26 ` Byungchul Park 2022-03-16 2:26 ` [PATCH RFC v5 15/21] locking/lockdep, cpu/hotplus: Use a weaker annotation in AP thread Byungchul Park 2022-03-16 2:26 ` Byungchul Park 2022-03-16 2:26 ` [PATCH RFC v5 16/21] dept: Distinguish each syscall context from another Byungchul Park 2022-03-16 2:26 ` Byungchul Park 2022-03-16 2:26 ` [PATCH RFC v5 17/21] dept: Distinguish each work " Byungchul Park 2022-03-16 2:26 ` Byungchul Park 2022-03-16 2:26 ` [PATCH RFC v5 18/21] dept: Disable Dept within the wait_bit layer by default Byungchul Park 2022-03-16 2:26 ` Byungchul Park 2022-03-16 2:26 ` [PATCH RFC v5 19/21] dept: Add nocheck version of init_completion() Byungchul Park 2022-03-16 2:26 ` Byungchul Park 2022-03-16 2:26 ` [PATCH RFC v5 20/21] dept: Disable Dept on struct crypto_larval's completion for now Byungchul Park 2022-03-16 2:26 ` Byungchul Park 2022-03-16 2:26 ` [PATCH RFC v5 21/21] dept: Don't create dependencies between different depths in any case Byungchul Park 2022-03-16 2:26 ` Byungchul Park 2022-03-17 3:39 ` [PATCH RFC v5 00/21] DEPT(Dependency Tracker) Theodore Ts'o 2022-03-17 3:39 ` Theodore Ts'o 2022-03-18 7:49 ` Byungchul Park 2022-03-18 7:49 ` Byungchul Park 2022-03-19 22:49 ` Theodore Ts'o 2022-03-19 22:49 ` Theodore Ts'o 2022-03-20 10:55 ` Byungchul Park 2022-03-20 10:55 ` Byungchul Park
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1647397593-16747-14-git-send-email-byungchul.park@lge.com \ --to=byungchul.park@lge.com \ --cc=adilger.kernel@dilger.ca \ --cc=airlied@linux.ie \ --cc=akpm@linux-foundation.org \ --cc=amir73il@gmail.com \ --cc=bfields@fieldses.org \ --cc=chris@chris-wilson.co.uk \ --cc=cl@linux.com \ --cc=damien.lemoal@opensource.wdc.com \ --cc=dan.j.williams@intel.com \ --cc=daniel.vetter@ffwll.ch \ --cc=david@fromorbit.com \ --cc=dennis@kernel.org \ --cc=djwong@kernel.org \ --cc=dri-devel@lists.freedesktop.org \ --cc=duyuyang@gmail.com \ --cc=gregkh@linuxfoundation.org \ --cc=hamohammed.sa@gmail.com \ --cc=hannes@cmpxchg.org \ --cc=hch@infradead.org \ --cc=jack@suse.com \ --cc=jack@suse.cz \ --cc=jglisse@redhat.com \ --cc=jlayton@kernel.org \ --cc=joel@joelfernandes.org \ --cc=johannes.berg@intel.com \ --cc=josef@toxicpanda.com \ --cc=kernel-team@lge.com \ --cc=linux-block@vger.kernel.org \ --cc=linux-ext4@vger.kernel.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-ide@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=melissa.srw@gmail.com \ --cc=mhocko@kernel.org \ --cc=minchan@kernel.org \ --cc=mingo@redhat.com \ --cc=ngupta@vflare.org \ --cc=paolo.valente@linaro.org \ --cc=penberg@kernel.org \ --cc=peterz@infradead.org \ --cc=rientjes@google.com \ --cc=rodrigosiqueiramelo@gmail.com \ --cc=rostedt@goodmis.org \ --cc=sashal@kernel.org \ --cc=sj@kernel.org \ --cc=tglx@linutronix.de \ --cc=tj@kernel.org \ --cc=torvalds@linux-foundation.org \ --cc=tytso@mit.edu \ --cc=vbabka@suse.cz \ --cc=vdavydov.dev@gmail.com \ --cc=viro@zeniv.linux.org.uk \ --cc=will@kernel.org \ --cc=willy@infradead.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.