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:   Thu, 25 Aug 2022 22:49:44 -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] selftests/bpf: Fix bind{4,6} tcp/socket header type
 conflict
Message-ID: <20220826054944.5bcx7unsyx4ts6ok@kafai-mbp.dhcp.thefacebook.com>
References: <20220825221751.258958-1-james.hilliard1@gmail.com>
 <20220826051630.glhrbdhiybtqwc4p@kafai-mbp.dhcp.thefacebook.com>
 <CADvTj4rQdnd=V0tENFGCTtpTESwSCcwK+h3i9nZ75M+TywNWzA@mail.gmail.com>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CADvTj4rQdnd=V0tENFGCTtpTESwSCcwK+h3i9nZ75M+TywNWzA@mail.gmail.com>
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?SkUk61kKz3YnZgPFpXwuZsQCfDCg18Cg8J/prPpxT4n1VBq31CMrZabyvxA+?=
 =?us-ascii?Q?yzVmL1hIcCcwWx7+4JqpI807BQF9YNmGq+kOiJzA8wUld+O3fS/hfGSIBrLk?=
 =?us-ascii?Q?u+GYZN8B82LFj/wXKd+kRtEYw8zTInuc8wuLsfMXSsazcRvi5xEidKi6FLaP?=
 =?us-ascii?Q?s/xpMSQS4d9dNNZtvN9qA7wK69kn+kH94utGtI3Llu2YLKvsetzSpKZOJ0jf?=
 =?us-ascii?Q?Cl8KdayOmYbzLrD8M62JsL3KpuP2aYGp+LgCN7Q+Q0/kgI5X+XXF1fXpV+Ml?=
 =?us-ascii?Q?6o1OvvDDm3MNc7NLKlFvTkzd28E8WdTx3kmvUsrRmip+8zgFcw/Kz0dYkHpX?=
 =?us-ascii?Q?1mHTuiBXYkG9tIRWRywl1/7+2ZIr0T8xRzGA1Xm1/NVDdxoYo97jj+tQghwg?=
 =?us-ascii?Q?YsslNTKI8S6ZyclNxQxP+Z0atOX1RQeh4uAEhc3iwrT79onwjNU2DHyHhbMA?=
 =?us-ascii?Q?R7RQCS42aNkUWVR8ZeG7Ax7AO2OYWkcWLSERid7Hdoeh2B8GsU6TMmkf4YEr?=
 =?us-ascii?Q?ahzMqjRcdZjUQ9umWS69XrWrL5eELxYha2pUGr/LgTz02RsbT1pmURs9PYCE?=
 =?us-ascii?Q?jqY5iE2z6Vqj8/q1j/7eON1M+61U0AWIc1n3hVKXW3+wq0P6WtbUff839tLK?=
 =?us-ascii?Q?RwZ3GmehvtoZoMZgoYY2fnJQ/bd3T9qexbmC2+0rWJ1KDYE+eVmqVtp9IZx0?=
 =?us-ascii?Q?rCThN73BZyQZ1G4pptnEFOmnFbG5QkDW5h/WSM+VUgxjL7N7d2JQ5QCnyrO9?=
 =?us-ascii?Q?sWmGhRr7590DsQBkDDmmVDnzclRa9DPsEJmYgFjLG4gDfhrbbtY/e5kNUIkP?=
 =?us-ascii?Q?tsSqCJaY9GEsQlwlTAjvTuVKh82Heqzeiirs87HgzWOVlLwE8NIwYiNnV6nP?=
 =?us-ascii?Q?dIzX96BRUi3GNwEPMWnw4ww3uII4/TdpWF9V0DPy6oJFZgEgQWYvx6c6sPyN?=
 =?us-ascii?Q?kp+l7tHqczsd3OnNQ5Cqfv0zHsNud2mydoSU3uSxQC0uUJvLMOp0xwr86ND6?=
 =?us-ascii?Q?PuCVYqAV7QOutWHfxZlanIG34qZXUEZTYYhWyA9E5zokqfvscqp+0X5YY0gx?=
 =?us-ascii?Q?YiTPRHwinOOLotzvTksYEXBeneVp7CnKvaVwaKWyIMTWEjkcyuzPJl3gqcyp?=
 =?us-ascii?Q?HT6naoDbsTx24xQYcqp8H80dlmRdoZJ2ls1o5eIf46Vwtuffr7gB//MyTpbC?=
 =?us-ascii?Q?tzulEmb9NAWEXPeDjX9AReAa2e60wiX0/RVdLgGAai3Lwl3sHTh3BzZQ9bgY?=
 =?us-ascii?Q?SzNV1mULu4lDleno6P92ubvR59LbOSoBWwEK1Fv1pRstocQWsr0pLwk1QEwv?=
 =?us-ascii?Q?EZ1DqogXq0d/XClwI8OTZsQaJn7mZzwjq6FEBe+SHNbAypDfTI7Vh9mV0b6m?=
 =?us-ascii?Q?HaNsM0n5KQPuQ/B4ctqs27sA9jGGnLhN0ug9CcCj72ENUcNvfUBCGLLqmJWL?=
 =?us-ascii?Q?Z+KDoxa+dfhkUTnt96gunbFM3q9v1ZgJ6eYmDh7oFnD2eb9jarX6Pgow8cUa?=
 =?us-ascii?Q?IpywMZF5q6dgy+9moYU6pUwLDgWuHWosUBRgkcunUflOCHqN6e3ox6umur1G?=
 =?us-ascii?Q?rWR3BsPfY9CBE5XlZp0DecevG7CwLmr1iH3mop99AHAa2OdgFil1lH/wajlz?=
 =?us-ascii?Q?Qw=3D=3D?=
X-OriginatorOrg: fb.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e71ac0c8-7081-45fa-9a37-08da8726c820
X-MS-Exchange-CrossTenant-AuthSource: MW4PR15MB4475.namprd15.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Aug 2022 05:49:46.4308
 (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: mPxPkBoyj0W5ihMQ0xojunLwOtaUowP68y+1qNBcGW/d/nAQYx05dL2aIzufUa4G
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR15MB3605
X-Proofpoint-GUID: eU9b0jHeYUPSLtI71rTXMXuUTRe8heHN
X-Proofpoint-ORIG-GUID: eU9b0jHeYUPSLtI71rTXMXuUTRe8heHN
X-Proofpoint-UnRewURL: 0 URL was un-rewritten
MIME-Version: 1.0
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_02,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:31:15PM -0600, James Hilliard wrote:
> On Thu, Aug 25, 2022 at 11:16 PM Martin KaFai Lau <kafai@fb.com> wrote:
> >
> > On Thu, Aug 25, 2022 at 04:17:49PM -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 replace both of these includes
> > > with linux/tcp.h to avoid this conflict.
> > >
> > > 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>
> > > ---
> > >  tools/testing/selftests/bpf/progs/bind4_prog.c | 3 +--
> > >  tools/testing/selftests/bpf/progs/bind6_prog.c | 3 +--
> > >  2 files changed, 2 insertions(+), 4 deletions(-)
> > >
> > > diff --git a/tools/testing/selftests/bpf/progs/bind4_prog.c b/tools/testing/selftests/bpf/progs/bind4_prog.c
> > > index 474c6a62078a..6bd20042fd53 100644
> > > --- a/tools/testing/selftests/bpf/progs/bind4_prog.c
> > > +++ b/tools/testing/selftests/bpf/progs/bind4_prog.c
> > > @@ -6,8 +6,7 @@
> > >  #include <linux/bpf.h>
> > >  #include <linux/in.h>
> > >  #include <linux/in6.h>
> > > -#include <sys/socket.h>
> > > -#include <netinet/tcp.h>
> > These includes look normal to me.  What environment is hitting this.
> 
> I was hitting this error with GCC 13(GCC master branch).
These two includes (<sys/socket.h> and <netinet/tcp.h>) are normal,
so does it mean all existing programs need to change to use gcc 13 ?

> 
> > I don't prefer the selftest writers need to remember this rule.
> >
> > Beside, afaict, tcp.h should be removed because
> > I don't see this test needs it.  I tried removing it
> > and it works fine.  It should be removed instead of replacing it
> > with another unnecessary tcp.h.
> 
> Oh, that does also appear to work, thought I had tried that already but I guess
> I hadn't, sent a v2 with them removed:
> https://lore.kernel.org/bpf/20220826052925.980431-1-james.hilliard1@gmail.com/T/#u
> 
> >
> > > +#include <linux/tcp.h>
> > >  #include <linux/if.h>
> > >  #include <errno.h>
> > >
> > > diff --git a/tools/testing/selftests/bpf/progs/bind6_prog.c b/tools/testing/selftests/bpf/progs/bind6_prog.c
> > > index c19cfa869f30..f37617b35a55 100644
> > > --- a/tools/testing/selftests/bpf/progs/bind6_prog.c
> > > +++ b/tools/testing/selftests/bpf/progs/bind6_prog.c
> > > @@ -6,8 +6,7 @@
> > >  #include <linux/bpf.h>
> > >  #include <linux/in.h>
> > >  #include <linux/in6.h>
> > > -#include <sys/socket.h>
> > > -#include <netinet/tcp.h>
> > > +#include <linux/tcp.h>
> > >  #include <linux/if.h>
> > >  #include <errno.h>
> > >
> > > --
> > > 2.34.1
> > >