Paths

Table of Contentst

-
sys/dev/xen/control/
-
dev/
-
xen/
-
control/
-
control.c

xen/control: print warning on call of xctrl_suspend()
ClosedPublic
Actions

Authored by ehem_freebsd_m5p.com on Apr 6 2021, 1:08 AM.

Details

Reviewers

royger
mhorne

Commits

rG46c46edd1889: xen/control: print warning on call of xctrl_suspend()

Summary

Presently suspend/resume and migration aren't supported on Xen/ARM. As
such this shouldn't ever occur.

Modified to check for ARM instead of !x86, since ARM is where support is
missing. Other Xen architectures might get suspend support sooner.

Submitted by: Elliott Mitchell <ehem+freebsd@m5p.com>
Original implementation: Julien Grall <julien@xen.org>, 2014-01-13 17:41:15

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

ehem_freebsd_m5p.com created this revision.Apr 6 2021, 1:08 AM

Herald added a subscriber: imp. · View Herald TranscriptApr 6 2021, 1:08 AM

ehem_freebsd_m5p.com requested review of this revision.Apr 6 2021, 1:08 AM

Harbormaster completed remote builds in B38348: Diff 86878.Apr 6 2021, 1:08 AM

The commit message doesn't seem to match the actual code, it says: "implement suspend as panic for ARM" yet xctrl_suspend for Arm is just a printf, not a panic.

Hopefully arc grabs the updated commit message, though I suspect I'll
need to manually update the message in Phabricator.

Harbormaster completed remote builds in B38742: Diff 87845.Apr 21 2021, 1:41 AM

Hopefully the updated commit message is okay. That one was the original line, I hadn't been paying too close attention since issues hadn't focused here.

Switching back to checking for amd64 or i386. Likely
suspend/resume/migration won't immediately be supported for RISC-V.

Add machine/intr_machdep.h to guarded headers, this shouldn't be
#included in an architecture-independent file.

Harbormaster completed remote builds in B38824: Diff 88024.Apr 23 2021, 5:42 AM

ehem_freebsd_m5p.com mentioned this in D29306: xen/control: disable 15226522304868a8312a84f8ff549fdc6bbf54db on !x86.Apr 23 2021, 10:41 PM

mhorne accepted this revision.Apr 24 2021, 8:13 PM

This revision is now accepted and ready to land.Apr 24 2021, 8:13 PM

ehem_freebsd_m5p.com mentioned this in D29959: xen/devices: purge uses of intr_machdep.h.Apr 25 2021, 1:07 AM

ehem_freebsd_m5p.com added a child revision: D30950: xen/arm64: enable arm64 Xen configuration.Jun 30 2021, 1:28 AM

Closed by commit rG46c46edd1889: xen/control: print warning on call of xctrl_suspend() (authored by julien_xen.org, committed by royger). · Explain WhyJul 28 2021, 3:30 PM

This revision was automatically updated to reflect the committed changes.

royger added a commit: rG46c46edd1889: xen/control: print warning on call of xctrl_suspend().

Revision Contents
Changeset List

Path

Size

sys/

dev/

xen/

control/

control.c

10 lines

Diff 92878

View Options

sys/dev/xen/control/control.c

Show All 24 Lines
*		*
* $FreeBSD$		* $FreeBSD$
*/		*/

#include <sys/cdefs.h>		#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");		__FBSDID("$FreeBSD$");

#include <sys/param.h>		#include <sys/param.h>
		#ifndef WITHOUT_CAPSICUM
		#include <sys/capsicum.h>
		#endif
#include <sys/queue.h>		#include <sys/queue.h>
#include <sys/errno.h>		#include <sys/errno.h>
#include <sys/stat.h>		#include <sys/stat.h>
#include <sys/ioctl.h>		#include <sys/ioctl.h>
#include <sys/disk.h>		#include <sys/disk.h>

#include <assert.h>		#include <assert.h>
#include <err.h>		#include <err.h>
#include <fcntl.h>		#include <fcntl.h>
#include <stdio.h>		#include <stdio.h>
#include <stdlib.h>		#include <stdlib.h>
#include <string.h>		#include <string.h>
#include <pthread.h>		#include <pthread.h>
#include <pthread_np.h>		#include <pthread_np.h>
#include <signal.h>		#include <signal.h>
		#include <sysexits.h>
#include <unistd.h>		#include <unistd.h>

#include <machine/atomic.h>		#include <machine/atomic.h>

#include "bhyverun.h"		#include "bhyverun.h"
#include "mevent.h"		#include "mevent.h"
#include "block_if.h"		#include "block_if.h"

▲ Show 20 Lines • Show All 339 Lines • ▼ Show 20 Lines	blockif_open(const char optstr, const char ident)
char name[MAXPATHLEN];		char name[MAXPATHLEN];
char nopt, xopts, *cp;		char nopt, xopts, *cp;
struct blockif_ctxt *bc;		struct blockif_ctxt *bc;
struct stat sbuf;		struct stat sbuf;
struct diocgattr_arg arg;		struct diocgattr_arg arg;
off_t size, psectsz, psectoff;		off_t size, psectsz, psectoff;
int extra, fd, i, sectsz;		int extra, fd, i, sectsz;
int nocache, sync, ro, candelete, geom, ssopt, pssopt;		int nocache, sync, ro, candelete, geom, ssopt, pssopt;
		#ifndef WITHOUT_CAPSICUM
		cap_rights_t rights;
		u_long cmds[] = {DIOCGFLUSH, DIOCGDELETE};
		#endif

pthread_once(&blockif_once, blockif_init);		pthread_once(&blockif_once, blockif_init);

fd = -1;		fd = -1;
ssopt = 0;		ssopt = 0;
nocache = 0;		nocache = 0;
sync = 0;		sync = 0;
ro = 0;		ro = 0;
▲ Show 20 Lines • Show All 41 Lines • ▼ Show 20 Lines	if (fd < 0) {
goto err;		goto err;
}		}

if (fstat(fd, &sbuf) < 0) {		if (fstat(fd, &sbuf) < 0) {
warn("Could not stat backing file %s", nopt);		warn("Could not stat backing file %s", nopt);
goto err;		goto err;
}		}

		#ifndef WITHOUT_CAPSICUM
		grehanUnsubmitted Not Done Inline Actions fsync needs to be added here, or an ahci-hd file-backed disk image will fail on FreeBSD guest shutdown with (ada0:ahcich0:0:0:0): FLUSHCACHE48. ACB: ea 00 00 00 00 40 00 00 00 00 00 00 (ada0:ahcich0:0:0:0): CAM status: ATA Status Error (ada0:ahcich0:0:0:0): ATA status: 41 (DRDY ERR), error: 04 (ABRT ) (ada0:ahcich0:0:0:0): RES: 41 04 00 00 00 40 00 00 00 00 00 (ada0:ahcich0:0:0:0): Retrying command (ada0:ahcich0:0:0:0): FLUSHCACHE48. ACB: ea 00 00 00 00 40 00 00 00 00 00 00 (ada0:ahcich0:0:0:0): CAM status: ATA Status Error (ada0:ahcich0:0:0:0): ATA status: 41 (DRDY ERR), error: 04 (ABRT ) (ada0:ahcich0:0:0:0): RES: 41 04 00 00 00 40 00 00 00 00 00 (ada0:ahcich0:0:0:0): Error 5, Retries exhausted (ada0:ahcich0:0:0:0): Synchronize cache failed #ifndef WITHOUT_CAPSICUM cap_rights_init(&rights, CAP_IOCTL, CAP_READ, CAP_SEEK, CAP_WRITE); if (ro) + cap_rights_init(&rights, CAP_IOCTL, CAP_READ, CAP_SEEK, CAP_WRITE, + CAP_FSYNC); + if (ro) { cap_rights_clear(&rights, CAP_WRITE); + cap_rights_clear(&rights, CAP_FSYNC); + } grehan: fsync needs to be added here, or an ahci-hd file-backed disk image will fail on FreeBSD guest…
		cap_rights_init(&rights, CAP_IOCTL, CAP_READ, CAP_SEEK, CAP_WRITE);
		if (ro)
		cap_rights_clear(&rights, CAP_WRITE);

		oshogboUnsubmitted Not Done Inline Actions I'm not sure if here the reverse logic would be more secure. oshogbo: I'm not sure if here the reverse logic would be more secure.
		emasteUnsubmitted Not Done Inline Actions That is: cap_rights_init(&rights, CAP_IOCTL, CAP_READ, CAP_SEEK); if (!ro) cap_rights_set(&rights, CAP_FSYNC, CAP_WRITE); I agree that looks preferable. emaste: That is: ``` cap_rights_init(&rights, CAP_IOCTL, CAP_READ, CAP_SEEK); if (!ro)…
		if (cap_rights_limit(fd, &rights) == -1 && errno != ENOSYS)
		errx(EX_OSERR, "Unable to apply rights for sandbox");
		#endif

/*		/*
* Deal with raw devices		* Deal with raw devices
*/		*/
size = sbuf.st_size;		size = sbuf.st_size;
sectsz = DEV_BSIZE;		sectsz = DEV_BSIZE;
psectsz = psectoff = 0;		psectsz = psectoff = 0;
candelete = geom = 0;		candelete = geom = 0;
if (S_ISCHR(sbuf.st_mode)) {		if (S_ISCHR(sbuf.st_mode)) {
Show All 9 Lines	if (S_ISCHR(sbuf.st_mode)) {
strlcpy(arg.name, "GEOM::candelete", sizeof(arg.name));		strlcpy(arg.name, "GEOM::candelete", sizeof(arg.name));
arg.len = sizeof(arg.value.i);		arg.len = sizeof(arg.value.i);
if (ioctl(fd, DIOCGATTR, &arg) == 0)		if (ioctl(fd, DIOCGATTR, &arg) == 0)
candelete = arg.value.i;		candelete = arg.value.i;
if (ioctl(fd, DIOCGPROVIDERNAME, name) == 0)		if (ioctl(fd, DIOCGPROVIDERNAME, name) == 0)
geom = 1;		geom = 1;
} else		} else
psectsz = sbuf.st_blksize;		psectsz = sbuf.st_blksize;

		#ifndef WITHOUT_CAPSICUM
		if (cap_ioctls_limit(fd, cmds, nitems(cmds)) == -1 && errno != ENOSYS)
		errx(EX_OSERR, "Unable to apply rights for sandbox");
		#endif

if (ssopt != 0) {		if (ssopt != 0) {
if (!powerof2(ssopt) \|\| !powerof2(pssopt) \|\| ssopt < 512 \|\|		if (!powerof2(ssopt) \|\| !powerof2(pssopt) \|\| ssopt < 512 \|\|
ssopt > pssopt) {		ssopt > pssopt) {
fprintf(stderr, "Invalid sector size %d/%d\n",		fprintf(stderr, "Invalid sector size %d/%d\n",
ssopt, pssopt);		ssopt, pssopt);
goto err;		goto err;
}		}
▲ Show 20 Lines • Show All 329 Lines • Show Last 20 Lines

xen/control: print warning on call of xctrl_suspend()ClosedPublicActions