Differential D20949

Two issues with casueword(9) update.
ClosedPublic
Actions

Authored by kib on Jul 14 2019, 6:21 PM.

Details

Reviewers

Commits

rS349995: In do_lock_pi(), do not return prematurely.
rS349994: Correctly check for casueword(9) success in do_set_ceiling().

Summary

In do_lock_pi(), properly clean up resources on umxq_check_susp() indicating block.
In do_set_ceiling(), properly verify that the operation succeed, it is not enough to compare old and new.

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Skipped

Unit

Tests Skipped

Build Status

Buildable 25339

Event Timeline

kib created this revision.Jul 14 2019, 6:21 PM

Herald added a subscriber: imp. · View Herald TranscriptJul 14 2019, 6:21 PM

Harbormaster completed remote builds in B25339: Diff 59742.Jul 14 2019, 6:21 PM

markj accepted this revision.Jul 14 2019, 6:39 PM

This revision is now accepted and ready to land.Jul 14 2019, 6:39 PM

I tested D20949.59742.diff with all of the threaded tests I have, on i386. No problems seen.

Closed by commit rS349994: Correctly check for casueword(9) success in do_set_ceiling(). (authored by kib). · Explain WhyJul 15 2019, 8:38 AM

This revision was automatically updated to reflect the committed changes.

kib added a commit: rS349994: Correctly check for casueword(9) success in do_set_ceiling()..

kib added a commit: rS349995: In do_lock_pi(), do not return prematurely..

Revision Contents
Changeset List

Path

Size

sys/

kern/

kern_umtx.c

5 lines

Diff 59742

View Options

sys/kern/kern_umtx.c

	Show First 20 Lines • Show All 289 Lines • ▼ Show 20 Lines
	}			}

	/*			/*
	* blist_alloc() - reserve space in the block bitmap. Return the base			* blist_alloc() - reserve space in the block bitmap. Return the base
	* of a contiguous region or SWAPBLK_NONE if space could			* of a contiguous region or SWAPBLK_NONE if space could
	* not be allocated.			* not be allocated.
	*/			*/
	daddr_t			daddr_t
	blist_alloc(blist_t bl, int *count, int maxcount)			blist_alloc(blist_t bl, daddr_t io_cursor, int count, int maxcount)
	{			{
	daddr_t blk, cursor;			daddr_t blk, cursor;

	KASSERT(*count <= maxcount,			KASSERT(*count <= maxcount,
	("invalid parameters %d > %d", *count, maxcount));			("invalid parameters %d > %d", *count, maxcount));
	KASSERT(*count <= BLIST_MAX_ALLOC,			KASSERT(*count <= BLIST_MAX_ALLOC,
	("minimum allocation too large: %d", *count));			("minimum allocation too large: %d", *count));

	/*			/*
	* This loop iterates at most twice. An allocation failure in the			* This loop iterates at most twice. An allocation failure in the
	* first iteration leads to a second iteration only if the cursor was			* first iteration leads to a second iteration only if the cursor was
	* non-zero. When the cursor is zero, an allocation failure will			* non-zero. When the cursor is zero, an allocation failure will
	* stop further iterations.			* stop further iterations.
	*/			*/
	for (cursor = bl->bl_cursor;; cursor = 0) {			for (cursor = *io_cursor;; cursor = 0) {
	blk = blst_meta_alloc(bl->bl_root, cursor, count, maxcount,			blk = blst_meta_alloc(bl->bl_root, cursor, count, maxcount,
	bl->bl_radix);			bl->bl_radix);
	if (blk != SWAPBLK_NONE) {			if (blk != SWAPBLK_NONE) {
	bl->bl_avail -= *count;			bl->bl_avail -= *count;
	bl->bl_cursor = blk + *count;			io_cursor = blk + count;
	if (bl->bl_cursor == bl->bl_blocks)			if (*io_cursor == bl->bl_blocks)
	bl->bl_cursor = 0;			*io_cursor = 0;
	return (blk);			return (blk);
	}			}
	if (cursor == 0)			if (cursor == 0)
	return (SWAPBLK_NONE);			return (SWAPBLK_NONE);
	}			}
	}			}

	/*			/*
	▲ Show 20 Lines • Show All 70 Lines • ▼ Show 20 Lines
	#ifdef BLIST_DEBUG			#ifdef BLIST_DEBUG

	/*			/*
	* blist_print() - dump radix tree			* blist_print() - dump radix tree
	*/			*/
	void			void
	blist_print(blist_t bl)			blist_print(blist_t bl)
	{			{
	printf("BLIST avail = %jd, cursor = %08jx {\n",			printf("BLIST avail = %jd {\n", (uintmax_t)bl->bl_avail);
	(uintmax_t)bl->bl_avail, (uintmax_t)bl->bl_cursor);

	if (bl->bl_root->bm_bitmap != 0)			if (bl->bl_root->bm_bitmap != 0)
	blst_radix_print(bl->bl_root, 0, bl->bl_radix, 4);			blst_radix_print(bl->bl_root, 0, bl->bl_radix, 4);
	printf("}\n");			printf("}\n");
	}			}

	#endif			#endif

	▲ Show 20 Lines • Show All 801 Lines • Show Last 20 Lines

Two issues with casueword(9) update.ClosedPublicActions