Received: by 2002:a05:6358:c692:b0:131:369:b2a3 with SMTP id fe18csp4613860rwb; Mon, 31 Jul 2023 09:24:29 -0700 (PDT) X-Google-Smtp-Source: APBJJlH2Re11RitN/LVUUKLI9Kl+PuwZfnms5Ilbe4KeayWF+wi71ulyP4Ncpz3PdAA5gKM1Qpa5 X-Received: by 2002:a05:6a00:a01:b0:687:1603:b2e7 with SMTP id p1-20020a056a000a0100b006871603b2e7mr11429175pfh.8.1690820668658; Mon, 31 Jul 2023 09:24:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690820668; cv=none; d=google.com; s=arc-20160816; b=E0d9XHUtoAT+Bk+dUvZCmm02CAIFesN64tjjsejnAZLafxkKVZnVGc8l4sPtkWrevF 9buk8KTmy+/nCytZtxcPRoIgsu8rfPQASeqrC9c0rj6tWeFfJZ4RrGEoLgILdhiimyxW usIZIQD6P2HpxR4Nd6oSnSqM4UYSsZKtkBaiEcneGt1JmNdkzhhX940jsJMcR3ikYLmc I8vgIjErsyYgMOmmc8RaNq9D1L/WxlS3gbru6LyXGjEfhMIy32MVNeGkrC/EMGYInsrs CTaCUfvmXuOl6ajJqnnxZIWTid5P8bxtm6dIFngQnZCrYa6xhhYYEwO5yGOtyyMLzp1D 9tFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:in-reply-to:from :references:cc:to:content-language:subject:user-agent:mime-version :date:message-id:dkim-signature:dkim-signature; bh=zuHboTWCwPGySaXqOF3u5WFE4it+YcCx6H5qaEbbX6U=; fh=eiNE2rgMD4eHl5lqOP1VDJJJiHwHFoMAhch4rwweq1k=; b=rB5JBhFoD2GcBwix+Fx7NpHtp1+hqsXwiuGq2l0pt2V/FWmLUzoiq3WluO8U8RZI8o yvEiEttiFgUcxW/0FpxRvnrhK/NKf6lMZHENIIt+9QxGrhNLT+EPtqO8P0hJQhLKLwBC Lpp5SpYNGSvKmkxvbLRqfHASwOvu99i8Vq+nrGbv/U/3djaE9Fsvw0gMpo9nSFba1y0n hum+Kluw400lp1MiFYa/glGXF656dExaJaRqARUqHdE8sQDSCKFSa+42wI5CrzgcUApm /Frq6YWCg4Mm2kI3sDDSs862MBJbcoTGb+5wgm9T31JN8+tV1ecJU1ldsEzM8wzVNEvB lWMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@alu.unizg.hr header.s=mail header.b=fv57DVGL; dkim=fail header.i=@alu.unizg.hr header.s=mail header.b=LvP8vQ5X; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alu.unizg.hr Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k11-20020a056a00168b00b00682850547a9si6935052pfc.201.2023.07.31.09.24.16; Mon, 31 Jul 2023 09:24:28 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=fail header.i=@alu.unizg.hr header.s=mail header.b=fv57DVGL; dkim=fail header.i=@alu.unizg.hr header.s=mail header.b=LvP8vQ5X; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alu.unizg.hr Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230114AbjGaPXp (ORCPT + 99 others); Mon, 31 Jul 2023 11:23:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41888 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229459AbjGaPXn (ORCPT ); Mon, 31 Jul 2023 11:23:43 -0400 Received: from domac.alu.hr (domac.alu.unizg.hr [IPv6:2001:b68:2:2800::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C199610E3; Mon, 31 Jul 2023 08:23:41 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by domac.alu.hr (Postfix) with ESMTP id 8D6C96017F; Mon, 31 Jul 2023 17:23:39 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=alu.unizg.hr; s=mail; t=1690817019; bh=ISG2jRu84O8tN50xDVnUgYYjLOV7WKIkKxcodfIlYEQ=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=fv57DVGLvEzKk1Izt27ydCPEXF6Nuv/OV/xQUWoDiv3NvevfgD5aO2Hy0W7Q4tG7M Ttjj45mTWAcaCfhSWJFfjWrU/7orVtf+jR3UPn6HfCjSvZlCUbAQTyjcNlQobFF8fb xZiicfpv9IYWiKl/vZUIEEFTlKR2UvvCcUOtvKk1AmoyVMPOjoZm23PMMxSGz7PXKZ U4zCzxnvVDAiLTYQzlHXwGoCdAnyC3CrIj0WpgLR/YqpZ5rIsIXceCrLf5eoOeZkdQ Bm7Fj4LxCBgMXsslQmUZJ0Mgx1ZUFoqA+ht5lE11QxSvk/ZgCjliCKUSC5PZKNKbqF GtLmeAfP51aCQ== 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 7cjOiumQGmcF; Mon, 31 Jul 2023 17:23:37 +0200 (CEST) Received: from [192.168.1.6] (unknown [94.250.191.183]) by domac.alu.hr (Postfix) with ESMTPSA id 3F9F560173; Mon, 31 Jul 2023 17:23:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=alu.unizg.hr; s=mail; t=1690817017; bh=ISG2jRu84O8tN50xDVnUgYYjLOV7WKIkKxcodfIlYEQ=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=LvP8vQ5XgRekhDcciWZXR/hj61jMzI3wku1bjiRW9kHavqUG5+hWdRaxm6y1wxupp h+9ybpFDqaYOjJDdgIwWMpOKM4cOU4885W3ueEdXYs3uRlAvGXDuL1oIJptppm7wDb qm/5PeYxS7HUaG9j4u9Ky70U7oKubIP/rT+6lFE/pVvaMLwmuOlq3KiACtsMPFFaWp +utPu3/rp0EyxKS04qzp8MSKiaGIiXGpCyWuETv1uHWDPcoRqvT9HqCB3IjxfNZSmV u25VD8ZcGLS47FPd5jbNO7e/wbrLx0jDqAcg/ZyGB8s+HSCQ/a4V4pqz/tZUldSbEC TCFlusaGUo1Aw== Message-ID: Date: Mon, 31 Jul 2023 17:23:37 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.1 Subject: Re: [PATCH v1 01/11] selftests: forwarding: custom_multipath_hash.sh: add cleanup for SIGTERM sent by timeout Content-Language: en-US To: Ido Schimmel Cc: petrm@nvidia.com, razor@blackwall.org, Ido Schimmel , netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan References: <0550924e-dce9-f90d-df8a-db810fd2499f@alu.unizg.hr> <2f203995-5ae0-13bc-d1a6-997c2b36a2b8@alu.unizg.hr> From: Mirsad Todorovac In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham 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: X-Mailing-List: linux-kernel@vger.kernel.org On 7/31/23 14:02, Ido Schimmel wrote: >> NOTE: The error happened because two patches collided. This patch >> >> diff --git a/tools/testing/selftests/net/forwarding/lib.sh b/tools/testing/selftests/net/forwarding/lib.sh >> index 975fc5168c6334..40a8c1541b7f81 100755 >> --- a/tools/testing/selftests/net/forwarding/lib.sh >> +++ b/tools/testing/selftests/net/forwarding/lib.sh >> @@ -30,6 +30,7 @@ REQUIRE_MZ=${REQUIRE_MZ:=yes} >> REQUIRE_MTOOLS=${REQUIRE_MTOOLS:=no} >> STABLE_MAC_ADDRS=${STABLE_MAC_ADDRS:=no} >> TCPDUMP_EXTRA_FLAGS=${TCPDUMP_EXTRA_FLAGS:=} >> +TROUTE6=${TROUTE6:=traceroute6} >> relative_path="${BASH_SOURCE%/*}" >> if [[ "$relative_path" == "${BASH_SOURCE}" ]]; then >> >> and this patch >> >> diff --git a/tools/testing/selftests/net/forwarding/lib.sh b/tools/testing/selftests/net/forwarding/lib.sh >> index 71f7c0c49677..5b0183013017 100755 >> --- a/tools/testing/selftests/net/forwarding/lib.sh >> +++ b/tools/testing/selftests/net/forwarding/lib.sh >> @@ -16,8 +16,6 @@ TEAMD=${TEAMD:=teamd} >> WAIT_TIME=${WAIT_TIME:=5} >> PAUSE_ON_FAIL=${PAUSE_ON_FAIL:=no} >> PAUSE_ON_CLEANUP=${PAUSE_ON_CLEANUP:=no} >> -NETIF_TYPE=${NETIF_TYPE:=veth} >> -NETIF_CREATE=${NETIF_CREATE:=yes} >> MCD=${MCD:=smcrouted} >> MC_CLI=${MC_CLI:=smcroutectl} >> PING_COUNT=${PING_COUNT:=10} >> @@ -30,6 +28,20 @@ REQUIRE_MZ=${REQUIRE_MZ:=yes} >> REQUIRE_MTOOLS=${REQUIRE_MTOOLS:=no} >> STABLE_MAC_ADDRS=${STABLE_MAC_ADDRS:=no} >> TCPDUMP_EXTRA_FLAGS=${TCPDUMP_EXTRA_FLAGS:=} >> +NETIF_TYPE=${NETIF_TYPE:=veth} >> +NETIF_CREATE=${NETIF_CREATE:=yes} >> +declare -A NETIFS=( >> + [p1]=veth0 >> + [p2]=veth1 >> + [p3]=veth2 >> + [p4]=veth3 >> + [p5]=veth4 >> + [p6]=veth5 >> + [p7]=veth6 >> + [p8]=veth7 >> + [p9]=veth8 >> + [p10]=veth9 >> +) >> >> relative_path="${BASH_SOURCE%/*}" >> if [[ "$relative_path" == "${BASH_SOURCE}" ]]; then >> >> are not compatible. >> >> I have applied the 'require_command $TROUTE6' patch manually. >> >> I suppose this is what you intended to have: >> >> # Can be overridden by the configuration file. >> PING=${PING:=ping} >> PING6=${PING6:=ping6} >> MZ=${MZ:=mausezahn} >> ARPING=${ARPING:=arping} >> TEAMD=${TEAMD:=teamd} >> WAIT_TIME=${WAIT_TIME:=5} >> PAUSE_ON_FAIL=${PAUSE_ON_FAIL:=no} >> PAUSE_ON_CLEANUP=${PAUSE_ON_CLEANUP:=no} >> MCD=${MCD:=smcrouted} >> MC_CLI=${MC_CLI:=smcroutectl} >> PING_COUNT=${PING_COUNT:=10} >> PING_TIMEOUT=${PING_TIMEOUT:=5} >> WAIT_TIMEOUT=${WAIT_TIMEOUT:=20} >> INTERFACE_TIMEOUT=${INTERFACE_TIMEOUT:=600} >> LOW_AGEING_TIME=${LOW_AGEING_TIME:=1000} >> REQUIRE_JQ=${REQUIRE_JQ:=yes} >> REQUIRE_MZ=${REQUIRE_MZ:=yes} >> REQUIRE_MTOOLS=${REQUIRE_MTOOLS:=no} >> STABLE_MAC_ADDRS=${STABLE_MAC_ADDRS:=no} >> TCPDUMP_EXTRA_FLAGS=${TCPDUMP_EXTRA_FLAGS:=} >> TROUTE6=${TROUTE6:=traceroute6} >> NETIF_TYPE=${NETIF_TYPE:=veth} >> NETIF_CREATE=${NETIF_CREATE:=yes} >> declare -A NETIFS=( >> [p1]=veth0 >> [p2]=veth1 >> [p3]=veth2 >> [p4]=veth3 >> [p5]=veth4 >> [p6]=veth5 >> [p7]=veth6 >> [p8]=veth7 >> [p9]=veth8 >> [p10]=veth9 >> ) >> >> relative_path="${BASH_SOURCE%/*}" >> if [[ "$relative_path" == "${BASH_SOURCE}" ]]; then >> relative_path="." >> fi >> ------------------------------------------------ >> >> Probably for the production patch you would like to have this fixed. > > No, I don't intend to submit the patch that automatically creates the > veth pairs. It is superseded by "selftests: forwarding: Skip test when > no interfaces are specified". It is your call, but consider that the majority of testers will use the default setup and maybe grep "not ok" messages in the log, because the amount of logs is overwhelming. Knowing that there is "forwarding.config.sample" probably requires in-depth knowledge of the selftest net/forwarding bundle and maybe direct hint from the developers? Kind regards, Mirsad