Skip to contentSkip to conversation

Btrfs for mainline

RFC PATCH In review Chris Mason 45 participants 367 messages Dec 31, 2008 – Jan 21, 2009 Page 1 of 2

Subsystems (8)
x86 VFS Kbuild Btrfs file system +4 more subsystems
lore
Share & tools
lore
#0 lore raw

Hello everyone,

I've done some testing against Linus' git tree from last night and the current btrfs trees still work well.

There are a few bug fixes that I need to include from while I was on vacation but I haven't made any large changes since early in December:

Btrfs details and usage information can be found:

http://btrfs.wiki.kernel.org/

The btrfs kernel code is here:

http://git.kernel.org/?p=linux/kernel/git/mason/btrfs-unstable.git;a=summary

And the utilities are here:

http://git.kernel.org/?p=linux/kernel/git/mason/btrfs-progs-unstable.git;a=summary

-chris

#1 lore raw
Quoted 1 line · On Wed, 31 Dec 2008 06:28:55 -0500 Chris Mason <[email protected]> wrote:

Hello everyone,

Hi!

Quoted 2 lines

I've done some testing against Linus' git tree from last night and the current btrfs trees still work well.

what's btrfs? I think I've heard the name before, but I've never seen the patches :)

#2 lore raw
Quoted 11 lines · Andrew Morton
Quoted 1 line · On Wed, 31 Dec 2008 06:28:55 -0500 Chris Mason <[email protected]> wrote:

Hello everyone,

Hi!

Quoted 2 lines

I've done some testing against Linus' git tree from last night and the current btrfs trees still work well.

what's btrfs? I think I've heard the name before, but I've never seen the patches :)

The source is up to around 38k loc, I thought it better to use that http thing for people who were interested in the code.

There is also a standalone git repo:

http://git.kernel.org/?p=linux/kernel/git/mason/btrfs-unstable-standalone.git;a=summary

This has only btrfs as a module and would be the fastest way to see the .c files. btrfs doesn't have any changes outside of fs/Makefile and fs/Kconfig

(happy new year ;)

-chris

#3 lore raw

Hi,

Quoted 4 lines · Chris Mason

This has only btrfs as a module and would be the fastest way to see the .c files. btrfs doesn't have any changes outside of fs/Makefile and fs/Kconfig

I found some overlapping (or cloned) functions in
btrfs-unstable.git/fs/btrfs, for example:

- Declarations to apply hardware crc32c in fs/btrfs/crc32c.h:
The same code is found in arch/x86/crypto/crc32c-intel.c

- btrfs_wait_on_page_writeback_range() and btrfs_fdatawrite_range():
These are clones of wait_on_page_writeback_range() and __filemap_fdatawrite_range() respectively, and can be removed if they are just exported.

- Copies of add_to_page_cache_lru() found in compression.c and extent_io.c (can be replaced if it's exported)

How about including patches to resolve these in the btrfs kernel tree (or patchset to be posted) ?

In addition, there seem to be well-separated reusable routines such as async-thread (enhanced workqueue) and extent_map. Do you intend to move these into lib/ or so?

I also tried scripts/checkpatch.pl against btrfs, and it has detected 45 ERRORs and 93 WARNINGs. I think it's a good opportunity to clean up these violations.

With regards,
Ryusuke Konishi

#4 lore raw
Quoted 7 lines · Ryusuke Konishi

Hi,

Quoted 4 lines · Chris Mason

This has only btrfs as a module and would be the fastest way to see the .c files. btrfs doesn't have any changes outside of fs/Makefile and fs/Kconfig

Quoted 6 lines

I found some overlapping (or cloned) functions in
btrfs-unstable.git/fs/btrfs, for example:

- Declarations to apply hardware crc32c in fs/btrfs/crc32c.h:
The same code is found in arch/x86/crypto/crc32c-intel.c

Yes, I can just remove the btrfs version of this for now.

Quoted 11 lines

- btrfs_wait_on_page_writeback_range() and btrfs_fdatawrite_range():
These are clones of wait_on_page_writeback_range() and __filemap_fdatawrite_range() respectively, and can be removed if they are just exported.

- Copies of add_to_page_cache_lru() found in compression.c and extent_io.c (can be replaced if it's exported)

How about including patches to resolve these in the btrfs kernel tree (or patchset to be posted) ?

My plan was to export those after btrfs was actually in. But on Monday I'll send along a patch to export them and make compat functions in btrfs.

Quoted 7 lines

In addition, there seem to be well-separated reusable routines such as async-thread (enhanced workqueue) and extent_map. Do you intend to move these into lib/ or so?

I also tried scripts/checkpatch.pl against btrfs, and it has detected 45 ERRORs and 93 WARNINGs. I think it's a good opportunity to clean up these violations.

Good point, thanks for looking at the code.

-chris

#15 lore raw
In reply to Chris Mason
Quoted 13 lines · Chris Mason
Quoted 11 lines · Andrew Morton
Quoted 1 line · On Wed, 31 Dec 2008 06:28:55 -0500 Chris Mason <[email protected]> wrote:

Hello everyone,

Hi!

Quoted 2 lines

I've done some testing against Linus' git tree from last night and the current btrfs trees still work well.

what's btrfs? I think I've heard the name before, but I've never seen the patches :)

Quoted 6 lines

The source is up to around 38k loc, I thought it better to use that http thing for people who were interested in the code.

There is also a standalone git repo:

http://git.kernel.org/?p=linux/kernel/git/mason/btrfs-unstable-standalone.git;a=summary

Some items I remember from my last look at the code that should be cleaned up before mainline merge (that wasn't a full in depth review):

- locking.c needs a lot of cleanup.
If combination spinlocks/mutexes are really a win they should be in the generic mutex framework. And I'm still dubious on the hardcoded numbers.
- compat.h needs to go
- there's various copy'n'pasted code from the VFS (like may_create) that needs to be cleaned up.
- there should be manpages for all the ioctls and other interfaces.
- ioctl.c was not explicitely root protected. security issues?
- some code was severly undercommented.
e.g. each file should at least have a one liner
describing what it does (ideally at least a paragraph). Bad examples are export.c or free-space-cache.c, but also others.
- ENOMEM checks are still missing all over (e.g. with most of the btrfs_alloc_path callers). If you keep it that way you would need at least XFS style "loop for ever" alloc wrappers, but better just fix all the callers. Also there used to be a lot of BUG_ON()s on memory allocation failure even.
- In general BUG_ONs need review I think. Lots of externally triggerable ones.
- various checkpath.pl level problems I think (e.g. printk levels)
- the printks should all include which file system they refer to

In general I think the whole thing needs more review.

-Andi

Signature · 1 line
[email protected]
#16 lore raw
Quoted 18 lines · Andi Kleen
Quoted 16 lines · Chris Mason
Quoted 11 lines · Andrew Morton
Quoted 1 line · On Wed, 31 Dec 2008 06:28:55 -0500 Chris Mason <[email protected]> wrote:

Hello everyone,

Hi!

Quoted 2 lines

I've done some testing against Linus' git tree from last night and the current btrfs trees still work well.

what's btrfs? I think I've heard the name before, but I've never seen the patches :)

The source is up to around 38k loc, I thought it better to use that http thing for people who were interested in the code.

Quoted 7 lines
Quoted 3 lines

There is also a standalone git repo:

http://git.kernel.org/?p=linux/kernel/git/mason/btrfs-unstable-standalone.git;a=summary

Some items I remember from my last look at the code that should be cleaned up before mainline merge (that wasn't a full in depth review):

Hi Andi, thanks for looking at things.

Quoted 1 line

- locking.c needs a lot of cleanup.

Grin, lots of the code needs to be cleaned, but locking.c is really just a few wrappers around the mutex calls. I don't think I had it at the top of my to-be-cleaned list ;)

Quoted 3 lines

If combination spinlocks/mutexes are really a win they should be in the generic mutex framework. And I'm still dubious on the hardcoded numbers.

Sure, I'm happy to use a generic framework there (or help create one). They are definitely a win for btrfs, and show up in most benchmarks.

Quoted 1 line

- compat.h needs to go

Projects that are out of mainline have a difficult task of making sure development can continue until they are in mainline and being clean enough to merge. I'd rather get rid of the small amount of compat code that I have left after btrfs is in (compat.h is 32 lines).

It isn't hurting anything, and taking it out makes it much more difficult for our current users.

Quoted 2 lines

- there's various copy'n'pasted code from the VFS (like may_create) that needs to be cleaned up.

Yes, I tried to mark those as I did them (a very small number of functions). In general they were copied to avoid adding exports, and that is easily fixed.

Quoted 2 lines

- there should be manpages for all the ioctls and other interfaces.
- ioctl.c was not explicitely root protected. security issues?

Christoph added a CAP_SYS_ADMIN check to the trans start ioctl, but I do need to add one to the device add/remove/balance code as well.

The subvol/snapshot creation is meant to be user callable (controlled by something similar to quotas later on).

Quoted 8 lines

- some code was severly undercommented.
e.g. each file should at least have a one liner describing what it does (ideally at least a paragraph). Bad examples are export.c or free-space-cache.c, but also others.
- ENOMEM checks are still missing all over (e.g. with most of the btrfs_alloc_path callers). If you keep it that way you would need at least XFS style "loop for ever" alloc wrappers, but better just fix all the callers.

Yes, there's quite some work to do in the error handling paths.

Quoted 8 lines

Also there used to be a lot of BUG_ON()s on
memory allocation failure even.
- In general BUG_ONs need review I think. Lots of externally triggerable ones.
- various checkpath.pl level problems I think (e.g. printk levels)
- the printks should all include which file system they refer to

In general I think the whole thing needs more review.

I don't disagree, please do keep in mind that I'm not suggesting anyone use this in production yet.

-chris

#5 lore raw
In reply to Ryusuke Konishi
Quoted 6 lines · Ryusuke Konishi

Hi,

Quoted 4 lines · Chris Mason

This has only btrfs as a module and would be the fastest way to see the .c files. btrfs doesn't have any changes outside of fs/Makefile and fs/Kconfig

[ ... ]

Quoted 3 lines

In addition, there seem to be well-separated reusable routines such as async-thread (enhanced workqueue) and extent_map. Do you intend to move these into lib/ or so?

Sorry, looks like I hit send too soon that time. The async-thread code is very self contained, and was intended for generic use. Pushing that into lib is probably a good idea.

The extent_map and extent_buffer code was also intended for generic use. It needs some love and care (making it work for blocksize != pagesize) before I'd suggest moving it out of fs/btrfs.

-chris

#17 lore raw
In reply to Chris Mason
Quoted 6 lines · Chris Mason
Quoted 3 lines

If combination spinlocks/mutexes are really a win they should be in the generic mutex framework. And I'm still dubious on the hardcoded numbers.

Sure, I'm happy to use a generic framework there (or help create one). They are definitely a win for btrfs, and show up in most benchmarks.

If they are such a big win then likely they will help other users too and should be generic in some form.

Quoted 7 lines
Quoted 2 lines

- compat.h needs to go

Projects that are out of mainline have a difficult task of making sure development can continue until they are in mainline and being clean enough to merge. I'd rather get rid of the small amount of compat code that I have left after btrfs is in (compat.h is 32 lines).

It's fine for an out of tree variant, but the in tree version shouldn't have compat.h. For out of tree you just apply a patch that adds the includes. e.g.compat-wireless and lots of other projects do it this way.

Quoted 10 lines

Yes, I tried to mark those as I did them (a very small number of functions). In general they were copied to avoid adding exports, and that is easily fixed.

Quoted 2 lines

- there should be manpages for all the ioctls and other interfaces.
- ioctl.c was not explicitely root protected. security issues?

Christoph added a CAP_SYS_ADMIN check to the trans start ioctl, but I do need to add one to the device add/remove/balance code as well.

Ok. Didn't see that.

It still needs to be carefully audited for security holes even with root checks.

Another thing is that once auto mounting is enabled each usb stick with btrfs on it could be a root hole if you have buffer overflows somewhere triggerable by disk data. I guess that would need some checking too.

Quoted 2 lines

The subvol/snapshot creation is meant to be user callable (controlled by something similar to quotas later on).

But right now that's not there so it should be root only.

Quoted 8 lines
Quoted 8 lines

Also there used to be a lot of BUG_ON()s on
memory allocation failure even.
- In general BUG_ONs need review I think. Lots of externally triggerable ones.
- various checkpath.pl level problems I think (e.g. printk levels)
- the printks should all include which file system they refer to

Quoted 4 lines
Quoted 1 line

In general I think the whole thing needs more review.

I don't disagree, please do keep in mind that I'm not suggesting anyone use this in production yet.

When it's in mainline I suspect people will start using it for that.

-Andi

Signature · 1 line
[email protected]
#18 lore raw
Quoted 11 lines · Andi Kleen
Quoted 6 lines · Chris Mason
Quoted 3 lines

If combination spinlocks/mutexes are really a win they should be in the generic mutex framework. And I'm still dubious on the hardcoded numbers.

Sure, I'm happy to use a generic framework there (or help create one). They are definitely a win for btrfs, and show up in most benchmarks.

If they are such a big win then likely they will help other users too and should be generic in some form.

I don't disagree. It's about 6 lines of code though, and just hasn't been at the top of my list. I'm sure the generic version will be faster, as it could add checks to see if the holder of the lock was actually running.

Quoted 8 lines
Quoted 7 lines
Quoted 2 lines

- compat.h needs to go

Projects that are out of mainline have a difficult task of making sure development can continue until they are in mainline and being clean enough to merge. I'd rather get rid of the small amount of compat code that I have left after btrfs is in (compat.h is 32 lines).

Quoted 5 lines

It's fine for an out of tree variant, but the in tree version shouldn't have compat.h. For out of tree you just apply a patch that adds the includes. e.g.compat-wireless and lots of other projects do it this way.

It helps debugging that my standalone tree is generated from and exactly the same as fs/btrfs in the full kernel tree. I'll switch to a pull and merge system for the standalone tree.

Quoted 8 lines
Quoted 8 lines

Yes, I tried to mark those as I did them (a very small number of functions). In general they were copied to avoid adding exports, and that is easily fixed.

Quoted 2 lines

- there should be manpages for all the ioctls and other interfaces.
- ioctl.c was not explicitely root protected. security issues?

Quoted 7 lines
Quoted 2 lines

Christoph added a CAP_SYS_ADMIN check to the trans start ioctl, but I do need to add one to the device add/remove/balance code as well.

Ok. Didn't see that.

It still needs to be carefully audited for security holes even with root checks.

Yes, the most important one is the device scan ioctl (also missing the root check, will fix).

Quoted 11 lines

Another thing is that once auto mounting is enabled each usb stick with btrfs on it could be a root hole if you have buffer overflows somewhere triggerable by disk data. I guess that would need some checking too.

Quoted 2 lines

The subvol/snapshot creation is meant to be user callable (controlled by something similar to quotas later on).

But right now that's not there so it should be root only.

I'll switch to checking against directory permissions for now. subvol/snapshot creation are basically mkdir anyway, so this fits well.

Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

Also there used to be a lot of BUG_ON()s on
memory allocation failure even.
- In general BUG_ONs need review I think. Lots of externally triggerable ones.
- various checkpath.pl level problems I think (e.g. printk levels)
- the printks should all include which file system they refer to

Quoted 6 lines
Quoted 4 lines
Quoted 1 line

In general I think the whole thing needs more review.

I don't disagree, please do keep in mind that I'm not suggesting anyone use this in production yet.

When it's in mainline I suspect people will start using it for that.

I think the larger question here is where we want development to happen. I'm definitely not pretending that btrfs is perfect, but I strongly believe that it will be a better filesystem if the development moves to mainline where it will attract more eyeballs and more testers.

-chris

#19 lore raw
Quoted 9 lines
Quoted 4 lines
Quoted 2 lines

I don't disagree, please do keep in mind that I'm not suggesting anyone use this in production yet.

When it's in mainline I suspect people will start using it for that.

I think the larger question here is where we want development to happen. I'm definitely not pretending that btrfs is perfect, but I strongly believe that it will be a better filesystem if the development moves to mainline where it will attract more eyeballs and more testers.

One possibility would be to mimic ext4 and register the fs as "btrfsdev" until it's considered stable enough for production. I agree with the consensus that we want to use the upstream kernel as a nexus for coordinating btrfs development, so I don't think it's worth waiting a release or two to merge something.

- R.

#6 lore raw
In reply to Chris Mason
Quoted 8 lines · Chris Mason
Quoted 3 lines · Ryusuke Konishi

In addition, there seem to be well-separated reusable routines such as async-thread (enhanced workqueue) and extent_map. Do you intend to move these into lib/ or so?

Sorry, looks like I hit send too soon that time. The async-thread code is very self contained, and was intended for generic use. Pushing that into lib is probably a good idea.

As for async-thread, kernel/ seems to be better place (sorry, I also hit send too soon ;)

Anyway, I think it should be reviewed deeply by scheduler people and wider range of people. So, it's a good idea to put it out in order to arouse interest.

Quoted 5 lines

The extent_map and extent_buffer code was also intended for generic use. It needs some love and care (making it work for blocksize != pagesize) before I'd suggest moving it out of fs/btrfs.

-chris

The extent_map itself seemed independent of the problem to me, but I understand your plan.

Btrfs seems to have other helpful code including pages/bio compression which may become separable, too. And, this may be the same for pages/bio encryption/decryption code which would come next. (I don't mention about the volume management/raid feature here to avoid getting off the subject, but it's likewise).

I think it's wonderful if they can be well-integrated into sublayers or libraries.

Regards,
Ryusuke

#26 lore raw
In reply to Andi Kleen
Quoted 7 lines · Andi Kleen

Some items I remember from my last look at the code that should be cleaned up before mainline merge (that wasn't a full in depth review):

- locking.c needs a lot of cleanup.
If combination spinlocks/mutexes are really a win they should be in the generic mutex framework. And I'm still dubious on the hardcoded numbers.

I don't think this needs to be cleaned up before merge. I've spent an hour or two looking at it, and while we can do a somewhat better job as part of the generic mutex framework, it's quite tricky (due to the different <asm/mutex.h> implementations). It has the potential to introduce some hard-to-hit bugs in the generic mutexes, and there's some API discussions to have.

It's no worse than XFS (which still has its own implementation of 'synchronisation variables', a (very thin) wrapper around mutexes, a (thin) wrapper around rwsems, and wrappers around kmalloc and kmem_cache.

Quoted 1 line

- compat.h needs to go

Later. It's still there for XFS.

Quoted 2 lines

- there's various copy'n'pasted code from the VFS (like may_create) that needs to be cleaned up.

No urgency here.

Quoted 1 line

- there should be manpages for all the ioctls and other interfaces.

I wonder if Michael Kerrisk has time to help with that. Cc'd.

Quoted 1 line

- ioctl.c was not explicitely root protected. security issues?

This does need auditing.

Quoted 4 lines

- some code was severly undercommented.
e.g. each file should at least have a one liner describing what it does (ideally at least a paragraph). Bad examples are export.c or free-space-cache.c, but also others.

Nice to have, but generally not required.

Quoted 7 lines

- ENOMEM checks are still missing all over (e.g. with most of the btrfs_alloc_path callers). If you keep it that way you would need at least XFS style "loop for ever" alloc wrappers, but better just fix all the callers. Also there used to be a lot of BUG_ON()s on memory allocation failure even.
- In general BUG_ONs need review I think. Lots of externally triggerable ones.

Agreed on these two.

Quoted 1 line

- various checkpath.pl level problems I think (e.g. printk levels)

Can be fixed up later.

Quoted 1 line

- the printks should all include which file system they refer to

Ditto.

Signature · 4 lines
Matthew Wilcox				Intel Open Source Technology Centre
"Bill, look, we understand that you're interested in selling us this
operating system, but compare it to ours.  We can't possibly take such
a retrograde step."
#27 lore raw
Quoted 2 lines · Matthew Wilcox

It's no worse than XFS (which still has its own implementation of 'synchronisation variables',

Which are a trivial wrapper around wait queues. I have patches to kill them, but I'm not entirely sure it's worth it

Quoted 1 line

a (very thin) wrapper around mutexes,

nope.

Quoted 2 lines

a
(thin) wrapper around rwsems,

Which are needed so we can have asserts about the lock state, which generic rwsems still don't have. At some pointer Peter looked into it, and once we have that we can kill the wrapper.

and wrappers around kmalloc and kmem_cache.

Quoted 4 lines
Quoted 2 lines

- compat.h needs to go

Later. It's still there for XFS.

?

Quoted 3 lines
Quoted 1 line

- there should be manpages for all the ioctls and other interfaces.

I wonder if Michael Kerrisk has time to help with that. Cc'd.

Actually a lot of the ioctl API don't just need documentation but a complete redo. That's true at least for the physical device management and subvolume / snaphot ones.

Quoted 9 lines
Quoted 1 line

- various checkpath.pl level problems I think (e.g. printk levels)

Can be fixed up later.

Quoted 1 line

- the printks should all include which file system they refer to

Ditto.

From painfull experience with a lot of things, including a filesystem

you keep on mentioning it's clear that once stuff is upstream there is very little to no incentive to fix these things up.

#28 lore raw
Quoted 8 lines · Christoph Hellwig
Quoted 3 lines · Matthew Wilcox
Quoted 1 line

- compat.h needs to go

Later. It's still there for XFS.

?

Quoted 8 lines
Quoted 3 lines
Quoted 1 line

- there should be manpages for all the ioctls and other interfaces.

I wonder if Michael Kerrisk has time to help with that. Cc'd.

Actually a lot of the ioctl API don't just need documentation but a complete redo. That's true at least for the physical device management and subvolume / snaphot ones.

The ioctl interface is definitely not finalized. Adding more vs replacing the existing ones is an open question.

Quoted 4 lines
Quoted 4 lines
Quoted 1 line

- various checkpath.pl level problems I think (e.g. printk levels)

Can be fixed up later.

Quoted 8 lines
Quoted 5 lines
Quoted 1 line

- the printks should all include which file system they refer to

Ditto.

From painfull experience with a lot of things, including a filesystem

you keep on mentioning it's clear that once stuff is upstream there is very little to no incentive to fix these things up.

I'd disagree here. Cleanup incentive is a mixture of the people involved and the attention the project has.

-chris

#31 lore raw
In reply to Christoph Hellwig
Quoted 6 lines · Christoph Hellwig
Quoted 2 lines · Matthew Wilcox

It's no worse than XFS (which still has its own implementation of 'synchronisation variables',

Which are a trivial wrapper around wait queues. I have patches to kill them, but I'm not entirely sure it's worth it

I'm not sure it's worth it either.

Quoted 3 lines
Quoted 1 line

a (very thin) wrapper around mutexes,

nope.

It's down to:

typedef struct mutex mutex_t;

but it's still there.

Quoted 6 lines
Quoted 2 lines

a
(thin) wrapper around rwsems,

Which are needed so we can have asserts about the lock state, which generic rwsems still don't have. At some pointer Peter looked into it, and once we have that we can kill the wrapper.

Good to know. Rather like btrfs's wrappers around mutexes then ...

Quoted 5 lines
Quoted 3 lines
Quoted 1 line

- compat.h needs to go

Later. It's still there for XFS.

?

XFS still has 'fs/xfs/linux-2.6'. It's a little bigger than compat.h, for sure, and doesn't contain code for supporting different Linux versions, sure. But it's still a compat layer.

Quoted 7 lines
Quoted 3 lines
Quoted 1 line

- there should be manpages for all the ioctls and other interfaces.

I wonder if Michael Kerrisk has time to help with that. Cc'd.

Actually a lot of the ioctl API don't just need documentation but a complete redo. That's true at least for the physical device management and subvolume / snaphot ones.

That's a more important critique than Andi's. Let's take care of that.

Quoted 3 lines

From painfull experience with a lot of things, including a filesystem you keep on mentioning it's clear that once stuff is upstream there is very little to no incentive to fix these things up.

I don't think that's as true of btrfs as it was of XFS -- for example, Chris has no incentive to keep compatibility with IRIX, or continue to support CXFS. I don't think 'getting included in kernel' is Chris' goal, so much as it is a step towards making btrfs better.

Signature · 4 lines
Matthew Wilcox				Intel Open Source Technology Centre
"Bill, look, we understand that you're interested in selling us this
operating system, but compare it to ours.  We can't possibly take such
a retrograde step."
#355 lore raw
In reply to Chris Mason

Hi Chris,

Does this means that disk format finalised or at least backward compatible?

Quoted 28 lines · Chris Mason

Hello everyone,

I've done some testing against Linus' git tree from last night and the current btrfs trees still work well.

There are a few bug fixes that I need to include from while I was on vacation but I haven't made any large changes since early in December:

Btrfs details and usage information can be found:

http://btrfs.wiki.kernel.org/

The btrfs kernel code is here:

http://git.kernel.org/?p=linux/kernel/git/mason/btrfs-unstable.git;a=summary

And the utilities are here:

http://git.kernel.org/?p=linux/kernel/git/mason/btrfs-progs-unstable.git;a=summary

-chris

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

#20 lore raw
In reply to Roland Dreier

Hi

Quoted 5 lines

One possibility would be to mimic ext4 and register the fs as "btrfsdev" until it's considered stable enough for production. I agree with the consensus that we want to use the upstream kernel as a nexus for coordinating btrfs development, so I don't think it's worth waiting a release or two to merge something.

I like this idea.
I also want to test btrfs. but I'm not interested out of tree code.

#21 lore raw
Quoted 10 lines · KOSAKI Motohiro

Hi

Quoted 5 lines

One possibility would be to mimic ext4 and register the fs as "btrfsdev" until it's considered stable enough for production. I agree with the consensus that we want to use the upstream kernel as a nexus for coordinating btrfs development, so I don't think it's worth waiting a release or two to merge something.

I like this idea.
I also want to test btrfs. but I'm not interested out of tree code.

I'll second this. Please get btrfsdev into mainline asap.

TIA
Ed Tomlinson

maintainer
#32 lore raw
In reply to Matthew Wilcox
Quoted 4 lines · Matthew Wilcox
Quoted 3 lines

- locking.c needs a lot of cleanup.
If combination spinlocks/mutexes are really a win they should be in the generic mutex framework. And I'm still dubious on the

hardcoded

Quoted 8 lines
Quoted 1 line

numbers.

I don't think this needs to be cleaned up before merge. I've spent an hour or two looking at it, and while we can do a somewhat better job as part of the generic mutex framework, it's quite tricky (due to the different <asm/mutex.h> implementations). It has the potential to introduce some hard-to-hit bugs in the generic mutexes, and there's some API discussions to have.

I'm really opposed to having this in some filesystem. Please remove it before merging it.

The -rt tree has adaptive spin patches for the rtmutex code, its really not all that hard to do -- the rtmutex code is way more tricky than the regular mutexes due to all the PI fluff.

For kernel only locking the simple rule: spin iff the lock holder is running proved to be simple enough. Any added heuristics like max spin count etc. only made things worse. The whole idea though did make sense and certainly improved performance.

We've also been looking at doing adaptive spins for futexes, although that does get a little more complex, furthermore, we've never gotten around to actually doing any code on that.

#33 lore raw
Quoted 8 lines · Peter Zijlstra

The -rt tree has adaptive spin patches for the rtmutex code, its really not all that hard to do -- the rtmutex code is way more tricky than the regular mutexes due to all the PI fluff.

For kernel only locking the simple rule: spin iff the lock holder is running proved to be simple enough. Any added heuristics like max spin count etc. only made things worse. The whole idea though did make sense and certainly improved performance.

That implies moving

        struct thread_info      *owner;

out from under the CONFIG_DEBUG_MUTEXES code. One of the original justifications for mutexes was:

- 'struct mutex' is smaller on most architectures: .e.g on x86, 'struct semaphore' is 20 bytes, 'struct mutex' is 16 bytes. A smaller structure size means less RAM footprint, and better CPU-cache utilization.

I'd be reluctant to reverse that decision just for btrfs.

Benchmarking required! Maybe I can put a patch together that implements the simple 'spin if it's running' heuristic and throw it at our testing guys on Monday ...

Signature · 4 lines
Matthew Wilcox				Intel Open Source Technology Centre
"Bill, look, we understand that you're interested in selling us this
operating system, but compare it to ours.  We can't possibly take such
a retrograde step."
#29 lore raw
In reply to Chris Mason
Quoted 8 lines · Chris Mason

=20

Quoted 4 lines

Actually a lot of the ioctl API don't just need documentation but a complete redo. =A0That's true at least for the physical device management and subvolume / snaphot ones.
=20

=20
The ioctl interface is definitely not finalized. =A0Adding more vs replacing the existing ones is an open question.

As long as that's an open question, the ioctl interface shouldn't get merged into the kernel, or should get in as btrfsdev, otherwise you get stuck with the current ABI forever.

Is it possible to separate out the nonstandard ioctls into a patch that can get merged when the interface is final, or will that make btrfs unusable?

	Arnd <><
#22 lore raw
In reply to Andi Kleen
Quoted 1 line · Andi Kleen

When it's in mainline I suspect people will start using it for that.

Some people don't even wait for that. ;-)

Seriously though, if that is a concern can I suggest taking the btrfsdev route and, if you want a real belt and braces approach, perhaps require it to have a mandatory mount option specified to successfully mount, maybe "eat_my_data" ?

cheers,
Chris

Signature · 4 lines
 Chris Samuel  :  http://www.csamuel.org/  :  Melbourne, VIC

This email may come with a PGP signature as a file. Do not panic.
For more info see: http://en.wikipedia.org/wiki/OpenPGP
#9 lore raw
In reply to Chris Mason
Quoted 4 lines · On Saturday 03 January 2009 06:38:07 Chris Mason wrote:
Quoted 3 lines · Ryusuke Konishi

Hi,

On Wed, 31 Dec 2008 18:19:09 -0500, Chris Mason <[email protected]>

Quoted 10 lines · wrote:
Quoted 3 lines
Quoted 3 lines

This has only btrfs as a module and would be the fastest way to see the .c files. btrfs doesn't have any changes outside of fs/Makefile and fs/Kconfig

[ ... ]

Quoted 3 lines

In addition, there seem to be well-separated reusable routines such as async-thread (enhanced workqueue) and extent_map. Do you intend to move these into lib/ or so?

Quoted 7 lines

Sorry, looks like I hit send too soon that time. The async-thread code is very self contained, and was intended for generic use. Pushing that into lib is probably a good idea.

The extent_map and extent_buffer code was also intended for generic use. It needs some love and care (making it work for blocksize != pagesize) before I'd suggest moving it out of fs/btrfs.

I'm yet to be convinced it is a good idea to use extents for this. Been a long time since we visited the issue, but when you converted ext2 to use the extent mapping stuff, it actually went slower, and complexity went up a lot (IIRC possibly required allocations in the writeback path).

So I think it is a fine idea to live in btrfs until it is more proven and found useful elsewhere.

#23 lore raw
In reply to Chris Samuel
Quoted 9 lines · Chris Samuel
Quoted 1 line · Andi Kleen

When it's in mainline I suspect people will start using it for that.

Some people don't even wait for that. ;-)

Seriously though, if that is a concern can I suggest taking the btrfsdev route and, if you want a real belt and braces approach, perhaps require it to have a mandatory mount option specified to successfully mount, maybe "eat_my_data" ?

I think ext4dev made more sense for ext4 because people generally expect ext* to be stable. Btrfs doesn't quite have the reputation for stability yet, so I don't feel we need a special -dev name for it.

But, if Andrew/Linus prefer that unstable filesystems are tagged with -dev, I'm happy to do it.

-chris

#10 lore raw
In reply to Nick Piggin
Quoted 6 lines · Nick Piggin
Quoted 3 lines · On Saturday 03 January 2009 06:38:07 Chris Mason wrote:

The extent_map and extent_buffer code was also intended for generic use. It needs some love and care (making it work for blocksize != pagesize) before I'd suggest moving it out of fs/btrfs.

Quoted 8 lines

I'm yet to be convinced it is a good idea to use extents for this. Been a long time since we visited the issue, but when you converted ext2 to use the extent mapping stuff, it actually went slower, and complexity went up a lot (IIRC possibly required allocations in the writeback path).

So I think it is a fine idea to live in btrfs until it is more proven and found useful elsewhere.

It has gotten faster since then, but it makes sense to wait on moving extent_* code.

-chris

#30 lore raw
In reply to Arnd Bergmann
Quoted 7 lines · Arnd Bergmann
Quoted 6 lines · Chris Mason
Quoted 5 lines

Actually a lot of the ioctl API don't just need documentation but a complete redo. That's true at least for the physical device management and subvolume / snaphot ones.

Quoted 7 lines
Quoted 2 lines

The ioctl interface is definitely not finalized. Adding more vs replacing the existing ones is an open question.

As long as that's an open question, the ioctl interface shouldn't get merged into the kernel, or should get in as btrfsdev, otherwise you get stuck with the current ABI forever.

Maintaining the current ioctls isn't a problem. There aren't very many and they do very discrete things. The big part that may change is the device scanning, which may get more integrated into udev and mount (see other threads about this).

But, that is one very simple ioctl, and most of the code it uses is going to stay regardless of how the device scanning is done.

-chris

#7 lore raw
In reply to Ryusuke Konishi
Quoted 8 lines · Ryusuke Konishi

On Fri, 02 Jan 2009 14:38:07 -0500, Chris Mason

Btrfs seems to have other helpful code including pages/bio compression which may become separable, too. And, this may be the same for pages/bio encryption/decryption code which would come next. (I don't mention about the volume management/raid feature here to avoid getting off the subject, but it's likewise).

The compression code is somewhat tied to the btrfs internals, but it could be pulled out without too much trouble. The big question there is if other filesystems are interested in transparent compression support.

But, at the end of the day, most of the work is still done by the zlib code. The btrfs bits just organize pages to send down to zlib.

-chris

#354 lore raw
In reply to Peter Zijlstra
Quoted 14 lines · Peter Zijlstra
Quoted 4 lines · Matthew Wilcox
Quoted 3 lines

- locking.c needs a lot of cleanup.
If combination spinlocks/mutexes are really a win they should be in the generic mutex framework. And I'm still dubious on the

hardcoded

Quoted 8 lines
Quoted 1 line

numbers.

I don't think this needs to be cleaned up before merge. I've spent an hour or two looking at it, and while we can do a somewhat better job as part of the generic mutex framework, it's quite tricky (due to the different <asm/mutex.h> implementations). It has the potential to introduce some hard-to-hit bugs in the generic mutexes, and there's some API discussions to have.

Quoted 3 lines

I'm really opposed to having this in some filesystem. Please remove it before merging it.

It is 5 lines in a single function that is local to btrfs. I'll be happy to take it out when a clear path to a replacement is in.

I know people have been doing work in this area for -rt, and do not want to start a parallel effort to change things.

I'm not trying to jump into the design discussions because there are people already working on it who know the issues much better than I do.

But, if anyone working on adaptive mutexes is looking for a coder, tester, use case, or benchmark for their locking scheme, my hand is up.

Until then, this is my for loop, there are many like it, but this one is mine.

-chris

#356 lore raw
In reply to Gabor MICSKO
Quoted 6 lines · Gabor MICSKO

Hi Chris,

Does this means that disk format finalised or at least backward compatible?

We're making every effort to avoid new disk format changes now (that are not backward compatible). Only a critical bug would result in a disk format change now.

-chris

#11 lore raw

generic pagecache to block mapping layer (was Re: Btrfs for mainline)

In reply to Chris Mason

[trim ccs]

Feel free to ignore this diversion ;) I'd like to see btrfs go upstream sooner rather than later. But eventually we'll have to resurrect fsblock vs extent map discussion.

Quoted 12 lines · On Tuesday 06 January 2009 00:21:43 Chris Mason wrote:
Quoted 11 lines · Nick Piggin
Quoted 3 lines · On Saturday 03 January 2009 06:38:07 Chris Mason wrote:

The extent_map and extent_buffer code was also intended for generic use. It needs some love and care (making it work for blocksize != pagesize) before I'd suggest moving it out of fs/btrfs.

I'm yet to be convinced it is a good idea to use extents for this. Been a long time since we visited the issue, but when you converted ext2 to use the extent mapping stuff, it actually went slower, and complexity went up a lot (IIRC possibly required allocations in the writeback path).

Quoted 5 lines
Quoted 2 lines

So I think it is a fine idea to live in btrfs until it is more proven and found useful elsewhere.

It has gotten faster since then, but it makes sense to wait on moving extent_* code.

faster, than it was or than buffer heads now?

fsblock is faster than buffer heads, robust WRT memory allocation, supports smaller and larger blocks than pagecache, and does locking solely on a per-page basis.

I added a module that can cache block mapping (but not pagecache state mapping, importantly) in extents for filesystems that don't have a good in-memory data structure (although this has a per-inode lock course). I agree that using extents for this makes perfect sense, but I've just never thought pagecache state extents are a good idea.

I don't think this will be too easy to beat with state extents. I haven't looked closely at your implementation for quite a while, but last I did, I couldn't imagine it being easy to make fast+scalable or rework it to have good memory allocation behaviour.

#34 lore raw
In reply to Matthew Wilcox
Quoted 22 lines · On Monday 05 January 2009 05:41:03 Matthew Wilcox wrote:
Quoted 8 lines · Peter Zijlstra

The -rt tree has adaptive spin patches for the rtmutex code, its really not all that hard to do -- the rtmutex code is way more tricky than the regular mutexes due to all the PI fluff.

For kernel only locking the simple rule: spin iff the lock holder is running proved to be simple enough. Any added heuristics like max spin count etc. only made things worse. The whole idea though did make sense and certainly improved performance.

That implies moving

        struct thread_info      *owner;

out from under the CONFIG_DEBUG_MUTEXES code. One of the original justifications for mutexes was:

- 'struct mutex' is smaller on most architectures: .e.g on x86, 'struct semaphore' is 20 bytes, 'struct mutex' is 16 bytes. A smaller structure size means less RAM footprint, and better CPU-cache utilization.

Quoted 5 lines

I'd be reluctant to reverse that decision just for btrfs.

Benchmarking required! Maybe I can put a patch together that implements the simple 'spin if it's running' heuristic and throw it at our testing guys on Monday ...

adaptive locks have traditionally (read: Linus says) indicated the locking is suboptimal from a performance perspective and should be reworked. This is definitely the case for the -rt patchset, because they deliberately trade performance by change even very short held spinlocks to sleeping locks.

So I don't really know if -rt justifies adaptive locks in mainline/btrfs. Is there no way for the short critical sections to be decoupled from the long/sleeping ones?

#357 lore raw
In reply to Chris Mason
Quoted 11 lines · Chris Mason
Quoted 6 lines · Gabor MICSKO

Hi Chris,

Does this means that disk format finalised or at least backward compatible?

We're making every effort to avoid new disk format changes now (that are not backward compatible). Only a critical bug would result in a disk format change now.

Is this means that new format is ready for RAID5-like disk layout?

Signature · 2 lines
Tomasz Torcz                Only gods can safely risk perfection,
[email protected]     it's a dangerous thing for a man.  -- Alia
#35 lore raw
In reply to Nick Piggin
Quoted 8 lines · Nick Piggin

adaptive locks have traditionally (read: Linus says) indicated the locking is suboptimal from a performance perspective and should be reworked. This is definitely the case for the -rt patchset, because they deliberately trade performance by change even very short held spinlocks to sleeping locks.

So I don't really know if -rt justifies adaptive locks in mainline/btrfs. Is there no way for the short critical sections to be decoupled from the long/sleeping ones?

I wondered about that option too. Let's see if we have other users that will benefit from adaptive locks -- my gut says that Linus is right, but then there's a lot of lazy programmers out there using mutexes when they should be using spinlocks.

I wonder about a new lockdep-style debugging option that adds a bit per mutex class to determine whether the holder ever slept while holding it. Then a periodic check could determine which mutexes were needlessly held would find one style of bad lock management.

The comment in btrfs certainly indicates that locking redesign is a potential solution:

* locks the per buffer mutex in an extent buffer. This uses adaptive locks
* and the spin is not tuned very extensively. The spinning does make a big
* difference in almost every workload, but spinning for the right amount of
* time needs some help.
*
* In general, we want to spin as long as the lock holder is doing btree searches,
* and we should give up if they are in more expensive code.

btrfs almost wants its own hybrid locks (like lock_sock(), to choose a new in-tree example). One where it will spin, unless a flag is set to not spin, in which case it sleeps. Then the 'more expensive code' can set the flag to not bother spinning.

Signature · 4 lines
Matthew Wilcox				Intel Open Source Technology Centre
"Bill, look, we understand that you're interested in selling us this
operating system, but compare it to ours.  We can't possibly take such
a retrograde step."
#36 lore raw
In reply to Nick Piggin

On Tue, 2009-01-06 at 01:47 +1100, Nick Piggin wrote:

[ adaptive locking in btrfs ]

Quoted 8 lines

adaptive locks have traditionally (read: Linus says) indicated the locking is suboptimal from a performance perspective and should be reworked. This is definitely the case for the -rt patchset, because they deliberately trade performance by change even very short held spinlocks to sleeping locks.

So I don't really know if -rt justifies adaptive locks in mainline/btrfs. Is there no way for the short critical sections to be decoupled from the long/sleeping ones?

Yes and no. The locks are used here to control access to the btree leaves and nodes. Some of these are very hot and tend to stay in cache all the time, while others have to be read from the disk.

As the btree search walks down the tree, access to the hot nodes is best controlled by a spinlock. Some operations (like a balance) will need to read other blocks from the disk and keep the node/leaf locked. So it also needs to be able to sleep.

I try to drop the locks where it makes sense before sleeping operatinos, but in some corner cases it isn't practical.

For leaves, once the code has found the item in the btree it was looking for, it wants to go off and do something useful (insert an inode etc etc). Those operations also tend to block, and the lock needs to be held to keep the tree block from changing.

All of this is a long way of saying the btrfs locking scheme is far from perfect. I'll look harder at the loop and ways to get rid of it.

-chris

#358 lore raw
In reply to Tomasz Torcz
Quoted 9 lines · Tomasz Torcz
Quoted 8 lines · Chris Mason
Quoted 6 lines · Gabor MICSKO

Hi Chris,

Does this means that disk format finalised or at least backward compatible?

Quoted 7 lines
Quoted 3 lines

We're making every effort to avoid new disk format changes now (that are not backward compatible). Only a critical bug would result in a disk format change now.

Is this means that new format is ready for RAID5-like disk layout?

That will be done through forward compat bits. So you won't be able to use today's code to mount a RAID5 FS, but the raid5 fs will understand today's FS.

-chris

#24 lore raw
In reply to Chris Mason
Quoted 7 lines · Chris Mason
Quoted 6 lines · Chris Samuel
Quoted 1 line · Andi Kleen

When it's in mainline I suspect people will start using it for that.

Some people don't even wait for that. ;-)

Quoted 7 lines
Quoted 3 lines

Seriously though, if that is a concern can I suggest taking the btrfsdev route and, if you want a real belt and braces approach, perhaps require it to have a mandatory mount option specified to successfully mount, maybe "eat_my_data" ?

I think ext4dev made more sense for ext4 because people generally expect ext* to be stable. Btrfs doesn't quite have the reputation for stability yet, so I don't feel we need a special -dev name for it.

Old kernel versions may still get booted after brtfs has gotten a reputation for stability. E.g. if I move my / to brtfs in 2.6.34, then one day need to boot back to 2.6.30 to track down some regression, the reminder that I'm moving back to some sort of brtfs dark-ages might be welcome.

(Not that I have particularly strong feelings about this.)

--b.

Quoted 12 lines

But, if Andrew/Linus prefer that unstable filesystems are tagged with

(quoted diff) +0 -3
-dev, I'm happy to do it.
 
-chris
 
 
--

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

#12 lore raw

Re: generic pagecache to block mapping layer (was Re: Btrfs for mainline)

In reply to Nick Piggin
Quoted 6 lines · Nick Piggin

[trim ccs]

Feel free to ignore this diversion ;) I'd like to see btrfs go upstream sooner rather than later. But eventually we'll have to resurrect fsblock vs extent map discussion.

There's extent_map, extent_state and extent_buffer. I'd expect the mapping code to beat fsblock, since it more closely models the conditions of the disk format. This is a very thin layer of code to figure out which file offset goes to which block on disk.

extent_state is a different beast, since it is trying to track state across extents. It is entirely possible that we're better off keeping the state in the pages, aside from the part where we're running out of bits.

extent_buffers are an api to access/modify the contents of ranges of bytes, supporting larger and smaller blocksizes than the page. I'd be really interested in comparing this to fsblock, but I need to first fix it to actually support larger and smaller blocksizes than the page ;)

So, long term we can have a benchmarking contest, but I've got a little ways to go before that is a good idea.

-chris

#8 lore raw
In reply to Chris Mason
Quoted 10 lines · Chris Mason
Quoted 8 lines · Ryusuke Konishi

On Fri, 02 Jan 2009 14:38:07 -0500, Chris Mason

Btrfs seems to have other helpful code including pages/bio compression which may become separable, too. And, this may be the same for pages/bio encryption/decryption code which would come next. (I don't mention about the volume management/raid feature here to avoid getting off the subject, but it's likewise).

Quoted 3 lines

The compression code is somewhat tied to the btrfs internals, but it could be pulled out without too much trouble. The big question there is if other filesystems are interested in transparent compression support.

It was so attractive to me ;)
though I don't know if it's applicable.

Anyway, making this common can be said to be the exercise of someone who try to reuse it, and I don't adhere to it in order not to get off the subject. Just I wanted to add presence of other candicates.

Quoted 4 lines

But, at the end of the day, most of the work is still done by the zlib code. The btrfs bits just organize pages to send down to zlib.

-chris

Yes, but that's the interesting point; it provides ways to apply compression through array of pages, or bio - I like it.

Ryusuke

#13 lore raw

Re: generic pagecache to block mapping layer (was Re: Btrfs for mainline)

In reply to Chris Mason
Quoted 11 lines · On Tuesday 06 January 2009 03:37:33 Chris Mason wrote:
Quoted 5 lines · Nick Piggin

[trim ccs]

Feel free to ignore this diversion ;) I'd like to see btrfs go upstream sooner rather than later. But eventually we'll have to resurrect fsblock vs extent map discussion.

There's extent_map, extent_state and extent_buffer. I'd expect the mapping code to beat fsblock, since it more closely models the conditions of the disk format. This is a very thin layer of code to figure out which file offset goes to which block on disk.

It looks somewhat similar to the optional extent mapping layer I added in front of fsblock (which works very nicely for ext2, but may not be bloated^W enough for btrfs :P).

#define FE_mapped       0x1
#define FE_hole         0x2
#define FE_new          0x4
struct fsb_extent {
        struct rb_node          rb_node;
        sector_t                offset;
        sector_t                block;
        unsigned int            size;
        unsigned int            flags;
};

But I have a feeling that it might be better to not have such a layer and go direct to the filesystem in cases where they have good in memory data structures for mapping themselves. btrfs for example has some non-generic looking data in its mapping.

But... we'll see. If we can distill the common goodness from different places and make it more usable, it would definitely be a good idea.

Quoted 4 lines

extent_state is a different beast, since it is trying to track state across extents. It is entirely possible that we're better off keeping the state in the pages, aside from the part where we're running out of bits.

OK, I haven't really understood how that works.

Quoted 4 lines

extent_buffers are an api to access/modify the contents of ranges of bytes, supporting larger and smaller blocksizes than the page. I'd be really interested in comparing this to fsblock, but I need to first fix it to actually support larger and smaller blocksizes than the page ;)

Yes, this area is where we have a difference of opinion I think ;)

Quoted 2 lines

So, long term we can have a benchmarking contest, but I've got a little ways to go before that is a good idea.

That would be good.

Thanks,
Nick

maintainer
#40 lore raw

RFC PATCH 1/1 : mutex: adaptive spin

In reply to Matthew Wilcox

Subject: mutex: adaptive spin
From: Peter Zijlstra <[email protected]>
Date: Tue Jan 06 12:32:12 CET 2009

Based on the code in -rt, provide adaptive spins on generic mutexes.

---
 include/linux/mutex.h |    4 ++--
 include/linux/sched.h |    1 +
 kernel/mutex-debug.c  |   11 ++---------
 kernel/mutex-debug.h  |    8 --------
 kernel/mutex.c        |   46 +++++++++++++++++++++++++++++++++++++++-------
 kernel/mutex.h        |    2 --
 kernel/sched.c        |    5 +++++
 7 files changed, 49 insertions(+), 28 deletions(-)
include/linux/mutex.h +2 -2
Index: linux-2.6/include/linux/mutex.h
===================================================================
@@ -50,8 +50,8 @@ struct mutex {
 	atomic_t		count;
 	spinlock_t		wait_lock;
 	struct list_head	wait_list;
+	struct task_struct	*owner;
 #ifdef CONFIG_DEBUG_MUTEXES
-	struct thread_info	*owner;
 	const char 		*name;
 	void			*magic;
 #endif
@@ -67,8 +67,8 @@ struct mutex {
 struct mutex_waiter {
 	struct list_head	list;
 	struct task_struct	*task;
-#ifdef CONFIG_DEBUG_MUTEXES
 	struct mutex		*lock;
+#ifdef CONFIG_DEBUG_MUTEXES
 	void			*magic;
 #endif
 };
include/linux/sched.h +1 -0
Index: linux-2.6/include/linux/sched.h
===================================================================
@@ -249,6 +249,7 @@ extern void init_idle(struct task_struct
 extern void init_idle_bootup_task(struct task_struct *idle);
 
 extern int runqueue_is_locked(void);
+extern int task_is_current(struct task_struct *p);
 extern void task_rq_unlock_wait(struct task_struct *p);
 
 extern cpumask_var_t nohz_cpu_mask;
kernel/mutex-debug.c +2 -9
Index: linux-2.6/kernel/mutex-debug.c
===================================================================
@@ -26,11 +26,6 @@
 /*
  * Must be called with lock->wait_lock held.
  */
-void debug_mutex_set_owner(struct mutex *lock, struct thread_info *new_owner)
-{
-	lock->owner = new_owner;
-}
-
 void debug_mutex_lock_common(struct mutex *lock, struct mutex_waiter *waiter)
 {
 	memset(waiter, MUTEX_DEBUG_INIT, sizeof(*waiter));
@@ -59,7 +54,6 @@ void debug_mutex_add_waiter(struct mutex
 
 	/* Mark the current thread as blocked on the lock: */
 	ti->task->blocked_on = waiter;
-	waiter->lock = lock;
 }
 
 void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
@@ -80,9 +74,9 @@ void debug_mutex_unlock(struct mutex *lo
 		return;
 
 	DEBUG_LOCKS_WARN_ON(lock->magic != lock);
-	DEBUG_LOCKS_WARN_ON(lock->owner != current_thread_info());
+	DEBUG_LOCKS_WARN_ON(lock->owner != current);
 	DEBUG_LOCKS_WARN_ON(!lock->wait_list.prev && !lock->wait_list.next);
-	DEBUG_LOCKS_WARN_ON(lock->owner != current_thread_info());
+	DEBUG_LOCKS_WARN_ON(lock->owner != current);
 }
 
 void debug_mutex_init(struct mutex *lock, const char *name,
@@ -95,7 +89,6 @@ void debug_mutex_init(struct mutex *lock
 	debug_check_no_locks_freed((void *)lock, sizeof(*lock));
 	lockdep_init_map(&lock->dep_map, name, key, 0);
 #endif
-	lock->owner = NULL;
 	lock->magic = lock;
 }
 
kernel/mutex-debug.h +0 -8
Index: linux-2.6/kernel/mutex-debug.h
===================================================================
@@ -13,14 +13,6 @@
 /*
  * This must be called with lock->wait_lock held.
  */
-extern void
-debug_mutex_set_owner(struct mutex *lock, struct thread_info *new_owner);
-
-static inline void debug_mutex_clear_owner(struct mutex *lock)
-{
-	lock->owner = NULL;
-}
-
 extern void debug_mutex_lock_common(struct mutex *lock,
 				    struct mutex_waiter *waiter);
 extern void debug_mutex_wake_waiter(struct mutex *lock,
kernel/mutex.c +39 -7

96 lines not on this page · raw message

kernel/sched.c +5 -0
Index: linux-2.6/kernel/sched.c
===================================================================
@@ -697,6 +697,11 @@ int runqueue_is_locked(void)
 	return ret;
 }
 
+int task_is_current(struct task_struct *p)
+{
+	return task_rq(p)->curr == p;
+}
+
 /*
  * Debugging: various feature bits
  */
kernel/mutex.h +0 -2
Index: linux-2.6/kernel/mutex.h
===================================================================
@@ -16,8 +16,6 @@
 #define mutex_remove_waiter(lock, waiter, ti) \
 		__list_del((waiter)->list.prev, (waiter)->list.next)
 
-#define debug_mutex_set_owner(lock, new_owner)		do { } while (0)
-#define debug_mutex_clear_owner(lock)			do { } while (0)
 #define debug_mutex_wake_waiter(lock, waiter)		do { } while (0)
 #define debug_mutex_free_waiter(waiter)			do { } while (0)
 #define debug_mutex_add_waiter(lock, waiter, ti)	do { } while (0)
#41 lore raw

Re: [PATCH][RFC]: mutex: adaptive spin

Quoted 18 lines · Peter Zijlstra

+++ linux-2.6/kernel/mutex.c

kernel/mutex.c +6 -0
@@ -46,6 +46,7 @@ __mutex_init(struct mutex *lock, const c
 	atomic_set(&lock->count, 1);
 	spin_lock_init(&lock->wait_lock);
 	INIT_LIST_HEAD(&lock->wait_list);
+	lock->owner = NULL;
 
 	debug_mutex_init(lock, name, key);
 }
@@ -120,6 +121,28 @@ void __sched mutex_unlock(struct mutex *
 
 EXPORT_SYMBOL(mutex_unlock);
 
+#ifdef CONFIG_SMP
+static int adaptive_wait(struct mutex_waiter *waiter,
+			 struct task_struct *owner, long state)
+{
+	for (;;) {

kernel/mutex.c void __sched mutex_unlock(struct mutex * · line 138

Quoted 10 lines
kernel/mutex.c +10 -0
+		if (signal_pending_state(state, waiter->task))
+			return 0;
+		if (waiter->lock->owner != owner)
+			return 0;
+		if (!task_is_current(owner))
+			return 1;
+		cpu_relax();
+	}
+}
+#else

Linus, what do you think about this particular approach of spin-mutexes? It's not the typical spin-mutex i think.

The thing i like most about Peter's patch (compared to most other adaptive spinning approaches i've seen, which all sucked as they included various ugly heuristics complicating the whole thing) is that it solves the "how long should we spin" question elegantly: we spin until the owner runs on a CPU.

So on shortly held locks we degenerate to spinlock behavior, and only long-held blocking locks [with little CPU time spent while holding the lock - say we wait for IO] we degenerate to classic mutex behavior.

There's no time or spin-rate based heuristics in this at all (i.e. these mutexes are not 'adaptive' at all!), and it degenerates to our primary and well-known locking behavior in the important boundary situations.

A couple of other properties i like about it:

- A spinlock user can be changed to a mutex with no runtime impact. (no increase in scheduling) This might enable us to convert/standardize some of the uglier locking constructs within ext2/3/4?

- This mutex modification would probably be a win for workloads where mutexes are held briefly - we'd never schedule.

- If the owner is preempted, we fall back to proper blocking behavior. This might reduce the cost of preemptive kernels in general.

The flip side:

- The slight increase in the hotpath - we now maintain the 'owner' field. That's cached in a register on most platforms anyway so it's not a too big deal - if the general win justifies it.

( This reminds me: why not flip over all the task_struct uses in
mutex.c to thread_info? thread_info is faster to access [on x86] than current. )

- The extra mutex->owner pointer data overhead.

- It could possibly increase spinning overhead (and waste CPU time) on workloads where locks are held and contended for. OTOH, such cases are probably a prime target for improvements anyway. It would probably be near-zero-impact for workloads where mutexes are held for a very long time and where most of the time is spent blocking.

It's hard to tell how it would impact inbetween workloads - i guess it needs to be measured on a couple of workloads.

Ingo

maintainer
#42 lore raw

Re: [PATCH][RFC]: mutex: adaptive spin

Quoted 34 lines · Ingo Molnar
Quoted 18 lines · Peter Zijlstra

+++ linux-2.6/kernel/mutex.c

kernel/mutex.c +6 -0
@@ -46,6 +46,7 @@ __mutex_init(struct mutex *lock, const c
 	atomic_set(&lock->count, 1);
 	spin_lock_init(&lock->wait_lock);
 	INIT_LIST_HEAD(&lock->wait_list);
+	lock->owner = NULL;
 
 	debug_mutex_init(lock, name, key);
 }
@@ -120,6 +121,28 @@ void __sched mutex_unlock(struct mutex *
 
 EXPORT_SYMBOL(mutex_unlock);
 
+#ifdef CONFIG_SMP
+static int adaptive_wait(struct mutex_waiter *waiter,
+			 struct task_struct *owner, long state)
+{
+	for (;;) {

kernel/mutex.c void __sched mutex_unlock(struct mutex * · line 138

Quoted 10 lines
kernel/mutex.c +10 -0
+		if (signal_pending_state(state, waiter->task))
+			return 0;
+		if (waiter->lock->owner != owner)
+			return 0;
+		if (!task_is_current(owner))
+			return 1;
+		cpu_relax();
+	}
+}
+#else

Linus, what do you think about this particular approach of spin-mutexes? It's not the typical spin-mutex i think.

Quoted 5 lines

The thing i like most about Peter's patch (compared to most other adaptive spinning approaches i've seen, which all sucked as they included various ugly heuristics complicating the whole thing) is that it solves the "how long should we spin" question elegantly: we spin until the owner runs on a CPU.

s/until/as long as/

Quoted 7 lines

So on shortly held locks we degenerate to spinlock behavior, and only long-held blocking locks [with little CPU time spent while holding the lock - say we wait for IO] we degenerate to classic mutex behavior.

There's no time or spin-rate based heuristics in this at all (i.e. these mutexes are not 'adaptive' at all!), and it degenerates to our primary and well-known locking behavior in the important boundary situations.

Well, it adapts to the situation, choosing between spinning vs blocking. But what's in a name ;-)

Quoted 5 lines

A couple of other properties i like about it:

- A spinlock user can be changed to a mutex with no runtime impact. (no increase in scheduling) This might enable us to convert/standardize some of the uglier locking constructs within ext2/3/4?

I think a lot of stuff there is bit (spin) locks.

Quoted 2 lines

It's hard to tell how it would impact inbetween workloads - i guess it needs to be measured on a couple of workloads.

Matthew volunteered to run something IIRC.

#44 lore raw

Re: [PATCH][RFC]: mutex: adaptive spin

In reply to Ingo Molnar
Quoted 2 lines · Ingo Molnar

There's no time or spin-rate based heuristics in this at all (i.e. these mutexes are not 'adaptive' at all!),

FYI: The original "adaptive" name was chosen in the -rt implementation to reflect that the locks can adaptively spin or sleep, depending on conditions. I realize this is in contrast to the typical usage of the term when it is in reference to the spin-time being based on some empirical heuristics, etc as you mentioned. Sorry for the confusion.

Regards,
-Greg

#45 lore raw

Re: [PATCH][RFC]: mutex: adaptive spin

Quoted 9 lines · Gregory Haskins
Quoted 2 lines · Ingo Molnar

There's no time or spin-rate based heuristics in this at all (i.e. these mutexes are not 'adaptive' at all!),

FYI: The original "adaptive" name was chosen in the -rt implementation to reflect that the locks can adaptively spin or sleep, depending on conditions. I realize this is in contrast to the typical usage of the term when it is in reference to the spin-time being based on some empirical heuristics, etc as you mentioned. Sorry for the confusion.

the current version of the -rt spinny-mutexes bits were mostly written by Steve, right? Historically it all started out with a more classic "adaptive mutexes" patchset so the name stuck i guess.

Ingo

maintainer
#46 lore raw

Re: [PATCH][RFC]: mutex: adaptive spin

Quoted 12 lines · Ingo Molnar
Quoted 9 lines · Gregory Haskins
Quoted 2 lines · Ingo Molnar

There's no time or spin-rate based heuristics in this at all (i.e. these mutexes are not 'adaptive' at all!),

FYI: The original "adaptive" name was chosen in the -rt implementation to reflect that the locks can adaptively spin or sleep, depending on conditions. I realize this is in contrast to the typical usage of the term when it is in reference to the spin-time being based on some empirical heuristics, etc as you mentioned. Sorry for the confusion.

Quoted 3 lines

the current version of the -rt spinny-mutexes bits were mostly written by Steve, right? Historically it all started out with a more classic "adaptive mutexes" patchset so the name stuck i guess.

Yeah, Gregory and co. started with the whole thing and showed there was significant performance to be gained, after that Steve rewrote it from scratch reducing it to this minimalist heuristic, with help from Greg.

(At least, that is how I remember it, please speak up if I got things wrong)

#345 lore raw

Re: [PATCH][RFC]: mutex: adaptive spin

In reply to Peter Zijlstra
Quoted 5 lines · Peter Zijlstra

Subject: mutex: adaptive spin
From: Peter Zijlstra <[email protected]>
Date: Tue Jan 06 12:32:12 CET 2009

Based on the code in -rt, provide adaptive spins on generic mutexes.

I guess it would be nice to add another type so you can test/convert callsites individually. I've got no objections to improving synchronisation primitives, but I would be interested to see good results from some mutex that can't be achieved by improving the locking (by improving I don't mean inventing some crazy lockless algorithm, but simply making it reasonably sane and scalable).

Good area to investigate though, I think.

Quoted 248 lines
---
 include/linux/mutex.h |    4 ++--
 include/linux/sched.h |    1 +
 kernel/mutex-debug.c  |   11 ++---------
 kernel/mutex-debug.h  |    8 --------
 kernel/mutex.c        |   46 +++++++++++++++++++++++++++++++++++++++-------
 kernel/mutex.h        |    2 --
 kernel/sched.c        |    5 +++++
 7 files changed, 49 insertions(+), 28 deletions(-)

Index: linux-2.6/include/linux/mutex.h
===================================================================

include/linux/mutex.h +2 -2
@@ -50,8 +50,8 @@ struct mutex {
 	atomic_t		count;
 	spinlock_t		wait_lock;
 	struct list_head	wait_list;
+	struct task_struct	*owner;
 #ifdef CONFIG_DEBUG_MUTEXES
-	struct thread_info	*owner;
 	const char 		*name;
 	void			*magic;
 #endif
@@ -67,8 +67,8 @@ struct mutex {
 struct mutex_waiter {
 	struct list_head	list;
 	struct task_struct	*task;
-#ifdef CONFIG_DEBUG_MUTEXES
 	struct mutex		*lock;
+#ifdef CONFIG_DEBUG_MUTEXES
 	void			*magic;
 #endif
 };

Index: linux-2.6/include/linux/sched.h
===================================================================

include/linux/sched.h +1 -0
@@ -249,6 +249,7 @@ extern void init_idle(struct task_struct
 extern void init_idle_bootup_task(struct task_struct *idle);
 
 extern int runqueue_is_locked(void);
+extern int task_is_current(struct task_struct *p);
 extern void task_rq_unlock_wait(struct task_struct *p);
 
 extern cpumask_var_t nohz_cpu_mask;

Index: linux-2.6/kernel/mutex-debug.c
===================================================================

kernel/mutex-debug.c +2 -9
@@ -26,11 +26,6 @@
 /*
  * Must be called with lock->wait_lock held.
  */
-void debug_mutex_set_owner(struct mutex *lock, struct thread_info *new_owner)
-{
-	lock->owner = new_owner;
-}
-
 void debug_mutex_lock_common(struct mutex *lock, struct mutex_waiter *waiter)
 {
 	memset(waiter, MUTEX_DEBUG_INIT, sizeof(*waiter));
@@ -59,7 +54,6 @@ void debug_mutex_add_waiter(struct mutex
 
 	/* Mark the current thread as blocked on the lock: */
 	ti->task->blocked_on = waiter;
-	waiter->lock = lock;
 }
 
 void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
@@ -80,9 +74,9 @@ void debug_mutex_unlock(struct mutex *lo
 		return;
 
 	DEBUG_LOCKS_WARN_ON(lock->magic != lock);
-	DEBUG_LOCKS_WARN_ON(lock->owner != current_thread_info());
+	DEBUG_LOCKS_WARN_ON(lock->owner != current);
 	DEBUG_LOCKS_WARN_ON(!lock->wait_list.prev && !lock->wait_list.next);
-	DEBUG_LOCKS_WARN_ON(lock->owner != current_thread_info());
+	DEBUG_LOCKS_WARN_ON(lock->owner != current);
 }
 
 void debug_mutex_init(struct mutex *lock, const char *name,
@@ -95,7 +89,6 @@ void debug_mutex_init(struct mutex *lock
 	debug_check_no_locks_freed((void *)lock, sizeof(*lock));
 	lockdep_init_map(&lock->dep_map, name, key, 0);
 #endif
-	lock->owner = NULL;
 	lock->magic = lock;
 }
 

Index: linux-2.6/kernel/mutex-debug.h
===================================================================

kernel/mutex-debug.h +0 -8
@@ -13,14 +13,6 @@
 /*
  * This must be called with lock->wait_lock held.
  */
-extern void
-debug_mutex_set_owner(struct mutex *lock, struct thread_info *new_owner);
-
-static inline void debug_mutex_clear_owner(struct mutex *lock)
-{
-	lock->owner = NULL;
-}
-
 extern void debug_mutex_lock_common(struct mutex *lock,
 				    struct mutex_waiter *waiter);
 extern void debug_mutex_wake_waiter(struct mutex *lock,

Index: linux-2.6/kernel/mutex.c
===================================================================

kernel/mutex.c +39 -7
@@ -46,6 +46,7 @@ __mutex_init(struct mutex *lock, const c
 	atomic_set(&lock->count, 1);
 	spin_lock_init(&lock->wait_lock);
 	INIT_LIST_HEAD(&lock->wait_list);
+	lock->owner = NULL;
 
 	debug_mutex_init(lock, name, key);
 }
@@ -120,6 +121,28 @@ void __sched mutex_unlock(struct mutex *
 
 EXPORT_SYMBOL(mutex_unlock);
 
+#ifdef CONFIG_SMP
+static int adaptive_wait(struct mutex_waiter *waiter,
+			 struct task_struct *owner, long state)
+{
+	for (;;) {
+		if (signal_pending_state(state, waiter->task))
+			return 0;
+		if (waiter->lock->owner != owner)
+			return 0;
+		if (!task_is_current(owner))
+			return 1;
+		cpu_relax();
+	}
+}
+#else
+static int adaptive_wait(struct mutex_waiter *waiter,
+			 struct task_struct *owner, long state)
+{
+	return 1;
+}
+#endif
+
 /*
  * Lock a mutex (possibly interruptible), slowpath:
  */
@@ -127,7 +150,7 @@ static inline int __sched
 __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
 	       	unsigned long ip)
 {
-	struct task_struct *task = current;
+	struct task_struct *owner, *task = current;
 	struct mutex_waiter waiter;
 	unsigned int old_val;
 	unsigned long flags;
@@ -141,6 +164,7 @@ __mutex_lock_common(struct mutex *lock, 
 	/* add waiting tasks to the end of the waitqueue (FIFO): */
 	list_add_tail(&waiter.list, &lock->wait_list);
 	waiter.task = task;
+	waiter.lock = lock;
 
 	old_val = atomic_xchg(&lock->count, -1);
 	if (old_val == 1)
@@ -175,11 +199,19 @@ __mutex_lock_common(struct mutex *lock, 
 			debug_mutex_free_waiter(&waiter);
 			return -EINTR;
 		}
-		__set_task_state(task, state);
 
-		/* didnt get the lock, go to sleep: */
+		owner = lock->owner;
+		get_task_struct(owner);
 		spin_unlock_mutex(&lock->wait_lock, flags);
-		schedule();
+
+		if (adaptive_wait(&waiter, owner, state)) {
+			put_task_struct(owner);
+			__set_task_state(task, state);
+			/* didnt get the lock, go to sleep: */
+			schedule();
+		} else
+			put_task_struct(owner);
+
 		spin_lock_mutex(&lock->wait_lock, flags);
 	}
 
@@ -187,7 +219,7 @@ done:
 	lock_acquired(&lock->dep_map, ip);
 	/* got the lock - rejoice! */
 	mutex_remove_waiter(lock, &waiter, task_thread_info(task));
-	debug_mutex_set_owner(lock, task_thread_info(task));
+	lock->owner = task;
 
 	/* set it to 0 if there are no waiters left: */
 	if (likely(list_empty(&lock->wait_list)))
@@ -260,7 +292,7 @@ __mutex_unlock_common_slowpath(atomic_t 
 		wake_up_process(waiter->task);
 	}
 
-	debug_mutex_clear_owner(lock);
+	lock->owner = NULL;
 
 	spin_unlock_mutex(&lock->wait_lock, flags);
 }
@@ -352,7 +384,7 @@ static inline int __mutex_trylock_slowpa
 
 	prev = atomic_xchg(&lock->count, -1);
 	if (likely(prev == 1)) {
-		debug_mutex_set_owner(lock, current_thread_info());
+		lock->owner = current;
 		mutex_acquire(&lock->dep_map, 0, 1, _RET_IP_);
 	}
 	/* Set it back to 0 if there are no waiters: */

Index: linux-2.6/kernel/sched.c
===================================================================

kernel/sched.c +5 -0
@@ -697,6 +697,11 @@ int runqueue_is_locked(void)
 	return ret;
 }
 
+int task_is_current(struct task_struct *p)
+{
+	return task_rq(p)->curr == p;
+}
+
 /*
  * Debugging: various feature bits
  */

Index: linux-2.6/kernel/mutex.h
===================================================================

kernel/mutex.h +0 -2
@@ -16,8 +16,6 @@
 #define mutex_remove_waiter(lock, waiter, ti) \
 		__list_del((waiter)->list.prev, (waiter)->list.next)
 
-#define debug_mutex_set_owner(lock, new_owner)		do { } while (0)
-#define debug_mutex_clear_owner(lock)			do { } while (0)
 #define debug_mutex_wake_waiter(lock, waiter)		do { } while (0)
 #define debug_mutex_free_waiter(waiter)			do { } while (0)
 #define debug_mutex_add_waiter(lock, waiter, ti)	do { } while (0)
#47 lore raw

Re: [PATCH][RFC]: mutex: adaptive spin

In reply to Peter Zijlstra
Quoted 21 lines · Peter Zijlstra
Quoted 14 lines · Ingo Molnar
Quoted 11 lines · Gregory Haskins
Quoted 3 lines · Ingo Molnar

There's no time or spin-rate based heuristics in this at all (i.e. these mutexes are not 'adaptive' at all!),

FYI: The original "adaptive" name was chosen in the -rt implementation to reflect that the locks can adaptively spin or sleep, depending on conditions. I realize this is in contrast to the typical usage of the term when it is in reference to the spin-time being based on some empirical heuristics, etc as you mentioned. Sorry for the confusion.

Quoted 4 lines

the current version of the -rt spinny-mutexes bits were mostly written by Steve, right? Historically it all started out with a more classic "adaptive mutexes" patchset so the name stuck i guess.

Quoted 7 lines

Yeah, Gregory and co. started with the whole thing and showed there was significant performance to be gained, after that Steve rewrote it from scratch reducing it to this minimalist heuristic, with help from Greg.

(At least, that is how I remember it, please speak up if I got things wrong)

Thats pretty accurate IIUC. The concept and original patches were written by myself, Peter Morreale and Sven Dietrich (cc'd). However, Steve cleaned up our patch before accepting it into -rt (we had extra provisions for things like handling conditional compilation and run-time disablement which he did not care for), but its otherwise the precise core concept we introduced. I think Steven gave a nice attribution to that fact in the prologue, however. And I also ACKed his cleanup, so I think all is well from my perspective.

As a historical note: It should be mentioned that Steven also introduced a really brilliant optimization to use RCU for the owner tracking that the original patch as submitted by my team did not have. However, it turned out to inadvertently regress performance due to the way preempt-rcu's rcu_read_lock() works so it had to be reverted a few weeks later to the original logic that we submitted (even though on paper his ideas in that area were superior to ours). So whats in -rt now really is more or less our patch sans the conditional crap, etc.

Hope that helps!

-Greg

#43 lore raw

Re: [PATCH][RFC]: mutex: adaptive spin

In reply to Peter Zijlstra
Quoted 4 lines · Peter Zijlstra
Quoted 2 lines

It's hard to tell how it would impact inbetween workloads - i guess it needs to be measured on a couple of workloads.

Matthew volunteered to run something IIRC.

I've sent it off to two different teams at Intel for benchmarking. One is a database load, and one is a mixed load.

Signature · 4 lines
Matthew Wilcox				Intel Open Source Technology Centre
"Bill, look, we understand that you're interested in selling us this
operating system, but compare it to ours.  We can't possibly take such
a retrograde step."
#334 lore raw

Re: [PATCH][RFC]: mutex: adaptive spin

In reply to Ingo Molnar
Quoted 6 lines · Ingo Molnar

The thing i like most about Peter's patch (compared to most other adaptive spinning approaches i've seen, which all sucked as they included various ugly heuristics complicating the whole thing) is that it solves the "how long should we spin" question elegantly: we spin until the owner runs on a CPU.

The other way around, you mean: we spin until the owner is no longer holding a cpu.

I agree that it's better than the normal "spin for some random time" model, but I can't say I like the "return 0" cases where it just retries the whole loop if the semaphore was gotten by somebody else instead. Sounds like an easyish live-lock to me.

I also still strongly suspect that whatever lock actually needs this, should be seriously re-thought.

But apart from the "return 0" craziness I at least dont' _hate_ this patch. Do we have numbers? Do we know which locks this matters on?

Linus

#335 lore raw

Re: [PATCH][RFC]: mutex: adaptive spin

Quoted 3 lines · Linus Torvalds

The other way around, you mean: we spin until the owner is no longer holding a cpu.

Btw, I hate the name of the helper function for that. "task_is_current()"? "current" means something totally different in the linux kernel: it means that the task is _this_ task.

So the only sensible implementation of "task_is_current(task)" is to just make it return "task == current", but that's obviously not what the function wants to do.

So it should be renamed. Something like "task_is_oncpu()" or whatever.

I realize that the scheduler internally has that whole "rq->curr" thing, but that's an internal scheduler thing, and should not be confused with the overall kernel model of "current".

Linus

#343 lore raw

Re: [PATCH][RFC]: mutex: adaptive spin

In reply to Linus Torvalds
Quoted 17 lines · Linus Torvalds
Quoted 6 lines · Ingo Molnar

The thing i like most about Peter's patch (compared to most other adaptive spinning approaches i've seen, which all sucked as they included various ugly heuristics complicating the whole thing) is that it solves the "how long should we spin" question elegantly: we spin until the owner runs on a CPU.

The other way around, you mean: we spin until the owner is no longer holding a cpu.

I agree that it's better than the normal "spin for some random time" model, but I can't say I like the "return 0" cases where it just retries the whole loop if the semaphore was gotten by somebody else instead. Sounds like an easyish live-lock to me.

Quoted 5 lines

I also still strongly suspect that whatever lock actually needs this, should be seriously re-thought.

But apart from the "return 0" craziness I at least dont' _hate_ this patch. Do we have numbers? Do we know which locks this matters on?

This discussion was kicked off by an unconditional spin (512 tries) against mutex_trylock in the btrfs tree locking code.

Btrfs is using mutexes to protect the btree blocks, and btree searching often hits hot nodes that are always in cache. For these nodes, the spinning is much faster, but btrfs also needs to be able to sleep with the locks held so it can read from the disk and do other complex operations.

For btrfs, dbench 50 performance doubles with the unconditional spin, mostly because that workload is almost all in ram.

For 50 procs creating 4k files in parallel, the spin is 30-50% faster. This workload is a mixture of disk bound and CPU bound.

Yes, there is definitely some low hanging fruit to tune the btrfs btree searches and locking. But, I think the adaptive model is a good fit for on disk btrees in general.

-chris

#346 lore raw

Re: [PATCH][RFC]: mutex: adaptive spin

In reply to Peter Zijlstra
Quoted 5 lines · Peter Zijlstra

Subject: mutex: adaptive spin
From: Peter Zijlstra <[email protected]>
Date: Tue Jan 06 12:32:12 CET 2009

Based on the code in -rt, provide adaptive spins on generic mutexes.

I already sent Peter details, but the patch has problems without mutex debugging turned on. So it isn't quite ready for benchmarking yet.

-chris

#336 lore raw

Re: [PATCH][RFC]: mutex: adaptive spin

In reply to Linus Torvalds
Quoted 8 lines · Linus Torvalds

Btw, I hate the name of the helper function for that. "task_is_current()"? "current" means something totally different in the linux kernel: it means that the task is _this_ task.

So the only sensible implementation of "task_is_current(task)" is to just make it return "task == current", but that's obviously not what the function wants to do.

Quoted 5 lines

So it should be renamed. Something like "task_is_oncpu()" or whatever.

I realize that the scheduler internally has that whole "rq->curr" thing, but that's an internal scheduler thing, and should not be confused with the overall kernel model of "current".

I totally agree that we should change the name of that. I never thought about the confusion that it would cause to someone that is not working so heavy on the scheduler. Thanks for the perspective.

Sometimes us scheduler guys have our heads too much up the scheduler ass that all we see is scheduler crap ;-)

-- Steve

#337 lore raw

Re: [PATCH][RFC]: mutex: adaptive spin

In reply to Linus Torvalds
Quoted 2 lines · Linus Torvalds

So it should be renamed. Something like "task_is_oncpu()" or whatever.

Another complaint, which is tangentially related in that it actually concerns "current".

Right now, if some process deadlocks on a mutex, we get hung process, but with a nice backtrace and hopefully other things (that don't need that lock) still continue to work.

But if I read it correctly, the adaptive spin code will instead just hang. Exactly because "task_is_current()" will also trigger for that case, and now you get an infinite loop, with the process spinning until it looses its own CPU, which obviously will never happen.

Yes, this is the behavior we get with spinlocks too, and yes, lock debugging will talk about it, but it's a regression. We've historically had a _lot_ more bad deadlocks on mutexes than we have had on spinlocks, exactly because mutexes can be held over much more complex code. So regressing on it and making it less debuggable is bad.

IOW, if we do this, then I think we need a

	BUG_ON(task == owner);

in the waiting slow-path. I realize the test already exists for the DEBUG case, but I think we just want it even for production kernels. Especially since we'd only ever need it in the slow-path.

Linus

#338 lore raw

Re: [PATCH][RFC]: mutex: adaptive spin

Quoted 4 lines · Linus Torvalds

Right now, if some process deadlocks on a mutex, we get hung process, but with a nice backtrace and hopefully other things (that don't need that lock) still continue to work.

Clarification: the "nice backtrace" we only get with something like sysrq-W, of course. We don't get a backtrace _automatically_, but with an otherwise live machine, there's a better chance that people do get wchan or other info. IOW, it's at least a fairly debuggable situation.

Linus

#340 lore raw

Re: [PATCH][RFC]: mutex: adaptive spin

In reply to Linus Torvalds
Quoted 22 lines · Linus Torvalds
Quoted 2 lines · Linus Torvalds

So it should be renamed. Something like "task_is_oncpu()" or whatever.

Another complaint, which is tangentially related in that it actually concerns "current".

Right now, if some process deadlocks on a mutex, we get hung process, but with a nice backtrace and hopefully other things (that don't need that lock) still continue to work.

But if I read it correctly, the adaptive spin code will instead just hang. Exactly because "task_is_current()" will also trigger for that case, and now you get an infinite loop, with the process spinning until it looses its own CPU, which obviously will never happen.

Yes, this is the behavior we get with spinlocks too, and yes, lock debugging will talk about it, but it's a regression. We've historically had a _lot_ more bad deadlocks on mutexes than we have had on spinlocks, exactly because mutexes can be held over much more complex code. So regressing on it and making it less debuggable is bad.

Quoted 7 lines

IOW, if we do this, then I think we need a

	BUG_ON(task == owner);

in the waiting slow-path. I realize the test already exists for the DEBUG case, but I think we just want it even for production kernels. Especially since we'd only ever need it in the slow-path.

yeah, sounds good.

One thought:

BUG_ON()'s do_exit() shows a slightly misleading failure pattern to users:
instead of a 'hanging' task, we'd get a misbehaving app due to one of its tasks exiting spuriously. It can even go completely unnoticed [users dont look at kernel logs normally] - while a hanging task generally does get noticed. (because there's no progress in processing)

So instead of the BUG_ON() we could emit a WARN_ONCE() perhaps, plus not do any spinning and just block - resulting in an uninterruptible task (that the user will probably notice) and a scary message in the syslog? [all in the slowpath]

So in this case WARN_ONCE() is both more passive (it does not run do_exit()), and shows the more intuitive failure pattern to users. No strong feelings though.

Ingo

#341 lore raw

Re: [PATCH][RFC]: mutex: adaptive spin

Quoted 8 lines · Ingo Molnar

One thought:

BUG_ON()'s do_exit() shows a slightly misleading failure pattern to
users: instead of a 'hanging' task, we'd get a misbehaving app due to one of its tasks exiting spuriously. It can even go completely unnoticed [users dont look at kernel logs normally] - while a hanging task generally does get noticed. (because there's no progress in processing)

Quoted 4 lines

So instead of the BUG_ON() we could emit a WARN_ONCE() perhaps, plus not do any spinning and just block - resulting in an uninterruptible task (that the user will probably notice) and a scary message in the syslog? [all in the slowpath]

And we'd strictly do an uninterruptible sleep here, unconditionally: even if this is within mutex_lock_interruptible() - we dont want a Ctrl-C or a SIGKILL to allow to 'break out' the app from the deadlock.

Ingo

#342 lore raw

Re: [PATCH][RFC]: mutex: adaptive spin

In reply to Ingo Molnar
Quoted 5 lines · Ingo Molnar

So instead of the BUG_ON() we could emit a WARN_ONCE() perhaps, plus not do any spinning and just block - resulting in an uninterruptible task (that the user will probably notice) and a scary message in the syslog? [all in the slowpath]

Sure. You could put it in the adaptive function thing, with something like

	if (WARN_ONCE(waiter == owner))
		return 1;

which should fall back on the old behavior and do the one-time warning.

Linus

#339 lore raw

Re: [PATCH][RFC]: mutex: adaptive spin

In reply to Linus Torvalds
Quoted 10 lines · Linus Torvalds
Quoted 4 lines · Linus Torvalds

Right now, if some process deadlocks on a mutex, we get hung process, but with a nice backtrace and hopefully other things (that don't need that lock) still continue to work.

Clarification: the "nice backtrace" we only get with something like sysrq-W, of course. We don't get a backtrace _automatically_, but with an otherwise live machine, there's a better chance that people do get wchan or other info. IOW, it's at least a fairly debuggable situation.

btw., the softlockup watchdog detects non-progressing uninterruptible tasks (regardless of whether they locked up due to mutexes or any other reason).

This does occasionally help in debugging deadlocks:

http://marc.info/?l=linux-mm&m=122889587725061&w=2

but it would indeed be also good to have the most common self-deadlock case checked unconditionally in the mutex slowpath.

Ingo

#347 lore raw

Re: [PATCH][RFC]: mutex: adaptive spin

In reply to Peter Zijlstra
Quoted 6 lines · On Tue, 06 Jan 2009 12:40:31 +0100 Peter Zijlstra <[email protected]> wrote:

Subject: mutex: adaptive spin
From: Peter Zijlstra <[email protected]>
Date: Tue Jan 06 12:32:12 CET 2009

Based on the code in -rt, provide adaptive spins on generic mutexes.

How dumb is it to send a lump of uncommented, changelogged code as an rfc, only to have Ingo reply, providing the changelog for you?

Sigh.

Quoted 18 lines
kernel/mutex.c +5 -0
@@ -46,6 +46,7 @@ __mutex_init(struct mutex *lock, const c
 	atomic_set(&lock->count, 1);
 	spin_lock_init(&lock->wait_lock);
 	INIT_LIST_HEAD(&lock->wait_list);
+	lock->owner = NULL;
 
 	debug_mutex_init(lock, name, key);
 }
@@ -120,6 +121,28 @@ void __sched mutex_unlock(struct mutex *
 
 EXPORT_SYMBOL(mutex_unlock);
 
+#ifdef CONFIG_SMP
+static int adaptive_wait(struct mutex_waiter *waiter,
+			 struct task_struct *owner, long state)
+{

kernel/mutex.c void __sched mutex_unlock(struct mutex * · line 137

Quoted 10 lines
kernel/mutex.c +10 -0
+	for (;;) {
+		if (signal_pending_state(state, waiter->task))
+			return 0;
+		if (waiter->lock->owner != owner)
+			return 0;
+		if (!task_is_current(owner))
+			return 1;
+		cpu_relax();
+	}
+}

Each of the tests in this function should be carefully commented. It's really the core piece of the design.

Quoted 29 lines
kernel/mutex.c +10 -1
+#else
+static int adaptive_wait(struct mutex_waiter *waiter,
+			 struct task_struct *owner, long state)
+{
+	return 1;
+}
+#endif
+
 /*
  * Lock a mutex (possibly interruptible), slowpath:
  */
@@ -127,7 +150,7 @@ static inline int __sched
 __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
 	       	unsigned long ip)
 {
-	struct task_struct *task = current;
+	struct task_struct *owner, *task = current;
 	struct mutex_waiter waiter;
 	unsigned int old_val;
 	unsigned long flags;
@@ -141,6 +164,7 @@ __mutex_lock_common(struct mutex *lock, 
 	/* add waiting tasks to the end of the waitqueue (FIFO): */
 	list_add_tail(&waiter.list, &lock->wait_list);
 	waiter.task = task;
+	waiter.lock = lock;
 
 	old_val = atomic_xchg(&lock->count, -1);
 	if (old_val == 1)

kernel/mutex.c __mutex_lock_common(struct mutex *lock, · line 203

Quoted 7 lines
kernel/mutex.c +1 -2
@@ -175,11 +199,19 @@ __mutex_lock_common(struct mutex *lock, 
 			debug_mutex_free_waiter(&waiter);
 			return -EINTR;
 		}
-		__set_task_state(task, state);
 
-		/* didnt get the lock, go to sleep: */
+		owner = lock->owner;

What prevents *owner from exitting right here?

Quoted 47 lines
kernel/mutex.c +13 -4
+		get_task_struct(owner);
 		spin_unlock_mutex(&lock->wait_lock, flags);
-		schedule();
+
+		if (adaptive_wait(&waiter, owner, state)) {
+			put_task_struct(owner);
+			__set_task_state(task, state);
+			/* didnt get the lock, go to sleep: */
+			schedule();
+		} else
+			put_task_struct(owner);
+
 		spin_lock_mutex(&lock->wait_lock, flags);
 	}
 
@@ -187,7 +219,7 @@ done:
 	lock_acquired(&lock->dep_map, ip);
 	/* got the lock - rejoice! */
 	mutex_remove_waiter(lock, &waiter, task_thread_info(task));
-	debug_mutex_set_owner(lock, task_thread_info(task));
+	lock->owner = task;
 
 	/* set it to 0 if there are no waiters left: */
 	if (likely(list_empty(&lock->wait_list)))
@@ -260,7 +292,7 @@ __mutex_unlock_common_slowpath(atomic_t 
 		wake_up_process(waiter->task);
 	}
 
-	debug_mutex_clear_owner(lock);
+	lock->owner = NULL;
 
 	spin_unlock_mutex(&lock->wait_lock, flags);
 }
@@ -352,7 +384,7 @@ static inline int __mutex_trylock_slowpa
 
 	prev = atomic_xchg(&lock->count, -1);
 	if (likely(prev == 1)) {
-		debug_mutex_set_owner(lock, current_thread_info());
+		lock->owner = current;
 		mutex_acquire(&lock->dep_map, 0, 1, _RET_IP_);
 	}
 	/* Set it back to 0 if there are no waiters: */

Index: linux-2.6/kernel/sched.c
===================================================================

kernel/sched.c int runqueue_is_locked(void) · line 703

Quoted 7 lines
kernel/sched.c +4 -0
@@ -697,6 +697,11 @@ int runqueue_is_locked(void)
 	return ret;
 }
 
+int task_is_current(struct task_struct *p)
+{
+	return task_rq(p)->curr == p;
+}

Please don't add kernel-wide infrastructure and leave it completely undocumented. Particularly functions which are as vague and dangerous as this one.

What locking must the caller provide? What are the semantics of the return value?

What must the caller do to avoid oopses if *p is concurrently exiting?

etc.

The overall design intent seems very smart to me, as long as the races can be plugged, if they're indeed present.

#14 lore raw

Re: generic pagecache to block mapping layer (was Re: Btrfs for mainline)

In reply to Nick Piggin
Quoted 6 lines · On Tuesday 06 January 2009 04:10:42 Nick Piggin wrote:
Quoted 2 lines · On Tuesday 06 January 2009 03:37:33 Chris Mason wrote:

So, long term we can have a benchmarking contest, but I've got a little ways to go before that is a good idea.

That would be good.

This got me motivated to rebase fsblock to current again. I finally switched it to create a private inode for the metadata linear mapping, which makes it incredibly cleaner (doesn't require the new page flag, lives much more happily beside buffer_heads etc).

Another big thing I did a few months back is to add a ->data pointer to metadata fsblocks (like bh->b_data), which makes a quick fsblock conversion much more trivial (although it wouldn't support super-page blocks without further work).

I'd also converted XFS to fsblock, which involved adding support for delalloc and unwritten blocks. Although that has a couple of unfinished bits, it works pretty well and helps prove fsblock working with an advanced filesystem.

Given these points (particularly the first one), I'm going to try to find time in the next few months to work on fsblock with a view to submitting it.

#348 lore raw

Re: [PATCH][RFC]: mutex: adaptive spin

In reply to Andrew Morton
Quoted 11 lines · Andrew Morton
Quoted 6 lines · On Tue, 06 Jan 2009 12:40:31 +0100 Peter Zijlstra <[email protected]> wrote:

Subject: mutex: adaptive spin
From: Peter Zijlstra <[email protected]>
Date: Tue Jan 06 12:32:12 CET 2009

Based on the code in -rt, provide adaptive spins on generic mutexes.

How dumb is it to send a lump of uncommented, changelogged code as an rfc, only to have Ingo reply, providing the changelog for you?

Sounds smart to me. He was able to get someone else to do the work. ;-)

Quoted 26 lines

Sigh.

Quoted 23 lines
kernel/mutex.c +10 -0
@@ -46,6 +46,7 @@ __mutex_init(struct mutex *lock, const c
 	atomic_set(&lock->count, 1);
 	spin_lock_init(&lock->wait_lock);
 	INIT_LIST_HEAD(&lock->wait_list);
+	lock->owner = NULL;
 
 	debug_mutex_init(lock, name, key);
 }
@@ -120,6 +121,28 @@ void __sched mutex_unlock(struct mutex *
 
 EXPORT_SYMBOL(mutex_unlock);
 
+#ifdef CONFIG_SMP
+static int adaptive_wait(struct mutex_waiter *waiter,
+			 struct task_struct *owner, long state)
+{
+	for (;;) {
+		if (signal_pending_state(state, waiter->task))
+			return 0;
+		if (waiter->lock->owner != owner)
+			return 0;
Quoted 8 lines

kernel/mutex.c void __sched mutex_unlock(struct mutex * · line 137

Quoted 5 lines
kernel/mutex.c +5 -0
+		if (!task_is_current(owner))
+			return 1;
+		cpu_relax();
+	}
+}

Each of the tests in this function should be carefully commented. It's really the core piece of the design.

Yep, I agree here too.

Quoted 35 lines
Quoted 35 lines
kernel/mutex.c +10 -2
+#else
+static int adaptive_wait(struct mutex_waiter *waiter,
+			 struct task_struct *owner, long state)
+{
+	return 1;
+}
+#endif
+
 /*
  * Lock a mutex (possibly interruptible), slowpath:
  */
@@ -127,7 +150,7 @@ static inline int __sched
 __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
 	       	unsigned long ip)
 {
-	struct task_struct *task = current;
+	struct task_struct *owner, *task = current;
 	struct mutex_waiter waiter;
 	unsigned int old_val;
 	unsigned long flags;
@@ -141,6 +164,7 @@ __mutex_lock_common(struct mutex *lock, 
 	/* add waiting tasks to the end of the waitqueue (FIFO): */
 	list_add_tail(&waiter.list, &lock->wait_list);
 	waiter.task = task;
+	waiter.lock = lock;
 
 	old_val = atomic_xchg(&lock->count, -1);
 	if (old_val == 1)
@@ -175,11 +199,19 @@ __mutex_lock_common(struct mutex *lock, 
 			debug_mutex_free_waiter(&waiter);
 			return -EINTR;
 		}
-		__set_task_state(task, state);
 
Quoted 4 lines

kernel/mutex.c __mutex_lock_common(struct mutex *lock, · line 203

Quoted 2 lines
kernel/mutex.c +1 -1
-		/* didnt get the lock, go to sleep: */
+		owner = lock->owner;

What prevents *owner from exitting right here?

Yeah, this should be commented. Why this is not a race is because the owner has the mutex here, and we have the lock->wait_lock. When the owner releases the mutex it must go into the slow unlock path and grab the lock->wait_lock spinlock. Thus it will block and not go away.

Of course if there's a bug elsewhere in the kernel that lets the task exit without releasing the mutex, this will fail. But in that case, there's bigger problems that need to be fixed.

Quoted 3 lines

kernel/mutex.c __mutex_lock_common(struct mutex *lock, · line 205

Quoted 3 lines
kernel/mutex.c +1 -0
+		get_task_struct(owner);
 		spin_unlock_mutex(&lock->wait_lock, flags);

Here, we get the owner before releasing the wait_lock.

Quoted 60 lines
Quoted 45 lines
kernel/mutex.c +12 -4
-		schedule();
+
+		if (adaptive_wait(&waiter, owner, state)) {
+			put_task_struct(owner);
+			__set_task_state(task, state);
+			/* didnt get the lock, go to sleep: */
+			schedule();
+		} else
+			put_task_struct(owner);
+
 		spin_lock_mutex(&lock->wait_lock, flags);
 	}
 
@@ -187,7 +219,7 @@ done:
 	lock_acquired(&lock->dep_map, ip);
 	/* got the lock - rejoice! */
 	mutex_remove_waiter(lock, &waiter, task_thread_info(task));
-	debug_mutex_set_owner(lock, task_thread_info(task));
+	lock->owner = task;
 
 	/* set it to 0 if there are no waiters left: */
 	if (likely(list_empty(&lock->wait_list)))
@@ -260,7 +292,7 @@ __mutex_unlock_common_slowpath(atomic_t 
 		wake_up_process(waiter->task);
 	}
 
-	debug_mutex_clear_owner(lock);
+	lock->owner = NULL;
 
 	spin_unlock_mutex(&lock->wait_lock, flags);
 }
@@ -352,7 +384,7 @@ static inline int __mutex_trylock_slowpa
 
 	prev = atomic_xchg(&lock->count, -1);
 	if (likely(prev == 1)) {
-		debug_mutex_set_owner(lock, current_thread_info());
+		lock->owner = current;
 		mutex_acquire(&lock->dep_map, 0, 1, _RET_IP_);
 	}
 	/* Set it back to 0 if there are no waiters: */

Index: linux-2.6/kernel/sched.c
===================================================================

kernel/sched.c int runqueue_is_locked(void) · line 703

Quoted 7 lines
kernel/sched.c +4 -0
@@ -697,6 +697,11 @@ int runqueue_is_locked(void)
 	return ret;
 }
 
+int task_is_current(struct task_struct *p)
+{
+	return task_rq(p)->curr == p;
+}

Please don't add kernel-wide infrastructure and leave it completely undocumented. Particularly functions which are as vague and dangerous as this one.

What locking must the caller provide? What are the semantics of the return value?

Quoted 7 lines

What must the caller do to avoid oopses if *p is concurrently exiting?

etc.

The overall design intent seems very smart to me, as long as the races can be plugged, if they're indeed present.

Thanks for the complement on the design. It came about lots of work by many people in the -rt tree. What we need here is to comment the code for those that did not see the evolution of the changes that were made.

-- Steve

#349 lore raw

Re: [PATCH][RFC]: mutex: adaptive spin

In reply to Peter Zijlstra

Ok, last comment, I promise.

Quoted 11 lines · Peter Zijlstra
kernel/mutex.c +2 -3
@@ -175,11 +199,19 @@ __mutex_lock_common(struct mutex *lock, 
 			debug_mutex_free_waiter(&waiter);
 			return -EINTR;
 		}
-		__set_task_state(task, state);
 
-		/* didnt get the lock, go to sleep: */
+		owner = lock->owner;
+		get_task_struct(owner);
 		spin_unlock_mutex(&lock->wait_lock, flags);
-		schedule();

kernel/mutex.c __mutex_lock_common(struct mutex *lock, · line 215

Quoted 10 lines
kernel/mutex.c +9 -0
+
+		if (adaptive_wait(&waiter, owner, state)) {
+			put_task_struct(owner);
+			__set_task_state(task, state);
+			/* didnt get the lock, go to sleep: */
+			schedule();
+		} else
+			put_task_struct(owner);
+
 		spin_lock_mutex(&lock->wait_lock, flags);

So I really dislike the whole get_task_struct/put_task_struct thing. It seems very annoying. And as far as I can tell, it's there _only_ to protect "task->rq" and nothing else (ie to make sure that the task doesn't exit and get freed and the pointer now points to la-la-land).

Wouldn't it be much nicer to just cache the rq pointer (take it while still holding the spinlock), and then pass it in to adaptive_wait()?

Then, adaptive_wait() can just do

	if (lock->owner != owner)
		return 0;

	if (rq->task != owner)
		return 1;

Sure - the owner may have rescheduled to another CPU, but if it did that, then we really might as well sleep. So we really don't need to dereference that (possibly stale) owner task_struct at all - because we don't care. All we care about is whether the owner is still busy on that other CPU that it was on.

Hmm? So it looks to me that we don't really need that annoying "try to protect the task pointer" crud. We can do the sufficient (and limited) sanity checking without the task even existing, as long as we originally load the ->rq pointer at a point where it was stable (ie inside the spinlock, when we know that the task must be still alive since it owns the lock).

Linus

#350 lore raw

Re: [PATCH][RFC]: mutex: adaptive spin

Quoted 22 lines · Linus Torvalds

Ok, last comment, I promise.

Quoted 18 lines · Peter Zijlstra
kernel/mutex.c +9 -3
@@ -175,11 +199,19 @@ __mutex_lock_common(struct mutex *lock, 
 			debug_mutex_free_waiter(&waiter);
 			return -EINTR;
 		}
-		__set_task_state(task, state);
 
-		/* didnt get the lock, go to sleep: */
+		owner = lock->owner;
+		get_task_struct(owner);
 		spin_unlock_mutex(&lock->wait_lock, flags);
-		schedule();
+
+		if (adaptive_wait(&waiter, owner, state)) {
+			put_task_struct(owner);
+			__set_task_state(task, state);
+			/* didnt get the lock, go to sleep: */
+			schedule();
+		} else
Quoted 8 lines

kernel/mutex.c __mutex_lock_common(struct mutex *lock, · line 215

Quoted 3 lines
kernel/mutex.c +2 -0
+			put_task_struct(owner);
+
 		spin_lock_mutex(&lock->wait_lock, flags);

So I really dislike the whole get_task_struct/put_task_struct thing. It seems very annoying. And as far as I can tell, it's there _only_ to protect "task->rq" and nothing else (ie to make sure that the task doesn't exit and get freed and the pointer now points to la-la-land).

Yeah, that was not one of the things that we liked either. We tried other ways to get around the get_task_struct but, ended up with the get_task_struct in the end anyway.

Quoted 18 lines

Wouldn't it be much nicer to just cache the rq pointer (take it while still holding the spinlock), and then pass it in to adaptive_wait()?

Then, adaptive_wait() can just do

	if (lock->owner != owner)
		return 0;

	if (rq->task != owner)
		return 1;

Sure - the owner may have rescheduled to another CPU, but if it did that, then we really might as well sleep. So we really don't need to dereference that (possibly stale) owner task_struct at all - because we don't care. All we care about is whether the owner is still busy on that other CPU that it was on.

Quoted 6 lines

Hmm? So it looks to me that we don't really need that annoying "try to protect the task pointer" crud. We can do the sufficient (and limited) sanity checking without the task even existing, as long as we originally load the ->rq pointer at a point where it was stable (ie inside the spinlock, when we know that the task must be still alive since it owns the lock).

Caching the rq is an interesting idea. But since the rq struct is local to sched.c, what would be a good API to do this?

in mutex.c:

	void *rq;

	[...]

	rq = get_task_rq(owner);
	spin_unlock(&lock->wait_lock);

	[...]

	if (!task_running_on_rq(rq, owner))

in sched.c:

	void *get_task_rq(struct task_struct *p)
	{
		return task_rq(p);
	}

	int task_running_on_rq(void *r, struct task_sturct *p)
	{
		struct rq *rq = r;

		return rq->curr == p;
	}

??

-- Steve

#352 lore raw

Re: [PATCH][RFC]: mutex: adaptive spin

In reply to Linus Torvalds
Quoted 3 lines · Linus Torvalds

Sure - the owner may have rescheduled to another CPU, but if it did that, then we really might as well sleep.

.. or at least re-try the loop.

It might be worth it to move the whole sleeping behavior into that helper function (mutex_spin_or_sleep()), and just make the logic be:

- if we _enter_ the function with the owner not on a runqueue, then we sleep

- otherwise, we spin as long as the owner stays on the same runqueue.

and then we loop over the whole "get mutex spinlock and revalidate it all" after either sleeping or spinning for a while.

That seems much simpler in all respects. And it should simplify the whole patch too, because it literally means that in the main __mutex_lock_common(), the only real difference is

	-             __set_task_state(task, state);
	-             spin_unlock_mutex(&lock->wait_lock, flags);
	-             schedule();

becoming instead

	+		mutex_spin_or_schedule(owner, task, lock, state);

and then all the "spin-or-schedule" logic is in just that one simple routine (that has to look up the rq and drop the lock and re-take it).

The "mutex_spin_or_schedule()" code would literally look something like

	void mutex_spin_or_schedule(owner, task, lock, state)
	{
		struct rq *owner_rq = owner->rq;

		if (owner_rq->curr != owner) {
			__set_task_state(task, state);
			spin_unlock_mutex(&lock->wait_lock, flags);
			schedule();
		} else {
			spin_unlock_mutex(&lock->wait_lock, flags);
			do {
				cpu_relax();
			while (lock->owner == owner &&
				owner_rq->curr == owner);
		}
		spin_lock_mutex(&lock->wait_lock, flags);
	}

or something.

Btw, this also fixes a bug: your patch did

	+                     __set_task_state(task, state);
	+                     /* didnt get the lock, go to sleep: */
	+                     schedule();

for the schedule case without holding the mutex spinlock.

And that seems very buggy and racy indeed: since it doesn't hold the mutex lock, if the old owner releases the mutex at just the right point (yeah, yeah, it requires a scheduling event on another CPU in order to also miss the whole "task_is_current()" logic), the wakeup can get lost, because you set the state to sleeping perhaps _after_ the task just got woken up. So we stay sleeping even though the mutex is clear.

So I'm going to NAK the original patch, and just -require- the cleanup I'm suggesting as also fixing what looks like a bug.

Of course, once I see the actual patch, maybe I'm going to find something _else_ to kwetch about.

Linus

#351 lore raw

Re: [PATCH][RFC]: mutex: adaptive spin

In reply to Steven Rostedt
Quoted 3 lines · Steven Rostedt

Caching the rq is an interesting idea. But since the rq struct is local to sched.c, what would be a good API to do this?

Just move the whole "spin_or_schedule()" into sched.c, and you're all done.

Yeah, that requires having sched.c know a bit about mutex locking rules, but the data structures are already exported in <linux/mutex.h>, and while _normal_ code should never care or know exactly how it is used, I think the scheduler might as well. Mutexes are clearly very much a scheduling entity, so it's not too much of a break with internal knowledge.

Linus

#353 lore raw

Re: [PATCH][RFC]: mutex: adaptive spin

In reply to Linus Torvalds
Quoted 8 lines

Btw, this also fixes a bug: your patch did

	+                     __set_task_state(task, state);
	+                     /* didnt get the lock, go to sleep: */
	+                     schedule();
Quoted 8 lines

for the schedule case without holding the mutex spinlock.

And that seems very buggy and racy indeed: since it doesn't hold the mutex lock, if the old owner releases the mutex at just the right point (yeah, yeah, it requires a scheduling event on another CPU in order to also miss the whole "task_is_current()" logic), the wakeup can get lost, because you set the state to sleeping perhaps _after_ the task just got woken up. So we stay sleeping even though the mutex is clear.

That is indeed a bug.

Peter, why did you need to move __set_task_state down here? The -rt patch does not do this.

-- Steve

#359 lore raw
In reply to Chris Mason

Hello everyone,

Thanks for all of the comments so far. I've pushed out a number of fixes for btrfs mainline, covering most of the comments from this thread.

* All LINUX_KERNEL_VERSION checks are gone.
* checkpatch.pl fixes
* Extra permission checks on the ioctls
* Some important bug fixes from the btrfs list
* Andi found a buggy use of kmap_atomic during checksum verification
* Drop EXPORT_SYMBOLs from extent_io.c

Unresolved from this reviewing thread:

* Should it be named btrfsdev? My vote is no, it is extra work for the distros when we finally do rename it, and I don't think btrfs really has the reputation for stability right now. But if Linus or Andrew would prefer the dev on there, I'll do it.

* My ugly mutex_trylock spin. It's a hefty performance gain so I'm hoping to keep it until there is a generic adaptive lock.

The full kernel tree is here:

http://git.kernel.org/?p=linux/kernel/git/mason/btrfs-unstable.git;a=summary

The standalone tree just has the btrfs files and commits, reviewers may find it easier:

http://git.kernel.org/?p=linux/kernel/git/mason/btrfs-unstable-standalone.git;a=summary

The utilities can be found here:

http://git.kernel.org/?p=linux/kernel/git/mason/btrfs-progs-unstable.git;a=summary

-chris

#48 lore raw

Re: [PATCH][RFC]: mutex: adaptive spin

In reply to Gregory Haskins
Quoted 38 lines · Gregory Haskins
Quoted 21 lines · Peter Zijlstra
Quoted 14 lines · Ingo Molnar
Quoted 11 lines · Gregory Haskins
Quoted 3 lines · Ingo Molnar

There's no time or spin-rate based heuristics in this at all (i.e. these mutexes are not 'adaptive' at all!),

FYI: The original "adaptive" name was chosen in the -rt implementation to reflect that the locks can adaptively spin or sleep, depending on conditions. I realize this is in contrast to the typical usage of the term when it is in reference to the spin-time being based on some empirical heuristics, etc as you mentioned. Sorry for the confusion.

Quoted 4 lines

the current version of the -rt spinny-mutexes bits were mostly written by Steve, right? Historically it all started out with a more classic "adaptive mutexes" patchset so the name stuck i guess.

Quoted 7 lines

Yeah, Gregory and co. started with the whole thing and showed there was significant performance to be gained, after that Steve rewrote it from scratch reducing it to this minimalist heuristic, with help from Greg.

(At least, that is how I remember it, please speak up if I got things wrong)

Thats pretty accurate IIUC. The concept and original patches were written by myself, Peter Morreale and Sven Dietrich (cc'd). However, Steve cleaned up our patch before accepting it into -rt (we had extra provisions for things like handling conditional compilation and run-time disablement which he did not care for), but its otherwise the precise core concept we introduced. I think Steven gave a nice attribution to that fact in the prologue, however. And I also ACKed his cleanup, so I think all is well from my perspective.

Quoted 8 lines

As a historical note: It should be mentioned that Steven also introduced a really brilliant optimization to use RCU for the owner tracking that the original patch as submitted by my team did not have. However, it turned out to inadvertently regress performance due to the way preempt-rcu's rcu_read_lock() works so it had to be reverted a few weeks later to the original logic that we submitted (even though on paper his ideas in that area were superior to ours). So whats in -rt now really is more or less our patch sans the conditional crap, etc.

Preemptable RCU needs to be faster. Got it -- and might have a way to do it by eliminating the irq disabling and cutting way back on the number of operations that must be performed. It would probably still be necessary to access the task structure.

Or is something other than the raw performance of rcu_read_lock() and rcu_read_unlock() at issue here?

Thanx, Paul

Quoted 4 lines

Hope that helps!

-Greg

maintainer
#49 lore raw

Re: [PATCH][RFC]: mutex: adaptive spin

Quoted 7 lines · Paul E. McKenney

Preemptable RCU needs to be faster. Got it -- and might have a way to do it by eliminating the irq disabling and cutting way back on the number of operations that must be performed. It would probably still be necessary to access the task structure.

Or is something other than the raw performance of rcu_read_lock() and rcu_read_unlock() at issue here?

With Linus' mutex_spin_or_schedule() function the whole - keeping owner's task_struct alive issue goes away,.. now if only the thing would boot...

#50 lore raw

Re: [PATCH][RFC]: mutex: adaptive spin

Quoted 4 lines · Peter Zijlstra

With Linus' mutex_spin_or_schedule() function the whole - keeping owner's task_struct alive issue goes away,.. now if only the thing would boot...

Can you post the patch, so that we can see if we can find some silly error that we can ridicule you over?

Linus "always willing to 'help'" Torvalds

maintainer
#51 lore raw

Re: [PATCH][RFC]: mutex: adaptive spin

Quoted 9 lines · Linus Torvalds
Quoted 4 lines · Peter Zijlstra

With Linus' mutex_spin_or_schedule() function the whole - keeping owner's task_struct alive issue goes away,.. now if only the thing would boot...

Can you post the patch, so that we can see if we can find some silly error that we can ridicule you over?

Sure, see below..

I think I'm seeing why it deadlocks..

One of the things the previous patch did wrong was that it never tracked the owner in the mutex fast path -- I initially didn't notice because I had all debugging infrastructure enabled, and that short circuits all the fast paths.

So I added a lame fast path owner tracking:

  preempt_disable();
  mutex_fast_path_lock();
  lock->owner = current;
  preempt_enable();

and a similar clear on the unlock side.

Which is exactly what causes the deadlock -- or livelock more accurately. Since the contention code spins while !owner, and the unlock code clears owner before release, we spin so hard we never release the cacheline to the other cpu and therefore get stuck.

Now I just looked what kernel/rtmutex.c does, it keeps track of the owner in the lock field and uses cmpxchg to change ownership. Regular mutexes however use atomic_t (not wide enough for void *) and hand crafted assembly fast paths for all archs.

I think I'll just hack up a atomic_long_t atomic_lock_cmpxchg mutex implementation -- so we can at least test this on x86 to see if its worth continuing this way.

Converting all hand crafted asm only to find out it degrades performance doesn't sound too cool :-)

---
 include/linux/mutex.h |    4 +-
 include/linux/sched.h |    1 
 kernel/mutex-debug.c  |   10 ------
 kernel/mutex-debug.h  |    8 -----
 kernel/mutex.c        |   80 ++++++++++++++++++++++++++++++++++++++------------
 kernel/mutex.h        |    2 -
 kernel/sched.c        |   44 +++++++++++++++++++++++++++
 7 files changed, 110 insertions(+), 39 deletions(-)
include/linux/mutex.h +2 -2
Index: linux-2.6/include/linux/mutex.h
===================================================================
@@ -50,8 +50,8 @@ struct mutex {
 	atomic_t		count;
 	spinlock_t		wait_lock;
 	struct list_head	wait_list;
+	struct task_struct	*owner;
 #ifdef CONFIG_DEBUG_MUTEXES
-	struct thread_info	*owner;
 	const char 		*name;
 	void			*magic;
 #endif
@@ -67,8 +67,8 @@ struct mutex {
 struct mutex_waiter {
 	struct list_head	list;
 	struct task_struct	*task;
-#ifdef CONFIG_DEBUG_MUTEXES
 	struct mutex		*lock;
+#ifdef CONFIG_DEBUG_MUTEXES
 	void			*magic;
 #endif
 };
include/linux/sched.h +1 -0
Index: linux-2.6/include/linux/sched.h
===================================================================
@@ -329,6 +329,7 @@ extern signed long schedule_timeout(sign
 extern signed long schedule_timeout_interruptible(signed long timeout);
 extern signed long schedule_timeout_killable(signed long timeout);
 extern signed long schedule_timeout_uninterruptible(signed long timeout);
+extern void mutex_spin_or_schedule(struct mutex_waiter *, long state, unsigned long *flags);
 asmlinkage void schedule(void);
 
 struct nsproxy;
kernel/mutex-debug.c +1 -9
Index: linux-2.6/kernel/mutex-debug.c
===================================================================
@@ -26,11 +26,6 @@
 /*
  * Must be called with lock->wait_lock held.
  */
-void debug_mutex_set_owner(struct mutex *lock, struct thread_info *new_owner)
-{
-	lock->owner = new_owner;
-}
-
 void debug_mutex_lock_common(struct mutex *lock, struct mutex_waiter *waiter)
 {
 	memset(waiter, MUTEX_DEBUG_INIT, sizeof(*waiter));
@@ -59,7 +54,6 @@ void debug_mutex_add_waiter(struct mutex
 
 	/* Mark the current thread as blocked on the lock: */
 	ti->task->blocked_on = waiter;
-	waiter->lock = lock;
 }
 
 void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
@@ -80,9 +74,8 @@ void debug_mutex_unlock(struct mutex *lo
 		return;
 
 	DEBUG_LOCKS_WARN_ON(lock->magic != lock);
-	DEBUG_LOCKS_WARN_ON(lock->owner != current_thread_info());
+	/* DEBUG_LOCKS_WARN_ON(lock->owner != current); */
 	DEBUG_LOCKS_WARN_ON(!lock->wait_list.prev && !lock->wait_list.next);
-	DEBUG_LOCKS_WARN_ON(lock->owner != current_thread_info());
 }
 
 void debug_mutex_init(struct mutex *lock, const char *name,
@@ -95,7 +88,6 @@ void debug_mutex_init(struct mutex *lock
 	debug_check_no_locks_freed((void *)lock, sizeof(*lock));
 	lockdep_init_map(&lock->dep_map, name, key, 0);
 #endif
-	lock->owner = NULL;
 	lock->magic = lock;
 }
 
kernel/mutex-debug.h +0 -8
Index: linux-2.6/kernel/mutex-debug.h
===================================================================
@@ -13,14 +13,6 @@
 /*
  * This must be called with lock->wait_lock held.
  */
-extern void
-debug_mutex_set_owner(struct mutex *lock, struct thread_info *new_owner);
-
-static inline void debug_mutex_clear_owner(struct mutex *lock)
-{
-	lock->owner = NULL;
-}
-
 extern void debug_mutex_lock_common(struct mutex *lock,
 				    struct mutex_waiter *waiter);
 extern void debug_mutex_wake_waiter(struct mutex *lock,
kernel/mutex.c +62 -18

181 lines not on this page · raw message

kernel/sched.c +44 -0

50 lines not on this page · raw message

kernel/mutex.h +0 -2
Index: linux-2.6/kernel/mutex.h
===================================================================
@@ -16,8 +16,6 @@
 #define mutex_remove_waiter(lock, waiter, ti) \
 		__list_del((waiter)->list.prev, (waiter)->list.next)
 
-#define debug_mutex_set_owner(lock, new_owner)		do { } while (0)
-#define debug_mutex_clear_owner(lock)			do { } while (0)
 #define debug_mutex_wake_waiter(lock, waiter)		do { } while (0)
 #define debug_mutex_free_waiter(waiter)			do { } while (0)
 #define debug_mutex_add_waiter(lock, waiter, ti)	do { } while (0)
#25 lore raw
In reply to J. Bruce Fields
Quoted 5 lines · J. Bruce Fields

Old kernel versions may still get booted after brtfs has gotten a reputation for stability. E.g. if I move my / to brtfs in 2.6.34, then one day need to boot back to 2.6.30 to track down some regression, the reminder that I'm moving back to some sort of brtfs dark-ages might be welcome.

Require a mount option "allow_unstable_version" until it's stable? The stable version can ignore the option.

In your example, you wouldn't use the option, and in the btrfs dark ages it would refuse to mount.

-- Jamie

#52 lore raw

Re: [PATCH][RFC]: mutex: adaptive spin

In reply to Peter Zijlstra
Quoted 5 lines · Peter Zijlstra

One of the things the previous patch did wrong was that it never tracked the owner in the mutex fast path -- I initially didn't notice because I had all debugging infrastructure enabled, and that short circuits all the fast paths.

Why even worry?

Just set the owner non-atomically. We can consider a NULL owner in the slow-path to be a "let's schedule" case. After all, it's just a performance tuning thing after all, and the window is going to be very small, so it won't even be relevant from a performance tuning angle.

So there's _no_ reason why the fast-path can't just set owner, and no reason to disable preemption.

I also think the whole preempt_disable/enable around the mutex_spin_or_schedule() is pure garbage.

In fact, I suspect that's the real bug you're hitting: you're enabling preemption while holding a spinlock. That is NOT a good idea.

So

- remove all the "preempt_disable/enable" crud. It's wrong.

- remove the whole

+ if (!owner)
+ return;

thing. It's also wrong. Just go to the schedule case for that.

It all looks like unnecessary complexity that you added, and I think _that_ is what bites you.

Aim for _simple_. Not clever. Not complex. What you should aim for is to keep the _exact_ same code that we had before in mutex, and the absolute *only* change is replacing that "unlock+schedule()+relock" sequence with "mutex_spin_or_schedule()".

That should be your starting point.

Yeah, you'll need to set the owner for the fast case, but there are no locking or preemption issues there. Just forget them. You're confusing yourself and the code by trying to look for problems that aren't relevant.

Linus

#333 lore raw

Re: [PATCH][RFC]: mutex: adaptive spin

In reply to Peter Zijlstra
Quoted 6 lines · Peter Zijlstra
Quoted 5 lines · Paul E. McKenney

Preemptable RCU needs to be faster. Got it -- and might have a way to do it by eliminating the irq disabling and cutting way back on the number of operations that must be performed. It would probably still be necessary to access the task structure.

Quoted 6 lines
Quoted 2 lines

Or is something other than the raw performance of rcu_read_lock() and rcu_read_unlock() at issue here?

With Linus' mutex_spin_or_schedule() function the whole - keeping owner's task_struct alive issue goes away,.. now if only the thing would boot...

Cool! And I can relate to the "if only the thing would boot" part. ;-)

Thanx, Paul

maintainer
#53 lore raw

Re: [PATCH][RFC]: mutex: adaptive spin

In reply to Linus Torvalds
Quoted 9 lines · Linus Torvalds
Quoted 5 lines · Peter Zijlstra

One of the things the previous patch did wrong was that it never tracked the owner in the mutex fast path -- I initially didn't notice because I had all debugging infrastructure enabled, and that short circuits all the fast paths.

Why even worry?

Wrong mind-set, as you rightly point out below.

Quoted 7 lines

Just set the owner non-atomically. We can consider a NULL owner in the slow-path to be a "let's schedule" case. After all, it's just a performance tuning thing after all, and the window is going to be very small, so it won't even be relevant from a performance tuning angle.

So there's _no_ reason why the fast-path can't just set owner, and no reason to disable preemption.

Agreed, when viewed from that angle all the little races don't matter.

Quoted 5 lines

I also think the whole preempt_disable/enable around the mutex_spin_or_schedule() is pure garbage.

In fact, I suspect that's the real bug you're hitting: you're enabling preemption while holding a spinlock. That is NOT a good idea.

spinlocks also fiddle with preempt_count, that should all work out - although granted, it does look funny.

Indeed, the below does boot -- which means I get to sleep now ;-)

---
 include/linux/mutex.h |    4 +--
 include/linux/sched.h |    1 
 kernel/mutex-debug.c  |   10 --------
 kernel/mutex-debug.h  |    8 ------
 kernel/mutex.c        |   62 +++++++++++++++++++++++++++++++++++---------------
 kernel/mutex.h        |    2 -
 kernel/sched.c        |   44 +++++++++++++++++++++++++++++++++++
 7 files changed, 92 insertions(+), 39 deletions(-)
include/linux/mutex.h +2 -2
Index: linux-2.6/include/linux/mutex.h
===================================================================
@@ -50,8 +50,8 @@ struct mutex {
 	atomic_t		count;
 	spinlock_t		wait_lock;
 	struct list_head	wait_list;
+	struct task_struct	*owner;
 #ifdef CONFIG_DEBUG_MUTEXES
-	struct thread_info	*owner;
 	const char 		*name;
 	void			*magic;
 #endif
@@ -67,8 +67,8 @@ struct mutex {
 struct mutex_waiter {
 	struct list_head	list;
 	struct task_struct	*task;
-#ifdef CONFIG_DEBUG_MUTEXES
 	struct mutex		*lock;
+#ifdef CONFIG_DEBUG_MUTEXES
 	void			*magic;
 #endif
 };
include/linux/sched.h +1 -0
Index: linux-2.6/include/linux/sched.h
===================================================================
@@ -329,6 +329,7 @@ extern signed long schedule_timeout(sign
 extern signed long schedule_timeout_interruptible(signed long timeout);
 extern signed long schedule_timeout_killable(signed long timeout);
 extern signed long schedule_timeout_uninterruptible(signed long timeout);
+extern void mutex_spin_or_schedule(struct mutex_waiter *, long state, unsigned long *flags);
 asmlinkage void schedule(void);
 
 struct nsproxy;
kernel/mutex-debug.c +1 -9
Index: linux-2.6/kernel/mutex-debug.c
===================================================================
@@ -26,11 +26,6 @@
 /*
  * Must be called with lock->wait_lock held.
  */
-void debug_mutex_set_owner(struct mutex *lock, struct thread_info *new_owner)
-{
-	lock->owner = new_owner;
-}
-
 void debug_mutex_lock_common(struct mutex *lock, struct mutex_waiter *waiter)
 {
 	memset(waiter, MUTEX_DEBUG_INIT, sizeof(*waiter));
@@ -59,7 +54,6 @@ void debug_mutex_add_waiter(struct mutex
 
 	/* Mark the current thread as blocked on the lock: */
 	ti->task->blocked_on = waiter;
-	waiter->lock = lock;
 }
 
 void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
@@ -80,9 +74,8 @@ void debug_mutex_unlock(struct mutex *lo
 		return;
 
 	DEBUG_LOCKS_WARN_ON(lock->magic != lock);
-	DEBUG_LOCKS_WARN_ON(lock->owner != current_thread_info());
+	/* DEBUG_LOCKS_WARN_ON(lock->owner != current); */
 	DEBUG_LOCKS_WARN_ON(!lock->wait_list.prev && !lock->wait_list.next);
-	DEBUG_LOCKS_WARN_ON(lock->owner != current_thread_info());
 }
 
 void debug_mutex_init(struct mutex *lock, const char *name,
@@ -95,7 +88,6 @@ void debug_mutex_init(struct mutex *lock
 	debug_check_no_locks_freed((void *)lock, sizeof(*lock));
 	lockdep_init_map(&lock->dep_map, name, key, 0);
 #endif
-	lock->owner = NULL;
 	lock->magic = lock;
 }
 
kernel/mutex-debug.h +0 -8
Index: linux-2.6/kernel/mutex-debug.h
===================================================================
@@ -13,14 +13,6 @@
 /*
  * This must be called with lock->wait_lock held.
  */
-extern void
-debug_mutex_set_owner(struct mutex *lock, struct thread_info *new_owner);
-
-static inline void debug_mutex_clear_owner(struct mutex *lock)
-{
-	lock->owner = NULL;
-}
-
 extern void debug_mutex_lock_common(struct mutex *lock,
 				    struct mutex_waiter *waiter);
 extern void debug_mutex_wake_waiter(struct mutex *lock,
kernel/mutex.c +44 -18

160 lines not on this page · raw message

kernel/sched.c +44 -0

50 lines not on this page · raw message

kernel/mutex.h +0 -2
Index: linux-2.6/kernel/mutex.h
===================================================================
@@ -16,8 +16,6 @@
 #define mutex_remove_waiter(lock, waiter, ti) \
 		__list_del((waiter)->list.prev, (waiter)->list.next)
 
-#define debug_mutex_set_owner(lock, new_owner)		do { } while (0)
-#define debug_mutex_clear_owner(lock)			do { } while (0)
 #define debug_mutex_wake_waiter(lock, waiter)		do { } while (0)
 #define debug_mutex_free_waiter(waiter)			do { } while (0)
 #define debug_mutex_add_waiter(lock, waiter, ti)	do { } while (0)
#54 lore raw

Re: [PATCH][RFC]: mutex: adaptive spin

Quoted 6 lines · Peter Zijlstra
Quoted 3 lines

In fact, I suspect that's the real bug you're hitting: you're enabling preemption while holding a spinlock. That is NOT a good idea.

spinlocks also fiddle with preempt_count, that should all work out - although granted, it does look funny.

It most certainly doesn't always work out.

For example, the irq-disabling ones do *not* fiddle with preempt_count, because they disable preemption by just disabling interrupts. So doing preempt_enable() inside such a spinlock is almost guaranteed to lock up:
because the preempt_enable() will now potentially call the scheduler with a spinlock held and with interrupts disabled.

That, in turn, can cause any number of problems - deadlocks with other processes that then try to take the spinlock that didn't get released, but also deadlocks with interrupts, since the scheduler will enable interrupts again.

So mixing preemption and spinlocks is almost always a bug. Yes, _some_ cases work out ok, but I'd call those the odd ones.

Linus

#55 lore raw

Re: [PATCH][RFC]: mutex: adaptive spin

In reply to Peter Zijlstra
Quoted 2 lines · Peter Zijlstra

Indeed, the below does boot -- which means I get to sleep now ;-)

Well, if you didn't go to sleep, a few more questions..

kernel/mutex.c EXPORT_SYMBOL_GPL(mutex_lock_nested); · line 223

Quoted 12 lines

int __sched
mutex_lock_killable_nested(struct mutex *lock, unsigned int subclass) {

kernel/mutex.c +7 -1
+	int ret;
+
 	might_sleep();
-	return __mutex_lock_common(lock, TASK_KILLABLE, subclass, _RET_IP_);
+	ret =  __mutex_lock_common(lock, TASK_KILLABLE, subclass, _RET_IP_);
+	if (!ret)
+		lock->owner = current;
+
+	return ret;

This looks ugly. Why doesn't __mutex_lock_common() just set the lock owner? Hate seeing it done in the caller that has to re-compute common (yeah, yeah, it's cheap) and just looks ugly.

IOW, why didn't this just get done with something like

	--- a/kernel/mutex.c
	+++ b/kernel/mutex.c
	@@ -186,6 +186,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
	 done:
	 	lock_acquired(&lock->dep_map, ip);
	 	/* got the lock - rejoice! */
	+	lock->owner = task;
	 	mutex_remove_waiter(lock, &waiter, task_thread_info(task));
	 	debug_mutex_set_owner(lock, task_thread_info(task));

instead? That takes care of all callers, including the conditional thing (since the error case is a totally different path).

Linus

#56 lore raw

Re: [PATCH][RFC]: mutex: adaptive spin

Quoted 1 line · Linus Torvalds

Well, if you didn't go to sleep, a few more questions..

I know this one! Me sir, me me me!

Quoted 8 lines
Quoted 8 lines

int __sched
mutex_lock_killable_nested(struct mutex *lock, unsigned int subclass) {

kernel/mutex.c +3 -1
+	int ret;
+
 	might_sleep();
-	return __mutex_lock_common(lock, TASK_KILLABLE, subclass, _RET_IP_);
+	ret =  __mutex_lock_common(lock, TASK_KILLABLE, subclass, _RET_IP_);
Quoted 8 lines

kernel/mutex.c EXPORT_SYMBOL_GPL(mutex_lock_nested); · line 223

Quoted 4 lines
kernel/mutex.c +4 -0
+	if (!ret)
+		lock->owner = current;
+
+	return ret;

This looks ugly. Why doesn't __mutex_lock_common() just set the lock owner? Hate seeing it done in the caller that has to re-compute common (yeah, yeah, it's cheap) and just looks ugly.

Because __mutex_lock_common() is the slow path. The fast path is a couple of assembly instructions in asm/mutex.h. If the lock isn't contended, it will never call __mutex_lock_common().

That would make the whole exercise rather pointless; the only time worth spinning really is if you're the only other one waiting for it ... if there's already a waiter, you might as well go to sleep.

Signature · 4 lines
Matthew Wilcox				Intel Open Source Technology Centre
"Bill, look, we understand that you're interested in selling us this
operating system, but compare it to ours.  We can't possibly take such
a retrograde step."
maintainer
#58 lore raw

Re: [PATCH][RFC]: mutex: adaptive spin

In reply to Peter Zijlstra
Quoted 36 lines · Peter Zijlstra
(quoted diff) +28 -0
@@ -115,6 +117,7 @@ void __sched mutex_unlock(struct mutex *
 	 * The unlocking fastpath is the 0->1 transition from 'locked'
 	 * into 'unlocked' state:
 	 */
+	lock->owner = NULL;
 	__mutex_fastpath_unlock(&lock->count, __mutex_unlock_slowpath);
 }
 
 
+void mutex_spin_or_schedule(struct mutex_waiter *waiter, long state, unsigned long *flags)
+{
+	struct mutex *lock = waiter->lock;
+	struct task_struct *task = waiter->task;
+	struct task_struct *owner = lock->owner;
+	struct rq *rq;
+
+	if (!owner)
+		goto do_schedule;
+
+	rq = task_rq(owner);
+
+	if (rq->curr != owner) {
+do_schedule:
+		__set_task_state(task, state);
+		spin_unlock_mutex(&lock->wait_lock, *flags);
+		schedule();
+	} else {
+		spin_unlock_mutex(&lock->wait_lock, *flags);
+		for (;;) {
+			/* Stop spinning when there's a pending signal. */
+			if (signal_pending_state(state, task))
+				break;
+
+			/* Owner changed, bail to revalidate state */
+			if (lock->owner != owner)
+				break;

Review void __sched mutex_unlock(struct mutex *

Quoted 10 lines
(quoted diff) +10 -0
+
+			/* Owner stopped running, bail to revalidate state */
+			if (rq->curr != owner)
+				break;
+
+			cpu_relax();
+		}
+	}
+	spin_lock_mutex(&lock->wait_lock, *flags);
+}

That's not going to work, we set owner to NULL, which means pending spinners get schedule()ed out instead of racing to acquire.

I suppose the below would fix that... really sleep time now

kernel/sched.c +2 -2
Index: linux-2.6/kernel/sched.c
===================================================================
@@ -4626,8 +4626,8 @@ do_schedule:
 			if (signal_pending_state(state, task))
 				break;
 
-			/* Owner changed, bail to revalidate state */
-			if (lock->owner != owner)
+			/* Mutex got unlocked, race to acquire. */
+			if (!mutex_is_locked(lock))
 				break;
 
 			/* Owner stopped running, bail to revalidate state */
#57 lore raw

Re: [PATCH][RFC]: mutex: adaptive spin

In reply to Matthew Wilcox
Quoted 8 lines · Matthew Wilcox
Quoted 4 lines

This looks ugly. Why doesn't __mutex_lock_common() just set the lock owner? Hate seeing it done in the caller that has to re-compute common (yeah, yeah, it's cheap) and just looks ugly.

Because __mutex_lock_common() is the slow path. The fast path is a couple of assembly instructions in asm/mutex.h. If the lock isn't contended, it will never call __mutex_lock_common().

No, that's not it.

Look at the callers. They are _all_ the slow path. They looked like this:

	might_sleep();
	return __mutex_lock_common(lock, TASK_KILLABLE, subclass, _RET_IP_);

Yes, you _also_ need to set the owner in the fast-path, but that's all entirely different. This is the debug case, which _always_ calls the slow-path.

So what I'm saying is that the slow-path should just set it. And then yes, we _also_ need to set it in the fast-path, but at least we don't need to set it in all the debug versions that just call the slow path!

Linus

#329 lore raw

Re: [PATCH][RFC]: mutex: adaptive spin

In reply to Peter Zijlstra
Quoted 22 lines · Peter Zijlstra
kernel/sched.c +22 -0
+void mutex_spin_or_schedule(struct mutex_waiter *waiter, long state, unsigned long *flags)
+{
+	struct mutex *lock = waiter->lock;
+	struct task_struct *task = waiter->task;
+	struct task_struct *owner = lock->owner;
+	struct rq *rq;
+
+	if (!owner)
+		goto do_schedule;
+
+	rq = task_rq(owner);
+
+	if (rq->curr != owner) {
+do_schedule:
+		__set_task_state(task, state);
+		spin_unlock_mutex(&lock->wait_lock, *flags);
+		schedule();
+	} else {
+		spin_unlock_mutex(&lock->wait_lock, *flags);
+		for (;;) {
+			/* Stop spinning when there's a pending signal. */
+			if (signal_pending_state(state, task))

kernel/sched.c pick_next_task(struct rq *rq, struct tas · line 4636

Quoted 10 lines
kernel/sched.c +10 -0
+				break;
+
+			/* Owner changed, bail to revalidate state */
+			if (lock->owner != owner)
+				break;
+
+			/* Owner stopped running, bail to revalidate state */
+			if (rq->curr != owner)
+				break;
+

2 questions from my immature thought:

1) Do we need keep gcc from optimizing when we access lock->owner and rq->curr in the loop?

2) "if (rq->curr != owner)" need become smarter.
schedule()

   {
	select_next
	rq->curr = next;
	contex_swith

}
we also spin when owner is select_next-ing in schedule(). but select_next is not fast enough.

Lai.

maintainer
#330 lore raw

Re: [PATCH][RFC]: mutex: adaptive spin

Quoted 36 lines · Lai Jiangshan
Quoted 22 lines · Peter Zijlstra
kernel/sched.c +22 -0
+void mutex_spin_or_schedule(struct mutex_waiter *waiter, long state, unsigned long *flags)
+{
+	struct mutex *lock = waiter->lock;
+	struct task_struct *task = waiter->task;
+	struct task_struct *owner = lock->owner;
+	struct rq *rq;
+
+	if (!owner)
+		goto do_schedule;
+
+	rq = task_rq(owner);
+
+	if (rq->curr != owner) {
+do_schedule:
+		__set_task_state(task, state);
+		spin_unlock_mutex(&lock->wait_lock, *flags);
+		schedule();
+	} else {
+		spin_unlock_mutex(&lock->wait_lock, *flags);
+		for (;;) {
+			/* Stop spinning when there's a pending signal. */
+			if (signal_pending_state(state, task))

kernel/sched.c pick_next_task(struct rq *rq, struct tas · line 4636

Quoted 10 lines
kernel/sched.c +10 -0
+				break;
+
+			/* Owner changed, bail to revalidate state */
+			if (lock->owner != owner)
+				break;
+
+			/* Owner stopped running, bail to revalidate state */
+			if (rq->curr != owner)
+				break;
+

2 questions from my immature thought:

Quoted 2 lines

1) Do we need keep gcc from optimizing when we access lock->owner and rq->curr in the loop?

cpu_relax() is a compiler barrier iirc.

Quoted 9 lines

2) "if (rq->curr != owner)" need become smarter.
schedule()

   {
	select_next
	rq->curr = next;
	contex_swith

}
we also spin when owner is select_next-ing in schedule(). but select_next is not fast enough.

I'm not sure what you're saying here..

#331 lore raw

Re: [PATCH][RFC]: mutex: adaptive spin

Quoted 51 lines · Peter Zijlstra
Quoted 35 lines · Lai Jiangshan
Quoted 22 lines · Peter Zijlstra
kernel/sched.c +22 -0
+void mutex_spin_or_schedule(struct mutex_waiter *waiter, long state, unsigned long *flags)
+{
+	struct mutex *lock = waiter->lock;
+	struct task_struct *task = waiter->task;
+	struct task_struct *owner = lock->owner;
+	struct rq *rq;
+
+	if (!owner)
+		goto do_schedule;
+
+	rq = task_rq(owner);
+
+	if (rq->curr != owner) {
+do_schedule:
+		__set_task_state(task, state);
+		spin_unlock_mutex(&lock->wait_lock, *flags);
+		schedule();
+	} else {
+		spin_unlock_mutex(&lock->wait_lock, *flags);
+		for (;;) {
+			/* Stop spinning when there's a pending signal. */
+			if (signal_pending_state(state, task))

kernel/sched.c pick_next_task(struct rq *rq, struct tas · line 4636

Quoted 10 lines
kernel/sched.c +10 -0
+				break;
+
+			/* Owner changed, bail to revalidate state */
+			if (lock->owner != owner)
+				break;
+
+			/* Owner stopped running, bail to revalidate state */
+			if (rq->curr != owner)
+				break;
+

2 questions from my immature thought:

Quoted 2 lines

1) Do we need keep gcc from optimizing when we access lock->owner and rq->curr in the loop?

cpu_relax() is a compiler barrier iirc.

Quoted 9 lines

2) "if (rq->curr != owner)" need become smarter.
schedule()

   {
	select_next
	rq->curr = next;
	contex_swith

}
we also spin when owner is select_next-ing in schedule(). but select_next is not fast enough.

Quoted 3 lines

I'm not sure what you're saying here..

I means when mutex owner calls schedule(), current task is also spinning until rq->curr is changed.

I think such spin is not necessary, it is doing nothing but wasting time. And this spin period is not short, and when this spin period ended, rq->curr is changed too, current task has to sleep.

So I think current task should sleep earlier when it detects that mutex owner start schedule().

#360 lore raw
In reply to Chris Mason
Quoted 6 lines · Chris Mason

Hello everyone,

Thanks for all of the comments so far. I've pushed out a number of fixes for btrfs mainline, covering most of the comments from this thread.

Quoted 6 lines

* All LINUX_KERNEL_VERSION checks are gone.
* checkpatch.pl fixes
* Extra permission checks on the ioctls
* Some important bug fixes from the btrfs list
* Andi found a buggy use of kmap_atomic during checksum verification
* Drop EXPORT_SYMBOLs from extent_io.c

Looking good...

Quoted 6 lines

Unresolved from this reviewing thread:

* Should it be named btrfsdev? My vote is no, it is extra work for the distros when we finally do rename it, and I don't think btrfs really has the reputation for stability right now. But if Linus or Andrew would prefer the dev on there, I'll do it.

I agree; I don't think there's any particular need for the 'dev' suffix. It's already dependent on CONFIG_EXPERIMENTAL, after all.

Quoted 2 lines

* My ugly mutex_trylock spin. It's a hefty performance gain so I'm hoping to keep it until there is a generic adaptive lock.

If a better option is forthcoming, by all means use it -- but I wouldn't see the existing version as a barrier to merging.

One more thing I'd suggest is removing the INSTALL file. The parts about having to build libcrc32c aren't relevant when it's part of the kernel tree and you have 'select LIBCRC32C', and the documentation on the userspace utilities probably lives _with_ the userspace repo. Might be worth adding a pointer to the userspace utilities though, in Documentation/filesystems/btrfs.txt

I think you can drop your own copy of the GPL too.

Signature · 2 lines
David Woodhouse                            Open Source Technology Centre
[email protected]                              Intel Corporation
maintainer
#59 lore raw

RFC PATCH 1/1 : mutex: implement adaptive spinning

In reply to Peter Zijlstra

Change mutex contention behaviour such that it will sometimes busy wait on acquisition - moving its behaviour closer to that of spinlocks.

This concept got ported to mainline from the -rt tree, where it was originally implemented for rtmutexes by Steven Rostedt, based on work by Gregory Haskins.

Testing with Ingo's test-mutex application (http://lkml.org/lkml/2006/1/8/50)
gave a 8% boost for VFS scalability on my testbox:

  # echo MUTEX_SPIN > /debug/sched_features
  # ./test-mutex V 16 10
  2 CPUs, running 16 parallel test-tasks.
  checking VFS performance.

avg ops/sec: 74910

  # echo NO_MUTEX_SPIN > /debug/sched_features
  # ./test-mutex V 16 10
  2 CPUs, running 16 parallel test-tasks.
  checking VFS performance.

avg ops/sec: 68804

The key criteria for the busy wait is that the lock owner has to be running on a (different) cpu. The idea is that as long as the owner is running, there is a fair chance it'll release the lock soon, and thus we'll be better off spinning instead of blocking/scheduling.

Since regular mutexes (as opposed to rtmutexes) do not atomically track the owner, we add the owner in a non-atomic fashion and deal with the races in the slowpath.

Furthermore, to ease the testing of the performance impact of this new code, there is means to disable this behaviour runtime (without having to reboot the system), when scheduler debugging is enabled (CONFIG_SCHED_DEBUG=y), by issuing the following command:

 # echo NO_MUTEX_SPIN > /debug/sched_features

This command re-enables spinning again (this is also the default):

 # echo MUTEX_SPIN > /debug/sched_features

There's also a few new statistic fields in /proc/sched_debug (available if CONFIG_SCHED_DEBUG=y and CONFIG_SCHEDSTATS=y):

 # grep mtx /proc/sched_debug
  .mtx_spin                      : 2387
  .mtx_sched                     : 2283
  .mtx_spin                      : 1277
  .mtx_sched                     : 1700
---
 include/linux/mutex.h   |    4 +-
 include/linux/sched.h   |    2 +
 kernel/mutex-debug.c    |   10 +------
 kernel/mutex-debug.h    |    8 -----
 kernel/mutex.c          |   46 ++++++++++++++++++++++--------
 kernel/mutex.h          |    2 -
 kernel/sched.c          |   73 +++++++++++++++++++++++++++++++++++++++++++++++
 kernel/sched_debug.c    |    2 +
 kernel/sched_features.h |    1 +
 9 files changed, 115 insertions(+), 33 deletions(-)
include/linux/mutex.h +2 -2
index 7a0e5c4..c007b4e 100644
@@ -50,8 +50,8 @@ struct mutex {
 	atomic_t		count;
 	spinlock_t		wait_lock;
 	struct list_head	wait_list;
+	struct task_struct	*owner;
 #ifdef CONFIG_DEBUG_MUTEXES
-	struct thread_info	*owner;
 	const char 		*name;
 	void			*magic;
 #endif
@@ -67,8 +67,8 @@ struct mutex {
 struct mutex_waiter {
 	struct list_head	list;
 	struct task_struct	*task;
-#ifdef CONFIG_DEBUG_MUTEXES
 	struct mutex		*lock;
+#ifdef CONFIG_DEBUG_MUTEXES
 	void			*magic;
 #endif
 };
include/linux/sched.h +2 -0
index 4cae9b8..d8fa96b 100644
@@ -328,6 +328,8 @@ extern signed long schedule_timeout(signed long timeout);
 extern signed long schedule_timeout_interruptible(signed long timeout);
 extern signed long schedule_timeout_killable(signed long timeout);
 extern signed long schedule_timeout_uninterruptible(signed long timeout);
+extern void mutex_spin_or_schedule(struct mutex_waiter *waiter, long state,
+				   unsigned long *flags);
 asmlinkage void schedule(void);
 
 struct nsproxy;
kernel/mutex-debug.c +1 -9
index 1d94160..0564680 100644
@@ -26,11 +26,6 @@
 /*
  * Must be called with lock->wait_lock held.
  */
-void debug_mutex_set_owner(struct mutex *lock, struct thread_info *new_owner)
-{
-	lock->owner = new_owner;
-}
-
 void debug_mutex_lock_common(struct mutex *lock, struct mutex_waiter *waiter)
 {
 	memset(waiter, MUTEX_DEBUG_INIT, sizeof(*waiter));
@@ -59,7 +54,6 @@ void debug_mutex_add_waiter(struct mutex *lock, struct mutex_waiter *waiter,
 
 	/* Mark the current thread as blocked on the lock: */
 	ti->task->blocked_on = waiter;
-	waiter->lock = lock;
 }
 
 void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
@@ -80,9 +74,8 @@ void debug_mutex_unlock(struct mutex *lock)
 		return;
 
 	DEBUG_LOCKS_WARN_ON(lock->magic != lock);
-	DEBUG_LOCKS_WARN_ON(lock->owner != current_thread_info());
+	/* DEBUG_LOCKS_WARN_ON(lock->owner != current); */
 	DEBUG_LOCKS_WARN_ON(!lock->wait_list.prev && !lock->wait_list.next);
-	DEBUG_LOCKS_WARN_ON(lock->owner != current_thread_info());
 }
 
 void debug_mutex_init(struct mutex *lock, const char *name,
@@ -95,7 +88,6 @@ void debug_mutex_init(struct mutex *lock, const char *name,
 	debug_check_no_locks_freed((void *)lock, sizeof(*lock));
 	lockdep_init_map(&lock->dep_map, name, key, 0);
 #endif
-	lock->owner = NULL;
 	lock->magic = lock;
 }
 
kernel/mutex-debug.h +0 -8
index babfbdf..42eab06 100644
@@ -13,14 +13,6 @@
 /*
  * This must be called with lock->wait_lock held.
  */
-extern void
-debug_mutex_set_owner(struct mutex *lock, struct thread_info *new_owner);
-
-static inline void debug_mutex_clear_owner(struct mutex *lock)
-{
-	lock->owner = NULL;
-}
-
 extern void debug_mutex_lock_common(struct mutex *lock,
 				    struct mutex_waiter *waiter);
 extern void debug_mutex_wake_waiter(struct mutex *lock,
kernel/mutex.c +34 -12

125 lines not on this page · raw message

kernel/mutex.h +0 -2
index a075daf..55e1986 100644
@@ -16,8 +16,6 @@
 #define mutex_remove_waiter(lock, waiter, ti) \
 		__list_del((waiter)->list.prev, (waiter)->list.next)
 
-#define debug_mutex_set_owner(lock, new_owner)		do { } while (0)
-#define debug_mutex_clear_owner(lock)			do { } while (0)
 #define debug_mutex_wake_waiter(lock, waiter)		do { } while (0)
 #define debug_mutex_free_waiter(waiter)			do { } while (0)
 #define debug_mutex_add_waiter(lock, waiter, ti)	do { } while (0)
kernel/sched.c +73 -0

85 lines not on this page · raw message

kernel/sched_debug.c +2 -0
index 4293cfa..3dec83a 100644
@@ -288,6 +288,8 @@ static void print_cpu(struct seq_file *m, int cpu)
 
 	P(bkl_count);
 
+	P(mtx_spin);
+	P(mtx_sched);
 #undef P
 #endif
 	print_cfs_stats(m, cpu);
kernel/sched_features.h +1 -0
index da5d93b..f548627 100644
@@ -13,3 +13,4 @@ SCHED_FEAT(LB_WAKEUP_UPDATE, 1)
 SCHED_FEAT(ASYM_EFF_LOAD, 1)
 SCHED_FEAT(WAKEUP_OVERLAP, 0)
 SCHED_FEAT(LAST_BUDDY, 1)
+SCHED_FEAT(MUTEX_SPIN, 1)
#37 lore raw
In reply to Chris Mason
Quoted 25 lines · Chris Mason

On Tue, 2009-01-06 at 01:47 +1100, Nick Piggin wrote:

[ adaptive locking in btrfs ]

Quoted 8 lines

adaptive locks have traditionally (read: Linus says) indicated the locking is suboptimal from a performance perspective and should be reworked. This is definitely the case for the -rt patchset, because they deliberately trade performance by change even very short held spinlocks to sleeping locks.

So I don't really know if -rt justifies adaptive locks in mainline/btrfs. Is there no way for the short critical sections to be decoupled from the long/sleeping ones?

Yes and no. The locks are used here to control access to the btree leaves and nodes. Some of these are very hot and tend to stay in cache all the time, while others have to be read from the disk.

As the btree search walks down the tree, access to the hot nodes is best controlled by a spinlock. Some operations (like a balance) will need to read other blocks from the disk and keep the node/leaf locked. So it also needs to be able to sleep.

I try to drop the locks where it makes sense before sleeping operatinos, but in some corner cases it isn't practical.

Quoted 7 lines

For leaves, once the code has found the item in the btree it was looking for, it wants to go off and do something useful (insert an inode etc etc). Those operations also tend to block, and the lock needs to be held to keep the tree block from changing.

All of this is a long way of saying the btrfs locking scheme is far from perfect. I'll look harder at the loop and ways to get rid of it.

<ob'plug>

adaptive spinning mutexes perhaps? Such as:

http://lkml.org/lkml/2009/1/7/119

(also pullable via the URI below)

If you have a BTRFS performance test where you know such details matter you might want to try Peter's patch and send us the test results.

Ingo

------------->

You can pull the latest core/locking git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git core/locking

------------------>
Peter Zijlstra (1):
mutex: implement adaptive spinning

 include/linux/mutex.h   |    4 +-
 include/linux/sched.h   |    2 +
 kernel/mutex-debug.c    |   10 +------
 kernel/mutex-debug.h    |    8 -----
 kernel/mutex.c          |   46 ++++++++++++++++++++++--------
 kernel/mutex.h          |    2 -
 kernel/sched.c          |   73 +++++++++++++++++++++++++++++++++++++++++++++++
 kernel/sched_debug.c    |    2 +
 kernel/sched_features.h |    1 +
 9 files changed, 115 insertions(+), 33 deletions(-)
#38 lore raw
Quoted 7 lines · Ingo Molnar
Quoted 2 lines · Chris Mason

All of this is a long way of saying the btrfs locking scheme is far from perfect. I'll look harder at the loop and ways to get rid of it.

<ob'plug>

adaptive spinning mutexes perhaps? Such as:

Um, I don't know how your mail client does threading, but mine shows Peter's message introducing the adaptive spinning mutexes as a reply to one of Chris' messages in the btrfs thread.

Chris is just saying he'll look at other ways to not need the spinning mutexes.

Signature · 4 lines
Matthew Wilcox				Intel Open Source Technology Centre
"Bill, look, we understand that you're interested in selling us this
operating system, but compare it to ours.  We can't possibly take such
a retrograde step."
#332 lore raw

Re: [PATCH][RFC]: mutex: adaptive spin

In reply to Lai Jiangshan
Quoted 2 lines · Lai Jiangshan

So I think current task should sleep earlier when it detects that mutex owner start schedule().

How do you propose it detects this?

Signature · 4 lines
Matthew Wilcox				Intel Open Source Technology Centre
"Bill, look, we understand that you're interested in selling us this
operating system, but compare it to ours.  We can't possibly take such
a retrograde step."
#60 lore raw

Re: [PATCH -v4][RFC]: mutex: implement adaptive spinning

In reply to Peter Zijlstra

2009/1/7 Peter Zijlstra <[email protected]>:

Quoted 394 lines

Change mutex contention behaviour such that it will sometimes busy wait on acquisition - moving its behaviour closer to that of spinlocks.

This concept got ported to mainline from the -rt tree, where it was originally implemented for rtmutexes by Steven Rostedt, based on work by Gregory Haskins.

Testing with Ingo's test-mutex application (http://lkml.org/lkml/2006/1/8/50)
gave a 8% boost for VFS scalability on my testbox:

 # echo MUTEX_SPIN > /debug/sched_features
 # ./test-mutex V 16 10
 2 CPUs, running 16 parallel test-tasks.
 checking VFS performance.

avg ops/sec: 74910

 # echo NO_MUTEX_SPIN > /debug/sched_features
 # ./test-mutex V 16 10
 2 CPUs, running 16 parallel test-tasks.
 checking VFS performance.

avg ops/sec: 68804

The key criteria for the busy wait is that the lock owner has to be running on a (different) cpu. The idea is that as long as the owner is running, there is a fair chance it'll release the lock soon, and thus we'll be better off spinning instead of blocking/scheduling.

Since regular mutexes (as opposed to rtmutexes) do not atomically track the owner, we add the owner in a non-atomic fashion and deal with the races in the slowpath.

Furthermore, to ease the testing of the performance impact of this new code, there is means to disable this behaviour runtime (without having to reboot the system), when scheduler debugging is enabled (CONFIG_SCHED_DEBUG=y), by issuing the following command:

 # echo NO_MUTEX_SPIN > /debug/sched_features

This command re-enables spinning again (this is also the default):

 # echo MUTEX_SPIN > /debug/sched_features

There's also a few new statistic fields in /proc/sched_debug (available if CONFIG_SCHED_DEBUG=y and CONFIG_SCHEDSTATS=y):

 # grep mtx /proc/sched_debug
 .mtx_spin                      : 2387
 .mtx_sched                     : 2283
 .mtx_spin                      : 1277
 .mtx_sched                     : 1700
---
 include/linux/mutex.h   |    4 +-
 include/linux/sched.h   |    2 +
 kernel/mutex-debug.c    |   10 +------
 kernel/mutex-debug.h    |    8 -----
 kernel/mutex.c          |   46 ++++++++++++++++++++++--------
 kernel/mutex.h          |    2 -
 kernel/sched.c          |   73 +++++++++++++++++++++++++++++++++++++++++++++++
 kernel/sched_debug.c    |    2 +
 kernel/sched_features.h |    1 +
 9 files changed, 115 insertions(+), 33 deletions(-)
include/linux/mutex.h +2 -2
index 7a0e5c4..c007b4e 100644
@@ -50,8 +50,8 @@ struct mutex {
       atomic_t                count;
       spinlock_t              wait_lock;
       struct list_head        wait_list;
+       struct task_struct      *owner;
 #ifdef CONFIG_DEBUG_MUTEXES
-       struct thread_info      *owner;
       const char              *name;
       void                    *magic;
 #endif
@@ -67,8 +67,8 @@ struct mutex {
 struct mutex_waiter {
       struct list_head        list;
       struct task_struct      *task;
-#ifdef CONFIG_DEBUG_MUTEXES
       struct mutex            *lock;
+#ifdef CONFIG_DEBUG_MUTEXES
       void                    *magic;
 #endif
 };
include/linux/sched.h +2 -0
index 4cae9b8..d8fa96b 100644
@@ -328,6 +328,8 @@ extern signed long schedule_timeout(signed long timeout);
 extern signed long schedule_timeout_interruptible(signed long timeout);
 extern signed long schedule_timeout_killable(signed long timeout);
 extern signed long schedule_timeout_uninterruptible(signed long timeout);
+extern void mutex_spin_or_schedule(struct mutex_waiter *waiter, long state,
+                                  unsigned long *flags);
 asmlinkage void schedule(void);
 
 struct nsproxy;
kernel/mutex-debug.c +1 -9
index 1d94160..0564680 100644
@@ -26,11 +26,6 @@
 /*
 * Must be called with lock->wait_lock held.
 */
-void debug_mutex_set_owner(struct mutex *lock, struct thread_info *new_owner)
-{
-       lock->owner = new_owner;
-}
-
 void debug_mutex_lock_common(struct mutex *lock, struct mutex_waiter *waiter)
 {
       memset(waiter, MUTEX_DEBUG_INIT, sizeof(*waiter));
@@ -59,7 +54,6 @@ void debug_mutex_add_waiter(struct mutex *lock, struct mutex_waiter *waiter,
 
       /* Mark the current thread as blocked on the lock: */
       ti->task->blocked_on = waiter;
-       waiter->lock = lock;
 }
 
 void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
@@ -80,9 +74,8 @@ void debug_mutex_unlock(struct mutex *lock)
               return;
 
       DEBUG_LOCKS_WARN_ON(lock->magic != lock);
-       DEBUG_LOCKS_WARN_ON(lock->owner != current_thread_info());
+       /* DEBUG_LOCKS_WARN_ON(lock->owner != current); */
       DEBUG_LOCKS_WARN_ON(!lock->wait_list.prev && !lock->wait_list.next);
-       DEBUG_LOCKS_WARN_ON(lock->owner != current_thread_info());
 }
 
 void debug_mutex_init(struct mutex *lock, const char *name,
@@ -95,7 +88,6 @@ void debug_mutex_init(struct mutex *lock, const char *name,
       debug_check_no_locks_freed((void *)lock, sizeof(*lock));
       lockdep_init_map(&lock->dep_map, name, key, 0);
 #endif
-       lock->owner = NULL;
       lock->magic = lock;
 }
 
kernel/mutex-debug.h +0 -8
index babfbdf..42eab06 100644
@@ -13,14 +13,6 @@
 /*
 * This must be called with lock->wait_lock held.
 */
-extern void
-debug_mutex_set_owner(struct mutex *lock, struct thread_info *new_owner);
-
-static inline void debug_mutex_clear_owner(struct mutex *lock)
-{
-       lock->owner = NULL;
-}
-
 extern void debug_mutex_lock_common(struct mutex *lock,
                                   struct mutex_waiter *waiter);
 extern void debug_mutex_wake_waiter(struct mutex *lock,
kernel/mutex.c +34 -12
index 4f45d4b..089b46b 100644
@@ -10,6 +10,10 @@
 * Many thanks to Arjan van de Ven, Thomas Gleixner, Steven Rostedt and
 * David Howells for suggestions and improvements.
 *
+ *  - Adaptive spinning for mutexes by Peter Zijlstra. (Ported to mainline
+ *    from the -rt tree, where it was originally implemented for rtmutexes
+ *    by Steven Rostedt, based on work by Gregory Haskins.)
+ *
 * Also see Documentation/mutex-design.txt.
 */
 #include <linux/mutex.h>
@@ -46,6 +50,7 @@ __mutex_init(struct mutex *lock, const char *name, struct lock_class_key *key)
       atomic_set(&lock->count, 1);
       spin_lock_init(&lock->wait_lock);
       INIT_LIST_HEAD(&lock->wait_list);
+       lock->owner = NULL;
 
       debug_mutex_init(lock, name, key);
 }
@@ -91,6 +96,7 @@ void inline __sched mutex_lock(struct mutex *lock)
        * 'unlocked' into 'locked' state.
        */
       __mutex_fastpath_lock(&lock->count, __mutex_lock_slowpath);
+       lock->owner = current;
 }
 
 EXPORT_SYMBOL(mutex_lock);
@@ -115,6 +121,7 @@ void __sched mutex_unlock(struct mutex *lock)
        * The unlocking fastpath is the 0->1 transition from 'locked'
        * into 'unlocked' state:
        */
+       lock->owner = NULL;
       __mutex_fastpath_unlock(&lock->count, __mutex_unlock_slowpath);
 }
 
@@ -141,6 +148,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
       /* add waiting tasks to the end of the waitqueue (FIFO): */
       list_add_tail(&waiter.list, &lock->wait_list);
       waiter.task = task;
+       waiter.lock = lock;
 
       old_val = atomic_xchg(&lock->count, -1);
       if (old_val == 1)
@@ -175,19 +183,15 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
                       debug_mutex_free_waiter(&waiter);
                       return -EINTR;
               }
-               __set_task_state(task, state);
 
-               /* didnt get the lock, go to sleep: */
-               spin_unlock_mutex(&lock->wait_lock, flags);
-               schedule();
-               spin_lock_mutex(&lock->wait_lock, flags);
+               mutex_spin_or_schedule(&waiter, state, &flags);
       }
 
 done:
       lock_acquired(&lock->dep_map, ip);
       /* got the lock - rejoice! */
       mutex_remove_waiter(lock, &waiter, task_thread_info(task));
-       debug_mutex_set_owner(lock, task_thread_info(task));
+       lock->owner = task;
 
       /* set it to 0 if there are no waiters left: */
       if (likely(list_empty(&lock->wait_list)))
@@ -260,7 +264,7 @@ __mutex_unlock_common_slowpath(atomic_t *lock_count, int nested)
               wake_up_process(waiter->task);
       }
 
-       debug_mutex_clear_owner(lock);
+       lock->owner = NULL;
 
       spin_unlock_mutex(&lock->wait_lock, flags);
 }
@@ -298,18 +302,30 @@ __mutex_lock_interruptible_slowpath(atomic_t *lock_count);
 */
 int __sched mutex_lock_interruptible(struct mutex *lock)
 {
+       int ret;
+
       might_sleep();
-       return __mutex_fastpath_lock_retval
+       ret =  __mutex_fastpath_lock_retval
                       (&lock->count, __mutex_lock_interruptible_slowpath);
+       if (!ret)
+               lock->owner = current;
+
+       return ret;
 }
 
 EXPORT_SYMBOL(mutex_lock_interruptible);
 
 int __sched mutex_lock_killable(struct mutex *lock)
 {
+       int ret;
+
       might_sleep();
-       return __mutex_fastpath_lock_retval
+       ret = __mutex_fastpath_lock_retval
                       (&lock->count, __mutex_lock_killable_slowpath);
+       if (!ret)
+               lock->owner = current;
+
+       return ret;
 }
 EXPORT_SYMBOL(mutex_lock_killable);
 
@@ -352,9 +368,10 @@ static inline int __mutex_trylock_slowpath(atomic_t *lock_count)
 
       prev = atomic_xchg(&lock->count, -1);
       if (likely(prev == 1)) {
-               debug_mutex_set_owner(lock, current_thread_info());
+               lock->owner = current;
               mutex_acquire(&lock->dep_map, 0, 1, _RET_IP_);
       }
+
       /* Set it back to 0 if there are no waiters: */
       if (likely(list_empty(&lock->wait_list)))
               atomic_set(&lock->count, 0);
@@ -380,8 +397,13 @@ static inline int __mutex_trylock_slowpath(atomic_t *lock_count)
 */
 int __sched mutex_trylock(struct mutex *lock)
 {
-       return __mutex_fastpath_trylock(&lock->count,
-                                       __mutex_trylock_slowpath);
+       int ret;
+
+       ret = __mutex_fastpath_trylock(&lock->count, __mutex_trylock_slowpath);
+       if (ret)
+               lock->owner = current;
+
+       return ret;
 }
 
 EXPORT_SYMBOL(mutex_trylock);
kernel/mutex.h +0 -2
index a075daf..55e1986 100644
@@ -16,8 +16,6 @@
 #define mutex_remove_waiter(lock, waiter, ti) \
               __list_del((waiter)->list.prev, (waiter)->list.next)
 
-#define debug_mutex_set_owner(lock, new_owner)         do { } while (0)
-#define debug_mutex_clear_owner(lock)                  do { } while (0)
 #define debug_mutex_wake_waiter(lock, waiter)          do { } while (0)
 #define debug_mutex_free_waiter(waiter)                        do { } while (0)
 #define debug_mutex_add_waiter(lock, waiter, ti)       do { } while (0)
kernel/sched.c +62 -0
index 2e3545f..c189597 100644
@@ -631,6 +631,10 @@ struct rq {
 
       /* BKL stats */
       unsigned int bkl_count;
+
+       /* mutex spin stats */
+       unsigned int mtx_spin;
+       unsigned int mtx_sched;
 #endif
 };
 
@@ -4527,6 +4531,75 @@ pick_next_task(struct rq *rq, struct task_struct *prev)
       }
 }
 
+#ifdef CONFIG_DEBUG_MUTEXES
+# include "mutex-debug.h"
+#else
+# include "mutex.h"
+#endif
+
+void mutex_spin_or_schedule(struct mutex_waiter *waiter, long state,
+                           unsigned long *flags)
+{
+       struct mutex *lock = waiter->lock;
+       struct task_struct *task = waiter->task;
+       struct task_struct *owner = lock->owner;
+       struct rq *rq;
+       int spin = 0;
+
+       if (likely(sched_feat(MUTEX_SPIN) && owner)) {
+               rq = task_rq(owner);
+               spin = (rq->curr == owner);
+       }
+
+       if (!spin) {
+               schedstat_inc(this_rq(), mtx_sched);
+               __set_task_state(task, state);
+               spin_unlock_mutex(&lock->wait_lock, *flags);
+               schedule();
+               spin_lock_mutex(&lock->wait_lock, *flags);
+               return;
+       }
+
+       schedstat_inc(this_rq(), mtx_spin);
+       spin_unlock_mutex(&lock->wait_lock, *flags);
+       for (;;) {
+               struct task_struct *l_owner;
+
+               /* Stop spinning when there's a pending signal. */
+               if (signal_pending_state(state, task))
+                       break;
+
+               /* Mutex got unlocked, try to acquire. */
+               if (!mutex_is_locked(lock))
+                       break;
+
+               /*
+                * Owner changed, bail to re-assess state.
+                *
+                * We ignore !owner because that would break us out of
+                * the spin too early -- see mutex_unlock() -- and make
+                * us schedule -- see the !owner case on top -- at the
+                * worst possible moment.
+                */
+               l_owner = ACCESS_ONCE(lock->owner);
+               if (l_owner && l_owner != owner)
+                       break;
+
+               /* Owner stopped running, bail to re-assess state. */
+               if (rq->curr != owner)
+                       break;
+

kernel/sched.c pick_next_task(struct rq *rq, struct task_struct *prev) · line 4601

Quoted 10 lines
kernel/sched.c +10 -0
+               /*
+                * cpu_relax() provides a compiler barrier that ensures we
+                * reload everything every time. SMP barriers are not strictly
+                * required as the worst case is we'll spin a bit more before
+                * we observe the right values.
+                */
+               cpu_relax();
+       }
+       spin_lock_mutex(&lock->wait_lock, *flags);
+}

Hi Peter,

Sorry I haven't read all the previous talk about the older version. But it is possible that, in hopefully rare cases, you enter mutex_spin_or_schedule
multiple times, and try to spin for the same lock each of these times.

For each of the above break,

_if you exit the spin because the mutex is unlocked, and someone else grab it before you
_ or simply the owner changed...

then you will enter again in mutex_spin_or_schedule, you have some chances that rq->curr == the new owner, and then you will spin again.
And this situation can almost really make you behave like a spinlock...

Shouldn't it actually try only one time to spin, and if it calls again mutex_spin_or_schedule()
then it would be better to schedule() ?

Or I misunderstood something...?

Thanks.

Quoted 33 lines
kernel/sched.c +1 -0
+
 /*
 * schedule() is the main scheduler function.
 */
kernel/sched_debug.c +2 -0
index 4293cfa..3dec83a 100644
@@ -288,6 +288,8 @@ static void print_cpu(struct seq_file *m, int cpu)
 
       P(bkl_count);
 
+       P(mtx_spin);
+       P(mtx_sched);
 #undef P
 #endif
       print_cfs_stats(m, cpu);
kernel/sched_features.h +1 -1
index da5d93b..f548627 100644
@@ -13,3 +13,4 @@ SCHED_FEAT(LB_WAKEUP_UPDATE, 1)
 SCHED_FEAT(ASYM_EFF_LOAD, 1)
 SCHED_FEAT(WAKEUP_OVERLAP, 0)
 SCHED_FEAT(LAST_BUDDY, 1)
+SCHED_FEAT(MUTEX_SPIN, 1)
 
--

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

#39 lore raw
In reply to Matthew Wilcox
Quoted 7 lines · Matthew Wilcox
Quoted 6 lines · Ingo Molnar
Quoted 2 lines · Chris Mason

All of this is a long way of saying the btrfs locking scheme is far from perfect. I'll look harder at the loop and ways to get rid of it.

<ob'plug>

Quoted 8 lines
Quoted 1 line

adaptive spinning mutexes perhaps? Such as:

Um, I don't know how your mail client does threading, but mine shows Peter's message introducing the adaptive spinning mutexes as a reply to one of Chris' messages in the btrfs thread.

Chris is just saying he'll look at other ways to not need the spinning mutexes.

But those are not the same spinning mutexes. Chris wrote his mail on Jan 05, Peter his first mail about spin-mutexes on Jan 06, as a reaction to Chris's mail.

My reply links back the discussion to the original analysis from Chris pointing out that it would be nice to try BTRFS with plain mutexes plus Peter's patch - instead of throwing away BTRFS's locking design or anything intrusive like that.

Where's the problem? :)

Ingo

maintainer
#61 lore raw

Re: [PATCH -v4][RFC]: mutex: implement adaptive spinning

In reply to Frédéric Weisbecker
Quoted 2 lines · On Wed, 2009-01-07 at 15:50 +0100, Fr=C3=A9d=C3=A9ric Weisbecker wrote:

2009/1/7 Peter Zijlstra <[email protected]>:

Quoted 1 line

Change mutex contention behaviour such that it will sometimes busy =

wait on

Quoted 3 lines
Quoted 3 lines

acquisition - moving its behaviour closer to that of spinlocks.

This concept got ported to mainline from the -rt tree, where it was=

originally

Quoted 1 line
Quoted 1 line

implemented for rtmutexes by Steven Rostedt, based on work by Grego=

ry Haskins.

Quoted 2 lines
Quoted 2 lines

Testing with Ingo's test-mutex application (http://lkml.org/lkml/20=

06/1/8/50)

Quoted 9 lines
Quoted 9 lines

gave a 8% boost for VFS scalability on my testbox:

 # echo MUTEX_SPIN > /debug/sched_features
 # ./test-mutex V 16 10
 2 CPUs, running 16 parallel test-tasks.
 checking VFS performance.

avg ops/sec: 74910

Quoted 8 lines
Quoted 8 lines
 # echo NO_MUTEX_SPIN > /debug/sched_features
 # ./test-mutex V 16 10
 2 CPUs, running 16 parallel test-tasks.
 checking VFS performance.

avg ops/sec: 68804

The key criteria for the busy wait is that the lock owner has to be=

running on

Quoted 1 line
Quoted 1 line

a (different) cpu. The idea is that as long as the owner is running=

, there is a

Quoted 1 line
Quoted 1 line

fair chance it'll release the lock soon, and thus we'll be better o=

ff spinning

Quoted 3 lines
Quoted 3 lines

instead of blocking/scheduling.

Since regular mutexes (as opposed to rtmutexes) do not atomically t=

rack the

Quoted 1 line
Quoted 1 line

owner, we add the owner in a non-atomic fashion and deal with the r=

aces in

Quoted 3 lines
Quoted 3 lines

the slowpath.

Furthermore, to ease the testing of the performance impact of this =

new code,

Quoted 1 line
Quoted 1 line

there is means to disable this behaviour runtime (without having to=

reboot

Quoted 1 line
Quoted 1 line

the system), when scheduler debugging is enabled (CONFIG_SCHED_DEBU=

G=3Dy),

Quoted 17 lines
Quoted 17 lines

by issuing the following command:

 # echo NO_MUTEX_SPIN > /debug/sched_features

This command re-enables spinning again (this is also the default):

 # echo MUTEX_SPIN > /debug/sched_features

There's also a few new statistic fields in /proc/sched_debug (available if CONFIG_SCHED_DEBUG=3Dy and CONFIG_SCHEDSTATS=3Dy):

 # grep mtx /proc/sched_debug
 .mtx_spin                      : 2387
 .mtx_sched                     : 2283
 .mtx_spin                      : 1277
 .mtx_sched                     : 1700
Quoted 8 lines
Quoted 3 lines

---

Sorry I haven't read all the previous talk about the older version. But it is possible that, in hopefully rare cases, you enter mutex_spin_or_schedule
multiple times, and try to spin for the same lock each of these times=

=2E

Quoted 8 lines

=20
For each of the above break,
=20
_if you exit the spin because the mutex is unlocked, and someone else grab it before you
_ or simply the owner changed...
=20
then you will enter again in mutex_spin_or_schedule, you have some ch=

ances that

Quoted 2 lines

rq->curr =3D=3D the new owner, and then you will spin again. And this situation can almost really make you behave like a spinlock.=

=2E.

You understand correctly, that is indeed possible.

Quoted 1 line

Shouldn't it actually try only one time to spin, and if it calls agai=

n

Quoted 2 lines

mutex_spin_or_schedule()
then it would be better to schedule() ?

I don't know, maybe code it up and find a benchmark where it makes a difference. :-)
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel= " in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#62 lore raw

Re: [PATCH -v4][RFC]: mutex: implement adaptive spinning

In reply to Peter Zijlstra

Peter, nice work!

Quoted 170 lines · Peter Zijlstra

Change mutex contention behaviour such that it will sometimes busy wait on acquisition - moving its behaviour closer to that of spinlocks.

This concept got ported to mainline from the -rt tree, where it was originally implemented for rtmutexes by Steven Rostedt, based on work by Gregory Haskins.

Testing with Ingo's test-mutex application (http://lkml.org/lkml/2006/1/8/50)
gave a 8% boost for VFS scalability on my testbox:

  # echo MUTEX_SPIN > /debug/sched_features
  # ./test-mutex V 16 10
  2 CPUs, running 16 parallel test-tasks.
  checking VFS performance.

avg ops/sec: 74910

  # echo NO_MUTEX_SPIN > /debug/sched_features
  # ./test-mutex V 16 10
  2 CPUs, running 16 parallel test-tasks.
  checking VFS performance.

avg ops/sec: 68804

The key criteria for the busy wait is that the lock owner has to be running on a (different) cpu. The idea is that as long as the owner is running, there is a fair chance it'll release the lock soon, and thus we'll be better off spinning instead of blocking/scheduling.

Since regular mutexes (as opposed to rtmutexes) do not atomically track the owner, we add the owner in a non-atomic fashion and deal with the races in the slowpath.

Furthermore, to ease the testing of the performance impact of this new code, there is means to disable this behaviour runtime (without having to reboot the system), when scheduler debugging is enabled (CONFIG_SCHED_DEBUG=y), by issuing the following command:

 # echo NO_MUTEX_SPIN > /debug/sched_features

This command re-enables spinning again (this is also the default):

 # echo MUTEX_SPIN > /debug/sched_features

There's also a few new statistic fields in /proc/sched_debug (available if CONFIG_SCHED_DEBUG=y and CONFIG_SCHEDSTATS=y):

 # grep mtx /proc/sched_debug
  .mtx_spin                      : 2387
  .mtx_sched                     : 2283
  .mtx_spin                      : 1277
  .mtx_sched                     : 1700
---
 include/linux/mutex.h   |    4 +-
 include/linux/sched.h   |    2 +
 kernel/mutex-debug.c    |   10 +------
 kernel/mutex-debug.h    |    8 -----
 kernel/mutex.c          |   46 ++++++++++++++++++++++--------
 kernel/mutex.h          |    2 -
 kernel/sched.c          |   73 +++++++++++++++++++++++++++++++++++++++++++++++
 kernel/sched_debug.c    |    2 +
 kernel/sched_features.h |    1 +
 9 files changed, 115 insertions(+), 33 deletions(-)
include/linux/mutex.h +2 -2
index 7a0e5c4..c007b4e 100644
@@ -50,8 +50,8 @@ struct mutex {
 	atomic_t		count;
 	spinlock_t		wait_lock;
 	struct list_head	wait_list;
+	struct task_struct	*owner;
 #ifdef CONFIG_DEBUG_MUTEXES
-	struct thread_info	*owner;
 	const char 		*name;
 	void			*magic;
 #endif
@@ -67,8 +67,8 @@ struct mutex {
 struct mutex_waiter {
 	struct list_head	list;
 	struct task_struct	*task;
-#ifdef CONFIG_DEBUG_MUTEXES
 	struct mutex		*lock;
+#ifdef CONFIG_DEBUG_MUTEXES
 	void			*magic;
 #endif
 };
include/linux/sched.h +2 -0
index 4cae9b8..d8fa96b 100644
@@ -328,6 +328,8 @@ extern signed long schedule_timeout(signed long timeout);
 extern signed long schedule_timeout_interruptible(signed long timeout);
 extern signed long schedule_timeout_killable(signed long timeout);
 extern signed long schedule_timeout_uninterruptible(signed long timeout);
+extern void mutex_spin_or_schedule(struct mutex_waiter *waiter, long state,
+				   unsigned long *flags);
 asmlinkage void schedule(void);
 
 struct nsproxy;
kernel/mutex-debug.c +1 -9
index 1d94160..0564680 100644
@@ -26,11 +26,6 @@
 /*
  * Must be called with lock->wait_lock held.
  */
-void debug_mutex_set_owner(struct mutex *lock, struct thread_info *new_owner)
-{
-	lock->owner = new_owner;
-}
-
 void debug_mutex_lock_common(struct mutex *lock, struct mutex_waiter *waiter)
 {
 	memset(waiter, MUTEX_DEBUG_INIT, sizeof(*waiter));
@@ -59,7 +54,6 @@ void debug_mutex_add_waiter(struct mutex *lock, struct mutex_waiter *waiter,
 
 	/* Mark the current thread as blocked on the lock: */
 	ti->task->blocked_on = waiter;
-	waiter->lock = lock;
 }
 
 void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
@@ -80,9 +74,8 @@ void debug_mutex_unlock(struct mutex *lock)
 		return;
 
 	DEBUG_LOCKS_WARN_ON(lock->magic != lock);
-	DEBUG_LOCKS_WARN_ON(lock->owner != current_thread_info());
+	/* DEBUG_LOCKS_WARN_ON(lock->owner != current); */
 	DEBUG_LOCKS_WARN_ON(!lock->wait_list.prev && !lock->wait_list.next);
-	DEBUG_LOCKS_WARN_ON(lock->owner != current_thread_info());
 }
 
 void debug_mutex_init(struct mutex *lock, const char *name,
@@ -95,7 +88,6 @@ void debug_mutex_init(struct mutex *lock, const char *name,
 	debug_check_no_locks_freed((void *)lock, sizeof(*lock));
 	lockdep_init_map(&lock->dep_map, name, key, 0);
 #endif
-	lock->owner = NULL;
 	lock->magic = lock;
 }
 
kernel/mutex-debug.h +0 -8
index babfbdf..42eab06 100644
@@ -13,14 +13,6 @@
 /*
  * This must be called with lock->wait_lock held.
  */
-extern void
-debug_mutex_set_owner(struct mutex *lock, struct thread_info *new_owner);
-
-static inline void debug_mutex_clear_owner(struct mutex *lock)
-{
-	lock->owner = NULL;
-}
-
 extern void debug_mutex_lock_common(struct mutex *lock,
 				    struct mutex_waiter *waiter);
 extern void debug_mutex_wake_waiter(struct mutex *lock,
kernel/mutex.c +0 -0
index 4f45d4b..089b46b 100644

kernel/mutex.c line 15

Quoted 6 lines
kernel/mutex.c +3 -0
@@ -10,6 +10,10 @@
  * Many thanks to Arjan van de Ven, Thomas Gleixner, Steven Rostedt and
  * David Howells for suggestions and improvements.
  *
+ *  - Adaptive spinning for mutexes by Peter Zijlstra. (Ported to mainline
+ *    from the -rt tree, where it was originally implemented for rtmutexes
+ *    by Steven Rostedt, based on work by Gregory Haskins.)

I feel guilty with my name being the only one there for the rtmutexes. Thomas Gleixner, Ingo Molnar and Esben Nielsen also played large roles in that code.

And Peter Morreale and Sven Dietrich might also be mentioned next to Gregory's name.

Quoted 173 lines
kernel/mutex.c +31 -12
+ *
  * Also see Documentation/mutex-design.txt.
  */
 #include <linux/mutex.h>
@@ -46,6 +50,7 @@ __mutex_init(struct mutex *lock, const char *name, struct lock_class_key *key)
 	atomic_set(&lock->count, 1);
 	spin_lock_init(&lock->wait_lock);
 	INIT_LIST_HEAD(&lock->wait_list);
+	lock->owner = NULL;
 
 	debug_mutex_init(lock, name, key);
 }
@@ -91,6 +96,7 @@ void inline __sched mutex_lock(struct mutex *lock)
 	 * 'unlocked' into 'locked' state.
 	 */
 	__mutex_fastpath_lock(&lock->count, __mutex_lock_slowpath);
+	lock->owner = current;
 }
 
 EXPORT_SYMBOL(mutex_lock);
@@ -115,6 +121,7 @@ void __sched mutex_unlock(struct mutex *lock)
 	 * The unlocking fastpath is the 0->1 transition from 'locked'
 	 * into 'unlocked' state:
 	 */
+	lock->owner = NULL;
 	__mutex_fastpath_unlock(&lock->count, __mutex_unlock_slowpath);
 }
 
@@ -141,6 +148,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
 	/* add waiting tasks to the end of the waitqueue (FIFO): */
 	list_add_tail(&waiter.list, &lock->wait_list);
 	waiter.task = task;
+	waiter.lock = lock;
 
 	old_val = atomic_xchg(&lock->count, -1);
 	if (old_val == 1)
@@ -175,19 +183,15 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
 			debug_mutex_free_waiter(&waiter);
 			return -EINTR;
 		}
-		__set_task_state(task, state);
 
-		/* didnt get the lock, go to sleep: */
-		spin_unlock_mutex(&lock->wait_lock, flags);
-		schedule();
-		spin_lock_mutex(&lock->wait_lock, flags);
+		mutex_spin_or_schedule(&waiter, state, &flags);
 	}
 
 done:
 	lock_acquired(&lock->dep_map, ip);
 	/* got the lock - rejoice! */
 	mutex_remove_waiter(lock, &waiter, task_thread_info(task));
-	debug_mutex_set_owner(lock, task_thread_info(task));
+	lock->owner = task;
 
 	/* set it to 0 if there are no waiters left: */
 	if (likely(list_empty(&lock->wait_list)))
@@ -260,7 +264,7 @@ __mutex_unlock_common_slowpath(atomic_t *lock_count, int nested)
 		wake_up_process(waiter->task);
 	}
 
-	debug_mutex_clear_owner(lock);
+	lock->owner = NULL;
 
 	spin_unlock_mutex(&lock->wait_lock, flags);
 }
@@ -298,18 +302,30 @@ __mutex_lock_interruptible_slowpath(atomic_t *lock_count);
  */
 int __sched mutex_lock_interruptible(struct mutex *lock)
 {
+	int ret;
+
 	might_sleep();
-	return __mutex_fastpath_lock_retval
+	ret =  __mutex_fastpath_lock_retval
 			(&lock->count, __mutex_lock_interruptible_slowpath);
+	if (!ret)
+		lock->owner = current;
+
+	return ret;
 }
 
 EXPORT_SYMBOL(mutex_lock_interruptible);
 
 int __sched mutex_lock_killable(struct mutex *lock)
 {
+	int ret;
+
 	might_sleep();
-	return __mutex_fastpath_lock_retval
+	ret = __mutex_fastpath_lock_retval
 			(&lock->count, __mutex_lock_killable_slowpath);
+	if (!ret)
+		lock->owner = current;
+
+	return ret;
 }
 EXPORT_SYMBOL(mutex_lock_killable);
 
@@ -352,9 +368,10 @@ static inline int __mutex_trylock_slowpath(atomic_t *lock_count)
 
 	prev = atomic_xchg(&lock->count, -1);
 	if (likely(prev == 1)) {
-		debug_mutex_set_owner(lock, current_thread_info());
+		lock->owner = current;
 		mutex_acquire(&lock->dep_map, 0, 1, _RET_IP_);
 	}
+
 	/* Set it back to 0 if there are no waiters: */
 	if (likely(list_empty(&lock->wait_list)))
 		atomic_set(&lock->count, 0);
@@ -380,8 +397,13 @@ static inline int __mutex_trylock_slowpath(atomic_t *lock_count)
  */
 int __sched mutex_trylock(struct mutex *lock)
 {
-	return __mutex_fastpath_trylock(&lock->count,
-					__mutex_trylock_slowpath);
+	int ret;
+
+	ret = __mutex_fastpath_trylock(&lock->count, __mutex_trylock_slowpath);
+	if (ret)
+		lock->owner = current;
+
+	return ret;
 }
 
 EXPORT_SYMBOL(mutex_trylock);
kernel/mutex.h +0 -2
index a075daf..55e1986 100644
@@ -16,8 +16,6 @@
 #define mutex_remove_waiter(lock, waiter, ti) \
 		__list_del((waiter)->list.prev, (waiter)->list.next)
 
-#define debug_mutex_set_owner(lock, new_owner)		do { } while (0)
-#define debug_mutex_clear_owner(lock)			do { } while (0)
 #define debug_mutex_wake_waiter(lock, waiter)		do { } while (0)
 #define debug_mutex_free_waiter(waiter)			do { } while (0)
 #define debug_mutex_add_waiter(lock, waiter, ti)	do { } while (0)
kernel/sched.c +17 -0
index 2e3545f..c189597 100644
@@ -631,6 +631,10 @@ struct rq {
 
 	/* BKL stats */
 	unsigned int bkl_count;
+
+	/* mutex spin stats */
+	unsigned int mtx_spin;
+	unsigned int mtx_sched;
 #endif
 };
 
@@ -4527,6 +4531,75 @@ pick_next_task(struct rq *rq, struct task_struct *prev)
 	}
 }
 
+#ifdef CONFIG_DEBUG_MUTEXES
+# include "mutex-debug.h"
+#else
+# include "mutex.h"
+#endif
+
+void mutex_spin_or_schedule(struct mutex_waiter *waiter, long state,
+			    unsigned long *flags)
+{
+	struct mutex *lock = waiter->lock;
+	struct task_struct *task = waiter->task;
+	struct task_struct *owner = lock->owner;
+	struct rq *rq;

kernel/sched.c pick_next_task(struct rq *rq, struct task_struct *prev) · line 4556

Quoted 10 lines
kernel/sched.c +10 -0
+	int spin = 0;
+
+	if (likely(sched_feat(MUTEX_SPIN) && owner)) {
+		rq = task_rq(owner);
+		spin = (rq->curr == owner);
+	}
+
+	if (!spin) {
+		schedstat_inc(this_rq(), mtx_sched);
+		__set_task_state(task, state);

I still do not know why you set state here instead of in the mutex code. Yes, you prevent changing the state if we do not schedule, but there's nothing wrong with setting it before hand. We may even be able to cache the owner and keep the locking of the wait_lock out of here. But then I see that it may be used to protect the sched_stat counters.

-- Steve

Quoted 74 lines
kernel/sched.c +46 -0
+		spin_unlock_mutex(&lock->wait_lock, *flags);
+		schedule();
+		spin_lock_mutex(&lock->wait_lock, *flags);
+		return;
+	}
+
+	schedstat_inc(this_rq(), mtx_spin);
+	spin_unlock_mutex(&lock->wait_lock, *flags);
+	for (;;) {
+		struct task_struct *l_owner;
+
+		/* Stop spinning when there's a pending signal. */
+		if (signal_pending_state(state, task))
+			break;
+
+		/* Mutex got unlocked, try to acquire. */
+		if (!mutex_is_locked(lock))
+			break;
+
+		/*
+		 * Owner changed, bail to re-assess state.
+		 *
+		 * We ignore !owner because that would break us out of
+		 * the spin too early -- see mutex_unlock() -- and make
+		 * us schedule -- see the !owner case on top -- at the
+		 * worst possible moment.
+		 */
+		l_owner = ACCESS_ONCE(lock->owner);
+		if (l_owner && l_owner != owner)
+			break;
+
+		/* Owner stopped running, bail to re-assess state. */
+		if (rq->curr != owner)
+			break;
+
+		/*
+		 * cpu_relax() provides a compiler barrier that ensures we
+		 * reload everything every time. SMP barriers are not strictly
+		 * required as the worst case is we'll spin a bit more before
+		 * we observe the right values.
+		 */
+		cpu_relax();
+	}
+	spin_lock_mutex(&lock->wait_lock, *flags);
+}
+
 /*
  * schedule() is the main scheduler function.
  */
kernel/sched_debug.c +2 -0
index 4293cfa..3dec83a 100644
@@ -288,6 +288,8 @@ static void print_cpu(struct seq_file *m, int cpu)
 
 	P(bkl_count);
 
+	P(mtx_spin);
+	P(mtx_sched);
 #undef P
 #endif
 	print_cfs_stats(m, cpu);
kernel/sched_features.h +1 -0
index da5d93b..f548627 100644
@@ -13,3 +13,4 @@ SCHED_FEAT(LB_WAKEUP_UPDATE, 1)
 SCHED_FEAT(ASYM_EFF_LOAD, 1)
 SCHED_FEAT(WAKEUP_OVERLAP, 0)
 SCHED_FEAT(LAST_BUDDY, 1)
+SCHED_FEAT(MUTEX_SPIN, 1)
#63 lore raw

Re: [PATCH -v4][RFC]: mutex: implement adaptive spinning

Quoted 15 lines · Steven Rostedt

kernel/mutex.c line 15

Quoted 9 lines · Peter Zijlstra
kernel/mutex.c +3 -0
@@ -10,6 +10,10 @@
  * Many thanks to Arjan van de Ven, Thomas Gleixner, Steven Rostedt and
  * David Howells for suggestions and improvements.
  *
+ *  - Adaptive spinning for mutexes by Peter Zijlstra. (Ported to mainline
+ *    from the -rt tree, where it was originally implemented for rtmutexes
+ *    by Steven Rostedt, based on work by Gregory Haskins.)

I feel guilty with my name being the only one there for the rtmutexes. Thomas Gleixner, Ingo Molnar and Esben Nielsen also played large roles in that code.

Quoted 3 lines

And Peter Morreale and Sven Dietrich might also be mentioned next to Gregory's name.

If you are not talking about rtmutexes in general, and are just referencing the spinning part, then just group us all together:

Gregory Haskins, Steven Rostedt, Peter Morreale and Sven Dietrich.

Thanks,

-- Steve

maintainer
#64 lore raw

Re: [PATCH -v4][RFC]: mutex: implement adaptive spinning

In reply to Steven Rostedt
Quoted 1 line · Steven Rostedt

Peter, nice work!

Thanks!

Quoted 11 lines

Review

Quoted 5 lines
(quoted diff) +5 -0
+	}
+
+	if (!spin) {
+		schedstat_inc(this_rq(), mtx_sched);
+		__set_task_state(task, state);

I still do not know why you set state here instead of in the mutex code. Yes, you prevent changing the state if we do not schedule, but there's nothing wrong with setting it before hand. We may even be able to cache the owner and keep the locking of the wait_lock out of here. But then I see that it may be used to protect the sched_stat counters.

I was about to say because we need task_rq(owner) and can only deref owner while holding that lock, but I found a way around it by using task_cpu() which is exported.

Compile tested only so far...

---

include/linux/sched.h +2 -2
Index: linux-2.6/include/linux/sched.h
===================================================================
@@ -329,8 +329,8 @@ extern signed long schedule_timeout(sign
 extern signed long schedule_timeout_interruptible(signed long timeout);
 extern signed long schedule_timeout_killable(signed long timeout);
 extern signed long schedule_timeout_uninterruptible(signed long timeout);
-extern void mutex_spin_or_schedule(struct mutex_waiter *waiter, long state,
-				   unsigned long *flags);
+extern void mutex_spin_or_schedule(struct mutex_waiter *waiter,
+				   struct task_struct *owner, int cpu);
 asmlinkage void schedule(void);
 
 struct nsproxy;
kernel/mutex.c +13 -2
Index: linux-2.6/kernel/mutex.c
===================================================================
@@ -12,7 +12,8 @@
  *
  *  - Adaptive spinning for mutexes by Peter Zijlstra. (Ported to mainline
  *    from the -rt tree, where it was originally implemented for rtmutexes
- *    by Steven Rostedt, based on work by Gregory Haskins.)
+ *    by Steven Rostedt, based on work by Gregory Haskins, Peter Morreale
+ *    and Sven Dietrich.
  *
  * Also see Documentation/mutex-design.txt.
  */
@@ -157,6 +158,9 @@ __mutex_lock_common(struct mutex *lock, 
 	lock_contended(&lock->dep_map, ip);
 
 	for (;;) {
+		int cpu = 0;
+		struct task_struct *l_owner;
+
 		/*
 		 * Lets try to take the lock again - this is needed even if
 		 * we get here for the first time (shortly after failing to
@@ -184,8 +188,15 @@ __mutex_lock_common(struct mutex *lock, 
 			return -EINTR;
 		}
 
-		mutex_spin_or_schedule(&waiter, state, &flags);
+		__set_task_state(task, state);
+		l_owner = ACCESS_ONCE(lock->owner);
+		if (l_owner)
+			cpu = task_cpu(l_owner);
+		spin_unlock_mutex(&lock->wait_lock, flags);
+		mutex_spin_or_schedule(&waiter, l_owner, cpu);
+		spin_lock_mutex(&lock->wait_lock, flags);
 	}
+	__set_task_state(task, TASK_RUNNING);
 
 done:
 	lock_acquired(&lock->dep_map, ip);
kernel/sched.c +11 -17
Index: linux-2.6/kernel/sched.c
===================================================================
@@ -4600,42 +4600,37 @@ pick_next_task(struct rq *rq, struct tas
 	}
 }
 
-#ifdef CONFIG_DEBUG_MUTEXES
-# include "mutex-debug.h"
-#else
-# include "mutex.h"
-#endif
-
-void mutex_spin_or_schedule(struct mutex_waiter *waiter, long state,
-			    unsigned long *flags)
+void mutex_spin_or_schedule(struct mutex_waiter *waiter,
+			    struct task_struct *owner, int cpu)
 {
-	struct mutex *lock = waiter->lock;
 	struct task_struct *task = waiter->task;
-	struct task_struct *owner = lock->owner;
+	struct mutex *lock = waiter->lock;
 	struct rq *rq;
 	int spin = 0;
 
 	if (likely(sched_feat(MUTEX_SPIN) && owner)) {
-		rq = task_rq(owner);
+		rq = cpu_rq(cpu);
 		spin = (rq->curr == owner);
 	}
 
 	if (!spin) {
+		preempt_disable();
 		schedstat_inc(this_rq(), mtx_sched);
-		__set_task_state(task, state);
-		spin_unlock_mutex(&lock->wait_lock, *flags);
+		preempt_enable();
+
 		schedule();
-		spin_lock_mutex(&lock->wait_lock, *flags);
 		return;
 	}
 
+	preempt_disable();
 	schedstat_inc(this_rq(), mtx_spin);
-	spin_unlock_mutex(&lock->wait_lock, *flags);
+	preempt_enable();
+
 	for (;;) {
 		struct task_struct *l_owner;
 
 		/* Stop spinning when there's a pending signal. */
-		if (signal_pending_state(state, task))
+		if (signal_pending_state(task->state, task))
 			break;
 
 		/* Mutex got unlocked, try to acquire. */
@@ -4666,7 +4661,6 @@ void mutex_spin_or_schedule(struct mutex
 		 */
 		cpu_relax();
 	}
-	spin_lock_mutex(&lock->wait_lock, *flags);
 }
 
 /*
#65 lore raw

Re: [PATCH -v4][RFC]: mutex: implement adaptive spinning

In reply to Peter Zijlstra
Quoted 3 lines · Peter Zijlstra

Change mutex contention behaviour such that it will sometimes busy wait on acquisition - moving its behaviour closer to that of spinlocks.

Ok, this one looks _almost_ ok.

The only problem is that I think you've lost the UP case.

In UP, you shouldn't have the code to spin, and the "spin_or_schedule()" should fall back to just the schedule case.

It migth also be worthwhile to try to not set the owner, and re-organize that a bit (by making it a inline function that sets the owner only for CONFIG_SMP or lockdep/debug).

Linus

maintainer
#66 lore raw

RFC PATCH 1/1 : mutex: implement adaptive spinning

Quoted 8 lines · Linus Torvalds
Quoted 3 lines · Peter Zijlstra

Change mutex contention behaviour such that it will sometimes busy wait on acquisition - moving its behaviour closer to that of spinlocks.

Ok, this one looks _almost_ ok.

Quoted 8 lines

The only problem is that I think you've lost the UP case.

In UP, you shouldn't have the code to spin, and the "spin_or_schedule()" should fall back to just the schedule case.

It migth also be worthwhile to try to not set the owner, and re-organize that a bit (by making it a inline function that sets the owner only for CONFIG_SMP or lockdep/debug).

As you wish ;-)

---
Subject: mutex: implement adaptive spinning
From: Peter Zijlstra <[email protected]>
Date: Tue, 6 Jan 2009 12:32:12 +0100

Change mutex contention behaviour such that it will sometimes busy wait on acquisition - moving its behaviour closer to that of spinlocks.

This concept got ported to mainline from the -rt tree, where it was originally implemented for rtmutexes by Steven Rostedt, based on work by Gregory Haskins.

Testing with Ingo's test-mutex application (http://lkml.org/lkml/2006/1/8/50)
gave a 8% boost for VFS scalability on my testbox:

  # echo MUTEX_SPIN > /debug/sched_features
  # ./test-mutex V 16 10
  2 CPUs, running 16 parallel test-tasks.
  checking VFS performance.

avg ops/sec: 74910

  # echo NO_MUTEX_SPIN > /debug/sched_features
  # ./test-mutex V 16 10
  2 CPUs, running 16 parallel test-tasks.
  checking VFS performance.

avg ops/sec: 68804

The key criteria for the busy wait is that the lock owner has to be running on a (different) cpu. The idea is that as long as the owner is running, there is a fair chance it'll release the lock soon, and thus we'll be better off spinning instead of blocking/scheduling.

Since regular mutexes (as opposed to rtmutexes) do not atomically track the owner, we add the owner in a non-atomic fashion and deal with the races in the slowpath.

Furthermore, to ease the testing of the performance impact of this new code, there is means to disable this behaviour runtime (without having to reboot the system), when scheduler debugging is enabled (CONFIG_SCHED_DEBUG=y), by issuing the following command:

 # echo NO_MUTEX_SPIN > /debug/sched_features

This command re-enables spinning again (this is also the default):

 # echo MUTEX_SPIN > /debug/sched_features

There's also a few new statistic fields in /proc/sched_debug (available if CONFIG_SCHED_DEBUG=y and CONFIG_SCHEDSTATS=y):

 # grep mtx /proc/sched_debug
  .mtx_spin                      : 2387
  .mtx_sched                     : 2283
  .mtx_spin                      : 1277
  .mtx_sched                     : 1700
---
 include/linux/mutex.h   |    6 ++--
 include/linux/sched.h   |    2 +
 kernel/mutex-debug.c    |   10 -------
 kernel/mutex-debug.h    |   13 +++------
 kernel/mutex.c          |   66 +++++++++++++++++++++++++++++++++++++++++-------
 kernel/mutex.h          |   13 ++++++++-
 kernel/sched.c          |   63 +++++++++++++++++++++++++++++++++++++++++++++
 kernel/sched_debug.c    |    2 +
 kernel/sched_features.h |    1 
 9 files changed, 146 insertions(+), 30 deletions(-)
include/linux/mutex.h +4 -2
Index: linux-2.6/include/linux/mutex.h
===================================================================
@@ -50,8 +50,10 @@ struct mutex {
 	atomic_t		count;
 	spinlock_t		wait_lock;
 	struct list_head	wait_list;
+#if defined(CONFIG_DEBUG_MUTEXES) || defined(CONFIG_SMP)
+	struct task_struct	*owner;
+#endif
 #ifdef CONFIG_DEBUG_MUTEXES
-	struct thread_info	*owner;
 	const char 		*name;
 	void			*magic;
 #endif
@@ -67,8 +69,8 @@ struct mutex {
 struct mutex_waiter {
 	struct list_head	list;
 	struct task_struct	*task;
-#ifdef CONFIG_DEBUG_MUTEXES
 	struct mutex		*lock;
+#ifdef CONFIG_DEBUG_MUTEXES
 	void			*magic;
 #endif
 };
include/linux/sched.h +2 -0
Index: linux-2.6/include/linux/sched.h
===================================================================
@@ -329,6 +329,8 @@ extern signed long schedule_timeout(sign
 extern signed long schedule_timeout_interruptible(signed long timeout);
 extern signed long schedule_timeout_killable(signed long timeout);
 extern signed long schedule_timeout_uninterruptible(signed long timeout);
+extern void mutex_spin_or_schedule(struct mutex_waiter *waiter,
+				   struct task_struct *owner, int cpu);
 asmlinkage void schedule(void);
 
 struct nsproxy;
kernel/mutex-debug.c +1 -9
Index: linux-2.6/kernel/mutex-debug.c
===================================================================
@@ -26,11 +26,6 @@
 /*
  * Must be called with lock->wait_lock held.
  */
-void debug_mutex_set_owner(struct mutex *lock, struct thread_info *new_owner)
-{
-	lock->owner = new_owner;
-}
-
 void debug_mutex_lock_common(struct mutex *lock, struct mutex_waiter *waiter)
 {
 	memset(waiter, MUTEX_DEBUG_INIT, sizeof(*waiter));
@@ -59,7 +54,6 @@ void debug_mutex_add_waiter(struct mutex
 
 	/* Mark the current thread as blocked on the lock: */
 	ti->task->blocked_on = waiter;
-	waiter->lock = lock;
 }
 
 void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
@@ -80,9 +74,8 @@ void debug_mutex_unlock(struct mutex *lo
 		return;
 
 	DEBUG_LOCKS_WARN_ON(lock->magic != lock);
-	DEBUG_LOCKS_WARN_ON(lock->owner != current_thread_info());
+	DEBUG_LOCKS_WARN_ON(lock->owner != current);
 	DEBUG_LOCKS_WARN_ON(!lock->wait_list.prev && !lock->wait_list.next);
-	DEBUG_LOCKS_WARN_ON(lock->owner != current_thread_info());
 }
 
 void debug_mutex_init(struct mutex *lock, const char *name,
@@ -95,7 +88,6 @@ void debug_mutex_init(struct mutex *lock
 	debug_check_no_locks_freed((void *)lock, sizeof(*lock));
 	lockdep_init_map(&lock->dep_map, name, key, 0);
 #endif
-	lock->owner = NULL;
 	lock->magic = lock;
 }
 
kernel/mutex-debug.h +5 -8
Index: linux-2.6/kernel/mutex-debug.h
===================================================================
@@ -13,14 +13,6 @@
 /*
  * This must be called with lock->wait_lock held.
  */
-extern void
-debug_mutex_set_owner(struct mutex *lock, struct thread_info *new_owner);
-
-static inline void debug_mutex_clear_owner(struct mutex *lock)
-{
-	lock->owner = NULL;
-}
-
 extern void debug_mutex_lock_common(struct mutex *lock,
 				    struct mutex_waiter *waiter);
 extern void debug_mutex_wake_waiter(struct mutex *lock,
@@ -35,6 +27,11 @@ extern void debug_mutex_unlock(struct mu
 extern void debug_mutex_init(struct mutex *lock, const char *name,
 			     struct lock_class_key *key);
 
+static inline void mutex_set_owner(struct mutex *lock, struct task_struct *owner)
+{
+	lock->owner = owner;
+}
+
 #define spin_lock_mutex(lock, flags)			\
 	do {						\
 		struct mutex *l = container_of(lock, struct mutex, wait_lock); \
kernel/mutex.c +57 -9

154 lines not on this page · raw message

kernel/mutex.h +11 -2
Index: linux-2.6/kernel/mutex.h
===================================================================
@@ -16,8 +16,17 @@
 #define mutex_remove_waiter(lock, waiter, ti) \
 		__list_del((waiter)->list.prev, (waiter)->list.next)
 
-#define debug_mutex_set_owner(lock, new_owner)		do { } while (0)
-#define debug_mutex_clear_owner(lock)			do { } while (0)
+#ifdef CONFIG_SMP
+static inline void mutex_set_owner(struct mutex *lock, struct task_struct *owner)
+{
+	lock->owner = owner;
+}
+#else
+static inline void mutex_set_owner(struct mutex *lock, struct task_struct *owner)
+{
+}
+#endif
+
 #define debug_mutex_wake_waiter(lock, waiter)		do { } while (0)
 #define debug_mutex_free_waiter(waiter)			do { } while (0)
 #define debug_mutex_add_waiter(lock, waiter, ti)	do { } while (0)
kernel/sched.c +63 -0

75 lines not on this page · raw message

kernel/sched_debug.c +2 -0
Index: linux-2.6/kernel/sched_debug.c
===================================================================
@@ -288,6 +288,8 @@ static void print_cpu(struct seq_file *m
 
 	P(bkl_count);
 
+	P(mtx_spin);
+	P(mtx_sched);
 #undef P
 #endif
 	print_cfs_stats(m, cpu);
kernel/sched_features.h +1 -0
Index: linux-2.6/kernel/sched_features.h
===================================================================
@@ -13,3 +13,4 @@ SCHED_FEAT(LB_WAKEUP_UPDATE, 1)
 SCHED_FEAT(ASYM_EFF_LOAD, 1)
 SCHED_FEAT(WAKEUP_OVERLAP, 0)
 SCHED_FEAT(LAST_BUDDY, 1)
+SCHED_FEAT(MUTEX_SPIN, 1)
#326 lore raw

Re: [PATCH -v4][RFC]: mutex: implement adaptive spinning

In reply to Linus Torvalds
Quoted 8 lines · Linus Torvalds
Quoted 3 lines · Peter Zijlstra

Change mutex contention behaviour such that it will sometimes busy wait on acquisition - moving its behaviour closer to that of spinlocks.

Ok, this one looks _almost_ ok.

Quoted 8 lines

The only problem is that I think you've lost the UP case.

In UP, you shouldn't have the code to spin, and the "spin_or_schedule()" should fall back to just the schedule case.

It migth also be worthwhile to try to not set the owner, and re-organize that a bit (by making it a inline function that sets the owner only for CONFIG_SMP or lockdep/debug).

So far I haven't found any btrfs benchmarks where this is slower than mutexes without any spinning. But, it isn't quite as fast as the btrfs spin.

I'm using three different benchmarks, and they hammer on different things. All against btrfs and a single sata drive.

* dbench -t 30 50, which means run dbench 50 for 30 seconds. It is a
broad workload that hammers on lots of code, but it also tends to go faster when things are less fair. These numbers are stable across runs. Some IO is done at the very start of the run, but the bulk of the run is CPU bound in various btrfs btrees.

Plain mutex: dbench reports 240MB/s
Simple spin: dbench reports 560MB/s
Peter's v4: dbench reports 388MB/s

* 50 procs creating 10,000 files (4k each), one dir per proc. The result is 50 dirs and each dir has 10,000 files. This is mostly CPU bound for the procs, but pdflush and friends are doing lots of IO.

Plain mutex: avg: 115 files/s avg system time for each proc: 1.6s Simple spin: avg: 152 files/s avg system time for each proc: 2s Peter's v4: avg: 130 files/s avg system time for each proc: 2.9s

I would have expected Peter's patch to use less system time than my spin. If I change his patch to limit the spin to 512 iterations (same as my code), the system time goes back down to 1.7s, but the files/s doesn't improve.

* Parallel stat: the last benchmark is the most interesting, since it really hammers on the btree locking speed. I take the directory tree the file creation run (50 dirs, 10,000 files each) and have 50 procs running stat on all the files in parallel.

Before the run I clear the inode cache but leave the page cache. So, everything is hot in the btree but there are no inodes in cache.

Plain mutex: 9.488s real, 8.6 sys
Simple spin: 3.8s real 13.8s sys
Peter's v4: 7.9s real 8.5s sys

-chris

#327 lore raw

Re: [PATCH -v4][RFC]: mutex: implement adaptive spinning

Quoted 4 lines · Chris Mason

So far I haven't found any btrfs benchmarks where this is slower than mutexes without any spinning. But, it isn't quite as fast as the btrfs spin.

Quite frankly, from our history with ext3 and other filesystems, using a mutex in the filesystem is generally the wrong thing to do anyway.

Are you sure you can't just use a spinlock, and just release it over IO? The "have to do IO or extend the btree" case is usually pretty damn clear.

Because it really sounds like you're lock-limited, and you should just try to clean it up. A pure "just spinlock" in the hotpath is always going to be better.

Linus

#328 lore raw

Re: [PATCH -v4][RFC]: mutex: implement adaptive spinning

Quoted 10 lines · Linus Torvalds
Quoted 4 lines · Chris Mason

So far I haven't found any btrfs benchmarks where this is slower than mutexes without any spinning. But, it isn't quite as fast as the btrfs spin.

Quite frankly, from our history with ext3 and other filesystems, using a mutex in the filesystem is generally the wrong thing to do anyway.

Quoted 6 lines

Are you sure you can't just use a spinlock, and just release it over IO? The "have to do IO or extend the btree" case is usually pretty damn clear.

Because it really sounds like you're lock-limited, and you should just try to clean it up. A pure "just spinlock" in the hotpath is always going to be better.

There are definitely ways I can improve performance for contention in the hot btree nodes, and I think it would be a mistake to tune the generic adaptive locks just for my current code.

But, it isn't a bad test case to compare the spin with the new patch and with the plain mutex. If the adaptive code gets in, I think it would be best for me to drop the spin.

Either way there's more work to be done in the btrfs locking code.

-chris

#361 lore raw
In reply to David Woodhouse
Quoted 11 lines · David Woodhouse

On Tue, 2009-01-06 at 14:41 -0500, Chris Mason wrote:

One more thing I'd suggest is removing the INSTALL file. The parts about having to build libcrc32c aren't relevant when it's part of the kernel tree and you have 'select LIBCRC32C', and the documentation on the userspace utilities probably lives _with_ the userspace repo. Might be worth adding a pointer to the userspace utilities though, in Documentation/filesystems/btrfs.txt

I think you can drop your own copy of the GPL too.

I've pushed out your patch for this, thanks.

-chris

#67 lore raw

Re: [PATCH -v5][RFC]: mutex: implement adaptive spinning

In reply to Peter Zijlstra

Ok a few more issues. This never stops.

Here's the basic spinloop:

Review

Quoted 7 lines · Peter Zijlstra
(quoted diff) +6 -0
+	for (;;) {
+		struct task_struct *l_owner;
+
+		/* Stop spinning when there's a pending signal. */
+		if (signal_pending_state(task->state, task))
+			break;

This just can't be right. If we have signal latency issues, we have way way _way_ bigger issues.

So the correct test is to just break out if we have any work at all, whether it's signals or rescheduling. Yes, you probably never saw that in RT, but that was because you have preemption on etc. And obviously usually there isn't enough constant contention to trigger anything like this anyway, so usually the wait is short either because the owner ends up sleeping, or because the owner releases the semaphore.

But you could have starvation issues where everybody is all on CPU, and other processes constantly get the semaphore, and latency is absolutely HORRIBLE because of this guy just busy-looping all the time.

So at a minimum, add a couple of "if (need_resched())" calls.

However, the other thing that really strikes me is that we've done all that insane work to add ourselves to the waiter lists etc, and _then_ we start spinning. Again, that can't be right: if there are other people on the waiter list, we should not spin - because it's going to be really really unfair to take the lock from them!

So we should do all this spinning ONLY IF there are no other waiters, ie everybody else is spinning too!

Anything else sounds just horribly broken due to the extreme unfairness of it all. Those things are supposed to be fair.

What does that mean? It means that the spinning loop should also check that the wait-queue was empty. But it can't do that, because the way this whole adaptive spinning was done is _inside_ the slow path that already added itself to the waiting list - so you cannot tell if there are other spinners.

So I think that the spinning is actually done in the wrong place. It _should_ be done at the very top of __mutex_lock_common, _before_ we've done that lock->wait_list thing etc. That also makes us only spin at the beginning, and if we start sleeping, we don't suddenly go back to spinning again.

That in turn would mean that we should try to do this spinning without any locks. I think it's doable. I think it's also doable to spin _without_ dirtying the cacheline further and bouncing it due to the spinlock. We can really do the spinning by just reading that lock, and the only time we want to write is when we see the lock releasing.

Something like this..

NOTE NOTE NOTE! This does _not_ implement "spin_on_owner(lock, owner);". That's the thing that the scheduler needs to do, with the extra interesting part of needing to be able to access the thread_info struct without knowing whether it might possibly have exited already.

But we can do that with __get_user(thread_info->cpu) (very unlikely page fault protection due to the possibility of CONFIG_DEBUG_PAGEALLOC) and then validating the cpu. It it's in range, we can use it and verify whether cpu_rq(cpu)->curr has that thread_info.

So we can do all that locklessly and optimistically, just going back and verifying the results later. This is why "thread_info" is actually a better thing to use than "task_struct" - we can look up the cpu in it with a simple dereference. We knew the pointer _used_ to be valid, so in any normal situation, it will never page fault (and if you have CONFIG_DEBUG_PAGEALLOC and hit a very unlucky race, then performance isn't your concern anyway: we just need to make the page fault be non-lethal ;)

Linus

---
 kernel/mutex.c |   30 ++++++++++++++++++++++++++++--
 1 files changed, 28 insertions(+), 2 deletions(-)
kernel/mutex.c +28 -2
index 4f45d4b..65525d0 100644
@@ -120,6 +120,8 @@ void __sched mutex_unlock(struct mutex *lock)
 
 EXPORT_SYMBOL(mutex_unlock);
 
+#define MUTEX_SLEEPERS (-1000)
+
 /*
  * Lock a mutex (possibly interruptible), slowpath:
  */
@@ -132,6 +134,30 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
 	unsigned int old_val;
 	unsigned long flags;
 
+#ifdef CONFIG_SMP
+	/* Optimistic spinning.. */
+	for (;;) {
+		struct thread_struct *owner;
+		int oldval = atomic_read(&lock->count);
+
+		if (oldval <= MUTEX_SLEEPERS)
+			break;
+		if (oldval == 1) {
+			oldval = atomic_cmpxchg(&lock->count, oldval, 0);
+			if (oldval == 1) {
+				lock->owner = task_thread_info(task);
+				return 0;
+			}
+		} else {
+			/* See who owns it, and spin on him if anybody */
+			owner = lock->owner;
+			if (owner)
+				spin_on_owner(lock, owner);
+		}
+		cpu_relax();
+	}
+#endif
+
 	spin_lock_mutex(&lock->wait_lock, flags);
 
 	debug_mutex_lock_common(lock, &waiter);
@@ -142,7 +168,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
 	list_add_tail(&waiter.list, &lock->wait_list);
 	waiter.task = task;
 
-	old_val = atomic_xchg(&lock->count, -1);
+	old_val = atomic_xchg(&lock->count, MUTEX_SLEEPERS);
 	if (old_val == 1)
 		goto done;
 
@@ -158,7 +184,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
 		 * that when we release the lock, we properly wake up the
 		 * other waiters:
 		 */
-		old_val = atomic_xchg(&lock->count, -1);
+		old_val = atomic_xchg(&lock->count, MUTEX_SLEEPERS);
 		if (old_val == 1)
 			break;
 
#68 lore raw

Re: [PATCH -v5][RFC]: mutex: implement adaptive spinning

Quoted 8 lines · Linus Torvalds

So we can do all that locklessly and optimistically, just going back and verifying the results later. This is why "thread_info" is actually a better thing to use than "task_struct" - we can look up the cpu in it with a simple dereference. We knew the pointer _used_ to be valid, so in any normal situation, it will never page fault (and if you have CONFIG_DEBUG_PAGEALLOC and hit a very unlucky race, then performance isn't your concern anyway: we just need to make the page fault be non-lethal ;)

Wow, and I thought I do some crazy things with side effects of different kernel characteristics. So basically, since the owner use to be valid and we take the cpu number directly from the thread_info struct, we do not need to worry about page faulting.

Next comes the issue to know if the owner is still running. Wouldn't we need to do something like

	if (task_thread_info(cpu_rq(cpu)->curr) == owner)

I guess that would have the same characteristic, that even if the task struct of cpu_rq(cpu)->curr was freed, we can still reference the thread_info. Although, we might get garbage, but we don't care.

I understand that this should not be a problem, but I'm afraid it will give me nightmares at night. ;-)

God that code had better be commented well.

-- Steve

#69 lore raw

Re: [PATCH -v5][RFC]: mutex: implement adaptive spinning

Quoted 5 lines · Steven Rostedt

Next comes the issue to know if the owner is still running. Wouldn't we need to do something like

	if (task_thread_info(cpu_rq(cpu)->curr) == owner)

Yes. After verifying that "cpu" is in a valid range.

Quoted 4 lines

I understand that this should not be a problem, but I'm afraid it will give me nightmares at night. ;-)

God that code had better be commented well.

Well, the good news is that it really would be just a few - admittedly very subtle - lines, each basically generating just a couple of machine instructions. So we'd be looking at code where the actual assembly output should hopefully be in the ten-to-twenty instruction range, and the C code itself would be about five times as many comments as actual real lines.

So the code really shouldn't be much worse than

	/*
	 * Look out! "thread" is an entirely speculative pointer
	 * access and not reliable.
	 */
	void loop_while_oncpu(struct mutex *lock, struct thread_struct *thread)
	{
		for (;;) {
			unsigned cpu;
			struct runqueue *rq;

			if (lock->owner != thread)
				break;

			/*
			 * Need to access the cpu field knowing that
			 * DEBUG_PAGEALLOC could have unmapped it if
			 * the mutex owner just released it and exited.
			 */
			if (__get_user(cpu, &thread->cpu))
				break;

			/*
			 * Even if the access succeeded (likely case),
			 * the cpu field may no longer be valid. FIXME:
			 * this needs to validate that we can do a
			 * get_cpu() and that we have the percpu area.
			 */
			if (cpu >= NR_CPUS)
				break;

			if (!cpu_online(cpu))
				break;

			/*
			 * Is that thread really running on that cpu?
			 */
			rq = cpu_rq(cpu);
			if (task_thread_info(rq->curr) != thread)
				break;

			cpu_relax();
		}
	}

and it all looks like it shouldn't be all that bad. Yeah, it's like 50 lines of C code, but it's mostly comments about subtle one-liners that really expand to almost no real code at all.

Linus

#70 lore raw

Re: [PATCH -v5][RFC]: mutex: implement adaptive spinning

Quoted 9 lines · Linus Torvalds
	void loop_while_oncpu(struct mutex *lock, struct thread_struct *thread)
	{
		for (;;) {
			unsigned cpu;
			struct runqueue *rq;

			if (lock->owner != thread)
				break;
Quoted 7 lines
			/*
			 * Need to access the cpu field knowing that
			 * DEBUG_PAGEALLOC could have unmapped it if
			 * the mutex owner just released it and exited.
			 */
			if (__get_user(cpu, &thread->cpu))
				break;

I appreciate this is sample code, but using __get_user() on non-userspace pointers messes up architectures which have separate user/kernel spaces (eg the old 4G/4G split for x86-32). Do we have an appropriate function for kernel space pointers? Is this a good reason to add one?

Signature · 4 lines
Matthew Wilcox				Intel Open Source Technology Centre
"Bill, look, we understand that you're interested in selling us this
operating system, but compare it to ours.  We can't possibly take such
a retrograde step."
#324 lore raw

Re: [PATCH -v5][RFC]: mutex: implement adaptive spinning

In reply to Linus Torvalds
Quoted 5 lines

But we can do that with __get_user(thread_info->cpu) (very unlikely page fault protection due to the possibility of CONFIG_DEBUG_PAGEALLOC) and then validating the cpu. It it's in range, we can use it and verify whether cpu_rq(cpu)->curr has that thread_info.

Quoted 7 lines

So we can do all that locklessly and optimistically, just going back and verifying the results later. This is why "thread_info" is actually a better thing to use than "task_struct" - we can look up the cpu in it with a simple dereference. We knew the pointer _used_ to be valid, so in any normal situation, it will never page fault (and if you have CONFIG_DEBUG_PAGEALLOC and hit a very unlucky race, then performance isn't your concern anyway: we just need to make the page fault be non-lethal ;)

The problem with probe_kernel_address() is that it does lots of operations around the access in the hot path (set_fs, pagefault_disable etc.), so i'm not sure that's a good idea.

Sure you can probably do better, but that would involve patching all architectures won't it? Ok I suppose you could make an ARCH_HAS_blabla white list, but that wouldn't be exactly pretty.

-Andi

#71 lore raw

Re: [PATCH -v5][RFC]: mutex: implement adaptive spinning

In reply to Matthew Wilcox
Quoted 6 lines · Matthew Wilcox

I appreciate this is sample code, but using __get_user() on non-userspace pointers messes up architectures which have separate user/kernel spaces (eg the old 4G/4G split for x86-32). Do we have an appropriate function for kernel space pointers? Is this a good reason to add one?

Yes, you're right.

We could do the whole "oldfs = get_fs(); set_fs(KERNEL_DS); .. set_fs(oldfs);" crud, but it would probably be better to just add an architected accessor. Especially since it's going to generally just be a

	#define get_kernel_careful(val,p) __get_user(val,p)

for most architectures.

We've needed that before (and yes, we've simply mis-used __get_user() on x86 before rather than add it).

Linus

#76 lore raw

Re: [PATCH -v5][RFC]: mutex: implement adaptive spinning

In reply to Matthew Wilcox
Quoted 4 lines

I appreciate this is sample code, but using __get_user() on non-userspace pointers messes up architectures which have separate user/kernel spaces (eg the old 4G/4G split for x86-32). Do we have an appropriate function for kernel space pointers?

probe_kernel_address().

But it's slow.

-Andi

Signature · 1 line
[email protected]
#95 lore raw

Re: [PATCH -v5][RFC]: mutex: implement adaptive spinning

In reply to Linus Torvalds
Quoted 5 lines · Linus Torvalds

/*
* Even if the access succeeded (likely case),
* the cpu field may no longer be valid. FIXME:
* this needs to validate that we can do a
* get_cpu() and that we have the percpu area.

s/get_cpu/cpu_rq ?

Quoted 6 lines
			 */
			if (cpu >= NR_CPUS)
				break;

			if (!cpu_online(cpu))
				break;

Regarding the FIXME, this should be safe already - at least on x86 we set up all the possible-cpus-mask per CPU areas during bootup. So any CPU that is online, will have a percpu area. (even in the most racy case)

Ingo

#72 lore raw

Re: [PATCH -v5][RFC]: mutex: implement adaptive spinning

In reply to Linus Torvalds
Quoted 16 lines · Linus Torvalds
Quoted 6 lines · Matthew Wilcox

I appreciate this is sample code, but using __get_user() on non-userspace pointers messes up architectures which have separate user/kernel spaces (eg the old 4G/4G split for x86-32). Do we have an appropriate function for kernel space pointers? Is this a good reason to add one?

Yes, you're right.

We could do the whole "oldfs = get_fs(); set_fs(KERNEL_DS); .. set_fs(oldfs);" crud, but it would probably be better to just add an architected accessor. Especially since it's going to generally just be a

Quoted 6 lines
	#define get_kernel_careful(val,p) __get_user(val,p)

for most architectures.

We've needed that before (and yes, we've simply mis-used __get_user() on x86 before rather than add it).

for the oldfs stuff we already have probe_kernel_read(). OTOH, that involves pagefault_disable() which is an atomic op, so __get_user_careful() should be much more lightweight - and we already know that the memory range at least _used to_ be a valid kernel address.

(Theoretical race: with memory hotplug that kernel pointer address could have gotten unmapped and we could get device memory there - with side-effects if accessed. Wont happen in practice.)

Ingo

#325 lore raw

Re: [PATCH -v5][RFC]: mutex: implement adaptive spinning

In reply to Andi Kleen
Quoted 13 lines · On Wed, 7 Jan 2009 22:37:40 +0100 Andi Kleen <[email protected]> wrote:
Quoted 5 lines

But we can do that with __get_user(thread_info->cpu) (very unlikely page fault protection due to the possibility of CONFIG_DEBUG_PAGEALLOC) and then validating the cpu. It it's in range, we can use it and verify whether cpu_rq(cpu)->curr has that thread_info.

Quoted 7 lines

So we can do all that locklessly and optimistically, just going back and verifying the results later. This is why "thread_info" is actually a better thing to use than "task_struct" - we can look up the cpu in it with a simple dereference. We knew the pointer _used_ to be valid, so in any normal situation, it will never page fault (and if you have CONFIG_DEBUG_PAGEALLOC and hit a very unlucky race, then performance isn't your concern anyway: we just need to make the page fault be non-lethal ;)

Quoted 3 lines

The problem with probe_kernel_address() is that it does lots of operations around the access in the hot path (set_fs, pagefault_disable etc.), so i'm not sure that's a good idea.

probe_kernel_address() isn't tooooo bad - a few reads and writes into the task_struct and thread_struct. And we're on the slow, contended path here anyway..

#75 lore raw

Re: [PATCH -v5][RFC]: mutex: implement adaptive spinning

In reply to Linus Torvalds
Quoted 3 lines · Linus Torvalds

We've needed that before (and yes, we've simply mis-used __get_user() on x86 before rather than add it).

Ahh, yeah, we have a really broken form of this in probe_kernel_address(), but it's disgustingly slow. And it actually does a whole lot more, since it is designed for addresses that we can't trust.

The thing about "thread->cpu" is that we can actually _trust_ the address, so we know it's not a user address or anything like that. So we don't need the whole pagefault_disable/enable around it. At least the x86 page fault handler knows that it absolutely must not take the mm semaphore for these things, for example (because it would be an insta-deadlock for the vmalloc space and thus any mm fault handlers in filesystems that are modules).

So we would be better off without that, but we could certainly also improve probe_kernel_address() if we had a better model. IOW, we *could* do something like

	#define get_kernel_mode(val, addr) __get_user(val, addr)

on the simple platforms, and then in the generic <linux/uaccess.h> code we can just do

	#ifndef get_kernel_mode
	 #define get_kernel_mode(val, addr) ({  \
		long _err;			\
		mm_segment_t old_fs = get_fs(); \
		set_fs(KERNEL_DS);		\
		_err = __get_user(val, addr);	\
		set_fs(old_fs);			\
		_err; })
	#endif

and then probe_kernel_address becomes

	#define probe_kernel_address(addr, val) ({	\
		long _err;				\
		pagefault_disable();			\
		_err = get_kernel_mode(val, addr);	\
		pagefault_enable();			\
		_err; })

which leaves all architectures with the trivial option to just define their own 'get_kernel_mode()' thing that _often_ is exactly the same as __get_user().

Hmm? Anybody want to test it?

Linus

#73 lore raw

Re: [PATCH -v5][RFC]: mutex: implement adaptive spinning

In reply to Ingo Molnar
Quoted 6 lines · On Wed, 7 Jan 2009 22:32:22 +0100 Ingo Molnar <[email protected]> wrote:
Quoted 6 lines

We could do the whole "oldfs = get_fs(); set_fs(KERNEL_DS); .. set_fs(oldfs);" crud, but it would probably be better to just add an architected accessor. Especially since it's going to generally just be a

	#define get_kernel_careful(val,p) __get_user(val,p)
Quoted 7 lines
Quoted 4 lines

for most architectures.

We've needed that before (and yes, we've simply mis-used __get_user() on x86 before rather than add it).

for the oldfs stuff we already have probe_kernel_read(). OTOH, that involves pagefault_disable() which is an atomic op

tisn't. pagefault_disable() is just preempt_count()+=1;barrier() ?

Am suspecting that you guys might be over-optimising this contended-path-were-going-to-spin-anyway code?

maintainer
#96 lore raw

Re: [PATCH -v5][RFC]: mutex: implement adaptive spinning

In reply to Linus Torvalds
Quoted 35 lines · Linus Torvalds
	/*
	 * Look out! "thread" is an entirely speculative pointer
	 * access and not reliable.
	 */
	void loop_while_oncpu(struct mutex *lock, struct thread_struct *thread)
	{
		for (;;) {
			unsigned cpu;
			struct runqueue *rq;

			if (lock->owner != thread)
				break;

			/*
			 * Need to access the cpu field knowing that
			 * DEBUG_PAGEALLOC could have unmapped it if
			 * the mutex owner just released it and exited.
			 */
			if (__get_user(cpu, &thread->cpu))
				break;

			/*
			 * Even if the access succeeded (likely case),
			 * the cpu field may no longer be valid. FIXME:
			 * this needs to validate that we can do a
			 * get_cpu() and that we have the percpu area.
			 */
			if (cpu >= NR_CPUS)
				break;

			if (!cpu_online(cpu))
				break;

			/*
			 * Is that thread really running on that cpu?
Quoted 8 lines
			 */
			rq = cpu_rq(cpu);
			if (task_thread_info(rq->curr) != thread)
				break;

			cpu_relax();
		}
	}

Do we really have to re-do all that code every loop?

        void loop_while_oncpu(struct mutex *lock, struct thread_struct *thread)
        {
                unsigned cpu;
                struct runqueue *rq;

                /*
                 * Need to access the cpu field knowing that
                 * DEBUG_PAGEALLOC could have unmapped it if
                 * the mutex owner just released it and exited.
                 */
                if (__get_user(cpu, &thread->cpu))
                        break;

                /*
                 * Even if the access succeeded (likely case),
                 * the cpu field may no longer be valid. FIXME:
                 * this needs to validate that we can do a
                 * get_cpu() and that we have the percpu area.
                 */
                if (cpu >= NR_CPUS)
                        break;

                if (!cpu_online(cpu))
                        break;

                rq = cpu_rq(cpu);

                for (;;) {
                        if (lock->owner != thread)
                                break;

                        /*
                         * Is that thread really running on that cpu?
                         */
                        if (task_thread_info(rq->curr) != thread)
                                break;

                        cpu_relax();
                }
        }

Also, it would still need to do the funny:

l_owner = ACCESS_ONCE(lock->owner)
if (l_owner && l_owner != thread)
break;

thing, to handle the premature non-atomic lock->owner tracking.

#74 lore raw

Re: [PATCH -v5][RFC]: mutex: implement adaptive spinning

In reply to Andrew Morton
Quoted 11 lines · Andrew Morton
Quoted 8 lines · On Wed, 7 Jan 2009 22:32:22 +0100 Ingo Molnar <[email protected]> wrote:
Quoted 8 lines

We could do the whole "oldfs = get_fs(); set_fs(KERNEL_DS); .. set_fs(oldfs);" crud, but it would probably be better to just add an architected accessor. Especially since it's going to generally just be a

	#define get_kernel_careful(val,p) __get_user(val,p)

for most architectures.

Quoted 7 lines
Quoted 5 lines
Quoted 2 lines

We've needed that before (and yes, we've simply mis-used __get_user() on x86 before rather than add it).

for the oldfs stuff we already have probe_kernel_read(). OTOH, that involves pagefault_disable() which is an atomic op

tisn't. pagefault_disable() is just preempt_count()+=1;barrier() ?

okay. Not an atomic (which is plenty fast on Nehalem with 20 cycles anyway), but probe_kernel_read() is expensive nevertheless:

ffffffff8027c092 <probe_kernel_read>:
ffffffff8027c092: 65 48 8b 04 25 10 00 mov %gs:0x10,%rax
ffffffff8027c099: 00 00

ffffffff8027c09b:	53                   	push   %rbx
ffffffff8027c09c:	48 8b 98 48 e0 ff ff 	mov    -0x1fb8(%rax),%rbx
ffffffff8027c0a3:	48 c7 80 48 e0 ff ff 	movq   $0xffffffffffffffff,-0x1fb8(%rax)
ffffffff8027c0aa:	ff ff ff ff 
ffffffff8027c0ae:	65 48 8b 04 25 10 00 	mov    %gs:0x10,%rax
ffffffff8027c0b5:	00 00 
ffffffff8027c0b7:	ff 80 44 e0 ff ff    	incl   -0x1fbc(%rax)
ffffffff8027c0bd:	e8 0e dd 0d 00       	callq  ffffffff80359dd0 <__copy_from_user_inatomic>
ffffffff8027c0c2:	65 48 8b 14 25 10 00 	mov    %gs:0x10,%rdx

ffffffff8027c0c9: 00 00
ffffffff8027c0cb: ff 8a 44 e0 ff ff decl -0x1fbc(%rdx)
ffffffff8027c0d1: 65 48 8b 14 25 10 00 mov %gs:0x10,%rdx
ffffffff8027c0d8: 00 00

ffffffff8027c0da:	48 83 f8 01          	cmp    $0x1,%rax
ffffffff8027c0de:	48 89 9a 48 e0 ff ff 	mov    %rbx,-0x1fb8(%rdx)
ffffffff8027c0e5:	48 19 c0             	sbb    %rax,%rax
ffffffff8027c0e8:	48 f7 d0             	not    %rax
ffffffff8027c0eb:	48 83 e0 f2          	and    $0xfffffffffffffff2,%rax
ffffffff8027c0ef:	5b                   	pop    %rbx

ffffffff8027c0f0: c3 retq
ffffffff8027c0f1: 90 nop

where __copy_user_inatomic() goes into the full __copy_generic_unrolled(). Not pretty.

Quoted 2 lines

Am suspecting that you guys might be over-optimising this contended-path-were-going-to-spin-anyway code?

not sure. Especially for 'good' locking usage - where there are shortly held locks and the spin times are short, the average time to get _out_ of the spinning section is a kind of secondary fastpath as well.

Ingo

#97 lore raw

Re: [PATCH -v5][RFC]: mutex: implement adaptive spinning

In reply to Peter Zijlstra
Quoted 2 lines · Peter Zijlstra

Do we really have to re-do all that code every loop?

No, you're right, we can just look up the cpu once. Which makes Andrew's argument that "probe_kernel_address()" isn't in any hot path even more true.

Quoted 5 lines

Also, it would still need to do the funny:

l_owner = ACCESS_ONCE(lock->owner)
if (l_owner && l_owner != thread)
break;

Why? That would fall out of the

	if (lock->owner != thread)
		break;

part. We don't actually care that it only happens once: this all has _known_ races, and the "cpu_relax()" is a barrier.

And notice how the _caller_ handles the "owner == NULL" case by not even calling this, and looping over just the state in the lock itself. That was in the earlier emails. So this approach is actually pretty different from the case that depended on the whole spinlock thing.

Linus

#98 lore raw

Re: [PATCH -v5][RFC]: mutex: implement adaptive spinning

Quoted 3 lines · Linus Torvalds

We don't actually care that it only happens once: this all has _known_ races, and the "cpu_relax()" is a barrier.

I phrased that badly. It's not that it has "known races", it's really that the whole code sequence is very much written and intended to be optimistic.

So whatever code motion or whatever CPU memory ordering motion that happens, we don't really care, because none of the tests are final. We do need to make sure that the compiler doesn't optimize the loads out of the loops _entirely_, but the "cpu_relax()" things that we need for other reasons guarantee that part.

One related issue: since we avoid the spinlock, we now suddenly end up relying on the "atomic_cmpxchg()" having lock acquire memory ordering semantics. Because _that_ is the one non-speculative thing we do end up doing in the whole loop.

But atomic_cmpxchg() is currently defined to be a full memory barrier, so we should be ok. The only issue might be that it's _too_ much of a memory barrier for some architectures, but this is not the pure fastpath, so I think we're all good.

Linus

maintainer
#99 lore raw

Re: [PATCH -v5][RFC]: mutex: implement adaptive spinning

In reply to Linus Torvalds
Quoted 20 lines · Linus Torvalds
Quoted 2 lines · Peter Zijlstra

Do we really have to re-do all that code every loop?

No, you're right, we can just look up the cpu once. Which makes Andrew's argument that "probe_kernel_address()" isn't in any hot path even more true.

Quoted 5 lines

Also, it would still need to do the funny:

l_owner = ACCESS_ONCE(lock->owner)
if (l_owner && l_owner != thread)
break;

Why? That would fall out of the

	if (lock->owner != thread)
		break;
Quoted 7 lines

part. We don't actually care that it only happens once: this all has _known_ races, and the "cpu_relax()" is a barrier.

And notice how the _caller_ handles the "owner == NULL" case by not even calling this, and looping over just the state in the lock itself. That was in the earlier emails. So this approach is actually pretty different from the case that depended on the whole spinlock thing.

Ah, so now you do loop on !owner, previuosly you insisted we'd go to sleep on !owner. Yes, with !owner spinning that is indeed not needed.

Quoted 13 lines
kernel/mutex.c +13 -0
+#ifdef CONFIG_SMP
+	/* Optimistic spinning.. */
+	for (;;) {
+		struct thread_struct *owner;
+		int oldval = atomic_read(&lock->count);
+
+		if (oldval <= MUTEX_SLEEPERS)
+			break;
+		if (oldval == 1) {
+			oldval = atomic_cmpxchg(&lock->count, oldval, 0);
+			if (oldval == 1) {
+				lock->owner = task_thread_info(task);
+				return 0;

kernel/mutex.c __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass, · line 159

Quoted 10 lines
kernel/mutex.c +10 -0
+			}
+		} else {
+			/* See who owns it, and spin on him if anybody */
+			owner = lock->owner;
+			if (owner)
+				spin_on_owner(lock, owner);
+		}
+		cpu_relax();
+	}
+#endif

Hmm, still wouldn't the spin_on_owner() loopyness and the above need that need_resched() check you mentioned to that it can fall into the slow path and go to sleep?

#77 lore raw

Re: [PATCH -v5][RFC]: mutex: implement adaptive spinning

In reply to Andi Kleen
Quoted 6 lines · Andi Kleen
Quoted 5 lines

I appreciate this is sample code, but using __get_user() on non-userspace pointers messes up architectures which have separate user/kernel spaces (eg the old 4G/4G split for x86-32). Do we have an appropriate function for kernel space pointers?

Quoted 7 lines

probe_kernel_address().

But it's slow.

-Andi

Can I ask a simple question in light of all this discussion?

"Is get_task_struct() really that bad?"

I have to admit you guys have somewhat lost me on some of the more recent discussion, so its probably just a case of being naive on my part...but this whole thing seems to have become way more complex than it needs to be. Lets boil this down to the core requirements: We need to know if the owner task is still running somewhere in the system as a predicate to whether we should sleep or spin, period. Now the question is how to do that.

The get/put task is the obvious answer to me (as an aside, we looked at task->oncpu rather than the rq->curr stuff which I believe was better), and I am inclined to think that is perfectly reasonable way to do this:
After all, even if acquiring a reference is somewhat expensive (which I don't really think it is on a modern processor), we are already in the slowpath as it is and would sleep otherwise.

Steve proposed a really cool trick with RCU since we know that the task cannot release while holding the lock, and the pointer cannot go away without waiting for a grace period. It turned out to introduce latency side-effects so it ultimately couldn't be used (and this was in no way a knock against RCU or you, Paul..just wasn't the right tool for the job it turned out).

Ok, so onto other ideas. What if we simply look at something like a scheduling sequence id. If we know (within the wait-lock) that task X is the owner and its on CPU A, then we can simply monitor if A context switches. Having something like rq[A]->seq++ every time we schedule() would suffice and you wouldnt need to hold a task reference...just note A=X->cpu from inside the wait-lock. I guess the downside there is putting that extra increment in the schedule() hotpath even if no-one cares, but I would surmise that should be reasonably cheap when no-one is pulling the cacheline around other than A (i.e. no observers).

But anyway, my impression from observing the direction this discussion has taken is that it is being way way over optimized before we even know if a) the adaptive stuff helps, and b) the get/put-ref hurts. Food for thought.

-Greg

#78 lore raw

Re: [PATCH -v5][RFC]: mutex: implement adaptive spinning

Quoted 3 lines · Gregory Haskins

Can I ask a simple question in light of all this discussion?

"Is get_task_struct() really that bad?"

it dirties a cacheline and it also involves atomics.

Also, it's a small design cleanliness issue to me: get_task_struct() impacts the lifetime of an object - and if a locking primitive has side-effects on object lifetimes that's never nice.

Ingo

#79 lore raw

Re: [PATCH -v5][RFC]: mutex: implement adaptive spinning

Quoted 4 lines · Ingo Molnar
Quoted 2 lines · Gregory Haskins

Can I ask a simple question in light of all this discussion?

Quoted 8 lines
Quoted 1 line

"Is get_task_struct() really that bad?"

it dirties a cacheline and it also involves atomics.

Also, it's a small design cleanliness issue to me: get_task_struct() impacts the lifetime of an object - and if a locking primitive has side-effects on object lifetimes that's never nice.

True, but it's for one iteration * NR_CPUS, max.

Best,
-PWM

Quoted 2 lines

Ingo

#81 lore raw

Re: [PATCH -v5][RFC]: mutex: implement adaptive spinning

In reply to Ingo Molnar

Hi Ingo,

Quoted 10 lines · Ingo Molnar
Quoted 4 lines · Gregory Haskins

Can I ask a simple question in light of all this discussion?

"Is get_task_struct() really that bad?"

it dirties a cacheline and it also involves atomics.

Yes, understood. But we should note we are always going to be talking about thrashing caches here since we are ultimately having one CPU observe another. There's no way to get around that. I understand that there are various degrees of this occurring, and I have no doubt that the proposed improvements strive to achieve a reduction of that. My question is really targeted at "at what cost".

Don't get me wrong. I am not advocating going back to get/put-task per se. I am simply asking the question of whether we have taken the design off into the weeds having lost sight of the actual requirements and/or results. Its starting to smell like we have. This is just a friendly reality check. Feel free to disregard. ;)

-Greg

#314 lore raw

Re: [PATCH -v5][RFC]: mutex: implement adaptive spinning

In reply to Linus Torvalds
Quoted 8 lines · Linus Torvalds
Quoted 2 lines · Peter Zijlstra

Do we really have to re-do all that code every loop?

No, you're right, we can just look up the cpu once. Which makes Andrew's argument that "probe_kernel_address()" isn't in any hot path even more true.

Do you need to even do that if CONFIG_DEBUG_PAGEALLOC is unset? Something like:

#ifdef CONFIG_DEBUG_PAGEALLOC
                /*
                 * Need to access the cpu field knowing that
                 * DEBUG_PAGEALLOC could have unmapped it if
                 * the mutex owner just released it and exited.
                 */
                if (probe_kernel_address(&thread->cpu, cpu))
                        break;
#else
		cpu = thread->cpu;

#endif

Shaggy

Signature · 2 lines
David Kleikamp
IBM Linux Technology Center
#82 lore raw

Re: [PATCH -v5][RFC]: mutex: implement adaptive spinning

In reply to Gregory Haskins
Quoted 20 lines · Gregory Haskins

Hi Ingo,

Quoted 10 lines · Ingo Molnar
Quoted 4 lines · Gregory Haskins

Can I ask a simple question in light of all this discussion?

"Is get_task_struct() really that bad?"

it dirties a cacheline and it also involves atomics.

Yes, understood. But we should note we are always going to be talking about thrashing caches here since we are ultimately having one CPU observe another. There's no way to get around that. I understand that there are various degrees of this occurring, and I have no doubt that the proposed improvements strive to achieve a reduction of that. My question is really targeted at "at what cost".

Quoted 5 lines

Don't get me wrong. I am not advocating going back to get/put-task per se. I am simply asking the question of whether we have taken the design off into the weeds having lost sight of the actual requirements and/or results. Its starting to smell like we have. This is just a friendly reality check. Feel free to disregard. ;)

What would be interesting is various benchmarks against all three.

1) no mutex spinning.
2) get_task_struct() implementation.
3) spin_or_sched implementation.

I believe that 2 happens to be the easiest to understand. No need to know about the behavior of freed objects. If we see no or negligible improvement between 2 and 3 on any benchmark, then I say we stick with 2.

-- Steve

#100 lore raw

Re: [PATCH -v5][RFC]: mutex: implement adaptive spinning

In reply to Peter Zijlstra
Quoted 4 lines · Peter Zijlstra

Hmm, still wouldn't the spin_on_owner() loopyness and the above need that need_resched() check you mentioned to that it can fall into the slow path and go to sleep?

Yes, I do think that the outer loop at least should have a test for need_resched().

Please take all my patches to be pseudo-code. They've neither been compiled nor tested, and I'm just posting them in the hope that somebody else will then do things in the direction I think is the proper one ;)

Linus

#80 lore raw

Re: [PATCH -v5][RFC]: mutex: implement adaptive spinning

In reply to Peter W. Morreale
Quoted 14 lines · Peter W. Morreale
Quoted 4 lines · Ingo Molnar
Quoted 2 lines · Gregory Haskins

Can I ask a simple question in light of all this discussion?

Quoted 8 lines
Quoted 1 line

"Is get_task_struct() really that bad?"

it dirties a cacheline and it also involves atomics.

Also, it's a small design cleanliness issue to me: get_task_struct() impacts the lifetime of an object - and if a locking primitive has side-effects on object lifetimes that's never nice.

Quoted 4 lines

True, but it's for one iteration * NR_CPUS, max.

Best,
-PWM

Never mind. Bogus argument.

That's why we have you Big Guns out there... - To keep us rif-raf in line...

:-)

Best,
-PWM

#89 lore raw

Re: [PATCH -v5][RFC]: mutex: implement adaptive spinning

In reply to Gregory Haskins
Quoted 4 lines · Gregory Haskins

Can I ask a simple question in light of all this discussion?

"Is get_task_struct() really that bad?"

Yes. It's an atomic access (two, in fact, since you need to release it too), which is a huge deal if we're talking about a timing-critical section of code.

And this is timing-critical, or we wouldn't even care - even in the contention case. Admittedly btrfs apparently makes it more so that it _should_ be, but Peter had some timings that happened with just regular create/unlink that showed a big difference.

So the whole and only point of spinning mutexes is to get rid of the scheduler overhead, but to also not replace it with some other thing ;)

Linus

#90 lore raw

Re: [PATCH -v5][RFC]: mutex: implement adaptive spinning

Quoted 6 lines · Linus Torvalds
Quoted 2 lines

"Is get_task_struct() really that bad?"

Yes. It's an atomic access (two, in fact, since you need to release it too), which is a huge deal if we're talking about a timing-critical section of code.

There's another issue: you also need to lock the thing that gives you the task pointer in the first place. So it's not sufficient to do get_task_struct(), you also need to do it within a context where you know that the pointer is not going away _while_ you do it.

And with the mutexes clearing the ->owner field without even holding the spinlock, that is not a guarantee we can easily get any way. Maybe we'd need to hold the tasklist_lock or something.

Linus

#315 lore raw

Re: [PATCH -v5][RFC]: mutex: implement adaptive spinning

In reply to Dave Kleikamp
Quoted 2 lines · Dave Kleikamp

Do you need to even do that if CONFIG_DEBUG_PAGEALLOC is unset?

No.

Quoted 12 lines

Something like:

#ifdef CONFIG_DEBUG_PAGEALLOC
                /*
                 * Need to access the cpu field knowing that
                 * DEBUG_PAGEALLOC could have unmapped it if
                 * the mutex owner just released it and exited.
                 */
                if (probe_kernel_address(&thread->cpu, cpu))
                        break;
#else
		cpu = thread->cpu;
Quoted 1 line

#endif

yes. That would work fine.

Linus

#94 lore raw

Re: [PATCH -v5][RFC]: mutex: implement adaptive spinning

In reply to Gregory Haskins
Quoted 34 lines · Gregory Haskins
Quoted 6 lines · Andi Kleen
Quoted 5 lines

I appreciate this is sample code, but using __get_user() on non-userspace pointers messes up architectures which have separate user/kernel spaces (eg the old 4G/4G split for x86-32). Do we have an appropriate function for kernel space pointers?

Quoted 7 lines

probe_kernel_address().

But it's slow.

-Andi

Can I ask a simple question in light of all this discussion?

"Is get_task_struct() really that bad?"

I have to admit you guys have somewhat lost me on some of the more recent discussion, so its probably just a case of being naive on my part...but this whole thing seems to have become way more complex than it needs to be. Lets boil this down to the core requirements: We need to know if the owner task is still running somewhere in the system as a predicate to whether we should sleep or spin, period. Now the question is how to do that.

The get/put task is the obvious answer to me (as an aside, we looked at task->oncpu rather than the rq->curr stuff which I believe was better), and I am inclined to think that is perfectly reasonable way to do this:
After all, even if acquiring a reference is somewhat expensive (which I don't really think it is on a modern processor), we are already in the slowpath as it is and would sleep otherwise.

Quoted 6 lines

Steve proposed a really cool trick with RCU since we know that the task cannot release while holding the lock, and the pointer cannot go away without waiting for a grace period. It turned out to introduce latency side-effects so it ultimately couldn't be used (and this was in no way a knock against RCU or you, Paul..just wasn't the right tool for the job it turned out).

Too late...

I already figured out a way to speed up preemptable RCU's read-side primitives (to about as fast as CONFIG_PREEMPT RCU's read-side primitives) and also its grace-period latency. And it is making it quite clear that it won't let go of my brain until I implement it... ;-)

Thanx, Paul

Quoted 19 lines

Ok, so onto other ideas. What if we simply look at something like a scheduling sequence id. If we know (within the wait-lock) that task X is the owner and its on CPU A, then we can simply monitor if A context switches. Having something like rq[A]->seq++ every time we schedule() would suffice and you wouldnt need to hold a task reference...just note A=X->cpu from inside the wait-lock. I guess the downside there is putting that extra increment in the schedule() hotpath even if no-one cares, but I would surmise that should be reasonably cheap when no-one is pulling the cacheline around other than A (i.e. no observers).

But anyway, my impression from observing the direction this discussion has taken is that it is being way way over optimized before we even know if a) the adaptive stuff helps, and b) the get/put-ref hurts. Food for thought.

-Greg

#83 lore raw

Re: [PATCH -v5][RFC]: mutex: implement adaptive spinning

In reply to Steven Rostedt
Quoted 6 lines · Steven Rostedt

What would be interesting is various benchmarks against all three.

1) no mutex spinning.
2) get_task_struct() implementation.
3) spin_or_sched implementation.

One of the issues is that I cannot convince myself that (2) is even necessarily correct. At least not without having all cases happen inder the mutex spinlock - which they don't. Even with the original patch, the uncontended cases set and cleared the owner field outside the lock.

Linus

#84 lore raw

Re: [PATCH -v5][RFC]: mutex: implement adaptive spinning

Quoted 4 lines · Linus Torvalds
Quoted 3 lines · Steven Rostedt

What would be interesting is various benchmarks against all three.

Quoted 8 lines
Quoted 3 lines

1) no mutex spinning.
2) get_task_struct() implementation.
3) spin_or_sched implementation.

One of the issues is that I cannot convince myself that (2) is even necessarily correct. At least not without having all cases happen inder the mutex spinlock - which they don't. Even with the original patch, the uncontended cases set and cleared the owner field outside the lock.

True. I need to keep looking at the code that is posted. In -rt, we force the fast path into the slowpath as soon as another task fails to get the lock. Without that, as you pointed out, the code can be racy.

-- Steve

#85 lore raw

Re: [PATCH -v5][RFC]: mutex: implement adaptive spinning

Quoted 4 lines · Steven Rostedt

True. I need to keep looking at the code that is posted. In -rt, we force the fast path into the slowpath as soon as another task fails to get the lock. Without that, as you pointed out, the code can be racy.

I mean we force the fast unlock path into the slow path as soon as another task fails to get the lock.

-- Steve

#316 lore raw

Re: [PATCH -v5][RFC]: mutex: implement adaptive spinning

In reply to Linus Torvalds
Quoted 20 lines · Linus Torvalds
Quoted 2 lines · Dave Kleikamp

Do you need to even do that if CONFIG_DEBUG_PAGEALLOC is unset?

No.

Quoted 12 lines

Something like:

#ifdef CONFIG_DEBUG_PAGEALLOC
                /*
                 * Need to access the cpu field knowing that
                 * DEBUG_PAGEALLOC could have unmapped it if
                 * the mutex owner just released it and exited.
                 */
                if (probe_kernel_address(&thread->cpu, cpu))
                        break;
#else
		cpu = thread->cpu;
Quoted 1 line

#endif

Quoted 1 line

yes. That would work fine.

What about memory hotplug as Ingo mentioned?

Should that be:

#if defined(CONFIG_DEBUG_PAGEALLOC) || defined(CONFIG_MEMORY_HOTPLUG)

??

-- Steve

#86 lore raw

Re: [PATCH -v5][RFC]: mutex: implement adaptive spinning

In reply to Steven Rostedt
Quoted 9 lines · Steven Rostedt
Quoted 4 lines · Steven Rostedt

True. I need to keep looking at the code that is posted. In -rt, we force the fast path into the slowpath as soon as another task fails to get the lock. Without that, as you pointed out, the code can be racy.

I mean we force the fast unlock path into the slow path as soon as another task fails to get the lock.

I think the mainline mutex code does that all right too - we keep the counter negative all the time when it has contention.

So the original model where the spinning was done only after we'd gotten the spinlock probably was correct. However, it _is_ a lot more expensive than the "optimistic spin" model.

Linus

#317 lore raw

Re: [PATCH -v5][RFC]: mutex: implement adaptive spinning

In reply to Steven Rostedt
Quoted 4 lines · Steven Rostedt

Should that be:

#if defined(CONFIG_DEBUG_PAGEALLOC) || defined(CONFIG_MEMORY_HOTPLUG)

Well, probably CONFIG_MEMORY_HOTREMOVE, no? And I'd actually suggest that unplugging should have a stop-machine if it doesn't already, just because it's such a special case - like module removal.

Linus

#318 lore raw

Re: [PATCH -v5][RFC]: mutex: implement adaptive spinning

Quoted 4 lines · On Wed, 7 Jan 2009 15:57:06 -0800 (PST) Linus Torvalds…
Quoted 1 line · Steven Rostedt
Quoted 8 lines
Quoted 3 lines

Should that be:

#if defined(CONFIG_DEBUG_PAGEALLOC) || defined(CONFIG_MEMORY_HOTPLUG)

Well, probably CONFIG_MEMORY_HOTREMOVE, no? And I'd actually suggest that unplugging should have a stop-machine if it doesn't already, just because it's such a special case - like module removal.

I looked memory hotplug code again, then..

1. stop_machine() is not used.
2. x86-64 code doesn't have "unmap physical memory from the kernel space". (because ia64, my (old) target machine, doesn't need it.) I'm not sure about powerpc.

I'd like to look into this for x86-64 when I can.

BTW, can I make a quiestion ?
==

			if (lock->owner != thread)
				break;

			/*
			 * Need to access the cpu field knowing that
			 * DEBUG_PAGEALLOC could have unmapped it if
			 * the mutex owner just released it and exited.
			 */
			if (__get_user(cpu, &thread->cpu))
				break;

==
"thread" can be obsolete while lock->owner == thread ? Isn't this depends on CONFIG_DEBUG_MUTEXES ?

Thanks,
-Kame

#319 lore raw

Re: [PATCH -v5][RFC]: mutex: implement adaptive spinning

In reply to Linus Torvalds
Quoted 7 lines · Linus Torvalds
Quoted 3 lines

Should that be:

#if defined(CONFIG_DEBUG_PAGEALLOC) || defined(CONFIG_MEMORY_HOTPLUG)

Well, probably CONFIG_MEMORY_HOTREMOVE, no? And I'd actually suggest that unplugging should have a stop-machine if it doesn't already, just because it's such a special case - like module removal.

I do not think stop-machine will help, unless that spinning is protected by preempt-disable. If the task gets preempted after grabbing the owner thread_info, and then stop-machine runs, the memory disappears, the task is scheduled back, accesses the owner thread_info and then page-fault.

-- Steve

#320 lore raw

Re: [PATCH -v5][RFC]: mutex: implement adaptive spinning

Quoted 6 lines · On Wed, 7 Jan 2009 21:33:31 -0500 (EST) Steven Rostedt <[email protected]>…
Quoted 4 lines · Linus Torvalds
Quoted 3 lines

Should that be:

#if defined(CONFIG_DEBUG_PAGEALLOC) || defined(CONFIG_MEMORY_HOTPLUG)

Quoted 9 lines
Quoted 3 lines

Well, probably CONFIG_MEMORY_HOTREMOVE, no? And I'd actually suggest that unplugging should have a stop-machine if it doesn't already, just because it's such a special case - like module removal.

I do not think stop-machine will help, unless that spinning is protected by preempt-disable. If the task gets preempted after grabbing the owner thread_info, and then stop-machine runs, the memory disappears, the task is scheduled back, accesses the owner thread_info and then page-fault.

How about recording "cpu" into mutex at locking explicitly ? too bad ?

-Kame

#91 lore raw

Re: [PATCH -v5][RFC]: mutex: implement adaptive spinning

In reply to Linus Torvalds

[resend: i fat fingered the reply-to-all for a few messages]

Quoted 7 lines
Quoted 1 line
Quoted 1 line

Linus Torvalds <[email protected]> 01/07/09 6:20 PM >>>

Quoted 3 lines · Linus Torvalds
Quoted 2 lines

"Is get_task_struct() really that bad?"

Quoted 8 lines
Quoted 3 lines

Yes. It's an atomic access (two, in fact, since you need to release it too), which is a huge deal if we're talking about a timing-critical section of code.

There's another issue: you also need to lock the thing that gives you the task pointer in the first place. So it's not sufficient to do get_task_struct(), you also need to do it within a context where you know that the pointer is not going away _while_ you do it.

In my defense, the -rt versions of the patches guarantee this is ok based on a little hack:

"if the owner holds the mutex, and you old the wait-lock, you guarantee owner cannot exit". Therefore get_task_struct is guaranteed not to race if you take it while holding wait-lock. (This is, in fact, why the original design had a loop within a loop...the inner loop would break when it wanted the outer-loop to reacquire wait-lock for things such as re-acquiring owner/get-task

This is in part enforced by the fact that in -rt, pending pending waiters force the mutex-release to hit the slow path (and therefore require that the wait-lock be reacquired by the releaser). I am under the impression (because I havent had a chance to really review the new patches yet) that this is not necessarily the case here for the mainline patch, since the owner field is not managed atomically IIUC

Again, not advocating get/put task per se. Just wanted to point out that I didnt flub this up on the original -rt design ;)

-Greg

#87 lore raw

Re: [PATCH -v5][RFC]: mutex: implement adaptive spinning

In reply to Linus Torvalds

[resend: restore CC list]

Quoted 7 lines
Quoted 1 line
Quoted 1 line

Linus Torvalds <[email protected]> 01/07/09 6:33 PM >>>

Quoted 3 lines · Steven Rostedt

What would be interesting is various benchmarks against all three.

Quoted 8 lines
Quoted 3 lines

1) no mutex spinning.
2) get_task_struct() implementation.
3) spin_or_sched implementation.

One of the issues is that I cannot convince myself that (2) is even necessarily correct. At least not without having all cases happen inder the mutex spinlock - which they don't. Even with the original patch, the uncontended cases set and cleared the owner field outside the lock.

Yeah, you are right (see my last post). Without the cmpxchg trickery (*) on the owner field (like we have in -rt) with the pending bits, (2) cannot work.

(*) For what its worth, I am impressed with the brilliance of the cmgxchg fast path stuff in the rtmutex code. Whoever came up with that, my hat is off to you.

-Greg

#92 lore raw

Re: [PATCH -v5][RFC]: mutex: implement adaptive spinning

In reply to Gregory Haskins
Quoted 3 lines · Gregory Haskins

In my defense, the -rt versions of the patches guarantee this is ok based on a little hack:

The -rt versions worry about much more than what the mutex code in mainline does. Linus is correct in his arguments. The adaptive mutex (as suppose to what -rt has), is only to help aid in preformance. There are a lot of races that can happen in mainline version where lock taking may not be fifo, or where we might start to schedule when we could have taken the lock. These races are not in -rt, but that is because -rt cares about these. But mainline cares more about performance over determinism. This means that we have to look at the current code that Peter is submitting with a different perspective than we do in -rt.

-- Steve

#93 lore raw

Re: [PATCH -v5][RFC]: mutex: implement adaptive spinning

Quoted 6 lines · Steven Rostedt
Quoted 3 lines · Gregory Haskins

In my defense, the -rt versions of the patches guarantee this is ok based on a little hack:

Quoted 10 lines

The -rt versions worry about much more than what the mutex code in mainline does. Linus is correct in his arguments. The adaptive mutex (as suppose to what -rt has), is only to help aid in preformance. There are a lot of races that can happen in mainline version where lock taking may not be fifo, or where we might start to schedule when we could have taken the lock. These races are not in -rt, but that is because -rt cares about these. But mainline cares more about performance over determinism. This means that we have to look at the current code that Peter is submitting with a different perspective than we do in -rt.

Hey Steve,
Understood, and agreed. I only mentioned it because I wanted to clear
the record that I did not (to my knowledge) mess up the protocol design which first introduced the get/put-task pattern under discussion ;). I am fairly confident that at least the -rt version does not have any race conditions such as the one Linus mentioned in the mainline version. I am not advocating that the full protocol that we use in -rt should be carried forward, per se or anything like that.

-Greg

#321 lore raw

Re: [PATCH -v5][RFC]: mutex: implement adaptive spinning

In reply to Steven Rostedt
Quoted 5 lines

What about memory hotplug as Ingo mentioned?

Should that be:

#if defined(CONFIG_DEBUG_PAGEALLOC) || defined(CONFIG_MEMORY_HOTPLUG)

We expect memory hotunplug to only really work in movable zones (all others should at least have one kernel object somewhere that prevents unplug) and you can't have task structs in movable zones obviously

So it's probably a non issue in practice.

-Andi

Signature · 1 line
[email protected]
maintainer
#88 lore raw

Re: [PATCH -v5][RFC]: mutex: implement adaptive spinning

In reply to Linus Torvalds
Quoted 5 lines · Linus Torvalds
Quoted 3 lines · Steven Rostedt

What would be interesting is various benchmarks against all three.

Quoted 8 lines
Quoted 3 lines

1) no mutex spinning.
2) get_task_struct() implementation.
3) spin_or_sched implementation.

One of the issues is that I cannot convince myself that (2) is even necessarily correct. At least not without having all cases happen inder the mutex spinlock - which they don't. Even with the original patch, the uncontended cases set and cleared the owner field outside the lock.

Yes, 2 isn't feasible for regular mutexes as we have non-atomic owner tracking.

I've since realized the whole rtmutex thing is fundamentally difference on a few levels:

a) we have atomic owner tracking (that's the lock itself, it holds the
task_pointer as a cookie), and

b) we need to do that whole enqueue on the waitlist thing because we
need to do the PI propagation and such to figure out if the current task is even allowed to acquire -- that is, only the highest waiting and or lateral steal candidates are allowed to spin acquire.

maintainer
#101 lore raw

RFC PATCH 1/1 : mutex: implement adaptive spinning

In reply to Linus Torvalds
Quoted 3 lines · Linus Torvalds

Please take all my patches to be pseudo-code. They've neither been compiled nor tested, and I'm just posting them in the hope that somebody else will then do things in the direction I think is the proper one ;)

Linux opteron 2.6.28-tip #585 SMP PREEMPT Thu Jan 8 10:38:09 CET 2009 x86_64 x86_64 x86_64 GNU/Linux

[root@opteron bench]# echo NO_OWNER_SPIN > /debug/sched_features; ./timec -e -5,-4,-3,-2 ./test-mutex V 16 10 2 CPUs, running 16 parallel test-tasks.
checking VFS performance.
| loops/sec: 69415

avg ops/sec:               74996
average cost per op:       0.00 usecs
average cost per lock:     0.00 usecs
average cost per unlock:   0.00 usecs
max cost per op:           0.00 usecs
max cost per lock:         0.00 usecs
max cost per unlock:       0.00 usecs
average deviance per op:   0.00 usecs

Performance counter stats for './test-mutex':

12098.324578 task clock ticks (msecs)

           1081  CPU migrations       (events)
           7102  context switches     (events)
           2763  pagefaults           (events)
   12098.324578  task clock ticks     (msecs)

Wall-clock time elapsed: 12026.804839 msecs

[root@opteron bench]# echo OWNER_SPIN > /debug/sched_features; ./timec -e -5,-4,-3,-2 ./test-mutex V 16 10 2 CPUs, running 16 parallel test-tasks.
checking VFS performance.
| loops/sec: 208147

avg ops/sec:               228126
average cost per op:       0.00 usecs
average cost per lock:     0.00 usecs
average cost per unlock:   0.00 usecs
max cost per op:           0.00 usecs
max cost per lock:         0.00 usecs
max cost per unlock:       0.00 usecs
average deviance per op:   0.00 usecs

Performance counter stats for './test-mutex':

22280.283224 task clock ticks (msecs)

            117  CPU migrations       (events)
           5711  context switches     (events)
           2781  pagefaults           (events)
   22280.283224  task clock ticks     (msecs)

Wall-clock time elapsed: 12307.053737 msecs

* WOW *

---
Subject: mutex: implement adaptive spin
From: Peter Zijlstra <[email protected]>
Date: Thu Jan 08 09:41:22 CET 2009

---
 include/linux/mutex.h   |    4 +-
 include/linux/sched.h   |    1 
 kernel/mutex-debug.c    |    7 ----
 kernel/mutex-debug.h    |   18 +++++-----
 kernel/mutex.c          |   81 ++++++++++++++++++++++++++++++++++++++++++------
 kernel/mutex.h          |   22 +++++++++++--
 kernel/sched.c          |   63 +++++++++++++++++++++++++++++++++++++
 kernel/sched_features.h |    1 
 8 files changed, 170 insertions(+), 27 deletions(-)
include/linux/mutex.h +3 -1
Index: linux-2.6/include/linux/mutex.h
===================================================================
@@ -50,8 +50,10 @@ struct mutex {
 	atomic_t		count;
 	spinlock_t		wait_lock;
 	struct list_head	wait_list;
-#ifdef CONFIG_DEBUG_MUTEXES
+#if defined(CONFIG_DEBUG_MUTEXES) || defined(CONFIG_SMP)
 	struct thread_info	*owner;
+#endif
+#ifdef CONFIG_DEBUG_MUTEXES
 	const char 		*name;
 	void			*magic;
 #endif
kernel/mutex-debug.c +0 -7
Index: linux-2.6/kernel/mutex-debug.c
===================================================================
@@ -26,11 +26,6 @@
 /*
  * Must be called with lock->wait_lock held.
  */
-void debug_mutex_set_owner(struct mutex *lock, struct thread_info *new_owner)
-{
-	lock->owner = new_owner;
-}
-
 void debug_mutex_lock_common(struct mutex *lock, struct mutex_waiter *waiter)
 {
 	memset(waiter, MUTEX_DEBUG_INIT, sizeof(*waiter));
@@ -82,7 +77,6 @@ void debug_mutex_unlock(struct mutex *lo
 	DEBUG_LOCKS_WARN_ON(lock->magic != lock);
 	DEBUG_LOCKS_WARN_ON(lock->owner != current_thread_info());
 	DEBUG_LOCKS_WARN_ON(!lock->wait_list.prev && !lock->wait_list.next);
-	DEBUG_LOCKS_WARN_ON(lock->owner != current_thread_info());
 }
 
 void debug_mutex_init(struct mutex *lock, const char *name,
@@ -95,7 +89,6 @@ void debug_mutex_init(struct mutex *lock
 	debug_check_no_locks_freed((void *)lock, sizeof(*lock));
 	lockdep_init_map(&lock->dep_map, name, key, 0);
 #endif
-	lock->owner = NULL;
 	lock->magic = lock;
 }
 
kernel/mutex-debug.h +10 -8
Index: linux-2.6/kernel/mutex-debug.h
===================================================================
@@ -13,14 +13,6 @@
 /*
  * This must be called with lock->wait_lock held.
  */
-extern void
-debug_mutex_set_owner(struct mutex *lock, struct thread_info *new_owner);
-
-static inline void debug_mutex_clear_owner(struct mutex *lock)
-{
-	lock->owner = NULL;
-}
-
 extern void debug_mutex_lock_common(struct mutex *lock,
 				    struct mutex_waiter *waiter);
 extern void debug_mutex_wake_waiter(struct mutex *lock,
@@ -35,6 +27,16 @@ extern void debug_mutex_unlock(struct mu
 extern void debug_mutex_init(struct mutex *lock, const char *name,
 			     struct lock_class_key *key);
 
+static inline void mutex_set_owner(struct mutex *lock)
+{
+	lock->owner = current_thread_info();
+}
+
+static incline void mutex_clear_owner(struct mutex *lock)
+{
+	lock->owner = NULL;
+}
+
 #define spin_lock_mutex(lock, flags)			\
 	do {						\
 		struct mutex *l = container_of(lock, struct mutex, wait_lock); \
kernel/mutex.c +72 -9

170 lines not on this page · raw message

kernel/mutex.h +20 -2
Index: linux-2.6/kernel/mutex.h
===================================================================
@@ -16,8 +16,26 @@
 #define mutex_remove_waiter(lock, waiter, ti) \
 		__list_del((waiter)->list.prev, (waiter)->list.next)
 
-#define debug_mutex_set_owner(lock, new_owner)		do { } while (0)
-#define debug_mutex_clear_owner(lock)			do { } while (0)
+#ifdef CONFIG_SMP
+static inline void mutex_set_owner(struct mutex *lock)
+{
+	lock->owner = current_thread_info();
+}
+
+static inline void mutex_clear_owner(struct mutex *lock)
+{
+	lock->owner = NULL;
+}
+#else
+static inline void mutex_set_owner(struct mutex *lock)
+{
+}
+
+static inline void mutex_clear_owner(struct mutex *lock)
+{
+}
+#endif
+
 #define debug_mutex_wake_waiter(lock, waiter)		do { } while (0)
 #define debug_mutex_free_waiter(waiter)			do { } while (0)
 #define debug_mutex_add_waiter(lock, waiter, ti)	do { } while (0)
kernel/sched.c +63 -0

69 lines not on this page · raw message

include/linux/sched.h +1 -0
Index: linux-2.6/include/linux/sched.h
===================================================================
@@ -330,6 +330,7 @@ extern signed long schedule_timeout_inte
 extern signed long schedule_timeout_killable(signed long timeout);
 extern signed long schedule_timeout_uninterruptible(signed long timeout);
 asmlinkage void schedule(void);
+extern int spin_on_owner(struct mutex *lock, struct thread_info *owner);
 
 struct nsproxy;
 struct user_namespace;
kernel/sched_features.h +1 -0
Index: linux-2.6/kernel/sched_features.h
===================================================================
@@ -13,3 +13,4 @@ SCHED_FEAT(LB_WAKEUP_UPDATE, 1)
 SCHED_FEAT(ASYM_EFF_LOAD, 1)
 SCHED_FEAT(WAKEUP_OVERLAP, 0)
 SCHED_FEAT(LAST_BUDDY, 1)
+SCHED_FEAT(OWNER_SPIN, 1)
#102 lore raw

Re: [PATCH -v6][RFC]: mutex: implement adaptive spinning

Quoted 32 lines · Peter Zijlstra
Quoted 3 lines · Linus Torvalds

Please take all my patches to be pseudo-code. They've neither been compiled nor tested, and I'm just posting them in the hope that somebody else will then do things in the direction I think is the proper one ;)

Linux opteron 2.6.28-tip #585 SMP PREEMPT Thu Jan 8 10:38:09 CET 2009 x86_64 x86_64 x86_64 GNU/Linux

[root@opteron bench]# echo NO_OWNER_SPIN > /debug/sched_features; ./timec -e -5,-4,-3,-2 ./test-mutex V 16 10 2 CPUs, running 16 parallel test-tasks.
checking VFS performance.
avg ops/sec: 74996

Performance counter stats for './test-mutex':

12098.324578 task clock ticks (msecs)

           1081  CPU migrations       (events)
           7102  context switches     (events)
           2763  pagefaults           (events)

Wall-clock time elapsed: 12026.804839 msecs

[root@opteron bench]# echo OWNER_SPIN > /debug/sched_features; ./timec -e -5,-4,-3,-2 ./test-mutex V 16 10 2 CPUs, running 16 parallel test-tasks.
checking VFS performance.
avg ops/sec: 228126

Performance counter stats for './test-mutex':

22280.283224 task clock ticks (msecs)

Quoted 7 lines
            117  CPU migrations       (events)
           5711  context switches     (events)
           2781  pagefaults           (events)

Wall-clock time elapsed: 12307.053737 msecs

* WOW *

WOW indeed - and i can see a similar _brutal_ speedup on two separate 16-way boxes as well:

16 CPUs, running 128 parallel test-tasks.

NO_OWNER_SPIN:
avg ops/sec: 281595

OWNER_SPIN:
avg ops/sec: 524791

Da Killer!

Look at the performance counter stats:

Quoted 11 lines

12098.324578 task clock ticks (msecs)

           1081  CPU migrations       (events)
           7102  context switches     (events)
           2763  pagefaults           (events)

22280.283224 task clock ticks (msecs)

            117  CPU migrations       (events)
           5711  context switches     (events)
           2781  pagefaults           (events)

We were able to spend twice as much CPU time and efficiently so - and we did about 10% of the cross-CPU migrations as before (!).

My (wild) guess is that the biggest speedup factor was perhaps this little trick:

+ if (need_resched())
+ break;

this allows the spin-mutex to only waste CPU time if there's no work around on that CPU. (i.e. if there's no other task that wants to run) The moment there's some other task, we context-switch to it.

Very elegant concept i think.

[ A detail, -tip testing found that the patch breaks mutex debugging:

=====================================
[ BUG: bad unlock balance detected! ]
-------------------------------------
swapper/0 is trying to release lock (cpu_add_remove_lock) at:

  [<ffffffff8089f540>] mutex_unlock+0xe/0x10
  but there are no more locks to release!

but that's a detail for -v7 ;-) ]

Ingo

#322 lore raw

Re: [PATCH -v5][RFC]: mutex: implement adaptive spinning

In reply to Andi Kleen
Quoted 11 lines · Andi Kleen
Quoted 5 lines

What about memory hotplug as Ingo mentioned?

Should that be:

#if defined(CONFIG_DEBUG_PAGEALLOC) || defined(CONFIG_MEMORY_HOTPLUG)

We expect memory hotunplug to only really work in movable zones (all others should at least have one kernel object somewhere that prevents unplug) and you can't have task structs in movable zones obviously

So it's probably a non issue in practice.

Sure, it probably is a non issue, but I'm afraid that non issues of today might become issues of tomorrow. Where does it say that we can never put a task struct in a movable zone. Perhaps, we could someday have a CPU with memory local to it, and pinned tasks to that CPU in that memory. Then there can be cases where we remove the CPU and memory together.

Because of preemption in the mutex spin part, there's no guarantee that a the task in that removed memory will not be referenced again. Of course this thought is purely theoretical, but I like to solve bugs that might might happen tomorrow too. ;-)

-- Steve

#103 lore raw

Re: [PATCH -v6][RFC]: mutex: implement adaptive spinning

In reply to Ingo Molnar
Quoted 11 lines · Ingo Molnar
Quoted 2 lines · Peter Zijlstra

* WOW *

WOW indeed - and i can see a similar _brutal_ speedup on two separate 16-way boxes as well:

16 CPUs, running 128 parallel test-tasks.

Quoted 8 lines

NO_OWNER_SPIN:
avg ops/sec: 281595

OWNER_SPIN:
avg ops/sec: 524791

Da Killer!

This jives with our findings back when we first looked at this (200%-300% speedups in most benchmarks), so this is excellent that it is yielding boosts here as well.

Quoted 27 lines

Look at the performance counter stats:

Quoted 8 lines

12098.324578 task clock ticks (msecs)

           1081  CPU migrations       (events)
           7102  context switches     (events)
           2763  pagefaults           (events)
Quoted 6 lines

22280.283224 task clock ticks (msecs)

            117  CPU migrations       (events)
           5711  context switches     (events)
           2781  pagefaults           (events)

We were able to spend twice as much CPU time and efficiently so - and we did about 10% of the cross-CPU migrations as before (!).

My (wild) guess is that the biggest speedup factor was perhaps this little trick:

(quoted diff) +2 -0
+               if (need_resched())
+                       break;
Quoted 4 lines

this allows the spin-mutex to only waste CPU time if there's no work around on that CPU. (i.e. if there's no other task that wants to run) The moment there's some other task, we context-switch to it.

Well, IIUC thats only true if the other task happens to preempt current, which may not always be the case, right? For instance, if current still has timeslice left, etc. I think the primary difference is actually the reduction in the ctx switch rate, but its hard to say without looking at detailed traces and more stats. Either way, woohoo!

-Greg

#323 lore raw

Re: [PATCH -v5][RFC]: mutex: implement adaptive spinning

In reply to Steven Rostedt
Quoted 3 lines

Sure, it probably is a non issue, but I'm afraid that non issues of today might become issues of tomorrow. Where does it say that we can never put a task struct in a movable zone.

Task structs are not movable, so they by definition do not belong in movable zones.

Quoted 2 lines

memory local to it, and pinned tasks to that CPU in that memory. Then there can be cases where we remove the CPU and memory together.

If you did that you would need to redesign so much of the kernel, changing the mutex code too would be the smallest of your worries.

-Andi

Signature · 1 line
[email protected]
maintainer
#104 lore raw

RFC PATCH 1/1 : mutex: implement adaptive spinning

In reply to Ingo Molnar
Quoted 10 lines · Ingo Molnar

[ A detail, -tip testing found that the patch breaks mutex debugging:

=====================================
[ BUG: bad unlock balance detected! ]
-------------------------------------
swapper/0 is trying to release lock (cpu_add_remove_lock) at:

  [<ffffffff8089f540>] mutex_unlock+0xe/0x10
  but there are no more locks to release!

but that's a detail for -v7 ;-) ]

Here it is..

I changed the optimistic spin cmpxchg trickery to not require the -1000 state, please double and tripple check the code.

This was done because the interaction between trylock_slowpath and that -1000 state hurt my head.

---
Subject:
From: Peter Zijlstra <[email protected]>
Date: Thu Jan 08 09:41:22 CET 2009

---
 include/linux/mutex.h   |    4 +-
 include/linux/sched.h   |    1 
 kernel/mutex-debug.c    |   24 ++++++++++-----
 kernel/mutex-debug.h    |   18 ++++++-----
 kernel/mutex.c          |   76 ++++++++++++++++++++++++++++++++++++++++++------
 kernel/mutex.h          |   22 ++++++++++++-
 kernel/sched.c          |   66 +++++++++++++++++++++++++++++++++++++++++
 kernel/sched_features.h |    1 
 8 files changed, 185 insertions(+), 27 deletions(-)
include/linux/mutex.h +3 -1
Index: linux-2.6/include/linux/mutex.h
===================================================================
@@ -50,8 +50,10 @@ struct mutex {
 	atomic_t		count;
 	spinlock_t		wait_lock;
 	struct list_head	wait_list;
-#ifdef CONFIG_DEBUG_MUTEXES
+#if defined(CONFIG_DEBUG_MUTEXES) || defined(CONFIG_SMP)
 	struct thread_info	*owner;
+#endif
+#ifdef CONFIG_DEBUG_MUTEXES
 	const char 		*name;
 	void			*magic;
 #endif
kernel/mutex-debug.c +17 -7
Index: linux-2.6/kernel/mutex-debug.c
===================================================================
@@ -26,11 +26,6 @@
 /*
  * Must be called with lock->wait_lock held.
  */
-void debug_mutex_set_owner(struct mutex *lock, struct thread_info *new_owner)
-{
-	lock->owner = new_owner;
-}
-
 void debug_mutex_lock_common(struct mutex *lock, struct mutex_waiter *waiter)
 {
 	memset(waiter, MUTEX_DEBUG_INIT, sizeof(*waiter));
@@ -80,9 +75,25 @@ void debug_mutex_unlock(struct mutex *lo
 		return;
 
 	DEBUG_LOCKS_WARN_ON(lock->magic != lock);
+#if 0
+	/*
+	 * XXX something is iffy with owner tracking, but lockdep - which has
+	 * similar checks - finds everything dandy, so disable for now.
+	 */
+	if (lock->owner != current_thread_info()) {
+		printk(KERN_ERR "%p %p\n", lock->owner, current_thread_info());
+		if (lock->owner) {
+			printk(KERN_ERR "%d %s\n",
+					lock->owner->task->pid,
+					lock->owner->task->comm);
+		}
+		printk(KERN_ERR "%d %s\n",
+				current_thread_info()->task->pid,
+				current_thread_info()->task->comm);
+	}
 	DEBUG_LOCKS_WARN_ON(lock->owner != current_thread_info());
+#endif
 	DEBUG_LOCKS_WARN_ON(!lock->wait_list.prev && !lock->wait_list.next);
-	DEBUG_LOCKS_WARN_ON(lock->owner != current_thread_info());
 }
 
 void debug_mutex_init(struct mutex *lock, const char *name,
@@ -95,7 +106,6 @@ void debug_mutex_init(struct mutex *lock
 	debug_check_no_locks_freed((void *)lock, sizeof(*lock));
 	lockdep_init_map(&lock->dep_map, name, key, 0);
 #endif
-	lock->owner = NULL;
 	lock->magic = lock;
 }
 
kernel/mutex-debug.h +10 -8
Index: linux-2.6/kernel/mutex-debug.h
===================================================================
@@ -13,14 +13,6 @@
 /*
  * This must be called with lock->wait_lock held.
  */
-extern void
-debug_mutex_set_owner(struct mutex *lock, struct thread_info *new_owner);
-
-static inline void debug_mutex_clear_owner(struct mutex *lock)
-{
-	lock->owner = NULL;
-}
-
 extern void debug_mutex_lock_common(struct mutex *lock,
 				    struct mutex_waiter *waiter);
 extern void debug_mutex_wake_waiter(struct mutex *lock,
@@ -35,6 +27,16 @@ extern void debug_mutex_unlock(struct mu
 extern void debug_mutex_init(struct mutex *lock, const char *name,
 			     struct lock_class_key *key);
 
+static inline void mutex_set_owner(struct mutex *lock)
+{
+	lock->owner = current_thread_info();
+}
+
+static inline void mutex_clear_owner(struct mutex *lock)
+{
+	lock->owner = NULL;
+}
+
 #define spin_lock_mutex(lock, flags)			\
 	do {						\
 		struct mutex *l = container_of(lock, struct mutex, wait_lock); \
kernel/mutex.c +67 -9

153 lines not on this page · raw message

kernel/mutex.h +20 -2
Index: linux-2.6/kernel/mutex.h
===================================================================
@@ -16,8 +16,26 @@
 #define mutex_remove_waiter(lock, waiter, ti) \
 		__list_del((waiter)->list.prev, (waiter)->list.next)
 
-#define debug_mutex_set_owner(lock, new_owner)		do { } while (0)
-#define debug_mutex_clear_owner(lock)			do { } while (0)
+#ifdef CONFIG_SMP
+static inline void mutex_set_owner(struct mutex *lock)
+{
+	lock->owner = current_thread_info();
+}
+
+static inline void mutex_clear_owner(struct mutex *lock)
+{
+	lock->owner = NULL;
+}
+#else
+static inline void mutex_set_owner(struct mutex *lock)
+{
+}
+
+static inline void mutex_clear_owner(struct mutex *lock)
+{
+}
+#endif
+
 #define debug_mutex_wake_waiter(lock, waiter)		do { } while (0)
 #define debug_mutex_free_waiter(waiter)			do { } while (0)
 #define debug_mutex_add_waiter(lock, waiter, ti)	do { } while (0)
kernel/sched.c +66 -0

72 lines not on this page · raw message

include/linux/sched.h +1 -0
Index: linux-2.6/include/linux/sched.h
===================================================================
@@ -330,6 +330,7 @@ extern signed long schedule_timeout_inte
 extern signed long schedule_timeout_killable(signed long timeout);
 extern signed long schedule_timeout_uninterruptible(signed long timeout);
 asmlinkage void schedule(void);
+extern int spin_on_owner(struct mutex *lock, struct thread_info *owner);
 
 struct nsproxy;
 struct user_namespace;
kernel/sched_features.h +1 -0
Index: linux-2.6/kernel/sched_features.h
===================================================================
@@ -13,3 +13,4 @@ SCHED_FEAT(LB_WAKEUP_UPDATE, 1)
 SCHED_FEAT(ASYM_EFF_LOAD, 1)
 SCHED_FEAT(WAKEUP_OVERLAP, 0)
 SCHED_FEAT(LAST_BUDDY, 1)
+SCHED_FEAT(OWNER_SPIN, 1)
#105 lore raw

Re: [PATCH -v7][RFC]: mutex: implement adaptive spinning

Quoted 10 lines · Peter Zijlstra

Index: linux-2.6/kernel/sched.c
===================================================================

kernel/sched.c +2 -0
@@ -4672,6 +4672,72 @@ need_resched_nonpreemptible:
 }
 EXPORT_SYMBOL(schedule);
 
+#ifdef CONFIG_SMP
+/*

kernel/sched.c need_resched_nonpreemptible: · line 4686

Quoted 10 lines
kernel/sched.c +10 -0
+ * Look out! "owner" is an entirely speculative pointer
+ * access and not reliable.
+ */
+int spin_on_owner(struct mutex *lock, struct thread_info *owner)
+{
+	unsigned int cpu;
+	struct rq *rq;
+	int ret = 1;
+
+	if (unlikely(!sched_feat(OWNER_SPIN)))

I would remove the "unlikely", if someone turns OWNER_SPIN off, then you have the wrong decision being made. Choices by users should never be in a "likely" or "unlikely" annotation. It's discrimination ;-)

Quoted 18 lines
kernel/sched.c +18 -0
+		return 0;
+
+	preempt_disable();
+#ifdef CONFIG_DEBUG_PAGEALLOC
+	/*
+	 * Need to access the cpu field knowing that
+	 * DEBUG_PAGEALLOC could have unmapped it if
+	 * the mutex owner just released it and exited.
+	 */
+	if (probe_kernel_address(&owner->cpu, cpu))
+		goto out;
+#else
+	cpu = owner->cpu;
+#endif
+
+	/*
+	 * Even if the access succeeded (likely case),
+	 * the cpu field may no longer be valid.

kernel/sched.c need_resched_nonpreemptible: · line 4714

Quoted 10 lines
kernel/sched.c +10 -0
+	 */
+	if (cpu >= nr_cpumask_bits)
+		goto out;
+
+	/*
+	 * We need to validate that we can do a
+	 * get_cpu() and that we have the percpu area.
+	 */
+	if (!cpu_online(cpu))
+		goto out;

Should we need to do a "get_cpu" or something? Couldn't the CPU disappear between these two calls. Or does it do a stop-machine and the preempt disable will protect us?

-- Steve

Quoted 53 lines
kernel/sched.c +26 -0
+
+	rq = cpu_rq(cpu);
+
+	for (;;) {
+		if (lock->owner != owner)
+			break;
+
+		/*
+		 * Is that owner really running on that cpu?
+		 */
+		if (task_thread_info(rq->curr) != owner)
+			break;
+
+		if (need_resched()) {
+			ret = 0;
+			break;
+		}
+
+		cpu_relax();
+	}
+out:
+	preempt_enable_no_resched();
+	return ret;
+}
+#endif
+
 #ifdef CONFIG_PREEMPT
 /*
  * this is the entry point to schedule() from in-kernel preemption

Index: linux-2.6/include/linux/sched.h
===================================================================

include/linux/sched.h +1 -0
@@ -330,6 +330,7 @@ extern signed long schedule_timeout_inte
 extern signed long schedule_timeout_killable(signed long timeout);
 extern signed long schedule_timeout_uninterruptible(signed long timeout);
 asmlinkage void schedule(void);
+extern int spin_on_owner(struct mutex *lock, struct thread_info *owner);
 
 struct nsproxy;
 struct user_namespace;

Index: linux-2.6/kernel/sched_features.h
===================================================================

kernel/sched_features.h +1 -0
@@ -13,3 +13,4 @@ SCHED_FEAT(LB_WAKEUP_UPDATE, 1)
 SCHED_FEAT(ASYM_EFF_LOAD, 1)
 SCHED_FEAT(WAKEUP_OVERLAP, 0)
 SCHED_FEAT(LAST_BUDDY, 1)
+SCHED_FEAT(OWNER_SPIN, 1)
maintainer
#106 lore raw

Re: [PATCH -v7][RFC]: mutex: implement adaptive spinning

Quoted 9 lines · Steven Rostedt
Quoted 8 lines · Peter Zijlstra

Index: linux-2.6/kernel/sched.c
===================================================================

kernel/sched.c +0 -0
@@ -4672,6 +4672,72 @@ need_resched_nonpreemptible:
 }
 EXPORT_SYMBOL(schedule);
 
Quoted 16 lines

kernel/sched.c need_resched_nonpreemptible: · line 4686

Quoted 12 lines
kernel/sched.c +12 -0
+#ifdef CONFIG_SMP
+/*
+ * Look out! "owner" is an entirely speculative pointer
+ * access and not reliable.
+ */
+int spin_on_owner(struct mutex *lock, struct thread_info *owner)
+{
+	unsigned int cpu;
+	struct rq *rq;
+	int ret = 1;
+
+	if (unlikely(!sched_feat(OWNER_SPIN)))

I would remove the "unlikely", if someone turns OWNER_SPIN off, then you have the wrong decision being made. Choices by users should never be in a "likely" or "unlikely" annotation. It's discrimination ;-)

in the unlikely case we schedule(), that seems expensive enough to want to make the spin case ever so slightly faster.

Quoted 24 lines
Quoted 24 lines
kernel/sched.c +24 -0
+		return 0;
+
+	preempt_disable();
+#ifdef CONFIG_DEBUG_PAGEALLOC
+	/*
+	 * Need to access the cpu field knowing that
+	 * DEBUG_PAGEALLOC could have unmapped it if
+	 * the mutex owner just released it and exited.
+	 */
+	if (probe_kernel_address(&owner->cpu, cpu))
+		goto out;
+#else
+	cpu = owner->cpu;
+#endif
+
+	/*
+	 * Even if the access succeeded (likely case),
+	 * the cpu field may no longer be valid.
+	 */
+	if (cpu >= nr_cpumask_bits)
+		goto out;
+
+	/*
+	 * We need to validate that we can do a
Quoted 8 lines

kernel/sched.c need_resched_nonpreemptible: · line 4714

Quoted 4 lines
kernel/sched.c +4 -0
+	 * get_cpu() and that we have the percpu area.
+	 */
+	if (!cpu_online(cpu))
+		goto out;

Should we need to do a "get_cpu" or something? Couldn't the CPU disappear between these two calls. Or does it do a stop-machine and the preempt disable will protect us?

Did you miss the preempt_disable() a bit up?

Quoted 25 lines
Quoted 25 lines
kernel/sched.c +25 -0
+
+	rq = cpu_rq(cpu);
+
+	for (;;) {
+		if (lock->owner != owner)
+			break;
+
+		/*
+		 * Is that owner really running on that cpu?
+		 */
+		if (task_thread_info(rq->curr) != owner)
+			break;
+
+		if (need_resched()) {
+			ret = 0;
+			break;
+		}
+
+		cpu_relax();
+	}
+out:
+	preempt_enable_no_resched();
+	return ret;
+}
+#endif
#107 lore raw

Re: [PATCH -v7][RFC]: mutex: implement adaptive spinning

Quoted 27 lines · Peter Zijlstra
Quoted 9 lines · Steven Rostedt
Quoted 8 lines · Peter Zijlstra

Index: linux-2.6/kernel/sched.c
===================================================================

kernel/sched.c +0 -0
@@ -4672,6 +4672,72 @@ need_resched_nonpreemptible:
 }
 EXPORT_SYMBOL(schedule);
 
Quoted 16 lines

kernel/sched.c need_resched_nonpreemptible: · line 4686

Quoted 12 lines
kernel/sched.c +12 -0
+#ifdef CONFIG_SMP
+/*
+ * Look out! "owner" is an entirely speculative pointer
+ * access and not reliable.
+ */
+int spin_on_owner(struct mutex *lock, struct thread_info *owner)
+{
+	unsigned int cpu;
+	struct rq *rq;
+	int ret = 1;
+
+	if (unlikely(!sched_feat(OWNER_SPIN)))

I would remove the "unlikely", if someone turns OWNER_SPIN off, then you have the wrong decision being made. Choices by users should never be in a "likely" or "unlikely" annotation. It's discrimination ;-)

Quoted 2 lines

in the unlikely case we schedule(), that seems expensive enough to want to make the spin case ever so slightly faster.

OK, that makes sense, but I would comment that. Otherwise, it just looks like another misuse of the unlikely annotation.

Quoted 34 lines
Quoted 25 lines
Quoted 25 lines
kernel/sched.c +24 -0
+		return 0;
+
+	preempt_disable();
+#ifdef CONFIG_DEBUG_PAGEALLOC
+	/*
+	 * Need to access the cpu field knowing that
+	 * DEBUG_PAGEALLOC could have unmapped it if
+	 * the mutex owner just released it and exited.
+	 */
+	if (probe_kernel_address(&owner->cpu, cpu))
+		goto out;
+#else
+	cpu = owner->cpu;
+#endif
+
+	/*
+	 * Even if the access succeeded (likely case),
+	 * the cpu field may no longer be valid.
+	 */
+	if (cpu >= nr_cpumask_bits)
+		goto out;
+
+	/*
+	 * We need to validate that we can do a
Quoted 8 lines

kernel/sched.c need_resched_nonpreemptible: · line 4714

Quoted 4 lines
kernel/sched.c +4 -0
+	 * get_cpu() and that we have the percpu area.
+	 */
+	if (!cpu_online(cpu))
+		goto out;

Should we need to do a "get_cpu" or something? Couldn't the CPU disappear between these two calls. Or does it do a stop-machine and the preempt disable will protect us?

Quoted 1 line

Did you miss the preempt_disable() a bit up?

No, let me rephrase it better. Does the preempt_disable protect against another CPU from going off line? Does taking a CPU off line do a stop_machine?

-- Steve

Quoted 29 lines
Quoted 26 lines
Quoted 26 lines
kernel/sched.c +25 -0
+
+	rq = cpu_rq(cpu);
+
+	for (;;) {
+		if (lock->owner != owner)
+			break;
+
+		/*
+		 * Is that owner really running on that cpu?
+		 */
+		if (task_thread_info(rq->curr) != owner)
+			break;
+
+		if (need_resched()) {
+			ret = 0;
+			break;
+		}
+
+		cpu_relax();
+	}
+out:
+	preempt_enable_no_resched();
+	return ret;
+}
+#endif
maintainer
#108 lore raw

Re: [PATCH -v7][RFC]: mutex: implement adaptive spinning

Quoted 7 lines · Steven Rostedt
Quoted 2 lines · Peter Zijlstra

in the unlikely case we schedule(), that seems expensive enough to want to make the spin case ever so slightly faster.

OK, that makes sense, but I would comment that. Otherwise, it just looks like another misuse of the unlikely annotation.

OK, sensible enough.

Quoted 9 lines
Quoted 5 lines
Quoted 3 lines

Should we need to do a "get_cpu" or something? Couldn't the CPU disappear between these two calls. Or does it do a stop-machine and the preempt disable will protect us?

Did you miss the preempt_disable() a bit up?

No, let me rephrase it better. Does the preempt_disable protect against another CPU from going off line? Does taking a CPU off line do a stop_machine?

Yes and yes.

#109 lore raw

Re: [PATCH -v7][RFC]: mutex: implement adaptive spinning

In reply to Steven Rostedt
Quoted 11 lines · Steven Rostedt
Quoted 11 lines
Quoted 10 lines

kernel/sched.c need_resched_nonpreemptible: · line 4714

Quoted 6 lines
kernel/sched.c +6 -0
+	/*
+	 * We need to validate that we can do a
+	 * get_cpu() and that we have the percpu area.
+	 */
+	if (!cpu_online(cpu))
+		goto out;

Should we need to do a "get_cpu" or something? Couldn't the CPU disappear between these two calls. Or does it do a stop-machine and the preempt disable will protect us?

Quoted 5 lines
Quoted 1 line

Did you miss the preempt_disable() a bit up?

No, let me rephrase it better. Does the preempt_disable protect against another CPU from going off line? Does taking a CPU off line do a stop_machine?

I just looked at the cpu hotplug code, and it does call stop machine. All is in order ;-)

-- Steve

#110 lore raw

Re: [PATCH -v7][RFC]: mutex: implement adaptive spinning

In reply to Peter Zijlstra
Quoted 3 lines · Peter Zijlstra

This was done because the interaction between trylock_slowpath and that -1000 state hurt my head.

Yeah, it was a stupid hacky thing to avoid the "list_empty()", but doing it explicitly is fine (we don't hold the lock, so the list isn't necessarily stable, but doing "list_empty()" is fine because we don't ever dereference the pointers, we just compare the pointers themselves).

I shouldn't have done that hacky thing, it wasn't worth it.

Linus

#111 lore raw

Re: [PATCH -v7][RFC]: mutex: implement adaptive spinning

In reply to Peter Zijlstra

Ok, I've gone through -v7, and I'm sure you're all shocked to hear it, but I have no complaints. Except that you dropped all the good commit commentary you had earlier ;)

The patch looks pretty good (except for the big "#if 0" block in mutex-debug.c that I hope gets fixed, but I can't even really claim that I can be bothered), the locking looks fine (ie no locking at all), and the numbers seem pretty convinving.

Oh, and I think the open-coded

	atomic_cmpxchg(count, 1, 0) == 1

could possibly just be replaced with a simple __mutex_fastpath_trylock(). I dunno.

IOW, I'd actually like to take it, but let's give it at least a day or two. Do people have any concerns?

And as far as I'm concerned, the nice part about not having any locking there is that now the spinning has no impact what-so-ever on the rest of the mutex logic. There are no subtleties about any of that - it's literally about falling back to a (fairly educated) "try a few trylocks if you fail". So it _looks_ pretty robust. I don't think there should be any subtle interactions with anything else. If the old mutexes worked, then the spinning should work.

Discussion?

Linus

#112 lore raw

Re: [PATCH -v7][RFC]: mutex: implement adaptive spinning

Quoted 5 lines · Linus Torvalds

Ok, I've gone through -v7, and I'm sure you're all shocked to hear it, but I have no complaints. Except that you dropped all the good commit commentary you had earlier ;)

Seems to get stuck under load. I've hit it with make -j 50 on ext3 and with my btrfs benchmarking. This was against the latest git from about 5 minutes ago.

-chris

BUG: soft lockup - CPU#3 stuck for 61s! [python:3970]
CPU 3:
Modules linked in: netconsole configfs btrfs zlib_deflate loop e1000e 3w_9xxx
Pid: 3970, comm: python Not tainted 2.6.28 #1
RIP: 0010:[<ffffffff8024f4de>]  [<ffffffff8024f4de>] __cmpxchg+0x36/0x3f
RSP: 0018:ffff880148073be8  EFLAGS: 00000217
RAX: 00000000fffffff8 RBX: ffff880148073be8 RCX: 0000000000000004
RDX: 0000000000000000 RSI: 0000000000000001 RDI: ffff8801498efdf0
RBP: ffffffff8020ce0e R08: 00000000007563b7 R09: 0000000000000000
R10: ffff880148073c88 R11: 0000000000000001 R12: ffff880148073c88
R13: 0000000000000001 R14: ffff880148073be8 R15: ffffffff8020ce0e
FS:  00007f5fb455a6e0(0000) GS:ffff88014dd368c0(0000) knlGS:0000000000000000
CS:  0010 DS: 0000 ES: 0000 CR0: 000000008005003b
CR2: 00007f5fb38181a0 CR3: 00000001483a0000 CR4: 00000000000006e0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
Call Trace:
 [<ffffffff8024f4b1>] ? __cmpxchg+0x9/0x3f
 [<ffffffff805e0068>] ? __mutex_lock_common+0x3d/0x178
 [<ffffffff805e106c>] ? _spin_lock+0x9/0x1f
 [<ffffffff802af31b>] ? __d_lookup+0x98/0xdb
 [<ffffffff805e01f2>] ? __mutex_lock_slowpath+0x19/0x1b
 [<ffffffff805e025b>] ? mutex_lock+0x23/0x3a
 [<ffffffff802a7f99>] ? do_lookup+0x85/0x162
 [<ffffffff802a993d>] ? __link_path_walk+0x4db/0x620
 [<ffffffff802a9ad5>] ? path_walk+0x53/0x9a
 [<ffffffff802a9c68>] ? do_path_lookup+0x107/0x126
 [<ffffffff802a8f74>] ? getname+0x16b/0x1ad
 [<ffffffff802aa693>] ? user_path_at+0x57/0x98
 [<ffffffff802aa6a5>] ? user_path_at+0x69/0x98
 [<ffffffff802a3773>] ? vfs_stat_fd+0x26/0x53
 [<ffffffff802b46b2>] ? mntput_no_expire+0x2f/0x125
 [<ffffffff802a3963>] ? sys_newstat+0x27/0x41
 [<ffffffff802a7cae>] ? mntput+0x1d/0x1f
 [<ffffffff802a7d3e>] ? path_put+0x22/0x26
 [<ffffffff802a36b7>] ? sys_readlinkat+0x7b/0x89
 [<ffffffff8020c4eb>] ? system_call_fastpath+0x16/0x1b
maintainer
#313 lore raw

Re: [PATCH -v7][RFC]: mutex: implement adaptive spinning

In reply to Linus Torvalds
Quoted 3 lines · Linus Torvalds

Ok, I've gone through -v7, and I'm sure you're all shocked to hear it, but I have no complaints.

*cheer*, except I guess we need to figure out what goes bad for Chris.

Quoted 2 lines

Except that you dropped all the good commit
commentary you had earlier ;)

Yeah, I've yet to add that back, will do.

Quoted 11 lines

The patch looks pretty good (except for the big "#if 0" block in mutex-debug.c that I hope gets fixed, but I can't even really claim that I can be bothered), the locking looks fine (ie no locking at all), and the numbers seem pretty convinving.

Oh, and I think the open-coded

	atomic_cmpxchg(count, 1, 0) == 1

could possibly just be replaced with a simple __mutex_fastpath_trylock(). I dunno.

__mutex_fastpath_trylock() isn't always that neat -- see include/asm-generic/mutex-xchg.h -- and its a NOP on DEBUG_MUTEXES.

Note how I used old_val for the list_empty() thing as well, we could possibly drop that extra condition though.

#113 lore raw

Re: [PATCH -v7][RFC]: mutex: implement adaptive spinning

In reply to Chris Mason
Quoted 13 lines · Chris Mason
Quoted 5 lines · Linus Torvalds

Ok, I've gone through -v7, and I'm sure you're all shocked to hear it, but I have no complaints. Except that you dropped all the good commit commentary you had earlier ;)

Seems to get stuck under load. I've hit it with make -j 50 on ext3 and with my btrfs benchmarking. This was against the latest git from about 5 minutes ago.

-chris

Quoted 7 lines
BUG: soft lockup - CPU#3 stuck for 61s! [python:3970] CPU 3: Modules 

linked in: netconsole configfs btrfs zlib_deflate loop e1000e 3w_9xxx

Pid: 3970, comm: python Not tainted 2.6.28 #1 Call Trace:

[<ffffffff8024f4b1>] ? __cmpxchg+0x9/0x3f [<ffffffff805e0068>] ? __mutex_lock_common+0x3d/0x178

Hmm, looking at the code...

mutex.c:

       for (;;) {
                struct thread_info *owner;

                old_val = atomic_cmpxchg(&lock->count, 1, 0);
                if (old_val == 1) {
                        lock_acquired(&lock->dep_map, ip);
                        mutex_set_owner(lock);
                        return 0;
                }

                if (old_val < 0 && !list_empty(&lock->wait_list))
                        break;

                /* See who owns it, and spin on him if anybody */
                owner = ACCESS_ONCE(lock->owner);
                if (owner && !spin_on_owner(lock, owner))
                        break;

                cpu_relax();
        }

and in sched.c:

int spin_on_owner(struct mutex *lock, struct thread_info *owner)

{
        unsigned int cpu;
        struct rq *rq;
        int ret = 1;
[...]
                if (lock->owner != owner)
                        break;

We keep spinning if the owner changes. I wonder if you have many CPUS (Chris, how many cpus did this box have?), you could get one task constantly spinning while the mutex keeps changing owners on the other CPUS.

Perhaps, we should do something like:

mutex.c:

       for (;;) {
                struct thread_info *owner = NULL;

                old_val = atomic_cmpxchg(&lock->count, 1, 0);
                if (old_val == 1) {
                        lock_acquired(&lock->dep_map, ip);
                        mutex_set_owner(lock);
                        return 0;
                }

                if (old_val < 0 && !list_empty(&lock->wait_list)) 
                        break;

                /* See who owns it, and spin on him if anybody */
		if (!owner)
	                owner = ACCESS_ONCE(lock->owner);
                if (owner && !spin_on_owner(lock, owner)) 
                        break;

                cpu_relax();
        }

Or just pull assigning of the owner out of the loop. This way, we go to sleep if the owner changes and is not NULL.

Just a thought,

-- Steve

#114 lore raw

Re: [PATCH -v7][RFC]: mutex: implement adaptive spinning

Quoted 2 lines · Steven Rostedt

We keep spinning if the owner changes.

I think we want to - if you have multiple CPU's and a heavily contended lock that acts as a spinlock, we still _do_ want to keep spinning even if another CPU gets the lock.

And I don't even believe that is the bug. I suspect the bug is simpler.

I think the "need_resched()" needs to go in the outer loop, or at least happen in the "!owner" case. Because at least with preemption, what can happen otherwise is

- process A gets the lock, but gets preempted before it sets lock->owner.

End result: count = 0, owner = NULL.

- processes B/C goes into the spin loop, filling up all CPU's (assuming dual-core here), and will now both loop forever if they hold the kernel lock (or have some other preemption disabling thing over their down()).

And all the while, process A would _happily_ set ->owner, and eventually release the mutex, but it never gets to run to do either of them so.

In fact, you might not even need a process C: all you need is for B to be on the same runqueue as A, and having enough load on the other CPU's that A never gets migrated away. So "C" might be in user space.

I dunno. There are probably variations on the above.

Linus

#140 lore raw

Re: [PATCH -v7][RFC]: mutex: implement adaptive spinning

In reply to Chris Mason

Unrelated:

Quoted 2 lines · Chris Mason
RIP: 0010:[<ffffffff8024f4de>]  [<ffffffff8024f4de>] __cmpxchg+0x36/0x3f

Ouch. HOW THE HELL DID THAT NOT GET INLINED?

cmpxchg() is a _single_ instruction if it's inlined, but it's a horrible mess of dynamic conditionals on the (constant - per call-site) size argument if it isn't.

It looks like you probably enabled the "let gcc mess up inlining" config option.

Ingo - I think we need to remove that crap again. Because gcc gets the inlining horribly horribly wrong. As usual.

Linus

#115 lore raw

Re: [PATCH -v7][RFC]: mutex: implement adaptive spinning

In reply to Linus Torvalds
Quoted 15 lines · Linus Torvalds

And I don't even believe that is the bug. I suspect the bug is simpler.

I think the "need_resched()" needs to go in the outer loop, or at least happen in the "!owner" case. Because at least with preemption, what can happen otherwise is

- process A gets the lock, but gets preempted before it sets lock->owner.

End result: count = 0, owner = NULL.

- processes B/C goes into the spin loop, filling up all CPU's (assuming dual-core here), and will now both loop forever if they hold the kernel lock (or have some other preemption disabling thing over their down()).

Quoted 8 lines

And all the while, process A would _happily_ set ->owner, and eventually release the mutex, but it never gets to run to do either of them so.

In fact, you might not even need a process C: all you need is for B to be on the same runqueue as A, and having enough load on the other CPU's that A never gets migrated away. So "C" might be in user space.

I dunno. There are probably variations on the above.

Ouch! I think you are on to something:

        for (;;) {
                struct thread_info *owner;

                old_val = atomic_cmpxchg(&lock->count, 1, 0);
                if (old_val == 1) {
                        lock_acquired(&lock->dep_map, ip);
                        mutex_set_owner(lock);
                        return 0;
                }

                if (old_val < 0 && !list_empty(&lock->wait_list))
                        break;

                /* See who owns it, and spin on him if anybody */
                owner = ACCESS_ONCE(lock->owner);

The owner was preempted before assigning lock->owner (as you stated).

                if (owner && !spin_on_owner(lock, owner))
                        break;

We just spin :-(

I think adding the:

+ if (need_resched())
+ break;

would solve the problem.

Thanks,

-- Steve

                cpu_relax();
        }
#116 lore raw

Re: [PATCH -v7][RFC]: mutex: implement adaptive spinning

In reply to Linus Torvalds
Quoted 15 lines · Linus Torvalds

And I don't even believe that is the bug. I suspect the bug is simpler.

I think the "need_resched()" needs to go in the outer loop, or at least happen in the "!owner" case. Because at least with preemption, what can happen otherwise is

- process A gets the lock, but gets preempted before it sets lock->owner.

End result: count = 0, owner = NULL.

- processes B/C goes into the spin loop, filling up all CPU's (assuming dual-core here), and will now both loop forever if they hold the kernel lock (or have some other preemption disabling thing over their down()).

Quoted 8 lines

And all the while, process A would _happily_ set ->owner, and eventually release the mutex, but it never gets to run to do either of them so.

In fact, you might not even need a process C: all you need is for B to be on the same runqueue as A, and having enough load on the other CPU's that A never gets migrated away. So "C" might be in user space.

I dunno. There are probably variations on the above.

Ouch! I think you are on to something:

        for (;;) {
                struct thread_info *owner;

                old_val = atomic_cmpxchg(&lock->count, 1, 0);
                if (old_val == 1) {
                        lock_acquired(&lock->dep_map, ip);
                        mutex_set_owner(lock);
                        return 0;
                }

                if (old_val < 0 && !list_empty(&lock->wait_list))
                        break;

                /* See who owns it, and spin on him if anybody */
                owner = ACCESS_ONCE(lock->owner);

The owner was preempted before assigning lock->owner (as you stated).

                if (owner && !spin_on_owner(lock, owner))
                        break;

We just spin :-(

I think adding the:

+ if (need_resched())
+ break;

would solve the problem.

Thanks,

-- Steve

                cpu_relax();
        }
#117 lore raw

Re: [PATCH -v7][RFC]: mutex: implement adaptive spinning

In reply to Linus Torvalds
Quoted 15 lines · Linus Torvalds

And I don't even believe that is the bug. I suspect the bug is simpler.

I think the "need_resched()" needs to go in the outer loop, or at least happen in the "!owner" case. Because at least with preemption, what can happen otherwise is

- process A gets the lock, but gets preempted before it sets lock->owner.

End result: count = 0, owner = NULL.

- processes B/C goes into the spin loop, filling up all CPU's (assuming dual-core here), and will now both loop forever if they hold the kernel lock (or have some other preemption disabling thing over their down()).

Quoted 8 lines

And all the while, process A would _happily_ set ->owner, and eventually release the mutex, but it never gets to run to do either of them so.

In fact, you might not even need a process C: all you need is for B to be on the same runqueue as A, and having enough load on the other CPU's that A never gets migrated away. So "C" might be in user space.

I dunno. There are probably variations on the above.

Ouch! I think you are on to something:

        for (;;) {
                struct thread_info *owner;

                old_val = atomic_cmpxchg(&lock->count, 1, 0);
                if (old_val == 1) {
                        lock_acquired(&lock->dep_map, ip);
                        mutex_set_owner(lock);
                        return 0;
                }

                if (old_val < 0 && !list_empty(&lock->wait_list))
                        break;

                /* See who owns it, and spin on him if anybody */
                owner = ACCESS_ONCE(lock->owner);

The owner was preempted before assigning lock->owner (as you stated).

                if (owner && !spin_on_owner(lock, owner))
                        break;

We just spin :-(

I think adding the:

+ if (need_resched())
+ break;

would solve the problem.

Thanks,

-- Steve

                cpu_relax();
        }
#118 lore raw

Re: [PATCH -v7][RFC]: mutex: implement adaptive spinning

Quoted 3 lines · Steven Rostedt
Quoted 3 lines

In fact, you might not even need a process C: all you need is for B to be on the same runqueue as A, and having enough load on the other CPU's that A never gets migrated away. So "C" might be in user space.

You're right about not needing process C.

Quoted 21 lines
Quoted 2 lines

I dunno. There are probably variations on the above.

Ouch! I think you are on to something:

        for (;;) {
                struct thread_info *owner;

                old_val = atomic_cmpxchg(&lock->count, 1, 0);
                if (old_val == 1) {
                        lock_acquired(&lock->dep_map, ip);
                        mutex_set_owner(lock);
                        return 0;
                }

                if (old_val < 0 && !list_empty(&lock->wait_list))
                        break;

                /* See who owns it, and spin on him if anybody */
                owner = ACCESS_ONCE(lock->owner);
Quoted 1 line

The owner was preempted before assigning lock->owner (as you stated).

If it was the current process that preempted the owner and these are RT tasks pinned to the same CPU and the owner is of lower priority than the spinner, we have a deadlock!

Hmm, I do not think the need_sched here will even fix that :-/

-- Steve

#121 lore raw

Re: [PATCH -v7][RFC]: mutex: implement adaptive spinning

In reply to Steven Rostedt
Quoted 2 lines · Steven Rostedt

Ouch! I think you are on to something:

Yeah, there's somethign there, but looking at Chris' backtrace, there's nothing there to disable preemption. So if it was this simple case, it should still have preempted him to let the other process run and finish up.

So I don't think Chris' softlockup is at least _exactly_ that case. There's something else going on too.

That said, I do think it's a mistake for us to care about the value of "spin_on_owner()". I suspect v8 should

- always have

	if (need_resched())
		break

in the outer loop.

- drop the return value from "spin_on_owner()", and just break out if anything changes (including the need_resched() flag).

- I'd also drop the "old_value < 0 &&" test, and just test the list_empty() unconditionally.

Aim for really simple.

As to what to do about the "!owner" case - we do want to spin on it, but the interaction with preemption is kind of nasty. I'd hesitate to make the mutex_[un]lock() use preempt_disable() to avoid scheduling in between getting the lock and settign the owner, though - because that would slow down the normal fast-path case.

Maybe we should just limit the "spin on !owner" to some maximal count.

Linus

#122 lore raw

Re: [PATCH -v7][RFC]: mutex: implement adaptive spinning

Quoted 10 lines · Linus Torvalds
Quoted 2 lines · Steven Rostedt

Ouch! I think you are on to something:

Yeah, there's somethign there, but looking at Chris' backtrace, there's nothing there to disable preemption. So if it was this simple case, it should still have preempted him to let the other process run and finish up.

My .config has no lockdep or schedule debugging and voluntary preempt. I do have CONFIG_INLINE_OPTIMIZE on, its a good name for trusting gcc I guess.

Quoted 11 lines

So I don't think Chris' softlockup is at least _exactly_ that case. There's something else going on too.

That said, I do think it's a mistake for us to care about the value of "spin_on_owner()". I suspect v8 should

- always have

	if (need_resched())
		break
Quoted 8 lines

in the outer loop.

- drop the return value from "spin_on_owner()", and just break out if anything changes (including the need_resched() flag).

- I'd also drop the "old_value < 0 &&" test, and just test the list_empty() unconditionally.

I'll give the above a shot, and we can address the preempt + !owner in another rev

-chris

#141 lore raw

Re: [PATCH -v7][RFC]: mutex: implement adaptive spinning

In reply to Linus Torvalds
Quoted 12 lines · Linus Torvalds

Unrelated:

Quoted 2 lines · Chris Mason
RIP: 0010:[<ffffffff8024f4de>]  [<ffffffff8024f4de>] __cmpxchg+0x36/0x3f

Ouch. HOW THE HELL DID THAT NOT GET INLINED?

cmpxchg() is a _single_ instruction if it's inlined, but it's a horrible mess of dynamic conditionals on the (constant - per call-site) size argument if it isn't.

Quoted 5 lines

It looks like you probably enabled the "let gcc mess up inlining" config option.

Ingo - I think we need to remove that crap again. Because gcc gets the inlining horribly horribly wrong. As usual.

Apparently it messes up with asm()s: it doesnt know the contents of the asm() and hence it over-estimates the size [based on string heuristics]
...

Which is bad - asm()s tend to be the most important entities to inline - all over our fastpaths .

Despite that messup it's still a 1% net size win:

text data bss dec hex filename

   7109652 1464684  802888 9377224  8f15c8 vmlinux.always-inline
   7046115 1465324  802888 9314327  8e2017 vmlinux.optimized-inlining

That win is mixed in slowpath and fastpath as well.

I see three options:

- Disable CONFIG_OPTIMIZE_INLINING=y altogether (it's already default-off)

- Change the asm() inline markers to something new like asm_inline, which defaults to __always_inline.

- Just mark all asm() inline markers as __always_inline - realizing that these should never ever be out of line.

We might still try the second or third options, as i think we shouldnt go back into the business of managing the inline attributes of ~100,000 kernel functions.

I'll try to annotate the inline asms (there's not _that_ many of them), and measure what the size impact is.

Ingo

#142 lore raw

Re: [PATCH -v7][RFC]: mutex: implement adaptive spinning

Quoted 5 lines · Ingo Molnar

Apparently it messes up with asm()s: it doesnt know the contents of the asm() and hence it over-estimates the size [based on string heuristics]
...

Right. gcc simply doesn't have any way to know how heavyweight an
asm() statement is, and it WILL do the wrong thing in many cases -- especially the ones which involve an out-of-line recovery stub. This is due to a fundamental design decision in gcc to not integrate the compiler and assembler (which some compilers do.)

Quoted 10 lines

Which is bad - asm()s tend to be the most important entities to inline - all over our fastpaths .

Despite that messup it's still a 1% net size win:

text data bss dec hex filename

   7109652 1464684  802888 9377224  8f15c8 vmlinux.always-inline
   7046115 1465324  802888 9314327  8e2017 vmlinux.optimized-inlining

That win is mixed in slowpath and fastpath as well.

The good part here is that the assembly ones really don't have much subtlety -- a function call is at least five bytes, usually more once you count in the register spill penalties -- so __always_inline-ing them should still end up with numbers looking very much like the above.

Quoted 11 lines

I see three options:

- Disable CONFIG_OPTIMIZE_INLINING=y altogether (it's already default-off)

- Change the asm() inline markers to something new like asm_inline, which defaults to __always_inline.

- Just mark all asm() inline markers as __always_inline - realizing that these should never ever be out of line.

Quoted 6 lines

We might still try the second or third options, as i think we shouldnt go back into the business of managing the inline attributes of ~100,000 kernel functions.

I'll try to annotate the inline asms (there's not _that_ many of them), and measure what the size impact is.

The main reason to do #2 over #3 would be for programmer documentation.
There simply should be no reason to ever out-of-lining these. However,
documenting the reason to the programmer is a valuable thing in itself.

-hpa

Signature · 2 lines
H. Peter Anvin, Intel Open Source Technology Center
I work for Intel.  I don't speak on their behalf.
#215 lore raw

Re: [PATCH -v7][RFC]: mutex: implement adaptive spinning

In reply to Ingo Molnar
Quoted 2 lines

I'll try to annotate the inline asms (there's not _that_ many of them), and measure what the size impact is.

You can just use the patch I submitted and that you rejected for most of them :)

-Andi

Signature · 1 line
[email protected]
#123 lore raw

Re: [PATCH -v7][RFC]: mutex: implement adaptive spinning

In reply to Chris Mason
Quoted 12 lines · Chris Mason
Quoted 10 lines · Linus Torvalds
Quoted 2 lines · Steven Rostedt

Ouch! I think you are on to something:

Yeah, there's somethign there, but looking at Chris' backtrace, there's nothing there to disable preemption. So if it was this simple case, it should still have preempted him to let the other process run and finish up.

Quoted 3 lines

My .config has no lockdep or schedule debugging and voluntary preempt. I do have CONFIG_INLINE_OPTIMIZE on, its a good name for trusting gcc I guess.

The patch below isn't quite what Linus suggested, but it is working here at least. In every test I've tried so far, this is faster than the ugly btrfs spin.

dbench v7.1:        789mb/s
dbench simple spin: 566MB/s

50 proc parallel creates v7.1: 162 files/s avg sys: 1.6
50 proc parallel creates simple spin: 152 files/s avg sys: 2

50 proc parallel stat v7.1: 2.3s total
50 proc parallel stat simple spin: 3.8s total

It is less fair though, the 50 proc parallel creates had a much bigger span between the first and last proc's exit time. This isn't a huge shock, I think it shows the hot path is closer to a real spin lock.

Here's the incremental I was using. It looks to me like most of the things that could change inside spin_on_owner mean we still want to spin. The only exception is the need_resched() flag.

-chris

kernel/mutex.c +3 -1
index bd6342a..8936410 100644
@@ -161,11 +161,13 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
 			return 0;
 		}
 
-		if (old_val < 0 && !list_empty(&lock->wait_list))
+		if (!list_empty(&lock->wait_list))
 			break;
 
 		/* See who owns it, and spin on him if anybody */
 		owner = ACCESS_ONCE(lock->owner);
+		if (need_resched())
+			break;
 		if (owner && !spin_on_owner(lock, owner))
 			break;
 
#124 lore raw

Re: [PATCH -v7][RFC]: mutex: implement adaptive spinning

Quoted 4 lines · Chris Mason

It is less fair though, the 50 proc parallel creates had a much bigger span between the first and last proc's exit time. This isn't a huge shock, I think it shows the hot path is closer to a real spin lock.

Actually, the real spin locks are now fair. We use ticket locks on x86.

Well, at least we do unless you enable that broken paravirt support. I'm not at all clear on why CONFIG_PARAVIRT wants to use inferior locks, but I don't much care.

We _could_ certainly aim for using ticket locks for mutexes too, that might be quite nice.

But yes, from a throughput standpoint fairness is almost always a bad thing, so your numbers could easily go down if we did.

Linus

#119 lore raw

Re: [PATCH -v7][RFC]: mutex: implement adaptive spinning

In reply to Steven Rostedt
Quoted 30 lines · Steven Rostedt
Quoted 3 lines · Steven Rostedt
Quoted 3 lines

In fact, you might not even need a process C: all you need is for B to be on the same runqueue as A, and having enough load on the other CPU's that A never gets migrated away. So "C" might be in user space.

You're right about not needing process C.

Quoted 21 lines
Quoted 2 lines

I dunno. There are probably variations on the above.

Ouch! I think you are on to something:

        for (;;) {
                struct thread_info *owner;

                old_val = atomic_cmpxchg(&lock->count, 1, 0);
                if (old_val == 1) {
                        lock_acquired(&lock->dep_map, ip);
                        mutex_set_owner(lock);
                        return 0;
                }

                if (old_val < 0 && !list_empty(&lock->wait_list))
                        break;

                /* See who owns it, and spin on him if anybody */
                owner = ACCESS_ONCE(lock->owner);
Quoted 7 lines
Quoted 1 line

The owner was preempted before assigning lock->owner (as you stated).

If it was the current process that preempted the owner and these are RT tasks pinned to the same CPU and the owner is of lower priority than the spinner, we have a deadlock!

Hmm, I do not think the need_sched here will even fix that :-/

RT tasks could go directly to sleeping. The spinner would see them on the list and break out.

-chris

maintainer
#125 lore raw

Re: [PATCH -v7][RFC]: mutex: implement adaptive spinning

In reply to Linus Torvalds
Quoted 4 lines · Linus Torvalds

Well, at least we do unless you enable that broken paravirt support. I'm not at all clear on why CONFIG_PARAVIRT wants to use inferior locks, but I don't much care.

Because the virtual cpu that has the ticket might not get scheduled for a while, even though another vcpu with a spinner is scheduled.

The whole (para)virt is a nightmare in that respect.

#120 lore raw

Re: [PATCH -v7][RFC]: mutex: implement adaptive spinning

In reply to Chris Mason
Quoted 10 lines · Chris Mason
Quoted 6 lines · Steven Rostedt

If it was the current process that preempted the owner and these are RT tasks pinned to the same CPU and the owner is of lower priority than the spinner, we have a deadlock!

Hmm, I do not think the need_sched here will even fix that :-/

RT tasks could go directly to sleeping. The spinner would see them on the list and break out.

True, we could do:

	if (owner) {
		if (!spin_on_owner(lock, owner))	
			break;
	} else if (rt_task(current))
		break;

That would at least solve the issue in the short term.

-- Steve

#129 lore raw

Re: [PATCH -v7][RFC]: mutex: implement adaptive spinning

In reply to Chris Mason
Quoted 4 lines · Chris Mason

The patch below isn't quite what Linus suggested, but it is working here at least. In every test I've tried so far, this is faster than the ugly btrfs spin.

Sadly, I don't think it's really working.

I was pretty sure that adding the unlocked loop should provably not change the mutex lock semantics. Why? Because it's just basically equivalent to just doing the mutex_trylock() without really changing anything really fundamental in the mutex logic.

And that argument is sadly totally bogus.

The thing is, we used to have this guarantee that any contention would always go into the slowpath, and then in the slow-path we serialize using the spinlock.

So I think the bug is still there, we just hid it better by breaking out of the loop with that "if (need_resched())" always eventually triggering. And it would be ok if it really is guaranteed to _eventually_ trigger, and I guess with timeslices it eventually always will, but I suspect we could have some serious latency spikes.

The problem? Setting "lock->count" to 0. That will mean that the next "mutex_unlock()" will not necessarily enter the slowpath at all, and won't necessarily wake things up like it should.

Normally we set lock->count to 0 after getting the lock, and only _inside_ the spinlock, and then we check the waiters after that. The comment says it all:

        /* set it to 0 if there are no waiters left: */
        if (likely(list_empty(&lock->wait_list)))
                atomic_set(&lock->count, 0);

and the spinning case violates that rule.

Now, the spinning case only sets it to 0 if we saw it set to 1, so I think the argument can go something like:

- if it was 1, and we _have_ seen contention, then we know that at least _one_ person that set it to 1 must have gone through the unlock slowpath (ie it wasn't just a normal "locked increment".

- So even if _we_ (in the spinning part of stealing that lock) didn't wake the waiter up, the slowpath wakeup case (that did _not_ wake us up, since we were spinning and hadn't added ourselves to the wait list) must have done so.

So maybe it's all really really safe, and we're still guaranteed to have as many wakeups as we had go-to-sleeps. But I have to admit that my brain hurts a bit from worrying about this.

Sleeping mutexes are not ever simple.

Linus

#303 lore raw

Re: [PATCH -v7][RFC]: mutex: implement adaptive spinning

In reply to Ingo Molnar
Quoted 1 line · Ingo Molnar

* Linus Torvalds <[email protected]> wrote:

<snip>

Quoted 7 lines
Quoted 3 lines

Ingo - I think we need to remove that crap again. Because gcc gets the inlining horribly horribly wrong. As usual.

Apparently it messes up with asm()s: it doesnt know the contents of the asm() and hence it over-estimates the size [based on string heuristics]
...

<snip>

Quoted 6 lines

That win is mixed in slowpath and fastpath as well.

I see three options:

- Disable CONFIG_OPTIMIZE_INLINING=y altogether (it's already default-off)

I'd like to see this, leave all the heuristics out of it, if I say inline, I don't mean _maybe_, I mean you'd better damn well inline it. On the other hand, alpha seems to be hand-disabling the inline means __always_inline in their arch headers, so if this option is kept, it should be enabled on alpha as that is the current state of play there and get rid of that arch-private bit.

Quoted 3 lines

- Change the asm() inline markers to something new like asm_inline, which defaults to __always_inline.

I'd suggest just making inline always mean __always_inline. And get to work removing inline from functions in C files. This is probably also the better choice to keep older gccs producing decent code.

Quoted 7 lines

- Just mark all asm() inline markers as __always_inline - realizing that these should never ever be out of line.

We might still try the second or third options, as i think we shouldnt go back into the business of managing the inline attributes of ~100,000 kernel functions.

Or just make it clear that inline shouldn't (unless for a very good reason) _ever_ be used in a .c file.

Cheers,

Harvey

#130 lore raw

Re: [PATCH -v7][RFC]: mutex: implement adaptive spinning

In reply to Linus Torvalds
Quoted 10 lines

The problem? Setting "lock->count" to 0. That will mean that the next "mutex_unlock()" will not necessarily enter the slowpath at all, and won't necessarily wake things up like it should.

Normally we set lock->count to 0 after getting the lock, and only _inside_ the spinlock, and then we check the waiters after that. The comment says it all:

Quoted 5 lines
        /* set it to 0 if there are no waiters left: */
        if (likely(list_empty(&lock->wait_list)))
                atomic_set(&lock->count, 0);

and the spinning case violates that rule.

The difference is that here we have it set to -1 (in the non patched code), and we have to decide if we should change that to 0. To change from -1 to 0 needs the protection of the spin locks.

In the loop, we only change from 1 to 0 which is the same as the fast path, and should not cause any problems.

Quoted 3 lines

Now, the spinning case only sets it to 0 if we saw it set to 1, so I think the argument can go something like:

Yep.

Quoted 4 lines

- if it was 1, and we _have_ seen contention, then we know that at least _one_ person that set it to 1 must have gone through the unlock slowpath (ie it wasn't just a normal "locked increment".

Correct.

Quoted 5 lines

- So even if _we_ (in the spinning part of stealing that lock) didn't wake the waiter up, the slowpath wakeup case (that did _not_ wake us up, since we were spinning and hadn't added ourselves to the wait list) must have done so.

Agreed.

Quoted 4 lines

So maybe it's all really really safe, and we're still guaranteed to have as many wakeups as we had go-to-sleeps. But I have to admit that my brain hurts a bit from worrying about this.

I do not think that the issue with the previous bug that Chris showed had anything to do with the actual sleepers. The slow path never changes the lock to '1', so it should not affect the spinners. We can think of the spinners as not having true contention with the lock, and are just like a:

	while (cond) {
		if (mutex_trylock(lock))
			goto got_the_lock;
	}
Quoted 2 lines

Sleeping mutexes are not ever simple.

Now you see why in -rt we did all this in the slow path ;-)

-- Steve

#362 lore raw
In reply to Chris Mason
Quoted 7 lines · Chris Mason

Unresolved from this reviewing thread:

* Should it be named btrfsdev? My vote is no, it is extra work for the distros when we finally do rename it, and I don't think btrfs really has the reputation for stability right now. But if Linus or Andrew would prefer the dev on there, I'll do it.

We know who has the last word on this.

This is just additional background for those who commented.

Using tricks such as btrfsdev, mount "unsafe", or kernel messages won't provide a guarantee that btrfs is only used in appropriate and risk-free ways. Those tricks also won't prevent all problems caused by booting a broken old (or new) release. And the perceived quality and performance of any filesystem release, even between stable versions, depends very much on individual system configuration and use.

Before Chris posted the code, we had some btrfs concall discussions about the best way to set user expectations on btrfs mainline 1.0. Consensus was that the best way we could do this was to warn them when they did mkfs.btrfs.

Today I sent a patch to Chris (which he may ignore/change) so mkfs.btrfs will say:

WARNING! - Btrfs v0.16-39-gf9972b4 IS EXPERIMENTAL WARNING! - see http://btrfs.wiki.kernel.org before using

with a blank line before and after. They don't have to confirm since they can just mkfs a different filesystem if I scared them away. The version is auto-generated.

jim

#216 lore raw

Re: [PATCH -v7][RFC]: mutex: implement adaptive spinning

In reply to Andi Kleen
Quoted 5 lines · Andi Kleen
Quoted 2 lines

I'll try to annotate the inline asms (there's not _that_ many of them), and measure what the size impact is.

You can just use the patch I submitted and that you rejected for most of them :)

I just ran a sample build for x86-64 with gcc 4.3.0, these all allyesconfig builds (modulo the inlining option):

: voreg 64 ; size o.*/vmlinux
text data bss dec hex filename
57590217 24940519 15560504 98091240 5d8c0e8 o.andi/vmlinux 59421552 24912223 15560504 99894279 5f44407 o.noopt/vmlinux 57700527 24950719 15560504 98211750 5da97a6 o.opty/vmlinux

A 3% code size difference even on allyesconfig (1.8 MB!) is nothing to sneeze at. As shown by the delta from Andi's patch, these small assembly stubs really do need to be annotated, since gcc simply has no way to do anything sane with them -- it just doesn't know.

Personally, I'd like to see __asm_inline as opposed to __always_inline for these, though, as a documentation issue: __always_inline implies to me that this function needs to be inlined for correctness, and this could be highly relevant if someone, for example, recodes the routine in C or decides to bloat it out (e.g. paravirt_ops).

It's not a perfect solution even then, because gcc may choose to not inline a higher level of inline functions for the same bogus reason. There isn't much we can do about that, though, unless gcc either integrates the assembler, or gives us some way of injecting the actual weight of the asm statement...

-hpa

Signature · 2 lines
H. Peter Anvin, Intel Open Source Technology Center
I work for Intel.  I don't speak on their behalf.
#304 lore raw

Re: [PATCH -v7][RFC]: mutex: implement adaptive spinning

In reply to Harvey Harrison
Quoted 8 lines · Harvey Harrison
Quoted 4 lines

We might still try the second or third options, as i think we shouldnt go back into the business of managing the inline attributes of ~100,000 kernel functions.

Or just make it clear that inline shouldn't (unless for a very good reason) _ever_ be used in a .c file.

The question is if that would produce acceptable quality code. In theory it should, but I'm more than wondering if it really will.

It would be ideal, of course, as it would mean less typing. I guess we could try it out by disabling any "inline" in the current code that isn't "__always_inline"...

-hpa

Signature · 2 lines
H. Peter Anvin, Intel Open Source Technology Center
I work for Intel.  I don't speak on their behalf.
#305 lore raw

Re: [PATCH -v7][RFC]: mutex: implement adaptive spinning

Quoted 10 lines · H. Peter Anvin
Quoted 8 lines · Harvey Harrison
Quoted 4 lines

We might still try the second or third options, as i think we shouldnt go back into the business of managing the inline attributes of ~100,000 kernel functions.

Or just make it clear that inline shouldn't (unless for a very good reason) _ever_ be used in a .c file.

Quoted 7 lines

The question is if that would produce acceptable quality code. In theory it should, but I'm more than wondering if it really will.

It would be ideal, of course, as it would mean less typing. I guess we could try it out by disabling any "inline" in the current code that isn't "__always_inline"...

A lot of code was written assuming inline means __always_inline, I'd suggest keeping that assumption and working on removing inlines that aren't strictly necessary as there's no way to know what inlines meant 'try to inline' and what ones really should have been __always_inline.

Not that I feel _that_ strongly about it.

Cheers,

Harvey

#307 lore raw

Re: [PATCH -v7][RFC]: mutex: implement adaptive spinning

In reply to H. Peter Anvin
Quoted 6 lines · H. Peter Anvin
Quoted 5 lines · Harvey Harrison
Quoted 4 lines

We might still try the second or third options, as i think we shouldnt go back into the business of managing the inline attributes of ~100,000 kernel functions.

Quoted 6 lines
Quoted 3 lines

Or just make it clear that inline shouldn't (unless for a very good reason) _ever_ be used in a .c file.

The question is if that would produce acceptable quality code. In theory it should, but I'm more than wondering if it really will.

I actually often use noinline when developing code simply because it makes it easier to read oopses when gcc doesn't inline ever static (which it normally does if it only has a single caller). You know roughly where it crashed without having to decode the line number.

I believe others do that too, I notice it's all over btrfs for example.

-Andi

Signature · 1 line
[email protected]
#308 lore raw

Re: [PATCH -v7][RFC]: mutex: implement adaptive spinning

Quoted 4 lines · Andi Kleen

I actually often use noinline when developing code simply because it makes it easier to read oopses when gcc doesn't inline ever static (which it normally does if it only has a single caller)

Yes. Gcc inlining is a total piece of sh*t.

Gcc doesn't inline enough when we ask it to, and inlines too damn aggressively when we don't. It seems to almost totally ignore the inline hint.

Oh, well. The best option tends to be

- mark things "noinline" just to make sure gcc doesn't screw up.

- make "inline" mean "must_inline".

- maybe add a new "maybe_inline" to be the "inline" hint that gcc uses.

because quite frankly, depending on gcc to do the right thing is not working out.

Linus

#143 lore raw

Re: [PATCH -v7][RFC]: mutex: implement adaptive spinning

In reply to H. Peter Anvin
Quoted 3 lines · H. Peter Anvin

Right. gcc simply doesn't have any way to know how heavyweight an
asm() statement is

I don't think that's relevant.

First off, gcc _does_ have a perfectly fine notion of how heavy-weight an "asm" statement is: just count it as a single instruction (and count the argument setup cost that gcc _can_ estimate).

That would be perfectly fine. If people use inline asms, they tend to use it for a reason.

However, I doubt that it's the inline asm that was the biggest reason why gcc decided not to inline - it was probably the constant "switch()" statement. The inline function actually looks pretty large, if it wasn't for the fact that we have a constant argument, and that one makes the switch statement go away.

I suspect gcc has some pre-inlining heuristics that don't take constant folding and simplifiation into account - if you look at just the raw tree of the function without taking the optimization into account, it will look big.

Linus

#144 lore raw

Re: [PATCH -v7][RFC]: mutex: implement adaptive spinning

From: Linus Torvalds <[email protected]>
Date: Thu, 8 Jan 2009 19:46:30 -0800 (PST)

Quoted 3 lines

First off, gcc _does_ have a perfectly fine notion of how heavy-weight an "asm" statement is: just count it as a single instruction (and count the argument setup cost that gcc _can_ estimate).

Actually, at least at one point, it counted the number of newline characters in the assembly string to estimate how many instructions are contained inside.

It actually needs to know exaclty how many instructions are in there, to emit proper far branches and stuff like that, for some cpus.

Since they never added an (optional) way to actually tell the compiler this critical piece of information, so I guess the newline hack is the best they could come up with.

#145 lore raw

Re: [PATCH -v7][RFC]: mutex: implement adaptive spinning

In reply to Linus Torvalds
Quoted 5 lines · Linus Torvalds

First off, gcc _does_ have a perfectly fine notion of how heavy-weight an "asm" statement is: just count it as a single instruction (and count the argument setup cost that gcc _can_ estimate).

True. It's not what it's doing, though. It looks for '\n' and ';' characters, and counts the maximum instruction size for each possible instruction.

The reason why is that gcc's size estimation is partially designed to select what kind of branches it needs to use on architectures which have more than one type of branches. As a result, it tends to drastically overestimate, on purpose.

-hpa

Signature · 2 lines
H. Peter Anvin, Intel Open Source Technology Center
I work for Intel.  I don't speak on their behalf.
#306 lore raw

Re: [PATCH -v7][RFC]: mutex: implement adaptive spinning

In reply to Harvey Harrison
Quoted 8 lines · Harvey Harrison

A lot of code was written assuming inline means __always_inline, I'd suggest keeping that assumption and working on removing inlines that aren't strictly necessary as there's no way to know what inlines meant 'try to inline' and what ones really should have been __always_inline.

Not that I feel _that_ strongly about it.

Actually, we have that reasonably well down by now. There seems to be a couple of minor tweaking still necessary, but I think we're 90-95% there already.

-hpa

Signature · 2 lines
H. Peter Anvin, Intel Open Source Technology Center
I work for Intel.  I don't speak on their behalf.
#310 lore raw

Re: [PATCH -v7][RFC]: mutex: implement adaptive spinning

In reply to Andi Kleen
Quoted 14 lines · On Fri, 9 Jan 2009 04:35:31 +0100 Andi Kleen <[email protected]> wrote:
Quoted 6 lines · H. Peter Anvin
Quoted 5 lines · Harvey Harrison
Quoted 4 lines

We might still try the second or third options, as i think we shouldnt go back into the business of managing the inline attributes of ~100,000 kernel functions.

Quoted 6 lines
Quoted 3 lines

Or just make it clear that inline shouldn't (unless for a very good reason) _ever_ be used in a .c file.

The question is if that would produce acceptable quality code. In theory it should, but I'm more than wondering if it really will.

Quoted 7 lines

I actually often use noinline when developing code simply because it makes it easier to read oopses when gcc doesn't inline ever static (which it normally does if it only has a single caller). You know roughly where it crashed without having to decode the line number.

I believe others do that too, I notice it's all over btrfs for example.

Plus there is the problem where

foo()

{
	char a[1000];
}

bar()

{
	char a[1000];
}

zot()

{
	foo();
	bar();
}

uses 2000 bytes of stack.

Fortunately scripts/checkstack.pl can find these.

If someone runs it.

With the right kconfig settings.

And with the right compiler version.

#309 lore raw

Re: [PATCH -v7][RFC]: mutex: implement adaptive spinning

In reply to Linus Torvalds
Quoted 5 lines · Linus Torvalds
Quoted 3 lines

I actually often use noinline when developing code simply because it makes it easier to read oopses when gcc doesn't inline ever static (which it normally does if it only has a single caller)

Yes. Gcc inlining is a total piece of sh*t.

The static inlining by default (unfortunately) saves a lot of text size.

For testing I built an x86-64 allyesconfig kernel with -fno-inline-functions-called-once (which disables the default static inlining), and it increased text size by ~4.1% (over 2MB for a allyesconfig kernel). So I think we have to keep that, dropping it would cost too much :/

-Andi

Signature · 1 line
[email protected]
#311 lore raw

Re: [PATCH -v7][RFC]: mutex: implement adaptive spinning

In reply to Andrew Morton
Quoted 10 lines

foo()

{
	char a[1000];
}

bar()

{
	char a[1000];
}
Quoted 8 lines

zot()

{
	foo();
	bar();
}

uses 2000 bytes of stack.
And with the right compiler version.

I believe that's fixed in newer gcc versions.

For old gccs we might indeed need to add noinlines though.

-Andi

Signature · 1 line
[email protected]
maintainer
#127 lore raw

Re: [PATCH -v7][RFC]: mutex: implement adaptive spinning

In reply to Linus Torvalds
Quoted 11 lines · Linus Torvalds
Quoted 4 lines · Chris Mason

It is less fair though, the 50 proc parallel creates had a much bigger span between the first and last proc's exit time. This isn't a huge shock, I think it shows the hot path is closer to a real spin lock.

Actually, the real spin locks are now fair. We use ticket locks on x86.

We _could_ certainly aim for using ticket locks for mutexes too, that might be quite nice.

Not really, ticket locks cannot handle a spinner going away - and we need that here.

I've googled around a bit and MCS locks
(http://www.cs.rice.edu/~johnmc/papers/asplos91.pdf) look like a viable way to gain fairness in our situation.

maintainer
#131 lore raw

Re: [PATCH -v7][RFC]: mutex: implement adaptive spinning

In reply to Linus Torvalds
Quoted 6 lines · Linus Torvalds

I was pretty sure that adding the unlocked loop should provably not change the mutex lock semantics. Why? Because it's just basically equivalent to just doing the mutex_trylock() without really changing anything really fundamental in the mutex logic.

And that argument is sadly totally bogus.

It fails for the RT case, yes. It should still be true for regular tasks
- if the owner tracking was accurate.

Quoted 9 lines

The thing is, we used to have this guarantee that any contention would always go into the slowpath, and then in the slow-path we serialize using the spinlock.

So I think the bug is still there, we just hid it better by breaking out of the loop with that "if (need_resched())" always eventually triggering. And it would be ok if it really is guaranteed to _eventually_ trigger, and I guess with timeslices it eventually always will, but I suspect we could have some serious latency spikes.

Yes, the owner getting preempted after acquiring the lock, but before setting the owner can give some nasties :-(

I initially did that preempt_disable/enable around the fast path, but I agree that slowing down the fast path is unwelcome.

Alternatively we could go back to block on !owner, with the added complexity of not breaking out of the spin on lock->owner != owner when !lock->owner, so that the premature owner clearing of the unlock fast path will not force a schedule right before we get a chance to acquire the lock.

Let me do that..

Quoted 3 lines

The problem? Setting "lock->count" to 0. That will mean that the next "mutex_unlock()" will not necessarily enter the slowpath at all, and won't necessarily wake things up like it should.

That's exactly what __mutex_fastpath_trylock() does (or can do, depending on the implementation), so if regular mutexes are correct in the face of a trylock stealing the lock in front of a woken up waiter, then we're still good.

That said, I'm not seeing how mutexes aren't broken already.

say A locks it: counter 1->0
then B contends: counter 0->-1, added to wait list then C contentds: counter -1, added to wait list then A releases: counter -1->1, wake someone up, say B then D trylocks: counter 1->0
so B is back to wait list
then D releases, 0->1, no wakeup

Aaah, B going back to sleep sets it to -1

Therefore, I think we're good.

#146 lore raw

PATCH 1/1 measurements, numbers about CONFIG_OPTIMIZE_INLINING=y impact

In reply to Linus Torvalds
Quoted 20 lines · Linus Torvalds
Quoted 3 lines · H. Peter Anvin

Right. gcc simply doesn't have any way to know how heavyweight an asm() statement is

I don't think that's relevant.

First off, gcc _does_ have a perfectly fine notion of how heavy-weight an "asm" statement is: just count it as a single instruction (and count the argument setup cost that gcc _can_ estimate).

That would be perfectly fine. If people use inline asms, they tend to use it for a reason.

However, I doubt that it's the inline asm that was the biggest reason why gcc decided not to inline - it was probably the constant "switch()" statement. The inline function actually looks pretty large, if it wasn't for the fact that we have a constant argument, and that one makes the switch statement go away.

Quoted 4 lines

I suspect gcc has some pre-inlining heuristics that don't take constant folding and simplifiation into account - if you look at just the raw tree of the function without taking the optimization into account, it will look big.

Yeah. In my tests GCC 4.3.2 does properly inline that particular asm.

But because we cannot really trust GCC in this area yet (or at all), today i've conducted extensive tests measuring GCC's interaction with inlined asm statements. I built hundreds of vmlinux's and distilled the numbers. Here are my findings.

Firstly i've written 40 patches that gradually add an __asm_inline annotation to all inline functions of arch/x86/include/asm/*.h - i've annotated 224 inline functions that way.

Then i've conducted an x86 defconfig and an x86 allyesconfig test for each of the 40 patches.

Realizing that there's assymetry in the inlining practices of drivers and kernel code, i've also conducted a separate series of tests: measuring the size increase/decrease of the core kernel, kernel/built-in.o.

The first table containts the size numbers of kernel/built-in.o, on allyesconfig builds, and the size delta (and percentage):

( Object size tests on kernel: v2.6.28-7939-g2150edc
( using: gcc (GCC) 4.3.2 20081007 (Red Hat 4.3.2-6)
( target: kernel/ kernel/built-in.o
( config: x86.64.allyes

name text-size ( delta) ( pct)
-----------------------------------------------------------------------------

                  always-inline.patch:      1039591    (       0)  (   0.000%)
              optimize-inlining.patch:       967724    (  -71867)  (  -7.426%)
                   asm-inline-0.patch:       967724    (       0)  (   0.000%)
       asm-inline-bitops-simple.patch:       967691    (     -33)  (  -0.003%)
 asm-inline-bitops-constant-set.patch:       966947    (    -744)  (  -0.077%)
 asm-inline-bitops-test-and-set.patch:       966735    (    -212)  (  -0.022%)
          asm-inline-bitops-ffs.patch:       966735    (       0)  (   0.000%)
                   asm-inline-__ffs.h:       966735    (       0)  (   0.000%)
                   asm-inline-__fls.h:       966735    (       0)  (   0.000%)
                     asm-inline-fls.h:       966735    (       0)  (   0.000%)
                   asm-inline-fls64.h:       966735    (       0)  (   0.000%)
                    asm-inline-apic.h:       966735    (       0)  (   0.000%)
               asm-inline-atomic_32.h:       966735    (       0)  (   0.000%)
               asm-inline-atomic_64.h:       966735    (       0)  (   0.000%)
             asm-inline-checksum_32.h:       966735    (       0)  (   0.000%)
             asm-inline-checksum_64.h:       966735    (       0)  (   0.000%)
              asm-inline-cmpxchg_32.h:       966735    (       0)  (   0.000%)
              asm-inline-cmpxchg_64.h:       966735    (       0)  (   0.000%)
                    asm-inline-desc.h:       966735    (       0)  (   0.000%)
                   asm-inline-futex.h:       966735    (       0)  (   0.000%)
                    asm-inline-i387.h:       966735    (       0)  (   0.000%)
                      asm-inline-io.h:       966735    (       0)  (   0.000%)
                   asm-inline-io_32.h:       966735    (       0)  (   0.000%)
                   asm-inline-io_64.h:       966735    (       0)  (   0.000%)
                asm-inline-irqflags.h:       966735    (       0)  (   0.000%)
                   asm-inline-kexec.h:       966735    (       0)  (   0.000%)
                    asm-inline-kgdb.h:       966735    (       0)  (   0.000%)
                asm-inline-kvm_host.h:       966735    (       0)  (   0.000%)
                asm-inline-kvm_para.h:       966735    (       0)  (   0.000%)
            asm-inline-lguest_hcall.h:       966735    (       0)  (   0.000%)
                   asm-inline-local.h:       966735    (       0)  (   0.000%)
                     asm-inline-msr.h:       966735    (       0)  (   0.000%)
                asm-inline-paravirt.h:       966735    (       0)  (   0.000%)
                 asm-inline-pci_x86.h:       966735    (       0)  (   0.000%)
               asm-inline-processor.h:       966735    (       0)  (   0.000%)
                   asm-inline-rwsem.h:       966735    (       0)  (   0.000%)
                  asm-inline-signal.h:       966735    (       0)  (   0.000%)
                asm-inline-spinlock.h:       966735    (       0)  (   0.000%)
               asm-inline-string_32.h:       966735    (       0)  (   0.000%)
                    asm-inline-swab.h:       966735    (       0)  (   0.000%)
             asm-inline-sync_bitops.h:       966735    (       0)  (   0.000%)
                  asm-inline-system.h:       966735    (       0)  (   0.000%)
               asm-inline-system_64.h:       966735    (       0)  (   0.000%)
             asm-inline-thread_info.h:       966735    (       0)  (   0.000%)
                asm-inline-tlbflush.h:       966735    (       0)  (   0.000%)
                     asm-inline-xcr.h:       966735    (       0)  (   0.000%)
                   asm-inline-xsave.h:       966735    (       0)  (   0.000%)

[ The patch names reflect the include file names where i did the changes. ]

There are two surprising results:

Firstly, the CONFIG_OPTIMIZE_INLINING=y build is 7.4% more compact than the "always inline as instructed by kernel hackers" build:

              optimize-inlining.patch:       967724    (  -71867)  (  -7.426%)

Secondly: out of 40 patches, only three make an actual vmlinux object size difference (!):

       asm-inline-bitops-simple.patch:       967691    (     -33)  (  -0.003%)
 asm-inline-bitops-constant-set.patch:       966947    (    -744)  (  -0.077%)
 asm-inline-bitops-test-and-set.patch:       966735    (    -212)  (  -0.022%)

And those three have a combined effect of 0.1% - noise compared to the 7.4% that inline optimization already brought us. [it's still worth improving.]

I have also conducted full x86.64.defconfig vmlinux builds for each of the patches, and tabulated the size changes:

( Object size tests on kernel: v2.6.28-7939-g2150edc
( using: gcc (GCC) 4.3.2 20081007 (Red Hat 4.3.2-6)
( target: vmlinux vmlinux
( config: x86.64.defconfig

name text-size ( delta) ( pct)
-----------------------------------------------------------------------------

                  always-inline.patch:      7045187    (       0)  (   0.000%)
              optimize-inlining.patch:      6987053    (  -58134)  (  -0.832%)
                   asm-inline-0.patch:      6987053    (       0)  (   0.000%)
       asm-inline-bitops-simple.patch:      6987053    (       0)  (   0.000%)
 asm-inline-bitops-constant-set.patch:      6961126    (  -25927)  (  -0.372%)
 asm-inline-bitops-test-and-set.patch:      6961126    (       0)  (   0.000%)
          asm-inline-bitops-ffs.patch:      6961126    (       0)  (   0.000%)
                   asm-inline-__ffs.h:      6961126    (       0)  (   0.000%)
                   asm-inline-__fls.h:      6961126    (       0)  (   0.000%)
                     asm-inline-fls.h:      6961126    (       0)  (   0.000%)
                   asm-inline-fls64.h:      6961126    (       0)  (   0.000%)
                    asm-inline-apic.h:      6961126    (       0)  (   0.000%)
               asm-inline-atomic_32.h:      6961126    (       0)  (   0.000%)
               asm-inline-atomic_64.h:      6961126    (       0)  (   0.000%)
             asm-inline-checksum_32.h:      6961126    (       0)  (   0.000%)
             asm-inline-checksum_64.h:      6961126    (       0)  (   0.000%)
              asm-inline-cmpxchg_32.h:      6961126    (       0)  (   0.000%)
              asm-inline-cmpxchg_64.h:      6961126    (       0)  (   0.000%)
                    asm-inline-desc.h:      6961126    (       0)  (   0.000%)
                   asm-inline-futex.h:      6961126    (       0)  (   0.000%)
                    asm-inline-i387.h:      6961126    (       0)  (   0.000%)
                      asm-inline-io.h:      6961126    (       0)  (   0.000%)
                   asm-inline-io_32.h:      6961126    (       0)  (   0.000%)
                   asm-inline-io_64.h:      6961126    (       0)  (   0.000%)
                asm-inline-irqflags.h:      6961126    (       0)  (   0.000%)
                   asm-inline-kexec.h:      6961126    (       0)  (   0.000%)
                    asm-inline-kgdb.h:      6961126    (       0)  (   0.000%)
                asm-inline-kvm_host.h:      6961126    (       0)  (   0.000%)
                asm-inline-kvm_para.h:      6961126    (       0)  (   0.000%)
            asm-inline-lguest_hcall.h:      6961126    (       0)  (   0.000%)
                   asm-inline-local.h:      6961126    (       0)  (   0.000%)
                     asm-inline-msr.h:      6961126    (       0)  (   0.000%)
                asm-inline-paravirt.h:      6961126    (       0)  (   0.000%)
                 asm-inline-pci_x86.h:      6961126    (       0)  (   0.000%)
               asm-inline-processor.h:      6961126    (       0)  (   0.000%)
                   asm-inline-rwsem.h:      6961126    (       0)  (   0.000%)
                  asm-inline-signal.h:      6961126    (       0)  (   0.000%)
                asm-inline-spinlock.h:      6961126    (       0)  (   0.000%)
               asm-inline-string_32.h:      6961126    (       0)  (   0.000%)
                    asm-inline-swab.h:      6961126    (       0)  (   0.000%)
             asm-inline-sync_bitops.h:      6961126    (       0)  (   0.000%)
                  asm-inline-system.h:      6961126    (       0)  (   0.000%)
               asm-inline-system_64.h:      6961126    (       0)  (   0.000%)
             asm-inline-thread_info.h:      6961126    (       0)  (   0.000%)
                asm-inline-tlbflush.h:      6961126    (       0)  (   0.000%)
                     asm-inline-xcr.h:      6961126    (       0)  (   0.000%)
                   asm-inline-xsave.h:      6961126    (       0)  (   0.000%)

This is a surprising result too: the manual annotation of asm inlines (totally against my expectations) made even less of a difference.

Here's the allyesconfig vmlinux builds as well:

( Object size tests on kernel: v2.6.28-7939-g2150edc
( using: gcc (GCC) 4.3.2 20081007 (Red Hat 4.3.2-6)
( building: vmlinux vmlinux
( config: x86.64.allyes

name text-size ( delta) ( pct)

-----------------------------------------------------------------------------

                  always-inline.patch:     59089458    (       0)  (   0.000%)
              optimize-inlining.patch:     57363721    (-1725737)  (  -3.008%)
               asm-inline-combo.patch:     57254254    ( -109467)  (  -0.191%)

Similar pattern: optimize-inlining helps a lot, the manual annotations only a tiny bit more. [no finegrained results here - it would take me a week to finish a hundred allyesconfig builds. But the results line up with the kernel/built-in.o allyesconfig results.]

Another surprise to me was that according to the numbers the core kernel appears to be much worse with its inlining practices (at least in terms of absolute text size) than the full kernel.

I found these numbers hard to believe, so i double-checked them against source-level metrics: i compared the number of 'inline' keywords compared against object size, of kernel/built-in.o versus that of drivers/built-in.o. (on allyesconfig)

The results are:

nr-inlines .o size inline-frequency (bytes)

kernel/built-in.o: 529 1177230 2225
drivers/built-in.o: 9105 27933205 3067

i.e. in the driver space we get an inline function for every ~3K bytes of code, in the core kernel we get an inline function every ~2K bytes of code.

One interpretation of the numbers would be that core kernel hackers are more inline-happy, maybe because they think that their functions are more important to inline.

Which is generally a fair initial assumption, but according to the numbers it does not appear to pay off in practice as it does not result in a smaller kernel image. (Driver authors tend to be either more disciplined - or more lazy in that respect.)

One final note. One might ask, which one was this particular patch, which made the largest measurable impact on the allyesconfig build and which also showed up in the defconfig builds:

asm-inline-bitops-constant-set.patch: 6961126 ( -25927) ( -0.372%)

See that patch below, it is another surprise: a single inline function. [ GCC uninlines this one as its inliner probably got lost in the
__builtin_constant_p() trick we are doing there. ]

It is a central bitop primitive (test_bit()), so it made a relatively large difference of 0.3% to the defconfig build.

So out of the 224 functions i annotated manually, only one was inlined incorrectly by GCC. (that matters to x86 defconfig)

Note that these numbers match hpa's 4.3.0 based allyesconfig numbers very closely:

 |  : voreg 64 ; size o.*/vmlinux
 |     text    data     bss     dec     hex     filename
 |  57590217 24940519 15560504 98091240 5d8c0e8 o.andi/vmlinux
 |  59421552 24912223 15560504 99894279 5f44407 o.noopt/vmlinux
 |  57700527 24950719 15560504 98211750 5da97a6 o.opty/vmlinux

So the conclusion: GCC 4.3.x appears to do an acceptable job at inlining (if not, i'd like to see the specific .config where it screws up). We've also seen a few clear examples of earlier GCC versions screwing up with inlining.

So my inclination would be: either mark CONFIG_OPTIMIZE_INLINING as CONFIG_BROKEN, or limit CONFIG_OPTIMIZE_INLINING to GCC 4.3.x and later versions only.

I'm no fan of the GCC inliner, but the latter seems to be the more rational choice to me - the size win from inline-optimization is
significant: 1% for defconfig, 3% for allyesconfig and 7.5% for the core kernel (allyesconfig).

Ingo

---------------------->
Subject: asm: inline bitops constant set
From: Ingo Molnar <[email protected]>
Date: Fri Jan 09 11:43:20 CET 2009

---
 arch/x86/include/asm/bitops.h |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
arch/x86/include/asm/bitops.h +2 -1
Index: linux/arch/x86/include/asm/bitops.h
===================================================================
@@ -300,7 +300,8 @@ static inline int test_and_change_bit(in
 	return oldbit;
 }
 
-static inline int constant_test_bit(int nr, const volatile unsigned long *addr)
+static __asm_inline int
+constant_test_bit(int nr, const volatile unsigned long *addr)
 {
 	return ((1UL << (nr % BITS_PER_LONG)) &
 		(((unsigned long *)addr)[nr / BITS_PER_LONG])) != 0;
#312 lore raw

Re: [PATCH -v7][RFC]: mutex: implement adaptive spinning

In reply to Andi Kleen
Quoted 14 lines · Andi Kleen
Quoted 6 lines · H. Peter Anvin
Quoted 5 lines · Harvey Harrison
Quoted 4 lines

We might still try the second or third options, as i think we shouldnt go back into the business of managing the inline attributes of ~100,000 kernel functions.

Quoted 6 lines
Quoted 3 lines

Or just make it clear that inline shouldn't (unless for a very good reason) _ever_ be used in a .c file.

The question is if that would produce acceptable quality code. In theory it should, but I'm more than wondering if it really will.

Quoted 6 lines

I actually often use noinline when developing code simply because it makes it easier to read oopses when gcc doesn't inline ever static (which it normally does if it only has a single caller). You know roughly where it crashed without having to decode the line number.

I believe others do that too, I notice it's all over btrfs for example.

For btrfs it was mostly about stack size at first. I'd use checkstack.pl and then run through the big funcs and figure out how they got so huge. It was almost always because gcc was inlining something it shouldn't, so I started using it on most funcs.

-chris

#217 lore raw

Re: [PATCH -v7][RFC]: mutex: implement adaptive spinning

In reply to H. Peter Anvin
Quoted 16 lines · H. Peter Anvin
Quoted 5 lines · Andi Kleen
Quoted 2 lines

I'll try to annotate the inline asms (there's not _that_ many of them), and measure what the size impact is.

You can just use the patch I submitted and that you rejected for most of them :)

I just ran a sample build for x86-64 with gcc 4.3.0, these all allyesconfig builds (modulo the inlining option):

: voreg 64 ; size o.*/vmlinux
text data bss dec hex filename
59421552 24912223 15560504 99894279 5f44407 o.noopt/vmlinux 57700527 24950719 15560504 98211750 5da97a6 o.opty/vmlinux 57590217 24940519 15560504 98091240 5d8c0e8 o.andi/vmlinux

Quoted 4 lines

A 3% code size difference even on allyesconfig (1.8 MB!) is nothing to sneeze at. As shown by the delta from Andi's patch, these small assembly stubs really do need to be annotated, since gcc simply has no way to do anything sane with them -- it just doesn't know.

I've done a finegrained size analysis today (see my other mail in this thread), and it turns out that on gcc 4.3.x the main (and pretty much only) inlining annotation that matters in arch/x86/include/asm/*.h is the onliner patch attached below, annotating constant_test_bit().

That change is included in Andi's patch too AFAICS - i.e. just that single hunk from Andi's patch would have given you 90% of the size win - an additional 0.17% size win to the 3.00% that CONFIG_OPTIMIZE_INLINING=y already brings.

The second patch below had some (much smaller, 0.01% ) impact too. All the other annotations i did to hundreds of inlined asm()s had no measurable effect on GCC 4.3.2. (i.e. gcc appears to inline single-statement asms correctly)

[ On older GCC it might matter more, but there we can/should turn off
CONFIG_OPTIMIZE_INLINING. ]

Quoted 5 lines

Personally, I'd like to see __asm_inline as opposed to __always_inline for these, though, as a documentation issue: __always_inline implies to me that this function needs to be inlined for correctness, and this could be highly relevant if someone, for example, recodes the routine in C or decides to bloat it out (e.g. paravirt_ops).

Yeah. I've implemented __asm_inline today. It indeed documents the reason for the annotation in a cleaner way than slapping __always_inline around and diluting the quality of __always_inline annotations.

Quoted 5 lines

It's not a perfect solution even then, because gcc may choose to not inline a higher level of inline functions for the same bogus reason. There isn't much we can do about that, though, unless gcc either integrates the assembler, or gives us some way of injecting the actual weight of the asm statement...

Yeah.

Ingo

---
 arch/x86/include/asm/bitops.h |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
arch/x86/include/asm/bitops.h +2 -1
Index: linux/arch/x86/include/asm/bitops.h
===================================================================
@@ -300,7 +300,8 @@ static inline int test_and_change_bit(in
 	return oldbit;
 }
 
-static inline int constant_test_bit(int nr, const volatile unsigned long *addr)
+static __asm_inline int
+constant_test_bit(int nr, const volatile unsigned long *addr)
 {
 	return ((1UL << (nr % BITS_PER_LONG)) &
 		(((unsigned long *)addr)[nr / BITS_PER_LONG])) != 0;
 arch/x86/include/asm/bitops.h |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
arch/x86/include/asm/bitops.h +6 -6
Index: linux/arch/x86/include/asm/bitops.h
===================================================================
@@ -53,7 +53,7 @@
  * Note that @nr may be almost arbitrarily large; this function is not
  * restricted to acting on a single-word quantity.
  */
-static inline void set_bit(unsigned int nr, volatile unsigned long *addr)
+static __asm_inline void set_bit(unsigned int nr, volatile unsigned long *addr)
 {
 	if (IS_IMMEDIATE(nr)) {
 		asm volatile(LOCK_PREFIX "orb %1,%0"
@@ -75,7 +75,7 @@ static inline void set_bit(unsigned int 
  * If it's called on the same region of memory simultaneously, the effect
  * may be that only one operation succeeds.
  */
-static inline void __set_bit(int nr, volatile unsigned long *addr)
+static __asm_inline void __set_bit(int nr, volatile unsigned long *addr)
 {
 	asm volatile("bts %1,%0" : ADDR : "Ir" (nr) : "memory");
 }
@@ -90,7 +90,7 @@ static inline void __set_bit(int nr, vol
  * you should call smp_mb__before_clear_bit() and/or smp_mb__after_clear_bit()
  * in order to ensure changes are visible on other processors.
  */
-static inline void clear_bit(int nr, volatile unsigned long *addr)
+static __asm_inline void clear_bit(int nr, volatile unsigned long *addr)
 {
 	if (IS_IMMEDIATE(nr)) {
 		asm volatile(LOCK_PREFIX "andb %1,%0"
@@ -117,7 +117,7 @@ static inline void clear_bit_unlock(unsi
 	clear_bit(nr, addr);
 }
 
-static inline void __clear_bit(int nr, volatile unsigned long *addr)
+static __asm_inline void __clear_bit(int nr, volatile unsigned long *addr)
 {
 	asm volatile("btr %1,%0" : ADDR : "Ir" (nr));
 }
@@ -152,7 +152,7 @@ static inline void __clear_bit_unlock(un
  * If it's called on the same region of memory simultaneously, the effect
  * may be that only one operation succeeds.
  */
-static inline void __change_bit(int nr, volatile unsigned long *addr)
+static __asm_inline void __change_bit(int nr, volatile unsigned long *addr)
 {
 	asm volatile("btc %1,%0" : ADDR : "Ir" (nr));
 }
@@ -166,7 +166,7 @@ static inline void __change_bit(int nr, 
  * Note that @nr may be almost arbitrarily large; this function is not
  * restricted to acting on a single-word quantity.
  */
-static inline void change_bit(int nr, volatile unsigned long *addr)
+static __asm_inline void change_bit(int nr, volatile unsigned long *addr)
 {
 	if (IS_IMMEDIATE(nr)) {
 		asm volatile(LOCK_PREFIX "xorb %1,%0"
#147 lore raw

Re: [patch] measurements, numbers about CONFIG_OPTIMIZE_INLINING=y impact

In reply to Ingo Molnar
Quoted 4 lines · Ingo Molnar

One interpretation of the numbers would be that core kernel hackers are more inline-happy, maybe because they think that their functions are more important to inline.

Which is generally a fair initial assumption, but according to the numbers it does not appear to pay off in practice as it does not result in a smaller kernel image.

I think people over-use inline for the opposite reason.

They are taught:
- use inline functions instead of macros
- inlining functions makes your code run faster

They also know inlining may increase program object size. That inlining will reduce object size on many architectures if the function is small is just a happy side effect to them.

jim

maintainer
#132 lore raw

Re: [PATCH -v7][RFC]: mutex: implement adaptive spinning

In reply to Peter Zijlstra
Quoted 12 lines · Peter Zijlstra
Quoted 5 lines

So I think the bug is still there, we just hid it better by breaking out of the loop with that "if (need_resched())" always eventually triggering. And it would be ok if it really is guaranteed to _eventually_ trigger, and I guess with timeslices it eventually always will, but I suspect we could have some serious latency spikes.

Yes, the owner getting preempted after acquiring the lock, but before setting the owner can give some nasties :-(

I initially did that preempt_disable/enable around the fast path, but I agree that slowing down the fast path is unwelcome.

Quoted 7 lines

Alternatively we could go back to block on !owner, with the added complexity of not breaking out of the spin on lock->owner != owner when !lock->owner, so that the premature owner clearing of the unlock fast path will not force a schedule right before we get a chance to acquire the lock.

Let me do that..

Ok a few observations..

Adding that need_resched() in the outer loop utterly destroys the performance gain for PREEMPT=y. Voluntary preemption is mostly good, but somewhat unstable results.

Adding that blocking on !owner utterly destroys everything.

Going to look into where that extra preemption comes from.

#133 lore raw

Re: [PATCH -v7][RFC]: mutex: implement adaptive spinning

Quoted 20 lines · Peter Zijlstra
Quoted 18 lines · Peter Zijlstra
Quoted 5 lines

So I think the bug is still there, we just hid it better by breaking out of the loop with that "if (need_resched())" always eventually triggering. And it would be ok if it really is guaranteed to _eventually_ trigger, and I guess with timeslices it eventually always will, but I suspect we could have some serious latency spikes.

Yes, the owner getting preempted after acquiring the lock, but before setting the owner can give some nasties :-(

I initially did that preempt_disable/enable around the fast path, but I agree that slowing down the fast path is unwelcome.

Alternatively we could go back to block on !owner, with the added complexity of not breaking out of the spin on lock->owner != owner when !lock->owner, so that the premature owner clearing of the unlock fast path will not force a schedule right before we get a chance to acquire the lock.

Quoted 7 lines
Quoted 1 line

Let me do that..

Ok a few observations..

Adding that need_resched() in the outer loop utterly destroys the performance gain for PREEMPT=y. Voluntary preemption is mostly good, but somewhat unstable results.

How about if (!owner && need_resched()) break; instead of the unconditional need_resched(). That should solve the race that Linus saw without and hurt PREEMPT less.

Quoted 4 lines

Adding that blocking on !owner utterly destroys everything.

Going to look into where that extra preemption comes from.

-chris

#214 lore raw

Re: [patch] measurements, numbers about CONFIG_OPTIMIZE_INLINING=y impact

In reply to Ingo Molnar
Quoted 6 lines · Ingo Molnar
Quoted 4 lines

I suspect gcc has some pre-inlining heuristics that don't take constant folding and simplifiation into account - if you look at just the raw tree of the function without taking the optimization into account, it will look big.

Yeah. In my tests GCC 4.3.2 does properly inline that particular asm.

here is how that function ended up looking like here (with Peter's v7, which should be close to what Chris tried, looking at his crash dump):

ffffffff81491347 <__mutex_lock_common>:

ffffffff81491347:	55                   	push   %rbp
ffffffff81491348:	48 89 e5             	mov    %rsp,%rbp
ffffffff8149134b:	41 57                	push   %r15
ffffffff8149134d:	4c 8d 7f 08          	lea    0x8(%rdi),%r15
ffffffff81491351:	41 56                	push   %r14
ffffffff81491353:	49 89 f6             	mov    %rsi,%r14
ffffffff81491356:	41 55                	push   %r13
ffffffff81491358:	41 54                	push   %r12
ffffffff8149135a:	4c 8d 67 18          	lea    0x18(%rdi),%r12
ffffffff8149135e:	53                   	push   %rbx
ffffffff8149135f:	48 89 fb             	mov    %rdi,%rbx
ffffffff81491362:	48 83 ec 38          	sub    $0x38,%rsp
ffffffff81491366:	65 4c 8b 2c 25 00 00 	mov    %gs:0x0,%r13
ffffffff8149136d:	00 00 
ffffffff8149136f:	b8 01 00 00 00       	mov    $0x1,%eax
ffffffff81491374:	31 d2                	xor    %edx,%edx
ffffffff81491376:	f0 0f b1 13          	lock cmpxchg %edx,(%rbx)
ffffffff8149137a:	83 f8 01             	cmp    $0x1,%eax
ffffffff8149137d:	75 18                	jne    ffffffff81491397 <__mutex_lock_common+0x50>
ffffffff8149137f:	65 48 8b 04 25 10 00 	mov    %gs:0x10,%rax
ffffffff81491386:	00 00 
ffffffff81491388:	48 2d d8 1f 00 00    	sub    $0x1fd8,%rax
ffffffff8149138e:	48 89 43 18          	mov    %rax,0x18(%rbx)
ffffffff81491392:	e9 dd 00 00 00       	jmpq   ffffffff81491474 <__mutex_lock_common+0x12d>
ffffffff81491397:	85 c0                	test   %eax,%eax
ffffffff81491399:	79 06                	jns    ffffffff814913a1 <__mutex_lock_common+0x5a>
ffffffff8149139b:	4c 39 7b 08          	cmp    %r15,0x8(%rbx)
ffffffff8149139f:	75 19                	jne    ffffffff814913ba <__mutex_lock_common+0x73>
ffffffff814913a1:	49 8b 34 24          	mov    (%r12),%rsi
ffffffff814913a5:	48 85 f6             	test   %rsi,%rsi
ffffffff814913a8:	74 0c                	je     ffffffff814913b6 <__mutex_lock_common+0x6f>
ffffffff814913aa:	48 89 df             	mov    %rbx,%rdi
ffffffff814913ad:	e8 6c dd b9 ff       	callq  ffffffff8102f11e <spin_on_owner>
ffffffff814913b2:	85 c0                	test   %eax,%eax
ffffffff814913b4:	74 04                	je     ffffffff814913ba <__mutex_lock_common+0x73>
ffffffff814913b6:	f3 90                	pause  
ffffffff814913b8:	eb b5                	jmp    ffffffff8149136f <__mutex_lock_common+0x28>
ffffffff814913ba:	4c 8d 63 04          	lea    0x4(%rbx),%r12
ffffffff814913be:	4c 89 e7             	mov    %r12,%rdi
ffffffff814913c1:	e8 d2 0f 00 00       	callq  ffffffff81492398 <_spin_lock>
ffffffff814913c6:	48 8b 53 10          	mov    0x10(%rbx),%rdx
ffffffff814913ca:	48 8d 45 b0          	lea    -0x50(%rbp),%rax
ffffffff814913ce:	4c 89 7d b0          	mov    %r15,-0x50(%rbp)
ffffffff814913d2:	48 89 43 10          	mov    %rax,0x10(%rbx)
ffffffff814913d6:	48 89 02             	mov    %rax,(%rdx)
ffffffff814913d9:	48 89 55 b8          	mov    %rdx,-0x48(%rbp)
ffffffff814913dd:	48 83 ca ff          	or     $0xffffffffffffffff,%rdx
ffffffff814913e1:	4c 89 6d c0          	mov    %r13,-0x40(%rbp)
ffffffff814913e5:	48 89 d0             	mov    %rdx,%rax
ffffffff814913e8:	87 03                	xchg   %eax,(%rbx)
ffffffff814913ea:	ff c8                	dec    %eax
ffffffff814913ec:	74 55                	je     ffffffff81491443 <__mutex_lock_common+0xfc>
ffffffff814913ee:	44 88 f0             	mov    %r14b,%al
ffffffff814913f1:	44 89 f2             	mov    %r14d,%edx
ffffffff814913f4:	83 e0 81             	and    $0xffffffffffffff81,%eax
ffffffff814913f7:	83 e2 01             	and    $0x1,%edx
ffffffff814913fa:	88 45 af             	mov    %al,-0x51(%rbp)
ffffffff814913fd:	89 55 a8             	mov    %edx,-0x58(%rbp)
ffffffff81491400:	48 83 c8 ff          	or     $0xffffffffffffffff,%rax
ffffffff81491404:	87 03                	xchg   %eax,(%rbx)
ffffffff81491406:	ff c8                	dec    %eax
ffffffff81491408:	74 39                	je     ffffffff81491443 <__mutex_lock_common+0xfc>
ffffffff8149140a:	80 7d af 00          	cmpb   $0x0,-0x51(%rbp)
ffffffff8149140e:	74 1c                	je     ffffffff8149142c <__mutex_lock_common+0xe5>
ffffffff81491410:	49 8b 45 08          	mov    0x8(%r13),%rax
ffffffff81491414:	f6 40 10 04          	testb  $0x4,0x10(%rax)
ffffffff81491418:	74 12                	je     ffffffff8149142c <__mutex_lock_common+0xe5>
ffffffff8149141a:	83 7d a8 00          	cmpl   $0x0,-0x58(%rbp)
ffffffff8149141e:	75 65                	jne    ffffffff81491485 <__mutex_lock_common+0x13e>
ffffffff81491420:	4c 89 ef             	mov    %r13,%rdi
ffffffff81491423:	e8 e1 2e bb ff       	callq  ffffffff81044309 <__fatal_signal_pending>
ffffffff81491428:	85 c0                	test   %eax,%eax
ffffffff8149142a:	75 59                	jne    ffffffff81491485 <__mutex_lock_common+0x13e>
ffffffff8149142c:	4d 89 75 00          	mov    %r14,0x0(%r13)
ffffffff81491430:	41 fe 04 24          	incb   (%r12)
ffffffff81491434:	e8 e9 ef ff ff       	callq  ffffffff81490422 <schedule>
ffffffff81491439:	4c 89 e7             	mov    %r12,%rdi
ffffffff8149143c:	e8 57 0f 00 00       	callq  ffffffff81492398 <_spin_lock>
ffffffff81491441:	eb bd                	jmp    ffffffff81491400 <__mutex_lock_common+0xb9>
ffffffff81491443:	48 8b 45 b8          	mov    -0x48(%rbp),%rax
ffffffff81491447:	48 8b 55 b0          	mov    -0x50(%rbp),%rdx
ffffffff8149144b:	48 89 10             	mov    %rdx,(%rax)
ffffffff8149144e:	48 89 42 08          	mov    %rax,0x8(%rdx)
ffffffff81491452:	65 48 8b 04 25 10 00 	mov    %gs:0x10,%rax
ffffffff81491459:	00 00 
ffffffff8149145b:	48 2d d8 1f 00 00    	sub    $0x1fd8,%rax
ffffffff81491461:	4c 39 7b 08          	cmp    %r15,0x8(%rbx)
ffffffff81491465:	48 89 43 18          	mov    %rax,0x18(%rbx)
ffffffff81491469:	75 06                	jne    ffffffff81491471 <__mutex_lock_common+0x12a>
ffffffff8149146b:	c7 03 00 00 00 00    	movl   $0x0,(%rbx)
ffffffff81491471:	fe 43 04             	incb   0x4(%rbx)
ffffffff81491474:	31 c0                	xor    %eax,%eax
ffffffff81491476:	48 83 c4 38          	add    $0x38,%rsp
ffffffff8149147a:	5b                   	pop    %rbx
ffffffff8149147b:	41 5c                	pop    %r12
ffffffff8149147d:	41 5d                	pop    %r13
ffffffff8149147f:	41 5e                	pop    %r14
ffffffff81491481:	41 5f                	pop    %r15
ffffffff81491483:	c9                   	leaveq 
ffffffff81491484:	c3                   	retq   
ffffffff81491485:	48 8b 55 b0          	mov    -0x50(%rbp),%rdx
ffffffff81491489:	48 8b 45 b8          	mov    -0x48(%rbp),%rax
ffffffff8149148d:	48 89 42 08          	mov    %rax,0x8(%rdx)
ffffffff81491491:	48 89 10             	mov    %rdx,(%rax)
ffffffff81491494:	fe 43 04             	incb   0x4(%rbx)
ffffffff81491497:	b8 fc ff ff ff       	mov    $0xfffffffc,%eax
ffffffff8149149c:	eb d8                	jmp    ffffffff81491476 <__mutex_lock_common+0x12f>

the "lock cmpxchg" ended up being inlined properly at ffffffff81491376, and the whole assembly sequence looks pretty compact to me.

That does not let GCC off the hook though, and i'd be the last one to defend it when it messes up.

Ingo

#148 lore raw

Re: [patch] measurements, numbers about CONFIG_OPTIMIZE_INLINING=y impact

In reply to jim owens
Quoted 11 lines · jim owens
Quoted 8 lines · Ingo Molnar

One interpretation of the numbers would be that core kernel hackers are more inline-happy, maybe because they think that their functions are more important to inline.

Which is generally a fair initial assumption, but according to the numbers it does not appear to pay off in practice as it does not result in a smaller kernel image.

I think people over-use inline for the opposite reason.

Note that i talked about the core kernel (kernel/*.c) specifically.

Quoted 7 lines

They are taught:
- use inline functions instead of macros
- inlining functions makes your code run faster

They also know inlining may increase program object size. That inlining will reduce object size on many architectures if the function is small is just a happy side effect to them.

Core kernel developers tend to be quite inline-conscious and generally do not believe that making something inline will make it go faster.

That's why i picked kernel/built-in.o as a good "best of breed" entity to measure - if then that is an area where we have at least the chance to do a "kernel coders know best when to inline" manual inlining job.

But despite a decade of tuning and systematic effort in that area, the numbers suggest that we dont. (if someone has different numbers or different interpretation, please share it with us.)

My goal is to make the kernel smaller and faster, and as far as the placement of 'inline' keywords goes, i dont have too strong feelings about how it's achieved: they have a certain level of documentation value [signalling that a function is _intended_ to be lightweight] but otherwise they are pretty neutral attributes to me.

So we want all the mechanisms in place to constantly press towards a smaller and faster kernel, with the most efficient use of development resources. Some techniques work in practice despite looking problematic, some dont, despite looking good on paper.

This might be one of those cases. Or not :-)

Ingo

#134 lore raw

Re: [PATCH -v7][RFC]: mutex: implement adaptive spinning

In reply to Peter Zijlstra
Quoted 20 lines · Peter Zijlstra
Quoted 18 lines · Peter Zijlstra
Quoted 5 lines

So I think the bug is still there, we just hid it better by breaking out of the loop with that "if (need_resched())" always eventually triggering. And it would be ok if it really is guaranteed to _eventually_ trigger, and I guess with timeslices it eventually always will, but I suspect we could have some serious latency spikes.

Yes, the owner getting preempted after acquiring the lock, but before setting the owner can give some nasties :-(

I initially did that preempt_disable/enable around the fast path, but I agree that slowing down the fast path is unwelcome.

Alternatively we could go back to block on !owner, with the added complexity of not breaking out of the spin on lock->owner != owner when !lock->owner, so that the premature owner clearing of the unlock fast path will not force a schedule right before we get a chance to acquire the lock.

Quoted 7 lines
Quoted 1 line

Let me do that..

Ok a few observations..

Adding that need_resched() in the outer loop utterly destroys the performance gain for PREEMPT=y. Voluntary preemption is mostly good, but somewhat unstable results.

I was going to say a while ago...
In PREEMPT=y the need_resched() is not needed at all. If you have preemption enabled, you will get preempted in that loop. No need for the need_resched() in the outer loop. Although I'm not sure how it would even hit the "need_resched". If it was set, then it is most likely going to be cleared when coming back from being preempted.

Quoted 2 lines

Adding that blocking on !owner utterly destroys everything.

I was going to warn you about that ;-)

Without the check for !owner, you are almost guaranteed to go to sleep every time. Here's why:

You are spinning and thus have a hot cache on that CPU.

The owner goes to unlock but will be in a cold cache. It sets lock->owner to NULL, but is still in cold cache so it is a bit slower.

Once the spinner sees the NULL, it shoots out of the spin but sees the lock is still not available then goes to sleep. All before the owner could release it. This could probably happen at every contention. Thus, you lose the benefit of spinning. You probably make things worse because you add a spin before every sleep.

-- Steve

maintainer
#135 lore raw

Re: [PATCH -v7][RFC]: mutex: implement adaptive spinning

Quoted 10 lines · Steven Rostedt
Quoted 2 lines

Adding that blocking on !owner utterly destroys everything.

I was going to warn you about that ;-)

Without the check for !owner, you are almost guaranteed to go to sleep every time. Here's why:

You are spinning and thus have a hot cache on that CPU.

Quoted 8 lines

The owner goes to unlock but will be in a cold cache. It sets lock->owner to NULL, but is still in cold cache so it is a bit slower.

Once the spinner sees the NULL, it shoots out of the spin but sees the lock is still not available then goes to sleep. All before the owner could release it. This could probably happen at every contention. Thus, you lose the benefit of spinning. You probably make things worse because you add a spin before every sleep.

Which is why I changed the inner loop to:

  l_owner = ACCESS_ONCE(lock->owner)
  if (l_owner && l_owner != owner)
    break

So that that would continue spinning.

#218 lore raw

Re: [PATCH -v7][RFC]: mutex: implement adaptive spinning

In reply to Ingo Molnar

arch/x86/include/asm/bitops.h static inline int test_and_change_bit(in · line 307

Quoted 7 lines · Ingo Molnar
arch/x86/include/asm/bitops.h +2 -1
-static inline int constant_test_bit(int nr, const volatile unsigned long *addr)
+static __asm_inline int
+constant_test_bit(int nr, const volatile unsigned long *addr)
 {
 	return ((1UL << (nr % BITS_PER_LONG)) &
 		(((unsigned long *)addr)[nr / BITS_PER_LONG])) != 0;

Thios makes absolutely no sense.

It's called "__always_inline", not __asm_inline.

Why add a new nonsensical annotations like that?

Also, the very fact that gcc gets that function wrong WHEN 'nr' IS CONSTANT (which is when it is called) just shows what kind of crap gcc is!

Ingo, the fact is, I care about size, but I care about debuggability and sanity more. I don't care one _whit_ about 3% size differences, if they are insane and cause idiotic per-compiler differences.

And you haven't done any interesting analysis per-file etc. It shoul be almost _trivial_ to do CONFIG_OPTIMIZE_INLINING on/off tests for the whole tree, and then comparing sizes of individual object files, and see if we find some obvious _bug_ where we just inline too much.

In fact, we shouldn't even do that - we should try to find a mode where gcc simply refuses to inline at all, and compare that to one where it _only_ inlines the things we ask it to. Because that's the more relevant test. The problem with gcc inlining is actually two-fold:

- gcc doesn't inline things we ask for

Here the sub-problem is that we ask for this too much, but see above on how to figure -that- out!

- gcc _does_ inline things that we haven't marked at all, causing too much stack-space to be used, and causing debugging problems.

And here the problem is that gcc should damn well not do that, at least not as aggressively as it does!

IT DOES NOT MATTER if something is called in just one place and inlining makes things smaller! If it's not a clear performance win (and it almost never is, unless the function is really small), the inlining of especially functions that aren't even hot in the cache is ONLY a negative thing.

Linus

#219 lore raw

Re: [PATCH -v7][RFC]: mutex: implement adaptive spinning

Quoted 12 lines · Linus Torvalds

arch/x86/include/asm/bitops.h static inline int test_and_change_bit(in · line 307

Quoted 7 lines · Ingo Molnar
arch/x86/include/asm/bitops.h +2 -1
-static inline int constant_test_bit(int nr, const volatile unsigned long *addr)
+static __asm_inline int
+constant_test_bit(int nr, const volatile unsigned long *addr)
 {
 	return ((1UL << (nr % BITS_PER_LONG)) &
 		(((unsigned long *)addr)[nr / BITS_PER_LONG])) != 0;

Thios makes absolutely no sense.

Quoted 4 lines

It's called "__always_inline", not __asm_inline.

Why add a new nonsensical annotations like that?

__asm_inline was my suggestion, to distinguish "inline this unconditionally because gcc screws up in the presence of asm()" versus "inline this unconditionally because the world ends if it isn't" -- to tell the human reader, not gcc. I guess the above is a good indicator that the __asm_inline might have been a bad name.

-hpa

Signature · 2 lines
H. Peter Anvin, Intel Open Source Technology Center
I work for Intel.  I don't speak on their behalf.
#149 lore raw

Re: [patch] measurements, numbers about CONFIG_OPTIMIZE_INLINING=y impact

In reply to Ingo Molnar
Quoted 3 lines · Ingo Molnar

Core kernel developers tend to be quite inline-conscious and generally do not believe that making something inline will make it go faster.

Some of us core kernel developers tend to believe that:

- inlining is supposed to work like macros, and should make the compiler do decisions BASED ON CALL-SITE.

This is one of the most _common_ reasons for inlining. Making the compiler select static code rather than dynamic code, and using inlining as a nice macro. We can pass in a flag with a constant value, and only the case that matters will be compiled.

It's not about size - or necessarily even performance - at all. It's about abstraction, and a way of writing code.

And the thing is, as long as gcc does what we ask, we can notice when _we_ did something wrong. We can say "ok, we should just remove the inline" etc. But when gcc then essentially flips a coin, and inlines things we don't want to, it dilutes the whole value of inlining - because now gcc does things that actually does hurt us.

We get oopses that have a nice symbolic back-trace, and it reports an error IN TOTALLY THE WRONG FUNCTION, because gcc "helpfully" inlined things to the point that only an expert can realize "oh, the bug was actually five hundred lines up, in that other function that was just called once, so gcc inlined it even though it is huge".

See? THIS is the problem with gcc heuristics. It's not about quality of code, it's about RELIABILITY of code.

The reason people use C for system programming is because the language is a reasonably portable way to get the expected end results WITHOUT the compiler making a lot of semantic changes behind your back.

Inlining is also the wrong thing to do _even_ if it makes code smaller and faster if you inline the unlikely case, or inlining causes more live variables that cause stack pressure. And we KNOW this happens. Again, I'd be much happier if we had a compiler option to just does "do what I _say_, dammit", and then we can fix up the mistakes. Because then they are _our_ mistakes, not some random compiler version that throws a dice!

Linus

#136 lore raw

Re: [PATCH -v7][RFC]: mutex: implement adaptive spinning

In reply to Steven Rostedt
Quoted 7 lines · Steven Rostedt

I was going to say a while ago...
In PREEMPT=y the need_resched() is not needed at all. If you have preemption enabled, you will get preempted in that loop. No need for the need_resched() in the outer loop. Although I'm not sure how it would even hit the "need_resched". If it was set, then it is most likely going to be cleared when coming back from being preempted.

No, no, you miss the point entirely.

It's not about correctness.

Remember: the whole (and only) point of spinning is about performance.

And the thing is, we should only spin if it makes sense. So the

	if (need_resched())
		break;

is not there because of any "ok, I need to sleep now", it's there because of something TOTALLY DIFFERENT, namely "ok, it makes no sense to spin now, since I should be sleeping".

See? WE DO NOT WANT TO BE PREEMPTED in this region, because that totally destroys the whole point of the spinning. If we go through the scheduler, then we should go through the scheduler AND GO TO SLEEP, so that we don't go through the scheduler any more than absolutely necessary.

So this code - by design - is always only going to get worse if you have involuntary preemption. The preemption is going to do _two_ bad things:

- it's going to call the scheduler at the wrong point, meaning that we now scheduler _more_ (or at least not less) than if we didn't have that spin-loop in the first place.

- .. and to make things worse, since it scheduled "for us", it is going to clear that "need_resched()" flag, so we'll _stay_ in the bad spinning loop too long!

So quite frankly, if you have CONFIG_PREEMPT, then the spinning really is the wrong thing to do, or the whole mutex slow-path thing should be done with preemption disabled so that we only schedule where we _should_ be scheduling.

Linus

#163 lore raw

Re: [patch] measurements, numbers about CONFIG_OPTIMIZE_INLINING=y impact

In reply to Ingo Molnar
Quoted 7 lines · Ingo Molnar

My goal is to make the kernel smaller and faster, and as far as the placement of 'inline' keywords goes, i dont have too strong feelings about how it's achieved: they have a certain level of documentation value [signalling that a function is _intended_ to be lightweight] but otherwise they are pretty neutral attributes to me.

As far as naming is concerned, gcc effectively supports four levels, which *currently* map onto macros as follows:

__always_inline Inline unconditionally
inline Inlining hint
<nothing> Standard heuristics
noinline Uninline unconditionally

A lot of noise is being made about the naming of the levels (and I personally believe we should have a different annotation for "inline unconditionally for correctness" and "inline unconditionally for performance", as a documentation issue), but those are the four we get.

-hpa

Signature · 2 lines
H. Peter Anvin, Intel Open Source Technology Center
I work for Intel.  I don't speak on their behalf.
#220 lore raw

Re: [PATCH -v7][RFC]: mutex: implement adaptive spinning

In reply to H. Peter Anvin
Quoted 3 lines · H. Peter Anvin

__asm_inline was my suggestion, to distinguish "inline this unconditionally because gcc screws up in the presence of asm()"

THERE IS NO ASM IN THERE!

Guys, look at the code. No asm. The whole notion that gcc gets confused by inline asms IS BOGUS. It's simply not TRUE. Gcc gets confused because gcc is confused, and it has NOTHING to do with inline asms.

So please don't confuse things further.

Linus

#137 lore raw

Re: [PATCH -v7][RFC]: mutex: implement adaptive spinning

In reply to Linus Torvalds
Quoted 4 lines · Linus Torvalds
Quoted 1 line · Steven Rostedt
Quoted 8 lines
Quoted 6 lines

I was going to say a while ago...
In PREEMPT=y the need_resched() is not needed at all. If you have preemption enabled, you will get preempted in that loop. No need for the need_resched() in the outer loop. Although I'm not sure how it would even hit the "need_resched". If it was set, then it is most likely going to be cleared when coming back from being preempted.

No, no, you miss the point entirely.

No I did not miss your point. I was commenting on the current code ;-)

Quoted 4 lines

So quite frankly, if you have CONFIG_PREEMPT, then the spinning really is the wrong thing to do, or the whole mutex slow-path thing should be done with preemption disabled so that we only schedule where we _should_ be scheduling.

I agree here. I was going to recommend to add a preempt_disable in the spinner. And keep the need_resched test. Then we should not allow preemption until we get all the way to the point of the schedule in the contention case, or when we get the lock.

When we get to the schedule() it then needs to be a:

	preempt_enable_no_resched();
	schedule();

-- Steve

#164 lore raw

Re: [patch] measurements, numbers about CONFIG_OPTIMIZE_INLINING=y impact

In reply to H. Peter Anvin
Quoted 9 lines · H. Peter Anvin

As far as naming is concerned, gcc effectively supports four levels, which *currently* map onto macros as follows:

__always_inline Inline unconditionally
inline Inlining hint
<nothing> Standard heuristics
noinline Uninline unconditionally

A lot of noise is being made about the naming of the levels

The biggest problem is the <nothing>.

The standard heuristics for that are broken, in particular for the "single call-site static function" case.

If gcc only inlined truly trivial functions for that case, I'd already be much happier. Size be damned.

Linus

#166 lore raw

Re: [patch] measurements, numbers about CONFIG_OPTIMIZE_INLINING=y impact

In reply to H. Peter Anvin
Quoted 9 lines · On Fri, 09 Jan 2009 08:34:57 -0800 "H. Peter Anvin" <[email protected]> wrote:

As far as naming is concerned, gcc effectively supports four levels, which *currently* map onto macros as follows:

__always_inline Inline unconditionally
inline Inlining hint
<nothing> Standard heuristics
noinline Uninline unconditionally

Quoted 5 lines

A lot of noise is being made about the naming of the levels (and I personally believe we should have a different annotation for "inline unconditionally for correctness" and "inline unconditionally for performance", as a documentation issue), but those are the four we get.

Does gcc actually follow the "promise"? If that's the case (and if it's considered a bug when it doesn't), then we can get what Linus wants by annotating EVERY function with either __always_inline or noinline.

/D

Signature · 2 lines
Dirk Hohndel
Intel Open Source Technology Center
#165 lore raw

Re: [patch] measurements, numbers about CONFIG_OPTIMIZE_INLINING=y impact

In reply to Linus Torvalds
Quoted 11 lines · On Fri, 9 Jan 2009 08:44:47 -0800 (PST) Linus Torvalds…
Quoted 9 lines · H. Peter Anvin

As far as naming is concerned, gcc effectively supports four levels, which *currently* map onto macros as follows:

__always_inline Inline unconditionally
inline Inlining hint
<nothing> Standard heuristics
noinline Uninline unconditionally

A lot of noise is being made about the naming of the levels

Quoted 7 lines

The biggest problem is the <nothing>.

The standard heuristics for that are broken, in particular for the "single call-site static function" case.

If gcc only inlined truly trivial functions for that case, I'd already be much happier. Size be damned.

See my other email. Maybe we should just stop trusting gcc and annotate every single function call.
Ugly, but effective.

/D

Signature · 2 lines
Dirk Hohndel
Intel Open Source Technology Center
#167 lore raw

Re: [patch] measurements, numbers about CONFIG_OPTIMIZE_INLINING=y impact

In reply to Dirk Hohndel
Quoted 5 lines · Dirk Hohndel

Does gcc actually follow the "promise"? If that's the case (and if it's considered a bug when it doesn't), then we can get what Linus wants by annotating EVERY function with either __always_inline or noinline.

__always_inline and noinline does work.

-hpa

Signature · 2 lines
H. Peter Anvin, Intel Open Source Technology Center
I work for Intel.  I don't speak on their behalf.
#171 lore raw

Re: [patch] measurements, numbers about CONFIG_OPTIMIZE_INLINING=y impact

In reply to Dirk Hohndel
Quoted 17 lines · Dirk Hohndel
Quoted 9 lines · On Fri, 09 Jan 2009 08:34:57 -0800 "H. Peter Anvin" <[email protected]> wrote:

As far as naming is concerned, gcc effectively supports four levels, which *currently* map onto macros as follows:

__always_inline Inline unconditionally
inline Inlining hint
<nothing> Standard heuristics
noinline Uninline unconditionally

Quoted 5 lines

A lot of noise is being made about the naming of the levels (and I personally believe we should have a different annotation for "inline unconditionally for correctness" and "inline unconditionally for performance", as a documentation issue), but those are the four we get.

Quoted 3 lines

Does gcc actually follow the "promise"? If that's the case (and if it's considered a bug when it doesn't), then we can get what Linus wants by annotating EVERY function with either __always_inline or noinline.

There's also one alternative: gcc's inlining algorithms are extensibly tunable with --param. We might be able to find a set of numbers that make it roughly work like we want it by default.

Disadvantage: the whole thing will be compiler version dependent so we might need to have different numbers for different compiler versions and it will be an area that will need constant maintenance in the future.

I'm not sure that's really a good path to walk down to.

Also cc Honza in case he has comments (you might want to review more of the thread in the archives)

-Andi

Signature · 1 line
[email protected]
#168 lore raw

Re: [patch] measurements, numbers about CONFIG_OPTIMIZE_INLINING=y impact

In reply to H. Peter Anvin
Quoted 8 lines · H. Peter Anvin
Quoted 5 lines · Dirk Hohndel

Does gcc actually follow the "promise"? If that's the case (and if it's considered a bug when it doesn't), then we can get what Linus wants by annotating EVERY function with either __always_inline or noinline.

__always_inline and noinline does work.

I vote for the, get rid of the current inline, rename __always_inline to inline, and then remove all non needed inlines from the kernel.

We'll, probably start adding a lot more noinlines.

-- Steve

#172 lore raw

Re: [patch] measurements, numbers about CONFIG_OPTIMIZE_INLINING=y impact

In reply to Andi Kleen
Quoted 4 lines · Andi Kleen

There's also one alternative: gcc's inlining algorithms are extensibly tunable with --param. We might be able to find a set of numbers that make it roughly work like we want it by default.

We tried that.

IIRC, the numbers mean different things for different versions of gcc, and I think using the parameters was very strongly discouraged by gcc developers. IOW, they were meant for gcc developers internal tuning efforts, not really for external people. Which means that using them would put us _more_ at the mercy of random compiler versions rather than less.

Linus

#213 lore raw

Re: [patch] measurements, numbers about CONFIG_OPTIMIZE_INLINING=y impact

In reply to jim owens
Quoted 3 lines · jim owens

They also know inlining may increase program object size. That inlining will reduce object size on many architectures if the function is small is just a happy side effect to them.

The problem is that the threshold for that is architecture specific. While e.g. x86 has relatively low overhead of prologue/epilogue other architectures like s390 have enormous overhead. So handling this in the compiler would be optimal, but it would need at least whole-program optimization and a compiler aware of the inline assembly to get it half-way right.

#169 lore raw

Re: [patch] measurements, numbers about CONFIG_OPTIMIZE_INLINING=y impact

In reply to Steven Rostedt
Quoted 3 lines · Steven Rostedt

I vote for the, get rid of the current inline, rename __always_inline to inline, and then remove all non needed inlines from the kernel.

This is what we do all the time, and historically have always done.

But
- CONFIG_OPTIMIZE_INLINING=y screws that up
and
- gcc still inlines even big functions static that have no markings at all.

Quoted 1 line

We'll, probably start adding a lot more noinlines.

That's going to be very painful. Especially since the cases we really want to not inline is the random drivers etc - generally not "hot in the cache", but they are the ones that cause the most oopses (not per line, but globally - because there's just so many drivers).

Linus

#170 lore raw

Re: [patch] measurements, numbers about CONFIG_OPTIMIZE_INLINING=y impact

In reply to Steven Rostedt
Quoted 1 line

I vote for the, get rid of the current inline, rename __always_inline to

There is some code that absolutely requires inline for correctness, like the x86-64 vsyscall code. I would advocate to keep the explicit __always_inline at least there to make it very clear.

Quoted 1 line

inline, and then remove all non needed inlines from the kernel.

Most inlines in .c should be probably dropped.

Quoted 2 lines

We'll, probably start adding a lot more noinlines.

That would cost you, see the numbers I posted (~4.1% text increase)

-Andi

Signature · 1 line
[email protected]
#174 lore raw

Re: [patch] measurements, numbers about CONFIG_OPTIMIZE_INLINING=y impact

In reply to Andi Kleen
Quoted 2 lines · Andi Kleen

Also cc Honza in case he has comments (you might want to review more of the thread in the archives)

I think this particular bug is already known and discussed:

http://gcc.gnu.org/ml/gcc/2008-12/msg00365.html

and it hints at being fixed with gcc 4.4. Does anyone want to test that?

Signature · 4 lines
Matthew Wilcox				Intel Open Source Technology Centre
"Bill, look, we understand that you're interested in selling us this
operating system, but compare it to ours.  We can't possibly take such
a retrograde step."
#173 lore raw

Re: [patch] measurements, numbers about CONFIG_OPTIMIZE_INLINING=y impact

In reply to Linus Torvalds
Quoted 4 lines · Linus Torvalds

IIRC, the numbers mean different things for different versions of gcc, and I think using the parameters was very strongly discouraged by gcc developers. IOW, they were meant for gcc developers internal tuning efforts, not really for external people. Which means that using them would

When I asked last time that was not what I heard. Apparently at least some --params are considered ready for user consumption these days.

Quoted 1 line

put us _more_ at the mercy of random compiler versions rather than less.

Yes it would basically be a list in the Makefile keyed on compiler version giving different options and someone would need to do the work to do that for each new compiler version.

That would be some work, but it might be less work than going all over 9.7MLOCs and changing inlines around manually. Also the advantage is that that you wouldn't need to teach the rules to hundreds of new driver programmers.

Anyways I'm not very strongly wedded to this idea, but I think it's an alternative that should be at least considered before doing anything else drastic.

-Andi

Signature · 1 line
[email protected]
#175 lore raw

Re: [patch] measurements, numbers about CONFIG_OPTIMIZE_INLINING=y impact

In reply to Matthew Wilcox
Quoted 5 lines · Matthew Wilcox
Quoted 2 lines · Andi Kleen

Also cc Honza in case he has comments (you might want to review more of the thread in the archives)

I think this particular bug is already known and discussed:

I thought so initially too, but:

Quoted 5 lines

http://gcc.gnu.org/ml/gcc/2008-12/msg00365.html

and it hints at being fixed with gcc 4.4. Does anyone want to test that?

Hugh already tested with 4.4 and it didn't work well. At least a lot of the low level asm inlines were not inlined. So it looks like it's still mistuned for the kernel.

-Andi

Signature · 1 line
[email protected]
#176 lore raw

Re: [patch] measurements, numbers about CONFIG_OPTIMIZE_INLINING=y impact

Quoted 10 lines · Andi Kleen
Quoted 5 lines · Matthew Wilcox
Quoted 2 lines · Andi Kleen

Also cc Honza in case he has comments (you might want to review more of the thread in the archives)

I think this particular bug is already known and discussed:

I thought so initially too, but:

Quoted 1 line
Quoted 8 lines
Quoted 4 lines

http://gcc.gnu.org/ml/gcc/2008-12/msg00365.html

and it hints at being fixed with gcc 4.4. Does anyone want to test that?

Hugh already tested with 4.4 and it didn't work well. At least a lot of the low level asm inlines were not inlined. So it looks like it's still mistuned for the kernel.

That seems like valuable feedback to give to the GCC developers.

Richi, you can find the whole thread at

http://marc.info/?l=linux-fsdevel&m=123150610901773&w=2

and http://marc.info/?l=linux-fsdevel&m=123150834405285&w=2 is also relevant.

Signature · 4 lines
Matthew Wilcox				Intel Open Source Technology Centre
"Bill, look, we understand that you're interested in selling us this
operating system, but compare it to ours.  We can't possibly take such
a retrograde step."
#126 lore raw

Re: [PATCH -v7][RFC]: mutex: implement adaptive spinning

In reply to Peter Zijlstra
Quoted 6 lines · Peter Zijlstra
Quoted 3 lines

Well, at least we do unless you enable that broken paravirt support. I'm not at all clear on why CONFIG_PARAVIRT wants to use inferior locks, but I don't much care.

Because the virtual cpu that has the ticket might not get scheduled for a while, even though another vcpu with a spinner is scheduled. The whole (para)virt is a nightmare in that respect.

Hmm, are we in fact really using byte locks in CONFIG_PARAVIRT situation? Where are we actually setting pv_lock_ops.spin_lock pointer to point to __byte_spin_lock?

Such initialization seems to happen only in paravirt_use_bytelocks() function, but my blind eyes prevent me from finding a callsite from which this function would eventually get called.

Signature · 2 lines
Jiri Kosina
SUSE Labs
#195 lore raw

Re: [patch] measurements, numbers about CONFIG_OPTIMIZE_INLINING=y impact

In reply to Andi Kleen
Quoted 10 lines · On Fri, 9 Jan 2009 18:47:19 +0100 Andi Kleen <[email protected]> wrote:
Quoted 5 lines · Matthew Wilcox
Quoted 2 lines · Andi Kleen

Also cc Honza in case he has comments (you might want to review more of the thread in the archives)

I think this particular bug is already known and discussed:

I thought so initially too, but:

Quoted 1 line
Quoted 8 lines
Quoted 4 lines

http://gcc.gnu.org/ml/gcc/2008-12/msg00365.html

and it hints at being fixed with gcc 4.4. Does anyone want to test that?

Hugh already tested with 4.4 and it didn't work well. At least a lot of the low level asm inlines were not inlined. So it looks like it's still mistuned for the kernel.

I think that's the point. gcc will not get it right.
So we need to do it ourselves in the kernel sources.
We may not like it, but it's the only way to guarantee reproducable reliable inline / noinline decisions.

/D

Signature · 2 lines
Dirk Hohndel
Intel Open Source Technology Center
#196 lore raw

Re: [patch] measurements, numbers about CONFIG_OPTIMIZE_INLINING=y impact

Quoted 1 line

I think that's the point. gcc will not get it right.

I don't think that's necessary an universal truth. It can be probably fixed.

Quoted 3 lines

So we need to do it ourselves in the kernel sources.
We may not like it, but it's the only way to guarantee reproducable reliable inline / noinline decisions.

For most things we don't really need it to be reproducable, the main exception are the inlines in headers.

Universal noinline would also be a bad idea because of its costs (4.1% text size increase). Perhaps should make it a CONFIG option for debugging though.

-Andi

Quoted 7 lines

/D

Signature · 2 lines
Dirk Hohndel
Intel Open Source Technology Center
Signature · 1 line
[email protected]
#177 lore raw

Re: [patch] measurements, numbers about CONFIG_OPTIMIZE_INLINING=y impact

In reply to Matthew Wilcox
Quoted 2 lines · Matthew Wilcox

That seems like valuable feedback to give to the GCC developers.

Well, one thing we should remember is that the kernel really _is_ special.

The kernel not only does things no other program tends to do (inline asms are unusual in the first place - many of them are literally due to system issues like atomic accesses and interrupts that simply aren't an issue in user space, or that need so much abstraction that they aren't inlinable anyway).

But the kernel also has totally different requirements in other ways. When was the last time you did user space programming and needed to get a backtrace from a user with register info because you simply don't have the hardware that he has?

IOW, debugging in user space tends to be much more about trying to reproduce the bug - in a way that we often cannot in the kernel. User space in general is much more reproducible, since it's seldom as hardware- or timing-dependent (threading does change the latter, but usually user space threading is not _nearly_ as aggressive as the kernel has to be).

So the thing is, even if gcc was "perfect", it would likely be perfect for a different audience than the kernel.

Do you think _any_ user space programmer worries about the stack space being a few hundred bytes larger because the compiler inlined two functions, and caused stack usage to be sum of them instead of just the maximum of the two?

So we do have special issues. And exactly _because_ we have special issues we should also expect that some compiler defaults simply won't ever really be appropriate for us.

Linus

#197 lore raw

Re: [patch] measurements, numbers about CONFIG_OPTIMIZE_INLINING=y impact

In reply to Andi Kleen
Quoted 4 lines · Andi Kleen

Universal noinline would also be a bad idea because of its costs (4.1% text size increase). Perhaps should make it a CONFIG option for debugging though.

That's _totally_ the wrong way.

If you can reproduce an issue on your machine, you generally don't care about inline, because you can see the stack, do the whole "gdb vmlinux" thing, and you generally have tools to help you decode things. Including just recompiling the kernel with an added noinline.

But _users_ just get their oopses sent automatically. So it's not about "debugging kernels", it's about _normal_ kernels. They are the ones that need to be debuggable, and the ones that care most about things like the symbolic EIP being as helpful as possible.

Linus

#178 lore raw

Re: [patch] measurements, numbers about CONFIG_OPTIMIZE_INLINING=y impact

In reply to Linus Torvalds
Quoted 3 lines

So we do have special issues. And exactly _because_ we have special issues we should also expect that some compiler defaults simply won't ever really be appropriate for us.

I agree that the kernel needs quite different inlining heuristics than let's say a template heavy C++ program. I guess that is also where our trouble comes from -- gcc is more tuned for the later. Perhaps because the C++ programmers are better at working with the gcc developers?

But it's also not inconceivable that gcc adds a -fkernel-inlining or similar that changes the parameters if we ask nicely. I suppose actually such a parameter would be useful for far more programs than the kernel.

-Andi

Signature · 1 line
[email protected]
#186 lore raw

Re: [patch] measurements, numbers about CONFIG_OPTIMIZE_INLINING=y impact

In reply to Linus Torvalds
Quoted 3 lines · Linus Torvalds

So we do have special issues. And exactly _because_ we have special issues we should also expect that some compiler defaults simply won't ever really be appropriate for us.

That is, of course, true.

However, the Linux kernel (and quite a few other kernels) is a very important customer of gcc, and adding sustainable modes for the kernel that we can rely on is probably something we can work with them on.

I think the relationship between the gcc and Linux kernel people is unnecessarily infected, and cultivating a more constructive relationship would be good. I suspect a big part of the reason for the oddities is that the timeline for the kernel community from making a request into gcc until we can actually rely on it is *very* long, and so we end up having to working things around no matter what (usually with copious invective), and the gcc people have other customers with shorter lead times which therefore drive their development more.

-hpa

maintainer
#138 lore raw

Re: [PATCH -v7][RFC]: mutex: implement adaptive spinning

In reply to Steven Rostedt
Quoted 4 lines · Steven Rostedt

When we get to the schedule() it then needs to be a:

	preempt_enable_no_resched();
	schedule();

On that note:

kernel/mutex.c +2 -0
Index: linux-2.6/kernel/mutex.c
===================================================================
@@ -220,7 +220,9 @@ __mutex_lock_common(struct mutex *lock, 
 		__set_task_state(task, state);
 
 		/* didnt get the lock, go to sleep: */
+		preempt_disable();
 		spin_unlock_mutex(&lock->wait_lock, flags);
+		preempt_enable_no_resched();
 		schedule();
 		spin_lock_mutex(&lock->wait_lock, flags);
 	}

actually improves mutex performance on PREEMPT=y

#139 lore raw

Re: [PATCH -v7][RFC]: mutex: implement adaptive spinning

Quoted 8 lines · Peter Zijlstra

On that note:

Index: linux-2.6/kernel/mutex.c
===================================================================

kernel/mutex.c __mutex_lock_common(struct mutex *lock, · line 226

Quoted 7 lines
kernel/mutex.c +2 -0
@@ -220,7 +220,9 @@ __mutex_lock_common(struct mutex *lock, 
 		__set_task_state(task, state);
 
 		/* didnt get the lock, go to sleep: */
+		preempt_disable();
 		spin_unlock_mutex(&lock->wait_lock, flags);
+		preempt_enable_no_resched();
 		schedule();

Yes. I think this is a generic issue independently of the whole adaptive thing.

In fact, I think wee could make the mutex code use explicit preemption and then the __raw spinlocks to make this more obvious. Because now there's a hidden "preempt_enable()" in that spin_unlock_mutex, and anybody looking at the code and not realizing it is going to just say "Whaa? Who is this crazy Peter Zijlstra guy, and what drugs is he on? I want me some!".

Because your patch really doesn't make much sense unless you know how spinlocks work, and if you _do_ know how spinlocks work, you go "eww, that's doing extra preemption crud in order to just disable the _automatic_ preemption crud".

Linus

#198 lore raw

Re: [patch] measurements, numbers about CONFIG_OPTIMIZE_INLINING=y impact

In reply to Linus Torvalds
Quoted 1 line

But _users_ just get their oopses sent automatically. So it's not about

If they send it from distro kernels the automated oops sender could just fetch the debuginfo rpm and decode it down to a line. My old automatic user segfault uploader I did originally for the core pipe code did that too.

Quoted 3 lines

"debugging kernels", it's about _normal_ kernels. They are the ones that need to be debuggable, and the ones that care most about things like the symbolic EIP being as helpful as possible.

Ok you're saying we should pay the 4.1% by default for this? If you want that you can apply the appended patch. Not sure if it's really a good idea though. 4.1% is a lot.

-Andi

---

Disable inlining of functions called once by default

This makes oopses easier to read because it's clearer in which function the problem is.

Disadvantage: costs ~4.1% of text size (measured with allyesconfig on gcc 4.1 on x86-64)

---
 Makefile |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
Makefile +1 -3
Index: linux-2.6.28-git12/Makefile
===================================================================
@@ -546,10 +546,8 @@
 KBUILD_CFLAGS	+= -pg
 endif
 
-# We trigger additional mismatches with less inlining
-ifdef CONFIG_DEBUG_SECTION_MISMATCH
+# Disable too aggressive inlining because it makes oopses harder to read
 KBUILD_CFLAGS += $(call cc-option, -fno-inline-functions-called-once)
-endif
 
 # arch Makefile may override CC so keep this after arch Makefile is included
 NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
Signature · 1 line
[email protected]
#179 lore raw

Re: [patch] measurements, numbers about CONFIG_OPTIMIZE_INLINING=y impact

In reply to Andi Kleen
Quoted 10 lines · Andi Kleen
Quoted 3 lines

So we do have special issues. And exactly _because_ we have special issues we should also expect that some compiler defaults simply won't ever really be appropriate for us.

I agree that the kernel needs quite different inlining heuristics than let's say a template heavy C++ program. I guess that is also where our trouble comes from -- gcc is more tuned for the later. Perhaps because the C++ programmers are better at working with the gcc developers?

Quoted 4 lines

But it's also not inconceivable that gcc adds a -fkernel-inlining or similar that changes the parameters if we ask nicely. I suppose actually such a parameter would be useful for far more programs than the kernel.

I think that the kernel is a perfect target to optimize default -Os behavior for (whereas template heavy C++ programs are a target to optimize -O2 for). And I think we did a good job in listening to kernel developers if once in time they tried to talk to us - GCC 4.3 should be good in compiling the kernel with default -Os settings. We, unfortunately, cannot retroactively fix old versions that kernel developers happen to like and still use.

Richard.

#199 lore raw

Re: [patch] measurements, numbers about CONFIG_OPTIMIZE_INLINING=y impact

In reply to Andi Kleen
Quoted 2 lines · Andi Kleen

Ok you're saying we should pay the 4.1% by default for this?

The thing is, YOU ARE MAKING THAT NUMBER UP!

First off, the size increase only matters if it actually increases the cache footprint. And it may, but..

Secondly, my whole point here has been that we should not rely on gcc doing things behind our back, because gcc will generally do the wrong thing. If we decided to be more active about this, we could just choose to find the places that matter (in hot code) and fix _those_.

Thirdly, you're just replacing _one_ random gcc choice with _another_ random one.

What happens when you say -fno-inline-functions-called-once? Does it disable inlining for those functions IN GENERAL, or just for the LARGE ones? See?

Linus

#180 lore raw

Re: [patch] measurements, numbers about CONFIG_OPTIMIZE_INLINING=y impact

In reply to Richard Guenther
Quoted 2 lines

GCC 4.3 should be good in compiling the
kernel with default -Os settings.

It's unfortunately not. It doesn't inline a lot of simple asm() inlines for example.

-Andi

Signature · 1 line
[email protected]
#187 lore raw

Re: [patch] measurements, numbers about CONFIG_OPTIMIZE_INLINING=y impact

In reply to Linus Torvalds
Quoted 7 lines · Linus Torvalds
Quoted 2 lines · Matthew Wilcox

That seems like valuable feedback to give to the GCC developers.

Well, one thing we should remember is that the kernel really _is_ special.

(sorry for not threading properly here)

Linus writes:

"Thirdly, you're just replacing _one_ random gcc choice with _another_ random one.

What happens when you say -fno-inline-functions-called-once? Does it disable inlining for those functions IN GENERAL, or just for the LARGE ones? See?"

-fno-inline-functions-called-once disables the heuristic that always inlines (static!) functions that are called once. Other heuristics still apply, like inlining
the static function if it is small. Everything else would be totally stupid - which
seems to be the "default mode" you think GCC developers are in.

Richard.