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

Merge tag 'hyperv-next-signed-20220114' of... 

Merge tag 'hyperv-next-signed-20220114' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux

Pull hyperv updates from Wei Liu:

 - More patches for Hyper-V isolation VM support (Tianyu Lan)

 - Bug fixes and clean-up patches from various people

* tag 'hyperv-next-signed-20220114' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux:
  scsi: storvsc: Fix storvsc_queuecommand() memory leak
  x86/hyperv: Properly deal with empty cpumasks in hyperv_flush_tlb_multi()
  Drivers: hv: vmbus: Initialize request offers message for Isolation VM
  scsi: storvsc: Fix unsigned comparison to zero
  swiotlb: Add CONFIG_HAS_IOMEM check around swiotlb_mem_remap()
  x86/hyperv: Fix definition of hv_ghcb_pg variable
  Drivers: hv: Fix definition of hypercall input & output arg variables
  net: netvsc: Add Isolation VM support for netvsc driver
  scsi: storvsc: Add Isolation VM support for storvsc driver
  hyper-v: Enable swiotlb bounce buffer for Isolation VM
  x86/hyper-v: Add hyperv Isolation VM check in the cc_platform_has()
  swiotlb: Add swiotlb bounce buffer remap function for HV IVM
parents 4d66020d 4eea5332

arch/x86/hyperv/hv_init.c

+13 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <linux/syscore_ops.h>

#include <clocksource/hyperv_timer.h>

#include <linux/highmem.h>

#include <linux/swiotlb.h>



int hyperv_init_cpuhp;

u64 hv_current_partition_id = ~0ull;
@@ -36,7 +37,7 @@ EXPORT_SYMBOL_GPL(hv_current_partition_id); 
void *hv_hypercall_pg;

EXPORT_SYMBOL_GPL(hv_hypercall_pg);



union hv_ghcb __percpu **hv_ghcb_pg;

union hv_ghcb * __percpu *hv_ghcb_pg;



/* Storage to save the hypercall page temporarily for hibernation */

static void *hv_hypercall_pg_saved;
@@ -498,6 +499,17 @@ void __init hyperv_init(void) 


	/* Query the VMs extended capability once, so that it can be cached. */

	hv_query_ext_cap(0);



#ifdef CONFIG_SWIOTLB

	/*

	 * Swiotlb bounce buffer needs to be mapped in extra address

	 * space. Map function doesn't work in the early place and so

	 * call swiotlb_update_mem_attributes() here.

	 */

	if (hv_is_isolation_supported())

		swiotlb_update_mem_attributes();

#endif



	return;



clean_guest_os_id:

arch/x86/hyperv/ivm.c

+28 −0
Original line number Diff line number Diff line
@@ -287,3 +287,31 @@ int hv_set_mem_host_visibility(unsigned long kbuffer, int pagecount, bool visibl 
	kfree(pfn_array);

	return ret;

}



/*

 * hv_map_memory - map memory to extra space in the AMD SEV-SNP Isolation VM.

 */

void *hv_map_memory(void *addr, unsigned long size)

{

	unsigned long *pfns = kcalloc(size / PAGE_SIZE,

				      sizeof(unsigned long), GFP_KERNEL);

	void *vaddr;

	int i;



	if (!pfns)

		return NULL;



	for (i = 0; i < size / PAGE_SIZE; i++)

		pfns[i] = vmalloc_to_pfn(addr + i * PAGE_SIZE) +

			(ms_hyperv.shared_gpa_boundary >> PAGE_SHIFT);



	vaddr = vmap_pfn(pfns, size / PAGE_SIZE, PAGE_KERNEL_IO);

	kfree(pfns);



	return vaddr;

}



void hv_unmap_memory(void *addr)

{

	vunmap(addr);

}

arch/x86/hyperv/mmu.c

+9 −10
Original line number Diff line number Diff line
@@ -68,15 +68,6 @@ static void hyperv_flush_tlb_multi(const struct cpumask *cpus, 


	local_irq_save(flags);



	/*

	 * Only check the mask _after_ interrupt has been disabled to avoid the

	 * mask changing under our feet.

	 */

	if (cpumask_empty(cpus)) {

		local_irq_restore(flags);

		return;

	}



	flush_pcpu = (struct hv_tlb_flush **)

		     this_cpu_ptr(hyperv_pcpu_input_arg);
@@ -115,7 +106,9 @@ static void hyperv_flush_tlb_multi(const struct cpumask *cpus, 
		 * must. We will also check all VP numbers when walking the

		 * supplied CPU set to remain correct in all cases.

		 */

		if (hv_cpu_number_to_vp_number(cpumask_last(cpus)) >= 64)

		cpu = cpumask_last(cpus);



		if (cpu < nr_cpumask_bits && hv_cpu_number_to_vp_number(cpu) >= 64)

			goto do_ex_hypercall;



		for_each_cpu(cpu, cpus) {
@@ -131,6 +124,12 @@ static void hyperv_flush_tlb_multi(const struct cpumask *cpus, 
			__set_bit(vcpu, (unsigned long *)

				  &flush->processor_mask);

		}



		/* nothing to flush if 'processor_mask' ends up being empty */

		if (!flush->processor_mask) {

			local_irq_restore(flags);

			return;

		}

	}



	/*

arch/x86/include/asm/mshyperv.h

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ extern void *hv_hypercall_pg; 


extern u64 hv_current_partition_id;



extern union hv_ghcb  __percpu **hv_ghcb_pg;

extern union hv_ghcb * __percpu *hv_ghcb_pg;



int hv_call_deposit_pages(int node, u64 partition_id, u32 num_pages);

int hv_call_add_logical_proc(int node, u32 lp_index, u32 acpi_id);

arch/x86/kernel/cc_platform.c

+8 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/cc_platform.h>

#include <linux/mem_encrypt.h>



#include <asm/mshyperv.h>

#include <asm/processor.h>



static bool __maybe_unused intel_cc_platform_has(enum cc_attr attr)
@@ -66,12 +67,19 @@ static bool amd_cc_platform_has(enum cc_attr attr) 
#endif

}



static bool hyperv_cc_platform_has(enum cc_attr attr)

{

	return attr == CC_ATTR_GUEST_MEM_ENCRYPT;

}



bool cc_platform_has(enum cc_attr attr)

{

	if (sme_me_mask)

		return amd_cc_platform_has(attr);



	if (hv_is_isolation_supported())

		return hyperv_cc_platform_has(attr);



	return false;

}

EXPORT_SYMBOL_GPL(cc_platform_has);