Drivers: hv: Cosmetic changes for hv.c and balloon.c (831bcbce) · Commits · git / linux-nf

drivers/hv/hv.c

+18 −19

Original line number	Diff line number	Diff line
		@@ -111,7 +111,7 @@ int hv_synic_alloc(void)

		hv_context.hv_numa_map = kcalloc(nr_node_ids, sizeof(struct cpumask),
		GFP_KERNEL);
		if (hv_context.hv_numa_map == NULL) {
		if (!hv_context.hv_numa_map) {
		pr_err("Unable to allocate NUMA map\n");
		goto err;
		}
		@@ -124,7 +124,7 @@ int hv_synic_alloc(void)

		if (ms_hyperv.paravisor_present && hv_isolation_type_tdx()) {
		hv_cpu->post_msg_page = (void *)get_zeroed_page(GFP_ATOMIC);
		if (hv_cpu->post_msg_page == NULL) {
		if (!hv_cpu->post_msg_page) {
		pr_err("Unable to allocate post msg page\n");
		goto err;
		}
		@@ -147,14 +147,14 @@ int hv_synic_alloc(void)
		if (!ms_hyperv.paravisor_present && !hv_root_partition) {
		hv_cpu->synic_message_page =
		(void *)get_zeroed_page(GFP_ATOMIC);
		if (hv_cpu->synic_message_page == NULL) {
		if (!hv_cpu->synic_message_page) {
		pr_err("Unable to allocate SYNIC message page\n");
		goto err;
		}

		hv_cpu->synic_event_page =
		(void *)get_zeroed_page(GFP_ATOMIC);
		if (hv_cpu->synic_event_page == NULL) {
		if (!hv_cpu->synic_event_page) {
		pr_err("Unable to allocate SYNIC event page\n");

		free_page((unsigned long)hv_cpu->synic_message_page);
		@@ -203,14 +203,13 @@ int hv_synic_alloc(void)
		return ret;
		}


		void hv_synic_free(void)
		{
		int cpu, ret;

		for_each_present_cpu(cpu) {
		struct hv_per_cpu_context *hv_cpu
		= per_cpu_ptr(hv_context.cpu_context, cpu);
		struct hv_per_cpu_context *hv_cpu =
		per_cpu_ptr(hv_context.cpu_context, cpu);

		/* It's better to leak the page if the encryption fails. */
		if (ms_hyperv.paravisor_present && hv_isolation_type_tdx()) {
		@@ -262,8 +261,8 @@ void hv_synic_free(void)
		*/
		void hv_synic_enable_regs(unsigned int cpu)
		{
		struct hv_per_cpu_context *hv_cpu
		= per_cpu_ptr(hv_context.cpu_context, cpu);
		struct hv_per_cpu_context *hv_cpu =
		per_cpu_ptr(hv_context.cpu_context, cpu);
		union hv_synic_simp simp;
		union hv_synic_siefp siefp;
		union hv_synic_sint shared_sint;
		@@ -277,8 +276,8 @@ void hv_synic_enable_regs(unsigned int cpu)
		/* Mask out vTOM bit. ioremap_cache() maps decrypted */
		u64 base = (simp.base_simp_gpa << HV_HYP_PAGE_SHIFT) &
		~ms_hyperv.shared_gpa_boundary;
		hv_cpu->synic_message_page
		= (void *)ioremap_cache(base, HV_HYP_PAGE_SIZE);
		hv_cpu->synic_message_page =
		(void *)ioremap_cache(base, HV_HYP_PAGE_SIZE);
		if (!hv_cpu->synic_message_page)
		pr_err("Fail to map synic message page.\n");
		} else {
		@@ -296,8 +295,8 @@ void hv_synic_enable_regs(unsigned int cpu)
		/* Mask out vTOM bit. ioremap_cache() maps decrypted */
		u64 base = (siefp.base_siefp_gpa << HV_HYP_PAGE_SHIFT) &
		~ms_hyperv.shared_gpa_boundary;
		hv_cpu->synic_event_page
		= (void *)ioremap_cache(base, HV_HYP_PAGE_SIZE);
		hv_cpu->synic_event_page =
		(void *)ioremap_cache(base, HV_HYP_PAGE_SIZE);
		if (!hv_cpu->synic_event_page)
		pr_err("Fail to map synic event page.\n");
		} else {
		@@ -348,8 +347,8 @@ int hv_synic_init(unsigned int cpu)
		*/
		void hv_synic_disable_regs(unsigned int cpu)
		{
		struct hv_per_cpu_context *hv_cpu
		= per_cpu_ptr(hv_context.cpu_context, cpu);
		struct hv_per_cpu_context *hv_cpu =
		per_cpu_ptr(hv_context.cpu_context, cpu);
		union hv_synic_sint shared_sint;
		union hv_synic_simp simp;
		union hv_synic_siefp siefp;

drivers/hv/hv_balloon.c

+35 −63

Original line number	Diff line number	Diff line
		@@ -42,8 +42,6 @@
		* Begin protocol definitions.
		*/



		/*
		* Protocol versions. The low word is the minor version, the high word the major
		* version.
		@@ -72,8 +70,6 @@ enum {
		DYNMEM_PROTOCOL_VERSION_CURRENT = DYNMEM_PROTOCOL_VERSION_WIN10
		};



		/*
		* Message Types
		*/
		@@ -102,7 +98,6 @@ enum dm_message_type {
		DM_VERSION_1_MAX = 12
		};


		/*
		* Structures defining the dynamic memory management
		* protocol.
		@@ -116,7 +111,6 @@ union dm_version {
		__u32 version;
		} __packed;


		union dm_caps {
		struct {
		__u64 balloon:1;
		@@ -149,8 +143,6 @@ union dm_mem_page_range {
		__u64 page_range;
		} __packed;



		/*
		* The header for all dynamic memory messages:
		*
		@@ -175,7 +167,6 @@ struct dm_message {
		__u8 data[]; /* enclosed message */
		} __packed;


		/*
		* Specific message types supporting the dynamic memory protocol.
		*/
		@@ -272,7 +263,6 @@ struct dm_status {
		__u32 io_diff;
		} __packed;


		/*
		* Message to ask the guest to allocate memory - balloon up message.
		* This message is sent from the host to the guest. The guest may not be
		@@ -287,14 +277,13 @@ struct dm_balloon {
		__u32 reservedz;
		} __packed;


		/*
		* Balloon response message; this message is sent from the guest
		* to the host in response to the balloon message.
		*
		* reservedz: Reserved; must be set to zero.
		* more_pages: If FALSE, this is the last message of the transaction.
		* if TRUE there will atleast one more message from the guest.
		* if TRUE there will be at least one more message from the guest.
		*
		* range_count: The number of ranges in the range array.
		*
		@@ -315,7 +304,7 @@ struct dm_balloon_response {
		* to the guest to give guest more memory.
		*
		* more_pages: If FALSE, this is the last message of the transaction.
		* if TRUE there will atleast one more message from the guest.
		* if TRUE there will be at least one more message from the guest.
		*
		* reservedz: Reserved; must be set to zero.
		*
		@@ -343,7 +332,6 @@ struct dm_unballoon_response {
		struct dm_header hdr;
		} __packed;


		/*
		* Hot add request message. Message sent from the host to the guest.
		*
		@@ -391,7 +379,6 @@ enum dm_info_type {
		MAX_INFO_TYPE
		};


		/*
		* Header for the information message.
		*/
		@@ -481,10 +468,10 @@ static unsigned long last_post_time;

		static int hv_hypercall_multi_failure;

		module_param(hot_add, bool, (S_IRUGO \| S_IWUSR));
		module_param(hot_add, bool, 0644);
		MODULE_PARM_DESC(hot_add, "If set attempt memory hot_add");

		module_param(pressure_report_delay, uint, (S_IRUGO \| S_IWUSR));
		module_param(pressure_report_delay, uint, 0644);
		MODULE_PARM_DESC(pressure_report_delay, "Delay in secs in reporting pressure");
		static atomic_t trans_id = ATOMIC_INIT(0);

		@@ -503,7 +490,6 @@ enum hv_dm_state {
		DM_INIT_ERROR
		};


		static __u8 recv_buffer[HV_HYP_PAGE_SIZE];
		static __u8 balloon_up_send_buffer[HV_HYP_PAGE_SIZE];

		@@ -599,12 +585,12 @@ static inline bool has_pfn_is_backed(struct hv_hotadd_state *has,
		struct hv_hotadd_gap *gap;

		/* The page is not backed. */
		if ((pfn < has->covered_start_pfn) \|\| (pfn >= has->covered_end_pfn))
		if (pfn < has->covered_start_pfn \|\| pfn >= has->covered_end_pfn)
		return false;

		/* Check for gaps. */
		list_for_each_entry(gap, &has->gap_list, list) {
		if ((pfn >= gap->start_pfn) && (pfn < gap->end_pfn))
		if (pfn >= gap->start_pfn && pfn < gap->end_pfn)
		return false;
		}

		@@ -784,7 +770,7 @@ static void hv_online_page(struct page *pg, unsigned int order)
		guard(spinlock_irqsave)(&dm_device.ha_lock);
		list_for_each_entry(has, &dm_device.ha_region_list, list) {
		/* The page belongs to a different HAS. */
		if ((pfn < has->start_pfn) \|\|
		if (pfn < has->start_pfn \|\|
		(pfn + (1UL << order) > has->end_pfn))
		continue;

		@@ -893,10 +879,9 @@ static unsigned long handle_pg_range(unsigned long pg_start,
		if (start_pfn > has->start_pfn &&
		online_section_nr(pfn_to_section_nr(start_pfn)))
		hv_bring_pgs_online(has, start_pfn, pgs_ol);

		}

		if ((has->ha_end_pfn < has->end_pfn) && (pfn_cnt > 0)) {
		if (has->ha_end_pfn < has->end_pfn && pfn_cnt > 0) {
		/*
		* We have some residual hot add range
		* that needs to be hot added; hot add
		@@ -999,7 +984,7 @@ static void hot_add_req(struct work_struct *dummy)
		rg_start = dm->ha_wrk.ha_region_range.finfo.start_page;
		rg_sz = dm->ha_wrk.ha_region_range.finfo.page_cnt;

		if ((rg_start == 0) && (!dm->host_specified_ha_region)) {
		if (rg_start == 0 && !dm->host_specified_ha_region) {
		/*
		* The host has not specified the hot-add region.
		* Based on the hot-add page range being specified,
		@@ -1191,7 +1176,6 @@ static void post_status(struct hv_dynmem_device *dm)
		sizeof(struct dm_status),
		(unsigned long)NULL,
		VM_PKT_DATA_INBAND, 0);

		}

		static void free_balloon_pages(struct hv_dynmem_device *dm,
		@@ -1211,8 +1195,6 @@ static void free_balloon_pages(struct hv_dynmem_device *dm,
		}
		}



		static unsigned int alloc_balloon_pages(struct hv_dynmem_device *dm,
		unsigned int num_pages,
		struct dm_balloon_response *bl_resp,
		@@ -1258,7 +1240,6 @@ static unsigned int alloc_balloon_pages(struct hv_dynmem_device *dm,
		page_to_pfn(pg);
		bl_resp->range_array[i].finfo.page_cnt = alloc_unit;
		bl_resp->hdr.size += sizeof(union dm_mem_page_range);

		}

		return i * alloc_unit;
		@@ -1351,7 +1332,6 @@ static void balloon_up(struct work_struct *dummy)
		done = true;
		}
		}

		}

		static void balloon_down(struct hv_dynmem_device *dm,
		@@ -1394,8 +1374,7 @@ static int dm_thread_func(void *dm_dev)
		struct hv_dynmem_device *dm = dm_dev;

		while (!kthread_should_stop()) {
		wait_for_completion_interruptible_timeout(
		&dm_device.config_event, 1*HZ);
		wait_for_completion_interruptible_timeout(&dm_device.config_event, 1 * HZ);
		/*
		* The host expects us to post information on the memory
		* pressure every second.
		@@ -1419,7 +1398,6 @@ static int dm_thread_func(void *dm_dev)
		return 0;
		}


		static void version_resp(struct hv_dynmem_device *dm,
		struct dm_version_response *vresp)
		{
		@@ -1583,10 +1561,8 @@ static void balloon_onchannelcallback(void *context)

		default:
		pr_warn_ratelimited("Unhandled message: type: %d\n", dm_hdr->type);

		}
		}

		}

		#define HV_LARGE_REPORTING_ORDER 9
		@@ -1642,14 +1618,12 @@ static int hv_free_page_report(struct page_reporting_dev_info *pr_dev_info,
		range->page.additional_pages =
		(sg->length / HV_HYP_PAGE_SIZE) - 1;
		}

		}

		status = hv_do_rep_hypercall(HV_EXT_CALL_MEMORY_HEAT_HINT, nents, 0,
		hint, NULL);
		local_irq_restore(flags);
		if (!hv_result_success(status)) {

		pr_err("Cold memory discard hypercall failed with status %llx\n",
		status);
		if (hv_hypercall_multi_failure > 0)
		@@ -2095,7 +2069,6 @@ static int balloon_suspend(struct hv_device *hv_dev)
		tasklet_enable(&hv_dev->channel->callback_event);

		return 0;

		}

		static int balloon_resume(struct hv_device *dev)
		@@ -2154,7 +2127,6 @@ static struct hv_driver balloon_drv = {

		static int __init init_balloon_drv(void)
		{

		return vmbus_driver_register(&balloon_drv);
		}