Btrfs needs a simple way to know if it needs to let go of it''s read lock on a rwsem. Introduce rwsem_is_contended to check to see if there are any waiters on this rwsem currently. This is just a hueristic, it is meant to be light and not 100% accurate and called by somebody already holding on to the rwsem in either read or write. Thanks, Signed-off-by: Josef Bacik <jbacik@fusionio.com> --- V1->V2: took everybodys suggestions and simplified it to just one function in rwsem.h so it works for both the spinlock case and non-spinlock case. include/linux/rwsem.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/linux/rwsem.h b/include/linux/rwsem.h index 0616ffe..c340493 100644 --- a/include/linux/rwsem.h +++ b/include/linux/rwsem.h @@ -75,6 +75,19 @@ do { \ } while (0) /* + * This is the same regardless of which rwsem implementation that is being used. + * It is just a heuristic meant to be called by somebody alreadying holding the + * rwsem to see if somebody from the opposite type is wanting access to the + * lock. + */ +static inline int rwsem_is_contended(struct rw_semaphore *sem) +{ + if (!list_empty(&sem->wait_list)) + return 1; + return 0; +} + +/* * lock for reading */ extern void down_read(struct rw_semaphore *sem); -- 1.8.3.1
Josef Bacik
2013-Sep-19 15:48 UTC
[PATCH 2/2] Btrfs: stop caching thread if extetn_commit_sem is contended
We can starve out the transaction commit with a bunch of caching threads all running at the same time. This is because we will only drop the extent_commit_sem if we need_resched(), which isn''t likely to happen since we will be reading a lot from the disk so have already schedule()''ed plenty. Alex observed that he could starve out a transaction commit for up to a minute with 32 caching threads all running at once. This will allow us to drop the extent_commit_sem to allow the transaction commit to swap the commit_root out and then all the cachers will start back up. Thanks, Signed-off-by: Josef Bacik <jbacik@fusionio.com> --- fs/btrfs/extent-tree.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index cfb3cf7..cc074c34 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -442,7 +442,8 @@ next: if (ret) break; - if (need_resched()) { + if (need_resched() || + rwsem_is_contended(&fs_info->extent_commit_sem)) { caching_ctl->progress = last; btrfs_release_path(path); up_read(&fs_info->extent_commit_sem); -- 1.8.3.1
On 09/19/2013 11:48 AM, Josef Bacik wrote:> Btrfs needs a simple way to know if it needs to let go of it''s read lock on a > rwsem. Introduce rwsem_is_contended to check to see if there are any waiters on > this rwsem currently. This is just a hueristic, it is meant to be light and not > 100% accurate and called by somebody already holding on to the rwsem in either > read or write. Thanks, > > Signed-off-by: Josef Bacik <jbacik@fusionio.com> > --- > V1->V2: took everybodys suggestions and simplified it to just one function in > rwsem.h so it works for both the spinlock case and non-spinlock case. > > include/linux/rwsem.h | 13 +++++++++++++ > 1 file changed, 13 insertions(+) > > diff --git a/include/linux/rwsem.h b/include/linux/rwsem.h > index 0616ffe..c340493 100644 > --- a/include/linux/rwsem.h > +++ b/include/linux/rwsem.h > @@ -75,6 +75,19 @@ do { \ > } while (0) > > /* > + * This is the same regardless of which rwsem implementation that is being used. > + * It is just a heuristic meant to be called by somebody alreadying holding the > + * rwsem to see if somebody from the opposite type is wanting access to the^^^^^^^^^^^^^ Readers can infer that at least one writer is waiting if the wait_list is !empty; however, writers cannot infer anything other than some other thread is waiting -- it could be a reader or a writer or multiples of either.> + * lock. > + */ > +static inline int rwsem_is_contended(struct rw_semaphore *sem) > +{ > + if (!list_empty(&sem->wait_list)) > + return 1; > + return 0;How about return !list_empty(&sem->wait_list); ?> +} > + > +/* > * lock for reading > */ > extern void down_read(struct rw_semaphore *sem); >
On Thu, Sep 19, 2013 at 06:57:27PM -0400, Peter Hurley wrote:> On 09/19/2013 11:48 AM, Josef Bacik wrote: > >Btrfs needs a simple way to know if it needs to let go of it''s read lock on a > >rwsem. Introduce rwsem_is_contended to check to see if there are any waiters on > >this rwsem currently. This is just a hueristic, it is meant to be light and not > >100% accurate and called by somebody already holding on to the rwsem in either > >read or write. Thanks, > > > >Signed-off-by: Josef Bacik <jbacik@fusionio.com> > >--- > >V1->V2: took everybodys suggestions and simplified it to just one function in > >rwsem.h so it works for both the spinlock case and non-spinlock case. > > > > include/linux/rwsem.h | 13 +++++++++++++ > > 1 file changed, 13 insertions(+) > > > >diff --git a/include/linux/rwsem.h b/include/linux/rwsem.h > >index 0616ffe..c340493 100644 > >--- a/include/linux/rwsem.h > >+++ b/include/linux/rwsem.h > >@@ -75,6 +75,19 @@ do { \ > > } while (0) > > > > /* > >+ * This is the same regardless of which rwsem implementation that is being used. > >+ * It is just a heuristic meant to be called by somebody alreadying holding the > >+ * rwsem to see if somebody from the opposite type is wanting access to the > ^^^^^^^^^^^^^ > > Readers can infer that at least one writer is waiting if the wait_list is > !empty; however, writers cannot infer anything other than some other > thread is waiting -- it could be a reader or a writer or multiples of either. >Right duh, I''ll fix that up.> > >+ * lock. > >+ */ > >+static inline int rwsem_is_contended(struct rw_semaphore *sem) > >+{ > >+ if (!list_empty(&sem->wait_list)) > >+ return 1; > >+ return 0; > > How about > > return !list_empty(&sem->wait_list); > > ? >Another duh, thanks I''ll wait for any other input and then fix this up and resend. Thanks, Josef
Ingo Molnar
2013-Sep-20 05:12 UTC
Re: [PATCH 2/2] Btrfs: stop caching thread if extetn_commit_sem is contended
* Josef Bacik <jbacik@fusionio.com> wrote:> We can starve out the transaction commit with a bunch of caching threads > all running at the same time. This is because we will only drop the > extent_commit_sem if we need_resched(), which isn''t likely to happen > since we will be reading a lot from the disk so have already > schedule()''ed plenty. Alex observed that he could starve out a > transaction commit for up to a minute with 32 caching threads all > running at once. This will allow us to drop the extent_commit_sem to > allow the transaction commit to swap the commit_root out and then all > the cachers will start back up. Thanks, > > Signed-off-by: Josef Bacik <jbacik@fusionio.com> > --- > fs/btrfs/extent-tree.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c > index cfb3cf7..cc074c34 100644 > --- a/fs/btrfs/extent-tree.c > +++ b/fs/btrfs/extent-tree.c > @@ -442,7 +442,8 @@ next: > if (ret) > break; > > - if (need_resched()) { > + if (need_resched() || > + rwsem_is_contended(&fs_info->extent_commit_sem)) { > caching_ctl->progress = last; > btrfs_release_path(path); > up_read(&fs_info->extent_commit_sem);So, just to fill in what happens in this loop: mutex_unlock(&caching_ctl->mutex); cond_resched(); goto again; where ''again:'' takes caching_ctl->mutex and fs_info->extent_commit_sem again: again: mutex_lock(&caching_ctl->mutex); /* need to make sure the commit_root doesn''t disappear */ down_read(&fs_info->extent_commit_sem); So, if I''m reading the code correct, there can be a fair amount of concurrency here: there may be multiple ''caching kthreads'' per filesystem active, while there''s one fs_info->extent_commit_sem per filesystem AFAICS. So, what happens if there are a lot of CPUs all busy holding the ->extent_commit_sem rwsem read-locked and a writer arrives? They''d all rush to try to release the fs_info->extent_commit_sem, and they''d block in the down_read() because there''s a writer waiting. So there''s a guarantee of forward progress. This should answer akpm''s concern I think. If this analysis is correct then: Acked-by: Ingo Molnar <mingo@kernel.org> Thanks, Ingo
Josef Bacik
2013-Sep-26 12:40 UTC
Re: [PATCH 2/2] Btrfs: stop caching thread if extetn_commit_sem is contended
On Fri, Sep 20, 2013 at 07:12:47AM +0200, Ingo Molnar wrote:> > * Josef Bacik <jbacik@fusionio.com> wrote: > > > We can starve out the transaction commit with a bunch of caching threads > > all running at the same time. This is because we will only drop the > > extent_commit_sem if we need_resched(), which isn''t likely to happen > > since we will be reading a lot from the disk so have already > > schedule()''ed plenty. Alex observed that he could starve out a > > transaction commit for up to a minute with 32 caching threads all > > running at once. This will allow us to drop the extent_commit_sem to > > allow the transaction commit to swap the commit_root out and then all > > the cachers will start back up. Thanks, > > > > Signed-off-by: Josef Bacik <jbacik@fusionio.com> > > --- > > fs/btrfs/extent-tree.c | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c > > index cfb3cf7..cc074c34 100644 > > --- a/fs/btrfs/extent-tree.c > > +++ b/fs/btrfs/extent-tree.c > > @@ -442,7 +442,8 @@ next: > > if (ret) > > break; > > > > - if (need_resched()) { > > + if (need_resched() || > > + rwsem_is_contended(&fs_info->extent_commit_sem)) { > > caching_ctl->progress = last; > > btrfs_release_path(path); > > up_read(&fs_info->extent_commit_sem); > > So, just to fill in what happens in this loop: > > mutex_unlock(&caching_ctl->mutex); > cond_resched(); > goto again; > > where ''again:'' takes caching_ctl->mutex and fs_info->extent_commit_sem > again: > > again: > mutex_lock(&caching_ctl->mutex); > /* need to make sure the commit_root doesn''t disappear */ > down_read(&fs_info->extent_commit_sem); > > So, if I''m reading the code correct, there can be a fair amount of > concurrency here: there may be multiple ''caching kthreads'' per filesystem > active, while there''s one fs_info->extent_commit_sem per filesystem > AFAICS. > > So, what happens if there are a lot of CPUs all busy holding the > ->extent_commit_sem rwsem read-locked and a writer arrives? They''d all > rush to try to release the fs_info->extent_commit_sem, and they''d block in > the down_read() because there''s a writer waiting. > > So there''s a guarantee of forward progress. This should answer akpm''s > concern I think. > > If this analysis is correct then: > > Acked-by: Ingo Molnar <mingo@kernel.org> >Yup this is correct, thank you, I''ll add your ack''ed by to the next iteration. Josef
Ingo Molnar
2013-Sep-26 12:43 UTC
Re: [PATCH 2/2] Btrfs: stop caching thread if extetn_commit_sem is contended
* Josef Bacik <jbacik@fusionio.com> wrote:> On Fri, Sep 20, 2013 at 07:12:47AM +0200, Ingo Molnar wrote: > > > > * Josef Bacik <jbacik@fusionio.com> wrote: > > > > > We can starve out the transaction commit with a bunch of caching threads > > > all running at the same time. This is because we will only drop the > > > extent_commit_sem if we need_resched(), which isn''t likely to happen > > > since we will be reading a lot from the disk so have already > > > schedule()''ed plenty. Alex observed that he could starve out a > > > transaction commit for up to a minute with 32 caching threads all > > > running at once. This will allow us to drop the extent_commit_sem to > > > allow the transaction commit to swap the commit_root out and then all > > > the cachers will start back up. Thanks, > > > > > > Signed-off-by: Josef Bacik <jbacik@fusionio.com> > > > --- > > > fs/btrfs/extent-tree.c | 3 ++- > > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > > > diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c > > > index cfb3cf7..cc074c34 100644 > > > --- a/fs/btrfs/extent-tree.c > > > +++ b/fs/btrfs/extent-tree.c > > > @@ -442,7 +442,8 @@ next: > > > if (ret) > > > break; > > > > > > - if (need_resched()) { > > > + if (need_resched() || > > > + rwsem_is_contended(&fs_info->extent_commit_sem)) { > > > caching_ctl->progress = last; > > > btrfs_release_path(path); > > > up_read(&fs_info->extent_commit_sem); > > > > So, just to fill in what happens in this loop: > > > > mutex_unlock(&caching_ctl->mutex); > > cond_resched(); > > goto again; > > > > where ''again:'' takes caching_ctl->mutex and fs_info->extent_commit_sem > > again: > > > > again: > > mutex_lock(&caching_ctl->mutex); > > /* need to make sure the commit_root doesn''t disappear */ > > down_read(&fs_info->extent_commit_sem); > > > > So, if I''m reading the code correct, there can be a fair amount of > > concurrency here: there may be multiple ''caching kthreads'' per filesystem > > active, while there''s one fs_info->extent_commit_sem per filesystem > > AFAICS. > > > > So, what happens if there are a lot of CPUs all busy holding the > > ->extent_commit_sem rwsem read-locked and a writer arrives? They''d all > > rush to try to release the fs_info->extent_commit_sem, and they''d block in > > the down_read() because there''s a writer waiting. > > > > So there''s a guarantee of forward progress. This should answer akpm''s > > concern I think. > > > > If this analysis is correct then: > > > > Acked-by: Ingo Molnar <mingo@kernel.org> > > > > Yup this is correct, thank you, I''ll add your ack''ed by to the next > iteration.You might also want to stick the explanation into the changelog - it wasn''t really obvious to someone not versed in btrfs internals. Thanks, Ingo