Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates
 216.228.117.161 as permitted sender) receiver=protection.outlook.com;
 client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C
References: <20230722003609.380549-1-mirsad.todorovac@alu.unizg.hr>
User-agent: mu4e 1.8.11; emacs 28.2
From:   Petr Machata <petrm@nvidia.com>
To:     Mirsad Todorovac <mirsad.todorovac@alu.unizg.hr>
CC:     Ido Schimmel <idosch@nvidia.com>, <netdev@vger.kernel.org>,
        <linux-kselftest@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
        "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        "Jakub Kicinski" <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>, Shuah Khan <shuah@kernel.org>
Subject: Re: [PATCH v1 01/11] selftests: forwarding:
 custom_multipath_hash.sh: add cleanup for SIGTERM sent by timeout
Date:   Tue, 25 Jul 2023 10:44:32 +0200
In-Reply-To: <20230722003609.380549-1-mirsad.todorovac@alu.unizg.hr>
Message-ID: <87mszkjrvc.fsf@nvidia.com>
MIME-Version: 1.0
Content-Type: text/plain
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jul 2023 08:52:10.3143
 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: a9445389-4f29-472c-0f80-08db8cec6efb
X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.161];Helo=[mail.nvidia.com]
X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT091.eop-nam11.prod.protection.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB6850
X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,
        RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE,
        T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no autolearn_force=no
        version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


Mirsad Todorovac <mirsad.todorovac@alu.unizg.hr> writes:

> 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 <idosch@nvidia.com>
> 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

I believe the EXIT trap covers whatever the cause of the exit was, i.e.
INT and TERM are implicitly covered:

    $ vim tmp/x.sh
    $ cat tmp/x.sh
    foo() { date; }
    trap foo EXIT
    read -p Ready.
    $ bash tmp/x.sh
    Ready.^CTue Jul 25 10:44:20 AM CEST 2023

Also, the interrupt trap seems to prevent the exit actually:

    $ cat tmp/x.sh
    foo() { date; }
    trap foo INT TERM EXIT
    read -p Ready.
    [petr@yaviefel ~]$ bash tmp/x.sh 
    Ready.^CTue Jul 25 10:43:35 AM CEST 2023
    ^CTue Jul 25 10:43:35 AM CEST 2023
    ^CTue Jul 25 10:43:36 AM CEST 2023
    ^CTue Jul 25 10:43:36 AM CEST 2023

(I see the same when I kill -TERM the script.)

This would call cleanup, which would dismantle the configuration, but
then would happilly proceed in the script. I might be missing something,
but I don't see how this can work.