| Message ID | 20181017142448.15071-1-nicolas.dichtel@6wind.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | BPF Maintainers |
| Headers | show |
| Series | [bpf] bpf: fix doc of bpf_skb_adjust_room() in uapi | expand |
2018-10-17 16:24 UTC+0200 ~ Nicolas Dichtel <nicolas.dichtel@6wind.com> > len_diff is signed. > > Fixes: fa15601ab31e ("bpf: add documentation for eBPF helpers (33-41)") > CC: Quentin Monnet <quentin.monnet@netronome.com> > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> > --- > include/uapi/linux/bpf.h | 2 +- > tools/include/uapi/linux/bpf.h | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h > index 66917a4eba27..c4ffe91d5598 100644 > --- a/include/uapi/linux/bpf.h > +++ b/include/uapi/linux/bpf.h > @@ -1430,7 +1430,7 @@ union bpf_attr { > * Return > * 0 on success, or a negative error in case of failure. > * > - * int bpf_skb_adjust_room(struct sk_buff *skb, u32 len_diff, u32 mode, u64 flags) > + * int bpf_skb_adjust_room(struct sk_buff *skb, s32 len_diff, u32 mode, u64 flags) > * Description > * Grow or shrink the room for data in the packet associated to > * *skb* by *len_diff*, and according to the selected *mode*. > diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h > index 66917a4eba27..c4ffe91d5598 100644 > --- a/tools/include/uapi/linux/bpf.h > +++ b/tools/include/uapi/linux/bpf.h > @@ -1430,7 +1430,7 @@ union bpf_attr { > * Return > * 0 on success, or a negative error in case of failure. > * > - * int bpf_skb_adjust_room(struct sk_buff *skb, u32 len_diff, u32 mode, u64 flags) > + * int bpf_skb_adjust_room(struct sk_buff *skb, s32 len_diff, u32 mode, u64 flags) > * Description > * Grow or shrink the room for data in the packet associated to > * *skb* by *len_diff*, and according to the selected *mode*. > Correct, thank you Nicolas! :) Reviewed-by: Quentin Monnet <quentin.monnet@netronome.com>
On Wed, Oct 17, 2018 at 04:24:48PM +0200, Nicolas Dichtel wrote: > len_diff is signed. > > Fixes: fa15601ab31e ("bpf: add documentation for eBPF helpers (33-41)") > CC: Quentin Monnet <quentin.monnet@netronome.com> > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> > --- > include/uapi/linux/bpf.h | 2 +- > tools/include/uapi/linux/bpf.h | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h > index 66917a4eba27..c4ffe91d5598 100644 > --- a/include/uapi/linux/bpf.h > +++ b/include/uapi/linux/bpf.h > @@ -1430,7 +1430,7 @@ union bpf_attr { > * Return > * 0 on success, or a negative error in case of failure. > * > - * int bpf_skb_adjust_room(struct sk_buff *skb, u32 len_diff, u32 mode, u64 flags) > + * int bpf_skb_adjust_room(struct sk_buff *skb, s32 len_diff, u32 mode, u64 flags) Thanks. Applied to bpf-next, since we're very late into release cycle.
Le 18/10/2018 à 06:49, Alexei Starovoitov a écrit : > On Wed, Oct 17, 2018 at 04:24:48PM +0200, Nicolas Dichtel wrote: >> len_diff is signed. >> >> Fixes: fa15601ab31e ("bpf: add documentation for eBPF helpers (33-41)") >> CC: Quentin Monnet <quentin.monnet@netronome.com> >> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> >> --- >> include/uapi/linux/bpf.h | 2 +- >> tools/include/uapi/linux/bpf.h | 2 +- >> 2 files changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h >> index 66917a4eba27..c4ffe91d5598 100644 >> --- a/include/uapi/linux/bpf.h >> +++ b/include/uapi/linux/bpf.h >> @@ -1430,7 +1430,7 @@ union bpf_attr { >> * Return >> * 0 on success, or a negative error in case of failure. >> * >> - * int bpf_skb_adjust_room(struct sk_buff *skb, u32 len_diff, u32 mode, u64 flags) >> + * int bpf_skb_adjust_room(struct sk_buff *skb, s32 len_diff, u32 mode, u64 flags) > > Thanks. Applied to bpf-next, since we're very late into release cycle. > Yep, I was also wondering if it was not too late for the bpf tree ;-) Thank you, Nicolas
diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index 66917a4eba27..c4ffe91d5598 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@ -1430,7 +1430,7 @@ union bpf_attr { * Return * 0 on success, or a negative error in case of failure. * - * int bpf_skb_adjust_room(struct sk_buff *skb, u32 len_diff, u32 mode, u64 flags) + * int bpf_skb_adjust_room(struct sk_buff *skb, s32 len_diff, u32 mode, u64 flags) * Description * Grow or shrink the room for data in the packet associated to * *skb* by *len_diff*, and according to the selected *mode*. diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h index 66917a4eba27..c4ffe91d5598 100644 --- a/tools/include/uapi/linux/bpf.h +++ b/tools/include/uapi/linux/bpf.h @@ -1430,7 +1430,7 @@ union bpf_attr { * Return * 0 on success, or a negative error in case of failure. * - * int bpf_skb_adjust_room(struct sk_buff *skb, u32 len_diff, u32 mode, u64 flags) + * int bpf_skb_adjust_room(struct sk_buff *skb, s32 len_diff, u32 mode, u64 flags) * Description * Grow or shrink the room for data in the packet associated to * *skb* by *len_diff*, and according to the selected *mode*.
len_diff is signed. Fixes: fa15601ab31e ("bpf: add documentation for eBPF helpers (33-41)") CC: Quentin Monnet <quentin.monnet@netronome.com> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- include/uapi/linux/bpf.h | 2 +- tools/include/uapi/linux/bpf.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)