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;
Date:   Fri, 26 Aug 2022 16:04:55 -0700
From:   Martin KaFai Lau <kafai@fb.com>
To:     James Hilliard <james.hilliard1@gmail.com>
Cc:     bpf@vger.kernel.org, Andrii Nakryiko <andrii@kernel.org>,
        Mykola Lysenko <mykolal@fb.com>,
        Alexei Starovoitov <ast@kernel.org>,
        Daniel Borkmann <daniel@iogearbox.net>,
        Martin KaFai Lau <martin.lau@linux.dev>,
        Song Liu <song@kernel.org>, Yonghong Song <yhs@fb.com>,
        John Fastabend <john.fastabend@gmail.com>,
        KP Singh <kpsingh@kernel.org>,
        Stanislav Fomichev <sdf@google.com>,
        Hao Luo <haoluo@google.com>, Jiri Olsa <jolsa@kernel.org>,
        Shuah Khan <shuah@kernel.org>, linux-kselftest@vger.kernel.org,
        linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2] selftests/bpf: Fix bind{4,6} tcp/socket header type
 conflict
Message-ID: <20220826230455.b5dcrvlmollglhx3@kafai-mbp.dhcp.thefacebook.com>
References: <20220826052925.980431-1-james.hilliard1@gmail.com>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20220826052925.980431-1-james.hilliard1@gmail.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?sUE4m4xixifWILuEHkIcptD/RenLUHmeWWAwnpqf+9jGLB7lsdpvmWG85wSF?=
 =?us-ascii?Q?BejO/u4cQm0sg7j8Vu4YtJSGwh8qcbsmv1z94R1X0aM8DjU/yil98EvcyMwF?=
 =?us-ascii?Q?FsQBDpMFaVhK1/MpO+Chr9//2kBUeNK4h2gudcZSNQcWm0qkYHDVwWFzbpOL?=
 =?us-ascii?Q?Vjos8w32zo5UuDd4s6yXMwNctDEsLh2nyjMIa84HX2GKKd6AFFenQbbKS8g5?=
 =?us-ascii?Q?xujv/+58lu1B+asqEtBvZCSO6vEO9C68BKes160VyMCJ37VWLtHkj58amOLm?=
 =?us-ascii?Q?ZikoLGpwC2cXz9UWijXKWtxvw4zEsdT/yYynzJ38IIMu+pR+fWM+xIWEyLQi?=
 =?us-ascii?Q?B1gfFwvpi8+eoy/DAYrMUaL6ZOEg3Zwvq+Jkwrwl13aIkCVAZu5c8nAUprNu?=
 =?us-ascii?Q?uideIchM2tkNuKhkA3+wiFS+rrWwGN7fUvJo61r0VDVJIzns1KE9GQNTjXhX?=
 =?us-ascii?Q?RAnb88jWrdcCfWOnb/fNTgeXOhEmnHDaG1NUkJYKyLJrQfwFEJpTMfqJ4HMy?=
 =?us-ascii?Q?43R+CJ1ZM/X0g+Aog+hmI1yoUWO8WeviCU2TapmspqmBXVMeDA5gGc1J5YPY?=
 =?us-ascii?Q?dyKOeo/y9nj8JnE02nPlDf9PdGrI17deFxxaJHCBIX6H/73VEYYnSgkev7pD?=
 =?us-ascii?Q?oMYAVd88LspVQMzWETk16qG21yNvT41fhzCpOiOsJBZ1Jno8xsxsubUgruQy?=
 =?us-ascii?Q?DM+U0daCR1rH2Pru4CK1oYigM3av9vx0RlyXoQJB9PFY8NtGJXJ1fWm31bZc?=
 =?us-ascii?Q?CmFcGBpir1v09LsHGhfqlxzYxkSWIEOwjNpXONZ4A2OvXWS+/2SXxq81GtRc?=
 =?us-ascii?Q?AHKsCGM1ab1M4FaJih+17LWZqCBdB/db7B0WDreSOfrcCr46EhoAR/s9S08j?=
 =?us-ascii?Q?U9g1icBLzMIlNOx1oPLeSkP6k0C7dBp2jeagJDYYaOygVgVozUoohyPq7PGS?=
 =?us-ascii?Q?Lf9RL+hDQdpHcKTEvdTjhXMv5pk+g12xLY0LPX5HUITpari0c647jEFsQkiy?=
 =?us-ascii?Q?k7wi+6z9oN3AWNtuwQXFKvAFK4kWmm5SbRft7+o5tGph5837NKXshT3NwyXl?=
 =?us-ascii?Q?Iz4C1btjPj7DJ1j+xLhIne4diZ3LnPC0kwqPjcef3kP9neL1BIuxfxXmX78O?=
 =?us-ascii?Q?BN+vUaaWlEOwhkdKh8kYx4Aql+l3lGiZYjbKfvdEeohVBaedUcvfpHp71Fw4?=
 =?us-ascii?Q?+eVTvvyxjrGsBSTVVhteXSKdaEV+dDEUA6da3crFcnk6g87yPM9n1zYGyWZn?=
 =?us-ascii?Q?+nVIatC6VeFYs8LAmfJdmFf9OeX71wQ6SbQOkzQMUCq4FHdt+9hTYkjFwmvG?=
 =?us-ascii?Q?9Tx3VKz7GJ9bCIPpYUVDQ3wMsDmZbMgdtpPr7thXRh6JJLZwsv39vx+1eNxZ?=
 =?us-ascii?Q?iY24zNtaTWUo3FsilW1LygVlWNhLgWnFkGiLcRfroDfUQRdnlzMWx3FOvzm9?=
 =?us-ascii?Q?LkpB5dSj73vYQe9jrBZgWdGy5sZLub5AYxDGNpMupC883i0mVziGufB/IOQu?=
 =?us-ascii?Q?N8gfv1M/FoDCBL+iAV8m7N8JBUkqkY98oPznkZj7jPpj9qyMFxoMlHCIao9H?=
 =?us-ascii?Q?/uSHwwlolztBNub/pP0Su/LswvOpoyjNKCJ4PMPnRVgWMu4Kcd+7pyxMkYce?=
 =?us-ascii?Q?fw=3D=3D?=
X-OriginatorOrg: fb.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 966005c1-293a-4ecd-e403-08da87b76592
X-MS-Exchange-CrossTenant-AuthSource: MW4PR15MB4475.namprd15.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Aug 2022 23:04:58.0955
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 8ae927fe-1255-47a7-a2af-5f3a069daaa2
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: tZpbZlZsiGB06+c5y/ex3jQ/QFbUJvjOdD6ydkw4Y0NuikUhfwtnNX/lFaJ+SJzg
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR15MB3062
X-Proofpoint-GUID: KiWwsDDqgtsnD_p_XTXqJGrSXCon-6BO
X-Proofpoint-ORIG-GUID: KiWwsDDqgtsnD_p_XTXqJGrSXCon-6BO
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.517,FMLib:17.11.122.1
 definitions=2022-08-26_12,2022-08-25_01,2022-06-22_01
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,
        T_SCC_BODY_TEXT_LINE 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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Thu, Aug 25, 2022 at 11:29:22PM -0600, James Hilliard wrote:
> There is a potential for us to hit a type conflict when including
> netinet/tcp.h with sys/socket.h, we can remove these as they are not
> actually needed.
> 
> Fixes errors like:
> In file included from /usr/include/netinet/tcp.h:91,
>                  from progs/bind4_prog.c:10:
> /home/buildroot/opt/cross/lib/gcc/bpf/13.0.0/include/stdint.h:34:23: error: conflicting types for 'int8_t'; have 'char'
>    34 | typedef __INT8_TYPE__ int8_t;
>       |                       ^~~~~~
> In file included from /usr/include/x86_64-linux-gnu/sys/types.h:155,
>                  from /usr/include/x86_64-linux-gnu/bits/socket.h:29,
>                  from /usr/include/x86_64-linux-gnu/sys/socket.h:33,
>                  from progs/bind4_prog.c:9:
> /usr/include/x86_64-linux-gnu/bits/stdint-intn.h:24:18: note: previous declaration of 'int8_t' with type 'int8_t' {aka 'signed char'}
>    24 | typedef __int8_t int8_t;
>       |                  ^~~~~~
> /home/buildroot/opt/cross/lib/gcc/bpf/13.0.0/include/stdint.h:43:24: error: conflicting types for 'int64_t'; have 'long int'
>    43 | typedef __INT64_TYPE__ int64_t;
>       |                        ^~~~~~~
> /usr/include/x86_64-linux-gnu/bits/stdint-intn.h:27:19: note: previous declaration of 'int64_t' with type 'int64_t' {aka 'long long int'}
>    27 | typedef __int64_t int64_t;
>       |                   ^~~~~~~
> make: *** [Makefile:537: /home/buildroot/bpf-next/tools/testing/selftests/bpf/bpf_gcc/bind4_prog.o] Error 1
> 
> Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
> ---
> Changes v1 -> v2:
>   - just remove netinet/tcp.h and sys/socket.h
> ---
>  tools/testing/selftests/bpf/progs/bind4_prog.c | 2 --
>  tools/testing/selftests/bpf/progs/bind6_prog.c | 2 --
>  2 files changed, 4 deletions(-)
> 
> diff --git a/tools/testing/selftests/bpf/progs/bind4_prog.c b/tools/testing/selftests/bpf/progs/bind4_prog.c
> index 474c6a62078a..a487f60b73ac 100644
> --- a/tools/testing/selftests/bpf/progs/bind4_prog.c
> +++ b/tools/testing/selftests/bpf/progs/bind4_prog.c
> @@ -6,8 +6,6 @@
>  #include <linux/bpf.h>
>  #include <linux/in.h>
>  #include <linux/in6.h>
> -#include <sys/socket.h>
> -#include <netinet/tcp.h>
>  #include <linux/if.h>
Are the AF_INET and SOCK_STREAM coming from linux/if.h somehow
and they are not from indirectly including sys/socket.h ?

If the program does not need if.h, what should it use ?
There are other progs in selftest/bpf that include sys/socket.h
and they have no issue ?