KVM: fix checkpatch warnings
PATCH 1/6 KVM: fix checkpatch warnings
Fix "SPDX comment style" warnings
This patchset fixes many checkpatch warnings in the virt/kvm directory. The warnings and errors that will remain are of the following kinds:
* "memory barrier without comment" warnings that don't have trivial fixes
* "function definition argument should also have an identifier name" warnings
* Numerous minor issues in kvm_main.c that merit a separate patch
--- virt/kvm/dirty_ring.c | 2 +- virt/kvm/kvm_mm.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
virt/kvm/dirty_ring.c +1 -1
@@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ +// SPDX-License-Identifier: GPL-2.0-only /* * KVM dirty ring implementation *
virt/kvm/kvm_mm.h +1 -1
@@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0-only +/* SPDX-License-Identifier: GPL-2.0-only */ #ifndef __KVM_MM_H__#define __KVM_MM_H__ 1
Signature · 1 line
2.35.1
PATCH 2/6 KVM: fix checkpatch warnings
Fix "Prefer 'unsigned int' to bare use of 'unsigned'" warnings
--- virt/kvm/coalesced_mmio.c | 2 +- virt/kvm/eventfd.c | 8 ++++---- virt/kvm/irqchip.c | 6 +++--- virt/kvm/kvm_main.c | 16 ++++++++-------- 4 files changed, 16 insertions(+), 16 deletions(-)
virt/kvm/coalesced_mmio.c +1 -1
@@ -43,7 +43,7 @@ static int coalesced_mmio_in_range(struct kvm_coalesced_mmio_dev *dev,static int coalesced_mmio_has_room (struct kvm_coalesced_mmio_dev *dev,u32 last) {struct kvm_coalesced_mmio_ring *ring; -unsigned avail; +unsigned int avail;/* Are we able to batch it ? */
virt/kvm/eventfd.c +4 -4
@@ -182,14 +182,14 @@ int __attribute__((weak)) kvm_arch_set_irq_inatomic(* Called with wqh->lock held and interrupts disabled */ static int -irqfd_wakeup (wait_queue_entry_t *wait,unsigned mode,int sync,void *key) +irqfd_wakeup (wait_queue_entry_t *wait,unsigned int mode,int sync,void *key) {struct kvm_kernel_irqfd *irqfd = container_of(wait, struct kvm_kernel_irqfd, wait);__poll_t flags =key_to_poll (key);struct kvm_kernel_irq_routing_entry irq;struct kvm *kvm = irqfd->kvm; -unsigned seq; +unsigned int seq;int idx;int ret =0 ;
@@ -455,7 +455,7 @@ kvm_irqfd_assign(struct kvm *kvm, struct kvm_irqfd *args)return ret; } -bool kvm_irq_has_notifier (struct kvm *kvm,unsigned irqchip,unsigned pin) +bool kvm_irq_has_notifier (struct kvm *kvm,unsigned int irqchip,unsigned int pin) {struct kvm_irq_ack_notifier *kian;int gsi, idx;
@@ -486,7 +486,7 @@ void kvm_notify_acked_gsi(struct kvm *kvm, int gsi) kian->irq_acked (kian); } -void kvm_notify_acked_irq (struct kvm *kvm,unsigned irqchip,unsigned pin) +void kvm_notify_acked_irq (struct kvm *kvm,unsigned int irqchip,unsigned int pin) {int gsi, idx;
virt/kvm/irqchip.c +3 -3
@@ -38,7 +38,7 @@ int kvm_irq_map_gsi(struct kvm *kvm,return n; } -int kvm_irq_map_chip_pin (struct kvm *kvm,unsigned irqchip,unsigned pin) +int kvm_irq_map_chip_pin (struct kvm *kvm,unsigned int irqchip,unsigned int pin) {struct kvm_irq_routing_table *irq_rt;
@@ -168,8 +168,8 @@ bool __weak kvm_arch_can_set_irq_routing(struct kvm *kvm)int kvm_set_irq_routing (struct kvm *kvm,const struct kvm_irq_routing_entry *ue, -unsigned nr, -unsigned flags) +unsigned int nr, +unsigned int flags) {struct kvm_irq_routing_table *new, *old;struct kvm_kernel_irq_routing_entry *e;
virt/kvm/kvm_main.c +8 -8
@@ -216,7 +216,7 @@ void vcpu_put(struct kvm_vcpu *vcpu)EXPORT_SYMBOL_GPL (vcpu_put);/* TODO: merge with kvm_arch_vcpu_should_kick */ -static bool kvm_request_needs_ipi (struct kvm_vcpu *vcpu,unsigned req) +static bool kvm_request_needs_ipi (struct kvm_vcpu *vcpu,unsigned int req) {int mode =kvm_vcpu_exiting_guest_mode (vcpu);
@@ -415,7 +415,7 @@ void *kvm_mmu_memory_cache_alloc(struct kvm_mmu_memory_cache *mc) }#endif -static void kvm_vcpu_init (struct kvm_vcpu *vcpu,struct kvm *kvm,unsigned id) +static void kvm_vcpu_init (struct kvm_vcpu *vcpu,struct kvm *kvm,unsigned int id) {mutex_init (&vcpu->mutex); vcpu->cpu =-1 ;
@@ -3454,7 +3454,7 @@ void kvm_vcpu_kick(struct kvm_vcpu *vcpu)*/ if (kvm_arch_vcpu_should_kick (vcpu)) { cpu =READ_ONCE (vcpu->cpu); -if (cpu != me && (unsigned )cpu < nr_cpu_ids &&cpu_online (cpu)) +if (cpu != me && (unsigned int )cpu < nr_cpu_ids &&cpu_online (cpu))smp_send_reschedule (cpu); } out:
@@ -5366,7 +5366,7 @@ static const struct file_operations stat_fops_per_vm = {static int vm_stat_get (void *_offset,u64 *val) { -unsigned offset = (long )_offset; +unsigned int offset = (long )_offset;struct kvm *kvm;u64 tmp_val;
@@ -5382,7 +5382,7 @@ static int vm_stat_get(void *_offset, u64 *val)static int vm_stat_clear (void *_offset,u64 val) { -unsigned offset = (long )_offset; +unsigned int offset = (long )_offset;struct kvm *kvm;if (val)
@@ -5402,7 +5402,7 @@ DEFINE_SIMPLE_ATTRIBUTE(vm_stat_readonly_fops, vm_stat_get, NULL, "%llu\n");static int vcpu_stat_get (void *_offset,u64 *val) { -unsigned offset = (long )_offset; +unsigned int offset = (long )_offset;struct kvm *kvm;u64 tmp_val;
@@ -5418,7 +5418,7 @@ static int vcpu_stat_get(void *_offset, u64 *val)static int vcpu_stat_clear (void *_offset,u64 val) { -unsigned offset = (long )_offset; +unsigned int offset = (long )_offset;struct kvm *kvm;if (val)
@@ -5654,7 +5654,7 @@ static void check_processor_compat(void *data) *c->ret =kvm_arch_check_processor_compat (c->opaque); } -int kvm_init (void *opaque,unsigned vcpu_size,unsigned vcpu_align, +int kvm_init (void *opaque,unsigned int vcpu_size,unsigned int vcpu_align,struct module *module) {struct kvm_cpu_compat_check c;
Signature · 1 line
2.35.1
PATCH 3/6 KVM: fix checkpatch warnings
In reply to Henry SloanFix "__attribute__((weak))" warnings
--- virt/kvm/eventfd.c | 12 ++++++------ virt/kvm/irqchip.c | 2 +- virt/kvm/kvm_main.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-)
virt/kvm/eventfd.c +6 -6
@@ -32,7 +32,7 @@static struct workqueue_struct *irqfd_cleanup_wq; -bool __attribute__((weak)) +bool __weak kvm_arch_irqfd_allowed (struct kvm *kvm,struct kvm_irqfd *args) {return true;
@@ -169,7 +169,7 @@ irqfd_deactivate(struct kvm_kernel_irqfd *irqfd)queue_work (irqfd_cleanup_wq, &irqfd->shutdown); } -int __attribute__((weak)) kvm_arch_set_irq_inatomic( +int __weak kvm_arch_set_irq_inatomic( struct kvm_kernel_irq_routing_entry *irq, struct kvm *kvm, int irq_source_id, int level,
@@ -265,24 +265,24 @@ static void irqfd_update(struct kvm *kvm, struct kvm_kernel_irqfd *irqfd) }#ifdef CONFIG_HAVE_KVM_IRQ_BYPASS -void __attribute__((weak))kvm_arch_irq_bypass_stop ( +void __weak kvm_arch_irq_bypass_stop (struct irq_bypass_consumer *cons) { } -void __attribute__((weak))kvm_arch_irq_bypass_start ( +void __weak kvm_arch_irq_bypass_start (struct irq_bypass_consumer *cons) { } -int __attribute__((weak))kvm_arch_update_irqfd_routing ( +int __weak kvm_arch_update_irqfd_routing (struct kvm *kvm,unsigned int host_irq,uint32_t guest_irq,bool set) {return 0 ; } -bool __attribute__((weak))kvm_arch_irqfd_route_changed ( +bool __weak kvm_arch_irqfd_route_changed (struct kvm_kernel_irq_routing_entry *old,struct kvm_kernel_irq_routing_entry *new) {
virt/kvm/irqchip.c +1 -1
@@ -157,7 +157,7 @@ static int setup_routing_entry(struct kvm *kvm,return 0 ; } -void __attribute__((weak))kvm_arch_irq_routing_update (struct kvm *kvm) +void __weak kvm_arch_irq_routing_update (struct kvm *kvm) { }
virt/kvm/kvm_main.c +1 -1
@@ -4386,7 +4386,7 @@ static int kvm_vm_ioctl_reset_dirty_pages(struct kvm *kvm)return cleared; } -int __attribute__((weak))kvm_vm_ioctl_enable_cap (struct kvm *kvm, +int __weak kvm_vm_ioctl_enable_cap (struct kvm *kvm,struct kvm_enable_cap *cap) {return -EINVAL ;
Signature · 1 line
2.35.1
PATCH 4/6 KVM: fix checkpatch warnings
In reply to Henry SloanFix "Missing a blank line after declarations" warnings
--- virt/kvm/eventfd.c | 1 + virt/kvm/irqchip.c | 2 ++ virt/kvm/kvm_main.c | 4 ++++ 3 files changed, 7 insertions(+)
virt/kvm/eventfd.c +1 -0
@@ -195,6 +195,7 @@ irqfd_wakeup(wait_queue_entry_t *wait, unsigned int mode, int sync, void *key)if (flags &EPOLLIN ) {u64 cnt; +eventfd_ctx_do_read (irqfd->eventfd, &cnt); idx =srcu_read_lock (&kvm->irq_srcu);
virt/kvm/irqchip.c +2 -0
@@ -86,6 +86,7 @@ int kvm_set_irq(struct kvm *kvm, int irq_source_id, u32 irq, int level,while (i--) {int r; + r = irq_set[i].set (&irq_set[i], kvm, irq_source_id, level, line_status);if (r <0 )
@@ -122,6 +123,7 @@ void kvm_free_irq_routing(struct kvm *kvm)/* Called only during vm destruction. Nobody can use the pointer at this stage */ struct kvm_irq_routing_table *rt =rcu_access_pointer (kvm->irq_routing); +free_irq_routing_table (rt); }
virt/kvm/kvm_main.c +4 -0
@@ -2171,6 +2171,7 @@ static int kvm_clear_dirty_log_protect(struct kvm *kvm, i++, offset += BITS_PER_LONG) {unsigned long mask = *dirty_bitmap_buffer++;atomic_long_t *p = (atomic_long_t *) &dirty_bitmap[i]; +if (!mask)continue ;
@@ -2477,6 +2478,7 @@ static int hva_to_pfn_remapped(struct vm_area_struct *vma,* not call the fault handler, so do it here. */ bool unlocked = false; + r =fixup_user_fault (current->mm, addr, (write_fault ?FAULT_FLAG_WRITE :0 ), &unlocked);
@@ -3053,6 +3055,7 @@ int kvm_gfn_to_hva_cache_init(struct kvm *kvm, struct gfn_to_hva_cache *ghc, gpa_t gpa, unsigned long len) {struct kvm_memslots *slots =kvm_memslots (kvm); +return __kvm_gfn_to_hva_cache_init (slots, ghc, gpa, len); }EXPORT_SYMBOL_GPL (kvm_gfn_to_hva_cache_init);
@@ -3887,6 +3890,7 @@ static long kvm_vcpu_ioctl(struct file *filp,switch (ioctl) {case KVM_RUN : {struct pid *oldpid; + r = -EINVAL ;if (arg) goto out;
Signature · 1 line
2.35.1
PATCH 5/6 KVM: fix checkpatch warnings
In reply to Henry SloanFix warnings involving block comments
--- virt/kvm/irqchip.c | 6 ++++-- virt/kvm/kvm_main.c | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-)
virt/kvm/irqchip.c +4 -2
@@ -120,8 +120,10 @@ static void free_irq_routing_table(struct kvm_irq_routing_table *rt)void kvm_free_irq_routing (struct kvm *kvm) { -/* Called only during vm destruction. Nobody can use the pointer -at this stage */ +/* +* Called only during vm destruction. Nobody can use the pointer +* at this stage +*/ struct kvm_irq_routing_table *rt =rcu_access_pointer (kvm->irq_routing);free_irq_routing_table (rt);
virt/kvm/kvm_main.c +3 -3
@@ -2182,7 +2182,7 @@ static int kvm_clear_dirty_log_protect(struct kvm *kvm,* never includes any bits beyond the length of the memslot (if * the length is not aligned to 64 pages), therefore it is not * a problem if userspace sets them in log->dirty_bitmap. -*/ +*/ if (mask) { flush = true; kvm_arch_mmu_enable_log_dirty_pt_masked(kvm, memslot,
@@ -5245,8 +5245,8 @@ static int kvm_debugfs_open(struct inode *inode, struct file *file,/* * The debugfs files are a reference to the kvm struct which -* is still valid when kvm_destroy_vm is called. kvm_get_kvm_safe -* avoids the race between open and the removal of the debugfs directory. +* is still valid when kvm_destroy_vm is called. kvm_get_kvm_safe +* avoids the race between open and the removal of the debugfs directory. */ if (!kvm_get_kvm_safe (stat_data->kvm))return -ENOENT ;
Signature · 1 line
2.35.1
PATCH 6/6 KVM: fix checkpatch warnings
In reply to Henry SloanFix warnings involving indentation and braces
--- virt/kvm/kvm_main.c | 36 +++++++++++++++++++----------------- virt/kvm/pfncache.c | 2 +- 2 files changed, 20 insertions(+), 18 deletions(-)
virt/kvm/kvm_main.c +19 -17
@@ -132,7 +132,10 @@ static long kvm_vcpu_compat_ioctl(struct file *file, unsigned int ioctl,* passed to a compat task, let the ioctls fail. */ static long kvm_no_compat_ioctl (struct file *file,unsigned int ioctl, -unsigned long arg) {return -EINVAL ; } +unsigned long arg) +{ +return -EINVAL ; +}static int kvm_no_compat_open (struct inode *inode,struct file *file) {
@@ -2154,9 +2157,9 @@ static int kvm_clear_dirty_log_protect(struct kvm *kvm, n =ALIGN (log->num_pages,BITS_PER_LONG ) /8 ;if (log->first_page > memslot->npages || - log->num_pages > memslot->npages - log->first_page || - (log->num_pages < memslot->npages - log->first_page && (log->num_pages &63 ))) -return -EINVAL ; + log->num_pages > memslot->npages - log->first_page || + (log->num_pages < memslot->npages - log->first_page && (log->num_pages &63 ))) +return -EINVAL ;kvm_arch_sync_dirty_log (kvm, memslot);
@@ -2517,7 +2520,7 @@ static int hva_to_pfn_remapped(struct vm_area_struct *vma,* tail pages of non-compound higher order allocations, which * would then underflow the refcount when the caller does the * required put_page. Don't allow those pages here. -*/ +*/ if (!kvm_try_get_pfn (pfn)) r = -EFAULT ;
@@ -2906,7 +2909,7 @@ int kvm_vcpu_read_guest(struct kvm_vcpu *vcpu, gpa_t gpa, void *data, unsigned lEXPORT_SYMBOL_GPL (kvm_vcpu_read_guest);static int __kvm_read_guest_atomic (struct kvm_memory_slot *slot,gfn_t gfn, -void *data,int offset,unsigned long len) +void *data,int offset,unsigned long len) {int r;unsigned long addr;
@@ -2923,7 +2926,7 @@ static int __kvm_read_guest_atomic(struct kvm_memory_slot *slot, gfn_t gfn, }int kvm_vcpu_read_guest_atomic (struct kvm_vcpu *vcpu,gpa_t gpa, -void *data,unsigned long len) +void *data,unsigned long len) {gfn_t gfn = gpa >>PAGE_SHIFT ;struct kvm_memory_slot *slot =kvm_vcpu_gfn_to_memslot (vcpu, gfn);
@@ -2934,8 +2937,8 @@ int kvm_vcpu_read_guest_atomic(struct kvm_vcpu *vcpu, gpa_t gpa,EXPORT_SYMBOL_GPL (kvm_vcpu_read_guest_atomic);static int __kvm_write_guest_page (struct kvm *kvm, -struct kvm_memory_slot *memslot,gfn_t gfn, -const void *data,int offset,int len) +struct kvm_memory_slot *memslot,gfn_t gfn, +const void *data,int offset,int len) {int r;unsigned long addr;
@@ -2990,7 +2993,7 @@ int kvm_write_guest(struct kvm *kvm, gpa_t gpa, const void *data,EXPORT_SYMBOL_GPL (kvm_write_guest);int kvm_vcpu_write_guest (struct kvm_vcpu *vcpu,gpa_t gpa,const void *data, -unsigned long len) +unsigned long len) {gfn_t gfn = gpa >>PAGE_SHIFT ;int seg;
@@ -3011,8 +3014,8 @@ int kvm_vcpu_write_guest(struct kvm_vcpu *vcpu, gpa_t gpa, const void *data,EXPORT_SYMBOL_GPL (kvm_vcpu_write_guest);static int __kvm_gfn_to_hva_cache_init (struct kvm_memslots *slots, -struct gfn_to_hva_cache *ghc, -gpa_t gpa,unsigned long len) +struct gfn_to_hva_cache *ghc, +gpa_t gpa,unsigned long len) {int offset =offset_in_page (gpa);gfn_t start_gfn = gpa >>PAGE_SHIFT ;
@@ -3156,8 +3159,8 @@ int kvm_clear_guest(struct kvm *kvm, gpa_t gpa, unsigned long len)EXPORT_SYMBOL_GPL (kvm_clear_guest);void mark_page_dirty_in_slot (struct kvm *kvm, -const struct kvm_memory_slot *memslot, -gfn_t gfn) +const struct kvm_memory_slot *memslot, +gfn_t gfn) {struct kvm_vcpu *vcpu =kvm_get_running_vcpu ();
@@ -5176,9 +5179,8 @@ int kvm_io_bus_unregister_dev(struct kvm *kvm, enum kvm_bus bus_idx,return 0 ;for (i =0 ; i < bus->dev_count; i++) { -if (bus->range[i].dev == dev) { +if (bus->range[i].dev == dev)break ; - } }if (i == bus->dev_count)
@@ -5599,7 +5601,7 @@ EXPORT_SYMBOL_GPL(kvm_get_running_vcpu);*/ struct kvm_vcpu *__percpu *kvm_get_running_vcpus (void ) { -return &kvm_running_vcpu; +return &kvm_running_vcpu; }#ifdef CONFIG_GUEST_PERF_EVENTS
virt/kvm/pfncache.c +1 -1
@@ -237,7 +237,7 @@ int kvm_gfn_to_pfn_cache_refresh(struct kvm *kvm, struct gfn_to_pfn_cache *gpc, ret = -EFAULT ; } - map_done: + map_done:write_lock_irq (&gpc->lock);if (ret) { gpc->valid = false;
Signature · 1 line
2.35.1
Quoted 1 line · Henry Sloan
Fix "SPDX comment style" warnings
Hi.
You've given all these patches the same email subject line.
That would mean the commit subject line would also be the same for each of these 6 patches.
That's bad.
More proper would be to use the first line of each commit message as part of the subject line
i.e.: This subject line would become:
Subject: [PATCH 1/6] KVM: Fix "SPDX comment style" warnings
or perhaps better:
Subject: [PATCH 1/6] KVM: Use typical SPDX comment style
etc...
Quoted 2 lines
This patchset fixes many checkpatch warnings in the
virt/kvmdirectory.
And this bit doesn't belong in the first patch of 6, but in a 0/6 patch cover letter.
cheers, Joe