From: David S. Miller Date: Tue, 26 May 2020 22:22:58 +0000 (-0700) Subject: Merge branch 'flow-mpls' X-Git-Tag: v5.8-rc1~165^2~105 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8928e19ad8598ba2e93905a73f39121513ddf4cb;p=thirdparty%2Flinux.git Merge branch 'flow-mpls' Guillaume Nault says: ==================== flow_dissector, cls_flower: Add support for multiple MPLS Label Stack Entries Currently, the flow dissector and the Flower classifier can only handle the first entry of an MPLS label stack. This patch series generalises the code to allow parsing and matching the Label Stack Entries that follow. Patch 1 extends the flow dissector to parse MPLS LSEs until the Bottom Of Stack bit is reached. The number of parsed LSEs is capped at FLOW_DIS_MPLS_MAX (arbitrarily set to 7). Flower and the NFP driver are updated to take into account the new layout of struct flow_dissector_key_mpls. Patch 2 extends Flower. It defines new netlink attributes, which are independent from the previous MPLS ones. Mixing the old and the new attributes in a same filter is not allowed. For backward compatibility, the old attributes are used when dumping filters that don't require the new ones. Changes since v2: * Fix compilation with the new MLX5 bareudp tunnel code. Changes since v1: * Fix compilation of NFP driver (kbuild test robot). * Fix sparse warning with entropy label (kbuild test robot). ==================== Signed-off-by: David S. Miller --- 8928e19ad8598ba2e93905a73f39121513ddf4cb