merged

Bruce

In message: [linux-yocto][standard/base v5.4/standard/base][PATCH] KVM: LAPIC: 
Mark hrtimer for period or oneshot mode to expire in hard interrupt context
on 24/03/2020 [email protected] wrote:

> From: He Zhe <[email protected]>
> 
> https://lore.kernel.org/lkml/[email protected]/
> 
> apic->lapic_timer.timer was initialized with HRTIMER_MODE_ABS_HARD but
> started later with HRTIMER_MODE_ABS, which may cause the following warning
> in PREEMPT_RT kernel.
> 
> WARNING: CPU: 1 PID: 2957 at kernel/time/hrtimer.c:1129 
> hrtimer_start_range_ns+0x348/0x3f0
> CPU: 1 PID: 2957 Comm: qemu-system-x86 Not tainted 5.4.23-rt11 #1
> Hardware name: Supermicro SYS-E300-9A-8C/A2SDi-8C-HLN4F, BIOS 1.1a 09/18/2018
> RIP: 0010:hrtimer_start_range_ns+0x348/0x3f0
> Code: 4d b8 0f 94 c1 0f b6 c9 e8 35 f1 ff ff 4c 8b 45
>       b0 e9 3b fd ff ff e8 d7 3f fa ff 48 98 4c 03 34
>       c5 a0 26 bf 93 e9 a1 fd ff ff <0f> 0b e9 fd fc ff
>       ff 65 8b 05 fa b7 90 6d 89 c0 48 0f a3 05 60 91
> RSP: 0018:ffffbc60026ffaf8 EFLAGS: 00010202
> RAX: 0000000000000001 RBX: ffff9d81657d4110 RCX: 0000000000000000
> RDX: 0000000000000000 RSI: 0000006cc7987bcf RDI: ffff9d81657d4110
> RBP: ffffbc60026ffb58 R08: 0000000000000001 R09: 0000000000000010
> R10: 0000000000000000 R11: 0000000000000000 R12: 0000006cc7987bcf
> R13: 0000000000000000 R14: 0000006cc7987bcf R15: ffffbc60026d6a00
> FS: 00007f401daed700(0000) GS:ffff9d81ffa40000(0000) knlGS:0000000000000000
> CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
> CR2: 00000000ffffffff CR3: 0000000fa7574000 CR4: 00000000003426e0
> Call Trace:
> ? kvm_release_pfn_clean+0x22/0x60 [kvm]
> start_sw_timer+0x85/0x230 [kvm]
> ? vmx_vmexit+0x1b/0x30 [kvm_intel]
> kvm_lapic_switch_to_sw_timer+0x72/0x80 [kvm]
> vmx_pre_block+0x1cb/0x260 [kvm_intel]
> ? vmx_vmexit+0xf/0x30 [kvm_intel]
> ? vmx_vmexit+0x1b/0x30 [kvm_intel]
> ? vmx_vmexit+0xf/0x30 [kvm_intel]
> ? vmx_vmexit+0x1b/0x30 [kvm_intel]
> ? vmx_vmexit+0xf/0x30 [kvm_intel]
> ? vmx_vmexit+0x1b/0x30 [kvm_intel]
> ? vmx_vmexit+0xf/0x30 [kvm_intel]
> ? vmx_vmexit+0xf/0x30 [kvm_intel]
> ? vmx_vmexit+0x1b/0x30 [kvm_intel]
> ? vmx_vmexit+0xf/0x30 [kvm_intel]
> ? vmx_vmexit+0x1b/0x30 [kvm_intel]
> ? vmx_vmexit+0xf/0x30 [kvm_intel]
> ? vmx_vmexit+0x1b/0x30 [kvm_intel]
> ? vmx_vmexit+0xf/0x30 [kvm_intel]
> ? vmx_vmexit+0x1b/0x30 [kvm_intel]
> ? vmx_vmexit+0xf/0x30 [kvm_intel]
> ? vmx_sync_pir_to_irr+0x9e/0x100 [kvm_intel]
> ? kvm_apic_has_interrupt+0x46/0x80 [kvm]
> kvm_arch_vcpu_ioctl_run+0x85b/0x1fa0 [kvm]
> ? _raw_spin_unlock_irqrestore+0x18/0x50
> ? _copy_to_user+0x2c/0x30
> kvm_vcpu_ioctl+0x235/0x660 [kvm]
> ? rt_spin_unlock+0x2c/0x50
> do_vfs_ioctl+0x3e4/0x650
> ? __fget+0x7a/0xa0
> ksys_ioctl+0x67/0x90
> __x64_sys_ioctl+0x1a/0x20
> do_syscall_64+0x4d/0x120
> entry_SYSCALL_64_after_hwframe+0x44/0xa9
> RIP: 0033:0x7f4027cc54a7
> Code: 00 00 90 48 8b 05 e9 59 0c 00 64 c7 00 26 00 00
>       00 48 c7 c0 ff ff ff ff c3 66 2e 0f 1f 84 00 00
>       00 00 00 b8 10 00 00 00 0f 05 <48> 3d 01 f0 ff ff
>       73 01 c3 48 8b 0d b9 59 0c 00 f7 d8 64 89 01 48
> RSP: 002b:00007f401dae9858 EFLAGS: 00000246 ORIG_RAX: 0000000000000010
> RAX: ffffffffffffffda RBX: 00005558bd029690 RCX: 00007f4027cc54a7
> RDX: 0000000000000000 RSI: 000000000000ae80 RDI: 000000000000000d
> RBP: 00007f4028b72000 R08: 00005558bc829ad0 R09: 00000000ffffffff
> R10: 00005558bcf90ca0 R11: 0000000000000246 R12: 0000000000000000
> R13: 0000000000000000 R14: 0000000000000000 R15: 00005558bce1c840
> --[ end trace 0000000000000002 ]--
> 
> Signed-off-by: He Zhe <[email protected]>
> ---
>  arch/x86/kvm/lapic.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
> index e3099c6..929511e 100644
> --- a/arch/x86/kvm/lapic.c
> +++ b/arch/x86/kvm/lapic.c
> @@ -1715,7 +1715,7 @@ static void start_sw_period(struct kvm_lapic *apic)
>  
>       hrtimer_start(&apic->lapic_timer.timer,
>               apic->lapic_timer.target_expiration,
> -             HRTIMER_MODE_ABS);
> +             HRTIMER_MODE_ABS_HARD);
>  }
>  
>  bool kvm_lapic_hv_timer_in_use(struct kvm_vcpu *vcpu)
> -- 
> 2.7.4
> 

In message: [linux-yocto][v5.4/standard/base][PATCH] ARM: 8918/2: only build 
return_address() if needed
on 24/03/2020 [email protected] wrote:

> From: Ben Dooks <[email protected]>
> 
> The system currently warns if the config conditions for
> building return_address in arch/arm/kernel/return_address.c
> are not met, leaving just an EXPORT_SYMBOL_GPL(return_address)
> of a function defined to be 'static linline'.
> This is a result of aeea3592a13b ("ARM: 8158/1: LLVMLinux: use static inline 
> in ARM ftrace.h").
> 
> Since we're not going to build anything other than an exported
> symbol for something that is already being defined to be an
> inline-able return of NULL, just avoid building the code to
> remove the following warning:
> 
> Fixes: aeea3592a13b ("ARM: 8158/1: LLVMLinux: use static inline in ARM 
> ftrace.h")
> Signed-off-by: Ben Dooks <[email protected]>
> Signed-off-by: Russell King <[email protected]>
> ---
>  arch/arm/kernel/Makefile         | 6 +++++-
>  arch/arm/kernel/return_address.c | 4 ----
>  2 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile
> index 8cad594..8b679e2 100644
> --- a/arch/arm/kernel/Makefile
> +++ b/arch/arm/kernel/Makefile
> @@ -17,10 +17,14 @@ CFLAGS_REMOVE_return_address.o = -pg
>  # Object file lists.
>  
>  obj-y                := elf.o entry-common.o irq.o opcodes.o \
> -                process.o ptrace.o reboot.o return_address.o \
> +                process.o ptrace.o reboot.o \
>                  setup.o signal.o sigreturn_codes.o \
>                  stacktrace.o sys_arm.o time.o traps.o
>  
> +ifneq ($(CONFIG_ARM_UNWIND),y)
> +obj-$(CONFIG_FRAME_POINTER)  += return_address.o
> +endif
> +
>  obj-$(CONFIG_ATAGS)          += atags_parse.o
>  obj-$(CONFIG_ATAGS_PROC)     += atags_proc.o
>  obj-$(CONFIG_DEPRECATED_PARAM_STRUCT) += atags_compat.o
> diff --git a/arch/arm/kernel/return_address.c 
> b/arch/arm/kernel/return_address.c
> index b0d2f1f..7b42ac0 100644
> --- a/arch/arm/kernel/return_address.c
> +++ b/arch/arm/kernel/return_address.c
> @@ -7,8 +7,6 @@
>   */
>  #include <linux/export.h>
>  #include <linux/ftrace.h>
> -
> -#if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND)
>  #include <linux/sched.h>
>  
>  #include <asm/stacktrace.h>
> @@ -53,6 +51,4 @@ void *return_address(unsigned int level)
>               return NULL;
>  }
>  
> -#endif /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) */
> -
>  EXPORT_SYMBOL_GPL(return_address);
> -- 
> 2.7.4
> 

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#8555): 
https://lists.yoctoproject.org/g/linux-yocto/message/8555
Mute This Topic: https://lists.yoctoproject.org/mt/72525264/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub  
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to