From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8853FC433FE for ; Tue, 21 Dec 2021 23:52:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238228AbhLUXwo (ORCPT ); Tue, 21 Dec 2021 18:52:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34578 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231741AbhLUXwn (ORCPT ); Tue, 21 Dec 2021 18:52:43 -0500 Received: from mail-il1-x12a.google.com (mail-il1-x12a.google.com [IPv6:2607:f8b0:4864:20::12a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6DB38C061574; Tue, 21 Dec 2021 15:52:43 -0800 (PST) Received: by mail-il1-x12a.google.com with SMTP id u8so533448ilk.0; Tue, 21 Dec 2021 15:52:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=vew+Y6C0Xb4YbeDjKWJ5N89q8pmGnOIhzn71f8LdWQI=; b=EaNe3ZSvokj/H/pohy2LjACQAmPjtsoc7e9TOiwwVjNOe0NV3jJFuDeHisHSmFg19n gaB0NAMWSofDJjyv/mtQZCBg2AxOpnoXuNiZMslBRQzDwmxXsCHSQOorSIy2Qhpwdj2w eVXRAf+Ng78+AlCtuzbPENAIMgUvN275RLUR60CCInXfRHdcsyOWaSQQCIRFmjpnk0nm MLoOSSU24l1qdHCnBO0esW2VQmNeD9iAxj3bMWUf+ZjOQkVrD59tWz0pBIlgQ+yV2uwK f9tEXapPrpHGJG1CmjwusUHoHzumcQBeS6jKPoPmaeaN3H/YmnecDDfKulihPlTEn7vg 4vhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=vew+Y6C0Xb4YbeDjKWJ5N89q8pmGnOIhzn71f8LdWQI=; b=rDeLtQxpwV0Ml5zTKtkW7pfLv6U3RPGLsrB8v5Gl4Rg+hvT5YTgVhKx3KYpy+R/2cj Kr+Jgn44Mk/78h1sgEdeGK27IEyxtzuMZ6MFj4zfcXx45op0xNZhnfDjyKlAIgkDs9BI 5thMSBCAlytiKSXrobalwWiIIOpTf6ljQlWJiJlwwNwWEhfa+0FIbbADNGkT0uS3aVz9 E3CElBlVJPmxoXpnA0uu6448QgFlfPhcrFNBMHk3GmQhOCdcC3pfjumzW/Ry9pToaoIG KaSFb609tXm9d2onSmadJFJJcF+3RxV3GMaS6dophYJlDo81pDKOHfWHWBQG9iy3QGuV nNew== X-Gm-Message-State: AOAM533Y6kSpAsIiitM03EJRpKqKH2osCzom7/XVaj0UszGX0+BWEkVc pMNpR6nObdGa7c5I+1dq4HCU+kRxj1tSDQNB9N4= X-Google-Smtp-Source: ABdhPJw6EW6RqfsSqxydJGudx4Qgp0WEhCNkhiP+plg+tm0GmGuZ04r1MKvAkbCXFQYs+Jb3vh4//oyKqEPK+fBG50s= X-Received: by 2002:a05:6e02:1a21:: with SMTP id g1mr257519ile.71.1640130762806; Tue, 21 Dec 2021 15:52:42 -0800 (PST) MIME-Version: 1.0 References: <20211214135555.125348-1-pulehui@huawei.com> <50d81d9c-2b5f-9dfd-a284-9778e6273725@huawei.com> <88aa98df-b566-d031-b9f9-2b88a437a810@huawei.com> In-Reply-To: <88aa98df-b566-d031-b9f9-2b88a437a810@huawei.com> From: Andrii Nakryiko Date: Tue, 21 Dec 2021 15:52:31 -0800 Message-ID: Subject: Re: [PATCH bpf-next] selftests/bpf: Fix building error when using userspace pt_regs To: Pu Lehui Cc: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin Lau , Song Liu , Yonghong Song , john fastabend , KP Singh , Paul Walmsley , Palmer Dabbelt , Albert Ou , Shuah Khan , "open list:KERNEL SELFTEST FRAMEWORK" , Networking , bpf , open list Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Dec 20, 2021 at 4:58 PM Pu Lehui wrote: > > > > On 2021/12/20 22:02, Pu Lehui wrote: > > > > > > On 2021/12/18 0:45, Andrii Nakryiko wrote: > >> On Thu, Dec 16, 2021 at 6:25 PM Pu Lehui wrote: > >>> > >>> > >>> > >>> On 2021/12/16 12:06, Andrii Nakryiko wrote: > >>>> On Tue, Dec 14, 2021 at 5:54 AM Pu Lehui wrote: > >>>>> > >>>>> When building bpf selftests on arm64, the following error will occur: > >>>>> > >>>>> progs/loop2.c:20:7: error: incomplete definition of type 'struct > >>>>> user_pt_regs' > >>>>> > >>>>> Some archs, like arm64 and riscv, use userspace pt_regs in > >>>>> bpf_tracing.h, which causes build failure when bpf prog use > >>>>> macro in bpf_tracing.h. So let's use vmlinux.h directly. > >>>> > >>>> We could probably also extend bpf_tracing.h to work with > >>>> kernel-defined pt_regs, just like we do for x86 (see __KERNEL__ and > >>>> __VMLINUX_H__ checks). It's more work, but will benefit other end > >>>> users, not just selftests. > >>>> > >>> It might change a lot. We can use header file directory generated by > >>> "make headers_install" to fix it. > >> > >> We don't have dependency on "make headers_install" and I'd rather not > >> add it. > >> > >> What do you mean by "change a lot"? > >> > > Maybe I misunderstood your advice. Your suggestion might be to extend > > bpf_tracing.h to kernel-space pt_regs, while some archs, like arm64, yes > > only support user-space. So the patch might be like this: > > > > diff --git a/tools/lib/bpf/bpf_tracing.h b/tools/lib/bpf/bpf_tracing.h > > index db05a5937105..2c3cb8e9ae92 100644 > > --- a/tools/lib/bpf/bpf_tracing.h > > +++ b/tools/lib/bpf/bpf_tracing.h > > @@ -195,9 +195,13 @@ struct pt_regs; > > > > #elif defined(bpf_target_arm64) > > > > -struct pt_regs; > > +#if defined(__KERNEL__) > > +#define PT_REGS_ARM64 const volatile struct pt_regs > > +#else > > /* arm64 provides struct user_pt_regs instead of struct pt_regs to > > userspace */ > > #define PT_REGS_ARM64 const volatile struct user_pt_regs > > +#endif > > + > > #define PT_REGS_PARM1(x) (((PT_REGS_ARM64 *)(x))->regs[0]) > > #define PT_REGS_PARM2(x) (((PT_REGS_ARM64 *)(x))->regs[1]) > > #define PT_REGS_PARM3(x) (((PT_REGS_ARM64 *)(x))->regs[2]) > > > Please ignore the last reply. User-space pt_regs of arm64/s390 is the > first part of the kernel-space's, it should has covered both kernel and > userspace. Alright, so is there still a problem or not? Looking at the definition of struct pt_regs for arm64, just casting struct pt_regs to struct user_pt_regs will indeed just work. So in that case, what was your original issue? > >>> > >>> --- a/tools/testing/selftests/bpf/Makefile > >>> +++ b/tools/testing/selftests/bpf/Makefile > >>> @@ -294,7 +294,8 @@ MENDIAN=$(if > >>> $(IS_LITTLE_ENDIAN),-mlittle-endian,-mbig-endian) > >>> CLANG_SYS_INCLUDES = $(call get_sys_includes,$(CLANG)) > >>> BPF_CFLAGS = -g -D__TARGET_ARCH_$(SRCARCH) $(MENDIAN) \ > >>> -I$(INCLUDE_DIR) -I$(CURDIR) -I$(APIDIR) \ > >>> - -I$(abspath $(OUTPUT)/../usr/include) > >>> + -I$(abspath $(OUTPUT)/../usr/include) \ > >>> + -I../../../../usr/include > >>>>> > >>>>> Signed-off-by: Pu Lehui > >>>>> --- > >>>>> tools/testing/selftests/bpf/progs/loop1.c | 8 ++------ > >>>>> tools/testing/selftests/bpf/progs/loop2.c | 8 ++------ > >>>>> tools/testing/selftests/bpf/progs/loop3.c | 8 ++------ > >>>>> tools/testing/selftests/bpf/progs/loop6.c | 20 > >>>>> ++++++------------- > >>>>> .../selftests/bpf/progs/test_overhead.c | 8 ++------ > >>>>> .../selftests/bpf/progs/test_probe_user.c | 6 +----- > >>>>> 6 files changed, 15 insertions(+), 43 deletions(-) > >>>>> > >>>> > >>>> [...] > >>>> . > >>>> > >> . > >> > > .