* [PATCH] samples: bpf: fix style in bpf_load
@ 2019-05-22 0:24 Daniel T. Lee
2019-05-22 7:45 ` Jakub Sitnicki
0 siblings, 1 reply; 4+ messages in thread
From: Daniel T. Lee @ 2019-05-22 0:24 UTC (permalink / raw)
To: Daniel Borkmann, Alexei Starovoitov; +Cc: netdev
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
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] samples: bpf: fix style in bpf_load
2019-05-22 0:24 [PATCH] samples: bpf: fix style in bpf_load Daniel T. Lee
@ 2019-05-22 7:45 ` Jakub Sitnicki
0 siblings, 0 replies; 4+ messages in thread
From: Jakub Sitnicki @ 2019-05-22 7:45 UTC (permalink / raw)
To: Daniel T. Lee; +Cc: Daniel Borkmann, Alexei Starovoitov, netdev
On Wed, May 22, 2019 at 02:24 AM CEST, Daniel T. Lee wrote:
> 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);
No need to build the path at run-time. Compile-time string literal
concatenation will do in this case:
fd = open(DEBUGFS "kprobe_events", flags);
-Jakub
>
> 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);
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] samples: bpf: fix style in bpf_load
@ 2019-05-06 13:03 Daniel T. Lee
2019-05-09 20:49 ` Alexei Starovoitov
0 siblings, 1 reply; 4+ messages in thread
From: Daniel T. Lee @ 2019-05-06 13:03 UTC (permalink / raw)
To: Daniel Borkmann, Alexei Starovoitov; +Cc: netdev
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
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] samples: bpf: fix style in bpf_load
2019-05-06 13:03 Daniel T. Lee
@ 2019-05-09 20:49 ` Alexei Starovoitov
0 siblings, 0 replies; 4+ messages in thread
From: Alexei Starovoitov @ 2019-05-09 20:49 UTC (permalink / raw)
To: Daniel T. Lee; +Cc: Daniel Borkmann, Alexei Starovoitov, Network Development
On Mon, May 6, 2019 at 6:03 AM Daniel T. Lee <danieltimlee@gmail.com> wrote:
>
> 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>
bpf-next is closed. Pls resubmit in about 2 weeks
or watch for 'bpf-next is open' email.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-05-22 7:45 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-05-22 0:24 [PATCH] samples: bpf: fix style in bpf_load Daniel T. Lee
2019-05-22 7:45 ` 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
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).