GRO is currently not aware of tunnel metadata generated by lightweight
tunnels and stored in the dst. This leads to two possible problems:
* Incorrectly merging two frames that have different metadata.
* Leaking of allocated metadata from merged frames.
This avoids those problems by comparing the tunnel information before
merging, similar to how we handle other metadata (such as vlan tags),
and releasing any state when we are done.
Reported-by: John <john.philli...@hpe.com>
Fixes: 2e15ea39 ("ip_gre: Add support to collect tunnel metadata.")
Signed-off-by: Jesse Gross <je...@kernel.org>
---
include/net/dst_metadata.h | 23 +++++++++++++++++++++++
net/core/dev.c | 9 +++++++--
2 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/include/net/dst_metadata.h b/include/net/dst_metadata.h
index 6816f0f..c3de935 100644
--- a/include/net/dst_metadata.h
+++ b/include/net/dst_metadata.h
@@ -44,6 +44,29 @@ static inline bool skb_valid_dst(const struct sk_buff *skb)
return dst && !(dst->flags & DST_METADATA);
}
+static inline int skb_metadata_dst_cmp(struct sk_buff *skb_a,
+ struct sk_buff *skb_b)
+{
+ const struct metadata_dst *a = skb_metadata_dst(skb_a);
+ const struct metadata_dst *b = skb_metadata_dst(skb_b);
+
+ if (!a != !b)
+ return 1;
+
+ if (!a)
+ return 0;
+
+ if (memcmp(&a->u.tun_info.key, &b->u.tun_info.key,
+ sizeof(a->u.tun_info.key)))
+ return 1;
+
+ if (a->u.tun_info.options_len != b->u.tun_info.options_len)
+ return 1;
+
+ return memcmp(&a->u.tun_info + 1, &b->u.tun_info + 1,
+ a->u.tun_info.options_len);
+}
+
struct metadata_dst *metadata_dst_alloc(u8 optslen, gfp_t flags);
struct metadata_dst __percpu *metadata_dst_alloc_percpu(u8 optslen, gfp_t
flags);
diff --git a/net/core/dev.c b/net/core/dev.c
index cc9e365..12cc9bd 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -4358,6 +4358,9 @@ static void gro_list_prepare(struct napi_struct *napi,
struct sk_buff *skb)
diffs = memcmp(skb_mac_header(p),
skb_mac_header(skb),
maclen);
+ if (!diffs)
+ diffs = skb_metadata_dst_cmp(p, skb);
+
NAPI_GRO_CB(p)->same_flow = !diffs;
}
}
@@ -4548,10 +4551,12 @@ static gro_result_t napi_skb_finish(gro_result_t ret,
struct sk_buff *skb)
break;
case GRO_MERGED_FREE:
- if (NAPI_GRO_CB(skb)->free == NAPI_GRO_FREE_STOLEN_HEAD)
+ if (NAPI_GRO_CB(skb)->free == NAPI_GRO_FREE_STOLEN_HEAD) {
+ skb_dst_drop(skb);
kmem_cache_free(skbuff_head_cache, skb);
- else
+ } else {
__kfree_skb(skb);
+ }
break;
case GRO_HELD:
--
2.5.0
