Commit a8ebfcd3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

Pull KVM fixes from Paolo Bonzini:
 "RISC-V:
   - Fix missing PAGE_PFN_MASK

   - Fix SRCU deadlock caused by kvm_riscv_check_vcpu_requests()

  x86:
   - Fix for nested virtualization when TSC scaling is active

   - Estimate the size of fastcc subroutines conservatively, avoiding
     disastrous underestimation when return thunks are enabled

   - Avoid possible use of uninitialized fields of 'struct
     kvm_lapic_irq'

  Generic:
   - Mark as such the boolean values available from the statistics file
     descriptors

   - Clarify statistics documentation"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: emulate: do not adjust size of fastop and setcc subroutines
  KVM: x86: Fully initialize 'struct kvm_lapic_irq' in kvm_pv_kick_cpu_op()
  Documentation: kvm: clarify histogram units
  kvm: stats: tell userspace which values are boolean
  x86/kvm: fix FASTOP_SIZE when return thunks are enabled
  KVM: nVMX: Always enable TSC scaling for L2 when it was enabled for L1
  RISC-V: KVM: Fix SRCU deadlock caused by kvm_riscv_check_vcpu_requests()
  riscv: Fix missing PAGE_PFN_MASK
parents 1ce9d792 79629181

Documentation/virt/kvm/api.rst

+13 −4
Original line number Diff line number Diff line
@@ -5657,6 +5657,7 @@ by a string of size ``name_size``. 
	#define KVM_STATS_UNIT_BYTES		(0x1 << KVM_STATS_UNIT_SHIFT)

	#define KVM_STATS_UNIT_SECONDS		(0x2 << KVM_STATS_UNIT_SHIFT)

	#define KVM_STATS_UNIT_CYCLES		(0x3 << KVM_STATS_UNIT_SHIFT)

	#define KVM_STATS_UNIT_BOOLEAN		(0x4 << KVM_STATS_UNIT_SHIFT)

	#define KVM_STATS_UNIT_MAX		KVM_STATS_UNIT_CYCLES



	#define KVM_STATS_BASE_SHIFT		8
@@ -5702,14 +5703,13 @@ Bits 0-3 of ``flags`` encode the type: 
    by the ``hist_param`` field. The range of the Nth bucket (1 <= N < ``size``)

    is [``hist_param``*(N-1), ``hist_param``*N), while the range of the last

    bucket is [``hist_param``*(``size``-1), +INF). (+INF means positive infinity

    value.) The bucket value indicates how many samples fell in the bucket's range.

    value.)

  * ``KVM_STATS_TYPE_LOG_HIST``

    The statistic is reported as a logarithmic histogram. The number of

    buckets is specified by the ``size`` field. The range of the first bucket is

    [0, 1), while the range of the last bucket is [pow(2, ``size``-2), +INF).

    Otherwise, The Nth bucket (1 < N < ``size``) covers

    [pow(2, N-2), pow(2, N-1)). The bucket value indicates how many samples fell

    in the bucket's range.

    [pow(2, N-2), pow(2, N-1)).



Bits 4-7 of ``flags`` encode the unit:
@@ -5724,6 +5724,15 @@ Bits 4-7 of ``flags`` encode the unit: 
    It indicates that the statistics data is used to measure time or latency.

  * ``KVM_STATS_UNIT_CYCLES``

    It indicates that the statistics data is used to measure CPU clock cycles.

  * ``KVM_STATS_UNIT_BOOLEAN``

    It indicates that the statistic will always be either 0 or 1.  Boolean

    statistics of "peak" type will never go back from 1 to 0.  Boolean

    statistics can be linear histograms (with two buckets) but not logarithmic

    histograms.



Note that, in the case of histograms, the unit applies to the bucket

ranges, while the bucket value indicates how many samples fell in the

bucket's range.



Bits 8-11 of ``flags``, together with ``exponent``, encode the scale of the

unit:
@@ -5746,7 +5755,7 @@ the corresponding statistics data. 


The ``bucket_size`` field is used as a parameter for histogram statistics data.

It is only used by linear histogram statistics data, specifying the size of a

bucket.

bucket in the unit expressed by bits 4-11 of ``flags`` together with ``exponent``.



The ``name`` field is the name string of the statistics data. The name string

starts at the end of ``struct kvm_stats_desc``.  The maximum length including

arch/riscv/include/asm/pgtable-64.h

+6 −6
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ static inline pud_t pfn_pud(unsigned long pfn, pgprot_t prot) 


static inline unsigned long _pud_pfn(pud_t pud)

{

	return pud_val(pud) >> _PAGE_PFN_SHIFT;

	return __page_val_to_pfn(pud_val(pud));

}



static inline pmd_t *pud_pgtable(pud_t pud)
@@ -278,13 +278,13 @@ static inline p4d_t pfn_p4d(unsigned long pfn, pgprot_t prot) 


static inline unsigned long _p4d_pfn(p4d_t p4d)

{

	return p4d_val(p4d) >> _PAGE_PFN_SHIFT;

	return __page_val_to_pfn(p4d_val(p4d));

}



static inline pud_t *p4d_pgtable(p4d_t p4d)

{

	if (pgtable_l4_enabled)

		return (pud_t *)pfn_to_virt(p4d_val(p4d) >> _PAGE_PFN_SHIFT);

		return (pud_t *)pfn_to_virt(__page_val_to_pfn(p4d_val(p4d)));



	return (pud_t *)pud_pgtable((pud_t) { p4d_val(p4d) });

}
@@ -292,7 +292,7 @@ static inline pud_t *p4d_pgtable(p4d_t p4d) 


static inline struct page *p4d_page(p4d_t p4d)

{

	return pfn_to_page(p4d_val(p4d) >> _PAGE_PFN_SHIFT);

	return pfn_to_page(__page_val_to_pfn(p4d_val(p4d)));

}



#define pud_index(addr) (((addr) >> PUD_SHIFT) & (PTRS_PER_PUD - 1))
@@ -347,7 +347,7 @@ static inline void pgd_clear(pgd_t *pgd) 
static inline p4d_t *pgd_pgtable(pgd_t pgd)

{

	if (pgtable_l5_enabled)

		return (p4d_t *)pfn_to_virt(pgd_val(pgd) >> _PAGE_PFN_SHIFT);

		return (p4d_t *)pfn_to_virt(__page_val_to_pfn(pgd_val(pgd)));



	return (p4d_t *)p4d_pgtable((p4d_t) { pgd_val(pgd) });

}
@@ -355,7 +355,7 @@ static inline p4d_t *pgd_pgtable(pgd_t pgd) 


static inline struct page *pgd_page(pgd_t pgd)

{

	return pfn_to_page(pgd_val(pgd) >> _PAGE_PFN_SHIFT);

	return pfn_to_page(__page_val_to_pfn(pgd_val(pgd)));

}

#define pgd_page(pgd)	pgd_page(pgd)

arch/riscv/include/asm/pgtable.h

+3 −3
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ static inline pgd_t pfn_pgd(unsigned long pfn, pgprot_t prot) 


static inline unsigned long _pgd_pfn(pgd_t pgd)

{

	return pgd_val(pgd) >> _PAGE_PFN_SHIFT;

	return __page_val_to_pfn(pgd_val(pgd));

}



static inline struct page *pmd_page(pmd_t pmd)
@@ -590,14 +590,14 @@ static inline pmd_t pmd_mkinvalid(pmd_t pmd) 
	return __pmd(pmd_val(pmd) & ~(_PAGE_PRESENT|_PAGE_PROT_NONE));

}



#define __pmd_to_phys(pmd)  (pmd_val(pmd) >> _PAGE_PFN_SHIFT << PAGE_SHIFT)

#define __pmd_to_phys(pmd)  (__page_val_to_pfn(pmd_val(pmd)) << PAGE_SHIFT)



static inline unsigned long pmd_pfn(pmd_t pmd)

{

	return ((__pmd_to_phys(pmd) & PMD_MASK) >> PAGE_SHIFT);

}



#define __pud_to_phys(pud)  (pud_val(pud) >> _PAGE_PFN_SHIFT << PAGE_SHIFT)

#define __pud_to_phys(pud)  (__page_val_to_pfn(pud_val(pud)) << PAGE_SHIFT)



static inline unsigned long pud_pfn(pud_t pud)

{

arch/riscv/kvm/mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ static inline unsigned long gstage_pte_index(gpa_t addr, u32 level) 


static inline unsigned long gstage_pte_page_vaddr(pte_t pte)

{

	return (unsigned long)pfn_to_virt(pte_val(pte) >> _PAGE_PFN_SHIFT);

	return (unsigned long)pfn_to_virt(__page_val_to_pfn(pte_val(pte)));

}



static int gstage_page_size_to_level(unsigned long page_size, u32 *out_level)

arch/riscv/kvm/vcpu.c

+2 −0
Original line number Diff line number Diff line
@@ -781,9 +781,11 @@ static void kvm_riscv_check_vcpu_requests(struct kvm_vcpu *vcpu) 


	if (kvm_request_pending(vcpu)) {

		if (kvm_check_request(KVM_REQ_SLEEP, vcpu)) {

			kvm_vcpu_srcu_read_unlock(vcpu);

			rcuwait_wait_event(wait,

				(!vcpu->arch.power_off) && (!vcpu->arch.pause),

				TASK_INTERRUPTIBLE);

			kvm_vcpu_srcu_read_lock(vcpu);



			if (vcpu->arch.power_off || vcpu->arch.pause) {

				/*