Received: by 2002:a05:6a10:eb17:0:0:0:0 with SMTP id hx23csp452865pxb; Thu, 9 Sep 2021 04:57:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxZLmCQX80BV9qB1IRHGvmkPSkZysM2Byo3CZ8raqpfo4ki/0cByEu+skyCNR+YeXmO07Nk X-Received: by 2002:a17:906:304e:: with SMTP id d14mr3028237ejd.170.1631188641690; Thu, 09 Sep 2021 04:57:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631188641; cv=none; d=google.com; s=arc-20160816; b=dYjMOKBE9zcPilg0Be1rb5iL0yd3fAKqBQdJg8KbHhdGkCw9KC0vklMjZyQfDcDNlG la7N2UP8l6ypwkJvmX+ESrAorTJE7eN6jhOZsEQfY2jQqvwH1xdbdFCI8ap6taThMNiE 8OGttF8Q/VSh3wHdr/1w3KlvPQV0UQAVV8jySYKOnGJH89zUE51ru25Bc3ZeAuF9Kb+q +iFt5fNwChYTu1Qn8rdc9JcurrwrNqWJVJOBb2i5t2ZyHox+Ey8sim+s7DOrzRmPhIN+ F1VKy6BGbgbRxVwQT2swBYCbdlbojQGyVRFyrCWU8ho7ezx/t2L8/3gz9+rtERu2M1bH frJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=0jW/+Y0BeTYZvS9qWV/M6R8/voD/k1VQap4VskqBB64=; b=ivQ5KKoiJeIl1OXr5wozf1EFM7dSo9/bW0qsvWriliEb+kn0vpmmWnYYzIO7elRVLa bvysaKkR1G2wceRLsmpHlOBWwCEGfxX7FM3Z1ikayJxwvch8P4bEkfQIGLcEHpOZ3nzM vW8scqG5lcrMUyPHScPqtsiHALid4dPOwaX4IaogsPes74qRaEiVlqMZSDhD+uXMHOrO 176MQIBaXsOU5X+TBFsNHVQoBgVYrPtrqHTV84l0Qvx/zQOo03TX3fAfrw56S4F+DkAS W7+RUUazjgQSORjvHPjkLGYp142Na2BYV9duBl7td7iYaV+3bnr8YVFgWHKFBoKb0hcQ kJ7Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=AS4ZDyfi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id u9si2256009edf.583.2021.09.09.04.56.57; Thu, 09 Sep 2021 04:57:21 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=AS4ZDyfi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243384AbhIILxr (ORCPT + 99 others); Thu, 9 Sep 2021 07:53:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:55360 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239488AbhIILvB (ORCPT ); Thu, 9 Sep 2021 07:51:01 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 94C9D61356; Thu, 9 Sep 2021 11:44:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631187844; bh=35mbzRvU6JfJ7yvh2CXrenvC6BWUwLp9YJcEV3nMwhw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AS4ZDyfizY21jcRGsfxXJS2cxu+kD6eGDcvFwtZ6/t/vhpzRNU8x/QZvBrPGzO03S EWouS7u576MRYwDIA/gpnpcO3ob+pRp/7WsTL0DxO/UkpSXO7H4dx/w4+Ed+nWGL9a X3UGzP3rmsOWXmwsQLiWeSYxKKhd4wHalLEw0Oihy4BgpYonmIH19MhtHOBEkRctrs szGJc9UsPBZ7harnVlhLOBhFWUDbnPdYpEor0LbvyAxnnq0JhwoOYbaW0Z0Lf87dX1 CNWmBSxD2k3M44Apk/1EHIUKcqDVAYCvdIw+p/NTDcamPhc2RSmVmspyRWHDYUjVSu B2Q/yl9h+mKFg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jussi Maki , Daniel Borkmann , Andrii Nakryiko , Sasha Levin , netdev@vger.kernel.org, bpf@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH AUTOSEL 5.14 137/252] selftests/bpf: Fix xdp_tx.c prog section name Date: Thu, 9 Sep 2021 07:39:11 -0400 Message-Id: <20210909114106.141462-137-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210909114106.141462-1-sashal@kernel.org> References: <20210909114106.141462-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jussi Maki [ Upstream commit 95413846cca37f20000dd095cf6d91f8777129d7 ] The program type cannot be deduced from 'tx' which causes an invalid argument error when trying to load xdp_tx.o using the skeleton. Rename the section name to "xdp" so that libbpf can deduce the type. Signed-off-by: Jussi Maki Signed-off-by: Daniel Borkmann Acked-by: Andrii Nakryiko Link: https://lore.kernel.org/bpf/20210731055738.16820-7-joamaki@gmail.com Signed-off-by: Sasha Levin --- tools/testing/selftests/bpf/progs/xdp_tx.c | 2 +- tools/testing/selftests/bpf/test_xdp_veth.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/bpf/progs/xdp_tx.c b/tools/testing/selftests/bpf/progs/xdp_tx.c index 94e6c2b281cb..5f725c720e00 100644 --- a/tools/testing/selftests/bpf/progs/xdp_tx.c +++ b/tools/testing/selftests/bpf/progs/xdp_tx.c @@ -3,7 +3,7 @@ #include #include -SEC("tx") +SEC("xdp") int xdp_tx(struct xdp_md *xdp) { return XDP_TX; diff --git a/tools/testing/selftests/bpf/test_xdp_veth.sh b/tools/testing/selftests/bpf/test_xdp_veth.sh index ba8ffcdaac30..995278e684b6 100755 --- a/tools/testing/selftests/bpf/test_xdp_veth.sh +++ b/tools/testing/selftests/bpf/test_xdp_veth.sh @@ -108,7 +108,7 @@ ip link set dev veth2 xdp pinned $BPF_DIR/progs/redirect_map_1 ip link set dev veth3 xdp pinned $BPF_DIR/progs/redirect_map_2 ip -n ns1 link set dev veth11 xdp obj xdp_dummy.o sec xdp_dummy -ip -n ns2 link set dev veth22 xdp obj xdp_tx.o sec tx +ip -n ns2 link set dev veth22 xdp obj xdp_tx.o sec xdp ip -n ns3 link set dev veth33 xdp obj xdp_dummy.o sec xdp_dummy trap cleanup EXIT -- 2.30.2