From patchwork Fri Sep 15 09:13:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Po-Hsu Lin X-Patchwork-Id: 1834777 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Rn7mH5Bxsz1yhZ for ; Fri, 15 Sep 2023 19:14:07 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1qh4tg-0006zs-R7; Fri, 15 Sep 2023 09:13:59 +0000 Received: from smtp-relay-canonical-0.internal ([10.131.114.83] helo=smtp-relay-canonical-0.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1qh4td-0006x5-3F for kernel-team@lists.ubuntu.com; Fri, 15 Sep 2023 09:13:53 +0000 Received: from localhost.localdomain (1.general.phlin.uk.vpn [10.172.194.38]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-0.canonical.com (Postfix) with ESMTPSA id C66B23F1DB for ; Fri, 15 Sep 2023 09:13:51 +0000 (UTC) From: Po-Hsu Lin To: kernel-team@lists.ubuntu.com Subject: [J][SRU][PATCH 0/1] Fix bpf build failure on Jammy Date: Fri, 15 Sep 2023 17:13:28 +0800 Message-Id: <20230915091329.619306-1-po-hsu.lin@canonical.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/2035181 [Impact] Commit bdeeed3498c7 ("libbpf: fix offsetof() and container_of() to work with CO-RE") from stable update breaks the ubuntu_bpf test build and cause net:udpgro_bench.sh, net:udpgro.sh, net:veth.sh in ubuntu_kernel_selftests stopped working, as they require bpf selftest to be built first. The following is extracted from the commit message: The problem is the new offsetof() does not play nice with static asserts. Given that the context is a static assert (and CO-RE relocation is not needed at compile time), offsetof() usage can be replaced by restoring the original offsetof() definition as __builtin_offsetof(). [Test Plan] Build bpf selftest in tools/testing/selftests with the following command: make headers; make -C tools/testing/selftests TARGETS=bpf SKIP_TARGETS= \ clean all KDIR=/usr/src/linux-headers-5.15.0-85-generic/ The build can finish successfully with patched kernel source code. [Where problems could occur] Fix limited to testing tool, if this fix is incorrect the bpf selftest build will remain broken. Alan Maguire (1): selftests/bpf: fix static assert compilation issue for test_cls_*.c tools/testing/selftests/bpf/progs/test_cls_redirect.h | 9 +++++++++ 1 file changed, 9 insertions(+) Acked-by: Stefan Bader Acked-by: Roxana Nicolescu