Page MenuHomeFreeBSD
Differential D14952

Add etdump for dumping El Torito boot catalog information
ClosedPublic
Actions

Authored by benno on Apr 3 2018, 6:04 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Apr 12, 10:08 AM
Unknown Object (File)
Fri, Apr 11, 11:22 PM
Unknown Object (File)
Mon, Mar 17, 7:31 AM
Unknown Object (File)
Feb 23 2025, 1:41 PM
Unknown Object (File)
Feb 18 2025, 10:20 AM
Unknown Object (File)
Feb 18 2025, 4:19 AM
Unknown Object (File)
Feb 6 2025, 2:51 PM
Unknown Object (File)
Jan 22 2025, 9:28 AM
View All 78 Files
Subscribers
sbruno

Details

Reviewers
imp
mav
Group Reviewers
manpages
Commits
rS331949: Add the etdump utility for dumping El Torito boot catalog information.
Summary

As part of generating hybrid ISO images we need to find out where the EFI ESP is located in the El Torito boot catalog. This utility can emit that information either in human-readable text or as a string that can be passed to eval in a shell script for further use there.

Test Plan

Run it against some El Torito ISO images and see what it says.

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Skipped
Unit
Tests Skipped
Build Status
Buildable 15960

Event Timeline

benno created this revision.Apr 3 2018, 6:04 PM
Herald added a reviewer: manpages. · View Herald TranscriptApr 3 2018, 6:04 PM
Harbormaster completed remote builds in B15960: Diff 41038.Apr 3 2018, 6:04 PM
imp accepted this revision.Apr 3 2018, 6:11 PM
This revision is now accepted and ready to land.Apr 3 2018, 6:11 PM
benno updated this revision to Diff 41051.Apr 3 2018, 8:41 PM

Address results of igor -Dgpxy and mandoc -Tlint.

This revision now requires review to proceed.Apr 3 2018, 8:41 PM
Harbormaster completed remote builds in B15964: Diff 41051.Apr 3 2018, 8:41 PM
sbruno added a subscriber: sbruno.Apr 3 2018, 8:47 PM

Minor man page review.

usr.bin/etdump/etdump.1
41

outputs it *in* various formats.

93

To use the output in a shell script <COMMA> a for loop can be used ....

benno updated this revision to Diff 41053.Apr 3 2018, 8:55 PM

Fix wording.

Harbormaster completed remote builds in B15966: Diff 41053.Apr 3 2018, 8:55 PM
benno marked 2 inline comments as done.Apr 3 2018, 8:55 PM
This revision was not accepted when it landed; it landed in state Needs Review.Apr 3 2018, 9:08 PM
Closed by commit rS331949: Add the etdump utility for dumping El Torito boot catalog information. (authored by benno). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
usr.bin/
1 line
etdump/
14 lines
48 lines
103 lines
268 lines
69 lines
97 lines

Diff 41038

View Options

usr.bin/Makefile

  • This file was added.
/*-
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
*
* Copyright (c) 2020 The FreeBSD Foundation
* All rights reserved.
*
* This software was developed by Konstantin Belousov <kib@FreeBSD.org>
* under sponsorship from the FreeBSD Foundation.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $FreeBSD$
*/
#ifndef _SYS_OBM_H
#define _SYS_OBM_H
/* One-Byte Lock */
#ifdef _KERNEL
#include <sys/systm.h>
#include <sys/_lock.h>
#include <sys/_obm.h>
#include <sys/proc.h>
#include <machine/atomic.h>
void obm_init_lo(struct lock_object *lo, const char *name);
void obm_init(obm_lock_t *obm);
void obm_lock_slow(obm_lock_t *obm, struct lock_object *lo);
void obm_unlock_slow(obm_lock_t *obm, struct lock_object *lo);
markjUnsubmitted
Done
Inline Actions

Did you consider making a structure to wrap the uint8_t lock state, instead of passing a naked uint8_t around?

markj: Did you consider making a structure to wrap the uint8_t lock state, instead of passing a naked…
__used static void
obm_assert_locked(obm_lock_t *obm)
{
#ifdef INVARIANTS
uint8_t v;
v = atomic_load_char(&obm->lk);
MPASS(v == OBM_LOCKED || v == (OBM_LOCKED | OBM_CONTESTED));
markjUnsubmitted
Done
Inline Actions

Are you sure that we have atomic_*_char on all platforms? I do not see it on arm64 for instance, though it does have atomic_*_8. Maybe the latter is a bit more clear anyway.

markj: Are you sure that we have atomic_*_char on all platforms? I do not see it on arm64 for instance…
#endif
}
static inline bool
obm_trylock(obm_lock_t *obm)
{
if (atomic_cmpset_acq_char(&obm->lk, OBM_UNLOCKED, OBM_LOCKED) != 0) {
TD_LOCKS_INC(curthread);
return (true);
}
return (false);
}
static inline void
obm_lock(obm_lock_t *obm, struct lock_object *lo)
{
uint8_t v;
v = OBM_UNLOCKED;
if (__predict_true(atomic_fcmpset_acq_char(&obm->lk, &v, OBM_LOCKED))) {
TD_LOCKS_INC(curthread);
} else {
MPASS(v == OBM_LOCKED || v == (OBM_LOCKED | OBM_CONTESTED) ||
v == OBM_UNLOCKED);
obm_lock_slow(obm, lo);
}
}
static inline void
obm_unlock(obm_lock_t *obm, struct lock_object *lo)
{
uint8_t v;
v = OBM_LOCKED;
if (atomic_fcmpset_rel_char(&obm->lk, &v, OBM_UNLOCKED)) {
TD_LOCKS_DEC(curthread);
} else {
MPASS(v == OBM_LOCKED || v == (OBM_LOCKED | OBM_CONTESTED));
obm_unlock_slow(obm, lo);
}
}
#endif
#endif
View Options

usr.bin/etdump/Makefile

  • This file was added.
/*-
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
*
* Copyright (c) 2020 The FreeBSD Foundation
* All rights reserved.
*
* This software was developed by Konstantin Belousov <kib@FreeBSD.org>
* under sponsorship from the FreeBSD Foundation.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $FreeBSD$
*/
#ifndef _SYS_OBM_H
#define _SYS_OBM_H
/* One-Byte Lock */
#ifdef _KERNEL
#include <sys/systm.h>
#include <sys/_lock.h>
#include <sys/_obm.h>
#include <sys/proc.h>
#include <machine/atomic.h>
void obm_init_lo(struct lock_object *lo, const char *name);
void obm_init(obm_lock_t *obm);
void obm_lock_slow(obm_lock_t *obm, struct lock_object *lo);
void obm_unlock_slow(obm_lock_t *obm, struct lock_object *lo);
markjUnsubmitted
Done
Inline Actions

Did you consider making a structure to wrap the uint8_t lock state, instead of passing a naked uint8_t around?

markj: Did you consider making a structure to wrap the uint8_t lock state, instead of passing a naked…
__used static void
obm_assert_locked(obm_lock_t *obm)
{
#ifdef INVARIANTS
uint8_t v;
v = atomic_load_char(&obm->lk);
MPASS(v == OBM_LOCKED || v == (OBM_LOCKED | OBM_CONTESTED));
markjUnsubmitted
Done
Inline Actions

Are you sure that we have atomic_*_char on all platforms? I do not see it on arm64 for instance, though it does have atomic_*_8. Maybe the latter is a bit more clear anyway.

markj: Are you sure that we have atomic_*_char on all platforms? I do not see it on arm64 for instance…
#endif
}
static inline bool
obm_trylock(obm_lock_t *obm)
{
if (atomic_cmpset_acq_char(&obm->lk, OBM_UNLOCKED, OBM_LOCKED) != 0) {
TD_LOCKS_INC(curthread);
return (true);
}
return (false);
}
static inline void
obm_lock(obm_lock_t *obm, struct lock_object *lo)
{
uint8_t v;
v = OBM_UNLOCKED;
if (__predict_true(atomic_fcmpset_acq_char(&obm->lk, &v, OBM_LOCKED))) {
TD_LOCKS_INC(curthread);
} else {
MPASS(v == OBM_LOCKED || v == (OBM_LOCKED | OBM_CONTESTED) ||
v == OBM_UNLOCKED);
obm_lock_slow(obm, lo);
}
}
static inline void
obm_unlock(obm_lock_t *obm, struct lock_object *lo)
{
uint8_t v;
v = OBM_LOCKED;
if (atomic_fcmpset_rel_char(&obm->lk, &v, OBM_UNLOCKED)) {
TD_LOCKS_DEC(curthread);
} else {
MPASS(v == OBM_LOCKED || v == (OBM_LOCKED | OBM_CONTESTED));
obm_unlock_slow(obm, lo);
}
}
#endif
#endif
View Options

usr.bin/etdump/etdump.h

  • This file was added.
/*-
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
*
* Copyright (c) 2020 The FreeBSD Foundation
* All rights reserved.
*
* This software was developed by Konstantin Belousov <kib@FreeBSD.org>
* under sponsorship from the FreeBSD Foundation.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $FreeBSD$
*/
#ifndef _SYS_OBM_H
#define _SYS_OBM_H
/* One-Byte Lock */
#ifdef _KERNEL
#include <sys/systm.h>
#include <sys/_lock.h>
#include <sys/_obm.h>
#include <sys/proc.h>
#include <machine/atomic.h>
void obm_init_lo(struct lock_object *lo, const char *name);
void obm_init(obm_lock_t *obm);
void obm_lock_slow(obm_lock_t *obm, struct lock_object *lo);
void obm_unlock_slow(obm_lock_t *obm, struct lock_object *lo);
markjUnsubmitted
Done
Inline Actions

Did you consider making a structure to wrap the uint8_t lock state, instead of passing a naked uint8_t around?

markj: Did you consider making a structure to wrap the uint8_t lock state, instead of passing a naked…
__used static void
obm_assert_locked(obm_lock_t *obm)
{
#ifdef INVARIANTS
uint8_t v;
v = atomic_load_char(&obm->lk);
MPASS(v == OBM_LOCKED || v == (OBM_LOCKED | OBM_CONTESTED));
markjUnsubmitted
Done
Inline Actions

Are you sure that we have atomic_*_char on all platforms? I do not see it on arm64 for instance, though it does have atomic_*_8. Maybe the latter is a bit more clear anyway.

markj: Are you sure that we have atomic_*_char on all platforms? I do not see it on arm64 for instance…
#endif
}
static inline bool
obm_trylock(obm_lock_t *obm)
{
if (atomic_cmpset_acq_char(&obm->lk, OBM_UNLOCKED, OBM_LOCKED) != 0) {
TD_LOCKS_INC(curthread);
return (true);
}
return (false);
}
static inline void
obm_lock(obm_lock_t *obm, struct lock_object *lo)
{
uint8_t v;
v = OBM_UNLOCKED;
if (__predict_true(atomic_fcmpset_acq_char(&obm->lk, &v, OBM_LOCKED))) {
TD_LOCKS_INC(curthread);
} else {
MPASS(v == OBM_LOCKED || v == (OBM_LOCKED | OBM_CONTESTED) ||
v == OBM_UNLOCKED);
obm_lock_slow(obm, lo);
}
}
static inline void
obm_unlock(obm_lock_t *obm, struct lock_object *lo)
{
uint8_t v;
v = OBM_LOCKED;
if (atomic_fcmpset_rel_char(&obm->lk, &v, OBM_UNLOCKED)) {
TD_LOCKS_DEC(curthread);
} else {
MPASS(v == OBM_LOCKED || v == (OBM_LOCKED | OBM_CONTESTED));
obm_unlock_slow(obm, lo);
}
}
#endif
#endif
View Options

usr.bin/etdump/etdump.1

  • This file was added.
/*-
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
*
* Copyright (c) 2020 The FreeBSD Foundation
* All rights reserved.
*
* This software was developed by Konstantin Belousov <kib@FreeBSD.org>
* under sponsorship from the FreeBSD Foundation.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $FreeBSD$
*/
#ifndef _SYS_OBM_H
#define _SYS_OBM_H
/* One-Byte Lock */
#ifdef _KERNEL
#include <sys/systm.h>
#include <sys/_lock.h>
#include <sys/_obm.h>
#include <sys/proc.h>
#include <machine/atomic.h>
void obm_init_lo(struct lock_object *lo, const char *name);
void obm_init(obm_lock_t *obm);
void obm_lock_slow(obm_lock_t *obm, struct lock_object *lo);
void obm_unlock_slow(obm_lock_t *obm, struct lock_object *lo);
markjUnsubmitted
Done
Inline Actions

Did you consider making a structure to wrap the uint8_t lock state, instead of passing a naked uint8_t around?

markj: Did you consider making a structure to wrap the uint8_t lock state, instead of passing a naked…
__used static void
obm_assert_locked(obm_lock_t *obm)
{
#ifdef INVARIANTS
uint8_t v;
v = atomic_load_char(&obm->lk);
MPASS(v == OBM_LOCKED || v == (OBM_LOCKED | OBM_CONTESTED));
markjUnsubmitted
Done
Inline Actions

Are you sure that we have atomic_*_char on all platforms? I do not see it on arm64 for instance, though it does have atomic_*_8. Maybe the latter is a bit more clear anyway.

markj: Are you sure that we have atomic_*_char on all platforms? I do not see it on arm64 for instance…
#endif
}
static inline bool
obm_trylock(obm_lock_t *obm)
{
if (atomic_cmpset_acq_char(&obm->lk, OBM_UNLOCKED, OBM_LOCKED) != 0) {
TD_LOCKS_INC(curthread);
return (true);
}
return (false);
}
static inline void
obm_lock(obm_lock_t *obm, struct lock_object *lo)
{
uint8_t v;
v = OBM_UNLOCKED;
if (__predict_true(atomic_fcmpset_acq_char(&obm->lk, &v, OBM_LOCKED))) {
TD_LOCKS_INC(curthread);
} else {
MPASS(v == OBM_LOCKED || v == (OBM_LOCKED | OBM_CONTESTED) ||
v == OBM_UNLOCKED);
obm_lock_slow(obm, lo);
}
}
static inline void
obm_unlock(obm_lock_t *obm, struct lock_object *lo)
{
uint8_t v;
v = OBM_LOCKED;
if (atomic_fcmpset_rel_char(&obm->lk, &v, OBM_UNLOCKED)) {
TD_LOCKS_DEC(curthread);
} else {
MPASS(v == OBM_LOCKED || v == (OBM_LOCKED | OBM_CONTESTED));
obm_unlock_slow(obm, lo);
}
}
#endif
#endif
View Options

usr.bin/etdump/etdump.c

Loading...
View Options

usr.bin/etdump/output_shell.c

Loading...
View Options

usr.bin/etdump/output_text.c

Loading...