From patchwork Wed Feb 26 19:27:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Krakauer X-Patchwork-Id: 13993056 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 38072239584 for ; Wed, 26 Feb 2025 19:28:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740598108; cv=none; b=CXRcoOM/qqkJ4gSnFj6RS4BDGa+l27kZME9TGH2TrrAYpcSK+dU+qtDpDNFg+flpXRQKxbmCZRTJjGm9RUqvATfitJezY5RgYaNw8OpM3C0GE3UJ1Iib9e0s5MPF/Z52dswQ3EPGQNoRgX5Nfy1tt8XFmCKUW7vOUJvdGSsiKtc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740598108; c=relaxed/simple; bh=tmN5JwTaZ421JUVQTXr4tJNOy/0VgsWNPYovSN2FDSU=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Om7GHe/Kp/iRTQDlPQh8qV1GS7k/wQ6wPEEEv1Gpoyr8M0ppnF7Zwbd7zLzKgtDcSraDv0gkfFiof/hN84W5QL2difINv+dGW19QoVn2X7pyg9XNZCH/EvGvCv6icYMbn2Ea82zav8+Ak4q0kHKUojwgFeId+yqZ3tVHzyH/kZc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--krakauer.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=Pzm/OXZ+; arc=none smtp.client-ip=209.85.216.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--krakauer.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Pzm/OXZ+" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-2fc1a4c14d4so414690a91.0 for ; Wed, 26 Feb 2025 11:28:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1740598106; x=1741202906; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=bfKyFrAiD8h/LnMC+tGogS6xsvZrTTIIDx60NZVpyZE=; b=Pzm/OXZ+TgUygYunrr38Ff4cgRZlJiJiNBJm79oEzx/i9MN5qv0SyOepDmYspAIIWV DFkLy2p9aKgT2LaFlnVpwOaUCbLWO5BpwFQj0mnHjQmalnKuk0+ECQiHFx6jlSV0nEvK 0WlOxUAKfJQFoYxY3KYtTreUK0Nb+D+xqO4HvAjPCrhq/nUMziPUUn1gks6AwU3d2RGY eIFtLF/GXT/yYeGzTTwjXnoLcoP+0hpYlJMPcaEjAz/DDTJYA0RVRVDHbk1tnDOTiDcg AT7o1vx1+0V35NKKGp4RQR7jyLF8+NBuz4e1bu0yor8wHTUuqxHHdJcbvb0P/68hDArA WEVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740598106; x=1741202906; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=bfKyFrAiD8h/LnMC+tGogS6xsvZrTTIIDx60NZVpyZE=; b=iOokq+aNo8byY/8kO0Wn0CvqEpx1HRDD32JCyTuJjh2wW6lmeB+7lJwrgwO72/bqei l2o6ZjCFV5VTYHOgMgFa15dBH1qtUojHxurC463YWu3HxzjT9gkvipOjuihVqfPP7ATz aDSKvmTaG/DvHRLs6TYECPoT3R8zFOwoikE1nqFwIaWO/JkR/QIo11u8Ar4tw62seuxd WOifYvt9MFlILXYX6P974gVCFPkWHdztjWWssUkFDcKFMcAYoeTQQAnRvTbtdDWGVvH5 3CeXXOCF1vjQZINNC9X2tGnhp20OWp6HVq5058QEGBwvO7J8A5Jm+VM+n0gAoedbXGp4 ZN8Q== X-Forwarded-Encrypted: i=1; AJvYcCUuYcTWTlBLRxKW0hBJKBFRvBED4yppLJ8QlZMm0M7Xbsd0l51Hn5PsRRPfydlZ5vu/e9CYSgVPyhCODEFjmWg=@vger.kernel.org X-Gm-Message-State: AOJu0Yyf8TmSvJX7olVXW8KNrSnEJLdkFnhqeSdXRYFJc2gEbHB3Npju JpiH/L1YqGOgf5cgITmAw7zvo3cYLXraIffn02PmWQshRLLT+Ku86f4jFn+aEFigpQrHoqDGUu2 A8BqvsroR X-Google-Smtp-Source: AGHT+IH6eAP4Cyst+V85LJmLhx2Rg1bDfnJ+WmNbTdbRluW4pkEzVr68R+e3txlLoA5Mp3lBArRubTvC02kHFg== X-Received: from pjbtc16.prod.google.com ([2002:a17:90b:5410:b0:2f7:d453:e587]) (user=krakauer job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:5243:b0:2f4:434d:c7f0 with SMTP id 98e67ed59e1d1-2fe68ada3e8mr15762000a91.12.1740598106543; Wed, 26 Feb 2025 11:28:26 -0800 (PST) Date: Wed, 26 Feb 2025 11:27:23 -0800 In-Reply-To: <20250226192725.621969-1-krakauer@google.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250226192725.621969-1-krakauer@google.com> X-Mailer: git-send-email 2.48.1.658.g4767266eb4-goog Message-ID: <20250226192725.621969-2-krakauer@google.com> Subject: [PATCH v2 1/3] selftests/net: have `gro.sh -t` return a correct exit code From: Kevin Krakauer To: netdev@vger.kernel.org, linux-kselftest@vger.kernel.org Cc: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Shuah Khan , linux-kernel@vger.kernel.org, Kevin Krakauer Modify gro.sh to return a useful exit code when the -t flag is used. It formerly returned 0 no matter what. Tested: Ran `gro.sh -t large` and verified that test failures return 1. Signed-off-by: Kevin Krakauer --- tools/testing/selftests/net/gro.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/gro.sh b/tools/testing/selftests/net/gro.sh index 02c21ff4ca81..aabd6e5480b8 100755 --- a/tools/testing/selftests/net/gro.sh +++ b/tools/testing/selftests/net/gro.sh @@ -100,5 +100,6 @@ trap cleanup EXIT if [[ "${test}" == "all" ]]; then run_all_tests else - run_test "${proto}" "${test}" + exit_code=$(run_test "${proto}" "${test}") + exit $exit_code fi; From patchwork Wed Feb 26 19:27:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Krakauer X-Patchwork-Id: 13993057 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AB23823A9B1 for ; Wed, 26 Feb 2025 19:28:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740598112; cv=none; b=CU3Ink5iYnGW3gXBLtGby1e4ZbGAAh2UVDgvDKtOwhIlePRfFUBaYa8NnquXKvT0jqOiU2xUmlcBxbAfKUSrUFhHCbQ8CubxUI1yfV3YsKtegDpg5km676dA+ixrcMIFIc7azkrkWXrGTk5H9xB4W2zrf8hkLXfjc7dqJh+u7HY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740598112; c=relaxed/simple; bh=tZ4mEjz0mMBNAvIEKtBrdqpxwP3sR5OVhL8PyV1SRr8=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Hbrlc0DqlftiFr0XYd+Tl7EXUqdFwS0EpzEByLPgvgDhaHOnQpXzqhkCpiZ8USDz4d5wmdk2u/qXEE9G7nJju0eb2rpSKmnZYPgsp7+Ilf3p5s4MMPoyMadoAiw3/z6z1mPQ84DEkdT9mURbYleqf47UqemXdrf3t9E5YUQcOyg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--krakauer.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=JaYDl7bj; arc=none smtp.client-ip=209.85.216.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--krakauer.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="JaYDl7bj" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-2fc2b258e82so387642a91.0 for ; Wed, 26 Feb 2025 11:28:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1740598110; x=1741202910; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=EAHfytQNUsiD5c8K+E1ZBkdfL4DOZcpSAfUWQ+cotG0=; b=JaYDl7bjX5h0huLcAR1OIKmxjCo9+3BOJW4FfQeY7V0kDeGvNWRtTCBQ8DUUco/W/3 0hp+RPfL5nQXwbB78Uzq4ijgG+T6IVGen0M9WNxSzsJnp7f+7YcPjKIND7viHySSwA9G SwYG/XklvpZbx25GurISQmV4kfWvKOGUi0Rmhwjcrr5r4fd8vAUdb0K0FqFR+MryYp0f ThbuOPbr1Rg2qAmnnanuvDfV+v+y/WwZ71KlOlo7TOOJpQJ0YrQMzPvS3FmrGfWg9WHK Y2syXJMs2cGBy6/4gy/sBlMV/Y3uZcXxH7bJsHqfkqlORW17PP2TeLhRIbYAJykYjqjS HxsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740598110; x=1741202910; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=EAHfytQNUsiD5c8K+E1ZBkdfL4DOZcpSAfUWQ+cotG0=; b=iuJfm1CLYLDli5CbGRKumsM5BWzasn07jkuce72MS3S29+vxHa6xu2V+xJ52a0paan Ks6V2oI5JHfUal3kdqsSQktANHvcNVNh3pmgAmTXNhqf23P/DOEOZkTsggVI8glU/6Je VrEgHnMOgednXA7WhEUtkPi5b9iOwqKo5XRFnL6mSiIW3P2K3yXI+NFMmfQOF6IFeYf1 nwym6kAHYA3NbEH0s+c0zQ7xfbgf2bOc7TZZIri8dpSWUOUO+XXjkNvyxsIrGdn7vyTZ N0tl5QCzotK4rCm1k3V2Yi9xb+bFpl+G/Z+U5+N4R7FZ2ijXaGVuPFMis/tLzU6rkjlP DWvw== X-Forwarded-Encrypted: i=1; AJvYcCXeCvLdRE8+YgXSQAn1uODN/Ozk8DgHMIl7on6fxGX/zT41oWfjlsXpIVPEaSEawWU6K0iFlKzccHXWaO80XRY=@vger.kernel.org X-Gm-Message-State: AOJu0YzdYA3aHLKC6MMyCYHyGEpcwQ5YqS2C54lzxQVMl4BZegSZuefn QC3hsOewIR4sWjP35hfRsxE4zbOJ26yTuaWB0kRcLX6hxQ6e3qYY2vB6yJTpNjRNdR7Z+uBYFtK TxkoUf6e9 X-Google-Smtp-Source: AGHT+IHnpgBcjLWJK3P1K4UEwO48PptHkVPMDaQtRyrbfS1CeCFR9+JXWBlM+SMFre4xrXqt/dk+pNsU4kVPXg== X-Received: from pjbsg17.prod.google.com ([2002:a17:90b:5211:b0:2fa:2661:76ac]) (user=krakauer job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:2d88:b0:2ea:5dea:eb0a with SMTP id 98e67ed59e1d1-2fe7e2e0f5dmr6628296a91.4.1740598109628; Wed, 26 Feb 2025 11:28:29 -0800 (PST) Date: Wed, 26 Feb 2025 11:27:24 -0800 In-Reply-To: <20250226192725.621969-1-krakauer@google.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250226192725.621969-1-krakauer@google.com> X-Mailer: git-send-email 2.48.1.658.g4767266eb4-goog Message-ID: <20250226192725.621969-3-krakauer@google.com> Subject: [PATCH v2 2/3] selftests/net: only print passing message in GRO tests when tests pass From: Kevin Krakauer To: netdev@vger.kernel.org, linux-kselftest@vger.kernel.org Cc: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Shuah Khan , linux-kernel@vger.kernel.org, Kevin Krakauer gro.c:main no longer erroneously claims a test passes when running as a sender. Tested: Ran `gro.sh -t large` to verify the sender no longer prints a status. Signed-off-by: Kevin Krakauer --- tools/testing/selftests/net/gro.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/net/gro.c b/tools/testing/selftests/net/gro.c index b2184847e388..d5824eadea10 100644 --- a/tools/testing/selftests/net/gro.c +++ b/tools/testing/selftests/net/gro.c @@ -1318,11 +1318,13 @@ int main(int argc, char **argv) read_MAC(src_mac, smac); read_MAC(dst_mac, dmac); - if (tx_socket) + if (tx_socket) { gro_sender(); - else + } else { + /* Only the receiver exit status determines test success. */ gro_receiver(); + fprintf(stderr, "Gro::%s test passed.\n", testname); + } - fprintf(stderr, "Gro::%s test passed.\n", testname); return 0; } From patchwork Wed Feb 26 19:27:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Krakauer X-Patchwork-Id: 13993058 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 763A623C8CD for ; Wed, 26 Feb 2025 19:28:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740598114; cv=none; b=MnmdhKRiDGNstwoBSJQK560lQDZGa4L+9mXFaNR00TaTSQTdlh3jAYIdosN+wrr1Xy6+Wh/tFggbYSpOf5/cIQGLZ+ZDA6Lvz9apLvHUpdwVR7RUUEahfPokv4yrqvHarPNeqKS/IHeXKm4LgBtW9sZP+wYWVCz4z9Kxu38ypaU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740598114; c=relaxed/simple; bh=HluyNYKDPS3yqo3t8x10fv0NM56bpm3mbUtXPJiO218=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=qvlwtPEtPmFqsQtScZcSkLGAVC+gz5YyKL/HA2zskjzYa2qU0uPjD/36wOssgvKTrjFXzj3boqvleEVVRdonHthZKaCQBWzAfgVZ7GuPu8yxiNpxdG5ehi+MytUGbGCgdQLS13roYObGwVoUbgr4/YFlzwFYLYa2W6ELsT56rP4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--krakauer.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=0x8LXeVx; arc=none smtp.client-ip=209.85.216.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--krakauer.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="0x8LXeVx" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-2f2a9f056a8so353491a91.2 for ; Wed, 26 Feb 2025 11:28:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1740598113; x=1741202913; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=4HpZI8xRryv6g8FTanFu9SU8gg3zdTSULVs1dwlkDW4=; b=0x8LXeVx0vs+elJ7t7Y/Rp2t0gCScn2ZaaBHf6i3y+rhb1JiJoVOWvIEOaug5ZT1A/ VdR/XV91ahTNfDoKSHHVBO4lEtUQVh+UlonriwXX0RL15CzwDvzGlrMKPEpQy/z42rFh lAaiH2JfmSmVTdWU3Enslkw35aoPTw4LcitKg8j0+uaZEDNFseqPFdzNH7FdfmDUQKFZ e2cEhAMbz59SGmAPtV1xOC6OTF04ScXpq+aQM39WLfp+Iikw3RXZ7diovuneQrZCSQ4+ /sZIC5Ggq9Yl11loQeWXvtQKWrVPU9KHbgfRDwkgvvLwHNoFvZOuy7PeY2uxw827omf4 qjSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740598113; x=1741202913; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=4HpZI8xRryv6g8FTanFu9SU8gg3zdTSULVs1dwlkDW4=; b=dky2jQIIH/JV15AyEN7/xV3YaeR9ZJPIVrI1L7lE4QzTLxkqBX+VNW0S9Gy2t4RzjQ +2Csfap5GmzWUfCNv++VB7CfAS0tppbzHSvRAJ2VDx+miiOe6zrODhaanRBvzvOpuw+s BZ4zfon5XSG4XHuZS2sxHZDmtdCjol10ZRoI2ca5S3JS6rZW1nW/Dm1muilLexlXPvCt CRabCI8gGSTcXl1zwnXzOCYhaKpsOs3DSw7SOWIQePe3CT8wtXEZQgltEn9W81pDWyw1 LdvMOMmesE13qKBRgNM1yYS2AO9baO46VgUWnkeBa5gAB+TnLijLhchcHn86Z7q7RFbZ 0nuA== X-Forwarded-Encrypted: i=1; AJvYcCUPBSK9oUg0MdbjrfuxdtHw25IpNbpgmQK50iO6ENhUvlGMVcv2Qj5DksJV99kg+ztJyWf8W9gzJzBggu8hTLA=@vger.kernel.org X-Gm-Message-State: AOJu0Yz6DhtbYQI05JpWUGmG4y8VeSelQy+si/198yA/zJbBmGUh1Jn7 cX1xZnfnkihPDemrmFLbnK3oNoeD6X44FfL5bTfungKMkONPcQBYPrm+gdJ6hNpoTWoxz0L+pyl dkJ0Z8I5K X-Google-Smtp-Source: AGHT+IFamKsEIxS3hTVFncv5CtlIUj3ZMQ5fhZAA0nlmJ8T2PdSmaceymwgTxy7txezIrqrqgE/2n3/ypIdyBw== X-Received: from pjuj12.prod.google.com ([2002:a17:90a:d00c:b0:2fc:1356:bcc3]) (user=krakauer job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:5686:b0:2ee:ee5e:42fb with SMTP id 98e67ed59e1d1-2fe7e2f795fmr7199088a91.13.1740598112745; Wed, 26 Feb 2025 11:28:32 -0800 (PST) Date: Wed, 26 Feb 2025 11:27:25 -0800 In-Reply-To: <20250226192725.621969-1-krakauer@google.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250226192725.621969-1-krakauer@google.com> X-Mailer: git-send-email 2.48.1.658.g4767266eb4-goog Message-ID: <20250226192725.621969-4-krakauer@google.com> Subject: [PATCH v2 3/3] selftests/net: deflake GRO tests From: Kevin Krakauer To: netdev@vger.kernel.org, linux-kselftest@vger.kernel.org Cc: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Shuah Khan , linux-kernel@vger.kernel.org, Kevin Krakauer GRO tests are timing dependent and can easily flake. This is partially mitigated in gro.sh by giving each subtest 3 chances to pass. However, this still flakes on some machines. Reduce the flakiness by: - Bumping retries to 6. - Setting napi_defer_hard_irqs to 1 to reduce the chance that GRO is flushed prematurely. This also lets us reduce the gro_flush_timeout from 1ms to 100us. Tested: Ran `gro.sh -t large` 1000 times. There were no failures with this change. Ran inside strace to increase flakiness. Signed-off-by: Kevin Krakauer --- tools/testing/selftests/net/gro.sh | 4 ++-- tools/testing/selftests/net/setup_veth.sh | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/net/gro.sh b/tools/testing/selftests/net/gro.sh index aabd6e5480b8..9e3f186bc2a1 100755 --- a/tools/testing/selftests/net/gro.sh +++ b/tools/testing/selftests/net/gro.sh @@ -18,10 +18,10 @@ run_test() { "--smac" "${CLIENT_MAC}" "--test" "${test}" "--verbose" ) setup_ns - # Each test is run 3 times to deflake, because given the receive timing, + # Each test is run 6 times to deflake, because given the receive timing, # not all packets that should coalesce will be considered in the same flow # on every try. - for tries in {1..3}; do + for tries in {1..6}; do # Actual test starts here ip netns exec $server_ns ./gro "${ARGS[@]}" "--rx" "--iface" "server" \ 1>>log.txt & diff --git a/tools/testing/selftests/net/setup_veth.sh b/tools/testing/selftests/net/setup_veth.sh index 1f78a87f6f37..eb3182066d12 100644 --- a/tools/testing/selftests/net/setup_veth.sh +++ b/tools/testing/selftests/net/setup_veth.sh @@ -11,7 +11,8 @@ setup_veth_ns() { local -r ns_mac="$4" [[ -e /var/run/netns/"${ns_name}" ]] || ip netns add "${ns_name}" - echo 1000000 > "/sys/class/net/${ns_dev}/gro_flush_timeout" + echo 100000 > "/sys/class/net/${ns_dev}/gro_flush_timeout" + echo 1 > "/sys/class/net/${ns_dev}/napi_defer_hard_irqs" ip link set dev "${ns_dev}" netns "${ns_name}" mtu 65535 ip -netns "${ns_name}" link set dev "${ns_dev}" up