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 0ADD62288DD; Thu, 12 Dec 2024 16:00:06 +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=1734019206; cv=none; b=tnnGF8Tci1iXah8Vca5hPZw5RJZvlqT20TGy7MDV1Xf2EjhCxOnfc2pFOoDuuPKYh0J8xVbFKBHBrCattJ7NMxVSmHvO9Uf3KzRsf2Ws3cy6kZdKeSPOVRo5VknfEDzLJWEZK/4afJ2aLnqtNWlIHBVkXmcgK3ZyRfwuRMNvySY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734019206; c=relaxed/simple; bh=jJnjh+uwpyGZ5P5LN8OqmKSUWTFoxubTnJYYyFNjwgs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=adnPOzdtI3mNAn6lmShO31Iws4vzl/9JrO6jJupc+6h16G91PQsUhX3ryTaAL6zThHsuQxczYs8VZ12KtMNgUQWplRtrIunxrYmeHPVVNnOBfuWKhLSQUW6wa76BXMfKAvsQn1QNBq0nHX25WbpM873BJwqzYlQaXZRthrmRxbo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=k+7vROFz; 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="k+7vROFz" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 50523C4CECE; Thu, 12 Dec 2024 16:00:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1734019205; bh=jJnjh+uwpyGZ5P5LN8OqmKSUWTFoxubTnJYYyFNjwgs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=k+7vROFzK6cdzbWihbYSnV0NaveCGspLPmp8Y+Ur6yobGwLlU2Tlxjpnz1SH5oeMP knrzp2oTfKENYrIBWccen5iQNAEuHS5tad9ykelO/xgrB6VGZbf4jifXcYDSsv1PTh gg8xOqjuuYOfegJyLJp/spyuwa9ZQvY+ZEVyjUe4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Yuan Chen , Andrii Nakryiko , Sasha Levin Subject: [PATCH 6.1 146/772] bpf: Fix the xdp_adjust_tail sample prog issue Date: Thu, 12 Dec 2024 15:51:31 +0100 Message-ID: <20241212144355.968787184@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241212144349.797589255@linuxfoundation.org> References: <20241212144349.797589255@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: Yuan Chen [ Upstream commit 4236f114a3ffbbfd217436c08852e94cae372f57 ] During the xdp_adjust_tail test, probabilistic failure occurs and SKB package is discarded by the kernel. After checking the issues by tracking SKB package, it is identified that they were caused by checksum errors. Refer to checksum of the arch/arm64/include/asm/checksum.h for fixing. v2: Based on Alexei Starovoitov's suggestions, it is necessary to keep the code implementation consistent. Fixes: c6ffd1ff7856 (bpf: add bpf_xdp_adjust_tail sample prog) Signed-off-by: Yuan Chen Signed-off-by: Andrii Nakryiko Link: https://lore.kernel.org/bpf/20240930024115.52841-1-chenyuan_fl@163.com Signed-off-by: Sasha Levin --- samples/bpf/xdp_adjust_tail_kern.c | 1 + 1 file changed, 1 insertion(+) diff --git a/samples/bpf/xdp_adjust_tail_kern.c b/samples/bpf/xdp_adjust_tail_kern.c index ffdd548627f0a..da67bcad1c638 100644 --- a/samples/bpf/xdp_adjust_tail_kern.c +++ b/samples/bpf/xdp_adjust_tail_kern.c @@ -57,6 +57,7 @@ static __always_inline void swap_mac(void *data, struct ethhdr *orig_eth) static __always_inline __u16 csum_fold_helper(__u32 csum) { + csum = (csum & 0xffff) + (csum >> 16); return ~((csum & 0xffff) + (csum >> 16)); } -- 2.43.0