Received: by 2002:a05:6a10:eb17:0:0:0:0 with SMTP id hx23csp541529pxb; Thu, 9 Sep 2021 06:46:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz0sSci4FRlsiE2cjnemQYcT2+EgbX7BG1YUbw+fRTFphwha5I4FY87b/Xrs5E7RoQstJVc X-Received: by 2002:a05:6e02:5a3:: with SMTP id k3mr2306523ils.283.1631195163501; Thu, 09 Sep 2021 06:46:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631195163; cv=none; d=google.com; s=arc-20160816; b=qxAu3FkDTTrhY9ul7FWvZHA/A73yU19I6bHM/ubxBqkEi/Jg+CDXiFZhwlLr1ct8kI 7FgEgi1seYV+jE2+t3WgfEKd+cshXq7E7sze2S8m92CPR7EPS/p7Flm1wIg0vpzxEFXt wyiDpIF5ozaLGexucVW+0PyG2s2e2VJpowvJ/rVHHOkp9Y6+Bpjs86p3guq56vIDtJ5p C/JncnbqPnuedzxwC+m+6W0jWI9Zurm2ZCE9PKjiL648+0uVTdCT34k0Drc+HdwdzMZE sKWpMwJHNu7qcAUtZe20JdrXfK4HdE1Rk+7JLOOmPoOiSJtHOFUAwc/Rkq4ta0e5FOIK EHLg== 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=gTF6xFeBbqMc7o2aTiTNrEwmLfKOXSCNbOZTPtJCGYk=; b=Gz93uj8ygfRhiZltyxB2e9iQTbzwiRXVjxPc7n1Yuyjr93YWMLB+8ou35P/QwyWybX IDvXENfWADu0d6YkhpgMYQUgXR7g/BgAhr2Kx9uhhUKtmQi6YG64U2gXGOpFLaA6kIdB QLdUuWwsdje0Rj6GmkUzkJnmpR9Qx8LfjLowxQ5GzGj7Jqr6O25QgljrtLjuTIGYpNHx TruVZAWu9DFa4jCk4ZT7BEswdhbcAk3vlMYWWeH18+FIeO09vZZ4UwCGm+PcW9xngNhd dPMaCnzpjmz3clM3FSV8dxaWjPYs+ze0sX0Xw7nKibeqXM/PC58KKpay3hkpmIUItqoQ cfxA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=QGps9I30; 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 b16si1752465ior.73.2021.09.09.06.45.50; Thu, 09 Sep 2021 06:46:03 -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=QGps9I30; 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 S1355583AbhIINoN (ORCPT + 99 others); Thu, 9 Sep 2021 09:44:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:40982 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1352669AbhIIMrH (ORCPT ); Thu, 9 Sep 2021 08:47:07 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 738D26321B; Thu, 9 Sep 2021 11:56:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631188581; bh=aPWGOzrcJUYBnY4fOgV8kDgDENBwRy9fv9+g8i3ZX9Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QGps9I30m1iyGT1yEM5x47hbm745o2DVilx8dCtRQ6Ob4V3QnGZaL3DwRUDBM6qFk 5I974nxMzWI0k/ARPxNrQd3ask4YmZW4z5+4jVq0i8JCZKsnWdBa3Blv26MawSbukL oRKZ6XlW/y8PnKwupiitnqBFxGgd9WRBst6gIZfpijP+Fd9812wOyp9r56x5y1OSdR dJeEr5pl4qOfRD0IHMKa+8FkgSNZZLGwrsbQUe82WXgHzKy38svVtKhn8Lvv3XYidt l15uZFpadTpEoiVNTgO56suX0dg8gJNF7FlhDNFN+zzwGD1PLoovXyE9U4j41ghKb/ xpnGy8T5kfngg== 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.4 058/109] selftests/bpf: Fix xdp_tx.c prog section name Date: Thu, 9 Sep 2021 07:54:15 -0400 Message-Id: <20210909115507.147917-58-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210909115507.147917-1-sashal@kernel.org> References: <20210909115507.147917-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 57912e7c94b0..9ed477776eca 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 "bpf_helpers.h" -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