| Message ID | F6FB0E698C9B3143BDF729DF222866464C28E2AE@ORSMSX110.amr.corp.intel.com |
|---|---|
| State | RFC, archived |
| Delegated to: | David Miller |
| Headers | show |
On Sat, 2013-05-04 at 21:05 +0000, Skidmore, Donald C wrote: [...] > > The version of ixgbe in this Debian kernel has bql support backported, but is > > otherwise the same as in 3.2.41. I assume that this bug has been fixed some > > time between 3.2 and 3.9, but no-one requested that the fix be included in > > stable branches. Please can you identify the fix? > > > > Ben. > > > > -- > > Ben Hutchings > > We get into the habit of living before acquiring the habit of thinking. > > - Albert Camus > > I believe this is the patch: > > commit 34948a947d1a576c10afee6d14792fd237549577 > Author: Benjamin Poirier <bpoirier@suse.de> > Date: Fri Apr 6 07:20:21 2012 +0000 > > ixgbe: add missing rtnl_lock in PM resume path [...] Looks like it. And it applies cleanly to 3.2.y. Stephen, could you test this on top of 3.2.y and then nominate it for stable? Ben.
On Sat, 04 May 2013 22:21:32 +0100 Ben Hutchings <ben@decadent.org.uk> wrote: > On Sat, 2013-05-04 at 21:05 +0000, Skidmore, Donald C wrote: > [...] > > > The version of ixgbe in this Debian kernel has bql support backported, but is > > > otherwise the same as in 3.2.41. I assume that this bug has been fixed some > > > time between 3.2 and 3.9, but no-one requested that the fix be included in > > > stable branches. Please can you identify the fix? > > > > > > Ben. > > > > > > -- > > > Ben Hutchings > > > We get into the habit of living before acquiring the habit of thinking. > > > - Albert Camus > > > > I believe this is the patch: > > > > commit 34948a947d1a576c10afee6d14792fd237549577 > > Author: Benjamin Poirier <bpoirier@suse.de> > > Date: Fri Apr 6 07:20:21 2012 +0000 > > > > ixgbe: add missing rtnl_lock in PM resume path > [...] > > Looks like it. And it applies cleanly to 3.2.y. Stephen, could you > test this on top of 3.2.y and then nominate it for stable? > > Ben. > Patch works. Tested with 3.2.44 with this patch and there is no problem.
On Mon, 2013-05-06 at 07:58 -0700, Stephen Hemminger wrote: > On Sat, 04 May 2013 22:21:32 +0100 > Ben Hutchings <ben@decadent.org.uk> wrote: > > > On Sat, 2013-05-04 at 21:05 +0000, Skidmore, Donald C wrote: > > [...] > > > > The version of ixgbe in this Debian kernel has bql support backported, but is > > > > otherwise the same as in 3.2.41. I assume that this bug has been fixed some > > > > time between 3.2 and 3.9, but no-one requested that the fix be included in > > > > stable branches. Please can you identify the fix? > > > > > > > > Ben. > > > > > > > > -- > > > > Ben Hutchings > > > > We get into the habit of living before acquiring the habit of thinking. > > > > - Albert Camus > > > > > > I believe this is the patch: > > > > > > commit 34948a947d1a576c10afee6d14792fd237549577 > > > Author: Benjamin Poirier <bpoirier@suse.de> > > > Date: Fri Apr 6 07:20:21 2012 +0000 > > > > > > ixgbe: add missing rtnl_lock in PM resume path > > [...] > > > > Looks like it. And it applies cleanly to 3.2.y. Stephen, could you > > test this on top of 3.2.y and then nominate it for stable? > > > > Ben. > > > > Patch works. > Tested with 3.2.44 with this patch and there is no problem. Thanks, I've added this to my queue. Ben.
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/i index dac7c01..9e2be8c 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -4836,7 +4836,9 @@ static int ixgbe_resume(struct pci_dev *pdev) pci_wake_from_d3(pdev, false); + rtnl_lock(); err = ixgbe_init_interrupt_scheme(adapter); + rtnl_unlock(); if (err) { e_dev_err("Cannot initialize interrupts for device\n"); return err;