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

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