From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751014AbdBJC6v (ORCPT ); Thu, 9 Feb 2017 21:58:51 -0500 Received: from szxga01-in.huawei.com ([58.251.152.64]:12179 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750966AbdBJC6s (ORCPT ); Thu, 9 Feb 2017 21:58:48 -0500 Subject: Re: [PATCH net-next v5 04/11] bpf: Use bpf_load_program() from the library To: =?UTF-8?Q?Micka=c3=abl_Sala=c3=bcn?= , References: <20170209232145.19085-1-mic@digikod.net> <20170209232145.19085-5-mic@digikod.net> <2ffd3f6b-ee07-af83-ced3-bad5e4e35cc8@huawei.com> CC: Alexei Starovoitov , Arnaldo Carvalho de Melo , Daniel Borkmann , "David S . Miller" , , Shuah Khan From: "Wangnan (F)" Message-ID: Date: Fri, 10 Feb 2017 10:39:31 +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: <2ffd3f6b-ee07-af83-ced3-bad5e4e35cc8@huawei.com> 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.0A020201.589D27F9.005F,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: cbbc6c67da091d5ba824c2d39a76b566 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2017/2/10 10:25, Wangnan (F) wrote: > > > On 2017/2/10 7:21, Mickaël Salaün wrote: >> Replace bpf_prog_load() with bpf_load_program() calls. >> >> Signed-off-by: Mickaël Salaün >> Cc: Alexei Starovoitov >> Cc: Daniel Borkmann >> Cc: Shuah Khan >> --- >> tools/lib/bpf/bpf.c | 6 +++--- >> tools/lib/bpf/bpf.h | 4 ++-- >> tools/testing/selftests/bpf/Makefile | 4 +++- >> tools/testing/selftests/bpf/bpf_sys.h | 21 --------------------- >> tools/testing/selftests/bpf/test_tag.c | 6 ++++-- >> tools/testing/selftests/bpf/test_verifier.c | 8 +++++--- >> 6 files changed, 17 insertions(+), 32 deletions(-) >> >> diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c >> index 3ddb58a36d3c..58ce252073fa 100644 >> --- a/tools/lib/bpf/bpf.c >> +++ b/tools/lib/bpf/bpf.c >> @@ -42,7 +42,7 @@ >> # endif >> #endif >> -static __u64 ptr_to_u64(void *ptr) >> +static __u64 ptr_to_u64(const void *ptr) >> { >> return (__u64) (unsigned long) ptr; >> } >> @@ -69,8 +69,8 @@ int bpf_create_map(enum bpf_map_type map_type, int >> key_size, >> return sys_bpf(BPF_MAP_CREATE, &attr, sizeof(attr)); >> } >> -int bpf_load_program(enum bpf_prog_type type, struct bpf_insn *insns, >> - size_t insns_cnt, char *license, >> +int bpf_load_program(enum bpf_prog_type type, const struct bpf_insn >> *insns, >> + size_t insns_cnt, const char *license, >> __u32 kern_version, char *log_buf, size_t log_buf_sz) >> { >> int fd; >> diff --git a/tools/lib/bpf/bpf.h b/tools/lib/bpf/bpf.h >> index a2f9853dd882..bc959a2de023 100644 >> --- a/tools/lib/bpf/bpf.h >> +++ b/tools/lib/bpf/bpf.h >> @@ -28,8 +28,8 @@ int bpf_create_map(enum bpf_map_type map_type, int >> key_size, int value_size, >> /* Recommend log buffer size */ >> #define BPF_LOG_BUF_SIZE 65536 >> -int bpf_load_program(enum bpf_prog_type type, struct bpf_insn *insns, >> - size_t insns_cnt, char *license, >> +int bpf_load_program(enum bpf_prog_type type, const struct bpf_insn >> *insns, >> + size_t insns_cnt, const char *license, >> __u32 kern_version, char *log_buf, >> size_t log_buf_sz); > > For libbpf changes: And for similar code in patch 5-8: Acked-by Wang Nan Thank you. > > Acked-by Wang Nan > > Thank you.