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

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