Doug Ledford <dledf...@redhat.com> wrote:
> If you have a patched up dhcp server (and dhclient),

Could you be more specific, I assume you refer to the ISC dhcp bits,
which version and which patches? AFAIK they don't give you access to
their source repo but rather only to drops plus possibly patches which
is a bit more tedious to follow, oh wel...

> they will use AF_PACKET/SOCK_DGRAM pair to send dhcp packets over IPoIB.


> This has worked since forever if you use OFED kernels or one of the 
> distribution
> kernels.  However, when testing an upstream kernel, it has been broken
> for a very long time (I tested 2.6.34, 2.6.38, 3.0, 3.1, 3.8, HEAD).

IMO doesn't seem relevant to the upstream commit message

> It turns out that the hard_header routine in ipoib is not following
> the API and is returning 0 even when it pushed data onto the skb.  This
> then causes af_packet.c to overwrite the header just pushed with data
> from user space.  This header is immediately referenced in the
> ipoib_start_xmit routine

cool, I assume we want this fix to go for -stable after spending some
time upstream, e.g probably by the time 3.9 is released and some more
testing is done on the patch (I'll advocate for that @ MLNX, copied
some folks now) get that to -stable too.

Erez, in the code we use internally which is based on upstream 3.7 do
we have DHCP/IPoIB working without this patch?

> so I'm wondering how this ever worked in
> distro/ofed kernels that also have this bug, but fixing the bug here
> makes things work in upstream kernels.

same for the last three lines


Signed-off-by: Doug Ledford <dledf...@redhat.com>
---
 drivers/infiniband/ulp/ipoib/
ipoib_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c
b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index 8534afd..31dd2a7 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -828,7 +828,7 @@ static int ipoib_hard_header(struct sk_buff *skb,
         */
        memcpy(cb->hwaddr, daddr, INFINIBAND_ALEN);

-       return 0;
+       return sizeof *header;
 }

 static void ipoib_set_mcast_list(struct net_device *dev)
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to