Page MenuHomeFreeBSD
Differential D22738

vfs: flatten vop vectors
ClosedPublic
Actions

Authored by mjg on Dec 9 2019, 7:41 PM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Apr 7, 1:36 PM
Unknown Object (File)
Thu, Mar 20, 3:05 AM
Unknown Object (File)
Mar 13 2025, 9:55 AM
Unknown Object (File)
Feb 27 2025, 1:57 AM
Unknown Object (File)
Feb 22 2025, 2:16 AM
Unknown Object (File)
Feb 20 2025, 2:31 PM
Unknown Object (File)
Feb 18 2025, 9:01 PM
Unknown Object (File)
Feb 17 2025, 10:44 PM
View All 87 Files
Subscribers
asomers
delphij
imp

Details

Reviewers
jeff
kib
Commits
rS355790: vfs: flatten vop vectors
Summary

This eliminates the following loop from all VOP calls:

while(vop != NULL && \
    vop->vop_spare2 == NULL && vop->vop_bypass == NULL)
        vop = vop->vop_default;
Test Plan

will ask pho

Diff Detail

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

Event Timeline

mjg created this revision.Dec 9 2019, 7:41 PM
Herald added subscribers: asomers, delphij, imp. · View Herald TranscriptDec 9 2019, 7:41 PM
Harbormaster completed remote builds in B28046: Diff 65436.Dec 9 2019, 7:41 PM
mjg retitled this revision from vfs: flatten vector ops to vfs: flatten vop vectors.Dec 9 2019, 7:41 PM
kib added inline comments.Dec 10 2019, 9:02 PM
sys/kern/vfs_default.c
149

Why do you need to 'register' this vector ?

sys/tools/vnode_if.awk
453

Do you really need this boolean ? Why not e.g. NULLify vop_default instead ? (I checked that e.g. nullfs does not use vop_default in obvious ways)

sys/ufs/ufs/ufs_vnops.c
2805

I would think that ufs vectors also do not need flattening.

mjg added inline comments.Dec 10 2019, 9:09 PM
sys/kern/vfs_default.c
149

For consistency with the rest. It's of no consequence for this one right now modulo surviving getnewvnode should somene pass it directly.

sys/tools/vnode_if.awk
453

I wanted to do it but vop_sigdefer walks the list and I did not want to interfere with that.

sys/ufs/ufs/ufs_vnops.c
2805

The current code is flattening stuff but I purposefully went for a more generic name to allow for whatever other stuff be useful to do in the future. If anything it is a little weird legally usable vector ops are not known upfront.

mjg updated this revision to Diff 65530.Dec 12 2019, 2:54 AM
  • pull up vop_bypass the same way
Harbormaster completed remote builds in B28094: Diff 65530.Dec 12 2019, 2:54 AM
mjg added a comment.Dec 14 2019, 9:25 PM

pho tesetd the change, no issues

jeff accepted this revision.Dec 15 2019, 11:41 PM
This revision is now accepted and ready to land.Dec 15 2019, 11:41 PM
mjg closed this revision.Dec 16 2019, 12:11 AM

https://svnweb.freebsd.org/base?view=revision&revision=355790

mjg added a commit: rS355790: vfs: flatten vop vectors.Jun 17 2020, 5:21 AM

Revision Contents
Changeset List

PathSize
sys/
cddl/
contrib/
opensolaris/
uts/
common/
fs/
zfs/
3 lines
3 lines
fs/
autofs/
1 line
cd9660/
2 lines
deadfs/
1 line
devfs/
2 lines
ext2fs/
2 lines
fdescfs/
1 line
fifofs/
1 line
fuse/
2 lines
msdosfs/
1 line
nfsclient/
4 lines
nullfs/
1 line
pseudofs/
1 line
smbfs/
1 line
tmpfs/
1 line
2 lines
udf/
2 lines
unionfs/
1 line
kern/
1 line
1 line
5 lines
5 lines
sys/
8 lines
tools/
43 lines
ufs/
ffs/
4 lines
ufs/
2 lines

Diff 65530

View Options

sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c

Show First 20 Lines • Show All 45 Lines • ▼ Show 20 Lines
#include "rtld.h" #include "rtld.h"
#ifdef __mips_n64 #ifdef __mips_n64
#define GOT1_MASK 0x8000000000000000UL #define GOT1_MASK 0x8000000000000000UL
#else #else
#define GOT1_MASK 0x80000000UL #define GOT1_MASK 0x80000000UL
#endif #endif
/*
* Determine if the second GOT entry is reserved for rtld or if it is
* the first "real" GOT entry.
*
* This must be a macro rather than a function so that
* _rtld_relocate_nonplt_self doesn't trigger a GOT invocation trying
* to use it before the local GOT entries in rtld are adjusted.
*/
#ifdef __mips_n64
/* Old binutils uses the 32-bit GOT1 mask value for N64. */
#define GOT1_RESERVED_FOR_RTLD(got) \
(((got)[1] == 0x80000000) || (got)[1] & GOT1_MASK)
#else
#define GOT1_RESERVED_FOR_RTLD(got) ((got)[1] & GOT1_MASK)
#endif
void void
init_pltgot(Obj_Entry *obj) init_pltgot(Obj_Entry *obj)
{ {
if (obj->pltgot != NULL) { if (obj->pltgot != NULL) {
obj->pltgot[0] = (Elf_Addr) &_rtld_bind_start; obj->pltgot[0] = (Elf_Addr) &_rtld_bind_start;
if (obj->pltgot[1] & 0x80000000) if (GOT1_RESERVED_FOR_RTLD(obj->pltgot))
obj->pltgot[1] = (Elf_Addr) obj | GOT1_MASK; obj->pltgot[1] = (Elf_Addr) obj | GOT1_MASK;
} }
} }
int int
do_copy_relocations(Obj_Entry *dstobj) do_copy_relocations(Obj_Entry *dstobj)
{ {
/* Do nothing */ /* Do nothing */
▲ Show 20 Lines • Show All 102 Lines • ▼ Show 20 Lines case DT_MIPS_SYMTABNO:
symtabno = dynp->d_un.d_val; symtabno = dynp->d_un.d_val;
break; break;
case DT_MIPS_GOTSYM: case DT_MIPS_GOTSYM:
gotsym = dynp->d_un.d_val; gotsym = dynp->d_un.d_val;
break; break;
} }
} }
i = (got[1] & GOT1_MASK) ? 2 : 1; i = GOT1_RESERVED_FOR_RTLD(got) ? 2 : 1;
/* Relocate the local GOT entries */ /* Relocate the local GOT entries */
got += i; got += i;
for (; i < local_gotno; i++) { for (; i < local_gotno; i++) {
*got++ += relocbase; *got++ += relocbase;
} }
sym = symtab + gotsym; sym = symtab + gotsym;
/* Now do the global GOT entries */ /* Now do the global GOT entries */
▲ Show 20 Lines • Show All 102 Lines • ▼ Show 20 Lines#ifdef SUPPORT_OLD_BROKEN_LD
broken = 0; broken = 0;
sym = obj->symtab; sym = obj->symtab;
for (i = 1; i < 12; i++) for (i = 1; i < 12; i++)
if (sym[i].st_info == ELF_ST_INFO(STB_LOCAL, STT_NOTYPE)) if (sym[i].st_info == ELF_ST_INFO(STB_LOCAL, STT_NOTYPE))
broken = 1; broken = 1;
dbg("%s: broken=%d", obj->path, broken); dbg("%s: broken=%d", obj->path, broken);
#endif #endif
i = (got[1] & GOT1_MASK) ? 2 : 1; i = GOT1_RESERVED_FOR_RTLD(got) ? 2 : 1;
/* Relocate the local GOT entries */ /* Relocate the local GOT entries */
got += i; got += i;
dbg("got:%p for %d entries adding %p", dbg("got:%p for %d entries adding %p",
got, obj->local_gotno, obj->relocbase); got, obj->local_gotno, obj->relocbase);
for (; i < obj->local_gotno; i++) { for (; i < obj->local_gotno; i++) {
*got += (Elf_Addr)obj->relocbase; *got += (Elf_Addr)obj->relocbase;
got++; got++;
▲ Show 20 Lines • Show All 408 Lines • Show Last 20 Lines
View Options

sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c

Show First 20 Lines • Show All 45 Lines • ▼ Show 20 Lines
#include "rtld.h" #include "rtld.h"
#ifdef __mips_n64 #ifdef __mips_n64
#define GOT1_MASK 0x8000000000000000UL #define GOT1_MASK 0x8000000000000000UL
#else #else
#define GOT1_MASK 0x80000000UL #define GOT1_MASK 0x80000000UL
#endif #endif
/*
* Determine if the second GOT entry is reserved for rtld or if it is
* the first "real" GOT entry.
*
* This must be a macro rather than a function so that
* _rtld_relocate_nonplt_self doesn't trigger a GOT invocation trying
* to use it before the local GOT entries in rtld are adjusted.
*/
#ifdef __mips_n64
/* Old binutils uses the 32-bit GOT1 mask value for N64. */
#define GOT1_RESERVED_FOR_RTLD(got) \
(((got)[1] == 0x80000000) || (got)[1] & GOT1_MASK)
#else
#define GOT1_RESERVED_FOR_RTLD(got) ((got)[1] & GOT1_MASK)
#endif
void void
init_pltgot(Obj_Entry *obj) init_pltgot(Obj_Entry *obj)
{ {
if (obj->pltgot != NULL) { if (obj->pltgot != NULL) {
obj->pltgot[0] = (Elf_Addr) &_rtld_bind_start; obj->pltgot[0] = (Elf_Addr) &_rtld_bind_start;
if (obj->pltgot[1] & 0x80000000) if (GOT1_RESERVED_FOR_RTLD(obj->pltgot))
obj->pltgot[1] = (Elf_Addr) obj | GOT1_MASK; obj->pltgot[1] = (Elf_Addr) obj | GOT1_MASK;
} }
} }
int int
do_copy_relocations(Obj_Entry *dstobj) do_copy_relocations(Obj_Entry *dstobj)
{ {
/* Do nothing */ /* Do nothing */
▲ Show 20 Lines • Show All 102 Lines • ▼ Show 20 Lines case DT_MIPS_SYMTABNO:
symtabno = dynp->d_un.d_val; symtabno = dynp->d_un.d_val;
break; break;
case DT_MIPS_GOTSYM: case DT_MIPS_GOTSYM:
gotsym = dynp->d_un.d_val; gotsym = dynp->d_un.d_val;
break; break;
} }
} }
i = (got[1] & GOT1_MASK) ? 2 : 1; i = GOT1_RESERVED_FOR_RTLD(got) ? 2 : 1;
/* Relocate the local GOT entries */ /* Relocate the local GOT entries */
got += i; got += i;
for (; i < local_gotno; i++) { for (; i < local_gotno; i++) {
*got++ += relocbase; *got++ += relocbase;
} }
sym = symtab + gotsym; sym = symtab + gotsym;
/* Now do the global GOT entries */ /* Now do the global GOT entries */
▲ Show 20 Lines • Show All 102 Lines • ▼ Show 20 Lines#ifdef SUPPORT_OLD_BROKEN_LD
broken = 0; broken = 0;
sym = obj->symtab; sym = obj->symtab;
for (i = 1; i < 12; i++) for (i = 1; i < 12; i++)
if (sym[i].st_info == ELF_ST_INFO(STB_LOCAL, STT_NOTYPE)) if (sym[i].st_info == ELF_ST_INFO(STB_LOCAL, STT_NOTYPE))
broken = 1; broken = 1;
dbg("%s: broken=%d", obj->path, broken); dbg("%s: broken=%d", obj->path, broken);
#endif #endif
i = (got[1] & GOT1_MASK) ? 2 : 1; i = GOT1_RESERVED_FOR_RTLD(got) ? 2 : 1;
/* Relocate the local GOT entries */ /* Relocate the local GOT entries */
got += i; got += i;
dbg("got:%p for %d entries adding %p", dbg("got:%p for %d entries adding %p",
got, obj->local_gotno, obj->relocbase); got, obj->local_gotno, obj->relocbase);
for (; i < obj->local_gotno; i++) { for (; i < obj->local_gotno; i++) {
*got += (Elf_Addr)obj->relocbase; *got += (Elf_Addr)obj->relocbase;
got++; got++;
▲ Show 20 Lines • Show All 408 Lines • Show Last 20 Lines
View Options

sys/fs/autofs/autofs_vnops.c

Show First 20 Lines • Show All 45 Lines • ▼ Show 20 Lines
#include "rtld.h" #include "rtld.h"
#ifdef __mips_n64 #ifdef __mips_n64
#define GOT1_MASK 0x8000000000000000UL #define GOT1_MASK 0x8000000000000000UL
#else #else
#define GOT1_MASK 0x80000000UL #define GOT1_MASK 0x80000000UL
#endif #endif
/*
* Determine if the second GOT entry is reserved for rtld or if it is
* the first "real" GOT entry.
*
* This must be a macro rather than a function so that
* _rtld_relocate_nonplt_self doesn't trigger a GOT invocation trying
* to use it before the local GOT entries in rtld are adjusted.
*/
#ifdef __mips_n64
/* Old binutils uses the 32-bit GOT1 mask value for N64. */
#define GOT1_RESERVED_FOR_RTLD(got) \
(((got)[1] == 0x80000000) || (got)[1] & GOT1_MASK)
#else
#define GOT1_RESERVED_FOR_RTLD(got) ((got)[1] & GOT1_MASK)
#endif
void void
init_pltgot(Obj_Entry *obj) init_pltgot(Obj_Entry *obj)
{ {
if (obj->pltgot != NULL) { if (obj->pltgot != NULL) {
obj->pltgot[0] = (Elf_Addr) &_rtld_bind_start; obj->pltgot[0] = (Elf_Addr) &_rtld_bind_start;
if (obj->pltgot[1] & 0x80000000) if (GOT1_RESERVED_FOR_RTLD(obj->pltgot))
obj->pltgot[1] = (Elf_Addr) obj | GOT1_MASK; obj->pltgot[1] = (Elf_Addr) obj | GOT1_MASK;
} }
} }
int int
do_copy_relocations(Obj_Entry *dstobj) do_copy_relocations(Obj_Entry *dstobj)
{ {
/* Do nothing */ /* Do nothing */
▲ Show 20 Lines • Show All 102 Lines • ▼ Show 20 Lines case DT_MIPS_SYMTABNO:
symtabno = dynp->d_un.d_val; symtabno = dynp->d_un.d_val;
break; break;
case DT_MIPS_GOTSYM: case DT_MIPS_GOTSYM:
gotsym = dynp->d_un.d_val; gotsym = dynp->d_un.d_val;
break; break;
} }
} }
i = (got[1] & GOT1_MASK) ? 2 : 1; i = GOT1_RESERVED_FOR_RTLD(got) ? 2 : 1;
/* Relocate the local GOT entries */ /* Relocate the local GOT entries */
got += i; got += i;
for (; i < local_gotno; i++) { for (; i < local_gotno; i++) {
*got++ += relocbase; *got++ += relocbase;
} }
sym = symtab + gotsym; sym = symtab + gotsym;
/* Now do the global GOT entries */ /* Now do the global GOT entries */
▲ Show 20 Lines • Show All 102 Lines • ▼ Show 20 Lines#ifdef SUPPORT_OLD_BROKEN_LD
broken = 0; broken = 0;
sym = obj->symtab; sym = obj->symtab;
for (i = 1; i < 12; i++) for (i = 1; i < 12; i++)
if (sym[i].st_info == ELF_ST_INFO(STB_LOCAL, STT_NOTYPE)) if (sym[i].st_info == ELF_ST_INFO(STB_LOCAL, STT_NOTYPE))
broken = 1; broken = 1;
dbg("%s: broken=%d", obj->path, broken); dbg("%s: broken=%d", obj->path, broken);
#endif #endif
i = (got[1] & GOT1_MASK) ? 2 : 1; i = GOT1_RESERVED_FOR_RTLD(got) ? 2 : 1;
/* Relocate the local GOT entries */ /* Relocate the local GOT entries */
got += i; got += i;
dbg("got:%p for %d entries adding %p", dbg("got:%p for %d entries adding %p",
got, obj->local_gotno, obj->relocbase); got, obj->local_gotno, obj->relocbase);
for (; i < obj->local_gotno; i++) { for (; i < obj->local_gotno; i++) {
*got += (Elf_Addr)obj->relocbase; *got += (Elf_Addr)obj->relocbase;
got++; got++;
▲ Show 20 Lines • Show All 408 Lines • Show Last 20 Lines
View Options

sys/fs/cd9660/cd9660_vnops.c

Show First 20 Lines • Show All 45 Lines • ▼ Show 20 Lines
#include "rtld.h" #include "rtld.h"
#ifdef __mips_n64 #ifdef __mips_n64
#define GOT1_MASK 0x8000000000000000UL #define GOT1_MASK 0x8000000000000000UL
#else #else
#define GOT1_MASK 0x80000000UL #define GOT1_MASK 0x80000000UL
#endif #endif
/*
* Determine if the second GOT entry is reserved for rtld or if it is
* the first "real" GOT entry.
*
* This must be a macro rather than a function so that
* _rtld_relocate_nonplt_self doesn't trigger a GOT invocation trying
* to use it before the local GOT entries in rtld are adjusted.
*/
#ifdef __mips_n64
/* Old binutils uses the 32-bit GOT1 mask value for N64. */
#define GOT1_RESERVED_FOR_RTLD(got) \
(((got)[1] == 0x80000000) || (got)[1] & GOT1_MASK)
#else
#define GOT1_RESERVED_FOR_RTLD(got) ((got)[1] & GOT1_MASK)
#endif
void void
init_pltgot(Obj_Entry *obj) init_pltgot(Obj_Entry *obj)
{ {
if (obj->pltgot != NULL) { if (obj->pltgot != NULL) {
obj->pltgot[0] = (Elf_Addr) &_rtld_bind_start; obj->pltgot[0] = (Elf_Addr) &_rtld_bind_start;
if (obj->pltgot[1] & 0x80000000) if (GOT1_RESERVED_FOR_RTLD(obj->pltgot))
obj->pltgot[1] = (Elf_Addr) obj | GOT1_MASK; obj->pltgot[1] = (Elf_Addr) obj | GOT1_MASK;
} }
} }
int int
do_copy_relocations(Obj_Entry *dstobj) do_copy_relocations(Obj_Entry *dstobj)
{ {
/* Do nothing */ /* Do nothing */
▲ Show 20 Lines • Show All 102 Lines • ▼ Show 20 Lines case DT_MIPS_SYMTABNO:
symtabno = dynp->d_un.d_val; symtabno = dynp->d_un.d_val;
break; break;
case DT_MIPS_GOTSYM: case DT_MIPS_GOTSYM:
gotsym = dynp->d_un.d_val; gotsym = dynp->d_un.d_val;
break; break;
} }
} }
i = (got[1] & GOT1_MASK) ? 2 : 1; i = GOT1_RESERVED_FOR_RTLD(got) ? 2 : 1;
/* Relocate the local GOT entries */ /* Relocate the local GOT entries */
got += i; got += i;
for (; i < local_gotno; i++) { for (; i < local_gotno; i++) {
*got++ += relocbase; *got++ += relocbase;
} }
sym = symtab + gotsym; sym = symtab + gotsym;
/* Now do the global GOT entries */ /* Now do the global GOT entries */
▲ Show 20 Lines • Show All 102 Lines • ▼ Show 20 Lines#ifdef SUPPORT_OLD_BROKEN_LD
broken = 0; broken = 0;
sym = obj->symtab; sym = obj->symtab;
for (i = 1; i < 12; i++) for (i = 1; i < 12; i++)
if (sym[i].st_info == ELF_ST_INFO(STB_LOCAL, STT_NOTYPE)) if (sym[i].st_info == ELF_ST_INFO(STB_LOCAL, STT_NOTYPE))
broken = 1; broken = 1;
dbg("%s: broken=%d", obj->path, broken); dbg("%s: broken=%d", obj->path, broken);
#endif #endif
i = (got[1] & GOT1_MASK) ? 2 : 1; i = GOT1_RESERVED_FOR_RTLD(got) ? 2 : 1;
/* Relocate the local GOT entries */ /* Relocate the local GOT entries */
got += i; got += i;
dbg("got:%p for %d entries adding %p", dbg("got:%p for %d entries adding %p",
got, obj->local_gotno, obj->relocbase); got, obj->local_gotno, obj->relocbase);
for (; i < obj->local_gotno; i++) { for (; i < obj->local_gotno; i++) {
*got += (Elf_Addr)obj->relocbase; *got += (Elf_Addr)obj->relocbase;
got++; got++;
▲ Show 20 Lines • Show All 408 Lines • Show Last 20 Lines
View Options

sys/fs/deadfs/dead_vnops.c

Loading...
View Options

sys/fs/devfs/devfs_vnops.c

Loading...
View Options

sys/fs/ext2fs/ext2_vnops.c

Loading...
View Options

sys/fs/fdescfs/fdesc_vnops.c

Loading...
View Options

sys/fs/fifofs/fifo_vnops.c

Loading...
View Options

sys/fs/fuse/fuse_vnops.c

Loading...
View Options

sys/fs/msdosfs/msdosfs_vnops.c

Loading...
View Options

sys/fs/nfsclient/nfs_clvnops.c

Loading...
View Options

sys/fs/nullfs/null_vnops.c

Loading...
View Options

sys/fs/pseudofs/pseudofs_vnops.c

Loading...
View Options

sys/fs/smbfs/smbfs_vnops.c

Loading...
View Options

sys/fs/tmpfs/tmpfs_fifoops.c

Loading...
View Options

sys/fs/tmpfs/tmpfs_vnops.c

Loading...
View Options

sys/fs/udf/udf_vnops.c

Loading...
View Options

sys/fs/unionfs/union_vnops.c

Loading...
View Options

sys/kern/uipc_mqueue.c

Loading...
View Options

sys/kern/vfs_default.c

Loading...
View Options

sys/kern/vfs_lookup.c

Loading...
View Options

sys/kern/vfs_subr.c

Loading...
View Options

sys/sys/vnode.h

Loading...
View Options

sys/tools/vnode_if.awk

Loading...
View Options

sys/ufs/ffs/ffs_vnops.c

Loading...
View Options

sys/ufs/ufs/ufs_vnops.c

Loading...