Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 800b8f03 authored by K. Y. Srinivasan's avatar K. Y. Srinivasan Committed by Thomas Gleixner
Browse files

X86/Hyper-V: Consolidate code for converting cpumask to vpset 



Consolidate code for converting cpumask to vpset.

Signed-off-by: default avatarK. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarMichael Kelley <mikelley@microsoft.com>
Cc: olaf@aepfle.de
Cc: sthemmin@microsoft.com
Cc: gregkh@linuxfoundation.org
Cc: jasowang@redhat.com
Cc: Michael.H.Kelley@microsoft.com
Cc: hpa@zytor.com
Cc: apw@canonical.com
Cc: devel@linuxdriverproject.org
Cc: vkuznets@redhat.com
Link: https://lkml.kernel.org/r/20180516215334.6547-4-kys@linuxonhyperv.com
parent 366f03b0

arch/x86/hyperv/mmu.c

+2 −41
Original line number Diff line number Diff line
@@ -25,11 +25,7 @@ struct hv_flush_pcpu { 
struct hv_flush_pcpu_ex {

	u64 address_space;

	u64 flags;

	struct {

		u64 format;

		u64 valid_bank_mask;

		u64 bank_contents[];

	} hv_vp_set;

	struct hv_vpset hv_vp_set;

	u64 gva_list[];

};
@@ -70,41 +66,6 @@ static inline int fill_gva_list(u64 gva_list[], int offset, 
	return gva_n - offset;

}



/* Return the number of banks in the resulting vp_set */

static inline int cpumask_to_vp_set(struct hv_flush_pcpu_ex *flush,

				    const struct cpumask *cpus)

{

	int cpu, vcpu, vcpu_bank, vcpu_offset, nr_bank = 1;



	/* valid_bank_mask can represent up to 64 banks */

	if (hv_max_vp_index / 64 >= 64)

		return 0;



	/*

	 * Clear all banks up to the maximum possible bank as hv_flush_pcpu_ex

	 * structs are not cleared between calls, we risk flushing unneeded

	 * vCPUs otherwise.

	 */

	for (vcpu_bank = 0; vcpu_bank <= hv_max_vp_index / 64; vcpu_bank++)

		flush->hv_vp_set.bank_contents[vcpu_bank] = 0;



	/*

	 * Some banks may end up being empty but this is acceptable.

	 */

	for_each_cpu(cpu, cpus) {

		vcpu = hv_cpu_number_to_vp_number(cpu);

		vcpu_bank = vcpu / 64;

		vcpu_offset = vcpu % 64;

		__set_bit(vcpu_offset, (unsigned long *)

			  &flush->hv_vp_set.bank_contents[vcpu_bank]);

		if (vcpu_bank >= nr_bank)

			nr_bank = vcpu_bank + 1;

	}

	flush->hv_vp_set.valid_bank_mask = GENMASK_ULL(nr_bank - 1, 0);



	return nr_bank;

}



static void hyperv_flush_tlb_others(const struct cpumask *cpus,

				    const struct flush_tlb_info *info)

{
@@ -240,7 +201,7 @@ static void hyperv_flush_tlb_others_ex(const struct cpumask *cpus, 


	if (!cpumask_equal(cpus, cpu_present_mask)) {

		flush->hv_vp_set.format = HV_GENERIC_SET_SPARSE_4K;

		nr_bank = cpumask_to_vp_set(flush, cpus);

		nr_bank = cpumask_to_vpset(&(flush->hv_vp_set), cpus);

	}



	if (!nr_bank) {