Paths

Table of Contentst

-
dns/mdnsd/
-
mdnsd/
7
Makefile
7
distinfo
-
files/
7
patch-1035.c
7
patch-Makefile
-
patch-libmdnsd_1035.c
-
patch-libmdnsd_mdnsd.c
-
patch-mdnsd.c
-
patch-mhttp.c
-
patch-mquery.c
-
patch-sdtxt.c
-
patch-xht.c
-
pkg-message

dns/mdnsd: Updating to the current revision
ClosedPublic
Actions

Authored by yuri on Dec 23 2017, 11:10 PM.

Details

Reviewers

tcberner
adamw
mat

Commits

rP460149: dns/mdnsd: Updating to the current revision

Summary

One other port bundled mdnsd, so I first thought that this port needed to be a dependency.
But as it turned out, this port doesn't install headers/lib, so it isn't useful for the original purpose.
Updating it anyway, once I am here.
I notified the upstream maintainer to install headers/libs.

I changed EPOCH because github version number isn't compatible with the previous one, as per portlint.

Diff Detail

Repository

rP FreeBSD ports repository

Lint

No Lint Coverage

Unit

No Test Coverage

Build Status

Buildable 13886
Build 14095: arc lint + arc unit

Event Timeline

yuri created this revision.Dec 23 2017, 11:10 PM

Herald added a subscriber: mat. · View Herald TranscriptDec 23 2017, 11:10 PM

Harbormaster completed remote builds in B13762: Diff 36952.Dec 23 2017, 11:10 PM

adamw added inline comments.Dec 23 2017, 11:35 PM

dns/mdnsd/Makefile
6	This version number makes no sense. If the next release is 0.8G, or 0.7H, then PORTEPOCH gets bumped again. Perhaps setting DISTVERSION to 0.7G.107 would make more sense. $ pkg version -t 0.7H 0.7G-107 < $ pkg version -t 0.7H 0.7G.107 >
25	Why CONFIGURE_WRKSRC?

yuri marked an inline comment as done.Dec 23 2017, 11:48 PM

yuri added inline comments.

dns/mdnsd/Makefile
6	Sorry, typo... I actually meant it this way: DISTVERSION= 0.7 DISTVERSIONSUFFIX= G-107-gf4aee59 Package version is `0.7```. 0.7G-107-gf4aee59``` is what ```git describe tags``` gives. It doesn't fetch it with: DISTVERSION= 0.7G.107 DISTVERSIONSUFFIX= -gf4aee59

Harbormaster completed remote builds in B13763: Diff 36953.Dec 23 2017, 11:48 PM

yuri marked 2 inline comments as done.Dec 24 2017, 12:11 AM

yuri added inline comments.

dns/mdnsd/Makefile
6	The original revision was `0.7G`. When I keep it as `0.7G`, portlint still complains: FATAL: Makefile: mdnsd-0.7.g < mdnsd-0.7G_1. Choose another PORTVERSION or bump PORTEPOCH. I think this is possibly some bug.
25	Because files are built there?

yuri marked 2 inline comments as done.Dec 24 2017, 12:18 AM

adamw added inline comments.Dec 24 2017, 12:48 AM

dns/mdnsd/Makefile
6	Right. You'd have to set `DISTNAME` as well. But it would avoid this, and future, PORTEPOCH bumps.
6	Yes. You're also switching from PORTVERSION to DISTVERSION. And if you do what you're intending, then yes 0.7 < 0.7G. We don't have to use bizarre version strings just because upstream does. I think you'll be better off in the long run by using a normal-ish version string.
25	Ah. Because of `cmake:outsource`. Got it.

yuri marked an inline comment as done.Dec 24 2017, 1:07 AM

yuri added inline comments.

dns/mdnsd/Makefile
6	Your suggestion, if I understand it correctly, is this: PORTNAME= mdnsd DISTVERSIONPREFIX= v DISTVERSION= 0.7G.107 DISTVERSIONSUFFIX= -gf4aee59 CATEGORIES= dns DISTNAME= ${GH_ACCOUNT}-${PORTNAME}-${DISTVERSIONPREFIX}0.7G-107${DISTVERSIONSUFFIX} But portlint still complains: FATAL: Makefile: mdnsd-0.7.g.107 < mdnsd-0.7G_1. Choose another PORTVERSION or bump PORTEPOCH

I think, `DISTVERSION`` should be set to 0.7, `PORTEPOCH` should be changed once. Later, if they keep updating the letter, this should be handled with `PORTREVISION``.

In D13600#284637, @yuri wrote:

I think, DISTVERSION should be set to 0.7, PORTEPOCH should be changed once. Later, if they keep updating the letter, this should be handled with PORTREVISION.

The problem is that DISTVERSION should change when the actual port version changes. If the next version is 0.7H, the actual port version has changed but DISTVERSION remains the same. Things like patch levels are appropriate for DISTVERSIONSUFFIX, but putting major pieces of the version string into that variable just aren't in spirit with the design.

mat requested changes to this revision.Dec 27 2017, 2:32 PM

mat added inline comments.

dns/mdnsd/Makefile
6	DISTVERSIONPREFIX= v DISTVERSION= 0.7G-107 DISTVERSIONSUFFIX= -gf4aee59 And remove the DISTNAME processing.
8	Not needed.

This revision now requires changes to proceed.Dec 27 2017, 2:32 PM

Followed mat's advice in DISTVERSION.

Harbormaster completed remote builds in B13886: Diff 37127.Dec 28 2017, 8:46 AM

yuri marked an inline comment as done.Dec 28 2017, 8:47 AM

yuri marked 3 inline comments as done.

tcberner added inline comments.Jan 9 2018, 9:57 PM

dns/mdnsd/files/patch-libmdnsd_1035.c
5	whith "WTF?"-y patches like these, it's sometimes good to include some explanation at the top :) ala "this is the error without this" or "this is done because"

As long as the others are fine with it, this is ok.

Also, did you ask the MAINTAINER?

mat accepted this revision.Jan 10 2018, 2:41 PM

This revision is now accepted and ready to land.Jan 10 2018, 2:41 PM

Asked for maintainer's approval: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=225114

yuri retitled this revision from dns/mdnsd: Updating to the current revision to dns/mdnsd: Updating to the current revision {PENDING maintainer's approval, see bug#225114}.Jan 12 2018, 5:54 PM

yuri retitled this revision from dns/mdnsd: Updating to the current revision {PENDING maintainer's approval, see bug#225114} to dns/mdnsd: Updating to the current revision.Jan 27 2018, 8:09 PM

Closed by commit rP460149: dns/mdnsd: Updating to the current revision (authored by yuri). · Explain WhyJan 27 2018, 8:10 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Path

Size

dns/

mdnsd/

Makefile

20 lines

distinfo

5 lines

files/

patch-1035.c

patch-Makefile

patch-libmdnsd_1035.c

11 lines

patch-libmdnsd_mdnsd.c

11 lines

130 lines

58 lines

4 lines

Diff 37127

View Options

dns/mdnsd/Makefile

Show First 20 Lines • Show All 302 Lines • ▼ Show 20 Lines

void		void
exec_sysvec_init(void *param)		exec_sysvec_init(void *param)
{		{
struct sysentvec *sv;		struct sysentvec *sv;
#ifdef RANDOM_FENESTRASX		#ifdef RANDOM_FENESTRASX
ptrdiff_t base;		ptrdiff_t base;
#endif		#endif
		u_int flags;

sv = (struct sysentvec *)param;		sv = (struct sysentvec *)param;
if ((sv->sv_flags & SV_SHP) == 0)		flags = sv->sv_flags;
		if ((flags & SV_SHP) == 0)
		kibUnsubmitted Not Done Inline Actions I think that this assert (sv_shared_page_base != 0) should be only done if SV_SHP flag is set. kib: I think that this assert (sv_shared_page_base != 0) should be only done if SV_SHP flag is set.
return;		return;
		MPASS(sv->sv_shared_page_obj == NULL);
		MPASS(sv->sv_shared_page_base != 0);

sv->sv_shared_page_obj = shared_page_obj;		sv->sv_shared_page_obj = shared_page_obj;
		if ((flags & SV_ABI_MASK) == SV_ABI_FREEBSD) {
sv->sv_sigcode_base = sv->sv_shared_page_base +		sv->sv_sigcode_base = sv->sv_shared_page_base +
shared_page_fill(*(sv->sv_szsigcode), 16, sv->sv_sigcode);		shared_page_fill(*(sv->sv_szsigcode), 16, sv->sv_sigcode);
if ((sv->sv_flags & SV_ABI_MASK) != SV_ABI_FREEBSD)		}
return;		if ((flags & SV_TIMEKEEP) != 0) {
		kibUnsubmitted Not Done Inline Actions Add {} around then statement, it is multi-line. kib: Add {} around then statement, it is multi-line.
if ((sv->sv_flags & SV_TIMEKEEP) != 0) {
#ifdef COMPAT_FREEBSD32		#ifdef COMPAT_FREEBSD32
if ((sv->sv_flags & SV_ILP32) != 0) {		if ((flags & SV_ILP32) != 0) {
		if ((flags & SV_ABI_MASK) == SV_ABI_FREEBSD) {
KASSERT(compat32_svtk == NULL,		KASSERT(compat32_svtk == NULL,
("Compat32 already registered"));		("Compat32 already registered"));
compat32_svtk = alloc_sv_tk_compat32();		compat32_svtk = alloc_sv_tk_compat32();
		} else {
		KASSERT(compat32_svtk != NULL,
		("Compat32 not registered"));
		}
		kibUnsubmitted Not Done Inline Actions Why do you need to check this condition? The assert on the previous line verified that the condition is true. kib: Why do you need to check this condition? The assert on the previous line verified that the…
sv->sv_timekeep_base = sv->sv_shared_page_base +		sv->sv_timekeep_base = sv->sv_shared_page_base +
compat32_svtk->sv_timekeep_off;		compat32_svtk->sv_timekeep_off;
} else {		} else {
#endif		#endif
KASSERT(host_svtk == NULL, ("Host already registered"));		if ((flags & SV_ABI_MASK) == SV_ABI_FREEBSD) {
		KASSERT(host_svtk == NULL,
		("Host already registered"));
host_svtk = alloc_sv_tk();		host_svtk = alloc_sv_tk();
		} else {
		KASSERT(host_svtk != NULL,
		("Host not registered"));
		}
sv->sv_timekeep_base = sv->sv_shared_page_base +		sv->sv_timekeep_base = sv->sv_shared_page_base +
host_svtk->sv_timekeep_off;		host_svtk->sv_timekeep_off;
#ifdef COMPAT_FREEBSD32		#ifdef COMPAT_FREEBSD32
}		}
#endif		#endif
}		}
#ifdef RANDOM_FENESTRASX		#ifdef RANDOM_FENESTRASX
if ((sv->sv_flags & SV_RNG_SEED_VER) != 0) {		if ((flags & SV_ABI_MASK) == SV_ABI_FREEBSD &&
		(flags & SV_RNG_SEED_VER) != 0) {
		kibUnsubmitted Not Done Inline Actions This one should be conditional on ABI_FREEBSD as well, perhaps? kib: This one should be conditional on ABI_FREEBSD as well, perhaps?
		kibUnsubmitted Not Done Inline Actions This can be written as a single check ((flags & (SV_ABI_MASK \| SV_RNG_SEED_VER) ) == (SV_ABI_FREEBSD \| SV_RNG_SEED_VER)) but it is up to you. kib: This can be written as a single check ``` ((flags & (SV_ABI_MASK \| SV_RNG_SEED_VER) ) ==…
/*		/*
* Only allocate a single VDSO entry for multiple sysentvecs,		* Only allocate a single VDSO entry for multiple sysentvecs,
* i.e., native and COMPAT32.		* i.e., native and COMPAT32.
*/		*/
if (fxrng_shpage_mapping == NULL)		if (fxrng_shpage_mapping == NULL)
alloc_sv_fxrng_generation();		alloc_sv_fxrng_generation();
base = (char *)fxrng_shpage_mapping - shared_page_mapping;		base = (char *)fxrng_shpage_mapping - shared_page_mapping;
sv->sv_fxrng_gen_base = sv->sv_shared_page_base + base;		sv->sv_fxrng_gen_base = sv->sv_shared_page_base + base;
Show All 18 Lines	exec_sysvec_init_secondary(struct sysentvec sv, struct sysentvec sv2)
if ((sv2->sv_flags & SV_TIMEKEEP) != 0) {		if ((sv2->sv_flags & SV_TIMEKEEP) != 0) {
sv2->sv_timekeep_base = sv2->sv_shared_page_base +		sv2->sv_timekeep_base = sv2->sv_shared_page_base +
(sv->sv_timekeep_base - sv->sv_shared_page_base);		(sv->sv_timekeep_base - sv->sv_shared_page_base);
}		}
if ((sv2->sv_flags & SV_RNG_SEED_VER) != 0) {		if ((sv2->sv_flags & SV_RNG_SEED_VER) != 0) {
sv2->sv_fxrng_gen_base = sv2->sv_shared_page_base +		sv2->sv_fxrng_gen_base = sv2->sv_shared_page_base +
(sv->sv_fxrng_gen_base - sv->sv_shared_page_base);		(sv->sv_fxrng_gen_base - sv->sv_shared_page_base);
}		}
}		}
		kibUnsubmitted Not Done Inline Actions Now, with the changes to exec_sysvec_init(), what is the reason to have exec_sysvec_init_abi()? It only asserts some state. kib: Now, with the changes to exec_sysvec_init(), what is the reason to have exec_sysvec_init_abi()?
		kibUnsubmitted Not Done Inline Actions Should `sv->sv_shared_page_obj == 0` (NULL BTW?) and `sv->sv_shared_page_base != 0` asserts moved to exec_sysvec_init() ? kib: Should `sv->sv_shared_page_obj == 0` (NULL BTW?) and `sv->sv_shared_page_base != 0` asserts…

View Options

dns/mdnsd/distinfo

Show First 20 Lines • Show All 302 Lines • ▼ Show 20 Lines

void		void
exec_sysvec_init(void *param)		exec_sysvec_init(void *param)
{		{
struct sysentvec *sv;		struct sysentvec *sv;
#ifdef RANDOM_FENESTRASX		#ifdef RANDOM_FENESTRASX
ptrdiff_t base;		ptrdiff_t base;
#endif		#endif
		u_int flags;

sv = (struct sysentvec *)param;		sv = (struct sysentvec *)param;
if ((sv->sv_flags & SV_SHP) == 0)		flags = sv->sv_flags;
		if ((flags & SV_SHP) == 0)
		kibUnsubmitted Not Done Inline Actions I think that this assert (sv_shared_page_base != 0) should be only done if SV_SHP flag is set. kib: I think that this assert (sv_shared_page_base != 0) should be only done if SV_SHP flag is set.
return;		return;
		MPASS(sv->sv_shared_page_obj == NULL);
		MPASS(sv->sv_shared_page_base != 0);

sv->sv_shared_page_obj = shared_page_obj;		sv->sv_shared_page_obj = shared_page_obj;
		if ((flags & SV_ABI_MASK) == SV_ABI_FREEBSD) {
sv->sv_sigcode_base = sv->sv_shared_page_base +		sv->sv_sigcode_base = sv->sv_shared_page_base +
shared_page_fill(*(sv->sv_szsigcode), 16, sv->sv_sigcode);		shared_page_fill(*(sv->sv_szsigcode), 16, sv->sv_sigcode);
if ((sv->sv_flags & SV_ABI_MASK) != SV_ABI_FREEBSD)		}
return;		if ((flags & SV_TIMEKEEP) != 0) {
		kibUnsubmitted Not Done Inline Actions Add {} around then statement, it is multi-line. kib: Add {} around then statement, it is multi-line.
if ((sv->sv_flags & SV_TIMEKEEP) != 0) {
#ifdef COMPAT_FREEBSD32		#ifdef COMPAT_FREEBSD32
if ((sv->sv_flags & SV_ILP32) != 0) {		if ((flags & SV_ILP32) != 0) {
		if ((flags & SV_ABI_MASK) == SV_ABI_FREEBSD) {
KASSERT(compat32_svtk == NULL,		KASSERT(compat32_svtk == NULL,
("Compat32 already registered"));		("Compat32 already registered"));
compat32_svtk = alloc_sv_tk_compat32();		compat32_svtk = alloc_sv_tk_compat32();
		} else {
		KASSERT(compat32_svtk != NULL,
		("Compat32 not registered"));
		}
		kibUnsubmitted Not Done Inline Actions Why do you need to check this condition? The assert on the previous line verified that the condition is true. kib: Why do you need to check this condition? The assert on the previous line verified that the…
sv->sv_timekeep_base = sv->sv_shared_page_base +		sv->sv_timekeep_base = sv->sv_shared_page_base +
compat32_svtk->sv_timekeep_off;		compat32_svtk->sv_timekeep_off;
} else {		} else {
#endif		#endif
KASSERT(host_svtk == NULL, ("Host already registered"));		if ((flags & SV_ABI_MASK) == SV_ABI_FREEBSD) {
		KASSERT(host_svtk == NULL,
		("Host already registered"));
host_svtk = alloc_sv_tk();		host_svtk = alloc_sv_tk();
		} else {
		KASSERT(host_svtk != NULL,
		("Host not registered"));
		}
sv->sv_timekeep_base = sv->sv_shared_page_base +		sv->sv_timekeep_base = sv->sv_shared_page_base +
host_svtk->sv_timekeep_off;		host_svtk->sv_timekeep_off;
#ifdef COMPAT_FREEBSD32		#ifdef COMPAT_FREEBSD32
}		}
#endif		#endif
}		}
#ifdef RANDOM_FENESTRASX		#ifdef RANDOM_FENESTRASX
if ((sv->sv_flags & SV_RNG_SEED_VER) != 0) {		if ((flags & SV_ABI_MASK) == SV_ABI_FREEBSD &&
		(flags & SV_RNG_SEED_VER) != 0) {
		kibUnsubmitted Not Done Inline Actions This one should be conditional on ABI_FREEBSD as well, perhaps? kib: This one should be conditional on ABI_FREEBSD as well, perhaps?
		kibUnsubmitted Not Done Inline Actions This can be written as a single check ((flags & (SV_ABI_MASK \| SV_RNG_SEED_VER) ) == (SV_ABI_FREEBSD \| SV_RNG_SEED_VER)) but it is up to you. kib: This can be written as a single check ``` ((flags & (SV_ABI_MASK \| SV_RNG_SEED_VER) ) ==…
/*		/*
* Only allocate a single VDSO entry for multiple sysentvecs,		* Only allocate a single VDSO entry for multiple sysentvecs,
* i.e., native and COMPAT32.		* i.e., native and COMPAT32.
*/		*/
if (fxrng_shpage_mapping == NULL)		if (fxrng_shpage_mapping == NULL)
alloc_sv_fxrng_generation();		alloc_sv_fxrng_generation();
base = (char *)fxrng_shpage_mapping - shared_page_mapping;		base = (char *)fxrng_shpage_mapping - shared_page_mapping;
sv->sv_fxrng_gen_base = sv->sv_shared_page_base + base;		sv->sv_fxrng_gen_base = sv->sv_shared_page_base + base;
Show All 18 Lines	exec_sysvec_init_secondary(struct sysentvec sv, struct sysentvec sv2)
if ((sv2->sv_flags & SV_TIMEKEEP) != 0) {		if ((sv2->sv_flags & SV_TIMEKEEP) != 0) {
sv2->sv_timekeep_base = sv2->sv_shared_page_base +		sv2->sv_timekeep_base = sv2->sv_shared_page_base +
(sv->sv_timekeep_base - sv->sv_shared_page_base);		(sv->sv_timekeep_base - sv->sv_shared_page_base);
}		}
if ((sv2->sv_flags & SV_RNG_SEED_VER) != 0) {		if ((sv2->sv_flags & SV_RNG_SEED_VER) != 0) {
sv2->sv_fxrng_gen_base = sv2->sv_shared_page_base +		sv2->sv_fxrng_gen_base = sv2->sv_shared_page_base +
(sv->sv_fxrng_gen_base - sv->sv_shared_page_base);		(sv->sv_fxrng_gen_base - sv->sv_shared_page_base);
}		}
}		}
		kibUnsubmitted Not Done Inline Actions Now, with the changes to exec_sysvec_init(), what is the reason to have exec_sysvec_init_abi()? It only asserts some state. kib: Now, with the changes to exec_sysvec_init(), what is the reason to have exec_sysvec_init_abi()?
		kibUnsubmitted Not Done Inline Actions Should `sv->sv_shared_page_obj == 0` (NULL BTW?) and `sv->sv_shared_page_base != 0` asserts moved to exec_sysvec_init() ? kib: Should `sv->sv_shared_page_obj == 0` (NULL BTW?) and `sv->sv_shared_page_base != 0` asserts…

View Options

dns/mdnsd/files/patch-1035.c

Show First 20 Lines • Show All 302 Lines • ▼ Show 20 Lines

void		void
exec_sysvec_init(void *param)		exec_sysvec_init(void *param)
{		{
struct sysentvec *sv;		struct sysentvec *sv;
#ifdef RANDOM_FENESTRASX		#ifdef RANDOM_FENESTRASX
ptrdiff_t base;		ptrdiff_t base;
#endif		#endif
		u_int flags;

sv = (struct sysentvec *)param;		sv = (struct sysentvec *)param;
if ((sv->sv_flags & SV_SHP) == 0)		flags = sv->sv_flags;
		if ((flags & SV_SHP) == 0)
		kibUnsubmitted Not Done Inline Actions I think that this assert (sv_shared_page_base != 0) should be only done if SV_SHP flag is set. kib: I think that this assert (sv_shared_page_base != 0) should be only done if SV_SHP flag is set.
return;		return;
		MPASS(sv->sv_shared_page_obj == NULL);
		MPASS(sv->sv_shared_page_base != 0);

sv->sv_shared_page_obj = shared_page_obj;		sv->sv_shared_page_obj = shared_page_obj;
		if ((flags & SV_ABI_MASK) == SV_ABI_FREEBSD) {
sv->sv_sigcode_base = sv->sv_shared_page_base +		sv->sv_sigcode_base = sv->sv_shared_page_base +
shared_page_fill(*(sv->sv_szsigcode), 16, sv->sv_sigcode);		shared_page_fill(*(sv->sv_szsigcode), 16, sv->sv_sigcode);
if ((sv->sv_flags & SV_ABI_MASK) != SV_ABI_FREEBSD)		}
return;		if ((flags & SV_TIMEKEEP) != 0) {
		kibUnsubmitted Not Done Inline Actions Add {} around then statement, it is multi-line. kib: Add {} around then statement, it is multi-line.
if ((sv->sv_flags & SV_TIMEKEEP) != 0) {
#ifdef COMPAT_FREEBSD32		#ifdef COMPAT_FREEBSD32
if ((sv->sv_flags & SV_ILP32) != 0) {		if ((flags & SV_ILP32) != 0) {
		if ((flags & SV_ABI_MASK) == SV_ABI_FREEBSD) {
KASSERT(compat32_svtk == NULL,		KASSERT(compat32_svtk == NULL,
("Compat32 already registered"));		("Compat32 already registered"));
compat32_svtk = alloc_sv_tk_compat32();		compat32_svtk = alloc_sv_tk_compat32();
		} else {
		KASSERT(compat32_svtk != NULL,
		("Compat32 not registered"));
		}
		kibUnsubmitted Not Done Inline Actions Why do you need to check this condition? The assert on the previous line verified that the condition is true. kib: Why do you need to check this condition? The assert on the previous line verified that the…
sv->sv_timekeep_base = sv->sv_shared_page_base +		sv->sv_timekeep_base = sv->sv_shared_page_base +
compat32_svtk->sv_timekeep_off;		compat32_svtk->sv_timekeep_off;
} else {		} else {
#endif		#endif
KASSERT(host_svtk == NULL, ("Host already registered"));		if ((flags & SV_ABI_MASK) == SV_ABI_FREEBSD) {
		KASSERT(host_svtk == NULL,
		("Host already registered"));
host_svtk = alloc_sv_tk();		host_svtk = alloc_sv_tk();
		} else {
		KASSERT(host_svtk != NULL,
		("Host not registered"));
		}
sv->sv_timekeep_base = sv->sv_shared_page_base +		sv->sv_timekeep_base = sv->sv_shared_page_base +
host_svtk->sv_timekeep_off;		host_svtk->sv_timekeep_off;
#ifdef COMPAT_FREEBSD32		#ifdef COMPAT_FREEBSD32
}		}
#endif		#endif
}		}
#ifdef RANDOM_FENESTRASX		#ifdef RANDOM_FENESTRASX
if ((sv->sv_flags & SV_RNG_SEED_VER) != 0) {		if ((flags & SV_ABI_MASK) == SV_ABI_FREEBSD &&
		(flags & SV_RNG_SEED_VER) != 0) {
		kibUnsubmitted Not Done Inline Actions This one should be conditional on ABI_FREEBSD as well, perhaps? kib: This one should be conditional on ABI_FREEBSD as well, perhaps?
		kibUnsubmitted Not Done Inline Actions This can be written as a single check ((flags & (SV_ABI_MASK \| SV_RNG_SEED_VER) ) == (SV_ABI_FREEBSD \| SV_RNG_SEED_VER)) but it is up to you. kib: This can be written as a single check ``` ((flags & (SV_ABI_MASK \| SV_RNG_SEED_VER) ) ==…
/*		/*
* Only allocate a single VDSO entry for multiple sysentvecs,		* Only allocate a single VDSO entry for multiple sysentvecs,
* i.e., native and COMPAT32.		* i.e., native and COMPAT32.
*/		*/
if (fxrng_shpage_mapping == NULL)		if (fxrng_shpage_mapping == NULL)
alloc_sv_fxrng_generation();		alloc_sv_fxrng_generation();
base = (char *)fxrng_shpage_mapping - shared_page_mapping;		base = (char *)fxrng_shpage_mapping - shared_page_mapping;
sv->sv_fxrng_gen_base = sv->sv_shared_page_base + base;		sv->sv_fxrng_gen_base = sv->sv_shared_page_base + base;
Show All 18 Lines	exec_sysvec_init_secondary(struct sysentvec sv, struct sysentvec sv2)
if ((sv2->sv_flags & SV_TIMEKEEP) != 0) {		if ((sv2->sv_flags & SV_TIMEKEEP) != 0) {
sv2->sv_timekeep_base = sv2->sv_shared_page_base +		sv2->sv_timekeep_base = sv2->sv_shared_page_base +
(sv->sv_timekeep_base - sv->sv_shared_page_base);		(sv->sv_timekeep_base - sv->sv_shared_page_base);
}		}
if ((sv2->sv_flags & SV_RNG_SEED_VER) != 0) {		if ((sv2->sv_flags & SV_RNG_SEED_VER) != 0) {
sv2->sv_fxrng_gen_base = sv2->sv_shared_page_base +		sv2->sv_fxrng_gen_base = sv2->sv_shared_page_base +
(sv->sv_fxrng_gen_base - sv->sv_shared_page_base);		(sv->sv_fxrng_gen_base - sv->sv_shared_page_base);
}		}
}		}
		kibUnsubmitted Not Done Inline Actions Now, with the changes to exec_sysvec_init(), what is the reason to have exec_sysvec_init_abi()? It only asserts some state. kib: Now, with the changes to exec_sysvec_init(), what is the reason to have exec_sysvec_init_abi()?
		kibUnsubmitted Not Done Inline Actions Should `sv->sv_shared_page_obj == 0` (NULL BTW?) and `sv->sv_shared_page_base != 0` asserts moved to exec_sysvec_init() ? kib: Should `sv->sv_shared_page_obj == 0` (NULL BTW?) and `sv->sv_shared_page_base != 0` asserts…

View Options

dns/mdnsd/files/patch-Makefile

Show First 20 Lines • Show All 302 Lines • ▼ Show 20 Lines

void		void
exec_sysvec_init(void *param)		exec_sysvec_init(void *param)
{		{
struct sysentvec *sv;		struct sysentvec *sv;
#ifdef RANDOM_FENESTRASX		#ifdef RANDOM_FENESTRASX
ptrdiff_t base;		ptrdiff_t base;
#endif		#endif
		u_int flags;

sv = (struct sysentvec *)param;		sv = (struct sysentvec *)param;
if ((sv->sv_flags & SV_SHP) == 0)		flags = sv->sv_flags;
		if ((flags & SV_SHP) == 0)
		kibUnsubmitted Not Done Inline Actions I think that this assert (sv_shared_page_base != 0) should be only done if SV_SHP flag is set. kib: I think that this assert (sv_shared_page_base != 0) should be only done if SV_SHP flag is set.
return;		return;
		MPASS(sv->sv_shared_page_obj == NULL);
		MPASS(sv->sv_shared_page_base != 0);

sv->sv_shared_page_obj = shared_page_obj;		sv->sv_shared_page_obj = shared_page_obj;
		if ((flags & SV_ABI_MASK) == SV_ABI_FREEBSD) {
sv->sv_sigcode_base = sv->sv_shared_page_base +		sv->sv_sigcode_base = sv->sv_shared_page_base +
shared_page_fill(*(sv->sv_szsigcode), 16, sv->sv_sigcode);		shared_page_fill(*(sv->sv_szsigcode), 16, sv->sv_sigcode);
if ((sv->sv_flags & SV_ABI_MASK) != SV_ABI_FREEBSD)		}
return;		if ((flags & SV_TIMEKEEP) != 0) {
		kibUnsubmitted Not Done Inline Actions Add {} around then statement, it is multi-line. kib: Add {} around then statement, it is multi-line.
if ((sv->sv_flags & SV_TIMEKEEP) != 0) {
#ifdef COMPAT_FREEBSD32		#ifdef COMPAT_FREEBSD32
if ((sv->sv_flags & SV_ILP32) != 0) {		if ((flags & SV_ILP32) != 0) {
		if ((flags & SV_ABI_MASK) == SV_ABI_FREEBSD) {
KASSERT(compat32_svtk == NULL,		KASSERT(compat32_svtk == NULL,
("Compat32 already registered"));		("Compat32 already registered"));
compat32_svtk = alloc_sv_tk_compat32();		compat32_svtk = alloc_sv_tk_compat32();
		} else {
		KASSERT(compat32_svtk != NULL,
		("Compat32 not registered"));
		}
		kibUnsubmitted Not Done Inline Actions Why do you need to check this condition? The assert on the previous line verified that the condition is true. kib: Why do you need to check this condition? The assert on the previous line verified that the…
sv->sv_timekeep_base = sv->sv_shared_page_base +		sv->sv_timekeep_base = sv->sv_shared_page_base +
compat32_svtk->sv_timekeep_off;		compat32_svtk->sv_timekeep_off;
} else {		} else {
#endif		#endif
KASSERT(host_svtk == NULL, ("Host already registered"));		if ((flags & SV_ABI_MASK) == SV_ABI_FREEBSD) {
		KASSERT(host_svtk == NULL,
		("Host already registered"));
host_svtk = alloc_sv_tk();		host_svtk = alloc_sv_tk();
		} else {
		KASSERT(host_svtk != NULL,
		("Host not registered"));
		}
sv->sv_timekeep_base = sv->sv_shared_page_base +		sv->sv_timekeep_base = sv->sv_shared_page_base +
host_svtk->sv_timekeep_off;		host_svtk->sv_timekeep_off;
#ifdef COMPAT_FREEBSD32		#ifdef COMPAT_FREEBSD32
}		}
#endif		#endif
}		}
#ifdef RANDOM_FENESTRASX		#ifdef RANDOM_FENESTRASX
if ((sv->sv_flags & SV_RNG_SEED_VER) != 0) {		if ((flags & SV_ABI_MASK) == SV_ABI_FREEBSD &&
		(flags & SV_RNG_SEED_VER) != 0) {
		kibUnsubmitted Not Done Inline Actions This one should be conditional on ABI_FREEBSD as well, perhaps? kib: This one should be conditional on ABI_FREEBSD as well, perhaps?
		kibUnsubmitted Not Done Inline Actions This can be written as a single check ((flags & (SV_ABI_MASK \| SV_RNG_SEED_VER) ) == (SV_ABI_FREEBSD \| SV_RNG_SEED_VER)) but it is up to you. kib: This can be written as a single check ``` ((flags & (SV_ABI_MASK \| SV_RNG_SEED_VER) ) ==…
/*		/*
* Only allocate a single VDSO entry for multiple sysentvecs,		* Only allocate a single VDSO entry for multiple sysentvecs,
* i.e., native and COMPAT32.		* i.e., native and COMPAT32.
*/		*/
if (fxrng_shpage_mapping == NULL)		if (fxrng_shpage_mapping == NULL)
alloc_sv_fxrng_generation();		alloc_sv_fxrng_generation();
base = (char *)fxrng_shpage_mapping - shared_page_mapping;		base = (char *)fxrng_shpage_mapping - shared_page_mapping;
sv->sv_fxrng_gen_base = sv->sv_shared_page_base + base;		sv->sv_fxrng_gen_base = sv->sv_shared_page_base + base;
Show All 18 Lines	exec_sysvec_init_secondary(struct sysentvec sv, struct sysentvec sv2)
if ((sv2->sv_flags & SV_TIMEKEEP) != 0) {		if ((sv2->sv_flags & SV_TIMEKEEP) != 0) {
sv2->sv_timekeep_base = sv2->sv_shared_page_base +		sv2->sv_timekeep_base = sv2->sv_shared_page_base +
(sv->sv_timekeep_base - sv->sv_shared_page_base);		(sv->sv_timekeep_base - sv->sv_shared_page_base);
}		}
if ((sv2->sv_flags & SV_RNG_SEED_VER) != 0) {		if ((sv2->sv_flags & SV_RNG_SEED_VER) != 0) {
sv2->sv_fxrng_gen_base = sv2->sv_shared_page_base +		sv2->sv_fxrng_gen_base = sv2->sv_shared_page_base +
(sv->sv_fxrng_gen_base - sv->sv_shared_page_base);		(sv->sv_fxrng_gen_base - sv->sv_shared_page_base);
}		}
}		}
		kibUnsubmitted Not Done Inline Actions Now, with the changes to exec_sysvec_init(), what is the reason to have exec_sysvec_init_abi()? It only asserts some state. kib: Now, with the changes to exec_sysvec_init(), what is the reason to have exec_sysvec_init_abi()?
		kibUnsubmitted Not Done Inline Actions Should `sv->sv_shared_page_obj == 0` (NULL BTW?) and `sv->sv_shared_page_base != 0` asserts moved to exec_sysvec_init() ? kib: Should `sv->sv_shared_page_obj == 0` (NULL BTW?) and `sv->sv_shared_page_base != 0` asserts…