net: bridge: update multicast stats from maybe_deliver()
Subsystems (3)
PATCH 1/1 net: bridge: update multicast stats from maybe_deliver()
Simplify this code by updating bridge multicast stats from maybe_deliver().
Note that commit 6db6f0eae605 ("bridge: multicast to unicast"), in case the port flag BR_MULTICAST_TO_UNICAST is set, never updates the previous port pointer, therefore it is always going to be different from the existing port in this deduplicated list iteration.
--- net/bridge/br_forward.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-)
net/bridge/br_forward.c +4 -11
@@ -173,6 +173,7 @@ static struct net_bridge_port *maybe_deliver( struct net_bridge_port *prev, struct net_bridge_port *p, struct sk_buff *skb, bool local_orig) { + u8 igmp_type = br_multicast_igmp_type(skb);int err;if (!should_deliver (p, skb))
@@ -184,8 +185,9 @@ static struct net_bridge_port *maybe_deliver( err =deliver_clone (prev, skb, local_orig);if (err)return ERR_PTR (err); - out: +br_multicast_count (p->br, p, skb, igmp_type,BR_MCAST_DIR_TX ); +return p; }
@@ -193,7 +195,6 @@ static struct net_bridge_port *maybe_deliver(void br_flood (struct net_bridge *br,struct sk_buff *skb,enum br_pkt_type pkt_type,bool local_rcv,bool local_orig) { -u8 igmp_type =br_multicast_igmp_type (skb);struct net_bridge_port *prev =NULL ;struct net_bridge_port *p;
@@ -226,9 +227,6 @@ void br_flood(struct net_bridge *br, struct sk_buff *skb, prev =maybe_deliver (prev, p, skb, local_orig);if (IS_ERR (prev)) goto out; -if (prev == p) -br_multicast_count (p->br, p, skb, igmp_type, -BR_MCAST_DIR_TX ); }if (!prev)
@@ -277,7 +275,6 @@ void br_multicast_flood(struct net_bridge_mdb_entry *mdst, bool local_rcv, bool local_orig) {struct net_device *dev =BR_INPUT_SKB_CB (skb)->brdev; -u8 igmp_type =br_multicast_igmp_type (skb);struct net_bridge *br =netdev_priv (dev);struct net_bridge_port *prev =NULL ;struct net_bridge_port_group *p;
@@ -304,13 +301,9 @@ void br_multicast_flood(struct net_bridge_mdb_entry *mdst, } prev =maybe_deliver (prev, port, skb, local_orig); -delivered:if (IS_ERR (prev)) goto out; -if (prev == port) -br_multicast_count (port->br, port, skb, igmp_type, -BR_MCAST_DIR_TX ); - +delivered:if ((unsigned long )lport >= (unsigned long )port) p =rcu_dereference (p->next);if ((unsigned long )rport >= (unsigned long )port)
Signature · 1 line
2.11.0
Quoted 8 lines · Pablo Neira Ayuso
Simplify this code by updating bridge multicast stats from
maybe_deliver().Note that commit
6db6f0eae605("bridge: multicast to unicast"), in case the port flagBR_MULTICAST_TO_UNICASTis set, never updates the previous port pointer, therefore it is always going to be different from the existing port in this deduplicated list iteration.
Quoted 5 lines
Signed-off-by Pablo Neira Ayuso <[email protected]>--- net/bridge/br_forward.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-)
This was intentional, the reason I didn't add that call to maybe_deliver() is to avoid these checks for the standard unicast fast-path. We need to avoid touching the mcast cache lines (and checks) when using unicast.
Quoted 15 lines · Nikolay Aleksandrov
Quoted 8 lines · Pablo Neira Ayuso
Simplify this code by updating bridge multicast stats from
maybe_deliver().Note that commit
6db6f0eae605("bridge: multicast to unicast"), in case the port flagBR_MULTICAST_TO_UNICASTis set, never updates the previous port pointer, therefore it is always going to be different from the existing port in this deduplicated list iteration.Quoted 5 lines
Signed-off-by Pablo Neira Ayuso <[email protected]>--- net/bridge/br_forward.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-)
Quoted 4 lines
This was intentional, the reason I didn't add that call to
maybe_deliver()is to avoid these checks for the standard unicast fast-path. We need to avoid touching the mcast cache lines (and checks) when using unicast.
To follow-up after my bridge boolean conversion to a flags field in the first cache line the hit is smaller but it still adds at least 2 new tests in the unicast fast-path which can easily be avoided.
Quoted 9 lines · Nikolay Aleksandrov
Quoted 8 lines · Pablo Neira Ayuso
Simplify this code by updating bridge multicast stats from
maybe_deliver().Note that commit
6db6f0eae605("bridge: multicast to unicast"), in case the port flagBR_MULTICAST_TO_UNICASTis set, never updates the previous port pointer, therefore it is always going to be different from the existing port in this deduplicated list iteration.
Quoted 4 lines
Quoted 4 lines
Signed-off-by Pablo Neira Ayuso <[email protected]>--- net/bridge/br_forward.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-)
This is removing two branches, it is less code to maintain and easier to read than:
if (prev == p)
Quoted 3 lines
This was intentional, the reason I didn't add that call to
maybe_deliver()is to avoid these checks for the standard unicast fast-path. We need to avoid touching the mcast cache lines (and checks) when using unicast.
maybe_deliver() is called from br_flood() and br_multicast_flood(), not the standard unicast fast-path.
Thanks.
Nikolay Aleksandrov
Acked-byQuoted 15 lines · Pablo Neira Ayuso
Quoted 9 lines · Nikolay Aleksandrov
Quoted 8 lines · Pablo Neira Ayuso
Simplify this code by updating bridge multicast stats from
maybe_deliver().Note that commit
6db6f0eae605("bridge: multicast to unicast"), in case the port flagBR_MULTICAST_TO_UNICASTis set, never updates the previous port pointer, therefore it is always going to be different from the existing port in this deduplicated list iteration.Quoted 4 lines
Quoted 4 lines
Signed-off-by Pablo Neira Ayuso <[email protected]>--- net/bridge/br_forward.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-)
Quoted 5 lines
This is removing two branches, it is less code to maintain and easier to read than:
if (prev == p)
ack
Quoted 7 lines
Quoted 3 lines
This was intentional, the reason I didn't add that call to
maybe_deliver()is to avoid these checks for the standard unicast fast-path. We need to avoid touching the mcast cache lines (and checks) when using unicast.
maybe_deliver()is called frombr_flood()andbr_multicast_flood(), not the standard unicast fast-path.
Oh right, I was thinking of should_deliver(), my bad.
Quoted 2 lines
Thanks.
From: Pablo Neira Ayuso <[email protected]>
Date: Thu, 4 Apr 2019 13:56:38 +0200
Quoted 9 lines
Simplify this code by updating bridge multicast stats from
maybe_deliver().Note that commit
6db6f0eae605("bridge: multicast to unicast"), in case the port flagBR_MULTICAST_TO_UNICASTis set, never updates the previous port pointer, therefore it is always going to be different from the existing port in this deduplicated list iteration.Signed-off-by Pablo Neira Ayuso <[email protected]>
Applied.