From patchwork Sat Jul 22 00:36:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mirsad Todorovac X-Patchwork-Id: 705694 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3B957EB64DD for ; Sat, 22 Jul 2023 00:37:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230108AbjGVAhC (ORCPT ); Fri, 21 Jul 2023 20:37:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46084 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229477AbjGVAhB (ORCPT ); Fri, 21 Jul 2023 20:37:01 -0400 Received: from domac.alu.hr (domac.alu.unizg.hr [IPv6:2001:b68:2:2800::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BF06B35AB; Fri, 21 Jul 2023 17:37:00 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by domac.alu.hr (Postfix) with ESMTP id 79CEA6016E; Sat, 22 Jul 2023 02:36:59 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=alu.unizg.hr; s=mail; t=1689986219; bh=QMQEJwodT9o6IRxHFTIzt5RjgYwj1u0/oGn1cqYAU4c=; h=From:To:Cc:Subject:Date:From; b=PEQ44MRweThypBxWnT+EIhVDBZ241yyRAcnFa0vAtS/wG5FErRs0pN4x6enAEA7kk KSkA+IGdo/3po02P6SU0jYtNOWEy+FxTd02rv+GmNdO9LGbn8MvhEroqEQ163lfa4t P8EkjW5SNp5ITRq/8bwN1YneQ+EB6nM3D++j6BjiwKez4pxNhPoqF786Tv9E3KR4Nz Y1YNRbcp2T0119cZB4OQtUw/VsRjRCzPIzgvnkuhuv3Um4vif2dpgU4S8mcisFkuxR uQb3ugN7jqHwvKUtWcMGWCIiYl2F/yQjtOOXaWSKAs3JZz0L1IoxORnfatdlnVXHxW hk2ZGvNPcmFoQ== X-Virus-Scanned: Debian amavisd-new at domac.alu.hr Received: from domac.alu.hr ([127.0.0.1]) by localhost (domac.alu.hr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fTkdtiiJxTHU; Sat, 22 Jul 2023 02:36:57 +0200 (CEST) Received: from defiant.. (unknown [94.250.191.183]) by domac.alu.hr (Postfix) with ESMTPSA id 35D2F6015F; Sat, 22 Jul 2023 02:36:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=alu.unizg.hr; s=mail; t=1689986217; bh=QMQEJwodT9o6IRxHFTIzt5RjgYwj1u0/oGn1cqYAU4c=; h=From:To:Cc:Subject:Date:From; b=Gm+fzv98GfXBxtE53VsjjfyRLGd3FzaW5WjkGwUgCO5J6DiGc/2VYnydkWp7ECDJw zfA6pDFbnuSz1PtP0ssU7erKX+Symrdh/aN7eLrXv8sfcKCzk2I03cE+nnqHpdj215 k+Znsb2XfGb0xgWDFKhgv+FomDcB1QPPjNx3/ghG89DpgRi9PSrffqnXNKYx3HTWMr Ed//S7kPKUYDbaJHVnxhvoufdzk7I8CaO1qHyEIVK71jQmLIZsKq2yWivegcJEQAr/ wHMLcOH+nKd9s3KqY13ZKls8k/YbXZM3GRfE2juB1j83ns3yHjUtIdducmXhtIEQDX 183XBirqKgxeA== From: Mirsad Todorovac To: Ido Schimmel , "GitAuthor: Mirsad Todorovac" , netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Cc: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan Subject: [PATCH v1 01/11] selftests: forwarding: custom_multipath_hash.sh: add cleanup for SIGTERM sent by timeout Date: Sat, 22 Jul 2023 02:36:00 +0200 Message-Id: <20230722003609.380549-1-mirsad.todorovac@alu.unizg.hr> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org Add trap and cleanup for SIGTERM sent by timeout and SIGINT from keyboard, for the test times out and leaves incoherent network stack. Fixes: 511e8db54036c ("selftests: forwarding: Add test for custom multipath hash") Cc: Ido Schimmel Cc: netdev@vger.kernel.org --- tools/testing/selftests/net/forwarding/custom_multipath_hash.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/forwarding/custom_multipath_hash.sh b/tools/testing/selftests/net/forwarding/custom_multipath_hash.sh index 56eb83d1a3bd..c7ab883d2515 100755 --- a/tools/testing/selftests/net/forwarding/custom_multipath_hash.sh +++ b/tools/testing/selftests/net/forwarding/custom_multipath_hash.sh @@ -363,7 +363,7 @@ custom_hash() custom_hash_v6 } -trap cleanup EXIT +trap cleanup INT TERM EXIT setup_prepare setup_wait From patchwork Sat Jul 22 00:36:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mirsad Todorovac X-Patchwork-Id: 705693 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EF32EEB64DD for ; Sat, 22 Jul 2023 00:37:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231247AbjGVAha (ORCPT ); Fri, 21 Jul 2023 20:37:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46452 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231245AbjGVAhZ (ORCPT ); Fri, 21 Jul 2023 20:37:25 -0400 Received: from domac.alu.hr (domac.alu.unizg.hr [IPv6:2001:b68:2:2800::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D529135AB; Fri, 21 Jul 2023 17:37:22 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by domac.alu.hr (Postfix) with ESMTP id 520BB6015F; Sat, 22 Jul 2023 02:37:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=alu.unizg.hr; s=mail; t=1689986241; bh=Bc0dIUG/XF3GLflgprZ9fOJOZFSZr/NOgaX0ho+Cj8E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MfDNSlaUJsXJ6zY4IWcQDHeJ6wCBFZdlFx8QyQm8Jwjf/odNvPQHc8+zm/ToOzK/Y xxbR/+GlqEtt9LmKmKscUQxHUZU5DVxKlSkUAKZNrAL1XkjLq97bK386wcXJbqAyNZ v9uewOSYiMyXq8dir1+bee1yvtx4eIN7ak9muDrYn7jKwXtOeG64CAx7AjRtO8X61B Jpl6Or0Ps2XxtggyE4Z9Q67MII2dqvl3l/9xLdZrJYGZ6VCN7yelPi4YAuUDoLY/7h B8knHFMaP5r5FJl2FJOxsAFbCl8uGQZ4GUeFBCjnoMITIWBvhPkfV9TLFDZUaDCfYS cfm36jflKDwBA== X-Virus-Scanned: Debian amavisd-new at domac.alu.hr Received: from domac.alu.hr ([127.0.0.1]) by localhost (domac.alu.hr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MvLS1Q3DjMCb; Sat, 22 Jul 2023 02:37:19 +0200 (CEST) Received: from defiant.. (unknown [94.250.191.183]) by domac.alu.hr (Postfix) with ESMTPSA id 33E0960171; Sat, 22 Jul 2023 02:37:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=alu.unizg.hr; s=mail; t=1689986239; bh=Bc0dIUG/XF3GLflgprZ9fOJOZFSZr/NOgaX0ho+Cj8E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bN0Huft29JSlT6o255gAqANu1pKkw9Ur3Ecin+WVVnr0CPlq8zm7SpFhMk3fIJmCI BlbbEMnz3mZBKRFJDSDoWhoCPpmS6C0gW+iWoTvDU0qC6tY5qAQ2e+TJKmp07DFhQx 8N5G9TWyZAgtWFftFN+/fQNkBNjGp1O3MveE+prUi8zqwul5RtHUFVlr9o86cxLlNd b3av7367F9cezDPOuYBYrwebHScDcQXcmLO3h3UMBy9RV+MugXtNBPlvOX3oDydWc4 hv2e7JusywHbzLEcbQbBnzbFjTiQXAapkdU9lBWMmqGV6gujkJkec/2k4Y/zZ5Guof qdJq0/Umd1c/w== From: Mirsad Todorovac To: Ido Schimmel , "GitAuthor: Mirsad Todorovac" , netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Cc: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan Subject: [PATCH v1 04/11] selftests: forwarding: gre_multipath_nh_res.sh: add cleanup for SIGTERM sent by timeout Date: Sat, 22 Jul 2023 02:36:03 +0200 Message-Id: <20230722003609.380549-4-mirsad.todorovac@alu.unizg.hr> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230722003609.380549-1-mirsad.todorovac@alu.unizg.hr> References: <20230722003609.380549-1-mirsad.todorovac@alu.unizg.hr> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org Add trap and cleanup for SIGTERM sent by timeout and SIGINT from keyboard, for the test times out and leaves incoherent network stack. Fixes: 902280cacc036 ("selftests: forwarding: Add resilient multipath tunneling nexthop test") Cc: Ido Schimmel Cc: netdev@vger.kernel.org --- tools/testing/selftests/net/forwarding/gre_multipath_nh_res.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/forwarding/gre_multipath_nh_res.sh b/tools/testing/selftests/net/forwarding/gre_multipath_nh_res.sh index 088b65e64d66..83032c165c65 100755 --- a/tools/testing/selftests/net/forwarding/gre_multipath_nh_res.sh +++ b/tools/testing/selftests/net/forwarding/gre_multipath_nh_res.sh @@ -352,7 +352,7 @@ multipath_ipv6_l4() multipath6_l4_test "Weighted MP 11:45" 11 45 } -trap cleanup EXIT +trap cleanup INT TERM EXIT setup_prepare setup_wait From patchwork Sat Jul 22 00:36:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mirsad Todorovac X-Patchwork-Id: 705692 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 75005C001E0 for ; Sat, 22 Jul 2023 00:37:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230185AbjGVAhc (ORCPT ); Fri, 21 Jul 2023 20:37:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46562 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229861AbjGVAh3 (ORCPT ); Fri, 21 Jul 2023 20:37:29 -0400 Received: from domac.alu.hr (domac.alu.unizg.hr [161.53.235.3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A046A3A92; Fri, 21 Jul 2023 17:37:24 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by domac.alu.hr (Postfix) with ESMTP id 5D9066016E; Sat, 22 Jul 2023 02:37:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=alu.unizg.hr; s=mail; t=1689986243; bh=7W3ynW0vvotn+/mE5zS4UF/4GcS0BEQbaUjU76Bkz1s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=b5gOO2Q9p7k87Wp9EEjtvpQQWxYc0wAjuibY4frrWvHjvG1UCZTJ7EFBEDrz2RxXI S9i2ZkUmaSkdeNcCr6iiCBvoSmT01WadWGy/RyjLTHyyGWdB9eqHZZT2jbk6s20dO+ 7enGMFNyktcGKpyUiNqjIW8UbtDbQr3NVRQoeoMs3Vtbh5j/XpaAVfWTjd2P0jwAuv p5NrWFWEEofjZQvkEkJTkOyxr8l2pnG+ax5Lt90bvgJ/1Li1AWb8MKxlHZGPnSPSdD AZeYnGfbUJ9N1Xtsh6z2ZhSCLCxvpekChqJdXwyuHMNfP3rrREzn4x83xN0i7i6rsb pWHFmrfbcAyDQ== X-Virus-Scanned: Debian amavisd-new at domac.alu.hr Received: from domac.alu.hr ([127.0.0.1]) by localhost (domac.alu.hr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 64sfHafPNM-S; Sat, 22 Jul 2023 02:37:21 +0200 (CEST) Received: from defiant.. (unknown [94.250.191.183]) by domac.alu.hr (Postfix) with ESMTPSA id 42FD660177; Sat, 22 Jul 2023 02:37:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=alu.unizg.hr; s=mail; t=1689986239; bh=7W3ynW0vvotn+/mE5zS4UF/4GcS0BEQbaUjU76Bkz1s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dOy9XdPhdOHptX5peyzm3KrhunrfImNtT4XOenc1nyLGcd/AhGbHl4JROIiSLtOT+ nyYt0KoiK6ZM0ZbuQNGSX3qVi2rfoHWDQb5ykDgcdgMB+oz5AXhacAdfif/P618tHJ FYIDLfowL6Wz+mlLLnj/6zKjCAPM0vF7LiHh46Oj3zF5NzCTDJtTQHF4aAEBnK4c2w SrgS1O2mWBVUwBz4q6imxQmCvyOlb9vYS+cHetVLpVDLd7UpTtOZFnt0aG4z2cirDW 53L8kNpGYtr5aIksBtypO4urBA+NwXJXsP/yWARWlTjpqkfoPYThcjxWEzTjVVyLFX rTBuq0GBNWJiw== From: Mirsad Todorovac To: Ido Schimmel , "GitAuthor: Mirsad Todorovac" , netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Cc: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan Subject: [PATCH v1 05/11] selftests: forwarding: gre_multipath_nh.sh: add cleanup for SIGTERM sent by timeout Date: Sat, 22 Jul 2023 02:36:04 +0200 Message-Id: <20230722003609.380549-5-mirsad.todorovac@alu.unizg.hr> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230722003609.380549-1-mirsad.todorovac@alu.unizg.hr> References: <20230722003609.380549-1-mirsad.todorovac@alu.unizg.hr> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org Add trap and cleanup for SIGTERM sent by timeout and SIGINT from keyboard, for the test times out and leaves incoherent network stack. Fixes: e035146d65603 ("selftests: forwarding: Add multipath tunneling nexthop test") Cc: Ido Schimmel Cc: netdev@vger.kernel.org --- tools/testing/selftests/net/forwarding/gre_multipath_nh.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/forwarding/gre_multipath_nh.sh b/tools/testing/selftests/net/forwarding/gre_multipath_nh.sh index d03aa2cab9fd..8338b8693387 100755 --- a/tools/testing/selftests/net/forwarding/gre_multipath_nh.sh +++ b/tools/testing/selftests/net/forwarding/gre_multipath_nh.sh @@ -347,7 +347,7 @@ multipath_ipv6_l4() multipath6_l4_test "Weighted MP 11:45" 11 45 } -trap cleanup EXIT +trap cleanup INT TERM EXIT setup_prepare setup_wait From patchwork Sat Jul 22 00:36:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mirsad Todorovac X-Patchwork-Id: 705691 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 444B5C001DC for ; Sat, 22 Jul 2023 00:37:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230137AbjGVAhd (ORCPT ); Fri, 21 Jul 2023 20:37:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46594 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231271AbjGVAha (ORCPT ); Fri, 21 Jul 2023 20:37:30 -0400 Received: from domac.alu.hr (domac.alu.unizg.hr [IPv6:2001:b68:2:2800::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C492A3C0F; Fri, 21 Jul 2023 17:37:26 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by domac.alu.hr (Postfix) with ESMTP id 77ED96017E; Sat, 22 Jul 2023 02:37:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=alu.unizg.hr; s=mail; t=1689986245; bh=HwfcetItcDbQUyVPKY4tZ80kehqSuVRT0oF1J5uK1jg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YU8RSR1NdCV/Dx023N2TtGwF4TBdKLIXZT92YhyTHSblD0kq8uhOg2mnZ0aAzqAKq BSJZubtRgAGky2lzWdeN7ZZPPuPXNY1c6iwgxLObo3VMdBT8aiaeOG3T9/Z31T1Uqf NVoMofEpSQsEoL6/f8BL6auiKCQlRjPHV79RKj6jAMfbAvFoTFTWvPIT3kpEota2n9 ETfJoaxH/E3j4e3IAj6BKkJTFdZbJEgq8Sri6FZe2Z5DUtqOqudVrJ9VTjZkdM5uQC aC7hdSiXPDirw4rufwL5WK32TwgEVUYy+P35LyozA2Bcltplaram48rrIs0N958Cny jIFhzQsMi6E+w== X-Virus-Scanned: Debian amavisd-new at domac.alu.hr Received: from domac.alu.hr ([127.0.0.1]) by localhost (domac.alu.hr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tNUQ11GI3Fis; Sat, 22 Jul 2023 02:37:23 +0200 (CEST) Received: from defiant.. (unknown [94.250.191.183]) by domac.alu.hr (Postfix) with ESMTPSA id 5C07B6017F; Sat, 22 Jul 2023 02:37:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=alu.unizg.hr; s=mail; t=1689986239; bh=HwfcetItcDbQUyVPKY4tZ80kehqSuVRT0oF1J5uK1jg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CvbBph3ZrKfysIxky4I+z2iwcdApcxGddnedz4YAw5O/IlbZ68eSBQ0tTwDS8rvUv 275u6hTPPkRZBpkeNld7kzEjNk6wMBg+kv1AJBfXLm6q/e22TL6DztB5/3HLCLsjva jrU1Uf4GUzWfvB9ywTTT+Me/1ESdKDO6XEQmPSs3OCJ8v/Wk5Q7XB6tJctrtYNCe0U 1q6FeG8O3hEiJonuluTinO5BmuWtB2NuthjZJvxzsC76wyqELRpdmbbDe/FAdzIFcV 1dKAHDh3ifknAqbbk/o10EOAPZM5NDLX7pSLYR2Sr8lPeTahwt9xRTn3oCc87jzMfk JtWJ/HlHF7I2A== From: Mirsad Todorovac To: Ido Schimmel , "GitAuthor: Mirsad Todorovac" , netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Cc: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan , Stephen Suryaputra Subject: [PATCH v1 07/11] selftests: forwarding: ip6gre_inner_v4_multipath.sh: add cleanup for SIGTERM sent by timeout Date: Sat, 22 Jul 2023 02:36:06 +0200 Message-Id: <20230722003609.380549-7-mirsad.todorovac@alu.unizg.hr> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230722003609.380549-1-mirsad.todorovac@alu.unizg.hr> References: <20230722003609.380549-1-mirsad.todorovac@alu.unizg.hr> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org Add trap and cleanup for SIGTERM sent by timeout and SIGINT from keyboard, for the test times out and leaves incoherent network stack. Fixes: 2800f2485417a ("selftests: forwarding: Test multipath hashing on inner IP pkts for GRE tunnel") Cc: Stephen Suryaputra Cc: Ido Schimmel Cc: netdev@vger.kernel.org --- .../selftests/net/forwarding/ip6gre_inner_v4_multipath.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/forwarding/ip6gre_inner_v4_multipath.sh b/tools/testing/selftests/net/forwarding/ip6gre_inner_v4_multipath.sh index a257979d3fc5..093cae3c2a49 100755 --- a/tools/testing/selftests/net/forwarding/ip6gre_inner_v4_multipath.sh +++ b/tools/testing/selftests/net/forwarding/ip6gre_inner_v4_multipath.sh @@ -295,7 +295,7 @@ multipath_ipv4() multipath4_test "Weighted MP 11:45" 11 45 } -trap cleanup EXIT +trap cleanup INT TERM EXIT setup_prepare setup_wait From patchwork Sat Jul 22 00:36:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mirsad Todorovac X-Patchwork-Id: 705690 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 83F63C001DC for ; Sat, 22 Jul 2023 00:37:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229757AbjGVAhi (ORCPT ); Fri, 21 Jul 2023 20:37:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46552 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231313AbjGVAhb (ORCPT ); Fri, 21 Jul 2023 20:37:31 -0400 Received: from domac.alu.hr (domac.alu.unizg.hr [161.53.235.3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 17F263C2B; Fri, 21 Jul 2023 17:37:29 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by domac.alu.hr (Postfix) with ESMTP id 9C81C60171; Sat, 22 Jul 2023 02:37:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=alu.unizg.hr; s=mail; t=1689986247; bh=0rIok0EQjGTKvrvF2VSOh1b7Lbci4BJ+WsapvWPqS0M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AC2oJSH/7x1aPR0Ere43VQEq6IaMuX7vPYg/F1HX8dPzHq7swg73PqxAnW/j0EnRV J8EJ1cGXYulr5N9otXP1xsSFE9z9pSpoeR92NDVzmoDRJlaU2trfR62v9ZWWacUzCP 1m2UVbJBbFpu2uHzCqUOsjSSmOvqiWWZg6NRjgFTvb2INXMGMjebpb+ImFxU4HAlx6 1KErleLgXm5SydI2SLwIST2/Kz0VSLd5J++RtaN/3hDyctJ5elic7dlCBTqIQzpcKd KE+p6wJMhEjdj2oVai8ya4nW5x2kWYkWVonjzMgYT/unwsnl00Ra8Jg0BfsBUWAnja TMnvA29AzEoUQ== X-Virus-Scanned: Debian amavisd-new at domac.alu.hr Received: from domac.alu.hr ([127.0.0.1]) by localhost (domac.alu.hr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fNK3DkGWk327; Sat, 22 Jul 2023 02:37:25 +0200 (CEST) Received: from defiant.. (unknown [94.250.191.183]) by domac.alu.hr (Postfix) with ESMTPSA id 8F2F360187; Sat, 22 Jul 2023 02:37:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=alu.unizg.hr; s=mail; t=1689986239; bh=0rIok0EQjGTKvrvF2VSOh1b7Lbci4BJ+WsapvWPqS0M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ui6S7uvdNgWhgmba5K9OGGRa5oyfotQUulpVDWyVewiPvWs1Bo0usDI1euBMsMheh HsouynCu6slqll51WV1iJZPKE7HogdWh5BqasQD4w3Deej4BbY+vdUYoCFzrDtb0qf VfrVakBtXb5tCgcAkt7B/RLsVaZCvHbTH3/P00qVxWQ1YaHQI8LYdmYoAhbBL5CwrW Z7wYrgaZBqZoWq8yhGZhvEuNDlqEhd+OggJuIJ2a7GIadDATRqUlFK6dBDs+iU67Qv G9b20xWgk+I3c7byt4+b84YDfTgBYAsOtK/KAy5kIDD9CS41hdaU63LJ7EG60tiLfp vxa8R1aHr6s+w== From: Mirsad Todorovac To: Ido Schimmel , "GitAuthor: Mirsad Todorovac" , netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Cc: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan , David Ahern Subject: [PATCH v1 10/11] selftests: forwarding: router_mpath_nh.sh: add cleanup for SIGTERM sent by timeout Date: Sat, 22 Jul 2023 02:36:09 +0200 Message-Id: <20230722003609.380549-10-mirsad.todorovac@alu.unizg.hr> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230722003609.380549-1-mirsad.todorovac@alu.unizg.hr> References: <20230722003609.380549-1-mirsad.todorovac@alu.unizg.hr> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org Add trap and cleanup for SIGTERM sent by timeout and SIGINT from keyboard, for the test times out and leaves incoherent network stack. Fixes: cab14d1087d9b ("selftests: Add version of router_multipath.sh using nexthop objects") Cc: David Ahern Cc: Ido Schimmel Cc: netdev@vger.kernel.org --- tools/testing/selftests/net/forwarding/router_mpath_nh.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/forwarding/router_mpath_nh.sh b/tools/testing/selftests/net/forwarding/router_mpath_nh.sh index a0d612e04990..0580519ab6d1 100755 --- a/tools/testing/selftests/net/forwarding/router_mpath_nh.sh +++ b/tools/testing/selftests/net/forwarding/router_mpath_nh.sh @@ -414,7 +414,7 @@ if [ $? -ne 0 ]; then exit $ksft_skip fi -trap cleanup EXIT +trap cleanup INT TERM EXIT setup_prepare setup_wait From patchwork Sat Jul 22 00:36:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mirsad Todorovac X-Patchwork-Id: 705689 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1CEA2EB64DD for ; Sat, 22 Jul 2023 00:37:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231304AbjGVAhp (ORCPT ); Fri, 21 Jul 2023 20:37:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46572 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231316AbjGVAhg (ORCPT ); Fri, 21 Jul 2023 20:37:36 -0400 Received: from domac.alu.hr (domac.alu.unizg.hr [161.53.235.3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5F3D93A84; Fri, 21 Jul 2023 17:37:31 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by domac.alu.hr (Postfix) with ESMTP id AA7CA6016E; Sat, 22 Jul 2023 02:37:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=alu.unizg.hr; s=mail; t=1689986249; bh=sWsZGt692J5HLzblOPdvGK1H4fS6uyGBmVHdVo25xyE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hdep9Oq/WlJCI2xzqQkNIZ0+u3/SEiLmfoKCDOS28kJgR5y8OU85NG+BbmnYIgFcF MCC9ntPCe420CWIQkibZcDUqs/M9i2GtdZl9rgJnqJlPhfholm3FZPOKt88SvGoLLM B68fD8b/q/SCUpII8uMu/1WK+i5UKu3W131LVI9nyY8eqGYF/ba1Jva0AmCYzH18es kIdNvp2Dj/boLPKtcvFNilUfjeZ/9aAtUxJNeeXO7EfvYzv/onDUfcRucl1zLUzfzh AsY8FiNd8W1wlYgVp+NvXyfhxFOPU2MRlB4WlM7OGeIpzM0NmmSQqXyuPAErKY+jS8 kbtJO+LvNI/mw== X-Virus-Scanned: Debian amavisd-new at domac.alu.hr Received: from domac.alu.hr ([127.0.0.1]) by localhost (domac.alu.hr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 79G8b3vzwaBk; Sat, 22 Jul 2023 02:37:27 +0200 (CEST) Received: from defiant.. (unknown [94.250.191.183]) by domac.alu.hr (Postfix) with ESMTPSA id 9E54760189; Sat, 22 Jul 2023 02:37:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=alu.unizg.hr; s=mail; t=1689986239; bh=sWsZGt692J5HLzblOPdvGK1H4fS6uyGBmVHdVo25xyE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UrfRg3QhteGDLZWiP859NVNSPoQl3xNBdNBJ8rgEZuost82DAK24QzpCOGEJgrSr9 DOxaiPsAv7JQQqKIEZmjXDhXaJT3/iT1/nH0l3Vf6fT94s+QzkzuI0JDk18DXJrGFo QcaNf2S69CaaMWh6Wg1E4x1BQ9lbc9UUstoTiBN8whBDIeqPCagev2zmjuQe4mZLQd Q8zYpECXNnS/s/XkzN8Gr2YX/CpOhBNmBMCJq2VCj3gKagRFF/idVOs77vn7NNEpMC 45VdBX1gD1f6QBrn/mHeZQm+PCkm0gN0h6NhAQXIokQmKxgJhAsWKQMus/Yw+PU7UM lRZqR4Z8zep8w== From: Mirsad Todorovac To: Ido Schimmel , "GitAuthor: Mirsad Todorovac" , netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Cc: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan Subject: [PATCH v1 11/11] selftests: forwarding: router_multipath.sh: add cleanup for SIGTERM sent by timeout Date: Sat, 22 Jul 2023 02:36:10 +0200 Message-Id: <20230722003609.380549-11-mirsad.todorovac@alu.unizg.hr> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230722003609.380549-1-mirsad.todorovac@alu.unizg.hr> References: <20230722003609.380549-1-mirsad.todorovac@alu.unizg.hr> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org Add trap and cleanup for SIGTERM sent by timeout and SIGINT from keyboard, for the test times out and leaves incoherent network stack. Fixes: 937eeb3482748 ("selftests: forwarding: Create test topology for multipath routing") Cc: Ido Schimmel Cc: netdev@vger.kernel.org --- tools/testing/selftests/net/forwarding/router_multipath.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/forwarding/router_multipath.sh b/tools/testing/selftests/net/forwarding/router_multipath.sh index 464821c587a5..7b3cfe577e00 100755 --- a/tools/testing/selftests/net/forwarding/router_multipath.sh +++ b/tools/testing/selftests/net/forwarding/router_multipath.sh @@ -332,7 +332,7 @@ ping_ipv6() ping6_test $h1 2001:db8:2::2 } -trap cleanup EXIT +trap cleanup INT TERM EXIT setup_prepare setup_wait