From patchwork Mon Nov 7 14:30:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrea Mayer X-Patchwork-Id: 16509 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2108360wru; Mon, 7 Nov 2022 07:10:49 -0800 (PST) X-Google-Smtp-Source: AMsMyM4SGEnPdBNCG0YHYjbjNcrfNYcczzLROUP8afHHk7UQvMbMO7a305Fp7usujm5ZHkcrUPHJ X-Received: by 2002:a05:6402:688:b0:463:babc:f400 with SMTP id f8-20020a056402068800b00463babcf400mr745965edy.294.1667833849456; Mon, 07 Nov 2022 07:10:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667833849; cv=none; d=google.com; s=arc-20160816; b=SShQryXBmN/91cXp/lMWmplBqXXKIdgySVQqVhrPeA7yg/b402qDvIa+aKIxwv/2YC I/Dloqwi7ag8opA8Y2mWe0R8gNEmWYC4TlMuVo5PVbuROi1XcR9Sedp0LH2xi+L1ur+a lsiKJn8jTud0VZDgLbXDVPBGGawW8hznWQyNtBvpNCbdc3BW0J7glD5bLUZGrQdSXFYb HLioKCsEIc/eKwReWwpmlhKsQvxTzkZMV69+s3EWG9K86PoeESLrMgZvIVtZsT7blNQW OgjcFR25ICYxZPjptKeOLUNEj+KukcQK3y9N5pbwExqAI5wLVsGSc77lxcOmyfNbjCTx 9Sgw== 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 :message-id:date:subject:cc:to:from; bh=npTIZtjwLckdghIdN1sLT+WkkPZOy1Cru8eqDldb3vA=; b=iU0bARQckfOFXPotQESwAcntAFEQjfAUnbuVZ7NGLwiKbuQGR7xrGb9l+ndizijNlC l/C5/btEOrkv6n9GcqB4RLe/kkkuVcooeXuoeDnn2989XfAgvtovJWD65lEiljmCrxdI FwuCTGWaqQ323WlcGae53K2DPJaDHIlk8seXXeD7IQ0tK0rJWE1G9uTbI9i/dCpUjmsH yd/KQLyP81Lnhe5cQ55NuSxAZxS+IVI71X3jTIKHs4n/LY8yZPd79cJ0gmv+1ev1NCGL 9DGAtdeYhc5bgm2HYvA19POvb2VYM7yfXu84Ja0aQ/FsrJj17MDB99aLcCN8bKwMuxk6 z+9w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=uniroma2.it Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id go37-20020a1709070da500b0078e1246e7d6si10662236ejc.748.2022.11.07.07.10.24; Mon, 07 Nov 2022 07:10:49 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=uniroma2.it Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232711AbiKGPJ6 (ORCPT + 99 others); Mon, 7 Nov 2022 10:09:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51520 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232144AbiKGPJ4 (ORCPT ); Mon, 7 Nov 2022 10:09:56 -0500 X-Greylist: delayed 600 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Mon, 07 Nov 2022 07:09:53 PST Received: from smtp.uniroma2.it (smtp.uniroma2.it [160.80.6.16]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7294B1DA74; Mon, 7 Nov 2022 07:09:53 -0800 (PST) Received: from localhost.localdomain ([160.80.103.126]) by smtp-2015.uniroma2.it (8.14.4/8.14.4/Debian-8) with ESMTP id 2A7EUxlV025525 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Mon, 7 Nov 2022 15:30:59 +0100 From: Andrea Mayer To: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Mykola Lysenko , Shuah Khan , =?utf-8?q?D?= =?utf-8?q?aniel_M=C3=BCller?= , bpf@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Stefano Salsano , Paolo Lungaroni , Ahmed Abdelsalam , Andrea Mayer Subject: [net] seg6: selftests/bpf: fix BPF object file name in test_lwt_seg6local.sh Date: Mon, 7 Nov 2022 15:30:44 +0100 Message-Id: <20221107143044.27763-1-andrea.mayer@uniroma2.it> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.100.0 at smtp-2015 X-Virus-Status: Clean X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748850546919725219?= X-GMAIL-MSGID: =?utf-8?q?1748850546919725219?= The test_lwt_seg6local.c implements several eBPF programs which are used to test the SRv6 End.BPF behavior. Since commit afef88e65554 ("selftests/bpf: Store BPF object files with .bpf.o extension"), part of the build system and test programs loading BPF object files are supposed to work with the .bpf.o extension. Consequently, the test_lwt_seg6local.c is compiled into test_lwt_seg6local.bpf.o and the corresponding test_lwt_seg6local.sh script is not updated to deal with the correct .bpf.o extension. This patch fixes the test_lwt_seg6local.sh, using the correct .bpf.o extension for the testing BPF object file, i.e. test_lwt_seg6local.bpf.o. Fixes: afef88e65554 ("selftests/bpf: Store BPF object files with .bpf.o extension") Signed-off-by: Andrea Mayer Acked-by: Daniel Müller Acked-by: Yonghong Song --- tools/testing/selftests/bpf/test_lwt_seg6local.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/bpf/test_lwt_seg6local.sh b/tools/testing/selftests/bpf/test_lwt_seg6local.sh index 826f4423ce02..bfe76ab78481 100755 --- a/tools/testing/selftests/bpf/test_lwt_seg6local.sh +++ b/tools/testing/selftests/bpf/test_lwt_seg6local.sh @@ -117,18 +117,18 @@ ip netns exec ${NS6} ip -6 addr add fb00::109/16 dev veth10 scope link ip netns exec ${NS1} ip -6 addr add fb00::1/16 dev lo ip netns exec ${NS1} ip -6 route add fb00::6 dev veth1 via fb00::21 -ip netns exec ${NS2} ip -6 route add fb00::6 encap bpf in obj test_lwt_seg6local.o sec encap_srh dev veth2 +ip netns exec ${NS2} ip -6 route add fb00::6 encap bpf in obj test_lwt_seg6local.bpf.o sec encap_srh dev veth2 ip netns exec ${NS2} ip -6 route add fd00::1 dev veth3 via fb00::43 scope link ip netns exec ${NS3} ip -6 route add fc42::1 dev veth5 via fb00::65 -ip netns exec ${NS3} ip -6 route add fd00::1 encap seg6local action End.BPF endpoint obj test_lwt_seg6local.o sec add_egr_x dev veth4 +ip netns exec ${NS3} ip -6 route add fd00::1 encap seg6local action End.BPF endpoint obj test_lwt_seg6local.bpf.o sec add_egr_x dev veth4 -ip netns exec ${NS4} ip -6 route add fd00::2 encap seg6local action End.BPF endpoint obj test_lwt_seg6local.o sec pop_egr dev veth6 +ip netns exec ${NS4} ip -6 route add fd00::2 encap seg6local action End.BPF endpoint obj test_lwt_seg6local.bpf.o sec pop_egr dev veth6 ip netns exec ${NS4} ip -6 addr add fc42::1 dev lo ip netns exec ${NS4} ip -6 route add fd00::3 dev veth7 via fb00::87 ip netns exec ${NS5} ip -6 route add fd00::4 table 117 dev veth9 via fb00::109 -ip netns exec ${NS5} ip -6 route add fd00::3 encap seg6local action End.BPF endpoint obj test_lwt_seg6local.o sec inspect_t dev veth8 +ip netns exec ${NS5} ip -6 route add fd00::3 encap seg6local action End.BPF endpoint obj test_lwt_seg6local.bpf.o sec inspect_t dev veth8 ip netns exec ${NS6} ip -6 addr add fb00::6/16 dev lo ip netns exec ${NS6} ip -6 addr add fd00::4/16 dev lo