From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
To: Eric Dumazet <eric.dumazet@gmail.com>
Cc: David Miller <davem@davemloft.net>, netdev <netdev@vger.kernel.org>
Subject: Re: [PATCH] neigh: __rcu annotations
Date: Fri, 21 Jan 2011 17:36:57 -0800 [thread overview]
Message-ID: <20110122013657.GP17752@linux.vnet.ibm.com> (raw)
In-Reply-To: <1295510567.2653.487.camel@edumazet-laptop>
On Thu, Jan 20, 2011 at 09:02:47AM +0100, Eric Dumazet wrote:
> fix some minor issues and sparse (__rcu) warnings
>
> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
> ---
> net/core/neighbour.c | 13 +++++++------
> 1 file changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/net/core/neighbour.c b/net/core/neighbour.c
> index 60a9029..799f06e 100644
> --- a/net/core/neighbour.c
> +++ b/net/core/neighbour.c
> @@ -316,7 +316,7 @@ static struct neigh_hash_table *neigh_hash_alloc(unsigned int entries)
> {
> size_t size = entries * sizeof(struct neighbour *);
> struct neigh_hash_table *ret;
> - struct neighbour **buckets;
> + struct neighbour __rcu **buckets;
>
> ret = kmalloc(sizeof(*ret), GFP_ATOMIC);
> if (!ret)
> @@ -324,14 +324,14 @@ static struct neigh_hash_table *neigh_hash_alloc(unsigned int entries)
> if (size <= PAGE_SIZE)
> buckets = kzalloc(size, GFP_ATOMIC);
> else
> - buckets = (struct neighbour **)
> + buckets = (struct neighbour __rcu **)
> __get_free_pages(GFP_ATOMIC | __GFP_ZERO,
> get_order(size));
> if (!buckets) {
> kfree(ret);
> return NULL;
> }
> - rcu_assign_pointer(ret->hash_buckets, buckets);
> + ret->hash_buckets = buckets;
> ret->hash_mask = entries - 1;
> get_random_bytes(&ret->hash_rnd, sizeof(ret->hash_rnd));
> return ret;
> @@ -343,7 +343,7 @@ static void neigh_hash_free_rcu(struct rcu_head *head)
> struct neigh_hash_table,
> rcu);
> size_t size = (nht->hash_mask + 1) * sizeof(struct neighbour *);
> - struct neighbour **buckets = nht->hash_buckets;
> + struct neighbour __rcu **buckets = nht->hash_buckets;
>
> if (size <= PAGE_SIZE)
> kfree(buckets);
> @@ -1540,7 +1540,7 @@ void neigh_table_init_no_netlink(struct neigh_table *tbl)
> panic("cannot create neighbour proc dir entry");
> #endif
>
> - tbl->nht = neigh_hash_alloc(8);
> + RCU_INIT_POINTER(tbl->nht, neigh_hash_alloc(8));
>
> phsize = (PNEIGH_HASHMASK + 1) * sizeof(struct pneigh_entry *);
> tbl->phash_buckets = kzalloc(phsize, GFP_KERNEL);
> @@ -1602,7 +1602,8 @@ int neigh_table_clear(struct neigh_table *tbl)
> }
> write_unlock(&neigh_tbl_lock);
>
> - call_rcu(&tbl->nht->rcu, neigh_hash_free_rcu);
> + call_rcu(&rcu_dereference_protected(tbl->nht, 1)->rcu,
> + neigh_hash_free_rcu);
Hello, Eric,
Any chance of a comment? Perhaps something like:
/*
* Because this has been removed from the list, no other updater
* can access this element.
*/
Thanx, Paul
> tbl->nht = NULL;
>
> kfree(tbl->phash_buckets);
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
prev parent reply other threads:[~2011-01-22 8:44 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-20 8:02 [PATCH] neigh: __rcu annotations Eric Dumazet
2011-01-21 0:56 ` David Miller
2011-01-22 1:36 ` Paul E. McKenney [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110122013657.GP17752@linux.vnet.ibm.com \
--to=paulmck@linux.vnet.ibm.com \
--cc=davem@davemloft.net \
--cc=eric.dumazet@gmail.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).