The patch titled
br_if: oops in port_carrier_check
has been removed from the -mm tree. Its filename was
br_if-oops-in-port_carrier_check.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: br_if: oops in port_carrier_check
From: Jarek Poplawski <jarkao2@xxxxx>
On Mon, Feb 12, 2007 at 09:47:38AM -0800, Stephen Hemminger wrote:
> On Mon, 12 Feb 2007 11:28:48 +0100
> Jarek Poplawski <jarkao2@xxxxx> wrote:
>
> > Here is my patch proposal for testing.
> > If it doesn't work - forget about it.
> > (Prepared with 2.6.20-git6 but could
> > be applied to 2.6.20 also.)
> >
> > Jarek P.
> >
> >
> > dev_hold/dev_put added to prevent dev kfree
> > during port_carrier_check runnig, while dev
> > and port are removed.
>
> No, holding the reference just stops the kfree, it doesn't
> stop the device from being removed from the port.
But I wrote above it is only to prevent the kfree.
> p = dev->br_port;
> if (!p)
> goto done;
> br = p->br;
Then p is NULL here and we goto done.
Sorry, but the first version was wrong (incomplete).
Below I attach a new proposal.
Signed-off-by: Jarek Poplawski <jarkao2@xxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
net/bridge/br_if.c | 8 ++++++--
net/bridge/br_notify.c | 4 +++-
2 files changed, 9 insertions(+), 3 deletions(-)
diff -puN net/bridge/br_if.c~br_if-oops-in-port_carrier_check net/bridge/br_if.c
--- a/net/bridge/br_if.c~br_if-oops-in-port_carrier_check
+++ a/net/bridge/br_if.c
@@ -108,6 +108,7 @@ static void port_carrier_check(struct wo
spin_unlock_bh(&br->lock);
}
done:
+ dev_put(dev);
rtnl_unlock();
}
@@ -161,7 +162,8 @@ static void del_nbp(struct net_bridge_po
dev_set_promiscuity(dev, -1);
- cancel_delayed_work(&p->carrier_check);
+ if (cancel_delayed_work(&p->carrier_check))
+ dev_put(dev);
spin_lock_bh(&br->lock);
br_stp_disable_port(p);
@@ -444,7 +446,9 @@ int br_add_if(struct net_bridge *br, str
spin_lock_bh(&br->lock);
br_stp_recalculate_bridge_id(br);
br_features_recompute(br);
- schedule_delayed_work(&p->carrier_check, BR_PORT_DEBOUNCE);
+ if (schedule_delayed_work(&p->carrier_check, BR_PORT_DEBOUNCE))
+ dev_hold(dev);
+
spin_unlock_bh(&br->lock);
dev_set_mtu(br->dev, br_min_mtu(br));
diff -puN net/bridge/br_notify.c~br_if-oops-in-port_carrier_check net/bridge/br_notify.c
--- a/net/bridge/br_notify.c~br_if-oops-in-port_carrier_check
+++ a/net/bridge/br_notify.c
@@ -56,7 +56,9 @@ static int br_device_event(struct notifi
case NETDEV_CHANGE:
if (br->dev->flags & IFF_UP)
- schedule_delayed_work(&p->carrier_check, BR_PORT_DEBOUNCE);
+ if (schedule_delayed_work(&p->carrier_check,
+ BR_PORT_DEBOUNCE))
+ dev_hold(dev);
break;
case NETDEV_FEAT_CHANGE:
_
Patches currently in -mm which might be from jarkao2@xxxxx are
origin.patch
lockdep-debug_locks-check-after-check_chain_key.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
