lkml.org 
[lkml]   [2012]   [Aug]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH v2] macvtap: rcu_dereference outside read-lock section
On Sun, Aug 12, 2012 at 10:26:31AM +0400, Denis Efremov wrote:
> rcu_dereference occurs in update section. Replacement by
> rcu_dereference_protected in order to prevent lockdep
> complaint.
>
> Found by Linux Driver Verification project (linuxtesting.org)
>
> Signed-off-by: Denis Efremov <yefremov.denis@gmail.com>
> ---
> drivers/net/macvtap.c | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
> index 0737bd4..0f0f9ce 100644
> --- a/drivers/net/macvtap.c
> +++ b/drivers/net/macvtap.c
> @@ -94,7 +94,8 @@ static int get_slot(struct macvlan_dev *vlan, struct macvtap_queue *q)
> int i;
>
> for (i = 0; i < MAX_MACVTAP_QUEUES; i++) {
> - if (rcu_dereference(vlan->taps[i]) == q)
> + if (rcu_dereference_protected(vlan->taps[i],
> + lockdep_is_held(&macvtap_lock)) == q)

And now it's too long. Maybe a temporary would be better?

struct macvtap_queue *t;
t = rcu_dereference_protected(vlan->taps[i],
lockdep_is_held(&macvtap_lock));
if (t == q)
return i;

?

Anyway -

Acked-by: Michael S. Tsirkin <mst@redhat.com>


> return i;
> }
>
> --
> 1.7.7


\
 
 \ /
  Last update: 2012-08-12 11:21    [W:2.507 / U:0.112 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site