From: Laurent Chavey <chavey@google.com>
To: cooldavid@cooldavid.org
Cc: David Miller <davem@davemloft.net>,
linux-netdev <netdev@vger.kernel.org>,
Ethan Hsiao <ethanhsiao@jmicron.com>
Subject: Re: [PATCH v2.6.33 2/2] jme: Adding lock to protect vlgrp structure.
Date: Mon, 15 Mar 2010 11:22:48 -0700 [thread overview]
Message-ID: <97949e3e1003151122q68ce19f4ja7f53ad380d3033f@mail.gmail.com> (raw)
In-Reply-To: <1268630132-10410-2-git-send-email-cooldavid@cooldavid.org>
what does the spinlock protect ?
On Sun, Mar 14, 2010 at 10:15 PM, <cooldavid@cooldavid.org> wrote:
> From: Guo-Fu Tseng <cooldavid@cooldavid.org>
>
> Adding a lock to prevent modifying the vlgrp structure while receiving
> VLAN packet.
>
> Signed-off-by: Guo-Fu Tseng <cooldavid@cooldavid.org>
> ---
> drivers/net/jme.c | 6 ++++++
> drivers/net/jme.h | 1 +
> 2 files changed, 7 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/net/jme.c b/drivers/net/jme.c
> index 3da390a..f10d9db 100644
> --- a/drivers/net/jme.c
> +++ b/drivers/net/jme.c
> @@ -942,11 +942,14 @@ jme_alloc_and_feed_skb(struct jme_adapter *jme, int idx)
> skb->ip_summed = CHECKSUM_NONE;
>
> if (rxdesc->descwb.flags & cpu_to_le16(RXWBFLAG_TAGON)) {
> + spin_lock(&jme->vlgrp_lock);
> if (jme->vlgrp) {
> jme->jme_vlan_rx(skb, jme->vlgrp,
> le16_to_cpu(rxdesc->descwb.vlan));
> + spin_unlock(&jme->vlgrp_lock);
> NET_STAT(jme).rx_bytes += 4;
> } else {
> + spin_unlock(&jme->vlgrp_lock);
> dev_kfree_skb(skb);
> }
> } else {
> @@ -2092,7 +2095,9 @@ jme_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp)
> {
> struct jme_adapter *jme = netdev_priv(netdev);
>
> + spin_lock_bh(&jme->vlgrp_lock);
> jme->vlgrp = grp;
> + spin_unlock_bh(&jme->vlgrp_lock);
> }
>
> static void
> @@ -2759,6 +2764,7 @@ jme_init_one(struct pci_dev *pdev,
> spin_lock_init(&jme->phy_lock);
> spin_lock_init(&jme->macaddr_lock);
> spin_lock_init(&jme->rxmcs_lock);
> + spin_lock_init(&jme->vlgrp_lock);
>
> atomic_set(&jme->link_changing, 1);
> atomic_set(&jme->rx_cleaning, 1);
> diff --git a/drivers/net/jme.h b/drivers/net/jme.h
> index 251abed..fbde5c5 100644
> --- a/drivers/net/jme.h
> +++ b/drivers/net/jme.h
> @@ -420,6 +420,7 @@ struct jme_adapter {
> spinlock_t phy_lock;
> spinlock_t macaddr_lock;
> spinlock_t rxmcs_lock;
> + spinlock_t vlgrp_lock;
> struct tasklet_struct rxempty_task;
> struct tasklet_struct rxclean_task;
> struct tasklet_struct txclean_task;
> --
> 1.6.4.4
>
> --
> 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
>
next prev parent reply other threads:[~2010-03-15 18:23 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-15 5:15 [PATCH v2.6.33 1/2] jme: Fix VLAN memory leak cooldavid
2010-03-15 5:15 ` [PATCH v2.6.33 2/2] jme: Adding lock to protect vlgrp structure cooldavid
2010-03-15 18:22 ` Laurent Chavey [this message]
2010-03-15 19:13 ` Guo-Fu Tseng
2010-03-15 22:53 ` David Miller
2010-03-16 7:15 ` Guo-Fu Tseng
2010-03-16 7:40 ` Eric Dumazet
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=97949e3e1003151122q68ce19f4ja7f53ad380d3033f@mail.gmail.com \
--to=chavey@google.com \
--cc=cooldavid@cooldavid.org \
--cc=davem@davemloft.net \
--cc=ethanhsiao@jmicron.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).