* [PATCH bpf-next] bpf: switch to offsetofend in BPF_PROG_TEST_RUN
@ 2019-12-10 19:19 Stanislav Fomichev
2019-12-10 19:34 ` Andrii Nakryiko
2019-12-11 13:57 ` Daniel Borkmann
0 siblings, 2 replies; 3+ messages in thread
From: Stanislav Fomichev @ 2019-12-10 19:19 UTC (permalink / raw)
To: netdev, bpf; +Cc: davem, ast, daniel, Stanislav Fomichev, Andrii Nakryiko
Switch existing pattern of "offsetof(..., member) + FIELD_SIZEOF(...,
member)' to "offsetofend(..., member)" which does exactly what
we need without all the copy-paste.
Suggested-by: Andrii Nakryiko <andriin@fb.com>
Signed-off-by: Stanislav Fomichev <sdf@google.com>
---
net/bpf/test_run.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/net/bpf/test_run.c b/net/bpf/test_run.c
index 915c2d6f7fb9..85c8cbbada92 100644
--- a/net/bpf/test_run.c
+++ b/net/bpf/test_run.c
@@ -252,22 +252,19 @@ static int convert___skb_to_skb(struct sk_buff *skb, struct __sk_buff *__skb)
/* priority is allowed */
- if (!range_is_zero(__skb, offsetof(struct __sk_buff, priority) +
- FIELD_SIZEOF(struct __sk_buff, priority),
+ if (!range_is_zero(__skb, offsetofend(struct __sk_buff, priority),
offsetof(struct __sk_buff, cb)))
return -EINVAL;
/* cb is allowed */
- if (!range_is_zero(__skb, offsetof(struct __sk_buff, cb) +
- FIELD_SIZEOF(struct __sk_buff, cb),
+ if (!range_is_zero(__skb, offsetofend(struct __sk_buff, cb),
offsetof(struct __sk_buff, tstamp)))
return -EINVAL;
/* tstamp is allowed */
- if (!range_is_zero(__skb, offsetof(struct __sk_buff, tstamp) +
- FIELD_SIZEOF(struct __sk_buff, tstamp),
+ if (!range_is_zero(__skb, offsetofend(struct __sk_buff, tstamp),
sizeof(struct __sk_buff)))
return -EINVAL;
@@ -437,8 +434,7 @@ static int verify_user_bpf_flow_keys(struct bpf_flow_keys *ctx)
/* flags is allowed */
- if (!range_is_zero(ctx, offsetof(struct bpf_flow_keys, flags) +
- FIELD_SIZEOF(struct bpf_flow_keys, flags),
+ if (!range_is_zero(ctx, offsetofend(struct bpf_flow_keys, flags),
sizeof(struct bpf_flow_keys)))
return -EINVAL;
--
2.24.0.525.g8f36a354ae-goog
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH bpf-next] bpf: switch to offsetofend in BPF_PROG_TEST_RUN
2019-12-10 19:19 [PATCH bpf-next] bpf: switch to offsetofend in BPF_PROG_TEST_RUN Stanislav Fomichev
@ 2019-12-10 19:34 ` Andrii Nakryiko
2019-12-11 13:57 ` Daniel Borkmann
1 sibling, 0 replies; 3+ messages in thread
From: Andrii Nakryiko @ 2019-12-10 19:34 UTC (permalink / raw)
To: Stanislav Fomichev
Cc: Networking, bpf, David S. Miller, Alexei Starovoitov,
Daniel Borkmann, Andrii Nakryiko
On Tue, Dec 10, 2019 at 11:20 AM Stanislav Fomichev <sdf@google.com> wrote:
>
> Switch existing pattern of "offsetof(..., member) + FIELD_SIZEOF(...,
> member)' to "offsetofend(..., member)" which does exactly what
> we need without all the copy-paste.
>
> Suggested-by: Andrii Nakryiko <andriin@fb.com>
> Signed-off-by: Stanislav Fomichev <sdf@google.com>
> ---
Awesome!
Acked-by: Andrii Nakryiko <andriin@fb.com>
> net/bpf/test_run.c | 12 ++++--------
> 1 file changed, 4 insertions(+), 8 deletions(-)
>
[...]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH bpf-next] bpf: switch to offsetofend in BPF_PROG_TEST_RUN
2019-12-10 19:19 [PATCH bpf-next] bpf: switch to offsetofend in BPF_PROG_TEST_RUN Stanislav Fomichev
2019-12-10 19:34 ` Andrii Nakryiko
@ 2019-12-11 13:57 ` Daniel Borkmann
1 sibling, 0 replies; 3+ messages in thread
From: Daniel Borkmann @ 2019-12-11 13:57 UTC (permalink / raw)
To: Stanislav Fomichev; +Cc: netdev, bpf, davem, ast, Andrii Nakryiko
On Tue, Dec 10, 2019 at 11:19:33AM -0800, Stanislav Fomichev wrote:
> Switch existing pattern of "offsetof(..., member) + FIELD_SIZEOF(...,
> member)' to "offsetofend(..., member)" which does exactly what
> we need without all the copy-paste.
>
> Suggested-by: Andrii Nakryiko <andriin@fb.com>
> Signed-off-by: Stanislav Fomichev <sdf@google.com>
Applied, thanks!
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-12-11 13:57 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-10 19:19 [PATCH bpf-next] bpf: switch to offsetofend in BPF_PROG_TEST_RUN Stanislav Fomichev
2019-12-10 19:34 ` Andrii Nakryiko
2019-12-11 13:57 ` Daniel Borkmann
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).