Details

Reviewers

kib
alc

Group Reviewers

manpages

Commits

rS283624: Export a list of VM objects in the system via a sysctl. The list can be

Summary

Export a list of VM objects in the system via a sysctl. The list
can be examined via 'vmstat -o'. It can be used to determine which
files are using physical pages of memory and how much each is using.

This is a port of the vm_objects kld/program I have had at
www.freebsd.org/~jhb/vm_object/ to the base system.

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

No Lint Coverage

Unit

No Test Coverage

Event Timeline

jhb updated this revision to Diff 4784.Apr 10 2015, 8:22 PM

jhb retitled this revision from to Export a list of VM objects via a sysctl..

jhb updated this object.

jhb edited the test plan for this revision. (Show Details)

jhb added reviewers: kib, alc.

Herald added a subscriber: imp. · View Herald TranscriptApr 10 2015, 8:22 PM

I don't know why arc thinks that I copied those two manpages on top of each other. I just added the new page as a new file in git.

kib added inline comments.Apr 11 2015, 6:54 AM

lib/libutil/kinfo_getvmobject.c
51	Allocate 2*len in advance ?
sys/sys/user.h
498	Probably it makes sense to change all residency counters to uint64 in advance, not waiting for vm_object to update the types. It is already can be overflowed, with the machines at the affordable price.
503	NumbeR
504	Add both int32 and int64 for spares, please. Making int64 from int spares in MI way is too complicated.
sys/vm/vm_object.c
2322	Note that the loop in vm_meter.c:vmtotal() only does trylock under vm_object_list_mtx. I am not sure why, this might be a fossil. Still, I think that a OBJT_DEAD sentinel is a better way to remember the current position in the list.
2329	This empty line does not make sense.
2377	Why MGTDEVICE is excluded ?

jhb added inline comments.Apr 13 2015, 6:13 PM

lib/libutil/kinfo_getvmobject.c
51	The in-kernel sysctl already overestimates a bit when given a NULL length. As a side note, it would be nice if the KERN_PROC_FILEDESC and KERN_PROC_VM<foo> sysctls would optimize the req->oldptr == NULL case to just give an estimate rather than doing all the work to look up pathnames, etc.
sys/sys/user.h
498	So all the size counts (resident, active, inactive)?
503	Fixed.
504	Will do.
sys/vm/vm_object.c
2322	Hmm, Alan added the trylock in r124083. The message just says there was a LOR, but I don't see it looking at the current vm_object.c code. Can we create a new VM object while an existing one is locked? It looks like vm_object_shadow() and vm_object_split() are both careful to drop their object lock while allocating a new one. We also always use M_WAITOK to allocate an object in vm_object_allocate(), and it looks like we don't hold any locks when dequeueing the object when freeing it.
2329	Removed.
2377	Whoops. I first wrote this on 8.x before MGTDEVICE existed.

Typo, add 64-bit spares, use 64-bit for page counts.
Remove blank, add OBJT_MGTDEVICE.

I'll make a tangential remark. Given that vm objects are allocated from a NOFREE zone, it actually strikes me as silly that we keep adding and removing them to and from the global list. Either we decide that iteration over the list is not performance critical and accept the cost of iterating over a lot of dead objects or, perhaps, implement some kind of lazy removal, i.e., during iteration over the list remove dead objects and during allocation insert if necessary.

sys/vm/vm_object.c
2322	My recollection is that the execution path for destroying an object still held the object lock when the object was removed from the global list. That is no longer the case, so the trylock could be eliminated.

kib added inline comments.Apr 14 2015, 6:24 AM

sys/sys/user.h
498	I think yes.

alc added inline comments.Apr 14 2015, 2:04 PM

sys/vm/vm_object.c
2298–2307	Could you add a comment explaining what this block is trying to do? Unless someone has read the user-space code, this seems puzzling at first.
2313	"it's" -> "its"
2314	"... stable while the list is unlocked. To ..."
2322	How about acquiring the reference on the object first and then downgrading the lock to a read lock for the iteration over the memq?

jhb added inline comments.Apr 15 2015, 2:29 PM

sys/vm/vm_object.c
2322	Even at the time the commit was made to add the try lock that was still the case, so I'm worried there might be some other case (e.g. calling vm_object_deallocate() on one object while holding the lock of a different VM object).

I also decided to skip OBJ_DEAD objects entirely. They don't really serve any useful purpose to list and this would allow us to consider Alan's proposal in the future without need for any further changes.

sys/vm/vm_object.c
2298–2307	Will do. It's actually a somewhat common idiom used in other sysctl handlers that return variable-sized tables.
2313	Fixed.
2314	Done.
2322	Good idea. Done.

Fixes from alc@ and skip OBJ_DEAD objects.

kib accepted this revision.Apr 15 2015, 3:08 PM

kib edited edge metadata.

This revision is now accepted and ready to land.Apr 15 2015, 3:08 PM

alc accepted this revision.Apr 15 2015, 3:13 PM

alc edited edge metadata.

I got a LOR when I tried this due to vm_object_list and vm_object. I added the reverse order to WITNESS to tease out where it occurs and this is what I got:

lock order reversal:
1st 0xfffff80011c36a00 vm object (vm object) @ vm/vm_object.c:576
2nd 0xffffffff818b5908 vm object_list (vm object_list) @ vm/vm_object.c:677
KDB: stack backtrace:
db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame 0xfffffe085cf602a0
witness_checkorder() at witness_checkorder+0xe26/frame 0xfffffe085cf60330
mtx_lock_flags() at mtx_lock_flags+0xa8/frame 0xfffffe085cf60380
vm_object_destroy() at vm_object_destroy+0x23/frame 0xfffffe085cf603a0
vm_object_collapse() at vm_object_collapse+0x32d/frame 0xfffffe085cf603f0
vm_object_deallocate() at vm_object_deallocate+0x2b/frame 0xfffffe085cf60450
vm_map_process_deferred() at vm_map_process_deferred+0x89/frame 0xfffffe085cf60480
vm_map_remove() at vm_map_remove+0xc8/frame 0xfffffe085cf604b0
exec_new_vmspace() at exec_new_vmspace+0x180/frame 0xfffffe085cf60510
exec_elf64_imgact() at exec_elf64_imgact+0x700/frame 0xfffffe085cf605e0
kern_execve() at kern_execve+0x4e6/frame 0xfffffe085cf60940
sys_execve() at sys_execve+0x37/frame 0xfffffe085cf609a0
amd64_syscall() at amd64_syscall+0x27f/frame 0xfffffe085cf60ab0
Xfast_syscall() at Xfast_syscall+0xfb/frame 0xfffffe085cf60ab0

syscall (59, FreeBSD ELF64, sys_execve), rip = 0x42402a, rsp = 0x7fffffffe738, rbp = 0x7fffffffe740 ---

The problem here being that vm_object_collapse() destroys backing_object while 'object' is locked. I'm not sure how best to rectify this. Even if I use a marker object to walk the list, I believe I still need the vm_object_list mutex to keep each object stable so I can grab a reference, but that alone would trigger the LOR.

I assume it wouldn't really be safe to change vm_object_collapse() to bump object's ref count and drop the lock around destroy.

OTOH, given that it is a NOFREE zone, I could adopt Alan's suggestion of leaving DEAD objects on the list and only adding objects to the list when they are originally allocated. That would remove the TAILQ_REMOVE from vm_object_destroy() and thus remove the LOR.

So you are going to restore the trylock for the commit ? I think that the change to keep even unallocated objects on the list should be separate.

John, how do you want to proceed? I see two possibilities. 1. Commit a revised version of this patch that uses trylock, and implement lazy dead object removal later. 2. Wait for the implementation of lazy dead object removal to be committed first, and then update this patch.

I'm swamped right now. If you want to take option #2, could one of you implement the lazy dead object removal?

Ah, I've just been preempted by other stuff. I already have a patch I haven't yet uploaded (or tested) that changes the list to never remove objects and only add new ones to the list when they are init'd. I can split that out into a separate change and have that go in first before this one.

hiren added a subscriber: hiren.Apr 24 2015, 11:01 PM

jhb added a parent revision: D2423: Place VM objects on the object list when created and never remove them..May 1 2015, 5:03 PM

Rebased on newer HEAD after the object list changes.

Update copyright holder.
Simplify the locking to take advantage of type stability, etc.
OBJ_DEAD != OBJT_DEAD.

This revision now requires review to proceed.May 27 2015, 3:37 PM

Herald added a reviewer: manpages. · View Herald TranscriptMay 27 2015, 3:37 PM

kib accepted this revision.May 27 2015, 4:55 PM

kib edited edge metadata.

This revision is now accepted and ready to land.May 27 2015, 4:55 PM

Closed by commit rS283624: Export a list of VM objects in the system via a sysctl. The list can be (authored by jhb). · Explain WhyMay 27 2015, 6:11 PM

This revision was automatically updated to reflect the committed changes.

Diff 4784

View Options

lib/libutil/Makefile

Show All 17 Lines
#		#
# Where -b is passed if the ISO image should be made "bootable" by		# Where -b is passed if the ISO image should be made "bootable" by
# whatever standards this architecture supports (may be unsupported),		# whatever standards this architecture supports (may be unsupported),
# image-label is the ISO image label, image-name is the filename of the		# image-label is the ISO image label, image-name is the filename of the
# resulting ISO image, base-bits-dir contains the image contents and		# resulting ISO image, base-bits-dir contains the image contents and
# extra-bits-dir, if provided, contains additional files to be merged		# extra-bits-dir, if provided, contains additional files to be merged
# into base-bits-dir as part of making the image.		# into base-bits-dir as part of making the image.

		if [ -z $ETDUMP ]; then
		ETDUMP=etdump
		fi

		if [ -z $MAKEFS ]; then
		MAKEFS=makefs
		fi

		if [ -z $MKIMG ]; then
		MKIMG=mkimg
		fi

if [ "$1" = "-b" ]; then		if [ "$1" = "-b" ]; then
# This is highly x86-centric and will be used directly below.		# This is highly x86-centric and will be used directly below.
bootable="-o bootimage=i386;$4/boot/cdboot -o no-emul-boot"		bootable="-o bootimage=i386;$4/boot/cdboot -o no-emul-boot"

# Make EFI system partition (should be done with makefs in the future)		# Make EFI system partition (should be done with makefs in the future)
dd if=/dev/zero of=efiboot.img bs=4k count=200		dd if=/dev/zero of=efiboot.img bs=4k count=200
device=`mdconfig -a -t vnode -f efiboot.img`		device=`mdconfig -a -t vnode -f efiboot.img`
newfs_msdos -F 12 -m 0xf8 /dev/$device		newfs_msdos -F 12 -m 0xf8 /dev/$device
Show All 16 Lines	if [ $# -lt 3 ]; then
exit 1		exit 1
fi		fi

LABEL=`echo "$1" \| tr '[:lower:]' '[:upper:]'`; shift		LABEL=`echo "$1" \| tr '[:lower:]' '[:upper:]'`; shift
NAME="$1"; shift		NAME="$1"; shift

publisher="The FreeBSD Project. https://www.FreeBSD.org/"		publisher="The FreeBSD Project. https://www.FreeBSD.org/"
echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > "$1/etc/fstab"		echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > "$1/etc/fstab"
makefs -t cd9660 $bootable -o rockridge -o label="$LABEL" -o publisher="$publisher" "$NAME" "$@"		$MAKEFS -t cd9660 $bootable -o rockridge -o label="$LABEL" -o publisher="$publisher" "$NAME" "$@"
rm -f "$1/etc/fstab"		rm -f "$1/etc/fstab"
rm -f efiboot.img		rm -f efiboot.img

if [ "$bootable" != "" ]; then		if [ "$bootable" != "" ]; then
# Look for the EFI System Partition image we dropped in the ISO image.		# Look for the EFI System Partition image we dropped in the ISO image.
for entry in `etdump --format shell $NAME`; do		for entry in `$ETDUMP --format shell $NAME`; do
eval $entry		eval $entry
if [ "$et_platform" = "efi" ]; then		if [ "$et_platform" = "efi" ]; then
espstart=`expr $et_lba \* 2048`		espstart=`expr $et_lba \* 2048`
espsize=`expr $et_sectors \* 512`		espsize=`expr $et_sectors \* 512`
espparam="-p efi::$espsize:$espstart"		espparam="-p efi::$espsize:$espstart"
break		break
fi		fi
done		done

# Create a GPT image containing the partitions we need for hybrid boot.		# Create a GPT image containing the partitions we need for hybrid boot.
imgsize=`stat -f %z $NAME`		imgsize=`stat -f %z $NAME`
mkimg -s gpt \		$MKIMG -s gpt \
--capacity $imgsize \		--capacity $imgsize \
-b $4/boot/pmbr \		-b $4/boot/pmbr \
$espparam \		$espparam \
-p freebsd-boot:=$4/boot/isoboot \		-p freebsd-boot:=$4/boot/isoboot \
-o hybrid.img		-o hybrid.img

# Drop the PMBR, GPT, and boot code into the System Area of the ISO.		# Drop the PMBR, GPT, and boot code into the System Area of the ISO.
dd if=hybrid.img of=$NAME bs=32k count=1 conv=notrunc		dd if=hybrid.img of=$NAME bs=32k count=1 conv=notrunc
rm -f hybrid.img		rm -f hybrid.img
fi		fi

View Options

lib/libutil/kinfo_getallproc.3

Show All 17 Lines
#		#
# Where -b is passed if the ISO image should be made "bootable" by		# Where -b is passed if the ISO image should be made "bootable" by
# whatever standards this architecture supports (may be unsupported),		# whatever standards this architecture supports (may be unsupported),
# image-label is the ISO image label, image-name is the filename of the		# image-label is the ISO image label, image-name is the filename of the
# resulting ISO image, base-bits-dir contains the image contents and		# resulting ISO image, base-bits-dir contains the image contents and
# extra-bits-dir, if provided, contains additional files to be merged		# extra-bits-dir, if provided, contains additional files to be merged
# into base-bits-dir as part of making the image.		# into base-bits-dir as part of making the image.

		if [ -z $ETDUMP ]; then
		ETDUMP=etdump
		fi

		if [ -z $MAKEFS ]; then
		MAKEFS=makefs
		fi

		if [ -z $MKIMG ]; then
		MKIMG=mkimg
		fi

if [ "$1" = "-b" ]; then		if [ "$1" = "-b" ]; then
# This is highly x86-centric and will be used directly below.		# This is highly x86-centric and will be used directly below.
bootable="-o bootimage=i386;$4/boot/cdboot -o no-emul-boot"		bootable="-o bootimage=i386;$4/boot/cdboot -o no-emul-boot"

# Make EFI system partition (should be done with makefs in the future)		# Make EFI system partition (should be done with makefs in the future)
dd if=/dev/zero of=efiboot.img bs=4k count=200		dd if=/dev/zero of=efiboot.img bs=4k count=200
device=`mdconfig -a -t vnode -f efiboot.img`		device=`mdconfig -a -t vnode -f efiboot.img`
newfs_msdos -F 12 -m 0xf8 /dev/$device		newfs_msdos -F 12 -m 0xf8 /dev/$device
Show All 16 Lines	if [ $# -lt 3 ]; then
exit 1		exit 1
fi		fi

LABEL=`echo "$1" \| tr '[:lower:]' '[:upper:]'`; shift		LABEL=`echo "$1" \| tr '[:lower:]' '[:upper:]'`; shift
NAME="$1"; shift		NAME="$1"; shift

publisher="The FreeBSD Project. https://www.FreeBSD.org/"		publisher="The FreeBSD Project. https://www.FreeBSD.org/"
echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > "$1/etc/fstab"		echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > "$1/etc/fstab"
makefs -t cd9660 $bootable -o rockridge -o label="$LABEL" -o publisher="$publisher" "$NAME" "$@"		$MAKEFS -t cd9660 $bootable -o rockridge -o label="$LABEL" -o publisher="$publisher" "$NAME" "$@"
rm -f "$1/etc/fstab"		rm -f "$1/etc/fstab"
rm -f efiboot.img		rm -f efiboot.img

if [ "$bootable" != "" ]; then		if [ "$bootable" != "" ]; then
# Look for the EFI System Partition image we dropped in the ISO image.		# Look for the EFI System Partition image we dropped in the ISO image.
for entry in `etdump --format shell $NAME`; do		for entry in `$ETDUMP --format shell $NAME`; do
eval $entry		eval $entry
if [ "$et_platform" = "efi" ]; then		if [ "$et_platform" = "efi" ]; then
espstart=`expr $et_lba \* 2048`		espstart=`expr $et_lba \* 2048`
espsize=`expr $et_sectors \* 512`		espsize=`expr $et_sectors \* 512`
espparam="-p efi::$espsize:$espstart"		espparam="-p efi::$espsize:$espstart"
break		break
fi		fi
done		done

# Create a GPT image containing the partitions we need for hybrid boot.		# Create a GPT image containing the partitions we need for hybrid boot.
imgsize=`stat -f %z $NAME`		imgsize=`stat -f %z $NAME`
mkimg -s gpt \		$MKIMG -s gpt \
--capacity $imgsize \		--capacity $imgsize \
-b $4/boot/pmbr \		-b $4/boot/pmbr \
$espparam \		$espparam \
-p freebsd-boot:=$4/boot/isoboot \		-p freebsd-boot:=$4/boot/isoboot \
-o hybrid.img		-o hybrid.img

# Drop the PMBR, GPT, and boot code into the System Area of the ISO.		# Drop the PMBR, GPT, and boot code into the System Area of the ISO.
dd if=hybrid.img of=$NAME bs=32k count=1 conv=notrunc		dd if=hybrid.img of=$NAME bs=32k count=1 conv=notrunc
rm -f hybrid.img		rm -f hybrid.img
fi		fi

View Options

lib/libutil/kinfo_getfile.3

Show All 17 Lines
#		#
# Where -b is passed if the ISO image should be made "bootable" by		# Where -b is passed if the ISO image should be made "bootable" by
# whatever standards this architecture supports (may be unsupported),		# whatever standards this architecture supports (may be unsupported),
# image-label is the ISO image label, image-name is the filename of the		# image-label is the ISO image label, image-name is the filename of the
# resulting ISO image, base-bits-dir contains the image contents and		# resulting ISO image, base-bits-dir contains the image contents and
# extra-bits-dir, if provided, contains additional files to be merged		# extra-bits-dir, if provided, contains additional files to be merged
# into base-bits-dir as part of making the image.		# into base-bits-dir as part of making the image.

		if [ -z $ETDUMP ]; then
		ETDUMP=etdump
		fi

		if [ -z $MAKEFS ]; then
		MAKEFS=makefs
		fi

		if [ -z $MKIMG ]; then
		MKIMG=mkimg
		fi

if [ "$1" = "-b" ]; then		if [ "$1" = "-b" ]; then
# This is highly x86-centric and will be used directly below.		# This is highly x86-centric and will be used directly below.
bootable="-o bootimage=i386;$4/boot/cdboot -o no-emul-boot"		bootable="-o bootimage=i386;$4/boot/cdboot -o no-emul-boot"

# Make EFI system partition (should be done with makefs in the future)		# Make EFI system partition (should be done with makefs in the future)
dd if=/dev/zero of=efiboot.img bs=4k count=200		dd if=/dev/zero of=efiboot.img bs=4k count=200
device=`mdconfig -a -t vnode -f efiboot.img`		device=`mdconfig -a -t vnode -f efiboot.img`
newfs_msdos -F 12 -m 0xf8 /dev/$device		newfs_msdos -F 12 -m 0xf8 /dev/$device
Show All 16 Lines	if [ $# -lt 3 ]; then
exit 1		exit 1
fi		fi

LABEL=`echo "$1" \| tr '[:lower:]' '[:upper:]'`; shift		LABEL=`echo "$1" \| tr '[:lower:]' '[:upper:]'`; shift
NAME="$1"; shift		NAME="$1"; shift

publisher="The FreeBSD Project. https://www.FreeBSD.org/"		publisher="The FreeBSD Project. https://www.FreeBSD.org/"
echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > "$1/etc/fstab"		echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > "$1/etc/fstab"
makefs -t cd9660 $bootable -o rockridge -o label="$LABEL" -o publisher="$publisher" "$NAME" "$@"		$MAKEFS -t cd9660 $bootable -o rockridge -o label="$LABEL" -o publisher="$publisher" "$NAME" "$@"
rm -f "$1/etc/fstab"		rm -f "$1/etc/fstab"
rm -f efiboot.img		rm -f efiboot.img

if [ "$bootable" != "" ]; then		if [ "$bootable" != "" ]; then
# Look for the EFI System Partition image we dropped in the ISO image.		# Look for the EFI System Partition image we dropped in the ISO image.
for entry in `etdump --format shell $NAME`; do		for entry in `$ETDUMP --format shell $NAME`; do
eval $entry		eval $entry
if [ "$et_platform" = "efi" ]; then		if [ "$et_platform" = "efi" ]; then
espstart=`expr $et_lba \* 2048`		espstart=`expr $et_lba \* 2048`
espsize=`expr $et_sectors \* 512`		espsize=`expr $et_sectors \* 512`
espparam="-p efi::$espsize:$espstart"		espparam="-p efi::$espsize:$espstart"
break		break
fi		fi
done		done

# Create a GPT image containing the partitions we need for hybrid boot.		# Create a GPT image containing the partitions we need for hybrid boot.
imgsize=`stat -f %z $NAME`		imgsize=`stat -f %z $NAME`
mkimg -s gpt \		$MKIMG -s gpt \
--capacity $imgsize \		--capacity $imgsize \
-b $4/boot/pmbr \		-b $4/boot/pmbr \
$espparam \		$espparam \
-p freebsd-boot:=$4/boot/isoboot \		-p freebsd-boot:=$4/boot/isoboot \
-o hybrid.img		-o hybrid.img

# Drop the PMBR, GPT, and boot code into the System Area of the ISO.		# Drop the PMBR, GPT, and boot code into the System Area of the ISO.
dd if=hybrid.img of=$NAME bs=32k count=1 conv=notrunc		dd if=hybrid.img of=$NAME bs=32k count=1 conv=notrunc
rm -f hybrid.img		rm -f hybrid.img
fi		fi

View Options

lib/libutil/kinfo_getproc.3

Show All 17 Lines
#		#
# Where -b is passed if the ISO image should be made "bootable" by		# Where -b is passed if the ISO image should be made "bootable" by
# whatever standards this architecture supports (may be unsupported),		# whatever standards this architecture supports (may be unsupported),
# image-label is the ISO image label, image-name is the filename of the		# image-label is the ISO image label, image-name is the filename of the
# resulting ISO image, base-bits-dir contains the image contents and		# resulting ISO image, base-bits-dir contains the image contents and
# extra-bits-dir, if provided, contains additional files to be merged		# extra-bits-dir, if provided, contains additional files to be merged
# into base-bits-dir as part of making the image.		# into base-bits-dir as part of making the image.

		if [ -z $ETDUMP ]; then
		ETDUMP=etdump
		fi

		if [ -z $MAKEFS ]; then
		MAKEFS=makefs
		fi

		if [ -z $MKIMG ]; then
		MKIMG=mkimg
		fi

if [ "$1" = "-b" ]; then		if [ "$1" = "-b" ]; then
# This is highly x86-centric and will be used directly below.		# This is highly x86-centric and will be used directly below.
bootable="-o bootimage=i386;$4/boot/cdboot -o no-emul-boot"		bootable="-o bootimage=i386;$4/boot/cdboot -o no-emul-boot"

# Make EFI system partition (should be done with makefs in the future)		# Make EFI system partition (should be done with makefs in the future)
dd if=/dev/zero of=efiboot.img bs=4k count=200		dd if=/dev/zero of=efiboot.img bs=4k count=200
device=`mdconfig -a -t vnode -f efiboot.img`		device=`mdconfig -a -t vnode -f efiboot.img`
newfs_msdos -F 12 -m 0xf8 /dev/$device		newfs_msdos -F 12 -m 0xf8 /dev/$device
Show All 16 Lines	if [ $# -lt 3 ]; then
exit 1		exit 1
fi		fi

LABEL=`echo "$1" \| tr '[:lower:]' '[:upper:]'`; shift		LABEL=`echo "$1" \| tr '[:lower:]' '[:upper:]'`; shift
NAME="$1"; shift		NAME="$1"; shift

publisher="The FreeBSD Project. https://www.FreeBSD.org/"		publisher="The FreeBSD Project. https://www.FreeBSD.org/"
echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > "$1/etc/fstab"		echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > "$1/etc/fstab"
makefs -t cd9660 $bootable -o rockridge -o label="$LABEL" -o publisher="$publisher" "$NAME" "$@"		$MAKEFS -t cd9660 $bootable -o rockridge -o label="$LABEL" -o publisher="$publisher" "$NAME" "$@"
rm -f "$1/etc/fstab"		rm -f "$1/etc/fstab"
rm -f efiboot.img		rm -f efiboot.img

if [ "$bootable" != "" ]; then		if [ "$bootable" != "" ]; then
# Look for the EFI System Partition image we dropped in the ISO image.		# Look for the EFI System Partition image we dropped in the ISO image.
for entry in `etdump --format shell $NAME`; do		for entry in `$ETDUMP --format shell $NAME`; do
eval $entry		eval $entry
if [ "$et_platform" = "efi" ]; then		if [ "$et_platform" = "efi" ]; then
espstart=`expr $et_lba \* 2048`		espstart=`expr $et_lba \* 2048`
espsize=`expr $et_sectors \* 512`		espsize=`expr $et_sectors \* 512`
espparam="-p efi::$espsize:$espstart"		espparam="-p efi::$espsize:$espstart"
break		break
fi		fi
done		done

# Create a GPT image containing the partitions we need for hybrid boot.		# Create a GPT image containing the partitions we need for hybrid boot.
imgsize=`stat -f %z $NAME`		imgsize=`stat -f %z $NAME`
mkimg -s gpt \		$MKIMG -s gpt \
--capacity $imgsize \		--capacity $imgsize \
-b $4/boot/pmbr \		-b $4/boot/pmbr \
$espparam \		$espparam \
-p freebsd-boot:=$4/boot/isoboot \		-p freebsd-boot:=$4/boot/isoboot \
-o hybrid.img		-o hybrid.img

# Drop the PMBR, GPT, and boot code into the System Area of the ISO.		# Drop the PMBR, GPT, and boot code into the System Area of the ISO.
dd if=hybrid.img of=$NAME bs=32k count=1 conv=notrunc		dd if=hybrid.img of=$NAME bs=32k count=1 conv=notrunc
rm -f hybrid.img		rm -f hybrid.img
fi		fi

View Options

lib/libutil/kinfo_getvmmap.3

Show All 17 Lines
#		#
# Where -b is passed if the ISO image should be made "bootable" by		# Where -b is passed if the ISO image should be made "bootable" by
# whatever standards this architecture supports (may be unsupported),		# whatever standards this architecture supports (may be unsupported),
# image-label is the ISO image label, image-name is the filename of the		# image-label is the ISO image label, image-name is the filename of the
# resulting ISO image, base-bits-dir contains the image contents and		# resulting ISO image, base-bits-dir contains the image contents and
# extra-bits-dir, if provided, contains additional files to be merged		# extra-bits-dir, if provided, contains additional files to be merged
# into base-bits-dir as part of making the image.		# into base-bits-dir as part of making the image.

		if [ -z $ETDUMP ]; then
		ETDUMP=etdump
		fi

		if [ -z $MAKEFS ]; then
		MAKEFS=makefs
		fi

		if [ -z $MKIMG ]; then
		MKIMG=mkimg
		fi

if [ "$1" = "-b" ]; then		if [ "$1" = "-b" ]; then
# This is highly x86-centric and will be used directly below.		# This is highly x86-centric and will be used directly below.
bootable="-o bootimage=i386;$4/boot/cdboot -o no-emul-boot"		bootable="-o bootimage=i386;$4/boot/cdboot -o no-emul-boot"

# Make EFI system partition (should be done with makefs in the future)		# Make EFI system partition (should be done with makefs in the future)
dd if=/dev/zero of=efiboot.img bs=4k count=200		dd if=/dev/zero of=efiboot.img bs=4k count=200
device=`mdconfig -a -t vnode -f efiboot.img`		device=`mdconfig -a -t vnode -f efiboot.img`
newfs_msdos -F 12 -m 0xf8 /dev/$device		newfs_msdos -F 12 -m 0xf8 /dev/$device
Show All 16 Lines	if [ $# -lt 3 ]; then
exit 1		exit 1
fi		fi

LABEL=`echo "$1" \| tr '[:lower:]' '[:upper:]'`; shift		LABEL=`echo "$1" \| tr '[:lower:]' '[:upper:]'`; shift
NAME="$1"; shift		NAME="$1"; shift

publisher="The FreeBSD Project. https://www.FreeBSD.org/"		publisher="The FreeBSD Project. https://www.FreeBSD.org/"
echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > "$1/etc/fstab"		echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > "$1/etc/fstab"
makefs -t cd9660 $bootable -o rockridge -o label="$LABEL" -o publisher="$publisher" "$NAME" "$@"		$MAKEFS -t cd9660 $bootable -o rockridge -o label="$LABEL" -o publisher="$publisher" "$NAME" "$@"
rm -f "$1/etc/fstab"		rm -f "$1/etc/fstab"
rm -f efiboot.img		rm -f efiboot.img

if [ "$bootable" != "" ]; then		if [ "$bootable" != "" ]; then
# Look for the EFI System Partition image we dropped in the ISO image.		# Look for the EFI System Partition image we dropped in the ISO image.
for entry in `etdump --format shell $NAME`; do		for entry in `$ETDUMP --format shell $NAME`; do
eval $entry		eval $entry
if [ "$et_platform" = "efi" ]; then		if [ "$et_platform" = "efi" ]; then
espstart=`expr $et_lba \* 2048`		espstart=`expr $et_lba \* 2048`
espsize=`expr $et_sectors \* 512`		espsize=`expr $et_sectors \* 512`
espparam="-p efi::$espsize:$espstart"		espparam="-p efi::$espsize:$espstart"
break		break
fi		fi
done		done

# Create a GPT image containing the partitions we need for hybrid boot.		# Create a GPT image containing the partitions we need for hybrid boot.
imgsize=`stat -f %z $NAME`		imgsize=`stat -f %z $NAME`
mkimg -s gpt \		$MKIMG -s gpt \
--capacity $imgsize \		--capacity $imgsize \
-b $4/boot/pmbr \		-b $4/boot/pmbr \
$espparam \		$espparam \
-p freebsd-boot:=$4/boot/isoboot \		-p freebsd-boot:=$4/boot/isoboot \
-o hybrid.img		-o hybrid.img

# Drop the PMBR, GPT, and boot code into the System Area of the ISO.		# Drop the PMBR, GPT, and boot code into the System Area of the ISO.
dd if=hybrid.img of=$NAME bs=32k count=1 conv=notrunc		dd if=hybrid.img of=$NAME bs=32k count=1 conv=notrunc
rm -f hybrid.img		rm -f hybrid.img
fi		fi

View Options

lib/libutil/kinfo_getvmobject.3

View Options

lib/libutil/kinfo_getvmobject.c

View Options

lib/libutil/libutil.h

View Options

sys/sys/user.h

View Options

sys/vm/vm_object.c

View Options

usr.bin/vmstat/vmstat.8

View Options

Export a list of VM objects via a sysctl.
ClosedPublic
Actions

Details

Diff Detail

Event Timeline

Revision Contents
Changeset List

Diff 4784

lib/libutil/Makefile

lib/libutil/kinfo_getallproc.3

lib/libutil/kinfo_getfile.3

lib/libutil/kinfo_getproc.3

lib/libutil/kinfo_getvmmap.3

lib/libutil/kinfo_getvmobject.3

lib/libutil/kinfo_getvmobject.c

lib/libutil/libutil.h

sys/sys/user.h

sys/vm/vm_object.c

usr.bin/vmstat/vmstat.8

usr.bin/vmstat/vmstat.c

Export a list of VM objects via a sysctl.ClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 4784

lib/libutil/Makefile

lib/libutil/kinfo_getallproc.3

lib/libutil/kinfo_getfile.3

lib/libutil/kinfo_getproc.3

lib/libutil/kinfo_getvmmap.3

lib/libutil/kinfo_getvmobject.3

lib/libutil/kinfo_getvmobject.c

lib/libutil/libutil.h

sys/sys/user.h

sys/vm/vm_object.c

usr.bin/vmstat/vmstat.8

usr.bin/vmstat/vmstat.c

Export a list of VM objects via a sysctl.
ClosedPublic
Actions

Revision Contents
Changeset List