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

   1 --- a/net/bridge/br_multicast.c
   2 +++ b/net/bridge/br_multicast.c
   3 @@ -634,7 +634,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 @@ -649,12 +650,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 @@ -681,13 +703,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 @@ -706,7 +728,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 @@ -717,14 +739,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 @@ -735,7 +757,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 @@ -950,6 +975,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 @@ -993,7 +1019,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 @@ -1007,6 +1033,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 @@ -1055,7 +1082,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 @@ -1319,7 +1346,8 @@ static void br_multicast_leave_group(str
 137                                      struct net_bridge_port *port,
 138                                      struct br_ip *group,
 139                                      struct bridge_mcast_querier *querier,
 140 -                                    struct bridge_mcast_query *query)
 141 +                                    struct bridge_mcast_query *query,
 142 +                                    const unsigned char *src)
 143  {
 144         struct net_bridge_mdb_htable *mdb;
 145         struct net_bridge_mdb_entry *mp;
 146 @@ -1369,7 +1397,7 @@ static void br_multicast_leave_group(str
 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 @@ -1403,7 +1431,7 @@ static void br_multicast_leave_group(str
 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 @@ -1421,8 +1449,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_query *query = port ? &port->ip4_query :
 175 @@ -1435,14 +1463,15 @@ static void br_ip4_multicast_leave_group
 176         br_group.proto = htons(ETH_P_IP);
 177         br_group.vid = vid;
 178
 179 -       br_multicast_leave_group(br, port, &br_group, &br->ip4_querier, query);
 180 +       br_multicast_leave_group(br, port, &br_group, &br->ip4_querier, query,
 181 +                                src);
 182  }
 183
 184  #if IS_ENABLED(CONFIG_IPV6)
 185  static void br_ip6_multicast_leave_group(struct net_bridge *br,
 186                                          struct net_bridge_port *port,
 187                                          const struct in6_addr *group,
 188 -                                        __u16 vid)
 189 +                                        __u16 vid, const unsigned char *src)
 190  {
 191         struct br_ip br_group;
 192         struct bridge_mcast_query *query = port ? &port->ip6_query :
 193 @@ -1456,7 +1485,8 @@ static void br_ip6_multicast_leave_group
 194         br_group.proto = htons(ETH_P_IPV6);
 195         br_group.vid = vid;
 196
 197 -       br_multicast_leave_group(br, port, &br_group, &br->ip6_querier, query);
 198 +       br_multicast_leave_group(br, port, &br_group, &br->ip6_querier, query,
 199 +                                src);
 200  }
 201  #endif
 202
 203 @@ -1465,6 +1495,7 @@ static int br_multicast_ipv4_rcv(struct
 204                                  struct sk_buff *skb,
 205                                  u16 vid)
 206  {
 207 +       const unsigned char *src = eth_hdr(skb)->h_source;
 208         struct sk_buff *skb2 = skb;
 209         const struct iphdr *iph;
 210         struct igmphdr *ih;
 211 @@ -1538,7 +1569,7 @@ static int br_multicast_ipv4_rcv(struct
 212         case IGMP_HOST_MEMBERSHIP_REPORT:
 213         case IGMPV2_HOST_MEMBERSHIP_REPORT:
 214                 BR_INPUT_SKB_CB(skb)->mrouters_only = 1;
 215 -               err = br_ip4_multicast_add_group(br, port, ih->group, vid);
 216 +               err = br_ip4_multicast_add_group(br, port, ih->group, vid, src);
 217                 break;
 218         case IGMPV3_HOST_MEMBERSHIP_REPORT:
 219                 err = br_ip4_multicast_igmp3_report(br, port, skb2, vid);
 220 @@ -1547,7 +1578,7 @@ static int br_multicast_ipv4_rcv(struct
 221                 err = br_ip4_multicast_query(br, port, skb2, vid);
 222                 break;
 223         case IGMP_HOST_LEAVE_MESSAGE:
 224 -               br_ip4_multicast_leave_group(br, port, ih->group, vid);
 225 +               br_ip4_multicast_leave_group(br, port, ih->group, vid, src);
 226                 break;
 227         }
 228
 229 @@ -1565,6 +1596,7 @@ static int br_multicast_ipv6_rcv(struct
 230                                  struct sk_buff *skb,
 231                                  u16 vid)
 232  {
 233 +       const unsigned char *src = eth_hdr(skb)->h_source;
 234         struct sk_buff *skb2;
 235         const struct ipv6hdr *ip6h;
 236         u8 icmp6_type;
 237 @@ -1674,7 +1706,8 @@ static int br_multicast_ipv6_rcv(struct
 238                 }
 239                 mld = (struct mld_msg *)skb_transport_header(skb2);
 240                 BR_INPUT_SKB_CB(skb)->mrouters_only = 1;
 241 -               err = br_ip6_multicast_add_group(br, port, &mld->mld_mca, vid);
 242 +               err = br_ip6_multicast_add_group(br, port, &mld->mld_mca, vid,
 243 +                                                src);
 244                 break;
 245             }
 246         case ICMPV6_MLD2_REPORT:
 247 @@ -1691,7 +1724,7 @@ static int br_multicast_ipv6_rcv(struct
 248                         goto out;
 249                 }
 250                 mld = (struct mld_msg *)skb_transport_header(skb2);
 251 -               br_ip6_multicast_leave_group(br, port, &mld->mld_mca, vid);
 252 +               br_ip6_multicast_leave_group(br, port, &mld->mld_mca, vid, src);
 253             }
 254         }
 255
 256 --- a/net/bridge/br_private.h
 257 +++ b/net/bridge/br_private.h
 258 @@ -116,6 +116,9 @@ struct net_bridge_port_group {
 259         struct timer_list               timer;
 260         struct br_ip                    addr;
 261         unsigned char                   state;
 262 +
 263 +       unsigned char                   eth_addr[ETH_ALEN];
 264 +       bool                            unicast;
 265  };
 266
 267  struct net_bridge_mdb_entry
 268 @@ -175,6 +178,7 @@ struct net_bridge_port
 269  #define BR_LEARNING            0x00000020
 270  #define BR_FLOOD               0x00000040
 271  #define BR_ISOLATE_MODE        0x00000080
 272 +#define BR_MULTICAST_TO_UCAST  0x00000100
 273
 274  #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
 275         struct bridge_mcast_query       ip4_query;
 276 @@ -471,7 +475,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 @@ -342,7 +342,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 @@ -170,6 +170,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 @@ -234,6 +257,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 @@ -244,10 +268,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 @@ -192,6 +192,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 @@ -218,6 +219,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_isolate_mode,
 378         NULL