[PATCH bpf-next 1/2] bpf: btf: fix the brackets of BTF_INT_OFFSET()

[PATCH bpf-next 1/2] bpf: btf: fix the brackets of BTF_INT_OFFSET()

[Gary Lin]

'VAL' should be protected by the brackets.

Fixes: 69b693f0aefa ("bpf: btf: Introduce BPF Type Format (BTF)")
Signed-off-by: Gary Lin <glin@suse.com>
---
 include/uapi/linux/btf.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/uapi/linux/btf.h b/include/uapi/linux/btf.h
index 9310652ca4f9..63ae4a39e58b 100644
--- a/include/uapi/linux/btf.h
+++ b/include/uapi/linux/btf.h
@@ -83,7 +83,7 @@ struct btf_type {
  * is the 32 bits arrangement:
  */
 #define BTF_INT_ENCODING(VAL)	(((VAL) & 0x0f000000) >> 24)
-#define BTF_INT_OFFSET(VAL)	(((VAL  & 0x00ff0000)) >> 16)
+#define BTF_INT_OFFSET(VAL)	(((VAL) & 0x00ff0000) >> 16)
 #define BTF_INT_BITS(VAL)	((VAL)  & 0x000000ff)
 
 /* Attributes stored in the BTF_INT_ENCODING */
-- 
2.21.0

[PATCH bpf-next 2/2] docs/btf: update BTF_INT_OFFSET()

[Gary Lin]

Fix BTF_INT_OFFSET() in the document

Signed-off-by: Gary Lin <glin@suse.com>
---
 Documentation/bpf/btf.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/bpf/btf.rst b/Documentation/bpf/btf.rst
index 8820360d00da..35d83e24dbdb 100644
--- a/Documentation/bpf/btf.rst
+++ b/Documentation/bpf/btf.rst
@@ -131,7 +131,7 @@ The following sections detail encoding of each kind.
 ``btf_type`` is followed by a ``u32`` with the following bits arrangement::
 
   #define BTF_INT_ENCODING(VAL)   (((VAL) & 0x0f000000) >> 24)
-  #define BTF_INT_OFFSET(VAL)     (((VAL  & 0x00ff0000)) >> 16)
+  #define BTF_INT_OFFSET(VAL)     (((VAL) & 0x00ff0000) >> 16)
   #define BTF_INT_BITS(VAL)       ((VAL)  & 0x000000ff)
 
 The ``BTF_INT_ENCODING`` has the following attributes::
-- 
2.21.0

Re: [PATCH bpf-next 1/2] bpf: btf: fix the brackets of BTF_INT_OFFSET()

[Daniel Borkmann]

On 05/13/2019 11:11 AM, Gary Lin wrote:
> 'VAL' should be protected by the brackets.
> 
> Fixes: 69b693f0aefa ("bpf: btf: Introduce BPF Type Format (BTF)")
> Signed-off-by: Gary Lin <glin@suse.com>
> ---
>  include/uapi/linux/btf.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/include/uapi/linux/btf.h b/include/uapi/linux/btf.h
> index 9310652ca4f9..63ae4a39e58b 100644
> --- a/include/uapi/linux/btf.h
> +++ b/include/uapi/linux/btf.h
> @@ -83,7 +83,7 @@ struct btf_type {
>   * is the 32 bits arrangement:
>   */
>  #define BTF_INT_ENCODING(VAL)	(((VAL) & 0x0f000000) >> 24)
> -#define BTF_INT_OFFSET(VAL)	(((VAL  & 0x00ff0000)) >> 16)
> +#define BTF_INT_OFFSET(VAL)	(((VAL) & 0x00ff0000) >> 16)
>  #define BTF_INT_BITS(VAL)	((VAL)  & 0x000000ff)
>  
>  /* Attributes stored in the BTF_INT_ENCODING */
> 

I'm okay with that fix, but could you please squash patch 1 and
patch 2 into a single one? I don't think it's worth splitting them
here.

Thanks,
Daniel