aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMohsin Kazmi <sykazmi@cisco.com>2019-08-22 18:40:28 +0200
committerAndrew Yourtchenko <ayourtch@gmail.com>2019-09-02 11:55:53 +0000
commit404e24de56c278507171a5af290169e6fc12d9fd (patch)
tree1a3183d59d7c469233f8ab2b1fff2f0b8285781a
parent43a5b7cc44596fea37a9b7ab62f49eb40c402f22 (diff)
gso: fix segmentation when gso_size greater than vlib buffer size
Type: fix Ticket: VPP-1751 Change-Id: I5ffb078492adc97374290de404f2ec0102b75184 Signed-off-by: Mohsin Kazmi <sykazmi@cisco.com> (cherry picked from commit 3f1964d2d2847c5307694fe8daea0a7eef1e2733)
-rw-r--r--src/vnet/interface_output.c5
-rw-r--r--test/test_gso.py32
2 files changed, 36 insertions, 1 deletions
diff --git a/src/vnet/interface_output.c b/src/vnet/interface_output.c
index 60953b0f35a..21a1f84b36e 100644
--- a/src/vnet/interface_output.c
+++ b/src/vnet/interface_output.c
@@ -235,8 +235,11 @@ tso_alloc_tx_bufs (vlib_main_t * vm,
vlib_buffer_t * b0, u32 n_bytes_b0, u16 l234_sz,
u16 gso_size)
{
+ u16 size =
+ clib_min (gso_size, vlib_buffer_get_default_data_size (vm) - l234_sz);
+
/* rounded-up division */
- u16 n_bufs = (n_bytes_b0 - l234_sz + (gso_size - 1)) / gso_size;
+ u16 n_bufs = (n_bytes_b0 - l234_sz + (size - 1)) / size;
u16 n_alloc;
ASSERT (n_bufs > 0);
diff --git a/test/test_gso.py b/test/test_gso.py
index b7d3b98b2e9..87626ccf01f 100644
--- a/test/test_gso.py
+++ b/test/test_gso.py
@@ -170,5 +170,37 @@ class TestGSO(VppTestCase):
size -= 20 # TCP header
self.assertEqual(size, 65200)
+ #
+ # Send jumbo frame with gso enabled only on input interface with 9K MTU
+ # and DF bit is unset. GSO packet will be fragmented. GSO size will be
+ # 8960.
+ #
+ self.vapi.sw_interface_set_mtu(self.pg1.sw_if_index, [9000, 0, 0, 0])
+ self.create_pg_interfaces(range(5, 6), 1, 8960)
+ for i in self.pg_interfaces:
+ i.admin_up()
+ i.config_ip4()
+ i.config_ip6()
+ i.disable_ipv6_ra()
+ i.resolve_arp()
+ i.resolve_ndp()
+
+ self.vapi.sw_interface_set_mtu(self.pg5.sw_if_index, [9000, 0, 0, 0])
+ p44 = (Ether(src=self.pg5.remote_mac, dst=self.pg5.local_mac) /
+ IP(src=self.pg5.remote_ip4, dst=self.pg1.remote_ip4) /
+ TCP(sport=1234, dport=1234) /
+ Raw('\xa5' * 65200))
+
+ self.pg1.enable_capture()
+ rxs = self.send_and_expect(self.pg5, [p44], self.pg1, 33)
+ size = 0
+ for rx in rxs:
+ self.assertEqual(rx[Ether].src, self.pg1.local_mac)
+ self.assertEqual(rx[Ether].dst, self.pg1.remote_mac)
+ self.assertEqual(rx[IP].src, self.pg5.remote_ip4)
+ self.assertEqual(rx[IP].dst, self.pg1.remote_ip4)
+ size = rxs[32][TCP].seq + rxs[32][IP].len - 20 - 20
+ self.assertEqual(size, 65200)
+
if __name__ == '__main__':
unittest.main(testRunner=VppTestRunner)