[Xen-devel] [PATCH] xen/arm64: livepatch: Fix build after 03957f58db

Julien Grall posted 1 patch 4 years, 10 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/xen tags/patchew/20190521142913.22394-1-julien.grall@arm.com
xen/arch/arm/arm64/livepatch.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[Xen-devel] [PATCH] xen/arm64: livepatch: Fix build after 03957f58db
Posted by Julien Grall 4 years, 10 months ago
Commit 03957f58db "xen/const: Extend the existing macro BIT to take a
suffix in parameter" didn't convert all the callers of the macro BIT.

This will result to a build breakage when enabling Livepatch on arm64.

Reported-by: Andrew Cooper <andrew.cooper3@citrix.com>
Signed-off-by: Julien Grall <julien.grall@arm.com>
---
 xen/arch/arm/arm64/livepatch.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xen/arch/arm/arm64/livepatch.c b/xen/arch/arm/arm64/livepatch.c
index 2247b925a0..5c75779284 100644
--- a/xen/arch/arm/arm64/livepatch.c
+++ b/xen/arch/arm/arm64/livepatch.c
@@ -208,7 +208,7 @@ static int reloc_insn_imm(enum aarch64_reloc_op op, void *dest, u64 val,
     sval >>= lsb;
 
     /* Extract the value bits and shift them to bit 0. */
-    imm_mask = (BIT(lsb + len) - 1) >> lsb;
+    imm_mask = (BIT(lsb + len, UL) - 1) >> lsb;
     imm = sval & imm_mask;
 
     /* Update the instruction's immediate field. */
-- 
2.11.0


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH] xen/arm64: livepatch: Fix build after 03957f58db
Posted by Stefano Stabellini 4 years, 10 months ago
On Tue, 21 May 2019, Julien Grall wrote:
> Commit 03957f58db "xen/const: Extend the existing macro BIT to take a
> suffix in parameter" didn't convert all the callers of the macro BIT.
> 
> This will result to a build breakage when enabling Livepatch on arm64.
> 
> Reported-by: Andrew Cooper <andrew.cooper3@citrix.com>
> Signed-off-by: Julien Grall <julien.grall@arm.com>

Acked-by: Stefano Stabellini <sstabellini@kernel.org>


> ---
>  xen/arch/arm/arm64/livepatch.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/xen/arch/arm/arm64/livepatch.c b/xen/arch/arm/arm64/livepatch.c
> index 2247b925a0..5c75779284 100644
> --- a/xen/arch/arm/arm64/livepatch.c
> +++ b/xen/arch/arm/arm64/livepatch.c
> @@ -208,7 +208,7 @@ static int reloc_insn_imm(enum aarch64_reloc_op op, void *dest, u64 val,
>      sval >>= lsb;
>  
>      /* Extract the value bits and shift them to bit 0. */
> -    imm_mask = (BIT(lsb + len) - 1) >> lsb;
> +    imm_mask = (BIT(lsb + len, UL) - 1) >> lsb;
>      imm = sval & imm_mask;
>  
>      /* Update the instruction's immediate field. */
> -- 
> 2.11.0
> 

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH] xen/arm64: livepatch: Fix build after 03957f58db
Posted by Julien Grall 4 years, 10 months ago

On 5/21/19 4:36 PM, Stefano Stabellini wrote:
> On Tue, 21 May 2019, Julien Grall wrote:
>> Commit 03957f58db "xen/const: Extend the existing macro BIT to take a
>> suffix in parameter" didn't convert all the callers of the macro BIT.
>>
>> This will result to a build breakage when enabling Livepatch on arm64.
>>
>> Reported-by: Andrew Cooper <andrew.cooper3@citrix.com>
>> Signed-off-by: Julien Grall <julien.grall@arm.com>
> 
> Acked-by: Stefano Stabellini <sstabellini@kernel.org>

FIY it was already merged to unblock the build. From my understanding, 
any ack from the rest is sufficient in that case.

Cheers,

-- 
Julien Grall

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH] xen/arm64: livepatch: Fix build after 03957f58db
Posted by Andrew Cooper 4 years, 10 months ago
On 21/05/2019 15:29, Julien Grall wrote:
> Commit 03957f58db "xen/const: Extend the existing macro BIT to take a
> suffix in parameter" didn't convert all the callers of the macro BIT.
>
> This will result to a build breakage when enabling Livepatch on arm64.
>
> Reported-by: Andrew Cooper <andrew.cooper3@citrix.com>
> Signed-off-by: Julien Grall <julien.grall@arm.com>

Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel