linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org,
	Arnaldo Carvalho de Melo <acme@redhat.com>,
	Joe Stringer <joe@ovn.org>, Alexei Starovoitov <ast@fb.com>,
	Daniel Borkmann <daniel@iogearbox.net>,
	Wang Nan <wangnan0@huawei.com>
Subject: [PATCH 27/29] samples/bpf: Be consistent with bpf_load_program bpf_insn parameter
Date: Tue, 20 Dec 2016 14:03:56 -0300	[thread overview]
Message-ID: <20161220170358.4350-28-acme@kernel.org> (raw)
In-Reply-To: <20161220170358.4350-1-acme@kernel.org>

From: Arnaldo Carvalho de Melo <acme@redhat.com>

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/
  <SNIP>
     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 <joe@ovn.org>
Cc: Alexei Starovoitov <ast@fb.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-1z5xee8n3oa66jf62bpv16ed@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 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 6245062844d1..a5cddc99cccd 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(),
 	};
-- 
2.9.3

  parent reply	other threads:[~2016-12-20 17:07 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-12-20 17:03 [GIT PULL 00/29] perf/core improvements and fixes Arnaldo Carvalho de Melo
2016-12-20 17:03 ` [PATCH 01/29] perf tools: Move headers check into bash script Arnaldo Carvalho de Melo
2016-12-20 17:03 ` [PATCH 02/29] perf sched timehist: Split is_idle_sample() Arnaldo Carvalho de Melo
2016-12-20 17:03 ` [PATCH 03/29] perf sched timehist: Introduce struct idle_time_data Arnaldo Carvalho de Melo
2016-12-20 17:03 ` [PATCH 04/29] perf sched timehist: Save callchain when entering idle Arnaldo Carvalho de Melo
2016-12-20 17:03 ` [PATCH 05/29] perf sched timehist: Skip non-idle events when necessary Arnaldo Carvalho de Melo
2016-12-20 17:03 ` [PATCH 06/29] perf sched timehist: Add -I/--idle-hist option Arnaldo Carvalho de Melo
2016-12-20 17:03 ` [PATCH 07/29] perf sched timehist: Show callchains for idle stat Arnaldo Carvalho de Melo
2016-12-20 17:03 ` [PATCH 08/29] perf tools: Remove some needless __maybe_unused Arnaldo Carvalho de Melo
2016-12-20 17:03 ` [PATCH 09/29] perf mem: Fix --all-user/--all-kernel options Arnaldo Carvalho de Melo
2016-12-20 17:03 ` [PATCH 10/29] perf evsel: Use variable instead of repeating lengthy FD macro Arnaldo Carvalho de Melo
2016-12-20 17:03 ` [PATCH 11/29] perf thread_map: Add thread_map__remove function Arnaldo Carvalho de Melo
2016-12-20 17:03 ` [PATCH 12/29] perf evsel: Allow to ignore missing pid Arnaldo Carvalho de Melo
2016-12-20 17:03 ` [PATCH 13/29] perf record: Force ignore_missing_thread for uid option Arnaldo Carvalho de Melo
2016-12-20 17:03 ` [PATCH 14/29] perf annotate: Support jump instruction with target as second operand Arnaldo Carvalho de Melo
2016-12-20 17:03 ` [PATCH 15/29] perf annotate: Fix jump target outside of function address range Arnaldo Carvalho de Melo
2016-12-20 17:03 ` [PATCH 16/29] tools lib bpf: Sync {tools,}/include/uapi/linux/bpf.h Arnaldo Carvalho de Melo
2016-12-20 17:03 ` [PATCH 17/29] tools lib bpf: use __u32 from linux/types.h Arnaldo Carvalho de Melo
2016-12-20 17:03 ` [PATCH 18/29] tools lib bpf: Add flags to bpf_create_map() Arnaldo Carvalho de Melo
2016-12-20 17:03 ` [PATCH 19/29] samples/bpf: Make samples more libbpf-centric Arnaldo Carvalho de Melo
2016-12-20 17:03 ` [PATCH 20/29] samples/bpf: Make perf_event_read() static Arnaldo Carvalho de Melo
2016-12-20 17:03 ` [PATCH 21/29] perf trace: Check if MAP_32BIT is defined (again) Arnaldo Carvalho de Melo
2016-12-20 17:03 ` [PATCH 22/29] perf bench futex: Fix lock-pi help string Arnaldo Carvalho de Melo
2016-12-20 17:03 ` [PATCH 23/29] perf annotate: Don't throw error for zero length symbols Arnaldo Carvalho de Melo
2016-12-20 17:03 ` [PATCH 24/29] perf diff: Do not overwrite valid build id Arnaldo Carvalho de Melo
2016-12-20 17:03 ` [PATCH 25/29] samples/bpf: Switch over to libbpf Arnaldo Carvalho de Melo
2016-12-20 17:03 ` [PATCH 26/29] tools lib bpf: Add bpf_prog_{attach,detach} Arnaldo Carvalho de Melo
2016-12-20 17:03 ` Arnaldo Carvalho de Melo [this message]
2016-12-20 17:03 ` [PATCH 28/29] samples/bpf: Remove perf_event_open() declaration Arnaldo Carvalho de Melo
2016-12-20 17:03 ` [PATCH 29/29] samples/bpf: Move open_raw_sock to separate header Arnaldo Carvalho de Melo
2016-12-20 19:15 ` [GIT PULL 00/29] perf/core improvements and fixes Ingo Molnar

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20161220170358.4350-28-acme@kernel.org \
    --to=acme@kernel.org \
    --cc=acme@redhat.com \
    --cc=ast@fb.com \
    --cc=daniel@iogearbox.net \
    --cc=joe@ovn.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=wangnan0@huawei.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).