From patchwork Thu Jan 9 02:18:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Faicker Mo X-Patchwork-Id: 2031685 X-Patchwork-Delegate: aconole@redhat.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=zenlayer.onmicrosoft.com header.i=@zenlayer.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-zenlayer-onmicrosoft-com header.b=JUygWYru; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4YT7kL5V0fz1yPD for ; Thu, 9 Jan 2025 13:18:32 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id D666180F87; Thu, 9 Jan 2025 02:18:30 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 6Jk8YLKc6nP3; Thu, 9 Jan 2025 02:18:29 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.9.56; helo=lists.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 91BC980F80 Authentication-Results: smtp1.osuosl.org; dkim=fail reason="signature verification failed" (1024-bit key, unprotected) header.d=zenlayer.onmicrosoft.com header.i=@zenlayer.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-zenlayer-onmicrosoft-com header.b=JUygWYru Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp1.osuosl.org (Postfix) with ESMTPS id 91BC980F80; Thu, 9 Jan 2025 02:18:29 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 4CB20C08E3; Thu, 9 Jan 2025 02:18:29 +0000 (UTC) X-Original-To: ovs-dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists.linuxfoundation.org (Postfix) with ESMTP id DB9FDC08E2 for ; Thu, 9 Jan 2025 02:18:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id B67B7401A0 for ; Thu, 9 Jan 2025 02:18:27 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id Mwf5ssud82EG for ; Thu, 9 Jan 2025 02:18:26 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a01:111:f403:2414::72b; helo=nam11-bn8-obe.outbound.protection.outlook.com; envelope-from=faicker.mo@zenlayer.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp4.osuosl.org 1B3434019F Authentication-Results: smtp4.osuosl.org; dmarc=pass (p=none dis=none) header.from=zenlayer.com DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 1B3434019F Authentication-Results: smtp4.osuosl.org; dkim=pass (1024-bit key, unprotected) header.d=zenlayer.onmicrosoft.com header.i=@zenlayer.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-zenlayer-onmicrosoft-com header.b=JUygWYru Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2072b.outbound.protection.outlook.com [IPv6:2a01:111:f403:2414::72b]) by smtp4.osuosl.org (Postfix) with ESMTPS id 1B3434019F for ; Thu, 9 Jan 2025 02:18:25 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Vlb+LUnlPM0OAUCL9x/uDcNLKllOoxkhXberYneZqoQjnDaZ6WzD/ZeXsIk4aVq0zcn85yvilNCzLFVBx9Yw3U0T0GxJa/Ic8euLulwpJ8/yBaXusIOm55wEl5JKnnPZc11IYkQb7+r5DHhiIZSJGciuAFZRhEkNsIKdDZyROg8pBoUYOar6h9m/AYVANCZQNGUm5RMXR82sTXc+juJPPj90Ry15/3lb1a9FAEA2wUuivIKgW92ZOHZ5ugEImcC2Jd0fox2AqYl6+qaP+WBBRTQrDNl/9Y70lBFlpDKbWJ1Jbfdo2TDYvVQHGGBHjX00l7jdh1vh62WQr2M2BKmhMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=nDy8dRWqu44DQ/W4RHHZK+vBa+uGPm4um5CoRwqgt1k=; b=QN3kjfvPH5S+tz8WpYYmcnzhr8hYySLMM82MTnpBL9OlWNXCtcWOJPCk9NL2j4/5XHa1a8lJ6LnFO0M5VFVmU+b4NOv2DYpN+6DPXWySU/kU8Bsz3P/DIl0yQFThPQ0m12O3gIm5rcKAI/gwwu5rkQT2Ql261bNj4Ud0Pqpb5+A7VotAnIIjVSiMqOnkuVpAqTdJQFyMeEv/Ao+D5A15A5NbC+FX2tNWFrcYeaPU4QADkzzmqUjPZy1tblZjkzw/bATno+3HEQT67N+2nAQ9pDuMK/eDxtbmIABPSWchxweOklHX+2gbi7/jJUuhqq7Pxnh6Vfpm7hcPszMC61//xQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=zenlayer.com; dmarc=pass action=none header.from=zenlayer.com; dkim=pass header.d=zenlayer.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zenlayer.onmicrosoft.com; s=selector2-zenlayer-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=nDy8dRWqu44DQ/W4RHHZK+vBa+uGPm4um5CoRwqgt1k=; b=JUygWYrurxpxaOBMTfp4I+MAtEGnNpUkcuCZliiBTbuInj2Qaeu9hmwUHamtQroYUTT11aZe2IAjacaPaSIMNdt9kjchcKProkU4lvcoSfSU5U6ZWRPyjdlv+xEZscbflQDRgGrC+1srr2SFwzz46qiKb8DAipV1y5t7+DQ8Dfc= Received: from SJ0PR20MB6079.namprd20.prod.outlook.com (2603:10b6:a03:4d7::19) by IA1PR20MB6773.namprd20.prod.outlook.com (2603:10b6:208:3da::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8335.10; Thu, 9 Jan 2025 02:18:17 +0000 Received: from SJ0PR20MB6079.namprd20.prod.outlook.com ([fe80::c11:df86:9358:e76]) by SJ0PR20MB6079.namprd20.prod.outlook.com ([fe80::c11:df86:9358:e76%6]) with mapi id 15.20.8335.007; Thu, 9 Jan 2025 02:18:17 +0000 From: Faicker Mo To: "ovs-dev@openvswitch.org" Thread-Topic: [PATCH v4] ipf: Fix the over-sized reassembly. Thread-Index: AQHbYjy+h7hooIBPXEaIx+5ZIyIj9g== Date: Thu, 9 Jan 2025 02:18:16 +0000 Message-ID: References: <20250109021012.59818-1-heapbin2@gmail.com> In-Reply-To: <20250109021012.59818-1-heapbin2@gmail.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=zenlayer.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: SJ0PR20MB6079:EE_|IA1PR20MB6773:EE_ x-ms-office365-filtering-correlation-id: 6a17c42b-6b2e-4d54-4deb-08dd3053e0cf x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; ARA:13230040|366016|1800799024|376014|8096899003|38070700018; x-microsoft-antispam-message-info: =?iso-8859-1?q?1bYn/pqxpgNFcxjjOjC26WyuI8?= =?iso-8859-1?q?YvFW71K9nhqgUUoT3ljHCb4A0jReUSlFmsQ6x7Kj9GqIud3G/vbsnvNkLVrT?= =?iso-8859-1?q?8Kf1c08sBpy7j8wPFm/d2Kwf0PBSm6eewBlsTptsRJPWWK0AJvxDikt2f1JH?= =?iso-8859-1?q?keyDFm6RjMt3wUbOJuKNdXAEPed2wpFsuholJVLyHSibe6diAag9XL+tFu0C?= =?iso-8859-1?q?zrwMY9Y8eRJEx+sBP1Y1NH791jx10EUiIMR3Ly13g3Usf9Z4LOLlFz6mMKms?= =?iso-8859-1?q?030xrz0KpK5/hP8LRVz4v1tfqwa/upQuyj4FZYAqW95NP3TPYMIYGIZRrKr8?= =?iso-8859-1?q?IvVzBXqD4moHFadBcw9nISORi6Kewwd+lwwCPTe5Ac7gHp8oJv2Gkez0zckL?= =?iso-8859-1?q?k6s2c6Vp6eO43kaQU0r2YWeNKo32ETiJvmhq3gnz18aB44s77RvvZOptYufb?= =?iso-8859-1?q?vYbIjL+qZuQTqxL/QmBzCjBUrya5dnI61pzCos1Wmog6U3fAlzqo+HsJK3He?= =?iso-8859-1?q?dDeoRh8qGI8VPYo/37cXCVNQPEyCtPUgV7PM9jHcmd8rH9ht/XaqIcA27dfj?= =?iso-8859-1?q?qDw8YVK771748laQxjdMuWUPbk5Ig9cP0zUdSmXmB+tHV4qKkligM5AMHT2l?= =?iso-8859-1?q?Y/9H/fiRzrrXIMsPrEp8cZPM0dw3d+U5YNpWspiI/ddzdbsG9O3m3Vgz6Rpo?= =?iso-8859-1?q?tYPaY79IVawst66ALXgvHIn2NZvJj+kDfsgp1Y8/MTaXWqAdzoHjKcQeAKkm?= =?iso-8859-1?q?KHOsP3ABAHuKsP2JwzwUtns3cGxJfCWDA7kE9Z0ueC5iPNrvEnYF+bQmaCU7?= =?iso-8859-1?q?C3d2kfvA+lXhJQvpujrtHMlJYY7XUBOr8O+poQXgwhj/qqHrYwqGRY6QbhcF?= =?iso-8859-1?q?45CsRlRLVDeM+/r+aTX2Kx7+gj5jdZUxXveo/h0RYpesRxr55R0fnscx4Rdw?= =?iso-8859-1?q?1neuZE2ZBQVDXEsuKUEKku3gcSowK4PLpiNF79ha3TsTP44GkoTz4SN93eVz?= =?iso-8859-1?q?fGiLb0J2FUVF9LgPDwLxxGPFNeLdvtX4Dgpdj2ePqTnzEGRv8niQlTklyp76?= =?iso-8859-1?q?HZAARge6OZfD9blFlxUQjJvntfB4x6zbTx+LfD+OsEAjyjC3+QqS/VMelfwc?= =?iso-8859-1?q?ZiOs4KqRNjgCz6y4PnWn/gCjWwEMUcmGj5LoNtwnoiU5gUX+anOC5hnp9akG?= =?iso-8859-1?q?EMvvLEk+7oaaAswMXCnCtdTSPyMMyIXA8fO5+zYkIFkUZdHMAbIkSayGwGXy?= =?iso-8859-1?q?WDvGimOX6gdCkHFF70FNMxOoJPHARdnx3hL3i78Gk+hu9xy52SO5PJwfdWYN?= =?iso-8859-1?q?AmpPk5NnT/uSDc9gkQPgQR1vvLKxW2ZtYN/oFp1634XimbmRiJ4HZagiCI5w?= =?iso-8859-1?q?/C/JmUXGVoF/TfcW2nv6/YFluKDqhJpRJmgS4elBPsFWRIQeZ4xZvDW1UCnZ?= =?iso-8859-1?q?/offdQJl1Gt/A9eaJiy1OzDl9UKw4OOomsJ0dbtRibqNGIMaJQp1O5d7vlBf?= =?iso-8859-1?q?Jt2syI?= x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR20MB6079.namprd20.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(1800799024)(376014)(8096899003)(38070700018); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?W95lZdY9RlJ26/7WP59i72p?= =?iso-8859-1?q?ezsLQ4YZLUOsxwQOqcGS9rBEuouOWGUgwq42IeSJjOMUQR563F4NfnBSoRS8?= =?iso-8859-1?q?5bgNY2EN9DgcdMdCL2/jkNstFXbLWuNaqnV7CoNvAT+C32Yg1pWDN60CSd7B?= =?iso-8859-1?q?sR5Yjz9h/CiAQg95zmIDmXAPQghiMejA9d9OePZ2Whw9247IOYdVKR8ajMRn?= =?iso-8859-1?q?KgOjcTXzT500al3PDXmcCHlDu82mCVCDvnNSKciSt+AUUdrXsYGGz8l5sX5E?= =?iso-8859-1?q?GEZflGO9fkTBSPFbEBba0Y5sHSVzvtfTRlcPyyvRJSzaIcxUN9Pv5cUWL3AJ?= =?iso-8859-1?q?O7pD85y1ae3ZxbaI1HqAPLNZgpANe34z7Dig+Te/8G0I3ZRvAQB0keO3nk+4?= =?iso-8859-1?q?pLd2DZX1SQvXHDdKpWIOv70eaKSuaCkBxMr2iUNpj3xZ5eEI+CLe8B+UgHNN?= =?iso-8859-1?q?I+xu0roTO+K4oA2KWSvOS8bs6/rmQaetYCI5iotpQGPb88iOmryqInFk7AzX?= =?iso-8859-1?q?f8A1gju/mW24L41q0tILvXAxmG5DTsjGjidk0cGFWuDSElFEHmtaTEYYwTsa?= =?iso-8859-1?q?dLAXF05FsUKO5Z7f7ceXAaJNxX1LQ9JpBI9PNGGxMl1gct3sfGpJRvhj71f4?= =?iso-8859-1?q?SXOnr+X+JzOK9v+YkBzdu5tNunQFqdbxQac7h8HPGLF04lSR0ZsK8ehr+JZ5?= =?iso-8859-1?q?wK/m8gnS0Swz3puHp07bpbKcFY+3dpFBr4O1e4YQ0ww/Gfo7FRj9QGhzKYQE?= =?iso-8859-1?q?z1UqsurCrLDpEPZlgQz0NCVGyWGzDfnpEngb+ZF9fvtCp9cDhMYVYvjK/GuS?= =?iso-8859-1?q?JC7rbQcQClBGIm95A4D7j2TraGiu/EtY2trBIK9DVsMNTcP0MGL1eSuNeBZD?= =?iso-8859-1?q?kn8s24emQ8OjGUxVKETgEh9on+fUkEM5nXoc0/u5PHN4tOCjk6/AlCS0/xz8?= =?iso-8859-1?q?afeEvA6zZ9fne5bV4N4gu/sptglwNnksl1RwUizr+nwyWdh5Drgx8+qvS5WJ?= =?iso-8859-1?q?XguQROkDVK94jpmx+Ix0B0GpZAiUra/kfgzbn2CHP8A53xn1XW72YRwnzdbk?= =?iso-8859-1?q?nG3AZBuq9Y9CFnOldmp6RIDwzkx9vDp2SEGuM8N2LuGJjTH9NylDW9MpSRKh?= =?iso-8859-1?q?yjsheMoYACTT3A78Q7b90aV8CYkdY8QE6X1ZXWZgzBf7c8VMjgmphrDlm7KF?= =?iso-8859-1?q?jUP45pZm4CULr+8TO0A0OtgD++SjN62Npb8Pw1hNps0MrKoQ4BkNs8rFiJsu?= =?iso-8859-1?q?snrzTp9lgWxYMqF30WdYkt56ryp3y1HHIZyQTPE8Tyy4aKwVkBTNRgcDBvi9?= =?iso-8859-1?q?cH5LEByq9ks0t+0qHPHmYXL0sow0Bi6YmpXw0Zu5vB2Wet5fD+g1fmHMCbUh?= =?iso-8859-1?q?yADzj4AbiSbXxpJZx3vQ6MQDmwjbBu3v2zeDJJtCZ1nEWzZBtdcXwsqrk1Tt?= =?iso-8859-1?q?cMbZmKN/vfColBcxKrFP0AOLYe/mtRliODbPsfHuRkkSbYhPE9fyiayByVMS?= =?iso-8859-1?q?5ERvm0nJzbkg8Bl1P5uJzBiwlPWq+uzVPBI6Vt3+7GBr3YZiyygyb1l8jb24?= =?iso-8859-1?q?MhU19Dlk+9mMglEoPiP9CFU8l3HCUiW1NYfzZviQdFAIaPuTasuDZaus7Gdc?= =?iso-8859-1?q?14sQpg7A2X1yQc5Fg?= MIME-Version: 1.0 X-OriginatorOrg: zenlayer.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SJ0PR20MB6079.namprd20.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6a17c42b-6b2e-4d54-4deb-08dd3053e0cf X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Jan 2025 02:18:16.8382 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 0d27725c-b11d-49f0-b479-a26ae758f26d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: YImMqSFexsDTPLWgKGMyk6f0Aq8Y2gLy1o53hElaWPLQyQ/Y/bFCT23rIzYkE3ArwFudKhbmzLKFIZXvcCkiTg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR20MB6773 X-Content-Filtered-By: Mailman/MimeDel 2.1.30 Subject: [ovs-dev] [PATCH v4] ipf: Fix the over-sized reassembly. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Fix the coredump of ovs_assert, The backtrace is as follows, #8 0x0000561ee52084bb in ovs_assert_failure (where=<>, function=<>, condition=<>) at ../lib/util.c:89 #9 0x0000561ee50f8ab2 in dp_packet_set_size (b=<>, v=<>) at ../lib/dp-packet.h:687 #10 dp_packet_set_size (v=<>, b=0x7f7f88143e80) at ../lib/dp-packet.h:687 #11 dp_packet_put_uninit (size=395, b=0x7f7f88143e80) at ../lib/dp-packet.c:355 #12 dp_packet_put (b=0x7f7f88143e80, p=0x7f7f88143ce2, size=395) at ../lib/dp-packet.c:376 #13 0x0000561ee512c147 in ipf_reassemble_v4_frags (ipf_list=0x7f7f88110810) at ../lib/ipf.c:430 The mbuf data_len is a uint16_t field, which includes the ether header. So does IPv6. Fixes: 4ea96698f667 ("Userspace datapath: Add fragmentation handling.") Signed-off-by: Faicker Mo Acked-by: Mike Pattrick --- v4: - Address comments from Aaron: - More readable of the max length. --- lib/ipf.c | 6 ++++-- tests/system-kmod-macros.at | 8 ++++++++ tests/system-traffic.at | 12 ++++++++++-- tests/system-userspace-macros.at | 8 ++++++++ 4 files changed, 30 insertions(+), 4 deletions(-) -- 2.34.1 diff --git a/lib/ipf.c b/lib/ipf.c index 59e232355..b76181e79 100644 --- a/lib/ipf.c +++ b/lib/ipf.c @@ -410,11 +410,12 @@ ipf_reassemble_v4_frags(struct ipf_list *ipf_list) dp_packet_set_size(pkt, dp_packet_size(pkt) - dp_packet_l2_pad_size(pkt)); struct ip_header *l3 = dp_packet_l3(pkt); int len = ntohs(l3->ip_tot_len); + int orig_len = dp_packet_size(pkt); int rest_len = frag_list[ipf_list->last_inuse_idx].end_data_byte - frag_list[1].start_data_byte + 1; - if (len + rest_len > IPV4_PACKET_MAX_SIZE) { + if (orig_len + rest_len > IPV4_PACKET_MAX_SIZE) { ipf_print_reass_packet( "Unsupported big reassembled v4 packet; v4 hdr:", l3); dp_packet_delete(pkt); @@ -459,11 +460,12 @@ ipf_reassemble_v6_frags(struct ipf_list *ipf_list) dp_packet_set_size(pkt, dp_packet_size(pkt) - dp_packet_l2_pad_size(pkt)); struct ovs_16aligned_ip6_hdr *l3 = dp_packet_l3(pkt); int pl = ntohs(l3->ip6_plen) - sizeof(struct ovs_16aligned_ip6_frag); + int orig_len = dp_packet_size(pkt); int rest_len = frag_list[ipf_list->last_inuse_idx].end_data_byte - frag_list[1].start_data_byte + 1; - if (pl + rest_len > IPV6_PACKET_MAX_DATA) { + if (orig_len + rest_len > IPV6_PACKET_MAX_DATA) { ipf_print_reass_packet( "Unsupported big reassembled v6 packet; v6 hdr:", l3); dp_packet_delete(pkt); diff --git a/tests/system-kmod-macros.at b/tests/system-kmod-macros.at index a48bd532a..7a7a19f7e 100644 --- a/tests/system-kmod-macros.at +++ b/tests/system-kmod-macros.at @@ -202,6 +202,14 @@ m4_define([DPCTL_CHECK_FRAGMENTATION_FAIL], ]) +# OVS_CHECK_FRAG_LARGE +# +# This check isn't valid for kernel +m4_define([OVS_CHECK_FRAG_LARGE], +[ + +]) + # OVS_CHECK_MIN_KERNEL([minversion], [minsublevel]) # # Skip test if kernel version falls below minversion.minsublevel diff --git a/tests/system-traffic.at b/tests/system-traffic.at index 16de8da20..95507cb57 100644 --- a/tests/system-traffic.at +++ b/tests/system-traffic.at @@ -4603,7 +4603,11 @@ NS_CHECK_EXEC([at_ns0], [ping -s 3200 -q -c 3 -i 0.3 -W 2 10.1.1.2 | FORMAT_PING dnl Check userspace conntrack fragmentation counters. DPCTL_CHECK_FRAGMENTATION_PASS() -OVS_TRAFFIC_VSWITCHD_STOP +dnl Ipv4 max packet size fragmentation dropped. +NS_EXEC([at_ns0], [ping -s 65507 -q -c 1 -W 0.5 10.1.1.2]) +OVS_CHECK_FRAG_LARGE() + +OVS_TRAFFIC_VSWITCHD_STOP(["/Unsupported big reassembled v4 packet/d"]) AT_CLEANUP AT_SETUP([conntrack - IPv4 fragmentation expiry]) @@ -4897,7 +4901,11 @@ NS_CHECK_EXEC([at_ns0], [ping6 -s 3200 -q -c 3 -i 0.3 -W 2 fc00::2 | FORMAT_PING 3 packets transmitted, 3 received, 0% packet loss, time 0ms ]) -OVS_TRAFFIC_VSWITCHD_STOP +dnl Ipv6 max packet size fragmentation dropped. +NS_EXEC([at_ns0], [ping6 -s 65487 -q -c 1 -W 0.5 fc00::2]) +OVS_CHECK_FRAG_LARGE() + +OVS_TRAFFIC_VSWITCHD_STOP(["/Unsupported big reassembled v6 packet/d"]) AT_CLEANUP AT_SETUP([conntrack - IPv6 fragmentation expiry]) diff --git a/tests/system-userspace-macros.at b/tests/system-userspace-macros.at index c1be97347..49b277a08 100644 --- a/tests/system-userspace-macros.at +++ b/tests/system-userspace-macros.at @@ -298,6 +298,14 @@ AT_CHECK([ovs-appctl dpctl/ipf-get-status -m | FORMAT_FRAG_LIST()], [], [dnl ]) ]) +# OVS_CHECK_FRAG_LARGE() +# +# The userspace needs to check that ipf larger fragments have occurred. +m4_define([OVS_CHECK_FRAG_LARGE], +[ + OVS_WAIT_UNTIL([grep -Eq 'Unsupported big reassembled (v4|v6) packet' ovs-vswitchd.log]) +]) + # OVS_CHECK_MIN_KERNEL([minversion], [maxversion]) # # The userspace skips all tests that check kernel version.