From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7929410A1C; Sat, 3 Feb 2024 04:10:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706933453; cv=none; b=mT48BjoN3SZP0OOH+Buw7ECEq1uFn2givytY1Eo1hQ/S1qKcDssZKTOT2rjRlx10j27i7/Ycxyo6nvYAHKItSXu3ySfdnEl20fMxn4cMiDyw8s+sTc7QJORohCbSqhen5tUV8WereTRYOktsiCLtFgB8zIkUaQBrftATUYRH89A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706933453; c=relaxed/simple; bh=cxU+npQtpZ99h9v6IhB4MfgRjAOTRrS31Cy1DzKEwow=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=euwEERwqNLwHghlD9e3TIfevhr8+ge9sLR9ODmlJVONv2wCF+ebIuDDMiWv6ifVlEwWJaQ1B6oLw+lvdoASdB89xCQH1EPDFru9BIlproARDbAdOIRKGA/34d98uN7pUXsuByN7ei7niWjDGzkW4xF+yzpFIhdGrrVS/+mnZ1b8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=QXyCYRQZ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="QXyCYRQZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4463DC433C7; Sat, 3 Feb 2024 04:10:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1706933453; bh=cxU+npQtpZ99h9v6IhB4MfgRjAOTRrS31Cy1DzKEwow=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QXyCYRQZ6raO6cWlW5B2jMAKLBGLdRNUlbxl4ypTMXEND/AskdTyw7qawgyxvCjuG z7uI4obTBsl/PtEh/6C/f7t98GF6A8zqrlDj/0DBc4ottaE2mIlQZOWAVLbn3wJ84u IdCColEOOOeDwvlfgzEErV25oFmAOz6eto3fd1Q0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Paolo Abeni , Eric Dumazet , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.1 189/219] selftests: net: give more time for GRO aggregation Date: Fri, 2 Feb 2024 20:06:02 -0800 Message-ID: <20240203035343.279961881@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240203035317.354186483@linuxfoundation.org> References: <20240203035317.354186483@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Paolo Abeni [ Upstream commit 89abe628375301fedb68770644df845d49018d8b ] The gro.sh test-case relay on the gro_flush_timeout to ensure that all the segments belonging to any given batch are properly aggregated. The other end, the sender is a user-space program transmitting each packet with a separate write syscall. A busy host and/or stracing the sender program can make the relevant segments reach the GRO engine after the flush timeout triggers. Give the GRO flush timeout more slack, to avoid sporadic self-tests failures. Fixes: 9af771d2ec04 ("selftests/net: allow GRO coalesce test on veth") Signed-off-by: Paolo Abeni Reviewed-by: Eric Dumazet Tested-by: Eric Dumazet Link: https://lore.kernel.org/r/bffec2beab3a5672dd13ecabe4fad81d2155b367.1706206101.git.pabeni@redhat.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- tools/testing/selftests/net/setup_veth.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/setup_veth.sh b/tools/testing/selftests/net/setup_veth.sh index 1003ddf7b3b2..227fd1076f21 100644 --- a/tools/testing/selftests/net/setup_veth.sh +++ b/tools/testing/selftests/net/setup_veth.sh @@ -8,7 +8,7 @@ setup_veth_ns() { local -r ns_mac="$4" [[ -e /var/run/netns/"${ns_name}" ]] || ip netns add "${ns_name}" - echo 100000 > "/sys/class/net/${ns_dev}/gro_flush_timeout" + echo 1000000 > "/sys/class/net/${ns_dev}/gro_flush_timeout" ip link set dev "${ns_dev}" netns "${ns_name}" mtu 65535 ip -netns "${ns_name}" link set dev "${ns_dev}" up -- 2.43.0