| Message ID | 1427409698.18540.11.camel@redhat.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
On Thu, 26 Mar 2015 17:41:38 -0500, Dan Williams wrote: > The broadcast MAC is supposed to be allowed whenever the device > has an IPv4 address, otherwise ARP requests get dropped on the > floor. If ndo_set_rx_mode (and thus > ipvlan_set_multicast_mac_filter()) gets called after the address > was added, it blows away the broadcast MAC address in > mac_filters that was added at IPv4 address addition. Fix that. > > Signed-off-by: Dan Williams <dcbw@redhat.com> > --- > drivers/net/ipvlan/ipvlan_main.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/net/ipvlan/ipvlan_main.c b/drivers/net/ipvlan/ipvlan_main.c > index 4f4099d..d34f580 100644 > --- a/drivers/net/ipvlan/ipvlan_main.c > +++ b/drivers/net/ipvlan/ipvlan_main.c > @@ -241,6 +241,9 @@ static void ipvlan_set_multicast_mac_filter(struct net_device *dev) > > bitmap_copy(ipvlan->mac_filters, mc_filters, > IPVLAN_MAC_FILTER_SIZE); > + > + if (ipvlan->ipv4cnt) > + ipvlan_set_broadcast_mac_filter(ipvlan, true); It would be probably better to set the bit in mc_filters before copying over to ipvlan->mac_filters. But it's not a big deal as bitmap_copy is not atomic and it is changed by the second patch anyway. I see not much value in having the two patches separate and would squash them but it's not a big deal, either. Reviewed-by: Jiri Benc <jbenc@redhat.com>
On Thu, Mar 26, 2015 at 3:41 PM, Dan Williams <dcbw@redhat.com> wrote: > The broadcast MAC is supposed to be allowed whenever the device > has an IPv4 address, otherwise ARP requests get dropped on the > floor. If ndo_set_rx_mode (and thus > ipvlan_set_multicast_mac_filter()) gets called after the address > was added, it blows away the broadcast MAC address in > mac_filters that was added at IPv4 address addition. Fix that. > > Signed-off-by: Dan Williams <dcbw@redhat.com> Acked-by: Mahesh Bandewar <maheshb@google.com> > --- > drivers/net/ipvlan/ipvlan_main.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/net/ipvlan/ipvlan_main.c b/drivers/net/ipvlan/ipvlan_main.c > index 4f4099d..d34f580 100644 > --- a/drivers/net/ipvlan/ipvlan_main.c > +++ b/drivers/net/ipvlan/ipvlan_main.c > @@ -241,6 +241,9 @@ static void ipvlan_set_multicast_mac_filter(struct net_device *dev) > > bitmap_copy(ipvlan->mac_filters, mc_filters, > IPVLAN_MAC_FILTER_SIZE); > + > + if (ipvlan->ipv4cnt) > + ipvlan_set_broadcast_mac_filter(ipvlan, true); > } > dev_uc_sync(ipvlan->phy_dev, dev); > dev_mc_sync(ipvlan->phy_dev, dev); > -- > 2.1.0 > > -- 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 Mon, 2015-03-30 at 13:28 -0700, Mahesh Bandewar wrote: > On Thu, Mar 26, 2015 at 3:41 PM, Dan Williams <dcbw@redhat.com> wrote: > > The broadcast MAC is supposed to be allowed whenever the device > > has an IPv4 address, otherwise ARP requests get dropped on the > > floor. If ndo_set_rx_mode (and thus > > ipvlan_set_multicast_mac_filter()) gets called after the address > > was added, it blows away the broadcast MAC address in > > mac_filters that was added at IPv4 address addition. Fix that. > > > > Signed-off-by: Dan Williams <dcbw@redhat.com> > Acked-by: Mahesh Bandewar <maheshb@google.com> I'm actually going to send another patch that supercedes this one and handles the DHCP issue in a slightly different way. Dan > > --- > > drivers/net/ipvlan/ipvlan_main.c | 3 +++ > > 1 file changed, 3 insertions(+) > > > > diff --git a/drivers/net/ipvlan/ipvlan_main.c b/drivers/net/ipvlan/ipvlan_main.c > > index 4f4099d..d34f580 100644 > > --- a/drivers/net/ipvlan/ipvlan_main.c > > +++ b/drivers/net/ipvlan/ipvlan_main.c > > @@ -241,6 +241,9 @@ static void ipvlan_set_multicast_mac_filter(struct net_device *dev) > > > > bitmap_copy(ipvlan->mac_filters, mc_filters, > > IPVLAN_MAC_FILTER_SIZE); > > + > > + if (ipvlan->ipv4cnt) > > + ipvlan_set_broadcast_mac_filter(ipvlan, true); > > } > > dev_uc_sync(ipvlan->phy_dev, dev); > > dev_mc_sync(ipvlan->phy_dev, dev); > > -- > > 2.1.0 > > > > > -- > 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 -- 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 Mon, Mar 30, 2015 at 2:01 PM, Dan Williams <dcbw@redhat.com> wrote: > On Mon, 2015-03-30 at 13:28 -0700, Mahesh Bandewar wrote: >> On Thu, Mar 26, 2015 at 3:41 PM, Dan Williams <dcbw@redhat.com> wrote: >> > The broadcast MAC is supposed to be allowed whenever the device >> > has an IPv4 address, otherwise ARP requests get dropped on the >> > floor. If ndo_set_rx_mode (and thus >> > ipvlan_set_multicast_mac_filter()) gets called after the address >> > was added, it blows away the broadcast MAC address in >> > mac_filters that was added at IPv4 address addition. Fix that. >> > >> > Signed-off-by: Dan Williams <dcbw@redhat.com> >> Acked-by: Mahesh Bandewar <maheshb@google.com> > > I'm actually going to send another patch that supercedes this one and > handles the DHCP issue in a slightly different way. > Sure, I'll take a look at that but irrespective of how DHCP is handled, this patch fixes the problem that you have described since ndo_set_rxmode will wipe the broadcast bit if set and will end up breaking the IPv4. So I feel that this is still required in some-form. > Dan > >> > --- >> > drivers/net/ipvlan/ipvlan_main.c | 3 +++ >> > 1 file changed, 3 insertions(+) >> > >> > diff --git a/drivers/net/ipvlan/ipvlan_main.c b/drivers/net/ipvlan/ipvlan_main.c >> > index 4f4099d..d34f580 100644 >> > --- a/drivers/net/ipvlan/ipvlan_main.c >> > +++ b/drivers/net/ipvlan/ipvlan_main.c >> > @@ -241,6 +241,9 @@ static void ipvlan_set_multicast_mac_filter(struct net_device *dev) >> > >> > bitmap_copy(ipvlan->mac_filters, mc_filters, >> > IPVLAN_MAC_FILTER_SIZE); >> > + >> > + if (ipvlan->ipv4cnt) >> > + ipvlan_set_broadcast_mac_filter(ipvlan, true); >> > } >> > dev_uc_sync(ipvlan->phy_dev, dev); >> > dev_mc_sync(ipvlan->phy_dev, dev); >> > -- >> > 2.1.0 >> > >> > >> -- >> 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 > > -- 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 Mon, 2015-03-30 at 14:11 -0700, Mahesh Bandewar wrote: > On Mon, Mar 30, 2015 at 2:01 PM, Dan Williams <dcbw@redhat.com> wrote: > > On Mon, 2015-03-30 at 13:28 -0700, Mahesh Bandewar wrote: > >> On Thu, Mar 26, 2015 at 3:41 PM, Dan Williams <dcbw@redhat.com> wrote: > >> > The broadcast MAC is supposed to be allowed whenever the device > >> > has an IPv4 address, otherwise ARP requests get dropped on the > >> > floor. If ndo_set_rx_mode (and thus > >> > ipvlan_set_multicast_mac_filter()) gets called after the address > >> > was added, it blows away the broadcast MAC address in > >> > mac_filters that was added at IPv4 address addition. Fix that. > >> > > >> > Signed-off-by: Dan Williams <dcbw@redhat.com> > >> Acked-by: Mahesh Bandewar <maheshb@google.com> > > > > I'm actually going to send another patch that supercedes this one and > > handles the DHCP issue in a slightly different way. > > > Sure, I'll take a look at that but irrespective of how DHCP is > handled, this patch fixes the problem that you have described since > ndo_set_rxmode will wipe the broadcast bit if set and will end up > breaking the IPv4. So I feel that this is still required in some-form. That's true, which is why I originally split the patches up. So I'm fine if this is applied. But the DHCP bits will change this part too. Dan > > Dan > > > >> > --- > >> > drivers/net/ipvlan/ipvlan_main.c | 3 +++ > >> > 1 file changed, 3 insertions(+) > >> > > >> > diff --git a/drivers/net/ipvlan/ipvlan_main.c b/drivers/net/ipvlan/ipvlan_main.c > >> > index 4f4099d..d34f580 100644 > >> > --- a/drivers/net/ipvlan/ipvlan_main.c > >> > +++ b/drivers/net/ipvlan/ipvlan_main.c > >> > @@ -241,6 +241,9 @@ static void ipvlan_set_multicast_mac_filter(struct net_device *dev) > >> > > >> > bitmap_copy(ipvlan->mac_filters, mc_filters, > >> > IPVLAN_MAC_FILTER_SIZE); > >> > + > >> > + if (ipvlan->ipv4cnt) > >> > + ipvlan_set_broadcast_mac_filter(ipvlan, true); > >> > } > >> > dev_uc_sync(ipvlan->phy_dev, dev); > >> > dev_mc_sync(ipvlan->phy_dev, dev); > >> > -- > >> > 2.1.0 > >> > > >> > > >> -- > >> 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 > > > > > -- > 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 -- 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
diff --git a/drivers/net/ipvlan/ipvlan_main.c b/drivers/net/ipvlan/ipvlan_main.c index 4f4099d..d34f580 100644 --- a/drivers/net/ipvlan/ipvlan_main.c +++ b/drivers/net/ipvlan/ipvlan_main.c @@ -241,6 +241,9 @@ static void ipvlan_set_multicast_mac_filter(struct net_device *dev) bitmap_copy(ipvlan->mac_filters, mc_filters, IPVLAN_MAC_FILTER_SIZE); + + if (ipvlan->ipv4cnt) + ipvlan_set_broadcast_mac_filter(ipvlan, true); } dev_uc_sync(ipvlan->phy_dev, dev); dev_mc_sync(ipvlan->phy_dev, dev);
The broadcast MAC is supposed to be allowed whenever the device has an IPv4 address, otherwise ARP requests get dropped on the floor. If ndo_set_rx_mode (and thus ipvlan_set_multicast_mac_filter()) gets called after the address was added, it blows away the broadcast MAC address in mac_filters that was added at IPv4 address addition. Fix that. Signed-off-by: Dan Williams <dcbw@redhat.com> --- drivers/net/ipvlan/ipvlan_main.c | 3 +++ 1 file changed, 3 insertions(+)