release: add wifi-firmware-kmod@release to ship as package
ClosedPublic
Actions

Authored by bz on Nov 3 2024, 12:16 AM.

Details

Reviewers

Group Reviewers

Commits

rG8c6df7ead19c: release: add wifi-firmware-kmod@release to ship as package
rGf21cb43c91ef: release: add wifi-firmware-kmod@release to ship as package
rG2483a2d36803: release: add wifi-firmware-kmod@release to ship as package

Summary

Rather than adding the rtw88 package add the flavored port for all the
supported wireless drivers we recently added support for.

Sponsored by: The FreeBSD Foundation
MFC after: 3 days
Pointed out by: cperciva (as part of the set of changes)

Test Plan

Not tested yet; packages in the main repo are not there for 15.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

bz created this revision.Nov 3 2024, 12:16 AM

Herald added subscribers: jrtc27, imp. · View Herald TranscriptNov 3 2024, 12:16 AM

bz requested review of this revision.Nov 3 2024, 12:16 AM

Harbormaster completed remote builds in B60351: Diff 145911.Nov 3 2024, 12:19 AM

I can confirm that (with my local repo of only providing the wifi-firmware) they ended up (to my surprise only) on the dvd1.iso (and neither disc1 or especially not the memstick).

To my further surprise our installer has no menu to actually install packages shipped on the dvd (apart from the handbook) which makes me question this list to some extend.
it's further funny as it's neither avail as a pkg repo option once you use the post-install shell (inside the newly installed image) and when you get the shell (and the newly installed image is unmounted you have to manually fiddle all your way there).

So I think this works as expected as well.

I hope we can get the bis in quickly and I'll work on the installer to start providing the option to install firmware as well (over the network at least so it'll work for all the images).

bz added a parent revision: D47408: release: set compat.linuxkpi.skb.mem_limit=1 in loader.conf.Nov 3 2024, 11:47 PM

cperciva accepted this revision.Nov 10 2024, 6:56 PM

This revision is now accepted and ready to land.Nov 10 2024, 6:56 PM

Closed by commit rG2483a2d36803: release: add wifi-firmware-kmod@release to ship as package (authored by bz). · Explain WhyNov 10 2024, 7:03 PM

This revision was automatically updated to reflect the committed changes.

bz added a commit: rG2483a2d36803: release: add wifi-firmware-kmod@release to ship as package.

bz added a commit: rGf21cb43c91ef: release: add wifi-firmware-kmod@release to ship as package.Nov 14 2024, 1:54 AM

bz added a commit: rG8c6df7ead19c: release: add wifi-firmware-kmod@release to ship as package.Nov 19 2024, 12:39 AM

Revision Contents
Changeset List

Path

Size

release/

scripts/

pkg-stage.sh

2 lines

Diff 146244

View Options

release/scripts/pkg-stage.sh

Show First 20 Lines • Show All 939 Lines • ▼ Show 20 Lines	if (interp[interp_name_len - 1] != '\0') {
return (ENOEXEC);		return (ENOEXEC);
}		}

*interpp = interp;		*interpp = interp;
*free_interpp = false;		*free_interpp = false;
return (0);		return (0);
}		}

		static int
		__elfN(load_interp)(struct image_params imgp, const Elf_Brandinfo brand_info,
		const char interp, u_long addr, u_long *entry)
		{
		char *path;
		int error;

		if (brand_info->emul_path != NULL &&
		brand_info->emul_path[0] != '\0') {
		path = malloc(MAXPATHLEN, M_TEMP, M_WAITOK);
		snprintf(path, MAXPATHLEN, "%s%s",
		brand_info->emul_path, interp);
		error = __elfN(load_file)(imgp->proc, path, addr, entry);
		free(path, M_TEMP);
		kibUnsubmitted Not Done Inline Actions This block of if() can be naturally moved before calculating newinterp. kib: This block of if() can be naturally moved before calculating newinterp.
		if (error == 0)
		return (0);
		}

		if (brand_info->interp_newpath != NULL &&
		(brand_info->interp_path == NULL \|\|
		strcmp(interp, brand_info->interp_path) == 0)) {
		error = __elfN(load_file)(imgp->proc,
		brand_info->interp_newpath, addr, entry);
		if (error == 0)
		kibUnsubmitted Not Done Inline Actions How could newinterp != NULL and brand_info->interp_path == NULL ? kib: How could newinterp != NULL and brand_info->interp_path == NULL ?
		traszAuthorUnsubmitted Done Inline Actions The newinterp comes from brand_info->interp_newpath, not brand_info->interp_path. trasz: The newinterp comes from brand_info->interp_newpath, not brand_info->interp_path.
		return (0);
		}

		error = __elfN(load_file)(imgp->proc, interp, addr, entry);
		if (error == 0)
		return (0);

		uprintf("ELF interpreter %s not found, error %d\n", interp, error);
		return (error);
		}
		kibUnsubmitted Done Inline Actions This block is irrelevant for the task of loading the interpreter. I must not be moved. kib: This block is irrelevant for the task of loading the interpreter. I must not be moved.

/*		/*
* Impossible et_dyn_addr initial value indicating that the real base		* Impossible et_dyn_addr initial value indicating that the real base
* must be calculated later with some randomization applied.		* must be calculated later with some randomization applied.
*/		*/
#define ET_DYN_ADDR_RAND 1		#define ET_DYN_ADDR_RAND 1

static int		static int
__CONCAT(exec_, __elfN(imgact))(struct image_params *imgp)		__CONCAT(exec_, __elfN(imgact))(struct image_params *imgp)
{		{
struct thread *td;		struct thread *td;
const Elf_Ehdr *hdr;		const Elf_Ehdr *hdr;
const Elf_Phdr *phdr;		const Elf_Phdr *phdr;
Elf_Auxargs *elf_auxargs;		Elf_Auxargs *elf_auxargs;
struct vmspace *vmspace;		struct vmspace *vmspace;
vm_map_t map;		vm_map_t map;
const char *newinterp;		char *interp;
char interp, path;
Elf_Brandinfo *brand_info;		Elf_Brandinfo *brand_info;
struct sysentvec *sv;		struct sysentvec *sv;
vm_prot_t prot;		vm_prot_t prot;
u_long addr, baddr, et_dyn_addr, entry, proghdr;		u_long addr, baddr, et_dyn_addr, entry, proghdr;
u_long maxalign, mapsz, maxv, maxv1;		u_long maxalign, mapsz, maxv, maxv1;
uint32_t fctl0;		uint32_t fctl0;
int32_t osrel;		int32_t osrel;
bool free_interp;		bool free_interp;
int error, i, n, have_interp;		int error, i, n;

hdr = (const Elf_Ehdr *)imgp->image_header;		hdr = (const Elf_Ehdr *)imgp->image_header;

/*		/*
* Do we have a valid ELF header ?		* Do we have a valid ELF header ?
*		*
* Only allow ET_EXEC & ET_DYN here, reject ET_DYN later		* Only allow ET_EXEC & ET_DYN here, reject ET_DYN later
* if particular brand doesn't support it.		* if particular brand doesn't support it.
Show All 19 Lines	if (!aligned(phdr, Elf_Addr)) {
return (ENOEXEC);		return (ENOEXEC);
}		}

n = error = 0;		n = error = 0;
baddr = 0;		baddr = 0;
osrel = 0;		osrel = 0;
fctl0 = 0;		fctl0 = 0;
entry = proghdr = 0;		entry = proghdr = 0;
newinterp = interp = NULL;		interp = NULL;
free_interp = false;		free_interp = false;
td = curthread;		td = curthread;
maxalign = PAGE_SIZE;		maxalign = PAGE_SIZE;
mapsz = 0;		mapsz = 0;

for (i = 0; i < hdr->e_phnum; i++) {		for (i = 0; i < hdr->e_phnum; i++) {
switch (phdr[i].p_type) {		switch (phdr[i].p_type) {
case PT_LOAD:		case PT_LOAD:
▲ Show 20 Lines • Show All 51 Lines • ▼ Show 20 Lines	if (baddr == 0) {
else if ((__elfN(pie_aslr_enabled) &&		else if ((__elfN(pie_aslr_enabled) &&
(imgp->proc->p_flag2 & P2_ASLR_DISABLE) == 0) \|\|		(imgp->proc->p_flag2 & P2_ASLR_DISABLE) == 0) \|\|
(imgp->proc->p_flag2 & P2_ASLR_ENABLE) != 0)		(imgp->proc->p_flag2 & P2_ASLR_ENABLE) != 0)
et_dyn_addr = ET_DYN_ADDR_RAND;		et_dyn_addr = ET_DYN_ADDR_RAND;
else		else
et_dyn_addr = ET_DYN_LOAD_ADDR;		et_dyn_addr = ET_DYN_LOAD_ADDR;
}		}
}		}
if (interp != NULL && brand_info->interp_newpath != NULL)
newinterp = brand_info->interp_newpath;

/*		/*
* Avoid a possible deadlock if the current address space is destroyed		* Avoid a possible deadlock if the current address space is destroyed
* and that address space maps the locked vnode. In the common case,		* and that address space maps the locked vnode. In the common case,
* the locked vnode's v_usecount is decremented but remains greater		* the locked vnode's v_usecount is decremented but remains greater
* than zero. Consequently, the vnode lock is not needed by vrele().		* than zero. Consequently, the vnode lock is not needed by vrele().
* However, in cases where the vnode lock is external, such as nullfs,		* However, in cases where the vnode lock is external, such as nullfs,
* v_usecount may become zero.		* v_usecount may become zero.
▲ Show 20 Lines • Show All 108 Lines • ▼ Show 20 Lines	map->anon_loc = __CONCAT(rnd_, __elfN(base))(map, addr, maxv1,
MAXPAGESIZES > 1 ? pagesizes[1] : pagesizes[0]);		MAXPAGESIZES > 1 ? pagesizes[1] : pagesizes[0]);
} else {		} else {
map->anon_loc = addr;		map->anon_loc = addr;
}		}

imgp->entry_addr = entry;		imgp->entry_addr = entry;

if (interp != NULL) {		if (interp != NULL) {
have_interp = FALSE;
VOP_UNLOCK(imgp->vp, 0);		VOP_UNLOCK(imgp->vp, 0);
if ((map->flags & MAP_ASLR) != 0) {		if ((map->flags & MAP_ASLR) != 0) {
/* Assume that interpeter fits into 1/4 of AS */		/* Assume that interpeter fits into 1/4 of AS */
maxv1 = maxv / 2 + addr / 2;		maxv1 = maxv / 2 + addr / 2;
MPASS(maxv1 >= addr); /* No overflow */		MPASS(maxv1 >= addr); /* No overflow */
addr = __CONCAT(rnd_, __elfN(base))(map, addr,		addr = __CONCAT(rnd_, __elfN(base))(map, addr,
maxv1, PAGE_SIZE);		maxv1, PAGE_SIZE);
}		}
if (brand_info->emul_path != NULL &&		error = __elfN(load_interp)(imgp, brand_info, interp, &addr,
brand_info->emul_path[0] != '\0') {
path = malloc(MAXPATHLEN, M_TEMP, M_WAITOK);
snprintf(path, MAXPATHLEN, "%s%s",
brand_info->emul_path, interp);
error = __elfN(load_file)(imgp->proc, path, &addr,
&imgp->entry_addr);		&imgp->entry_addr);
free(path, M_TEMP);
if (error == 0)
have_interp = TRUE;
}
if (!have_interp && newinterp != NULL &&
(brand_info->interp_path == NULL \|\|
strcmp(interp, brand_info->interp_path) == 0)) {
error = __elfN(load_file)(imgp->proc, newinterp, &addr,
&imgp->entry_addr);
if (error == 0)
have_interp = TRUE;
}
if (!have_interp) {
error = __elfN(load_file)(imgp->proc, interp, &addr,
&imgp->entry_addr);
}
vn_lock(imgp->vp, LK_EXCLUSIVE \| LK_RETRY);		vn_lock(imgp->vp, LK_EXCLUSIVE \| LK_RETRY);
if (error != 0) {		if (error != 0)
uprintf("ELF interpreter %s not found, error %d\n",
interp, error);
goto ret;		goto ret;
}
} else		} else
addr = et_dyn_addr;		addr = et_dyn_addr;

/*		/*
* Construct auxargs table (used by the fixup routine)		* Construct auxargs table (used by the fixup routine)
*/		*/
elf_auxargs = malloc(sizeof(Elf_Auxargs), M_TEMP, M_WAITOK);		elf_auxargs = malloc(sizeof(Elf_Auxargs), M_TEMP, M_WAITOK);
elf_auxargs->execfd = -1;		elf_auxargs->execfd = -1;
▲ Show 20 Lines • Show All 1,456 Lines • Show Last 20 Lines

release: add wifi-firmware-kmod@release to ship as packageClosedPublicActions