Use MTX_SYSINIT for the VESA lock.
ClosedPublic
Actions

Authored by jhb on Jul 22 2016, 9:31 PM.

Details

Reviewers

dumbbell
royger

Commits

rS303225: Use MTX_SYSINIT for the VESA lock.

Summary

Use MTX_SYSINIT for the VESA lock.

vesa_init_done isn't a reliable guard for the mutex init. If
vesa_configure() doesn't find valid VESA info it will not set
vesa_init_done, but the lock will remain initialized. Revert r303076
and use MTX_SYSINIT to deterministically init the lock.

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 4584
Build 4637: arc lint + arc unit

Event Timeline

jhb updated this revision to Diff 18689.Jul 22 2016, 9:31 PM

jhb retitled this revision from to Use MTX_SYSINIT for the VESA lock..

jhb updated this object.

jhb edited the test plan for this revision. (Show Details)

jhb added reviewers: royger, dumbbell.

Herald added a subscriber: imp. · View Herald TranscriptJul 22 2016, 9:31 PM

Don't explicitly destroy the lock.

I cannot test this ATM (I might be able to do it tomorrow), but it looks fine, and AFAICT it should also solve the issue I was seeing. Thanks for taking care of this (and sorry for messing it up)!

This revision is now accepted and ready to land.Jul 23 2016, 9:43 AM

Oh, forgot to ask, but since I'm not going to MFC r303076 could you please MFC this to stable/11?

Thanks.

Closed by commit rS303225: Use MTX_SYSINIT for the VESA lock. (authored by jhb). · Explain WhyJul 23 2016, 2:38 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Path

Size

sys/

dev/

fb/

vesa.c

19 lines

Diff 18689

View Options

sys/dev/fb/vesa.c

	Show First 20 Lines • Show All 82 Lines • ▼ Show 20 Lines
	static bool ia_need_loopback_route(const struct in_ifaddr *);			static bool ia_need_loopback_route(const struct in_ifaddr *);

	VNET_DEFINE_STATIC(int, nosameprefix);			VNET_DEFINE_STATIC(int, nosameprefix);
	#define V_nosameprefix VNET(nosameprefix)			#define V_nosameprefix VNET(nosameprefix)
	SYSCTL_INT(_net_inet_ip, OID_AUTO, no_same_prefix, CTLFLAG_VNET \| CTLFLAG_RW,			SYSCTL_INT(_net_inet_ip, OID_AUTO, no_same_prefix, CTLFLAG_VNET \| CTLFLAG_RW,
	&VNET_NAME(nosameprefix), 0,			&VNET_NAME(nosameprefix), 0,
	"Refuse to create same prefixes on different interfaces");			"Refuse to create same prefixes on different interfaces");

				VNET_DEFINE_STATIC(bool, broadcast_lowest);
				#define V_broadcast_lowest VNET(broadcast_lowest)
				SYSCTL_BOOL(_net_inet_ip, OID_AUTO, broadcast_lowest, CTLFLAG_VNET \| CTLFLAG_RW,
				&VNET_NAME(broadcast_lowest), 0,
				"Treat lowest address on a subnet (host 0) as broadcast");

	VNET_DECLARE(struct inpcbinfo, ripcbinfo);			VNET_DECLARE(struct inpcbinfo, ripcbinfo);
	#define V_ripcbinfo VNET(ripcbinfo)			#define V_ripcbinfo VNET(ripcbinfo)

	static struct sx in_control_sx;			static struct sx in_control_sx;
	SX_SYSINIT(in_control_sx, &in_control_sx, "in_control");			SX_SYSINIT(in_control_sx, &in_control_sx, "in_control");

	/*			/*
	* Return 1 if an internet address is for a ``local'' host			* Return 1 if an internet address is for a ``local'' host
	▲ Show 20 Lines • Show All 1,066 Lines • ▼ Show 20 Lines
	}			}

	int			int
	in_ifaddr_broadcast(struct in_addr in, struct in_ifaddr *ia)			in_ifaddr_broadcast(struct in_addr in, struct in_ifaddr *ia)
	{			{

	return ((in.s_addr == ia->ia_broadaddr.sin_addr.s_addr \|\|			return ((in.s_addr == ia->ia_broadaddr.sin_addr.s_addr \|\|
	/*			/*
	* Check for old-style (host 0) broadcast, but			* Optionally check for old-style (host 0) broadcast, but
	* taking into account that RFC 3021 obsoletes it.			* taking into account that RFC 3021 obsoletes it.
	*/			*/
	(ia->ia_subnetmask != IN_RFC3021_MASK &&			(V_broadcast_lowest && ia->ia_subnetmask != IN_RFC3021_MASK &&
				rgrimesUnsubmitted Not Done Inline Actions There might be a micro optimization here to do the V_broadcast_zero test LAST, that way the additional test in the fast path only occurs after the tests we have been doing all along. rgrimes: There might be a micro optimization here to do the V_broadcast_zero test LAST, that way the…
				karelsAuthorUnsubmitted Done Inline Actions Actually, I put it first as a micro-optimization. As it is false by default, the test fails immediately and we don't have to evaluate the rest. karels: Actually, I put it first as a micro-optimization. As it is false by default, the test fails…
	ntohl(in.s_addr) == ia->ia_subnet)) &&			ntohl(in.s_addr) == ia->ia_subnet)) &&
	/*			/*
	* Check for an all one subnetmask. These			* Check for an all one subnetmask. These
	* only exist when an interface gets a secondary			* only exist when an interface gets a secondary
	* address.			* address.
	*/			*/
	ia->ia_subnetmask != (u_long)0xffffffff);			ia->ia_subnetmask != (u_long)0xffffffff);
	}			}
	▲ Show 20 Lines • Show All 521 Lines • Show Last 20 Lines

Use MTX_SYSINIT for the VESA lock.ClosedPublicActions