OSDN Git Service

net: bridge: fdb: eliminate extra port state tests from fast-path
authorNikolay Aleksandrov <nikolay@cumulusnetworks.com>
Mon, 4 Nov 2019 09:36:51 +0000 (11:36 +0200)
committerDavid S. Miller <davem@davemloft.net>
Mon, 4 Nov 2019 19:15:27 +0000 (11:15 -0800)
commit5d1fcaf35d74b4188d238e46f0be37c14a01f169
tree55b357200a6a8666ee62f738ebb7508e1771d7cd
parent1574cf83c7a069f5f29295170ed8a568ccebcb7b
net: bridge: fdb: eliminate extra port state tests from fast-path

When commit df1c0b8468b3 ("[BRIDGE]: Packets leaking out of
disabled/blocked ports.") introduced the port state tests in
br_fdb_update() it was to avoid learning/refreshing from STP BPDUs, it was
also used to avoid learning/refreshing from user-space with NTF_USE. Those
two tests are done for every packet entering the bridge if it's learning,
but for the fast-path we already have them checked in br_handle_frame() and
is unnecessary to do it again. Thus push the checks to the unlikely cases
and drop them from br_fdb_update(), the new nbp_state_should_learn() helper
is used to determine if the port state allows br_fdb_update() to be called.
The two places which need to do it manually are:
 - user-space add call with NTF_USE set
 - link-local packet learning done in __br_handle_local_finish()

Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/bridge/br_fdb.c
net/bridge/br_input.c
net/bridge/br_private.h