565f13088f
Change the kernel to add features to vircopy and safecopies so that
transparent copy fixing won't happen to avoid deadlocks, and such copies
fail with EFAULT.
Transparently making copying work from filesystems (as normally done by
the kernel & VM when copying fails because of missing/readonly memory)
is problematic as it can happen that, for file-mapped ranges, that that
same filesystem that is blocked on the copy request is needed to satisfy
the memory range, leading to deadlock. Dito for VFS itself, if done with
a blocking call.
This change makes the copying done from a filesystem fail in such cases
with EFAULT by VFS adding the CPF_TRY flag to the grants. If a FS call
fails with EFAULT, VFS will then request the range to be made available
to VM after the FS is unblocked, allowing it to be used to satisfy the
range if need be in another VFS thread.
Similarly, for datacopies that VFS itself does, it uses the failable
vircopy variant and callers use a wrapper that talk to VM if necessary
to get the copy to work.
. kernel: add CPF_TRY flag to safecopies
. kernel: only request writable ranges to VM for the
target buffer when copying fails
. do copying in VFS TRY-first
. some fixes in VM to build SANITYCHECK mode
. add regression test for the cases where
- a FS system call needs memory mapped in a process that the
FS itself must map.
- such a range covers more than one file-mapped region.
. add 'try' mode to vircopy, physcopy
. add flags field to copy kernel call messages
. if CP_FLAG_TRY is set, do not transparently try
to fix memory ranges
. for use by VFS when accessing user buffers to avoid
deadlock
. remove some obsolete backwards compatability assignments
. VFS: let thread scheduling work for VM requests too
Allows VFS to make calls to VM while suspending and resuming
the currently running thread. Does currently not work for the
main thread.
. VM: add fix memory range call for use by VFS
Change-Id: I295794269cea51a3163519a9cfe5901301d90b32
68 lines
1.6 KiB
C
68 lines
1.6 KiB
C
#ifndef _SANITYCHECK_H
|
|
#define _SANITYCHECK_H 1
|
|
|
|
#include <assert.h>
|
|
|
|
#include "vm.h"
|
|
|
|
#if SANITYCHECKS
|
|
|
|
#define PT_SANE(p) { pt_sanitycheck((p), __FILE__, __LINE__); }
|
|
|
|
/* This macro is used in the sanity check functions, where file and
|
|
* line are function arguments.
|
|
*/
|
|
#define MYASSERT(c) do { if(!(c)) { \
|
|
printf("VM:%s:%d: %s failed (last sanity check %s:%d)\n", file, line, #c, sc_lastfile, sc_lastline); \
|
|
panic("sanity check failed"); } } while(0)
|
|
|
|
#define SLABSANITYCHECK(l) if(_minix_kerninfo) { \
|
|
slab_sanitycheck(__FILE__, __LINE__); }
|
|
|
|
#define SANITYCHECK(l) if(!nocheck && _minix_kerninfo && 0) { \
|
|
struct vmproc *vmpr; \
|
|
assert(incheck == 0); \
|
|
incheck = 1; \
|
|
usedpages_reset(); \
|
|
slab_sanitycheck(__FILE__, __LINE__); \
|
|
for(vmpr = vmproc; vmpr < &vmproc[VMP_NR]; vmpr++) { \
|
|
if((vmpr->vm_flags & (VMF_INUSE))) { \
|
|
PT_SANE(&vmpr->vm_pt); \
|
|
} \
|
|
} \
|
|
map_sanitycheck(__FILE__, __LINE__); \
|
|
mem_sanitycheck(__FILE__, __LINE__); \
|
|
assert(incheck == 1); \
|
|
incheck = 0; \
|
|
/* printf("(%s:%d OK) ", __FILE__, __LINE__); */ \
|
|
sc_lastfile = __FILE__; sc_lastline = __LINE__; \
|
|
}
|
|
|
|
#define SLABSANE(ptr) { \
|
|
if(!slabsane_f(__FILE__, __LINE__, ptr, sizeof(*(ptr)))) { \
|
|
printf("VM:%s:%d: SLABSANE(%s)\n", __FILE__, __LINE__, #ptr); \
|
|
panic("SLABSANE failed"); \
|
|
} \
|
|
}
|
|
|
|
#else
|
|
#define SANITYCHECK(l)
|
|
#define SLABSANITYCHECK(l)
|
|
#define SLABSANE(ptr)
|
|
#define MYASSERT(c)
|
|
#define PT_SANE(p)
|
|
#endif
|
|
|
|
#if MEMPROTECT
|
|
#define USE(obj, code) do { \
|
|
slabunlock(obj, sizeof(*obj)); \
|
|
do { \
|
|
code \
|
|
} while(0); \
|
|
slablock(obj, sizeof(*obj)); \
|
|
} while(0)
|
|
#else
|
|
#define USE(obj, code) do { code } while(0)
|
|
#endif
|
|
|
|
#endif
|