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,7 @@ 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 +       return br_multicast_add_group(br, port, &br_group, src);
 106  }
 107  #endif
 108
 109 @@ -966,6 +988,7 @@ static int br_ip4_multicast_igmp3_report
 110                                          struct sk_buff *skb,
 111                                          u16 vid)
 112  {
 113 +       const unsigned char *src = eth_hdr(skb)->h_source;
 114         struct igmpv3_report *ih;
 115         struct igmpv3_grec *grec;
 116         int i;
 117 @@ -1009,7 +1032,7 @@ static int br_ip4_multicast_igmp3_report
 118                         continue;
 119                 }
 120
 121 -               err = br_ip4_multicast_add_group(br, port, group, vid);
 122 +               err = br_ip4_multicast_add_group(br, port, group, vid, src);
 123                 if (err)
 124                         break;
 125         }
 126 @@ -1023,6 +1046,7 @@ static int br_ip6_multicast_mld2_report(
 127                                         struct sk_buff *skb,
 128                                         u16 vid)
 129  {
 130 +       const unsigned char *src = eth_hdr(skb)->h_source;
 131         struct icmp6hdr *icmp6h;
 132         struct mld2_grec *grec;
 133         int i;
 134 @@ -1071,7 +1095,7 @@ static int br_ip6_multicast_mld2_report(
 135                 }
 136
 137                 err = br_ip6_multicast_add_group(br, port, &grec->grec_mca,
 138 -                                                vid);
 139 +                                                vid, src);
 140                 if (err)
 141                         break;
 142         }
 143 @@ -1407,7 +1431,8 @@ br_multicast_leave_group(struct net_brid
 144                          struct net_bridge_port *port,
 145                          struct br_ip *group,
 146                          struct bridge_mcast_other_query *other_query,
 147 -                        struct bridge_mcast_own_query *own_query)
 148 +                        struct bridge_mcast_own_query *own_query,
 149 +                        const unsigned char *src)
 150  {
 151         struct net_bridge_mdb_htable *mdb;
 152         struct net_bridge_mdb_entry *mp;
 153 @@ -1457,7 +1482,7 @@ br_multicast_leave_group(struct net_brid
 154                 for (pp = &mp->ports;
 155                      (p = mlock_dereference(*pp, br)) != NULL;
 156                      pp = &p->next) {
 157 -                       if (p->port != port)
 158 +                       if (!br_port_group_equal(p, port, src))
 159                                 continue;
 160
 161                         rcu_assign_pointer(*pp, p->next);
 162 @@ -1491,7 +1516,7 @@ br_multicast_leave_group(struct net_brid
 163         for (p = mlock_dereference(mp->ports, br);
 164              p != NULL;
 165              p = mlock_dereference(p->next, br)) {
 166 -               if (p->port != port)
 167 +               if (!br_port_group_equal(p, port, src))
 168                         continue;
 169
 170                 if (!hlist_unhashed(&p->mglist) &&
 171 @@ -1509,8 +1534,8 @@ out:
 172
 173  static void br_ip4_multicast_leave_group(struct net_bridge *br,
 174                                          struct net_bridge_port *port,
 175 -                                        __be32 group,
 176 -                                        __u16 vid)
 177 +                                        __be32 group, __u16 vid,
 178 +                                        const unsigned char *src)
 179  {
 180         struct br_ip br_group;
 181         struct bridge_mcast_own_query *own_query;
 182 @@ -1525,14 +1550,14 @@ static void br_ip4_multicast_leave_group
 183         br_group.vid = vid;
 184
 185         br_multicast_leave_group(br, port, &br_group, &br->ip4_other_query,
 186 -                                own_query);
 187 +                                own_query, src);
 188  }
 189
 190  #if IS_ENABLED(CONFIG_IPV6)
 191  static void br_ip6_multicast_leave_group(struct net_bridge *br,
 192                                          struct net_bridge_port *port,
 193                                          const struct in6_addr *group,
 194 -                                        __u16 vid)
 195 +                                        __u16 vid, const unsigned char *src)
 196  {
 197         struct br_ip br_group;
 198         struct bridge_mcast_own_query *own_query;
 199 @@ -1547,7 +1572,7 @@ static void br_ip6_multicast_leave_group
 200         br_group.vid = vid;
 201
 202         br_multicast_leave_group(br, port, &br_group, &br->ip6_other_query,
 203 -                                own_query);
 204 +                                own_query, src);
 205  }
 206  #endif
 207
 208 @@ -1556,6 +1581,7 @@ static int br_multicast_ipv4_rcv(struct
 209                                  struct sk_buff *skb,
 210                                  u16 vid)
 211  {
 212 +       const unsigned char *src = eth_hdr(skb)->h_source;
 213         struct sk_buff *skb2 = skb;
 214         const struct iphdr *iph;
 215         struct igmphdr *ih;
 216 @@ -1629,7 +1655,7 @@ static int br_multicast_ipv4_rcv(struct
 217         case IGMP_HOST_MEMBERSHIP_REPORT:
 218         case IGMPV2_HOST_MEMBERSHIP_REPORT:
 219                 BR_INPUT_SKB_CB(skb)->mrouters_only = 1;
 220 -               err = br_ip4_multicast_add_group(br, port, ih->group, vid);
 221 +               err = br_ip4_multicast_add_group(br, port, ih->group, vid, src);
 222                 break;
 223         case IGMPV3_HOST_MEMBERSHIP_REPORT:
 224                 err = br_ip4_multicast_igmp3_report(br, port, skb2, vid);
 225 @@ -1638,7 +1664,7 @@ static int br_multicast_ipv4_rcv(struct
 226                 err = br_ip4_multicast_query(br, port, skb2, vid);
 227                 break;
 228         case IGMP_HOST_LEAVE_MESSAGE:
 229 -               br_ip4_multicast_leave_group(br, port, ih->group, vid);
 230 +               br_ip4_multicast_leave_group(br, port, ih->group, vid, src);
 231                 break;
 232         }
 233
 234 @@ -1656,6 +1682,7 @@ static int br_multicast_ipv6_rcv(struct
 235                                  struct sk_buff *skb,
 236                                  u16 vid)
 237  {
 238 +       const unsigned char *src = eth_hdr(skb)->h_source;
 239         struct sk_buff *skb2;
 240         const struct ipv6hdr *ip6h;
 241         u8 icmp6_type;
 242 @@ -1765,7 +1792,8 @@ static int br_multicast_ipv6_rcv(struct
 243                 }
 244                 mld = (struct mld_msg *)skb_transport_header(skb2);
 245                 BR_INPUT_SKB_CB(skb)->mrouters_only = 1;
 246 -               err = br_ip6_multicast_add_group(br, port, &mld->mld_mca, vid);
 247 +               err = br_ip6_multicast_add_group(br, port, &mld->mld_mca, vid,
 248 +                                                src);
 249                 break;
 250             }
 251         case ICMPV6_MLD2_REPORT:
 252 @@ -1782,7 +1810,7 @@ static int br_multicast_ipv6_rcv(struct
 253                         goto out;
 254                 }
 255                 mld = (struct mld_msg *)skb_transport_header(skb2);
 256 -               br_ip6_multicast_leave_group(br, port, &mld->mld_mca, vid);
 257 +               br_ip6_multicast_leave_group(br, port, &mld->mld_mca, vid, src);
 258             }
 259         }
 260
 261 --- a/net/bridge/br_private.h
 262 +++ b/net/bridge/br_private.h
 263 @@ -113,6 +113,9 @@ struct net_bridge_port_group {
 264         struct timer_list               timer;
 265         struct br_ip                    addr;
 266         unsigned char                   state;
 267 +
 268 +       unsigned char                   eth_addr[ETH_ALEN];
 269 +       bool                            unicast;
 270  };
 271
 272  struct net_bridge_mdb_entry
 273 @@ -481,7 +484,8 @@ void br_multicast_free_pg(struct rcu_hea
 274  struct net_bridge_port_group *
 275  br_multicast_new_port_group(struct net_bridge_port *port, struct br_ip *group,
 276                             struct net_bridge_port_group __rcu *next,
 277 -                           unsigned char state);
 278 +                           unsigned char state,
 279 +                      const unsigned char *src);
 280  void br_mdb_init(void);
 281  void br_mdb_uninit(void);
 282  void br_mdb_notify(struct net_device *dev, struct net_bridge_port *port,
 283 --- a/net/bridge/br_mdb.c
 284 +++ b/net/bridge/br_mdb.c
 285 @@ -343,7 +343,7 @@ static int br_mdb_add_group(struct net_b
 286                         break;
 287         }
 288
 289 -       p = br_multicast_new_port_group(port, group, *pp, state);
 290 +       p = br_multicast_new_port_group(port, group, *pp, state, NULL);
 291         if (unlikely(!p))
 292                 return -ENOMEM;
 293         rcu_assign_pointer(*pp, p);
 294 --- a/net/bridge/br_forward.c
 295 +++ b/net/bridge/br_forward.c
 296 @@ -169,6 +169,29 @@ out:
 297         return p;
 298  }
 299
 300 +static struct net_bridge_port *maybe_deliver_addr(
 301 +       struct net_bridge_port *prev, struct net_bridge_port *p,
 302 +       struct sk_buff *skb, const unsigned char *addr,
 303 +       void (*__packet_hook)(const struct net_bridge_port *p,
 304 +                             struct sk_buff *skb))
 305 +{
 306 +       struct net_device *dev = BR_INPUT_SKB_CB(skb)->brdev;
 307 +
 308 +       if (!should_deliver(p, skb))
 309 +               return prev;
 310 +
 311 +       skb = skb_copy(skb, GFP_ATOMIC);
 312 +       if (!skb) {
 313 +               dev->stats.tx_dropped++;
 314 +               return prev;
 315 +       }
 316 +
 317 +       memcpy(eth_hdr(skb)->h_dest, addr, ETH_ALEN);
 318 +       __packet_hook(p, skb);
 319 +
 320 +       return prev;
 321 +}
 322 +
 323  /* called under bridge lock */
 324  static void br_flood(struct net_bridge *br, struct sk_buff *skb,
 325                      struct sk_buff *skb0,
 326 @@ -241,6 +264,7 @@ static void br_multicast_flood(struct ne
 327         struct net_bridge_port *prev = NULL;
 328         struct net_bridge_port_group *p;
 329         struct hlist_node *rp;
 330 +       const unsigned char *addr;
 331
 332         rp = rcu_dereference(hlist_first_rcu(&br->router_list));
 333         p = mdst ? rcu_dereference(mdst->ports) : NULL;
 334 @@ -251,10 +275,19 @@ static void br_multicast_flood(struct ne
 335                 rport = rp ? hlist_entry(rp, struct net_bridge_port, rlist) :
 336                              NULL;
 337
 338 -               port = (unsigned long)lport > (unsigned long)rport ?
 339 -                      lport : rport;
 340 -
 341 -               prev = maybe_deliver(prev, port, skb, __packet_hook);
 342 +               if ((unsigned long)lport > (unsigned long)rport) {
 343 +                       port = lport;
 344 +                       addr = p->unicast ? p->eth_addr : NULL;
 345 +               } else {
 346 +                       port = rport;
 347 +                       addr = NULL;
 348 +               }
 349 +
 350 +               if (addr)
 351 +                       prev = maybe_deliver_addr(prev, port, skb, addr,
 352 +                                                 __packet_hook);
 353 +               else
 354 +                       prev = maybe_deliver(prev, port, skb, __packet_hook);
 355                 if (IS_ERR(prev))
 356                         goto out;
 357
 358 --- a/net/bridge/br_sysfs_if.c
 359 +++ b/net/bridge/br_sysfs_if.c
 360 @@ -204,6 +204,7 @@ static BRPORT_ATTR(multicast_router, S_I
 361                    store_multicast_router);
 362
 363  BRPORT_ATTR_FLAG(multicast_fast_leave, BR_MULTICAST_FAST_LEAVE);
 364 +BRPORT_ATTR_FLAG(multicast_to_unicast, BR_MULTICAST_TO_UCAST);
 365  #endif
 366
 367  static const struct brport_attribute *brport_attrs[] = {
 368 @@ -230,6 +231,7 @@ static const struct brport_attribute *br
 369  #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
 370         &brport_attr_multicast_router,
 371         &brport_attr_multicast_fast_leave,
 372 +       &brport_attr_multicast_to_unicast,
 373  #endif
 374         &brport_attr_proxyarp,
 375         &brport_attr_proxyarp_wifi,