target/linux/generic/patches-4.1/645-bridge_multicast_to_unicast.patch

   1 --- a/include/linux/if_bridge.h
   2 +++ b/include/linux/if_bridge.h
   3 @@ -46,6 +46,7 @@ struct br_ip_list {
   4  #define BR_LEARNING_SYNC       BIT(9)
   5  #define BR_PROXYARP_WIFI       BIT(10)
   6  #define BR_ISOLATE_MODE        BIT(11)
   7 +#define BR_MULTICAST_TO_UCAST  BIT(12)
   8
   9  extern void brioctl_set(int (*ioctl_hook)(struct net *, unsigned int, void __user *));
  10
  11 --- a/net/bridge/br_multicast.c
  12 +++ b/net/bridge/br_multicast.c
  13 @@ -635,7 +635,8 @@ struct net_bridge_port_group *br_multica
  14                         struct net_bridge_port *port,
  15                         struct br_ip *group,
  16                         struct net_bridge_port_group __rcu *next,
  17 -                       unsigned char state)
  18 +                       unsigned char state,
  19 +                       const unsigned char *src)
  20  {
  21         struct net_bridge_port_group *p;
  22
  23 @@ -650,12 +651,33 @@ struct net_bridge_port_group *br_multica
  24         hlist_add_head(&p->mglist, &port->mglist);
  25         setup_timer(&p->timer, br_multicast_port_group_expired,
  26                     (unsigned long)p);
  27 +       if ((port->flags & BR_MULTICAST_TO_UCAST) && src) {
  28 +               memcpy(p->eth_addr, src, ETH_ALEN);
  29 +               p->unicast = true;
  30 +       }
  31         return p;
  32  }
  33
  34 +static bool br_port_group_equal(struct net_bridge_port_group *p,
  35 +                               struct net_bridge_port *port,
  36 +                               const unsigned char *src)
  37 +{
  38 +       if (p->port != port)
  39 +               return false;
  40 +
  41 +       if (!p->unicast)
  42 +               return true;
  43 +
  44 +       if (!src)
  45 +               return false;
  46 +
  47 +       return ether_addr_equal(src, p->eth_addr);
  48 +}
  49 +
  50  static int br_multicast_add_group(struct net_bridge *br,
  51                                   struct net_bridge_port *port,
  52 -                                 struct br_ip *group)
  53 +                                 struct br_ip *group,
  54 +                                 const unsigned char *src)
  55  {
  56         struct net_bridge_mdb_entry *mp;
  57         struct net_bridge_port_group *p;
  58 @@ -682,13 +704,13 @@ static int br_multicast_add_group(struct
  59         for (pp = &mp->ports;
  60              (p = mlock_dereference(*pp, br)) != NULL;
  61              pp = &p->next) {
  62 -               if (p->port == port)
  63 +               if (br_port_group_equal(p, port, src))
  64                         goto found;
  65                 if ((unsigned long)p->port < (unsigned long)port)
  66                         break;
  67         }
  68
  69 -       p = br_multicast_new_port_group(port, group, *pp, MDB_TEMPORARY);
  70 +       p = br_multicast_new_port_group(port, group, *pp, MDB_TEMPORARY, src);
  71         if (unlikely(!p))
  72                 goto err;
  73         rcu_assign_pointer(*pp, p);
  74 @@ -707,7 +729,7 @@ err:
  75  static int br_ip4_multicast_add_group(struct net_bridge *br,
  76                                       struct net_bridge_port *port,
  77                                       __be32 group,
  78 -                                     __u16 vid)
  79 +                                     __u16 vid, const unsigned char *src)
  80  {
  81         struct br_ip br_group;
  82
  83 @@ -718,14 +740,14 @@ static int br_ip4_multicast_add_group(st
  84         br_group.proto = htons(ETH_P_IP);
  85         br_group.vid = vid;
  86
  87 -       return br_multicast_add_group(br, port, &br_group);
  88 +       return br_multicast_add_group(br, port, &br_group, src);
  89  }
  90
  91  #if IS_ENABLED(CONFIG_IPV6)
  92  static int br_ip6_multicast_add_group(struct net_bridge *br,
  93                                       struct net_bridge_port *port,
  94                                       const struct in6_addr *group,
  95 -                                     __u16 vid)
  96 +                                     __u16 vid, const unsigned char *src)
  97  {
  98         struct br_ip br_group;
  99
 100 @@ -736,7 +758,10 @@ static int br_ip6_multicast_add_group(st
 101         br_group.proto = htons(ETH_P_IPV6);
 102         br_group.vid = vid;
 103
 104 -       return br_multicast_add_group(br, port, &br_group);
 105 +       if (ipv6_addr_is_solict_mult(group))
 106 +               src = NULL;
 107 +
 108 +       return br_multicast_add_group(br, port, &br_group, src);
 109  }
 110  #endif
 111
 112 @@ -966,6 +991,7 @@ static int br_ip4_multicast_igmp3_report
 113                                          struct sk_buff *skb,
 114                                          u16 vid)
 115  {
 116 +       const unsigned char *src = eth_hdr(skb)->h_source;
 117         struct igmpv3_report *ih;
 118         struct igmpv3_grec *grec;
 119         int i;
 120 @@ -1009,7 +1035,7 @@ static int br_ip4_multicast_igmp3_report
 121                         continue;
 122                 }
 123
 124 -               err = br_ip4_multicast_add_group(br, port, group, vid);
 125 +               err = br_ip4_multicast_add_group(br, port, group, vid, src);
 126                 if (err)
 127                         break;
 128         }
 129 @@ -1023,6 +1049,7 @@ static int br_ip6_multicast_mld2_report(
 130                                         struct sk_buff *skb,
 131                                         u16 vid)
 132  {
 133 +       const unsigned char *src = eth_hdr(skb)->h_source;
 134         struct icmp6hdr *icmp6h;
 135         struct mld2_grec *grec;
 136         int i;
 137 @@ -1071,7 +1098,7 @@ static int br_ip6_multicast_mld2_report(
 138                 }
 139
 140                 err = br_ip6_multicast_add_group(br, port, &grec->grec_mca,
 141 -                                                vid);
 142 +                                                vid, src);
 143                 if (err)
 144                         break;
 145         }
 146 @@ -1407,7 +1434,8 @@ br_multicast_leave_group(struct net_brid
 147                          struct net_bridge_port *port,
 148                          struct br_ip *group,
 149                          struct bridge_mcast_other_query *other_query,
 150 -                        struct bridge_mcast_own_query *own_query)
 151 +                        struct bridge_mcast_own_query *own_query,
 152 +                        const unsigned char *src)
 153  {
 154         struct net_bridge_mdb_htable *mdb;
 155         struct net_bridge_mdb_entry *mp;
 156 @@ -1457,7 +1485,7 @@ br_multicast_leave_group(struct net_brid
 157                 for (pp = &mp->ports;
 158                      (p = mlock_dereference(*pp, br)) != NULL;
 159                      pp = &p->next) {
 160 -                       if (p->port != port)
 161 +                       if (!br_port_group_equal(p, port, src))
 162                                 continue;
 163
 164                         rcu_assign_pointer(*pp, p->next);
 165 @@ -1491,7 +1519,7 @@ br_multicast_leave_group(struct net_brid
 166         for (p = mlock_dereference(mp->ports, br);
 167              p != NULL;
 168              p = mlock_dereference(p->next, br)) {
 169 -               if (p->port != port)
 170 +               if (!br_port_group_equal(p, port, src))
 171                         continue;
 172
 173                 if (!hlist_unhashed(&p->mglist) &&
 174 @@ -1509,8 +1537,8 @@ out:
 175
 176  static void br_ip4_multicast_leave_group(struct net_bridge *br,
 177                                          struct net_bridge_port *port,
 178 -                                        __be32 group,
 179 -                                        __u16 vid)
 180 +                                        __be32 group, __u16 vid,
 181 +                                        const unsigned char *src)
 182  {
 183         struct br_ip br_group;
 184         struct bridge_mcast_own_query *own_query;
 185 @@ -1525,14 +1553,14 @@ static void br_ip4_multicast_leave_group
 186         br_group.vid = vid;
 187
 188         br_multicast_leave_group(br, port, &br_group, &br->ip4_other_query,
 189 -                                own_query);
 190 +                                own_query, src);
 191  }
 192
 193  #if IS_ENABLED(CONFIG_IPV6)
 194  static void br_ip6_multicast_leave_group(struct net_bridge *br,
 195                                          struct net_bridge_port *port,
 196                                          const struct in6_addr *group,
 197 -                                        __u16 vid)
 198 +                                        __u16 vid, const unsigned char *src)
 199  {
 200         struct br_ip br_group;
 201         struct bridge_mcast_own_query *own_query;
 202 @@ -1547,7 +1575,7 @@ static void br_ip6_multicast_leave_group
 203         br_group.vid = vid;
 204
 205         br_multicast_leave_group(br, port, &br_group, &br->ip6_other_query,
 206 -                                own_query);
 207 +                                own_query, src);
 208  }
 209  #endif
 210
 211 @@ -1556,6 +1584,7 @@ static int br_multicast_ipv4_rcv(struct
 212                                  struct sk_buff *skb,
 213                                  u16 vid)
 214  {
 215 +       const unsigned char *src = eth_hdr(skb)->h_source;
 216         struct sk_buff *skb2 = skb;
 217         const struct iphdr *iph;
 218         struct igmphdr *ih;
 219 @@ -1629,7 +1658,7 @@ static int br_multicast_ipv4_rcv(struct
 220         case IGMP_HOST_MEMBERSHIP_REPORT:
 221         case IGMPV2_HOST_MEMBERSHIP_REPORT:
 222                 BR_INPUT_SKB_CB(skb)->mrouters_only = 1;
 223 -               err = br_ip4_multicast_add_group(br, port, ih->group, vid);
 224 +               err = br_ip4_multicast_add_group(br, port, ih->group, vid, src);
 225                 break;
 226         case IGMPV3_HOST_MEMBERSHIP_REPORT:
 227                 err = br_ip4_multicast_igmp3_report(br, port, skb2, vid);
 228 @@ -1638,7 +1667,7 @@ static int br_multicast_ipv4_rcv(struct
 229                 err = br_ip4_multicast_query(br, port, skb2, vid);
 230                 break;
 231         case IGMP_HOST_LEAVE_MESSAGE:
 232 -               br_ip4_multicast_leave_group(br, port, ih->group, vid);
 233 +               br_ip4_multicast_leave_group(br, port, ih->group, vid, src);
 234                 break;
 235         }
 236
 237 @@ -1656,6 +1685,7 @@ static int br_multicast_ipv6_rcv(struct
 238                                  struct sk_buff *skb,
 239                                  u16 vid)
 240  {
 241 +       const unsigned char *src = eth_hdr(skb)->h_source;
 242         struct sk_buff *skb2;
 243         const struct ipv6hdr *ip6h;
 244         u8 icmp6_type;
 245 @@ -1765,7 +1795,8 @@ static int br_multicast_ipv6_rcv(struct
 246                 }
 247                 mld = (struct mld_msg *)skb_transport_header(skb2);
 248                 BR_INPUT_SKB_CB(skb)->mrouters_only = 1;
 249 -               err = br_ip6_multicast_add_group(br, port, &mld->mld_mca, vid);
 250 +               err = br_ip6_multicast_add_group(br, port, &mld->mld_mca, vid,
 251 +                                                src);
 252                 break;
 253             }
 254         case ICMPV6_MLD2_REPORT:
 255 @@ -1782,7 +1813,7 @@ static int br_multicast_ipv6_rcv(struct
 256                         goto out;
 257                 }
 258                 mld = (struct mld_msg *)skb_transport_header(skb2);
 259 -               br_ip6_multicast_leave_group(br, port, &mld->mld_mca, vid);
 260 +               br_ip6_multicast_leave_group(br, port, &mld->mld_mca, vid, src);
 261             }
 262         }
 263
 264 --- a/net/bridge/br_private.h
 265 +++ b/net/bridge/br_private.h
 266 @@ -113,6 +113,9 @@ struct net_bridge_port_group {
 267         struct timer_list               timer;
 268         struct br_ip                    addr;
 269         unsigned char                   state;
 270 +
 271 +       unsigned char                   eth_addr[ETH_ALEN];
 272 +       bool                            unicast;
 273  };
 274
 275  struct net_bridge_mdb_entry
 276 @@ -481,7 +484,8 @@ void br_multicast_free_pg(struct rcu_hea
 277  struct net_bridge_port_group *
 278  br_multicast_new_port_group(struct net_bridge_port *port, struct br_ip *group,
 279                             struct net_bridge_port_group __rcu *next,
 280 -                           unsigned char state);
 281 +                           unsigned char state,
 282 +                      const unsigned char *src);
 283  void br_mdb_init(void);
 284  void br_mdb_uninit(void);
 285  void br_mdb_notify(struct net_device *dev, struct net_bridge_port *port,
 286 --- a/net/bridge/br_mdb.c
 287 +++ b/net/bridge/br_mdb.c
 288 @@ -343,7 +343,7 @@ static int br_mdb_add_group(struct net_b
 289                         break;
 290         }
 291
 292 -       p = br_multicast_new_port_group(port, group, *pp, state);
 293 +       p = br_multicast_new_port_group(port, group, *pp, state, NULL);
 294         if (unlikely(!p))
 295                 return -ENOMEM;
 296         rcu_assign_pointer(*pp, p);
 297 --- a/net/bridge/br_forward.c
 298 +++ b/net/bridge/br_forward.c
 299 @@ -169,6 +169,29 @@ out:
 300         return p;
 301  }
 302
 303 +static struct net_bridge_port *maybe_deliver_addr(
 304 +       struct net_bridge_port *prev, struct net_bridge_port *p,
 305 +       struct sk_buff *skb, const unsigned char *addr,
 306 +       void (*__packet_hook)(const struct net_bridge_port *p,
 307 +                             struct sk_buff *skb))
 308 +{
 309 +       struct net_device *dev = BR_INPUT_SKB_CB(skb)->brdev;
 310 +
 311 +       if (!should_deliver(p, skb))
 312 +               return prev;
 313 +
 314 +       skb = skb_copy(skb, GFP_ATOMIC);
 315 +       if (!skb) {
 316 +               dev->stats.tx_dropped++;
 317 +               return prev;
 318 +       }
 319 +
 320 +       memcpy(eth_hdr(skb)->h_dest, addr, ETH_ALEN);
 321 +       __packet_hook(p, skb);
 322 +
 323 +       return prev;
 324 +}
 325 +
 326  /* called under bridge lock */
 327  static void br_flood(struct net_bridge *br, struct sk_buff *skb,
 328                      struct sk_buff *skb0,
 329 @@ -241,6 +264,7 @@ static void br_multicast_flood(struct ne
 330         struct net_bridge_port *prev = NULL;
 331         struct net_bridge_port_group *p;
 332         struct hlist_node *rp;
 333 +       const unsigned char *addr;
 334
 335         rp = rcu_dereference(hlist_first_rcu(&br->router_list));
 336         p = mdst ? rcu_dereference(mdst->ports) : NULL;
 337 @@ -251,10 +275,19 @@ static void br_multicast_flood(struct ne
 338                 rport = rp ? hlist_entry(rp, struct net_bridge_port, rlist) :
 339                              NULL;
 340
 341 -               port = (unsigned long)lport > (unsigned long)rport ?
 342 -                      lport : rport;
 343 -
 344 -               prev = maybe_deliver(prev, port, skb, __packet_hook);
 345 +               if ((unsigned long)lport > (unsigned long)rport) {
 346 +                       port = lport;
 347 +                       addr = p->unicast ? p->eth_addr : NULL;
 348 +               } else {
 349 +                       port = rport;
 350 +                       addr = NULL;
 351 +               }
 352 +
 353 +               if (addr)
 354 +                       prev = maybe_deliver_addr(prev, port, skb, addr,
 355 +                                                 __packet_hook);
 356 +               else
 357 +                       prev = maybe_deliver(prev, port, skb, __packet_hook);
 358                 if (IS_ERR(prev))
 359                         goto out;
 360
 361 --- a/net/bridge/br_sysfs_if.c
 362 +++ b/net/bridge/br_sysfs_if.c
 363 @@ -204,6 +204,7 @@ static BRPORT_ATTR(multicast_router, S_I
 364                    store_multicast_router);
 365
 366  BRPORT_ATTR_FLAG(multicast_fast_leave, BR_MULTICAST_FAST_LEAVE);
 367 +BRPORT_ATTR_FLAG(multicast_to_unicast, BR_MULTICAST_TO_UCAST);
 368  #endif
 369
 370  static const struct brport_attribute *brport_attrs[] = {
 371 @@ -230,6 +231,7 @@ static const struct brport_attribute *br
 372  #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
 373         &brport_attr_multicast_router,
 374         &brport_attr_multicast_fast_leave,
 375 +       &brport_attr_multicast_to_unicast,
 376  #endif
 377         &brport_attr_proxyarp,
 378         &brport_attr_proxyarp_wifi,