LinuxLists.cc - [GIT]: Networking for 2.6.30

[permalink] [raw]

Subject: Re: [GIT]: Networking for 2.6.30

From: David Miller <[email protected]>
Date: Thu, 26 Mar 2009 02:07:14 -0700 (PDT)

>
> These are the networking updates for 2.6.30
>
> The safest fix for the GRO stinker Ingo and others ran into
> is here as well, and I will push that to -stable once it
> hits your tree.

Just FYI, I've just pushed a merge of the changes you pulled in today
in order to resolve the one merge conflict that arose.

> Please pull, thanks a lot!
>
> The following changes since commit 8e0ee43bc2c3e19db56a4adaa9a9b04ce885cd84:
> Linus Torvalds (1):
> Linux 2.6.29
>
> are available in the git repository at:
>
> master.kernel.org:/pub/scm/linux/kernel/git/davem/net-next-2.6.git master

Thanks!

2009-03-26 22:59:35

[permalink] [raw]

Subject: Re: [GIT]: Networking for 2.6.30

On Thu, 26 Mar 2009, David Miller wrote:
>
> Just FYI, I've just pushed a merge of the changes you pulled in today
> in order to resolve the one merge conflict that arose.

Well, I merged infiniband, and that caused more conflicts. I fixed them
up, but people need to double-check my fixes.

Linus

2009-03-26 23:02:05

[permalink] [raw]

Subject: Re: [GIT]: Networking for 2.6.30

From: Linus Torvalds <[email protected]>
Date: Thu, 26 Mar 2009 15:56:24 -0700 (PDT)

> On Thu, 26 Mar 2009, David Miller wrote:
> >
> > Just FYI, I've just pushed a merge of the changes you pulled in today
> > in order to resolve the one merge conflict that arose.
>
> Well, I merged infiniband, and that caused more conflicts. I fixed them
> up, but people need to double-check my fixes.

Will do.

2009-03-26 23:26:26

[permalink] [raw]

Subject: RDMA/nes: Fix mis-merge

When net-next and infiniband were merged upstream, each branch deleted
one of a pair of adjacent lines from nes_nic.c, but when Linus fixed the
conflict up, he brought back both of the lines. Fix up to the intended
final tree state.
---
> Well, I merged infiniband, and that caused more conflicts. I fixed them
> up, but people need to double-check my fixes.

Looks like you mismerged one file -- each side deleted one line right
next to each other, but your merge left both lines in. I think the
patch below is needed. (The cxgb3 fix looks correct)

drivers/infiniband/hw/nes/nes_nic.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
index 8d3e4c6..ecb1f6f 100644
--- a/drivers/infiniband/hw/nes/nes_nic.c
+++ b/drivers/infiniband/hw/nes/nes_nic.c
@@ -1602,8 +1602,6 @@ struct net_device *nes_netdev_init(struct nes_device *nesdev,
netif_napi_add(netdev, &nesvnic->napi, nes_netdev_poll, 128);
nes_debug(NES_DBG_INIT, "Enabling VLAN Insert/Delete.\n");
netdev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
- netdev->vlan_rx_register = nes_netdev_vlan_rx_register;
- netdev->features |= NETIF_F_LLTX;

/* Fill in the port structure */
nesvnic->netdev = netdev;

2009-03-26 23:31:40

[permalink] [raw]

Subject: Re: RDMA/nes: Fix mis-merge

From: Roland Dreier <[email protected]>
Date: Thu, 26 Mar 2009 16:25:49 -0700

> When net-next and infiniband were merged upstream, each branch deleted
> one of a pair of adjacent lines from nes_nic.c, but when Linus fixed the
> conflict up, he brought back both of the lines. Fix up to the intended
> final tree state.
> ---
> > Well, I merged infiniband, and that caused more conflicts. I fixed them
> > up, but people need to double-check my fixes.
>
> Looks like you mismerged one file -- each side deleted one line right
> next to each other, but your merge left both lines in. I think the
> patch below is needed. (The cxgb3 fix looks correct)
>
> drivers/infiniband/hw/nes/nes_nic.c | 2 --
> 1 files changed, 0 insertions(+), 2 deletions(-)

Looks good, Linus please apply:

Acked-by: David S. Miller <[email protected]>

> diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
> index 8d3e4c6..ecb1f6f 100644
> --- a/drivers/infiniband/hw/nes/nes_nic.c
> +++ b/drivers/infiniband/hw/nes/nes_nic.c
> @@ -1602,8 +1602,6 @@ struct net_device *nes_netdev_init(struct nes_device *nesdev,
> netif_napi_add(netdev, &nesvnic->napi, nes_netdev_poll, 128);
> nes_debug(NES_DBG_INIT, "Enabling VLAN Insert/Delete.\n");
> netdev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
> - netdev->vlan_rx_register = nes_netdev_vlan_rx_register;
> - netdev->features |= NETIF_F_LLTX;
>
> /* Fill in the port structure */
> nesvnic->netdev = netdev;

2009-03-26 23:41:32

[permalink] [raw]

Subject: Re: RDMA/nes: Fix mis-merge

On Thu, 26 Mar 2009, David Miller wrote:
>
> Acked-by: David S. Miller <[email protected]>

Can I get a sign-off from Roland too?

Linus

2009-03-26 23:43:54

[permalink] [raw]

Subject: Re: RDMA/nes: Fix mis-merge

On Thu, 26 Mar 2009, Linus Torvalds wrote:

>
>
> On Thu, 26 Mar 2009, David Miller wrote:
> >
> > Acked-by: David S. Miller <[email protected]>
>
> Can I get a sign-off from Roland too?

Btw, as far as I can tell, that function had never been tested with any
polling. It had a line like

netif_napi_add(netdev, &nesvnic->napi, nes_netdev_poll, 128);

but that line was _before_ 'nesvnic' was actually initialized (well, it
had been initialized to NULL, so it passed in some NULL-pointer-offset to
that function).

I moved that initialization up in the merge, but I obviously didn't test
anything. So I'd suggest somebody actually test this case, because it
clearly must have gotten no testing at all.

Linus

2009-03-26 23:48:55

[permalink] [raw]

Subject: Re: RDMA/nes: Fix mis-merge

> Can I get a sign-off from Roland too?

Duh, not my day...

Signed-off-by: Roland Dreier <[email protected]>

2009-03-26 23:53:54

[permalink] [raw]

Subject: Re: RDMA/nes: Fix mis-merge

> Btw, as far as I can tell, that function had never been tested with any
> polling. It had a line like
>
> netif_napi_add(netdev, &nesvnic->napi, nes_netdev_poll, 128);
>
> but that line was _before_ 'nesvnic' was actually initialized (well, it
> had been initialized to NULL, so it passed in some NULL-pointer-offset to
> that function).

Yes, looks like the bug was introduced by d0929553 ("infiniband: convert
nes driver to net_device_ops"). And unfortunately the nesvnic=NULL
initialization stopped gcc from warning about used-uninitialized I
guess. I'll test the final merge out...

- R.

2009-03-27 07:30:19

[permalink] [raw]

Subject: Re: RDMA/nes: Fix mis-merge

From: Roland Dreier <[email protected]>
Date: Thu, 26 Mar 2009 16:53:25 -0700

> > Btw, as far as I can tell, that function had never been tested with any
> > polling. It had a line like
> >
> > netif_napi_add(netdev, &nesvnic->napi, nes_netdev_poll, 128);
> >
> > but that line was _before_ 'nesvnic' was actually initialized (well, it
> > had been initialized to NULL, so it passed in some NULL-pointer-offset to
> > that function).
>
> Yes, looks like the bug was introduced by d0929553 ("infiniband: convert
> nes driver to net_device_ops"). And unfortunately the nesvnic=NULL
> initialization stopped gcc from warning about used-uninitialized I
> guess. I'll test the final merge out...

Sorry about that, thanks for working this out Roland.

2009-03-27 19:16:40

[permalink] [raw]

Subject: [PATCH] RDMA/nes: Fix mis-merge

When net-next and infiniband were merged upstream, each branch deleted
one of a pair of adjacent lines from nes_nic.c, but when Linus fixed the
conflict up, he brought back both of the lines. Fix up to the intended
final tree state.

Acked-by: David S. Miller <[email protected]>
Signed-off-by: Roland Dreier <[email protected]>
---
Resending because this seems to have gotten dropped (probably because I
forgot my s-o-b the first time around); in the meantime I have tested
the iw_nes driver with this patch applied and it works (at least enough
to run some light traffic)

drivers/infiniband/hw/nes/nes_nic.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
index 8d3e4c6..ecb1f6f 100644
--- a/drivers/infiniband/hw/nes/nes_nic.c
+++ b/drivers/infiniband/hw/nes/nes_nic.c
@@ -1602,8 +1602,6 @@ struct net_device *nes_netdev_init(struct nes_device *nesdev,
netif_napi_add(netdev, &nesvnic->napi, nes_netdev_poll, 128);
nes_debug(NES_DBG_INIT, "Enabling VLAN Insert/Delete.\n");
netdev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
- netdev->vlan_rx_register = nes_netdev_vlan_rx_register;
- netdev->features |= NETIF_F_LLTX;

/* Fill in the port structure */
nesvnic->netdev = netdev;

2009-03-27 21:44:36

[permalink] [raw]

Subject: Re: [PATCH] RDMA/nes: Fix mis-merge

On Fri, 27 Mar 2009, Roland Dreier wrote:
>
> Resending because this seems to have gotten dropped (probably because I

Actually, it didn't get dropped - I just forgot to push out my tree after
the final fixes yesterday.

Linus

2009-03-27 22:16:18