Page MenuHomeFreeBSD
Differential D28284

elfctl: allow features to be specified by value
ClosedPublic
Actions

Authored by emaste on Jan 22 2021, 5:25 PM.
Tags
None
Referenced Files
F112723715: D28284.id82735.diff
Fri, Mar 21, 11:27 PM
Unknown Object (File)
Wed, Mar 19, 5:00 AM
Unknown Object (File)
Tue, Mar 18, 2:39 PM
Unknown Object (File)
Mon, Mar 17, 7:31 AM
Unknown Object (File)
Tue, Feb 25, 7:21 AM
Unknown Object (File)
Feb 19 2025, 9:29 PM
Unknown Object (File)
Feb 19 2025, 9:25 PM
Unknown Object (File)
Feb 18 2025, 11:35 PM
View All 84 Files
Subscribers
gbe

Details

Reviewers
kib
markj
Commits
rGf2b5999b2166: elfctl: allow features to be specified by value
rGd7e23b5cdd84: elfctl: allow features to be specified by value
rG86f33b5fcf60: elfctl: allow features to be specified by value
Summary

This will allow elfctl on older releases to set bits that are not yet known there, so that the binary will have the correct settings applied if run on a later FreeBSD version.

Suggested by: kib
Sponsored by: The FreeBSD Foundation

Diff Detail

Lint
Lint Skipped
Unit
Tests Skipped

Event Timeline

emaste requested review of this revision.Jan 22 2021, 5:25 PM
emaste created this revision.
gbe added a subscriber: gbe.Jan 22 2021, 5:47 PM

LGTM from manpages

kib added inline comments.Jan 22 2021, 6:53 PM
usr.bin/elfctl/elfctl.c
264

Do you want to check that only single bit is set in the val?

emaste added inline comments.Jan 22 2021, 6:55 PM
usr.bin/elfctl/elfctl.c
264

I didn't do that semi-intentionally, so that you could use e.g. elfctl -e =0x81.

emaste updated this revision to Diff 82733.Jan 22 2021, 6:58 PM

Add example of combining numerical values to man page

kib accepted this revision.Jan 22 2021, 7:25 PM
This revision is now accepted and ready to land.Jan 22 2021, 7:25 PM
Closed by commit rG86f33b5fcf60: elfctl: allow features to be specified by value (authored by emaste). · Explain WhyJan 22 2021, 7:41 PM
This revision was automatically updated to reflect the committed changes.
emaste added a commit: rG86f33b5fcf60: elfctl: allow features to be specified by value.
emaste added a commit: rGd7e23b5cdd84: elfctl: allow features to be specified by value.Jan 26 2021, 2:48 PM
emaste added a commit: rGf2b5999b2166: elfctl: allow features to be specified by value.Jan 27 2021, 12:26 AM

Revision Contents
Changeset List

PathSize
usr.bin/
elfctl/
15 lines
25 lines

Diff 82733

View Options

usr.bin/elfctl/elfctl.1

Show First 20 Lines • Show All 102 Lines • ▼ Show 20 Linesstruct msdosfsmount {
u_long pm_fatblocksec; /* size of FAT blocks in sectors */ u_long pm_fatblocksec; /* size of FAT blocks in sectors */
u_long pm_fatsize; /* size of FAT in bytes */ u_long pm_fatsize; /* size of FAT in bytes */
uint32_t pm_fatmask; /* mask to use for FAT numbers */ uint32_t pm_fatmask; /* mask to use for FAT numbers */
u_long pm_fsinfo; /* fsinfo block number */ u_long pm_fsinfo; /* fsinfo block number */
u_long pm_nxtfree; /* next place to search for a free cluster */ u_long pm_nxtfree; /* next place to search for a free cluster */
u_int pm_fatmult; /* these 2 values are used in FAT */ u_int pm_fatmult; /* these 2 values are used in FAT */
u_int pm_fatdiv; /* offset computation */ u_int pm_fatdiv; /* offset computation */
u_int pm_curfat; /* current FAT for FAT32 (0 otherwise) */ u_int pm_curfat; /* current FAT for FAT32 (0 otherwise) */
int pm_rootdirfree; /* number of free slots in FAT12/16 root directory */
u_int *pm_inusemap; /* ptr to bitmap of in-use clusters */ u_int *pm_inusemap; /* ptr to bitmap of in-use clusters */
uint64_t pm_flags; /* see below */ uint64_t pm_flags; /* see below */
void *pm_u2w; /* Local->Unicode iconv handle */ void *pm_u2w; /* Local->Unicode iconv handle */
void *pm_w2u; /* Unicode->Local iconv handle */ void *pm_w2u; /* Unicode->Local iconv handle */
void *pm_u2d; /* Unicode->DOS iconv handle */ void *pm_u2d; /* Unicode->DOS iconv handle */
void *pm_d2u; /* DOS->Local iconv handle */ void *pm_d2u; /* DOS->Local iconv handle */
#ifndef MAKEFS #ifndef MAKEFS
seAuthorUnsubmitted
Done
Inline Actions

This could also be an int or u:_int. The acceptable range is 0..65535.

se: This could also be an int or u:_int. The acceptable range is 0..65535.
seAuthorUnsubmitted
Done
Inline Actions

The type of pm_rootdirfree should be int to allow -1 to be returned as an error indicator.

se: The type of pm_rootdirfree should be int to allow -1 to be returned as an error indicator.
struct lock pm_fatlock; /* lockmgr protecting allocations */ struct lock pm_fatlock; /* lockmgr protecting allocations */
struct lock pm_checkpath_lock; /* protects doscheckpath result */ struct lock pm_checkpath_lock; /* protects doscheckpath result */
struct task pm_rw2ro_task; /* context for emergency remount ro */ struct task pm_rw2ro_task; /* context for emergency remount ro */
#endif #endif
}; };
/* /*
* A 64-bit file number and the 32-bit file number to which it is mapped, * A 64-bit file number and the 32-bit file number to which it is mapped,
▲ Show 20 Lines • Show All 90 Lines • ▼ Show 20 Lines
/* /*
* Calculate block number for directory entry at cluster dirclu, offset * Calculate block number for directory entry at cluster dirclu, offset
* dirofs * dirofs
*/ */
#define detobn(pmp, dirclu, dirofs) \ #define detobn(pmp, dirclu, dirofs) \
((dirclu) == MSDOSFSROOT \ ((dirclu) == MSDOSFSROOT \
? roottobn((pmp), (dirofs)) \ ? roottobn((pmp), (dirofs)) \
: cntobn((pmp), (dirclu))) : cntobn((pmp), (dirclu)))
/*
seAuthorUnsubmitted
Done
Inline Actions

The comment is wrong and applies to a prior version of the patch: the number of free entries is counted (here and in the macro below),

se: The comment is wrong and applies to a prior version of the patch: the number of free entries is…
seAuthorUnsubmitted
Done
Inline Actions

The comment needs to be fixed - has been forgotten when I prepared the latest patch.

se: The comment needs to be fixed - has been forgotten when I prepared the latest patch.
* Increment the number of used entries in a fixed size FAT12/16 root
* directory
*/
#define rootde_alloced(dep) \
if ((dep)->de_StartCluster == MSDOSFSROOT) \
(dep)->de_pmp->pm_rootdirfree--;
/*
* Decrement the number of used entries in a fixed size FAT12/16 root
* directory
*/
#define rootde_freed(dep) \
if ((dep)->de_StartCluster == MSDOSFSROOT) \
(dep)->de_pmp->pm_rootdirfree++;
#define MSDOSFS_LOCK_MP(pmp) \ #define MSDOSFS_LOCK_MP(pmp) \
lockmgr(&(pmp)->pm_fatlock, LK_EXCLUSIVE, NULL) lockmgr(&(pmp)->pm_fatlock, LK_EXCLUSIVE, NULL)
#define MSDOSFS_UNLOCK_MP(pmp) \ #define MSDOSFS_UNLOCK_MP(pmp) \
lockmgr(&(pmp)->pm_fatlock, LK_RELEASE, NULL) lockmgr(&(pmp)->pm_fatlock, LK_RELEASE, NULL)
#define MSDOSFS_ASSERT_MP_LOCKED(pmp) \ #define MSDOSFS_ASSERT_MP_LOCKED(pmp) \
lockmgr_assert(&(pmp)->pm_fatlock, KA_XLOCKED) lockmgr_assert(&(pmp)->pm_fatlock, KA_XLOCKED)
▲ Show 20 Lines • Show All 44 Lines • Show Last 20 Lines
View Options

usr.bin/elfctl/elfctl.c

Show First 20 Lines • Show All 102 Lines • ▼ Show 20 Linesstruct msdosfsmount {
u_long pm_fatblocksec; /* size of FAT blocks in sectors */ u_long pm_fatblocksec; /* size of FAT blocks in sectors */
u_long pm_fatsize; /* size of FAT in bytes */ u_long pm_fatsize; /* size of FAT in bytes */
uint32_t pm_fatmask; /* mask to use for FAT numbers */ uint32_t pm_fatmask; /* mask to use for FAT numbers */
u_long pm_fsinfo; /* fsinfo block number */ u_long pm_fsinfo; /* fsinfo block number */
u_long pm_nxtfree; /* next place to search for a free cluster */ u_long pm_nxtfree; /* next place to search for a free cluster */
u_int pm_fatmult; /* these 2 values are used in FAT */ u_int pm_fatmult; /* these 2 values are used in FAT */
u_int pm_fatdiv; /* offset computation */ u_int pm_fatdiv; /* offset computation */
u_int pm_curfat; /* current FAT for FAT32 (0 otherwise) */ u_int pm_curfat; /* current FAT for FAT32 (0 otherwise) */
int pm_rootdirfree; /* number of free slots in FAT12/16 root directory */
u_int *pm_inusemap; /* ptr to bitmap of in-use clusters */ u_int *pm_inusemap; /* ptr to bitmap of in-use clusters */
uint64_t pm_flags; /* see below */ uint64_t pm_flags; /* see below */
void *pm_u2w; /* Local->Unicode iconv handle */ void *pm_u2w; /* Local->Unicode iconv handle */
void *pm_w2u; /* Unicode->Local iconv handle */ void *pm_w2u; /* Unicode->Local iconv handle */
void *pm_u2d; /* Unicode->DOS iconv handle */ void *pm_u2d; /* Unicode->DOS iconv handle */
void *pm_d2u; /* DOS->Local iconv handle */ void *pm_d2u; /* DOS->Local iconv handle */
#ifndef MAKEFS #ifndef MAKEFS
seAuthorUnsubmitted
Done
Inline Actions

This could also be an int or u:_int. The acceptable range is 0..65535.

se: This could also be an int or u:_int. The acceptable range is 0..65535.
seAuthorUnsubmitted
Done
Inline Actions

The type of pm_rootdirfree should be int to allow -1 to be returned as an error indicator.

se: The type of pm_rootdirfree should be int to allow -1 to be returned as an error indicator.
struct lock pm_fatlock; /* lockmgr protecting allocations */ struct lock pm_fatlock; /* lockmgr protecting allocations */
struct lock pm_checkpath_lock; /* protects doscheckpath result */ struct lock pm_checkpath_lock; /* protects doscheckpath result */
struct task pm_rw2ro_task; /* context for emergency remount ro */ struct task pm_rw2ro_task; /* context for emergency remount ro */
#endif #endif
}; };
/* /*
* A 64-bit file number and the 32-bit file number to which it is mapped, * A 64-bit file number and the 32-bit file number to which it is mapped,
▲ Show 20 Lines • Show All 90 Lines • ▼ Show 20 Lines
/* /*
* Calculate block number for directory entry at cluster dirclu, offset * Calculate block number for directory entry at cluster dirclu, offset
* dirofs * dirofs
*/ */
#define detobn(pmp, dirclu, dirofs) \ #define detobn(pmp, dirclu, dirofs) \
((dirclu) == MSDOSFSROOT \ ((dirclu) == MSDOSFSROOT \
? roottobn((pmp), (dirofs)) \ ? roottobn((pmp), (dirofs)) \
: cntobn((pmp), (dirclu))) : cntobn((pmp), (dirclu)))
/*
seAuthorUnsubmitted
Done
Inline Actions

The comment is wrong and applies to a prior version of the patch: the number of free entries is counted (here and in the macro below),

se: The comment is wrong and applies to a prior version of the patch: the number of free entries is…
seAuthorUnsubmitted
Done
Inline Actions

The comment needs to be fixed - has been forgotten when I prepared the latest patch.

se: The comment needs to be fixed - has been forgotten when I prepared the latest patch.
* Increment the number of used entries in a fixed size FAT12/16 root
* directory
*/
#define rootde_alloced(dep) \
if ((dep)->de_StartCluster == MSDOSFSROOT) \
(dep)->de_pmp->pm_rootdirfree--;
/*
* Decrement the number of used entries in a fixed size FAT12/16 root
* directory
*/
#define rootde_freed(dep) \
if ((dep)->de_StartCluster == MSDOSFSROOT) \
(dep)->de_pmp->pm_rootdirfree++;
#define MSDOSFS_LOCK_MP(pmp) \ #define MSDOSFS_LOCK_MP(pmp) \
lockmgr(&(pmp)->pm_fatlock, LK_EXCLUSIVE, NULL) lockmgr(&(pmp)->pm_fatlock, LK_EXCLUSIVE, NULL)
#define MSDOSFS_UNLOCK_MP(pmp) \ #define MSDOSFS_UNLOCK_MP(pmp) \
lockmgr(&(pmp)->pm_fatlock, LK_RELEASE, NULL) lockmgr(&(pmp)->pm_fatlock, LK_RELEASE, NULL)
#define MSDOSFS_ASSERT_MP_LOCKED(pmp) \ #define MSDOSFS_ASSERT_MP_LOCKED(pmp) \
lockmgr_assert(&(pmp)->pm_fatlock, KA_XLOCKED) lockmgr_assert(&(pmp)->pm_fatlock, KA_XLOCKED)
▲ Show 20 Lines • Show All 44 Lines • Show Last 20 Lines