D5159.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D5159.diff
View Options

	Index: head/sys/dev/hyperv/netvsc/hv_net_vsc.c
	===================================================================
	--- head/sys/dev/hyperv/netvsc/hv_net_vsc.c
	+++ head/sys/dev/hyperv/netvsc/hv_net_vsc.c
	@@ -136,15 +136,15 @@
	int i;

	for (i = 0; i < bitsmap_words; i++) {
	- idx = ffs(~bitsmap[i]);
	+ idx = ffsl(~bitsmap[i]);
	if (0 == idx)
	continue;

	idx--;
	- if (i * BITS_PER_LONG + idx >= net_dev->send_section_count)
	- return (ret);
	+ KASSERT(i * BITS_PER_LONG + idx < net_dev->send_section_count,
	+ ("invalid i %d and idx %lu", i, idx));

	- if (synch_test_and_set_bit(idx, &bitsmap[i]))
	+ if (atomic_testandset_long(&bitsmap[i], idx))
	continue;

	ret = i * BITS_PER_LONG + idx;
	@@ -789,8 +789,27 @@
	if (NULL != net_vsc_pkt) {
	if (net_vsc_pkt->send_buf_section_idx !=
	NVSP_1_CHIMNEY_SEND_INVALID_SECTION_INDEX) {
	- synch_change_bit(net_vsc_pkt->send_buf_section_idx,
	- net_dev->send_section_bitsmap);
	+ u_long mask;
	+ int idx;
	+
	+ idx = net_vsc_pkt->send_buf_section_idx /
	+ BITS_PER_LONG;
	+ KASSERT(idx < net_dev->bitsmap_words,
	+ ("invalid section index %u",
	+ net_vsc_pkt->send_buf_section_idx));
	+ mask = 1UL <<
	+ (net_vsc_pkt->send_buf_section_idx %
	+ BITS_PER_LONG);
	+
	+ KASSERT(net_dev->send_section_bitsmap[idx] &
	+ mask,
	+ ("index bitmap 0x%lx, section index %u, "
	+ "bitmap idx %d, bitmask 0x%lx",
	+ net_dev->send_section_bitsmap[idx],
	+ net_vsc_pkt->send_buf_section_idx,
	+ idx, mask));
	+ atomic_clear_long(
	+ &net_dev->send_section_bitsmap[idx], mask);
	}

	/* Notify the layer above us */