Commit 5450a5f4 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'hyperv-fixes-signed' of... 

Merge tag 'hyperv-fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux into char-misc-linus

Sasha writes:

Three fixes:

 1. Fix for a race condition in the hyper-v ringbuffer code by Kimberly
Brown.
 2. Fix to show monitor data only when monitor pages are actually
allocated, also by Kimberly Brown.
 3. Fix cpu reference counting in the vmbus code by Dexuan Cui.

* tag 'hyperv-fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux:
  Drivers: hv: vmbus: Remove the undesired put_cpu_ptr() in hv_synic_cleanup()
  Drivers: hv: vmbus: Fix race condition with new ring_buffer_info mutex
  Drivers: hv: vmbus: Set ring_info field to 0 and remove memset
  Drivers: hv: vmbus: Refactor chan->state if statement
  Drivers: hv: vmbus: Expose monitor data only when monitor pages are used
parents 085b7755 a0033bd1

Documentation/ABI/stable/sysfs-bus-vmbus

+9 −3
Original line number Diff line number Diff line
@@ -81,7 +81,9 @@ What: /sys/bus/vmbus/devices/<UUID>/channels/<N>/latency 
Date:		September. 2017

KernelVersion:	4.14

Contact:	Stephen Hemminger <sthemmin@microsoft.com>

Description:	Channel signaling latency

Description:	Channel signaling latency. This file is available only for

		performance critical channels (storage, network, etc.) that use

		the monitor page mechanism.

Users:		Debugging tools



What:		/sys/bus/vmbus/devices/<UUID>/channels/<N>/out_mask
@@ -95,7 +97,9 @@ What: /sys/bus/vmbus/devices/<UUID>/channels/<N>/pending 
Date:		September. 2017

KernelVersion:	4.14

Contact:	Stephen Hemminger <sthemmin@microsoft.com>

Description:	Channel interrupt pending state

Description:	Channel interrupt pending state. This file is available only for

		performance critical channels (storage, network, etc.) that use

		the monitor page mechanism.

Users:		Debugging tools



What:		/sys/bus/vmbus/devices/<UUID>/channels/<N>/read_avail
@@ -137,7 +141,9 @@ What: /sys/bus/vmbus/devices/<UUID>/channels/<N>/monitor_id 
Date:		January. 2018

KernelVersion:	4.16

Contact:	Stephen Hemminger <sthemmin@microsoft.com>

Description:	Monitor bit associated with channel

Description:	Monitor bit associated with channel. This file is available only

		for performance critical channels (storage, network, etc.) that

		use the monitor page mechanism.

Users:		Debugging tools and userspace drivers



What:		/sys/bus/vmbus/devices/<UUID>/channels/<N>/ring

drivers/hv/channel_mgmt.c

+3 −0
Original line number Diff line number Diff line
@@ -336,6 +336,8 @@ static struct vmbus_channel *alloc_channel(void) 
	tasklet_init(&channel->callback_event,

		     vmbus_on_event, (unsigned long)channel);



	hv_ringbuffer_pre_init(channel);



	return channel;

}
@@ -345,6 +347,7 @@ static struct vmbus_channel *alloc_channel(void) 
static void free_channel(struct vmbus_channel *channel)

{

	tasklet_kill(&channel->callback_event);

	vmbus_remove_channel_attr_group(channel);



	kobject_put(&channel->kobj);

}

drivers/hv/hv.c

+0 −1
Original line number Diff line number Diff line
@@ -408,7 +408,6 @@ int hv_synic_cleanup(unsigned int cpu) 


		clockevents_unbind_device(hv_cpu->clk_evt, cpu);

		hv_ce_shutdown(hv_cpu->clk_evt);

		put_cpu_ptr(hv_cpu);

	}



	hv_get_synint_state(VMBUS_MESSAGE_SINT, shared_sint.as_uint64);

drivers/hv/hyperv_vmbus.h

+3 −0
Original line number Diff line number Diff line
@@ -193,6 +193,7 @@ extern void hv_synic_clockevents_cleanup(void); 


/* Interface */



void hv_ringbuffer_pre_init(struct vmbus_channel *channel);



int hv_ringbuffer_init(struct hv_ring_buffer_info *ring_info,

		       struct page *pages, u32 pagecnt);
@@ -321,6 +322,8 @@ void vmbus_device_unregister(struct hv_device *device_obj); 
int vmbus_add_channel_kobj(struct hv_device *device_obj,

			   struct vmbus_channel *channel);



void vmbus_remove_channel_attr_group(struct vmbus_channel *channel);



struct vmbus_channel *relid2channel(u32 relid);



void vmbus_free_channels(void);

drivers/hv/ring_buffer.c

+18 −4
Original line number Diff line number Diff line
@@ -166,14 +166,18 @@ hv_get_ringbuffer_availbytes(const struct hv_ring_buffer_info *rbi, 
}



/* Get various debug metrics for the specified ring buffer. */

int hv_ringbuffer_get_debuginfo(const struct hv_ring_buffer_info *ring_info,

int hv_ringbuffer_get_debuginfo(struct hv_ring_buffer_info *ring_info,

				struct hv_ring_buffer_debug_info *debug_info)

{

	u32 bytes_avail_towrite;

	u32 bytes_avail_toread;



	if (!ring_info->ring_buffer)

	mutex_lock(&ring_info->ring_buffer_mutex);



	if (!ring_info->ring_buffer) {

		mutex_unlock(&ring_info->ring_buffer_mutex);

		return -EINVAL;

	}



	hv_get_ringbuffer_availbytes(ring_info,

				     &bytes_avail_toread,
@@ -184,10 +188,19 @@ int hv_ringbuffer_get_debuginfo(const struct hv_ring_buffer_info *ring_info, 
	debug_info->current_write_index = ring_info->ring_buffer->write_index;

	debug_info->current_interrupt_mask

		= ring_info->ring_buffer->interrupt_mask;

	mutex_unlock(&ring_info->ring_buffer_mutex);



	return 0;

}

EXPORT_SYMBOL_GPL(hv_ringbuffer_get_debuginfo);



/* Initialize a channel's ring buffer info mutex locks */

void hv_ringbuffer_pre_init(struct vmbus_channel *channel)

{

	mutex_init(&channel->inbound.ring_buffer_mutex);

	mutex_init(&channel->outbound.ring_buffer_mutex);

}



/* Initialize the ring buffer. */

int hv_ringbuffer_init(struct hv_ring_buffer_info *ring_info,

		       struct page *pages, u32 page_cnt)
@@ -197,8 +210,6 @@ int hv_ringbuffer_init(struct hv_ring_buffer_info *ring_info, 


	BUILD_BUG_ON((sizeof(struct hv_ring_buffer) != PAGE_SIZE));



	memset(ring_info, 0, sizeof(struct hv_ring_buffer_info));



	/*

	 * First page holds struct hv_ring_buffer, do wraparound mapping for

	 * the rest.
@@ -232,6 +243,7 @@ int hv_ringbuffer_init(struct hv_ring_buffer_info *ring_info, 
		reciprocal_value(ring_info->ring_size / 10);

	ring_info->ring_datasize = ring_info->ring_size -

		sizeof(struct hv_ring_buffer);

	ring_info->priv_read_index = 0;



	spin_lock_init(&ring_info->ring_lock);
@@ -241,8 +253,10 @@ int hv_ringbuffer_init(struct hv_ring_buffer_info *ring_info, 
/* Cleanup the ring buffer. */

void hv_ringbuffer_cleanup(struct hv_ring_buffer_info *ring_info)

{

	mutex_lock(&ring_info->ring_buffer_mutex);

	vunmap(ring_info->ring_buffer);

	ring_info->ring_buffer = NULL;

	mutex_unlock(&ring_info->ring_buffer_mutex);

}



/* Write to the ring buffer. */

CRA Git | Maintained and supported by SUSTech CRA and CCSE