diff options
| author | Jamie Liu <jamieliu@google.com> | 2019-06-06 16:27:09 -0700 |
|---|---|---|
| committer | Shentubot <shentubot@google.com> | 2019-06-06 16:29:46 -0700 |
| commit | b3f104507d7a04c0ca058cbcacc5ff78d853f4ba (patch) | |
| tree | fb45110e8c9329b16165a92e67edb2c184de0dd6 /pkg/sentry/mm/vma.go | |
| parent | a26043ee53a2f38b81c9eaa098d115025e87f4c3 (diff) | |
"Implement" mbind(2).
We still only advertise a single NUMA node, and ignore mempolicy
accordingly, but mbind() at least now succeeds and has effects reflected
by get_mempolicy().
Also fix handling of nodemasks: round sizes to unsigned long (as
documented and done by Linux), and zero trailing bits when copying them
out.
PiperOrigin-RevId: 251950859
Diffstat (limited to 'pkg/sentry/mm/vma.go')
| -rw-r--r-- | pkg/sentry/mm/vma.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkg/sentry/mm/vma.go b/pkg/sentry/mm/vma.go index 02203f79f..0af8de5b0 100644 --- a/pkg/sentry/mm/vma.go +++ b/pkg/sentry/mm/vma.go @@ -107,6 +107,7 @@ func (mm *MemoryManager) createVMALocked(ctx context.Context, opts memmap.MMapOp private: opts.Private, growsDown: opts.GrowsDown, mlockMode: opts.MLockMode, + numaPolicy: linux.MPOL_DEFAULT, id: opts.MappingIdentity, hint: opts.Hint, } @@ -436,6 +437,8 @@ func (vmaSetFunctions) Merge(ar1 usermem.AddrRange, vma1 vma, ar2 usermem.AddrRa vma1.private != vma2.private || vma1.growsDown != vma2.growsDown || vma1.mlockMode != vma2.mlockMode || + vma1.numaPolicy != vma2.numaPolicy || + vma1.numaNodemask != vma2.numaNodemask || vma1.id != vma2.id || vma1.hint != vma2.hint { return vma{}, false |