Paths

Table of Contentst

-
sys/fs/fuse/
-
fs/
-
fuse/
12/14
fuse_internal.c

Differential D34593

fusefs: Initialize a pad word in the mknod message
ClosedPublic
Actions

Authored by markj on Mar 17 2022, 10:14 PM.

Details

Reviewers

asomers

Commits

rGc0b98fe16f25: fusefs: Initialize a pad word in the mknod message

Summary

Reported by: Jenkins (KMSAN job)
MFC after: 3 days

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 44814
Build 41702: arc lint + arc unit

Event Timeline

markj created this revision.Mar 17 2022, 10:14 PM

Herald added a subscriber: imp. · View Herald TranscriptMar 17 2022, 10:14 PM

markj requested review of this revision.Mar 17 2022, 10:14 PM

Harbormaster completed remote builds in B44814: Diff 103963.Mar 17 2022, 10:14 PM

LGTM

This revision is now accepted and ready to land.Mar 17 2022, 10:23 PM

Closed by commit rGc0b98fe16f25: fusefs: Initialize a pad word in the mknod message (authored by markj). · Explain WhyMar 17 2022, 10:31 PM

This revision was automatically updated to reflect the committed changes.

markj added a commit: rGc0b98fe16f25: fusefs: Initialize a pad word in the mknod message.

Revision Contents
Changeset List

Path

Size

sys/

fs/

fuse/

fuse_internal.c

1 line

Diff 103963

View Options

sys/fs/fuse/fuse_internal.c

Show First 20 Lines • Show All 81 Lines • ▼ Show 20 Lines echo " -I: Installation CDROM image location" \

"(default: ${DEFAULT_ISOFILE})" "(default: ${DEFAULT_ISOFILE})"

echo " -l: the OS loader to use (default: /boot/userboot.so)" echo " -l: the OS loader to use (default: /boot/userboot.so)"

echo " -L: IP address for UEFI GOP VNC server" \ echo " -L: IP address for UEFI GOP VNC server" \

"(default: ${DEFAULT_VNCHOST})" "(default: ${DEFAULT_VNCHOST})"

echo " -m: memory size (default: ${DEFAULT_MEMSIZE})" echo " -m: memory size (default: ${DEFAULT_MEMSIZE})"

echo " -n: network adapter emulation type" \ echo " -n: network adapter emulation type" \

"(default: ${DEFAULT_NIC})" "(default: ${DEFAULT_NIC})"

echo " -p: pass-through a host PCI device at bus/slot/func" \ echo " -p: pass-through a host PCI device at bus/slot/func" \

"(e.g. 10/0/0)" "(e.g. 10/0/0)"

markjUnsubmitted

Done

In my experience, if you want to pass a device through to the VM, the host driver has to be detached, in which case it'll show up in pciconf -l output as none@pci.... So I'm not sure how this can work.

markj: In my experience, if you want to pass a device through to the VM, the host driver has to be…

christosAuthorUnsubmitted

Done

The example is indeed incorrect, as the driver would have to be detached first. bhyve works by passing it a ppt driver, so none (although the script will still be able to fetch its bus/slot/func) isn't supposed to be used either.

https://wiki.freebsd.org/bhyve/pci_passthru

The example should say ppt0 instead of ehci0.

christos: The example is indeed incorrect, as the driver would have to be detached first. bhyve works by…

markjUnsubmitted

Done

Ah right, ok.

Can we please also preserve backward compatibility? That is, if the passthrough device is of the form a/b/c, avoid treating it as a device name?

markj: Ah right, ok. Can we please also preserve backward compatibility? That is, if the passthrough…

christosAuthorUnsubmitted

Done

Sure.

christos: Sure.

echo " -P: UEFI GOP VNC port (default: ${DEFAULT_VNCPORT})" echo " -P: UEFI GOP VNC port (default: ${DEFAULT_VNCPORT})"

echo " -t: tap device for virtio-net (default: $DEFAULT_TAPDEV)" echo " -t: tap device for virtio-net (default: $DEFAULT_TAPDEV)"

echo " -T: Enable tablet device (for UEFI GOP)" echo " -T: Enable tablet device (for UEFI GOP)"

echo " -u: RTC keeps UTC time" echo " -u: RTC keeps UTC time"

echo " -v: Wait for VNC client connection before booting VM" echo " -v: Wait for VNC client connection before booting VM"

echo " -w: ignore unimplemented MSRs" echo " -w: ignore unimplemented MSRs"

echo "" echo ""

[ -n "$msg" ] && errmsg "$msg" [ -n "$msg" ] && errmsg "$msg"

▲ Show 20 Lines • Show All 247 Lines • ▼ Show 20 Lines while [ $i -lt $disk_total ] ; do

devargs="$devargs -s $nextslot:0,$disk_emulation,${disk}${opts} " devargs="$devargs -s $nextslot:0,$disk_emulation,${disk}${opts} "

nextslot=$(($nextslot + 1)) nextslot=$(($nextslot + 1))

i=$(($i + 1)) i=$(($i + 1))

done done

i=0 i=0

while [ $i -lt $pass_total ] ; do while [ $i -lt $pass_total ] ; do

eval "pass=\$pass_dev${i}" eval "pass=\$pass_dev${i}"

devargs="$devargs -s $nextslot:0,passthru,${pass} " passno="$(

pciconf -l | grep "${pass}@" | awk '{print $1}' | cut -f2 -d@ |

markjUnsubmitted

Done

Sorry, I meant to write "bsf".

markj: Sorry, I meant to write "bsf".

christosAuthorUnsubmitted

Done

Sorry, I meant to write "bsf".

I didn't think about it at all, thanks.

christos: > Sorry, I meant to write "bsf". I didn't think about it at all, thanks.

cut -f2- -d: | sed 's/:$//' | tr : /

markjUnsubmitted

Done

I think you can replace this pipe with passno=$(pciconf -l | awk -F: '{print $2"/"$3"/"$4}').

markj: I think you can replace this pipe with `passno=$(pciconf -l | awk -F: '{print $2"/"$3"/"$4}')`.

christosAuthorUnsubmitted

Done

Thank you, definitely better this way

christos: Thank you, definitely better this way

markjUnsubmitted

Done

Sorry, I meant to write pciconf -l $pass| awk -F: '{print $2"/"$3"/"$4}'.

I'd also name the variable something more accurate, maybe "bsl" (bus slot function).

markj: Sorry, I meant to write `pciconf -l $pass| awk -F: '{print $2"/"$3"/"$4}'`. I'd also name the…

impUnsubmitted

Not Done

Don't we need to preserve the domain as well?

imp: Don't we need to preserve the domain as well?

christosAuthorUnsubmitted

Done

bhyve expects bus/slot/entry as input, so the domain field is not needed in this case.

christos: bhyve expects bus/slot/entry as input, so the domain field is not needed in this case.

test -z "${passno}" && errmsg "${pass} is not a host PCI device"

devargs="$devargs -s $nextslot:0,passthru,${passno} "

markjUnsubmitted

Not Done

test -z "${passno}" && errmsg "${pass} is not a host PCI device"

- devargs="$devargs -s $nextslot:0,passthru,${passno} "

+ devargs="$devargs -s ${nextslot}:0,passthru,${passno} "

nextslot=$(($nextslot + 1))

markj:

christosAuthorUnsubmitted

Done

I'll fix this in another commit because there are multiple other instances of this.

christos: I'll fix this in another commit because there are multiple other instances of this.

markjUnsubmitted

Done

eval "pass=\$pass_dev${i}"

- if [ -z "$(echo "${pass}" | grep "^[0-9]*/[0-9]*/[0-9]*$")" ]; then

+ if [ -z "$(echo "${pass}" | grep "^[0-9]\+/[0-9]\+/[0-9]\+$")" ]; then

bsl="$(pciconf -l "${pass}" 2>/dev/null)"

[0-9]* matches the empty string, but we don't want that.

markj: [0-9]* matches the empty string, but we don't want that.

nextslot=$(($nextslot + 1)) nextslot=$(($nextslot + 1))

i=$(($i + 1)) i=$(($i + 1))

done done

efiargs="" efiargs=""

if [ ${efi_mode} -gt 0 ]; then if [ ${efi_mode} -gt 0 ]; then

efiargs="-s 29,fbuf,tcp=${vnchost}:${vncport}," efiargs="-s 29,fbuf,tcp=${vnchost}:${vncport},"

efiargs="${efiargs}${vncsize}${vncwait}" efiargs="${efiargs}${vncsize}${vncwait}"

Show All 36 Lines

fusefs: Initialize a pad word in the mknod messageClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 103963

sys/fs/fuse/fuse_internal.c

fusefs: Initialize a pad word in the mknod message
ClosedPublic
Actions

Revision Contents
Changeset List