| Message ID | 1370056054-25449-8-git-send-email-jlayton@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, May 31, 2013 at 11:07:30PM -0400, Jeff Layton wrote: > Currently, when there is a lot of lock contention the kernel spends an > inordinate amount of time taking blocked locks off of the global > blocked_list and then putting them right back on again. When all of this > code was protected by a single lock, then it didn't matter much, but now > it means a lot of file_lock_lock thrashing. > > Optimize this a bit by deferring the removal from the blocked_list until > we're either applying or cancelling the lock. By doing this, and using a > lockless list_empty check, we can avoid taking the file_lock_lock in > many cases. > > Because the fl_link check is lockless, we must ensure that only the task > that "owns" the request manipulates the fl_link. Also, with this change, > it's possible that we'll see an entry on the blocked_list that has a > NULL fl_next pointer. In that event, just ignore it and continue walking > the list. OK, that sounds safe as in it shouldn't crash, but does the deadlock detection still work, or can it miss loops? Those locks that are temporarily NULL would previously not have been on the list at all, OK, but... I'm having trouble reasoning about how this works now. Previously a single lock was held interrupted across posix_locks_deadlock and locks_insert_block() which guaranteed we shouldn't be adding a loop, is that still true? --b. > > Signed-off-by: Jeff Layton <jlayton@redhat.com> > --- > fs/locks.c | 29 +++++++++++++++++++++++------ > 1 files changed, 23 insertions(+), 6 deletions(-) > > diff --git a/fs/locks.c b/fs/locks.c > index 055c06c..fc35b9e 100644 > --- a/fs/locks.c > +++ b/fs/locks.c > @@ -520,7 +520,6 @@ locks_delete_global_locks(struct file_lock *waiter) > static void __locks_delete_block(struct file_lock *waiter) > { > list_del_init(&waiter->fl_block); > - locks_delete_global_blocked(waiter); > waiter->fl_next = NULL; > } > > @@ -704,13 +703,16 @@ EXPORT_SYMBOL(posix_test_lock); > /* Find a lock that the owner of the given block_fl is blocking on. */ > static struct file_lock *what_owner_is_waiting_for(struct file_lock *block_fl) > { > - struct file_lock *fl; > + struct file_lock *fl, *ret = NULL; > > list_for_each_entry(fl, &blocked_list, fl_link) { > - if (posix_same_owner(fl, block_fl)) > - return fl->fl_next; > + if (posix_same_owner(fl, block_fl)) { > + ret = fl->fl_next; > + if (likely(ret)) > + break; > + } > } > - return NULL; > + return ret; > } > > static int posix_locks_deadlock(struct file_lock *caller_fl, > @@ -865,7 +867,8 @@ static int __posix_lock_file(struct inode *inode, struct file_lock *request, str > goto out; > error = FILE_LOCK_DEFERRED; > locks_insert_block(fl, request); > - locks_insert_global_blocked(request); > + if (list_empty(&request->fl_link)) > + locks_insert_global_blocked(request); > goto out; > } > } > @@ -876,6 +879,16 @@ static int __posix_lock_file(struct inode *inode, struct file_lock *request, str > goto out; > > /* > + * Now that we know the request is no longer blocked, we can take it > + * off the global list. Some callers send down partially initialized > + * requests, so we only do this if FL_SLEEP is set. Also, avoid taking > + * the lock if the list is empty, as that indicates a request that > + * never blocked. > + */ > + if ((request->fl_flags & FL_SLEEP) && !list_empty(&request->fl_link)) > + locks_delete_global_blocked(request); > + > + /* > * Find the first old lock with the same owner as the new lock. > */ > > @@ -1069,6 +1082,7 @@ int posix_lock_file_wait(struct file *filp, struct file_lock *fl) > continue; > > locks_delete_block(fl); > + locks_delete_global_blocked(fl); > break; > } > return error; > @@ -1147,6 +1161,7 @@ int locks_mandatory_area(int read_write, struct inode *inode, > } > > locks_delete_block(&fl); > + locks_delete_global_blocked(&fl); > break; > } > > @@ -1859,6 +1874,7 @@ static int do_lock_file_wait(struct file *filp, unsigned int cmd, > continue; > > locks_delete_block(fl); > + locks_delete_global_blocked(fl); > break; > } > > @@ -2160,6 +2176,7 @@ posix_unblock_lock(struct file *filp, struct file_lock *waiter) > else > status = -ENOENT; > spin_unlock(&inode->i_lock); > + locks_delete_global_blocked(waiter); > return status; > } > > -- > 1.7.1 > -- To unsubscribe from this list: send the line "unsubscribe linux-cifs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, 4 Jun 2013 17:58:39 -0400 "J. Bruce Fields" <bfields@fieldses.org> wrote: > On Fri, May 31, 2013 at 11:07:30PM -0400, Jeff Layton wrote: > > Currently, when there is a lot of lock contention the kernel spends an > > inordinate amount of time taking blocked locks off of the global > > blocked_list and then putting them right back on again. When all of this > > code was protected by a single lock, then it didn't matter much, but now > > it means a lot of file_lock_lock thrashing. > > > > Optimize this a bit by deferring the removal from the blocked_list until > > we're either applying or cancelling the lock. By doing this, and using a > > lockless list_empty check, we can avoid taking the file_lock_lock in > > many cases. > > > > Because the fl_link check is lockless, we must ensure that only the task > > that "owns" the request manipulates the fl_link. Also, with this change, > > it's possible that we'll see an entry on the blocked_list that has a > > NULL fl_next pointer. In that event, just ignore it and continue walking > > the list. > > OK, that sounds safe as in it shouldn't crash, but does the deadlock > detection still work, or can it miss loops? > > Those locks that are temporarily NULL would previously not have been on > the list at all, OK, but... I'm having trouble reasoning about how this > works now. > > Previously a single lock was held interrupted across > posix_locks_deadlock and locks_insert_block() which guaranteed we > shouldn't be adding a loop, is that still true? > > --b. > I had thought it was when I originally looked at this, but now that I consider it again I think you may be correct and that there are possible races here. Since we might end up reblocking behind a different lock without taking the global spinlock we could flip to blocking behind a different lock such that a loop is created if you had a complex (>2) chain of locks. I think I'm going to have to drop this approach and instead make it so that the deadlock detection and insertion into the global blocker list/hash are atomic. Ditto for locks_wake_up_blocks on posix locks and taking the entries off the list/hash. Now that I look, I think that approach may actually improve performance too since we'll be taking the global spinlock less than we would have, but I'll need to test it out to know for sure. > > > > Signed-off-by: Jeff Layton <jlayton@redhat.com> > > --- > > fs/locks.c | 29 +++++++++++++++++++++++------ > > 1 files changed, 23 insertions(+), 6 deletions(-) > > > > diff --git a/fs/locks.c b/fs/locks.c > > index 055c06c..fc35b9e 100644 > > --- a/fs/locks.c > > +++ b/fs/locks.c > > @@ -520,7 +520,6 @@ locks_delete_global_locks(struct file_lock *waiter) > > static void __locks_delete_block(struct file_lock *waiter) > > { > > list_del_init(&waiter->fl_block); > > - locks_delete_global_blocked(waiter); > > waiter->fl_next = NULL; > > } > > > > @@ -704,13 +703,16 @@ EXPORT_SYMBOL(posix_test_lock); > > /* Find a lock that the owner of the given block_fl is blocking on. */ > > static struct file_lock *what_owner_is_waiting_for(struct file_lock *block_fl) > > { > > - struct file_lock *fl; > > + struct file_lock *fl, *ret = NULL; > > > > list_for_each_entry(fl, &blocked_list, fl_link) { > > - if (posix_same_owner(fl, block_fl)) > > - return fl->fl_next; > > + if (posix_same_owner(fl, block_fl)) { > > + ret = fl->fl_next; > > + if (likely(ret)) > > + break; > > + } > > } > > - return NULL; > > + return ret; > > } > > > > static int posix_locks_deadlock(struct file_lock *caller_fl, > > @@ -865,7 +867,8 @@ static int __posix_lock_file(struct inode *inode, struct file_lock *request, str > > goto out; > > error = FILE_LOCK_DEFERRED; > > locks_insert_block(fl, request); > > - locks_insert_global_blocked(request); > > + if (list_empty(&request->fl_link)) > > + locks_insert_global_blocked(request); > > goto out; > > } > > } > > @@ -876,6 +879,16 @@ static int __posix_lock_file(struct inode *inode, struct file_lock *request, str > > goto out; > > > > /* > > + * Now that we know the request is no longer blocked, we can take it > > + * off the global list. Some callers send down partially initialized > > + * requests, so we only do this if FL_SLEEP is set. Also, avoid taking > > + * the lock if the list is empty, as that indicates a request that > > + * never blocked. > > + */ > > + if ((request->fl_flags & FL_SLEEP) && !list_empty(&request->fl_link)) > > + locks_delete_global_blocked(request); > > + > > + /* > > * Find the first old lock with the same owner as the new lock. > > */ > > > > @@ -1069,6 +1082,7 @@ int posix_lock_file_wait(struct file *filp, struct file_lock *fl) > > continue; > > > > locks_delete_block(fl); > > + locks_delete_global_blocked(fl); > > break; > > } > > return error; > > @@ -1147,6 +1161,7 @@ int locks_mandatory_area(int read_write, struct inode *inode, > > } > > > > locks_delete_block(&fl); > > + locks_delete_global_blocked(&fl); > > break; > > } > > > > @@ -1859,6 +1874,7 @@ static int do_lock_file_wait(struct file *filp, unsigned int cmd, > > continue; > > > > locks_delete_block(fl); > > + locks_delete_global_blocked(fl); > > break; > > } > > > > @@ -2160,6 +2176,7 @@ posix_unblock_lock(struct file *filp, struct file_lock *waiter) > > else > > status = -ENOENT; > > spin_unlock(&inode->i_lock); > > + locks_delete_global_blocked(waiter); > > return status; > > } > > > > -- > > 1.7.1 > >
On Wed, Jun 05, 2013 at 07:38:22AM -0400, Jeff Layton wrote: > On Tue, 4 Jun 2013 17:58:39 -0400 > "J. Bruce Fields" <bfields@fieldses.org> wrote: > > > On Fri, May 31, 2013 at 11:07:30PM -0400, Jeff Layton wrote: > > > Currently, when there is a lot of lock contention the kernel spends an > > > inordinate amount of time taking blocked locks off of the global > > > blocked_list and then putting them right back on again. When all of this > > > code was protected by a single lock, then it didn't matter much, but now > > > it means a lot of file_lock_lock thrashing. > > > > > > Optimize this a bit by deferring the removal from the blocked_list until > > > we're either applying or cancelling the lock. By doing this, and using a > > > lockless list_empty check, we can avoid taking the file_lock_lock in > > > many cases. > > > > > > Because the fl_link check is lockless, we must ensure that only the task > > > that "owns" the request manipulates the fl_link. Also, with this change, > > > it's possible that we'll see an entry on the blocked_list that has a > > > NULL fl_next pointer. In that event, just ignore it and continue walking > > > the list. > > > > OK, that sounds safe as in it shouldn't crash, but does the deadlock > > detection still work, or can it miss loops? > > > > Those locks that are temporarily NULL would previously not have been on > > the list at all, OK, but... I'm having trouble reasoning about how this > > works now. > > > > Previously a single lock was held interrupted across > > posix_locks_deadlock and locks_insert_block() which guaranteed we > > shouldn't be adding a loop, is that still true? > > > > --b. > > > > I had thought it was when I originally looked at this, but now that I > consider it again I think you may be correct and that there are possible > races here. Since we might end up reblocking behind a different lock > without taking the global spinlock we could flip to blocking behind a > different lock such that a loop is created if you had a complex (>2) > chain of locks. > > I think I'm going to have to drop this approach and instead make it so > that the deadlock detection and insertion into the global blocker > list/hash are atomic. Right. Once you drop the lock you can no longer be sure that what you learned about the file-lock graph stays true. > Ditto for locks_wake_up_blocks on posix locks and > taking the entries off the list/hash. Here I'm not sure what you mean. --b. -- To unsubscribe from this list: send the line "unsubscribe linux-cifs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, 5 Jun 2013 08:24:32 -0400 "J. Bruce Fields" <bfields@fieldses.org> wrote: > On Wed, Jun 05, 2013 at 07:38:22AM -0400, Jeff Layton wrote: > > On Tue, 4 Jun 2013 17:58:39 -0400 > > "J. Bruce Fields" <bfields@fieldses.org> wrote: > > > > > On Fri, May 31, 2013 at 11:07:30PM -0400, Jeff Layton wrote: > > > > Currently, when there is a lot of lock contention the kernel spends an > > > > inordinate amount of time taking blocked locks off of the global > > > > blocked_list and then putting them right back on again. When all of this > > > > code was protected by a single lock, then it didn't matter much, but now > > > > it means a lot of file_lock_lock thrashing. > > > > > > > > Optimize this a bit by deferring the removal from the blocked_list until > > > > we're either applying or cancelling the lock. By doing this, and using a > > > > lockless list_empty check, we can avoid taking the file_lock_lock in > > > > many cases. > > > > > > > > Because the fl_link check is lockless, we must ensure that only the task > > > > that "owns" the request manipulates the fl_link. Also, with this change, > > > > it's possible that we'll see an entry on the blocked_list that has a > > > > NULL fl_next pointer. In that event, just ignore it and continue walking > > > > the list. > > > > > > OK, that sounds safe as in it shouldn't crash, but does the deadlock > > > detection still work, or can it miss loops? > > > > > > Those locks that are temporarily NULL would previously not have been on > > > the list at all, OK, but... I'm having trouble reasoning about how this > > > works now. > > > > > > Previously a single lock was held interrupted across > > > posix_locks_deadlock and locks_insert_block() which guaranteed we > > > shouldn't be adding a loop, is that still true? > > > > > > --b. > > > > > > > I had thought it was when I originally looked at this, but now that I > > consider it again I think you may be correct and that there are possible > > races here. Since we might end up reblocking behind a different lock > > without taking the global spinlock we could flip to blocking behind a > > different lock such that a loop is created if you had a complex (>2) > > chain of locks. > > > > I think I'm going to have to drop this approach and instead make it so > > that the deadlock detection and insertion into the global blocker > > list/hash are atomic. > > Right. Once you drop the lock you can no longer be sure that what you > learned about the file-lock graph stays true. > > > Ditto for locks_wake_up_blocks on posix locks and > > taking the entries off the list/hash. > > Here I'm not sure what you mean. > Basically, I mean that rather than setting the fl_next pointer to NULL while holding only the inode lock and then ignoring those locks in the deadlock detection code, we should additionally take the global lock in locks_wake_up_blocks too and take the blocked locks off the global list and the i_flock list at the same time. That actually might not be completely necessary, but it'll make the logic clearer and easier to understand and probably won't hurt performance too much. Again, I'll need to do some perf testing to be sure.
On Wed, Jun 05, 2013 at 08:38:59AM -0400, Jeff Layton wrote: > On Wed, 5 Jun 2013 08:24:32 -0400 > "J. Bruce Fields" <bfields@fieldses.org> wrote: > > > On Wed, Jun 05, 2013 at 07:38:22AM -0400, Jeff Layton wrote: > > > On Tue, 4 Jun 2013 17:58:39 -0400 > > > "J. Bruce Fields" <bfields@fieldses.org> wrote: > > > > > > > On Fri, May 31, 2013 at 11:07:30PM -0400, Jeff Layton wrote: > > > > > Currently, when there is a lot of lock contention the kernel spends an > > > > > inordinate amount of time taking blocked locks off of the global > > > > > blocked_list and then putting them right back on again. When all of this > > > > > code was protected by a single lock, then it didn't matter much, but now > > > > > it means a lot of file_lock_lock thrashing. > > > > > > > > > > Optimize this a bit by deferring the removal from the blocked_list until > > > > > we're either applying or cancelling the lock. By doing this, and using a > > > > > lockless list_empty check, we can avoid taking the file_lock_lock in > > > > > many cases. > > > > > > > > > > Because the fl_link check is lockless, we must ensure that only the task > > > > > that "owns" the request manipulates the fl_link. Also, with this change, > > > > > it's possible that we'll see an entry on the blocked_list that has a > > > > > NULL fl_next pointer. In that event, just ignore it and continue walking > > > > > the list. > > > > > > > > OK, that sounds safe as in it shouldn't crash, but does the deadlock > > > > detection still work, or can it miss loops? > > > > > > > > Those locks that are temporarily NULL would previously not have been on > > > > the list at all, OK, but... I'm having trouble reasoning about how this > > > > works now. > > > > > > > > Previously a single lock was held interrupted across > > > > posix_locks_deadlock and locks_insert_block() which guaranteed we > > > > shouldn't be adding a loop, is that still true? > > > > > > > > --b. > > > > > > > > > > I had thought it was when I originally looked at this, but now that I > > > consider it again I think you may be correct and that there are possible > > > races here. Since we might end up reblocking behind a different lock > > > without taking the global spinlock we could flip to blocking behind a > > > different lock such that a loop is created if you had a complex (>2) > > > chain of locks. > > > > > > I think I'm going to have to drop this approach and instead make it so > > > that the deadlock detection and insertion into the global blocker > > > list/hash are atomic. > > > > Right. Once you drop the lock you can no longer be sure that what you > > learned about the file-lock graph stays true. > > > > > Ditto for locks_wake_up_blocks on posix locks and > > > taking the entries off the list/hash. > > > > Here I'm not sure what you mean. > > > > Basically, I mean that rather than setting the fl_next pointer to NULL > while holding only the inode lock and then ignoring those locks in the > deadlock detection code, we should additionally take the global lock in > locks_wake_up_blocks too and take the blocked locks off the global list > and the i_flock list at the same time. OK, thanks, got it. I have a hard time thinking about that.... But yes it bothers me that the deadlock detection code could see an out-of-date value of fl_next, and I can't convince myself that this wouldn't result in false positives or false negatives. > That actually might not be completely necessary, but it'll make the > logic clearer and easier to understand and probably won't hurt > performance too much. Again, I'll need to do some perf testing to be > sure. OK! --b. -- To unsubscribe from this list: send the line "unsubscribe linux-cifs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/locks.c b/fs/locks.c index 055c06c..fc35b9e 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -520,7 +520,6 @@ locks_delete_global_locks(struct file_lock *waiter) static void __locks_delete_block(struct file_lock *waiter) { list_del_init(&waiter->fl_block); - locks_delete_global_blocked(waiter); waiter->fl_next = NULL; } @@ -704,13 +703,16 @@ EXPORT_SYMBOL(posix_test_lock); /* Find a lock that the owner of the given block_fl is blocking on. */ static struct file_lock *what_owner_is_waiting_for(struct file_lock *block_fl) { - struct file_lock *fl; + struct file_lock *fl, *ret = NULL; list_for_each_entry(fl, &blocked_list, fl_link) { - if (posix_same_owner(fl, block_fl)) - return fl->fl_next; + if (posix_same_owner(fl, block_fl)) { + ret = fl->fl_next; + if (likely(ret)) + break; + } } - return NULL; + return ret; } static int posix_locks_deadlock(struct file_lock *caller_fl, @@ -865,7 +867,8 @@ static int __posix_lock_file(struct inode *inode, struct file_lock *request, str goto out; error = FILE_LOCK_DEFERRED; locks_insert_block(fl, request); - locks_insert_global_blocked(request); + if (list_empty(&request->fl_link)) + locks_insert_global_blocked(request); goto out; } } @@ -876,6 +879,16 @@ static int __posix_lock_file(struct inode *inode, struct file_lock *request, str goto out; /* + * Now that we know the request is no longer blocked, we can take it + * off the global list. Some callers send down partially initialized + * requests, so we only do this if FL_SLEEP is set. Also, avoid taking + * the lock if the list is empty, as that indicates a request that + * never blocked. + */ + if ((request->fl_flags & FL_SLEEP) && !list_empty(&request->fl_link)) + locks_delete_global_blocked(request); + + /* * Find the first old lock with the same owner as the new lock. */ @@ -1069,6 +1082,7 @@ int posix_lock_file_wait(struct file *filp, struct file_lock *fl) continue; locks_delete_block(fl); + locks_delete_global_blocked(fl); break; } return error; @@ -1147,6 +1161,7 @@ int locks_mandatory_area(int read_write, struct inode *inode, } locks_delete_block(&fl); + locks_delete_global_blocked(&fl); break; } @@ -1859,6 +1874,7 @@ static int do_lock_file_wait(struct file *filp, unsigned int cmd, continue; locks_delete_block(fl); + locks_delete_global_blocked(fl); break; } @@ -2160,6 +2176,7 @@ posix_unblock_lock(struct file *filp, struct file_lock *waiter) else status = -ENOENT; spin_unlock(&inode->i_lock); + locks_delete_global_blocked(waiter); return status; }
Currently, when there is a lot of lock contention the kernel spends an inordinate amount of time taking blocked locks off of the global blocked_list and then putting them right back on again. When all of this code was protected by a single lock, then it didn't matter much, but now it means a lot of file_lock_lock thrashing. Optimize this a bit by deferring the removal from the blocked_list until we're either applying or cancelling the lock. By doing this, and using a lockless list_empty check, we can avoid taking the file_lock_lock in many cases. Because the fl_link check is lockless, we must ensure that only the task that "owns" the request manipulates the fl_link. Also, with this change, it's possible that we'll see an entry on the blocked_list that has a NULL fl_next pointer. In that event, just ignore it and continue walking the list. Signed-off-by: Jeff Layton <jlayton@redhat.com> --- fs/locks.c | 29 +++++++++++++++++++++++------ 1 files changed, 23 insertions(+), 6 deletions(-)