Page MenuHomeFreeBSD
Differential D5992

Add chain loader support for loader
ClosedPublic
Actions

Authored by tsoome on Apr 19 2016, 6:29 AM.
Tags
None
Referenced Files
Unknown Object (File)
Thu, Mar 20, 9:57 PM
Unknown Object (File)
Mon, Mar 17, 4:41 PM
Unknown Object (File)
Fri, Mar 14, 6:42 PM
Unknown Object (File)
Tue, Mar 11, 1:58 PM
Unknown Object (File)
Feb 27 2025, 3:38 AM
Unknown Object (File)
Feb 20 2025, 6:42 PM
Unknown Object (File)
Feb 20 2025, 6:54 AM
Unknown Object (File)
Feb 18 2025, 3:09 PM
View All Files
Subscribers
allanjude
avg
cem
emaste
imp
jhb
Contributor Reviews (src)

Details

Reviewers
allanjude
imp
Group Reviewers
Contributor Reviews (src)
Commits
rS320011: Add chain loader support for loader
Summary

This update adds chain command to support simple chain loader. chain command accepts disk
device name as argument, then attempts to read MBR or VBR block (512B) into memory
and will jump to it. As an update to initial version, the bios chain is also allowed to read the bootcode from the file.

In addition, if variable "chain_disk" is set to disk device name, beastie menu will show an
ChainLoader menu entry for quick access to chain loading.

The UEFI chain command is intended to load efi application from ESP.

Test Plan

This update can only be tested in multiboot setups, to load another operating system.

The bios chain is in use in loader illumos port and appears to function quite nicely. The uefi chain I have tested only with loader boot1.efi (chaining illumos from freebsd:)

Diff Detail

Event Timeline

tsoome updated this revision to Diff 15307.Apr 19 2016, 6:29 AM
tsoome retitled this revision from to Add chain loader support for loader.
tsoome updated this object.
tsoome edited the test plan for this revision. (Show Details)
Herald added subscribers: Contributor Reviews (src), imp. · View Herald TranscriptApr 19 2016, 6:29 AM
tsoome added a reviewer: Contributor Reviews (src).Apr 19 2016, 3:07 PM
emaste added a subscriber: jhb.Apr 19 2016, 5:48 PM
emaste added a subscriber: emaste.
tsoome updated this revision to Diff 15802.May 1 2016, 9:46 PM

Updated to revision 298901.

tsoome updated this revision to Diff 17319.Jun 4 2016, 9:32 PM

Update to rev 301412.
Reserve extra space in relocator.

tsoome updated this revision to Diff 18430.Jul 14 2016, 6:33 PM

Updated to revision 302853.

allanjude added a reviewer: imp.Aug 31 2016, 5:54 PM
tsoome updated this revision to Diff 24654.Feb 2 2017, 10:23 AM

svn update to 313091.

allanjude added a subscriber: allanjude.Feb 7 2017, 8:29 PM

Can you add some instructions or a man page explaining how to use it? (and how one would test it)

allanjude added a reviewer: allanjude.Feb 7 2017, 8:29 PM
tsoome added a comment.Feb 7 2017, 8:40 PM
In D5992#195948, @allanjude wrote:

Can you add some instructions or a man page explaining how to use it? (and how one would test it)

from OK prompt: chain disk1: or chain disk1p1:

if the same device is set as value for chain_disk="disk1:" the menu would appear (hopefully). I guess the man update would be good indeed, I'll set note for myself:)

avg added a subscriber: avg.Feb 10 2017, 10:10 AM
tsoome updated this revision to Diff 28404.May 16 2017, 7:52 AM

Updated to revision 318337.

tsoome updated this revision to Diff 28407.May 16 2017, 8:10 AM

allow to read boot code from file

tsoome updated this revision to Diff 28408.May 16 2017, 8:19 AM

bios chain is missing size, add efi chain.

Harbormaster completed remote builds in B9300: Diff 28408.May 16 2017, 8:19 AM
tsoome edited the summary of this revision. (Show Details)May 16 2017, 8:27 AM
tsoome edited the test plan for this revision. (Show Details)
tsoome updated this revision to Diff 28410.May 16 2017, 8:50 AM

menu entry has extra l.

Harbormaster completed remote builds in B9297: Diff 28404.May 16 2017, 9:15 AM
Harbormaster failed remote builds in B9299: Diff 28407!May 16 2017, 10:15 AM
Harbormaster completed remote builds in B9300: Diff 28408.May 16 2017, 10:58 AM
Harbormaster completed remote builds in B9302: Diff 28410.May 16 2017, 11:34 AM
Closed by commit rS320011: Add chain loader support for loader (authored by tsoome). · Explain WhyJun 16 2017, 8:08 PM
This revision was automatically updated to reflect the committed changes.
cem added a subscriber: cem.Jun 22 2017, 11:03 PM
cem added inline comments.
head/sys/boot/i386/loader/chain.c
111–113 ↗(On Diff #29731)

This is totally bogus. uintptr points at relocater_data, which is a uint32_t, not an array type.

Coverity rightly warns about it in CID 1376405 — Memory corruption.

tsoome marked an inline comment as done.Jun 23 2017, 9:13 AM
tsoome added inline comments.
head/sys/boot/i386/loader/chain.c
111–113 ↗(On Diff #29731)

Addressed in https://reviews.freebsd.org/D11321, thank you!

Revision Contents
Changeset List

PathSize
sys/
boot/
forth/
15 lines
i386/
libi386/
2 lines
29 lines
358 lines
loader/
2 lines
131 lines
9 lines

Diff 28404

View Options

sys/boot/forth/menu.rc

Show First 20 Lines • Show All 431 Lines • ▼ Show 20 Linescompile_delimited(char *p, char *d, int is_tr)
else if (c == '\\') else if (c == '\\')
errx(1, "%lu: %s: \\ can not be used as a string delimiter", errx(1, "%lu: %s: \\ can not be used as a string delimiter",
linenum, fname); linenum, fname);
else if (c == '\n') else if (c == '\n')
errx(1, "%lu: %s: newline can not be used as a string delimiter", errx(1, "%lu: %s: newline can not be used as a string delimiter",
linenum, fname); linenum, fname);
while (*p) { while (*p) {
if (*p == '[' && *p != c) { if (*p == '[' && *p != c) {
if ((d = compile_ccl(&p, d)) == NULL) if (!is_tr) {
errx(1, "%lu: %s: unbalanced brackets ([])", linenum, fname); if ((d = compile_ccl(&p, d)) == NULL) {
errx(1,
"%lu: %s: unbalanced brackets ([])",
linenum, fname);
}
continue; continue;
}
} else if (*p == '\\' && p[1] == '[') { } else if (*p == '\\' && p[1] == '[') {
if (is_tr)
p++;
else
*d++ = *p++; *d++ = *p++;
} else if (*p == '\\' && p[1] == c) { } else if (*p == '\\' && p[1] == c) {
p++; p++;
} else if (*p == '\\' && } else if (*p == '\\' &&
(p[1] == 'n' || p[1] == 'r' || p[1] == 't')) { (p[1] == 'n' || p[1] == 'r' || p[1] == 't')) {
switch (p[1]) { switch (p[1]) {
case 'n': case 'n':
*d++ = '\n'; *d++ = '\n';
break; break;
case 'r': case 'r':
*d++ = '\r'; *d++ = '\r';
break; break;
case 't': case 't':
*d++ = '\t'; *d++ = '\t';
break; break;
} }
p += 2; p += 2;
continue; continue;
} else if (*p == '\\' && p[1] == 'x') { } else if (*p == '\\' && p[1] == 'x') {
if (dohex(&p[2], d, &hexlen)) { if (dohex(&p[2], d, &hexlen)) {
++d; ++d;
p += hexlen + 2; p += hexlen + 2;
continue; continue;
} }
} else if (*p == '\\' && p[1] == '\\') { } else if (*p == '\\' && p[1] == '\\') {
yuripvAuthorUnsubmitted
Done
Inline Actions

This needs to be changed to just } else if (*p == '\\') { so that all other \<char> sequences are translated to <char> in 'y' command mode (gsed and common sense do agree :).

yuripv: This needs to be changed to just `} else if (*p == '\\') {` so that all other \<char> sequences…
if (is_tr) if (is_tr)
p++; p++;
else else
*d++ = *p++; *d++ = *p++;
} else if (*p == c) { } else if (*p == c) {
*d = '\0'; *d = '\0';
return (p + 1); return (p + 1);
} }
▲ Show 20 Lines • Show All 592 Lines • Show Last 20 Lines
View Options

sys/boot/i386/libi386/Makefile

Show First 20 Lines • Show All 431 Lines • ▼ Show 20 Linescompile_delimited(char *p, char *d, int is_tr)
else if (c == '\\') else if (c == '\\')
errx(1, "%lu: %s: \\ can not be used as a string delimiter", errx(1, "%lu: %s: \\ can not be used as a string delimiter",
linenum, fname); linenum, fname);
else if (c == '\n') else if (c == '\n')
errx(1, "%lu: %s: newline can not be used as a string delimiter", errx(1, "%lu: %s: newline can not be used as a string delimiter",
linenum, fname); linenum, fname);
while (*p) { while (*p) {
if (*p == '[' && *p != c) { if (*p == '[' && *p != c) {
if ((d = compile_ccl(&p, d)) == NULL) if (!is_tr) {
errx(1, "%lu: %s: unbalanced brackets ([])", linenum, fname); if ((d = compile_ccl(&p, d)) == NULL) {
errx(1,
"%lu: %s: unbalanced brackets ([])",
linenum, fname);
}
continue; continue;
}
} else if (*p == '\\' && p[1] == '[') { } else if (*p == '\\' && p[1] == '[') {
if (is_tr)
p++;
else
*d++ = *p++; *d++ = *p++;
} else if (*p == '\\' && p[1] == c) { } else if (*p == '\\' && p[1] == c) {
p++; p++;
} else if (*p == '\\' && } else if (*p == '\\' &&
(p[1] == 'n' || p[1] == 'r' || p[1] == 't')) { (p[1] == 'n' || p[1] == 'r' || p[1] == 't')) {
switch (p[1]) { switch (p[1]) {
case 'n': case 'n':
*d++ = '\n'; *d++ = '\n';
break; break;
case 'r': case 'r':
*d++ = '\r'; *d++ = '\r';
break; break;
case 't': case 't':
*d++ = '\t'; *d++ = '\t';
break; break;
} }
p += 2; p += 2;
continue; continue;
} else if (*p == '\\' && p[1] == 'x') { } else if (*p == '\\' && p[1] == 'x') {
if (dohex(&p[2], d, &hexlen)) { if (dohex(&p[2], d, &hexlen)) {
++d; ++d;
p += hexlen + 2; p += hexlen + 2;
continue; continue;
} }
} else if (*p == '\\' && p[1] == '\\') { } else if (*p == '\\' && p[1] == '\\') {
yuripvAuthorUnsubmitted
Done
Inline Actions

This needs to be changed to just } else if (*p == '\\') { so that all other \<char> sequences are translated to <char> in 'y' command mode (gsed and common sense do agree :).

yuripv: This needs to be changed to just `} else if (*p == '\\') {` so that all other \<char> sequences…
if (is_tr) if (is_tr)
p++; p++;
else else
*d++ = *p++; *d++ = *p++;
} else if (*p == c) { } else if (*p == c) {
*d = '\0'; *d = '\0';
return (p + 1); return (p + 1);
} }
▲ Show 20 Lines • Show All 592 Lines • Show Last 20 Lines
View Options

sys/boot/i386/libi386/libi386.h

Show First 20 Lines • Show All 431 Lines • ▼ Show 20 Linescompile_delimited(char *p, char *d, int is_tr)
else if (c == '\\') else if (c == '\\')
errx(1, "%lu: %s: \\ can not be used as a string delimiter", errx(1, "%lu: %s: \\ can not be used as a string delimiter",
linenum, fname); linenum, fname);
else if (c == '\n') else if (c == '\n')
errx(1, "%lu: %s: newline can not be used as a string delimiter", errx(1, "%lu: %s: newline can not be used as a string delimiter",
linenum, fname); linenum, fname);
while (*p) { while (*p) {
if (*p == '[' && *p != c) { if (*p == '[' && *p != c) {
if ((d = compile_ccl(&p, d)) == NULL) if (!is_tr) {
errx(1, "%lu: %s: unbalanced brackets ([])", linenum, fname); if ((d = compile_ccl(&p, d)) == NULL) {
errx(1,
"%lu: %s: unbalanced brackets ([])",
linenum, fname);
}
continue; continue;
}
} else if (*p == '\\' && p[1] == '[') { } else if (*p == '\\' && p[1] == '[') {
if (is_tr)
p++;
else
*d++ = *p++; *d++ = *p++;
} else if (*p == '\\' && p[1] == c) { } else if (*p == '\\' && p[1] == c) {
p++; p++;
} else if (*p == '\\' && } else if (*p == '\\' &&
(p[1] == 'n' || p[1] == 'r' || p[1] == 't')) { (p[1] == 'n' || p[1] == 'r' || p[1] == 't')) {
switch (p[1]) { switch (p[1]) {
case 'n': case 'n':
*d++ = '\n'; *d++ = '\n';
break; break;
case 'r': case 'r':
*d++ = '\r'; *d++ = '\r';
break; break;
case 't': case 't':
*d++ = '\t'; *d++ = '\t';
break; break;
} }
p += 2; p += 2;
continue; continue;
} else if (*p == '\\' && p[1] == 'x') { } else if (*p == '\\' && p[1] == 'x') {
if (dohex(&p[2], d, &hexlen)) { if (dohex(&p[2], d, &hexlen)) {
++d; ++d;
p += hexlen + 2; p += hexlen + 2;
continue; continue;
} }
} else if (*p == '\\' && p[1] == '\\') { } else if (*p == '\\' && p[1] == '\\') {
yuripvAuthorUnsubmitted
Done
Inline Actions

This needs to be changed to just } else if (*p == '\\') { so that all other \<char> sequences are translated to <char> in 'y' command mode (gsed and common sense do agree :).

yuripv: This needs to be changed to just `} else if (*p == '\\') {` so that all other \<char> sequences…
if (is_tr) if (is_tr)
p++; p++;
else else
*d++ = *p++; *d++ = *p++;
} else if (*p == c) { } else if (*p == c) {
*d = '\0'; *d = '\0';
return (p + 1); return (p + 1);
} }
▲ Show 20 Lines • Show All 592 Lines • Show Last 20 Lines
View Options

sys/boot/i386/libi386/relocater_tramp.S

Show First 20 Lines • Show All 431 Lines • ▼ Show 20 Linescompile_delimited(char *p, char *d, int is_tr)
else if (c == '\\') else if (c == '\\')
errx(1, "%lu: %s: \\ can not be used as a string delimiter", errx(1, "%lu: %s: \\ can not be used as a string delimiter",
linenum, fname); linenum, fname);
else if (c == '\n') else if (c == '\n')
errx(1, "%lu: %s: newline can not be used as a string delimiter", errx(1, "%lu: %s: newline can not be used as a string delimiter",
linenum, fname); linenum, fname);
while (*p) { while (*p) {
if (*p == '[' && *p != c) { if (*p == '[' && *p != c) {
if ((d = compile_ccl(&p, d)) == NULL) if (!is_tr) {
errx(1, "%lu: %s: unbalanced brackets ([])", linenum, fname); if ((d = compile_ccl(&p, d)) == NULL) {
errx(1,
"%lu: %s: unbalanced brackets ([])",
linenum, fname);
}
continue; continue;
}
} else if (*p == '\\' && p[1] == '[') { } else if (*p == '\\' && p[1] == '[') {
if (is_tr)
p++;
else
*d++ = *p++; *d++ = *p++;
} else if (*p == '\\' && p[1] == c) { } else if (*p == '\\' && p[1] == c) {
p++; p++;
} else if (*p == '\\' && } else if (*p == '\\' &&
(p[1] == 'n' || p[1] == 'r' || p[1] == 't')) { (p[1] == 'n' || p[1] == 'r' || p[1] == 't')) {
switch (p[1]) { switch (p[1]) {
case 'n': case 'n':
*d++ = '\n'; *d++ = '\n';
break; break;
case 'r': case 'r':
*d++ = '\r'; *d++ = '\r';
break; break;
case 't': case 't':
*d++ = '\t'; *d++ = '\t';
break; break;
} }
p += 2; p += 2;
continue; continue;
} else if (*p == '\\' && p[1] == 'x') { } else if (*p == '\\' && p[1] == 'x') {
if (dohex(&p[2], d, &hexlen)) { if (dohex(&p[2], d, &hexlen)) {
++d; ++d;
p += hexlen + 2; p += hexlen + 2;
continue; continue;
} }
} else if (*p == '\\' && p[1] == '\\') { } else if (*p == '\\' && p[1] == '\\') {
yuripvAuthorUnsubmitted
Done
Inline Actions

This needs to be changed to just } else if (*p == '\\') { so that all other \<char> sequences are translated to <char> in 'y' command mode (gsed and common sense do agree :).

yuripv: This needs to be changed to just `} else if (*p == '\\') {` so that all other \<char> sequences…
if (is_tr) if (is_tr)
p++; p++;
else else
*d++ = *p++; *d++ = *p++;
} else if (*p == c) { } else if (*p == c) {
*d = '\0'; *d = '\0';
return (p + 1); return (p + 1);
} }
▲ Show 20 Lines • Show All 592 Lines • Show Last 20 Lines
View Options

sys/boot/i386/loader/Makefile

Loading...
View Options

sys/boot/i386/loader/chain.c

Loading...
View Options

sys/boot/i386/loader/help.i386

Loading...