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 6E5BA819; Sat, 6 Jul 2024 00:25:16 +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=1720225516; cv=none; b=r0GzqqjEPjeo1svATn6NEJiemb5ciELoYTYGBuv/siHHXT/9zpJbZPVl5m+MbjIHj5V6eH2+X8ZNXk8W6tDm7WbzQ7tCcMcenhWrF9SB1COOIfu+6zyYJNfOi66cnVEXoWBEX5DwK5dIISo/+6b1G5uHyYSht2msm/HtmLQ21fY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720225516; c=relaxed/simple; bh=HDvxJMVFURzuoh4c5OywGu8H0n7JGtyxxxcWcnJoWXU=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=HA33JL+b1kCdmNgFnXgz8KY0Ff9CZiyeGzY5asJiWpSJi4TzoTs0MBEbtnMWVKTGWnaOQpJRbIbI+E/DVYx2I97RAVDHB3nxEQ8ly+wmhFlUIo6jKyqwl4lzcShQ70UgdyhAPXxBFYJ7gSrtK52kORAl5l2Qz8Tdea/LxnIkNws= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=bU7jiVie; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="bU7jiVie" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D696EC116B1; Sat, 6 Jul 2024 00:25:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1720225516; bh=HDvxJMVFURzuoh4c5OywGu8H0n7JGtyxxxcWcnJoWXU=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=bU7jiVieKBuQprBoh0u/A02pz9mcwwtR0eUlvqFw9gNsXqar0NX5atAJJbzT4poOo eosqTjOzDVpPohLwyuaQ0MYCLH1b47YLuq66jTbzck+spkmCqewht1waTZQIgl61mW GudrQW2tX7CxEgAeKE/u/A/4Xs27PsVL3UwTcLwSj+isXbPZ/kn84QyQStI00m28Qp NHNuuJIx2l1NbGB9xfkrdXuk6Hr4uOn9ZwworXG47dfEiiYHhIFf+mbJ08Gd7lA7gl gEp60/jZVigEfXbrUjzkwuAYD/lE9tknHUbmxHBVV7QsHayj74mHE7EBfaYWoO9Yoi 7rd/NKSJ1rUbw== Message-ID: Date: Sat, 6 Jul 2024 02:25:07 +0200 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Beta Subject: Re: [PATCH bpf-next v3 2/3] selftests/bpf: Add mptcp pm_nl_ctl link Content-Language: en-GB To: Martin KaFai Lau Cc: Andrii Nakryiko , Eduard Zingerman , Mykola Lysenko , Alexei Starovoitov , Daniel Borkmann , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , "David S. Miller" , Jakub Kicinski , Jesper Dangaard Brouer , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, bpf@vger.kernel.org, linux-kselftest@vger.kernel.org, Geliang Tang , mptcp@lists.linux.dev, Mat Martineau , Geliang Tang , Shuah Khan References: <20240703-upstream-bpf-next-20240506-mptcp-subflow-test-v3-0-ebdc2d494049@kernel.org> <20240703-upstream-bpf-next-20240506-mptcp-subflow-test-v3-2-ebdc2d494049@kernel.org> <08f925cd-e267-4a6b-84b1-792515c4e199@kernel.org> <90e916e8-ec4e-447b-8ee6-eb247f3a72ad@linux.dev> From: Matthieu Baerts Autocrypt: addr=matttbe@kernel.org; keydata= xsFNBFXj+ekBEADxVr99p2guPcqHFeI/JcFxls6KibzyZD5TQTyfuYlzEp7C7A9swoK5iCvf YBNdx5Xl74NLSgx6y/1NiMQGuKeu+2BmtnkiGxBNanfXcnl4L4Lzz+iXBvvbtCbynnnqDDqU c7SPFMpMesgpcu1xFt0F6bcxE+0ojRtSCZ5HDElKlHJNYtD1uwY4UYVGWUGCF/+cY1YLmtfb WdNb/SFo+Mp0HItfBC12qtDIXYvbfNUGVnA5jXeWMEyYhSNktLnpDL2gBUCsdbkov5VjiOX7 CRTkX0UgNWRjyFZwThaZADEvAOo12M5uSBk7h07yJ97gqvBtcx45IsJwfUJE4hy8qZqsA62A nTRflBvp647IXAiCcwWsEgE5AXKwA3aL6dcpVR17JXJ6nwHHnslVi8WesiqzUI9sbO/hXeXw TDSB+YhErbNOxvHqCzZEnGAAFf6ges26fRVyuU119AzO40sjdLV0l6LE7GshddyazWZf0iac nEhX9NKxGnuhMu5SXmo2poIQttJuYAvTVUNwQVEx/0yY5xmiuyqvXa+XT7NKJkOZSiAPlNt6 VffjgOP62S7M9wDShUghN3F7CPOrrRsOHWO/l6I/qJdUMW+MHSFYPfYiFXoLUZyPvNVCYSgs 3oQaFhHapq1f345XBtfG3fOYp1K2wTXd4ThFraTLl8PHxCn4ywARAQABzSRNYXR0aGlldSBC YWVydHMgPG1hdHR0YmVAa2VybmVsLm9yZz7CwZEEEwEIADsCGwMFCwkIBwIGFQoJCAsCBBYC AwECHgECF4AWIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZUDpDAIZAQAKCRD2t4JPQmmgcz33 EACjROM3nj9FGclR5AlyPUbAq/txEX7E0EFQCDtdLPrjBcLAoaYJIQUV8IDCcPjZMJy2ADp7 /zSwYba2rE2C9vRgjXZJNt21mySvKnnkPbNQGkNRl3TZAinO1Ddq3fp2c/GmYaW1NWFSfOmw MvB5CJaN0UK5l0/drnaA6Hxsu62V5UnpvxWgexqDuo0wfpEeP1PEqMNzyiVPvJ8bJxgM8qoC cpXLp1Rq/jq7pbUycY8GeYw2j+FVZJHlhL0w0Zm9CFHThHxRAm1tsIPc+oTorx7haXP+nN0J iqBXVAxLK2KxrHtMygim50xk2QpUotWYfZpRRv8dMygEPIB3f1Vi5JMwP4M47NZNdpqVkHrm jvcNuLfDgf/vqUvuXs2eA2/BkIHcOuAAbsvreX1WX1rTHmx5ud3OhsWQQRVL2rt+0p1DpROI 3Ob8F78W5rKr4HYvjX2Inpy3WahAm7FzUY184OyfPO/2zadKCqg8n01mWA9PXxs84bFEV2mP VzC5j6K8U3RNA6cb9bpE5bzXut6T2gxj6j+7TsgMQFhbyH/tZgpDjWvAiPZHb3sV29t8XaOF BwzqiI2AEkiWMySiHwCCMsIH9WUH7r7vpwROko89Tk+InpEbiphPjd7qAkyJ+tNIEWd1+MlX ZPtOaFLVHhLQ3PLFLkrU3+Yi3tXqpvLE3gO3LM7BTQRV4/npARAA5+u/Sx1n9anIqcgHpA7l 5SUCP1e/qF7n5DK8LiM10gYglgY0XHOBi0S7vHppH8hrtpizx+7t5DBdPJgVtR6SilyK0/mp 9nWHDhc9rwU3KmHYgFFsnX58eEmZxz2qsIY8juFor5r7kpcM5dRR9aB+HjlOOJJgyDxcJTwM 1ey4L/79P72wuXRhMibN14SX6TZzf+/XIOrM6TsULVJEIv1+NdczQbs6pBTpEK/G2apME7vf mjTsZU26Ezn+LDMX16lHTmIJi7Hlh7eifCGGM+g/AlDV6aWKFS+sBbwy+YoS0Zc3Yz8zrdbi Kzn3kbKd+99//mysSVsHaekQYyVvO0KD2KPKBs1S/ImrBb6XecqxGy/y/3HWHdngGEY2v2IP Qox7mAPznyKyXEfG+0rrVseZSEssKmY01IsgwwbmN9ZcqUKYNhjv67WMX7tNwiVbSrGLZoqf Xlgw4aAdnIMQyTW8nE6hH/Iwqay4S2str4HZtWwyWLitk7N+e+vxuK5qto4AxtB7VdimvKUs x6kQO5F3YWcC3vCXCgPwyV8133+fIR2L81R1L1q3swaEuh95vWj6iskxeNWSTyFAVKYYVskG V+OTtB71P1XCnb6AJCW9cKpC25+zxQqD2Zy0dK3u2RuKErajKBa/YWzuSaKAOkneFxG3LJIv Hl7iqPF+JDCjB5sAEQEAAcLBXwQYAQIACQUCVeP56QIbDAAKCRD2t4JPQmmgc5VnD/9YgbCr HR1FbMbm7td54UrYvZV/i7m3dIQNXK2e+Cbv5PXf19ce3XluaE+wA8D+vnIW5mbAAiojt3Mb 6p0WJS3QzbObzHNgAp3zy/L4lXwc6WW5vnpWAzqXFHP8D9PTpqvBALbXqL06smP47JqbyQxj Xf7D2rrPeIqbYmVY9da1KzMOVf3gReazYa89zZSdVkMojfWsbq05zwYU+SCWS3NiyF6QghbW voxbFwX1i/0xRwJiX9NNbRj1huVKQuS4W7rbWA87TrVQPXUAdkyd7FRYICNW+0gddysIwPoa KrLfx3Ba6Rpx0JznbrVOtXlihjl4KV8mtOPjYDY9u+8x412xXnlGl6AC4HLu2F3ECkamY4G6 UxejX+E6vW6Xe4n7H+rEX5UFgPRdYkS1TA/X3nMen9bouxNsvIJv7C6adZmMHqu/2azX7S7I vrxxySzOw9GxjoVTuzWMKWpDGP8n71IFeOot8JuPZtJ8omz+DZel+WCNZMVdVNLPOd5frqOv mpz0VhFAlNTjU1Vy0CnuxX3AM51J8dpdNyG0S8rADh6C8AKCDOfUstpq28/6oTaQv7QZdge0 JY6dglzGKnCi/zsmp2+1w559frz4+IC7j/igvJGX4KDDKUs0mlld8J2u2sBXv7CGxdzQoHaz lzVbFe7fduHbABmYz9cefQpO7wDE/Q== Organization: NGI0 Core In-Reply-To: <90e916e8-ec4e-447b-8ee6-eb247f3a72ad@linux.dev> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Hi Martin, Thank you for your reply! On 06/07/2024 01:10, Martin KaFai Lau wrote: > On 7/4/24 3:48 AM, Matthieu Baerts wrote: >>> diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/ >>> selftests/bpf/Makefile >>> index e0b3887b3d2d..204269d0b5b8 100644 >>> --- a/tools/testing/selftests/bpf/Makefile >>> +++ b/tools/testing/selftests/bpf/Makefile >>> @@ -144,7 +144,7 @@ TEST_GEN_PROGS_EXTENDED = test_skb_cgroup_id_user \ >>>       flow_dissector_load test_flow_dissector >>> test_tcp_check_syncookie_user \ >>>       test_lirc_mode2_user xdping test_cpp runqslower bench >>> bpf_testmod.ko \ >>>       xskxceiver xdp_redirect_multi xdp_synproxy veristat >>> xdp_hw_metadata \ >>> -    xdp_features bpf_test_no_cfi.ko >>> +    xdp_features bpf_test_no_cfi.ko mptcp_pm_nl_ctl >> On the BPF CI, we have such errors: >> >>     mptcp_pm_nl_ctl.c:20:10: fatal error: 'linux/mptcp.h' file not found >>       20 | #include "linux/mptcp.h" >>          |          ^~~~~~~~~~~~~~~ >> >> On my side, I don't have any issue, because the compiler uses the >> mptcp.h file from the system: /usr/include/linux/mptcp.h >> >> I suppose that's not OK on the BPF CI, as it looks like it doesn't have >> this file there, probably because it still uses Ubuntu 20.04 as base, >> which doesn't include this file in the linux-libc-dev package. >> >> When I look at how this 'mptcp_pm_nl_ctl' tool -- and all the other >> programs from that list -- is compiled (V=1), I see that the following >> "-I" options are given: >> >>    -I${PWD}/tools/testing/selftests/bpf >>    -I${BUILD}//tools/include >>    -I${BUILD}/include/generated >>    -I${PWD}/tools/lib >>    -I${PWD}/tools/include >>    -I${PWD}/tools/include/uapi >>    -I${BUILD}/ >> >> It will then not look at -I${PWD}/usr/include or the directory generated >> with: >> >>    make headers_install INSTALL_HDR_PATH=(...) > > It sounds like the tools/testing/selftests/net/mptcp/Makefile is looking > at this include path, so it works? Yes it does work. > iiu the bpf/Makefile correctly, it has the bpftool "make" compiled and > installed at tools/testing/selftests/bpf/tools/sbin/. May be directly > compile the pm_nl_ctl by "make tools/testing/selftests/net/mptcp/"? That could be an alternative, I didn't know it would be OK to add such dependence, good idea. >> I guess that's why people have duplicated files in 'tools/include/uapi', >> but I also understood from Jakub that it is not a good idea to continue >> to do so. >> >> What would be the best solution to avoid a copy? A symlink still looks >> like a workaround. >> >> In the other selftests, KHDR_INCLUDES is used to be able to include the >> path containing the UAPI headers. So if someone built the headers in a > > Meaning KHDR_INCLUDES should be used and -I${PWD}/tools/include/uapi can > be retired? That's the idea, yes, for "userspace programs". I mean: for BPF programs requiring vmlinux.h (BPF_CFLAGS), I guess you will still need the bpf.h file from tools/include/uapi, no? > I haven't looked into the details. I quickly tried but it > fails in my environment. Do you not have issues because some files have something like: #include On my side, I had a working version using this patch: > diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile > index 7c5827d20c2e..112f14d40852 100644 > --- a/tools/testing/selftests/bpf/Makefile > +++ b/tools/testing/selftests/bpf/Makefile > @@ -37,7 +37,7 @@ CFLAGS += -g $(OPT_FLAGS) -rdynamic \ > -Wall -Werror -fno-omit-frame-pointer \ > $(GENFLAGS) $(SAN_CFLAGS) $(LIBELF_CFLAGS) \ > -I$(CURDIR) -I$(INCLUDE_DIR) -I$(GENDIR) -I$(LIBDIR) \ > - -I$(TOOLSINCDIR) -I$(APIDIR) -I$(OUTPUT) > + -I$(TOOLSINCDIR) $(KHDR_INCLUDES) -I$(OUTPUT) > LDFLAGS += $(SAN_LDFLAGS) > LDLIBS += $(LIBELF_LIBS) -lz -lrt -lpthread > But only after having removed these extra 'uapi/': $ git grep -l '> seperated directory -- INSTALL_HDR_PATH=(...) -- KHDR_INCLUDES can be >> overridden to look there, instead of ${KERNEL_SRC}/usr/include. Would it >> be OK to do that? Would it work for the CI without extra changes? Or do >> you still prefer a copy/symlink to 'tools/include/uapi' instead? Cheers, Matt -- Sponsored by the NGI0 Core fund.