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 v4 05/24] dept: Apply Dept to spinlock Date: Fri, 4 Mar 2022 16:06:24 +0900 [thread overview] Message-ID: <1646377603-19730-6-git-send-email-byungchul.park@lge.com> (raw) In-Reply-To: <1646377603-19730-1-git-send-email-byungchul.park@lge.com> Makes Dept able to track dependencies by spinlock. Signed-off-by: Byungchul Park <byungchul.park@lge.com> --- include/linux/lockdep.h | 18 +++++++++++++++--- include/linux/spinlock.h | 26 ++++++++++++++++++++++++++ include/linux/spinlock_types_raw.h | 13 +++++++++++++ 3 files changed, 54 insertions(+), 3 deletions(-) diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h index c1a56fe..529ea18 100644 --- a/include/linux/lockdep.h +++ b/include/linux/lockdep.h @@ -584,9 +584,21 @@ static inline void print_irqtrace_events(struct task_struct *curr) #define lock_acquire_shared(l, s, t, n, i) lock_acquire(l, s, t, 1, 1, n, i) #define lock_acquire_shared_recursive(l, s, t, n, i) lock_acquire(l, s, t, 2, 1, n, i) -#define spin_acquire(l, s, t, i) lock_acquire_exclusive(l, s, t, NULL, i) -#define spin_acquire_nest(l, s, t, n, i) lock_acquire_exclusive(l, s, t, n, i) -#define spin_release(l, i) lock_release(l, i) +#define spin_acquire(l, s, t, i) \ +do { \ + lock_acquire_exclusive(l, s, t, NULL, i); \ + dept_spin_lock(&(l)->dmap, s, t, NULL, "spin_unlock", i); \ +} while (0) +#define spin_acquire_nest(l, s, t, n, i) \ +do { \ + lock_acquire_exclusive(l, s, t, n, i); \ + dept_spin_lock(&(l)->dmap, s, t, (n) ? &(n)->dmap : NULL, "spin_unlock", i); \ +} while (0) +#define spin_release(l, i) \ +do { \ + lock_release(l, i); \ + dept_spin_unlock(&(l)->dmap, i); \ +} while (0) #define rwlock_acquire(l, s, t, i) lock_acquire_exclusive(l, s, t, NULL, i) #define rwlock_acquire_read(l, s, t, i) \ diff --git a/include/linux/spinlock.h b/include/linux/spinlock.h index 5c0c517..6b5c3f4 100644 --- a/include/linux/spinlock.h +++ b/include/linux/spinlock.h @@ -95,6 +95,32 @@ # include <linux/spinlock_up.h> #endif +#ifdef CONFIG_DEPT +#define dept_spin_lock(m, ne, t, n, e_fn, ip) \ +do { \ + if (t) { \ + dept_ecxt_enter(m, 1UL, ip, __func__, e_fn, ne); \ + dept_ask_event(m); \ + } else if (n) { \ + dept_skip(m); \ + } else { \ + dept_wait(m, 1UL, ip, __func__, ne); \ + dept_ecxt_enter(m, 1UL, ip, __func__, e_fn, ne); \ + dept_ask_event(m); \ + } \ +} while (0) +#define dept_spin_unlock(m, ip) \ +do { \ + if (!dept_unskip_if_skipped(m)) { \ + dept_event(m, 1UL, ip, __func__); \ + dept_ecxt_exit(m, ip); \ + } \ +} while (0) +#else +#define dept_spin_lock(m, ne, t, n, e_fn, ip) do { } while (0) +#define dept_spin_unlock(m, ip) do { } while (0) +#endif + #ifdef CONFIG_DEBUG_SPINLOCK extern void __raw_spin_lock_init(raw_spinlock_t *lock, const char *name, struct lock_class_key *key, short inner); diff --git a/include/linux/spinlock_types_raw.h b/include/linux/spinlock_types_raw.h index 91cb36b..279e821 100644 --- a/include/linux/spinlock_types_raw.h +++ b/include/linux/spinlock_types_raw.h @@ -26,16 +26,28 @@ #define SPINLOCK_OWNER_INIT ((void *)-1L) +#ifdef CONFIG_DEPT +# define RAW_SPIN_DMAP_INIT(lockname) .dmap = { .name = #lockname, .skip_cnt = ATOMIC_INIT(0) }, +# define SPIN_DMAP_INIT(lockname) .dmap = { .name = #lockname, .skip_cnt = ATOMIC_INIT(0) }, +# define LOCAL_SPIN_DMAP_INIT(lockname) .dmap = { .name = #lockname, .skip_cnt = ATOMIC_INIT(0) }, +#else +# define RAW_SPIN_DMAP_INIT(lockname) +# define SPIN_DMAP_INIT(lockname) +# define LOCAL_SPIN_DMAP_INIT(lockname) +#endif + #ifdef CONFIG_DEBUG_LOCK_ALLOC # define RAW_SPIN_DEP_MAP_INIT(lockname) \ .dep_map = { \ .name = #lockname, \ .wait_type_inner = LD_WAIT_SPIN, \ + RAW_SPIN_DMAP_INIT(lockname) \ } # define SPIN_DEP_MAP_INIT(lockname) \ .dep_map = { \ .name = #lockname, \ .wait_type_inner = LD_WAIT_CONFIG, \ + SPIN_DMAP_INIT(lockname) \ } # define LOCAL_SPIN_DEP_MAP_INIT(lockname) \ @@ -43,6 +55,7 @@ .name = #lockname, \ .wait_type_inner = LD_WAIT_CONFIG, \ .lock_type = LD_LOCK_PERCPU, \ + LOCAL_SPIN_DMAP_INIT(lockname) \ } #else # define RAW_SPIN_DEP_MAP_INIT(lockname) -- 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 v4 05/24] dept: Apply Dept to spinlock Date: Fri, 4 Mar 2022 16:06:24 +0900 [thread overview] Message-ID: <1646377603-19730-6-git-send-email-byungchul.park@lge.com> (raw) In-Reply-To: <1646377603-19730-1-git-send-email-byungchul.park@lge.com> Makes Dept able to track dependencies by spinlock. Signed-off-by: Byungchul Park <byungchul.park@lge.com> --- include/linux/lockdep.h | 18 +++++++++++++++--- include/linux/spinlock.h | 26 ++++++++++++++++++++++++++ include/linux/spinlock_types_raw.h | 13 +++++++++++++ 3 files changed, 54 insertions(+), 3 deletions(-) diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h index c1a56fe..529ea18 100644 --- a/include/linux/lockdep.h +++ b/include/linux/lockdep.h @@ -584,9 +584,21 @@ static inline void print_irqtrace_events(struct task_struct *curr) #define lock_acquire_shared(l, s, t, n, i) lock_acquire(l, s, t, 1, 1, n, i) #define lock_acquire_shared_recursive(l, s, t, n, i) lock_acquire(l, s, t, 2, 1, n, i) -#define spin_acquire(l, s, t, i) lock_acquire_exclusive(l, s, t, NULL, i) -#define spin_acquire_nest(l, s, t, n, i) lock_acquire_exclusive(l, s, t, n, i) -#define spin_release(l, i) lock_release(l, i) +#define spin_acquire(l, s, t, i) \ +do { \ + lock_acquire_exclusive(l, s, t, NULL, i); \ + dept_spin_lock(&(l)->dmap, s, t, NULL, "spin_unlock", i); \ +} while (0) +#define spin_acquire_nest(l, s, t, n, i) \ +do { \ + lock_acquire_exclusive(l, s, t, n, i); \ + dept_spin_lock(&(l)->dmap, s, t, (n) ? &(n)->dmap : NULL, "spin_unlock", i); \ +} while (0) +#define spin_release(l, i) \ +do { \ + lock_release(l, i); \ + dept_spin_unlock(&(l)->dmap, i); \ +} while (0) #define rwlock_acquire(l, s, t, i) lock_acquire_exclusive(l, s, t, NULL, i) #define rwlock_acquire_read(l, s, t, i) \ diff --git a/include/linux/spinlock.h b/include/linux/spinlock.h index 5c0c517..6b5c3f4 100644 --- a/include/linux/spinlock.h +++ b/include/linux/spinlock.h @@ -95,6 +95,32 @@ # include <linux/spinlock_up.h> #endif +#ifdef CONFIG_DEPT +#define dept_spin_lock(m, ne, t, n, e_fn, ip) \ +do { \ + if (t) { \ + dept_ecxt_enter(m, 1UL, ip, __func__, e_fn, ne); \ + dept_ask_event(m); \ + } else if (n) { \ + dept_skip(m); \ + } else { \ + dept_wait(m, 1UL, ip, __func__, ne); \ + dept_ecxt_enter(m, 1UL, ip, __func__, e_fn, ne); \ + dept_ask_event(m); \ + } \ +} while (0) +#define dept_spin_unlock(m, ip) \ +do { \ + if (!dept_unskip_if_skipped(m)) { \ + dept_event(m, 1UL, ip, __func__); \ + dept_ecxt_exit(m, ip); \ + } \ +} while (0) +#else +#define dept_spin_lock(m, ne, t, n, e_fn, ip) do { } while (0) +#define dept_spin_unlock(m, ip) do { } while (0) +#endif + #ifdef CONFIG_DEBUG_SPINLOCK extern void __raw_spin_lock_init(raw_spinlock_t *lock, const char *name, struct lock_class_key *key, short inner); diff --git a/include/linux/spinlock_types_raw.h b/include/linux/spinlock_types_raw.h index 91cb36b..279e821 100644 --- a/include/linux/spinlock_types_raw.h +++ b/include/linux/spinlock_types_raw.h @@ -26,16 +26,28 @@ #define SPINLOCK_OWNER_INIT ((void *)-1L) +#ifdef CONFIG_DEPT +# define RAW_SPIN_DMAP_INIT(lockname) .dmap = { .name = #lockname, .skip_cnt = ATOMIC_INIT(0) }, +# define SPIN_DMAP_INIT(lockname) .dmap = { .name = #lockname, .skip_cnt = ATOMIC_INIT(0) }, +# define LOCAL_SPIN_DMAP_INIT(lockname) .dmap = { .name = #lockname, .skip_cnt = ATOMIC_INIT(0) }, +#else +# define RAW_SPIN_DMAP_INIT(lockname) +# define SPIN_DMAP_INIT(lockname) +# define LOCAL_SPIN_DMAP_INIT(lockname) +#endif + #ifdef CONFIG_DEBUG_LOCK_ALLOC # define RAW_SPIN_DEP_MAP_INIT(lockname) \ .dep_map = { \ .name = #lockname, \ .wait_type_inner = LD_WAIT_SPIN, \ + RAW_SPIN_DMAP_INIT(lockname) \ } # define SPIN_DEP_MAP_INIT(lockname) \ .dep_map = { \ .name = #lockname, \ .wait_type_inner = LD_WAIT_CONFIG, \ + SPIN_DMAP_INIT(lockname) \ } # define LOCAL_SPIN_DEP_MAP_INIT(lockname) \ @@ -43,6 +55,7 @@ .name = #lockname, \ .wait_type_inner = LD_WAIT_CONFIG, \ .lock_type = LD_LOCK_PERCPU, \ + LOCAL_SPIN_DMAP_INIT(lockname) \ } #else # define RAW_SPIN_DEP_MAP_INIT(lockname) -- 1.9.1
next prev parent reply other threads:[~2022-03-04 7:07 UTC|newest] Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-03-04 7:06 [PATCH v4 00/24] DEPT(Dependency Tracker) Byungchul Park 2022-03-04 7:06 ` Byungchul Park 2022-03-04 7:06 ` [PATCH v4 01/24] llist: Move llist_{head,node} definition to types.h Byungchul Park 2022-03-04 7:06 ` Byungchul Park 2022-03-04 7:06 ` [PATCH v4 02/24] dept: Implement Dept(Dependency Tracker) Byungchul Park 2022-03-04 7:06 ` Byungchul Park 2022-03-09 7:21 ` kernel test robot 2022-03-09 23:43 ` kernel test robot 2022-03-04 7:06 ` [PATCH v4 03/24] dept: Embed Dept data in Lockdep Byungchul Park 2022-03-04 7:06 ` Byungchul Park 2022-03-04 7:06 ` [PATCH v4 04/24] dept: Add a API for skipping dependency check temporarily Byungchul Park 2022-03-04 7:06 ` Byungchul Park 2022-03-04 7:06 ` Byungchul Park [this message] 2022-03-04 7:06 ` [PATCH v4 05/24] dept: Apply Dept to spinlock Byungchul Park 2022-03-04 7:06 ` [PATCH v4 06/24] dept: Apply Dept to mutex families Byungchul Park 2022-03-04 7:06 ` Byungchul Park 2022-03-04 7:06 ` [PATCH v4 07/24] dept: Apply Dept to rwlock Byungchul Park 2022-03-04 7:06 ` Byungchul Park 2022-03-04 7:06 ` [PATCH v4 08/24] dept: Apply Dept to wait_for_completion()/complete() Byungchul Park 2022-03-04 7:06 ` Byungchul Park 2022-03-04 7:06 ` [PATCH v4 09/24] dept: Apply Dept to seqlock Byungchul Park 2022-03-04 7:06 ` Byungchul Park 2022-03-04 7:06 ` [PATCH v4 10/24] dept: Apply Dept to rwsem Byungchul Park 2022-03-04 7:06 ` Byungchul Park 2022-03-04 7:06 ` [PATCH v4 11/24] dept: Add proc knobs to show stats and dependency graph Byungchul Park 2022-03-04 7:06 ` Byungchul Park 2022-03-10 7:43 ` kernel test robot 2022-03-04 7:06 ` [PATCH v4 12/24] dept: Introduce split map concept and new APIs for them Byungchul Park 2022-03-04 7:06 ` Byungchul Park 2022-03-04 7:06 ` [PATCH v4 13/24] dept: Apply Dept to wait/event of PG_{locked,writeback} Byungchul Park 2022-03-04 7:06 ` [PATCH v4 13/24] dept: Apply Dept to wait/event of PG_{locked, writeback} Byungchul Park 2022-03-04 7:06 ` [PATCH v4 14/24] dept: Apply SDT to swait Byungchul Park 2022-03-04 7:06 ` Byungchul Park 2022-03-09 9:14 ` kernel test robot 2022-03-04 7:06 ` [PATCH v4 15/24] dept: Apply SDT to wait(waitqueue) Byungchul Park 2022-03-04 7:06 ` Byungchul Park 2022-03-04 7:06 ` [PATCH v4 16/24] locking/lockdep, cpu/hotplus: Use a weaker annotation in AP thread Byungchul Park 2022-03-04 7:06 ` Byungchul Park 2022-03-04 19:28 ` Sergei Shtylyov 2022-03-04 19:28 ` Sergei Shtylyov 2022-03-04 23:36 ` Byungchul Park 2022-03-04 23:36 ` Byungchul Park 2022-03-04 7:06 ` [PATCH v4 17/24] dept: Distinguish each syscall context from another Byungchul Park 2022-03-04 7:06 ` Byungchul Park 2022-03-04 7:06 ` [PATCH v4 18/24] dept: Distinguish each work " Byungchul Park 2022-03-04 7:06 ` Byungchul Park 2022-03-04 7:06 ` [PATCH v4 19/24] dept: Disable Dept within the wait_bit layer by default Byungchul Park 2022-03-04 7:06 ` Byungchul Park 2022-03-04 7:06 ` [PATCH v4 20/24] dept: Add nocheck version of init_completion() Byungchul Park 2022-03-04 7:06 ` Byungchul Park 2022-03-04 7:06 ` [PATCH v4 21/24] dept: Disable Dept on struct crypto_larval's completion for now Byungchul Park 2022-03-04 7:06 ` Byungchul Park 2022-03-04 7:06 ` [PATCH v4 22/24] dept: Don't create dependencies between different depths in any case Byungchul Park 2022-03-04 7:06 ` Byungchul Park 2022-03-04 11:39 ` Hyeonggon Yoo 2022-03-04 11:39 ` Hyeonggon Yoo 2022-03-04 23:38 ` Byungchul Park 2022-03-04 23:38 ` Byungchul Park 2022-03-04 7:06 ` [PATCH v4 23/24] dept: Let it work with real sleeps in __schedule() Byungchul Park 2022-03-04 7:06 ` Byungchul Park 2022-03-04 7:06 ` [PATCH v4 24/24] dept: Disable Dept on that map once it's been handled until next turn Byungchul Park 2022-03-04 7:06 ` Byungchul Park 2022-03-12 1:53 ` [PATCH v4 00/24] DEPT(Dependency Tracker) Hyeonggon Yoo 2022-03-12 1:53 ` Hyeonggon Yoo 2022-03-14 6:59 ` Byungchul Park 2022-03-14 6:59 ` Byungchul Park 2022-03-15 12:04 ` Hyeonggon Yoo 2022-03-15 12:04 ` Hyeonggon Yoo 2022-03-16 4:32 ` Byungchul Park 2022-03-16 4:32 ` Byungchul Park 2022-03-16 9:30 ` Hyeonggon Yoo 2022-03-16 9:30 ` Hyeonggon Yoo 2022-03-18 7:51 ` Byungchul Park 2022-03-18 7:51 ` Byungchul Park 2022-03-20 10:57 ` Byungchul Park 2022-03-20 10:57 ` 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=1646377603-19730-6-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.