From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751478AbdBJCax (ORCPT ); Thu, 9 Feb 2017 21:30:53 -0500 Received: from szxga01-in.huawei.com ([58.251.152.64]:1410 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751217AbdBJCau (ORCPT ); Thu, 9 Feb 2017 21:30:50 -0500 Subject: Re: [PATCH net-next v5 10/11] bpf: Remove bpf_sys.h from selftests To: =?UTF-8?Q?Micka=c3=abl_Sala=c3=bcn?= , References: <20170209232145.19085-1-mic@digikod.net> <20170209232145.19085-11-mic@digikod.net> CC: Alexei Starovoitov , Arnaldo Carvalho de Melo , Daniel Borkmann , "David S . Miller" , , Shuah Khan From: "Wangnan (F)" Message-ID: <828ab1ff-4dcf-53ff-c97b-074adb895006@huawei.com> Date: Fri, 10 Feb 2017 10:30:13 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.5.1 MIME-Version: 1.0 In-Reply-To: <20170209232145.19085-11-mic@digikod.net> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 8bit X-Originating-IP: [10.111.194.139] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020203.589D25CB.0052,ss=1,re=0.000,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0, ip=0.0.0.0, so=2013-06-18 04:22:30, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 524549436caef89bbd37b22dac65c772 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2017/2/10 7:21, Mickaël Salaün wrote: > Add require dependency headers. > > Signed-off-by: Mickaël Salaün > Cc: Alexei Starovoitov > Cc: Daniel Borkmann > Cc: Shuah Khan > --- > tools/lib/bpf/bpf.c | 6 ++++++ > tools/testing/selftests/bpf/bpf_sys.h | 27 --------------------------- > tools/testing/selftests/bpf/test_lpm_map.c | 1 - > tools/testing/selftests/bpf/test_lru_map.c | 1 - > tools/testing/selftests/bpf/test_maps.c | 1 - > tools/testing/selftests/bpf/test_tag.c | 3 +-- > tools/testing/selftests/bpf/test_verifier.c | 4 ++-- > 7 files changed, 9 insertions(+), 34 deletions(-) > delete mode 100644 tools/testing/selftests/bpf/bpf_sys.h > > diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c > index f8a2b7fa7741..50e04cc5dddd 100644 > --- a/tools/lib/bpf/bpf.c > +++ b/tools/lib/bpf/bpf.c > @@ -50,7 +50,13 @@ static __u64 ptr_to_u64(const void *ptr) > static int sys_bpf(enum bpf_cmd cmd, union bpf_attr *attr, > unsigned int size) > { > +#ifdef __NR_bpf > return syscall(__NR_bpf, cmd, attr, size); > +#else > + fprintf(stderr, "No bpf syscall, kernel headers too old?\n"); > + errno = ENOSYS; > + return -1; > +#endif > } > We don't need check __NR_bpf again. It has already been checked at the header of this file: #ifndef __NR_bpf # if defined(__i386__) # define __NR_bpf 357 # elif defined(__x86_64__) # define __NR_bpf 321 # elif defined(__aarch64__) # define __NR_bpf 280 # else # error __NR_bpf not defined. libbpf does not support your arch. # endif #endif Thank you.