Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
SUSE:SLE-12-SP5:GA
openvswitch-dpdk.18162
0001-flow-Support-extra-padding-length.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 0001-flow-Support-extra-padding-length.patch of Package openvswitch-dpdk.18162
From c4f739e76cf969c078cbd112b757ed4f1b6b54e6 Mon Sep 17 00:00:00 2001 From: Flavio Leitner <fbl@sysclose.org> Date: Mon, 26 Oct 2020 16:03:19 -0300 Subject: [PATCH v2 branch-2.5] flow: Support extra padding length. Although not required, padding can be optionally added until the packet length is MTU bytes. A packet with extra padding currently fails sanity checks. Fixes: fa8d9001a624 ("miniflow_extract: Properly handle small IP packets.") Reported-by: Joakim Hindersson <joakim.hindersson@elastx.se> Acked-by: Ilya Maximets <i.maximets@ovn.org> Signed-off-by: Flavio Leitner <fbl@sysclose.org> --- lib/dp-packet.h | 10 +++++----- lib/flow.c | 5 ++--- tests/classifier.at | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 8 deletions(-) diff --git a/lib/dp-packet.h b/lib/dp-packet.h index 5044ce0e3..bea3a96b5 100644 --- a/lib/dp-packet.h +++ b/lib/dp-packet.h @@ -51,7 +51,7 @@ struct dp_packet { bool rss_hash_valid; /* Is the 'rss_hash' valid? */ #endif enum dp_packet_source source; /* Source of memory allocated as 'base'. */ - uint8_t l2_pad_size; /* Detected l2 padding size. + uint16_t l2_pad_size; /* Detected l2 padding size. * Padding is non-pullable. */ uint16_t l2_5_ofs; /* MPLS label stack offset, or UINT16_MAX */ uint16_t l3_ofs; /* Network-level header offset, @@ -76,8 +76,8 @@ void *dp_packet_resize_l2(struct dp_packet *, int increment); void *dp_packet_resize_l2_5(struct dp_packet *, int increment); static inline void *dp_packet_l2(const struct dp_packet *); static inline void dp_packet_reset_offsets(struct dp_packet *); -static inline uint8_t dp_packet_l2_pad_size(const struct dp_packet *); -static inline void dp_packet_set_l2_pad_size(struct dp_packet *, uint8_t); +static inline uint16_t dp_packet_l2_pad_size(const struct dp_packet *); +static inline void dp_packet_set_l2_pad_size(struct dp_packet *, uint16_t); static inline void *dp_packet_l2_5(const struct dp_packet *); static inline void dp_packet_set_l2_5(struct dp_packet *, void *); static inline void *dp_packet_l3(const struct dp_packet *); @@ -270,14 +270,14 @@ dp_packet_reset_offsets(struct dp_packet *b) b->l4_ofs = UINT16_MAX; } -static inline uint8_t +static inline uint16_t dp_packet_l2_pad_size(const struct dp_packet *b) { return b->l2_pad_size; } static inline void -dp_packet_set_l2_pad_size(struct dp_packet *b, uint8_t pad_size) +dp_packet_set_l2_pad_size(struct dp_packet *b, uint16_t pad_size) { ovs_assert(pad_size <= dp_packet_size(b)); b->l2_pad_size = pad_size; diff --git a/lib/flow.c b/lib/flow.c index f483fe97d..7b7d8a908 100644 --- a/lib/flow.c +++ b/lib/flow.c @@ -547,7 +547,7 @@ miniflow_extract(struct dp_packet *packet, struct miniflow *dst) if (OVS_UNLIKELY(tot_len > size || ip_len > tot_len)) { goto out; } - if (OVS_UNLIKELY(size - tot_len > UINT8_MAX)) { + if (OVS_UNLIKELY(size - tot_len > UINT16_MAX)) { goto out; } dp_packet_set_l2_pad_size(packet, size - tot_len); @@ -582,8 +582,7 @@ miniflow_extract(struct dp_packet *packet, struct miniflow *dst) if (OVS_UNLIKELY(plen > size)) { goto out; } - /* Jumbo Payload option not supported yet. */ - if (OVS_UNLIKELY(size - plen > UINT8_MAX)) { + if (OVS_UNLIKELY(size - plen > UINT16_MAX)) { goto out; } dp_packet_set_l2_pad_size(packet, size - plen); diff --git a/tests/classifier.at b/tests/classifier.at index 3520acd07..f598c8e55 100644 --- a/tests/classifier.at +++ b/tests/classifier.at @@ -306,3 +306,39 @@ ovs-ofctl: Incorrect instruction ordering ]) OVS_VSWITCHD_STOP AT_CLEANUP + +# Flow classifier a packet with excess of padding. +AT_SETUP([flow classifier - packet with extra padding]) +OVS_VSWITCHD_START +ADD_OF_PORTS([br0], 1, 2) +AT_DATA([flows.txt], [dnl +priority=5,ip,ip_dst=1.1.1.1,actions=1 +priority=5,ip,ip_dst=1.1.1.2,actions=2 +priority=0,actions=drop +]) +AT_CHECK([ovs-ofctl add-flows br0 flows.txt]) +packet=00020202020000010101010008004500001c00010000401176cc01010101010101020d6a00350008ee3a +AT_CHECK([ovs-appctl ofproto/trace br0 in_port=1 $packet] , [0], [stdout]) +AT_CHECK([tail -2 stdout], [0], + [Megaflow: recirc_id=0,ip,in_port=1,nw_dst=1.1.1.2,nw_frag=no +Datapath actions: 2 +]) +# normal packet plus 255 bytes of padding (8bit padding). +# 255 * 2 = 510 +padding=$(printf '%*s' 510 | tr ' ' '0') +AT_CHECK([ovs-appctl ofproto/trace br0 in_port=1 ${packet}${padding}] , [0], [stdout]) +AT_CHECK([tail -2 stdout], [0], + [Megaflow: recirc_id=0,ip,in_port=1,nw_dst=1.1.1.2,nw_frag=no +Datapath actions: 2 +]) +# normal packet plus padding up to 65535 bytes of length (16bit limit). +# 65535 - 43 = 65492 +# 65492 * 2 = 130984 +padding=$(printf '%*s' 130984 | tr ' ' '0') +AT_CHECK([ovs-appctl ofproto/trace br0 in_port=1 ${packet}${padding}], [0], [stdout]) +AT_CHECK([tail -2 stdout], [0], + [Megaflow: recirc_id=0,ip,in_port=1,nw_dst=1.1.1.2,nw_frag=no +Datapath actions: 2 +]) +OVS_VSWITCHD_STOP +AT_CLEANUP -- 2.29.2
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor