Commit dc70ec21 authored by David Woodhouse's avatar David Woodhouse Committed by Paolo Bonzini
Browse files

KVM: Introduce CONFIG_HAVE_KVM_DIRTY_RING 



I'd like to make the build include dirty_ring.c based on whether the
arch wants it or not. That's a whole lot simpler if there's a config
symbol instead of doing it implicitly on KVM_DIRTY_LOG_PAGE_OFFSET
being set to something non-zero.

Signed-off-by: default avatarDavid Woodhouse <dwmw@amazon.co.uk>
Message-Id: <20211121125451.9489-2-dwmw2@infradead.org>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 45af1bb9

arch/x86/kvm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ config KVM 
	select MMU_NOTIFIER

	select HAVE_KVM_IRQCHIP

	select HAVE_KVM_IRQFD

	select HAVE_KVM_DIRTY_RING

	select IRQ_BYPASS_MANAGER

	select HAVE_KVM_IRQ_BYPASS

	select HAVE_KVM_IRQ_ROUTING

include/linux/kvm_dirty_ring.h

+4 −4
Original line number Diff line number Diff line
@@ -27,9 +27,9 @@ struct kvm_dirty_ring { 
	int index;

};



#if (KVM_DIRTY_LOG_PAGE_OFFSET == 0)

#ifndef CONFIG_HAVE_KVM_DIRTY_RING

/*

 * If KVM_DIRTY_LOG_PAGE_OFFSET not defined, kvm_dirty_ring.o should

 * If CONFIG_HAVE_HVM_DIRTY_RING not defined, kvm_dirty_ring.o should

 * not be included as well, so define these nop functions for the arch.

 */

static inline u32 kvm_dirty_ring_get_rsvd_entries(void)
@@ -74,7 +74,7 @@ static inline bool kvm_dirty_ring_soft_full(struct kvm_dirty_ring *ring) 
	return true;

}



#else /* KVM_DIRTY_LOG_PAGE_OFFSET == 0 */

#else /* CONFIG_HAVE_KVM_DIRTY_RING */



u32 kvm_dirty_ring_get_rsvd_entries(void);

int kvm_dirty_ring_alloc(struct kvm_dirty_ring *ring, int index, u32 size);
@@ -98,6 +98,6 @@ struct page *kvm_dirty_ring_get_page(struct kvm_dirty_ring *ring, u32 offset); 
void kvm_dirty_ring_free(struct kvm_dirty_ring *ring);

bool kvm_dirty_ring_soft_full(struct kvm_dirty_ring *ring);



#endif /* KVM_DIRTY_LOG_PAGE_OFFSET == 0 */

#endif /* CONFIG_HAVE_KVM_DIRTY_RING */



#endif	/* KVM_DIRTY_RING_H */

virt/kvm/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -13,6 +13,9 @@ config HAVE_KVM_IRQFD 
config HAVE_KVM_IRQ_ROUTING

       bool



config HAVE_KVM_DIRTY_RING

       bool



config HAVE_KVM_EVENTFD

       bool

       select EVENTFD

virt/kvm/kvm_main.c

+2 −2
Original line number Diff line number Diff line
@@ -3600,7 +3600,7 @@ EXPORT_SYMBOL_GPL(kvm_vcpu_on_spin); 


static bool kvm_page_in_dirty_ring(struct kvm *kvm, unsigned long pgoff)

{

#if KVM_DIRTY_LOG_PAGE_OFFSET > 0

#ifdef CONFIG_HAVE_KVM_DIRTY_RING

	return (pgoff >= KVM_DIRTY_LOG_PAGE_OFFSET) &&

	    (pgoff < KVM_DIRTY_LOG_PAGE_OFFSET +

	     kvm->dirty_ring_size / PAGE_SIZE);
@@ -4305,7 +4305,7 @@ static long kvm_vm_ioctl_check_extension_generic(struct kvm *kvm, long arg) 
	case KVM_CAP_NR_MEMSLOTS:

		return KVM_USER_MEM_SLOTS;

	case KVM_CAP_DIRTY_LOG_RING:

#if KVM_DIRTY_LOG_PAGE_OFFSET > 0

#ifdef CONFIG_HAVE_KVM_DIRTY_RING

		return KVM_DIRTY_RING_MAX_ENTRIES * sizeof(struct kvm_dirty_gfn);

#else

		return 0;