Page MenuHomeFreeBSD
Differential D39415

stand/efi: Simplify code here
ClosedPublic
Actions

Authored by imp on Apr 4 2023, 6:13 PM.
Tags
None
Referenced Files
Unknown Object (File)
Fri, Mar 7, 5:39 PM
Unknown Object (File)
Tue, Feb 25, 4:22 AM
Unknown Object (File)
Tue, Feb 25, 1:31 AM
Unknown Object (File)
Tue, Feb 25, 1:24 AM
Unknown Object (File)
Mon, Feb 24, 6:18 PM
Unknown Object (File)
Jan 24 2025, 5:12 PM
Unknown Object (File)
Dec 26 2024, 7:35 PM
Unknown Object (File)
Dec 4 2024, 8:27 AM
View All 56 Files
Subscribers
bcran
dab

Details

Reviewers
allanjude
kevans
tsoome
manu
Commits
rGd5babd0d2376: stand/efi: Simplify code here
Summary

We have plenty of stack in the EFI case, so use it instead of the
complicated malloc / free dance.

Sponsored by: Netflix

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

imp created this revision.Apr 4 2023, 6:13 PM
Herald added subscribers: dab, bcran. · View Herald TranscriptApr 4 2023, 6:13 PM
imp requested review of this revision.Apr 4 2023, 6:13 PM
imp added a parent revision: D39414: stand/userboot: Simplify code.
imp added a child revision: D39416: stand/kboot: Simplify.
Harbormaster completed remote builds in B50760: Diff 119846.Apr 4 2023, 6:13 PM
imp mentioned this in D39400: efi: Add zfs bootonce support to boot1.efi.Apr 4 2023, 6:16 PM
kevans accepted this revision.Apr 12 2023, 5:10 AM

I had to stop a minute and consider if this is true, but it is; lua is the stack hog, and this is executing long before we get to any lua bits. We generally have to have way more than 8k stack at around this depth for lua to operate, so all is good.

This revision is now accepted and ready to land.Apr 12 2023, 5:10 AM
tsoome accepted this revision.Apr 12 2023, 6:15 AM
Closed by commit rGd5babd0d2376: stand/efi: Simplify code here (authored by imp). · Explain WhyMay 1 2023, 9:04 PM
This revision was automatically updated to reflect the committed changes.
imp added a commit: rGd5babd0d2376: stand/efi: Simplify code here.

Revision Contents
Changeset List

PathSize
stand/
efi/
loader/
19 lines

Diff 121349

View Options

stand/efi/loader/main.c

Show First 20 Lines • Show All 220 Lines • ▼ Show 20 Lines
static void vtcon_tty_free(void *); static void vtcon_tty_free(void *);
static void vtcon_get_console_size(struct vtcon_softc *, uint16_t *, static void vtcon_get_console_size(struct vtcon_softc *, uint16_t *,
uint16_t *); uint16_t *);
static void vtcon_enable_interrupts(struct vtcon_softc *); static void vtcon_enable_interrupts(struct vtcon_softc *);
static void vtcon_disable_interrupts(struct vtcon_softc *); static void vtcon_disable_interrupts(struct vtcon_softc *);
#define vtcon_modern(_sc) (((_sc)->vtcon_features & VIRTIO_F_VERSION_1) != 0)
#define vtcon_htog16(_sc, _val) virtio_htog16(vtcon_modern(_sc), _val)
#define vtcon_htog32(_sc, _val) virtio_htog32(vtcon_modern(_sc), _val)
#define vtcon_htog64(_sc, _val) virtio_htog64(vtcon_modern(_sc), _val)
#define vtcon_gtoh16(_sc, _val) virtio_gtoh16(vtcon_modern(_sc), _val)
#define vtcon_gtoh32(_sc, _val) virtio_gtoh32(vtcon_modern(_sc), _val)
#define vtcon_gtoh64(_sc, _val) virtio_gtoh64(vtcon_modern(_sc), _val)
static int vtcon_pending_free; static int vtcon_pending_free;
static struct ttydevsw vtcon_tty_class = { static struct ttydevsw vtcon_tty_class = {
.tsw_flags = 0, .tsw_flags = 0,
.tsw_open = vtcon_tty_open, .tsw_open = vtcon_tty_open,
.tsw_close = vtcon_tty_close, .tsw_close = vtcon_tty_close,
.tsw_outwakeup = vtcon_tty_outwakeup, .tsw_outwakeup = vtcon_tty_outwakeup,
.tsw_free = vtcon_tty_free, .tsw_free = vtcon_tty_free,
▲ Show 20 Lines • Show All 188 Lines • ▼ Show 20 Lines
{ {
device_t dev; device_t dev;
uint64_t features; uint64_t features;
dev = sc->vtcon_dev; dev = sc->vtcon_dev;
features = VTCON_FEATURES; features = VTCON_FEATURES;
sc->vtcon_features = virtio_negotiate_features(dev, features); sc->vtcon_features = virtio_negotiate_features(dev, features);
virtio_finalize_features(dev);
} }
static void static void
vtcon_setup_features(struct vtcon_softc *sc) vtcon_setup_features(struct vtcon_softc *sc)
{ {
device_t dev; device_t dev;
dev = sc->vtcon_dev; dev = sc->vtcon_dev;
▲ Show 20 Lines • Show All 400 Lines • ▼ Show 20 Linesvtcon_ctrl_port_name_event(struct vtcon_softc *sc, int id, const char *name,
VTCON_PORT_UNLOCK(port); VTCON_PORT_UNLOCK(port);
} }
static void static void
vtcon_ctrl_process_event(struct vtcon_softc *sc, vtcon_ctrl_process_event(struct vtcon_softc *sc,
struct virtio_console_control *control, void *data, size_t data_len) struct virtio_console_control *control, void *data, size_t data_len)
{ {
device_t dev; device_t dev;
int id; uint32_t id;
uint16_t event;
dev = sc->vtcon_dev; dev = sc->vtcon_dev;
id = control->id; id = vtcon_htog32(sc, control->id);
event = vtcon_htog16(sc, control->event);
if (id < 0 || id >= sc->vtcon_max_ports) { if (id >= sc->vtcon_max_ports) {
device_printf(dev, "%s: invalid port ID %d\n", __func__, id); device_printf(dev, "%s: event %d invalid port ID %d\n",
__func__, event, id);
return; return;
} }
switch (control->event) { switch (event) {
case VIRTIO_CONSOLE_PORT_ADD: case VIRTIO_CONSOLE_PORT_ADD:
vtcon_ctrl_port_add_event(sc, id); vtcon_ctrl_port_add_event(sc, id);
break; break;
case VIRTIO_CONSOLE_PORT_REMOVE: case VIRTIO_CONSOLE_PORT_REMOVE:
vtcon_ctrl_port_remove_event(sc, id); vtcon_ctrl_port_remove_event(sc, id);
break; break;
▲ Show 20 Lines • Show All 111 Lines • ▼ Show 20 Lines
vtcon_ctrl_send_control(struct vtcon_softc *sc, uint32_t portid, vtcon_ctrl_send_control(struct vtcon_softc *sc, uint32_t portid,
uint16_t event, uint16_t value) uint16_t event, uint16_t value)
{ {
struct virtio_console_control control; struct virtio_console_control control;
if ((sc->vtcon_flags & VTCON_FLAG_MULTIPORT) == 0) if ((sc->vtcon_flags & VTCON_FLAG_MULTIPORT) == 0)
return; return;
control.id = portid; control.id = vtcon_gtoh32(sc, portid);
control.event = event; control.event = vtcon_gtoh16(sc, event);
control.value = value; control.value = vtcon_gtoh16(sc, value);
vtcon_ctrl_poll(sc, &control); vtcon_ctrl_poll(sc, &control);
} }
static int static int
vtcon_port_enqueue_buf(struct vtcon_port *port, void *buf, size_t len) vtcon_port_enqueue_buf(struct vtcon_port *port, void *buf, size_t len)
{ {
struct sglist_seg segs[2]; struct sglist_seg segs[2];
▲ Show 20 Lines • Show All 504 Lines • Show Last 20 Lines