From: "Daniel T. Lee" <danieltimlee@gmail.com>
To: Daniel Borkmann <daniel@iogearbox.net>,
Alexei Starovoitov <ast@kernel.org>
Cc: netdev@vger.kernel.org
Subject: [PATCH] samples: bpf: fix style in bpf_load
Date: Wed, 22 May 2019 09:24:57 +0900 [thread overview]
Message-ID: <20190522002457.10181-1-danieltimlee@gmail.com> (raw)
This commit fixes style problem in samples/bpf/bpf_load.c
Styles that have been changed are:
- Magic string use of 'DEBUGFS'
- Useless zero initialization of a global variable
- Minor style fix with whitespace
Signed-off-by: Daniel T. Lee <danieltimlee@gmail.com>
---
samples/bpf/bpf_load.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/samples/bpf/bpf_load.c b/samples/bpf/bpf_load.c
index eae7b635343d..e71d23d2a0ff 100644
--- a/samples/bpf/bpf_load.c
+++ b/samples/bpf/bpf_load.c
@@ -40,7 +40,7 @@ int prog_cnt;
int prog_array_fd = -1;
struct bpf_map_data map_data[MAX_MAPS];
-int map_data_count = 0;
+int map_data_count;
static int populate_prog_array(const char *event, int prog_fd)
{
@@ -57,6 +57,7 @@ static int populate_prog_array(const char *event, int prog_fd)
static int write_kprobe_events(const char *val)
{
int fd, ret, flags;
+ char buf[256];
if (val == NULL)
return -1;
@@ -65,7 +66,9 @@ static int write_kprobe_events(const char *val)
else
flags = O_WRONLY | O_APPEND;
- fd = open("/sys/kernel/debug/tracing/kprobe_events", flags);
+ strcpy(buf, DEBUGFS);
+ strcat(buf, "kprobe_events");
+ fd = open(buf, flags);
ret = write(fd, val, strlen(val));
close(fd);
@@ -490,8 +493,8 @@ static int load_elf_maps_section(struct bpf_map_data *maps, int maps_shndx,
/* Verify no newer features were requested */
if (validate_zero) {
- addr = (unsigned char*) def + map_sz_copy;
- end = (unsigned char*) def + map_sz_elf;
+ addr = (unsigned char *) def + map_sz_copy;
+ end = (unsigned char *) def + map_sz_elf;
for (; addr < end; addr++) {
if (*addr != 0) {
free(sym);
--
2.17.1
next reply other threads:[~2019-05-22 0:25 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-22 0:24 Daniel T. Lee [this message]
2019-05-22 7:45 ` [PATCH] samples: bpf: fix style in bpf_load Jakub Sitnicki
-- strict thread matches above, loose matches on Subject: below --
2019-05-06 13:03 Daniel T. Lee
2019-05-09 20:49 ` Alexei Starovoitov
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=20190522002457.10181-1-danieltimlee@gmail.com \
--to=danieltimlee@gmail.com \
--cc=ast@kernel.org \
--cc=daniel@iogearbox.net \
--cc=netdev@vger.kernel.org \
/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).