Message ID | alpine.DEB.2.00.1008270827280.11792@router.home |
---|---|
State | Not Applicable, archived |
Delegated to: | David Miller |
Headers | show |
Christoph Lameter wrote: > Here is the patch somewhat cleaned up with PACKET_BROADCAST. > Subject: [IPoIB] Identify multicast packets and fix IGMP breakage V3 > I don't see this patch in Roland's for-next branch nor Dave's net-next-2.6 tree, is anything else needed to merge that? Or. > IGMP processing is broken because the IPOIB does not set the > skb->pkt_type the right way for Multicast traffic. All incoming > packets are set to PACKET_HOST which means that the igmp_recv() > function will ignore the IGMP broadcasts/multicasts. > > This in turn means that the IGMP timers are firing and are sending > information about multicast subscriptions unnecessarily. In a large > private network this can cause traffic spikes. > > Signed-off-by: Christoph Lameter <cl@linux.com> > > --- > > Index: linux-2.6/drivers/infiniband/ulp/ipoib/ipoib_ib.c > =================================================================== > --- linux-2.6.orig/drivers/infiniband/ulp/ipoib/ipoib_ib.c 2010-08-26 18:24:07.842079559 -0500 > +++ linux-2.6/drivers/infiniband/ulp/ipoib/ipoib_ib.c 2010-08-27 08:26:37.929641162 -0500 > @@ -223,6 +223,7 @@ > unsigned int wr_id = wc->wr_id & ~IPOIB_OP_RECV; > struct sk_buff *skb; > u64 mapping[IPOIB_UD_RX_SG]; > + union ib_gid *dgid; > > ipoib_dbg_data(priv, "recv completion: id %d, status: %d\n", > wr_id, wc->status); > @@ -271,6 +272,21 @@ > ipoib_ud_dma_unmap_rx(priv, mapping); > ipoib_ud_skb_put_frags(priv, skb, wc->byte_len); > > + /* First byte of dgid signals multicast when 0xff */ > + dgid = &((struct ib_grh *)skb->data)->dgid; > + > + if (!(wc->wc_flags & IB_WC_GRH) || dgid->raw[0] != 0xff) > + > + skb->pkt_type = PACKET_HOST; > + > + else if (memcmp(dgid, dev->broadcast + 4, sizeof(union ib_gid)) == 0) > + > + skb->pkt_type = PACKET_BROADCAST; > + > + else > + > + skb->pkt_type = PACKET_MULTICAST; > + > skb_pull(skb, IB_GRH_BYTES); > > skb->protocol = ((struct ipoib_header *) skb->data)->proto; > @@ -281,9 +297,6 @@ > dev->stats.rx_bytes += skb->len; > > skb->dev = dev; > - /* XXX get correct PACKET_ type here */ > - skb->pkt_type = PACKET_HOST; > - > if (test_bit(IPOIB_FLAG_CSUM, &priv->flags) && likely(wc->csum_ok)) > skb->ip_summed = CHECKSUM_UNNECESSARY; > > -- 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
On Tue, 14 Sep 2010, Or Gerlitz wrote: > I don't see this patch in Roland's for-next branch nor Dave's net-next-2.6 > tree, is anything else needed to merge that? No there is nothing else needed. Roland said he is going to merge it for 2.6.37. -- 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
thanks, applied. -- 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
Index: linux-2.6/drivers/infiniband/ulp/ipoib/ipoib_ib.c =================================================================== --- linux-2.6.orig/drivers/infiniband/ulp/ipoib/ipoib_ib.c 2010-08-26 18:24:07.842079559 -0500 +++ linux-2.6/drivers/infiniband/ulp/ipoib/ipoib_ib.c 2010-08-27 08:26:37.929641162 -0500 @@ -223,6 +223,7 @@ unsigned int wr_id = wc->wr_id & ~IPOIB_OP_RECV; struct sk_buff *skb; u64 mapping[IPOIB_UD_RX_SG]; + union ib_gid *dgid; ipoib_dbg_data(priv, "recv completion: id %d, status: %d\n", wr_id, wc->status); @@ -271,6 +272,21 @@ ipoib_ud_dma_unmap_rx(priv, mapping); ipoib_ud_skb_put_frags(priv, skb, wc->byte_len); + /* First byte of dgid signals multicast when 0xff */ + dgid = &((struct ib_grh *)skb->data)->dgid; + + if (!(wc->wc_flags & IB_WC_GRH) || dgid->raw[0] != 0xff) + + skb->pkt_type = PACKET_HOST; + + else if (memcmp(dgid, dev->broadcast + 4, sizeof(union ib_gid)) == 0) + + skb->pkt_type = PACKET_BROADCAST; + + else + + skb->pkt_type = PACKET_MULTICAST; + skb_pull(skb, IB_GRH_BYTES); skb->protocol = ((struct ipoib_header *) skb->data)->proto; @@ -281,9 +297,6 @@ dev->stats.rx_bytes += skb->len; skb->dev = dev; - /* XXX get correct PACKET_ type here */ - skb->pkt_type = PACKET_HOST; - if (test_bit(IPOIB_FLAG_CSUM, &priv->flags) && likely(wc->csum_ok)) skb->ip_summed = CHECKSUM_UNNECESSARY;