2018-12-21 23:03:48

by Dennis Zhou

Subject: [PATCH] blkcg: add rcu lock to bio_clone_blkg_association()

I cleaned up blkg_tryget_closest() to require rcu_read_lock() earlier.
However, this was a subtle case too which clearly was too subtle for me.
The idea was the src bio should be holding a ref to the blkg so rcu
wasn't technically needed. If it doesn't hold a ref, it should be %NULL
and the blkg->parent pointers are unused.

This adds the appropriate read lock in bio_clone_blkg_association().

Fixes: 80fd3c272c1a ("blkcg: clean up blkg_tryget_closest()")
Reported-by: [email protected]
Signed-off-by: Dennis Zhou <[email protected]>
---
block/bio.c | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/block/bio.c b/block/bio.c
index c288b9057042..9194d8ad3d5e 100644
--- a/block/bio.c
+++ b/block/bio.c
@@ -2096,8 +2096,12 @@ EXPORT_SYMBOL_GPL(bio_associate_blkg);
*/
void bio_clone_blkg_association(struct bio *dst, struct bio *src)
{
+ rcu_read_lock();
+
if (src->bi_blkg)
__bio_associate_blkg(dst, src->bi_blkg);
+
+ rcu_read_unlock();
}
EXPORT_SYMBOL_GPL(bio_clone_blkg_association);
#endif /* CONFIG_BLK_CGROUP */
--
2.17.1

2018-12-22 01:13:52

by Jens Axboe

Subject: Re: [PATCH] blkcg: add rcu lock to bio_clone_blkg_association()

On 12/21/18 7:54 AM, Dennis Zhou wrote:
> I cleaned up blkg_tryget_closest() to require rcu_read_lock() earlier.
> However, this was a subtle case too which clearly was too subtle for me.
> The idea was the src bio should be holding a ref to the blkg so rcu
> wasn't technically needed. If it doesn't hold a ref, it should be %NULL
> and the blkg->parent pointers are unused.
>
> This adds the appropriate read lock in bio_clone_blkg_association().

Shall I just fold this with the previous? I staged it in a
later-in-merge-cycle branch, so that's not an issue to amend.

--
Jens Axboe

2018-12-22 17:02:22

by Jens Axboe

Subject: Re: [PATCH] blkcg: add rcu lock to bio_clone_blkg_association()

On 12/21/18 10:02 AM, Dennis Zhou wrote:
> On Fri, Dec 21, 2018 at 08:26:02AM -0700, Jens Axboe wrote:
>> On 12/21/18 7:54 AM, Dennis Zhou wrote:
>>> I cleaned up blkg_tryget_closest() to require rcu_read_lock() earlier.
>>> However, this was a subtle case too which clearly was too subtle for me.
>>> The idea was the src bio should be holding a ref to the blkg so rcu
>>> wasn't technically needed. If it doesn't hold a ref, it should be %NULL
>>> and the blkg->parent pointers are unused.
>>>
>>> This adds the appropriate read lock in bio_clone_blkg_association().
>>
>> Shall I just fold this with the previous? I staged it in a
>> later-in-merge-cycle branch, so that's not an issue to amend.
>>
>
> Yeah that would be great!

Done

--
Jens Axboe

2018-12-22 20:31:10

by Dennis Zhou

Subject: Re: [PATCH] blkcg: add rcu lock to bio_clone_blkg_association()

On Fri, Dec 21, 2018 at 08:26:02AM -0700, Jens Axboe wrote:
> On 12/21/18 7:54 AM, Dennis Zhou wrote:
> > I cleaned up blkg_tryget_closest() to require rcu_read_lock() earlier.
> > However, this was a subtle case too which clearly was too subtle for me.
> > The idea was the src bio should be holding a ref to the blkg so rcu
> > wasn't technically needed. If it doesn't hold a ref, it should be %NULL
> > and the blkg->parent pointers are unused.
> >
> > This adds the appropriate read lock in bio_clone_blkg_association().
>
> Shall I just fold this with the previous? I staged it in a
> later-in-merge-cycle branch, so that's not an issue to amend.
>

Yeah that would be great!

Thanks,
Dennis