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 6774F1E9B38; Tue, 21 Jan 2025 17:54:50 +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=1737482090; cv=none; b=hAJWwI6RCHLGddN513gvK6NxfYgsxflJwmoZTVTVc2cX/U1pY0azvQ9Nhone0uf1zkQ1VV/tht7UxEiaMSXSODZ2kNnBRc11JA2Wve14gdmu8Rt/Yc7eTh6nGrXSeoEAjPr1wnonNUq1jpASrvBC1YD3NbUeSUXtqWMHyysokCY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737482090; c=relaxed/simple; bh=6QkzMyl9FzCNI07E7cCVFgW0eyvEjp5Twi27NYXhOT4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fQLOn8HW+0cZt2xEvgVxmO2sTL/kydcNYaTAYt/NvwS7mxAtGzVsRr2LWCIU/RqGd9dZ2VDJmjfUffY2tROUckqZd7BZFBr5ZRPOQuf0X45Aqtckz6ItlAttvM2r2xNbXLixXkOGqGRnnbgsTQ1Cxjk7tthJ1iFA6KgvOTHYDXE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=yoOCA4WN; 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="yoOCA4WN" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DF28FC4CEDF; Tue, 21 Jan 2025 17:54:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1737482090; bh=6QkzMyl9FzCNI07E7cCVFgW0eyvEjp5Twi27NYXhOT4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yoOCA4WN2Mdmut5+NDn9oe8PvydhJukqefuAQnovVW5PDsfeqUYn5C8pm+mwQTDaN Ma61rpdquyKL/Q/VVjQxh4mdLrFqRAov3ZB8KpIQkl3gfZfsNIlwPwyAZC7gggAOeS jOv53ZylTokkW0nUmZCIlgXWjNYythwFoDwyQOis= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Eric Dumazet , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.6 31/72] selftests: tc-testing: reduce rshift value Date: Tue, 21 Jan 2025 18:51:57 +0100 Message-ID: <20250121174524.623768569@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250121174523.429119852@linuxfoundation.org> References: <20250121174523.429119852@linuxfoundation.org> User-Agent: quilt/0.68 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.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jakub Kicinski [ Upstream commit e95274dfe86490ec2a5633035c24b2de6722841f ] After previous change rshift >= 32 is no longer allowed. Modify the test to use 31, the test doesn't seem to send any traffic so the exact value shouldn't matter. Reviewed-by: Eric Dumazet Link: https://patch.msgid.link/20250103182458.1213486-1-kuba@kernel.org Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- tools/testing/selftests/tc-testing/tc-tests/filters/flow.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/tc-testing/tc-tests/filters/flow.json b/tools/testing/selftests/tc-testing/tc-tests/filters/flow.json index 58189327f6444..383fbda07245c 100644 --- a/tools/testing/selftests/tc-testing/tc-tests/filters/flow.json +++ b/tools/testing/selftests/tc-testing/tc-tests/filters/flow.json @@ -78,10 +78,10 @@ "setup": [ "$TC qdisc add dev $DEV1 ingress" ], - "cmdUnderTest": "$TC filter add dev $DEV1 parent ffff: handle 1 prio 1 protocol ip flow map key dst rshift 0xff", + "cmdUnderTest": "$TC filter add dev $DEV1 parent ffff: handle 1 prio 1 protocol ip flow map key dst rshift 0x1f", "expExitCode": "0", "verifyCmd": "$TC filter get dev $DEV1 parent ffff: handle 1 protocol ip prio 1 flow", - "matchPattern": "filter parent ffff: protocol ip pref 1 flow chain [0-9]+ handle 0x1 map keys dst rshift 255 baseclass", + "matchPattern": "filter parent ffff: protocol ip pref 1 flow chain [0-9]+ handle 0x1 map keys dst rshift 31 baseclass", "matchCount": "1", "teardown": [ "$TC qdisc del dev $DEV1 ingress" -- 2.39.5