KVM: s390: updates for 6.15
Janosch Frank
maintainerPaolo,
only two cleanup patches by Thomas Weissschuh fixing our pointer print formats in s390 KVM.
I'll be on a conference next week but I'll check my mails periodically and I really don't expect problems with those two patches.
Please pull.
Cheers,
Janosch
The following changes since commit a64dcfb451e254085a7daee5fe51bf22959d52d3:
Linux 6.14-rc2 (2025-02-09 12:45:03 -0800)
are available in the Git repository at:
https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git tags/kvm-s390-next-6.15-1
for you to fetch changes up to 0c7fbae5bc782429c97d68dc40fb126748d7e352:
KVM: s390: Don't use %pK through debug printing (2025-03-17 08:55:46 +0000)
----------------------------------------------------------------
Pointer print format fixes
----------------------------------------------------------------
Thomas Weißschuh (2):
KVM: s390: Don't use %pK through tracepoints
KVM: s390: Don't use %pK through debug printing
arch/s390/kvm/intercept.c | 2 +- arch/s390/kvm/interrupt.c | 8 ++++---- arch/s390/kvm/kvm-s390.c | 10 +++++----- arch/s390/kvm/trace-s390.h | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-)
Signature · 1 line
2.49.0
Janosch Frank
maintainer[GIT PULL 1/2] KVM: s390: Don't use %pK through tracepoints
From: Thomas Weißschuh <[email protected]>
Restricted pointers ("%pK") are not meant to be used through TP_format(). It can unintentionally expose security sensitive, raw pointer values.
Use regular pointer formatting instead.
Message-ID: <20250217-restricted-pointers-s390-v1-1-0e4ace75d8aa@linutronix.de>
--- arch/s390/kvm/trace-s390.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/s390/kvm/trace-s390.h +2 -2
@@ -56,7 +56,7 @@ TRACE_EVENT(kvm_s390_create_vcpu, __entry->sie_block = sie_block; ), -TP_printk ("create cpu %d at 0x%pK, sie block at 0x%pK" , +TP_printk ("create cpu %d at 0x%p, sie block at 0x%p" , __entry->id, __entry->vcpu, __entry->sie_block) );
@@ -255,7 +255,7 @@ TRACE_EVENT(kvm_s390_enable_css, __entry->kvm = kvm; ), -TP_printk ("enabling channel I/O support (kvm @ %pK)\n" , +TP_printk ("enabling channel I/O support (kvm @ %p)\n" , __entry->kvm) );
Signature · 1 line
2.49.0
Janosch Frank
maintainer[GIT PULL 2/2] KVM: s390: Don't use %pK through debug printing
In reply to Janosch FrankFrom: Thomas Weißschuh <[email protected]>
Restricted pointers ("%pK") are only meant to be used when directly printing to a file from task context.
Otherwise it can unintentionally expose security sensitive, raw pointer values.
Use regular pointer formatting instead.
Message-ID: <20250217-restricted-pointers-s390-v1-2-0e4ace75d8aa@linutronix.de>
--- arch/s390/kvm/intercept.c | 2 +- arch/s390/kvm/interrupt.c | 8 ++++---- arch/s390/kvm/kvm-s390.c | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-)
arch/s390/kvm/intercept.c +1 -1
@@ -95,7 +95,7 @@ static int handle_validity(struct kvm_vcpu *vcpu) vcpu->stat.exit_validity++;trace_kvm_s390_intercept_validity (vcpu, viwhy); -KVM_EVENT (3 ,"validity intercept 0x%x for pid %u (kvm 0x%pK)" , viwhy, +KVM_EVENT (3 ,"validity intercept 0x%x for pid %u (kvm 0x%p)" , viwhy, current->pid, vcpu->kvm);/* do not warn on invalid runtime instrumentation mode */
arch/s390/kvm/interrupt.c +4 -4
@@ -3161,7 +3161,7 @@ void kvm_s390_gisa_clear(struct kvm *kvm)if (!gi->origin)return ;gisa_clear_ipm (gi->origin); -VM_EVENT (kvm,3 ,"gisa 0x%pK cleared" , gi->origin); +VM_EVENT (kvm,3 ,"gisa 0x%p cleared" , gi->origin); }void kvm_s390_gisa_init (struct kvm *kvm)
@@ -3178,7 +3178,7 @@ void kvm_s390_gisa_init(struct kvm *kvm) gi->timer.function = gisa_vcpu_kicker;memset (gi->origin,0 ,sizeof (struct kvm_s390_gisa )); gi->origin->next_alert = (u32 )virt_to_phys (gi->origin); -VM_EVENT (kvm,3 ,"gisa 0x%pK initialized" , gi->origin); +VM_EVENT (kvm,3 ,"gisa 0x%p initialized" , gi->origin); }void kvm_s390_gisa_enable (struct kvm *kvm)
@@ -3219,7 +3219,7 @@ void kvm_s390_gisa_destroy(struct kvm *kvm)process_gib_alert_list ();hrtimer_cancel (&gi->timer); gi->origin =NULL ; -VM_EVENT (kvm,3 ,"gisa 0x%pK destroyed" , gisa); +VM_EVENT (kvm,3 ,"gisa 0x%p destroyed" , gisa); }void kvm_s390_gisa_disable (struct kvm *kvm)
@@ -3468,7 +3468,7 @@ int __init kvm_s390_gib_init(u8 nisc) } } -KVM_EVENT (3 ,"gib 0x%pK (nisc=%d) initialized" , gib, gib->nisc); +KVM_EVENT (3 ,"gib 0x%p (nisc=%d) initialized" , gib, gib->nisc); goto out; out_unreg_gal:
arch/s390/kvm/kvm-s390.c +5 -5
@@ -1020,7 +1020,7 @@ static int kvm_s390_set_mem_control(struct kvm *kvm, struct kvm_device_attr *att }mutex_unlock (&kvm->lock);VM_EVENT (kvm,3 ,"SET: max guest address: %lu" , new_limit); -VM_EVENT (kvm,3 ,"New guest asce: 0x%pK" , +VM_EVENT (kvm,3 ,"New guest asce: 0x%p" , (void *) kvm->arch.gmap->asce);break ; }
@@ -3464,7 +3464,7 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type)kvm_s390_gisa_init (kvm);INIT_LIST_HEAD (&kvm->arch.pv.need_cleanup); kvm->arch.pv.set_aside =NULL ; -KVM_EVENT (3 ,"vm 0x%pK created by pid %u" , kvm, current->pid); +KVM_EVENT (3 ,"vm 0x%p created by pid %u" , kvm, current->pid);return 0 ; out_err:
@@ -3527,7 +3527,7 @@ void kvm_arch_destroy_vm(struct kvm *kvm)kvm_s390_destroy_adapters (kvm);kvm_s390_clear_float_irqs (kvm);kvm_s390_vsie_destroy (kvm); -KVM_EVENT (3 ,"vm 0x%pK destroyed" , kvm); +KVM_EVENT (3 ,"vm 0x%p destroyed" , kvm); }/* Section: vcpu related */
@@ -3648,7 +3648,7 @@ static int sca_switch_to_extended(struct kvm *kvm)free_page ((unsigned long )old_sca); -VM_EVENT (kvm,2 ,"Switched to ESCA (0x%pK -> 0x%pK)" , +VM_EVENT (kvm,2 ,"Switched to ESCA (0x%p -> 0x%p)" , old_sca, kvm->arch.sca);return 0 ; }
@@ -4025,7 +4025,7 @@ int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu) goto out_free_sie_block; } -VM_EVENT (vcpu->kvm,3 ,"create cpu %d at 0x%pK, sie block at 0x%pK" , +VM_EVENT (vcpu->kvm,3 ,"create cpu %d at 0x%p, sie block at 0x%p" , vcpu->vcpu_id, vcpu, vcpu->arch.sie_block);trace_kvm_s390_create_vcpu (vcpu->vcpu_id, vcpu, vcpu->arch.sie_block);
Signature · 1 line
2.49.0
Paolo Bonzini
maintainerQuoted 10 lines · Janosch Frank
Paolo,
only two cleanup patches by Thomas Weissschuh fixing our pointer print formats in s390 KVM.
I'll be on a conference next week but I'll check my mails periodically and I really don't expect problems with those two patches.
Please pull.
Pulled, thanks.
Paolo