From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965548AbcLTTdK (ORCPT ); Tue, 20 Dec 2016 14:33:10 -0500 Received: from terminus.zytor.com ([198.137.202.10]:36486 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964861AbcLTTdG (ORCPT ); Tue, 20 Dec 2016 14:33:06 -0500 Date: Tue, 20 Dec 2016 11:32:12 -0800 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: linux-kernel@vger.kernel.org, daniel@iogearbox.net, acme@redhat.com, tglx@linutronix.de, hpa@zytor.com, wangnan0@huawei.com, ast@fb.com, mingo@kernel.org, joe@ovn.org Reply-To: acme@redhat.com, daniel@iogearbox.net, linux-kernel@vger.kernel.org, mingo@kernel.org, joe@ovn.org, hpa@zytor.com, ast@fb.com, wangnan0@huawei.com, tglx@linutronix.de To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] samples/bpf: Be consistent with bpf_load_program bpf_insn parameter Git-Commit-ID: 811b4f0d785d33eabfff5d0ea60596b6b8bdc825 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 811b4f0d785d33eabfff5d0ea60596b6b8bdc825 Gitweb: http://git.kernel.org/tip/811b4f0d785d33eabfff5d0ea60596b6b8bdc825 Author: Arnaldo Carvalho de Melo AuthorDate: Tue, 20 Dec 2016 11:03:13 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 20 Dec 2016 12:00:39 -0300 samples/bpf: Be consistent with bpf_load_program bpf_insn parameter Only one of the examples declare the bpf_insn bpf proggie as a const: $ grep 'struct bpf_insn [a-z]' samples/bpf/*.c samples/bpf/fds_example.c: static const struct bpf_insn insns[] = { samples/bpf/sock_example.c: struct bpf_insn prog[] = { samples/bpf/test_cgrp2_attach2.c: struct bpf_insn prog[] = { samples/bpf/test_cgrp2_attach.c: struct bpf_insn prog[] = { samples/bpf/test_cgrp2_sock.c: struct bpf_insn prog[] = { $ Which causes this warning: [root@f5065a7d6272 linux]# make -j4 O=/tmp/build/linux samples/bpf/ HOSTCC samples/bpf/fds_example.o /git/linux/samples/bpf/fds_example.c: In function 'bpf_prog_create': /git/linux/samples/bpf/fds_example.c:63:6: warning: passing argument 2 of 'bpf_load_program' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers] insns, insns_cnt, "GPL", 0, ^~~~~ In file included from /git/linux/samples/bpf/libbpf.h:5:0, from /git/linux/samples/bpf/bpf_load.h:4, from /git/linux/samples/bpf/fds_example.c:15: /git/linux/tools/lib/bpf/bpf.h:31:5: note: expected 'struct bpf_insn *' but argument is of type 'const struct bpf_insn *' int bpf_load_program(enum bpf_prog_type type, struct bpf_insn *insns, ^~~~~~~~~~~~~~~~ HOSTCC samples/bpf/sockex1_user.o So just ditch that 'const' to reduce build noise, leaving changing the bpf_load_program() bpf_insn parameter to const to a later patch, if deemed adequate. Cc: Joe Stringer Cc: Alexei Starovoitov Cc: Daniel Borkmann Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-1z5xee8n3oa66jf62bpv16ed@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- samples/bpf/fds_example.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/bpf/fds_example.c b/samples/bpf/fds_example.c index 6245062..a5cddc9 100644 --- a/samples/bpf/fds_example.c +++ b/samples/bpf/fds_example.c @@ -49,7 +49,7 @@ static int bpf_map_create(void) static int bpf_prog_create(const char *object) { - static const struct bpf_insn insns[] = { + static struct bpf_insn insns[] = { BPF_MOV64_IMM(BPF_REG_0, 1), BPF_EXIT_INSN(), };