@@ -329,6 +329,10 @@ struct flow_dissector_key_cfm {
#define FLOW_DIS_CFM_MDL_MASK GENMASK(7, 5)
#define FLOW_DIS_CFM_MDL_MAX 7
+struct flow_dissector_ipv6_mh {
+ u8 mh_type;
+};
+
enum flow_dissector_key_id {
FLOW_DISSECTOR_KEY_CONTROL, /* struct flow_dissector_key_control */
FLOW_DISSECTOR_KEY_BASIC, /* struct flow_dissector_key_basic */
@@ -363,6 +367,7 @@ enum flow_dissector_key_id {
FLOW_DISSECTOR_KEY_L2TPV3, /* struct flow_dissector_key_l2tpv3 */
FLOW_DISSECTOR_KEY_CFM, /* struct flow_dissector_key_cfm */
FLOW_DISSECTOR_KEY_IPSEC, /* struct flow_dissector_key_ipsec */
+ FLOW_DISSECTOR_KEY_IPV6MH, /* struct flow_dissector_ipv6_mh */
FLOW_DISSECTOR_KEY_MAX,
};
@@ -1531,6 +1531,33 @@ bool __skb_flow_dissect(const struct net *net,
fdret = FLOW_DISSECT_RET_IPPROTO_AGAIN;
break;
}
+ case NEXTHDR_MOBILITY: {
+ struct flow_dissector_ipv6_mh *key_ipv6mh;
+ u8 _opthdr[3], *opthdr;
+
+ if (proto != htons(ETH_P_IPV6))
+ break;
+
+ opthdr = __skb_header_pointer(skb, nhoff, sizeof(_opthdr),
+ data, hlen, &_opthdr);
+ if (!opthdr) {
+ fdret = FLOW_DISSECT_RET_OUT_BAD;
+ break;
+ }
+
+ if (!dissector_uses_key(flow_dissector, FLOW_DISSECTOR_KEY_IPV6MH))
+ break;
+
+ key_ipv6mh = skb_flow_dissector_target(flow_dissector,
+ FLOW_DISSECTOR_KEY_IPV6MH,
+ target_container);
+ ip_proto = opthdr[0];
+ nhoff += (opthdr[1] + 1) << 3;
+ key_ipv6mh->mh_type = opthdr[2];
+
+ fdret = FLOW_DISSECT_RET_OUT_GOOD;
+ break;
+ }
case NEXTHDR_FRAGMENT: {
struct frag_hdr _fh, *fh;
Needed to replace xfrm home-grown decoder with the flow dissector if we don't want to lose functionality. Alternative is to drop mobility header support and see if anyone complains. Signed-off-by: Florian Westphal <fw@strlen.de> --- include/net/flow_dissector.h | 5 +++++ net/core/flow_dissector.c | 27 +++++++++++++++++++++++++++ 2 files changed, 32 insertions(+)