From: "Roger Pau Monné" <roger.pau@citrix.com>
To: Manuel Bouyer <bouyer@netbsd.org>
Cc: <xen-devel@lists.xenproject.org>,
Ian Jackson <iwj@xenproject.org>, Wei Liu <wl@xen.org>
Subject: Re: [PATCH v2] libs/foreignmemory: Implement on NetBSD
Date: Thu, 28 Jan 2021 11:48:49 +0100 [thread overview]
Message-ID: <YBKWkc8mzlaIktD7@Air-de-Roger> (raw)
In-Reply-To: <20210126224800.1246-6-bouyer@netbsd.org>
On Tue, Jan 26, 2021 at 11:47:52PM +0100, Manuel Bouyer wrote:
> Implement foreignmemory interface on NetBSD. The compat interface is now used
> only on __sun__
>
> Signed-off-by: Manuel Bouyer <bouyer@netbsd.org>
> ---
> tools/libs/foreignmemory/Makefile | 2 +-
> tools/libs/foreignmemory/netbsd.c | 66 +++++++++++++++++++++++++-----
> tools/libs/foreignmemory/private.h | 6 +--
> 3 files changed, 60 insertions(+), 14 deletions(-)
>
> diff --git a/tools/libs/foreignmemory/Makefile b/tools/libs/foreignmemory/Makefile
> index 13850f7988..f191cdbed0 100644
> --- a/tools/libs/foreignmemory/Makefile
> +++ b/tools/libs/foreignmemory/Makefile
> @@ -8,7 +8,7 @@ SRCS-y += core.c
> SRCS-$(CONFIG_Linux) += linux.c
> SRCS-$(CONFIG_FreeBSD) += freebsd.c
> SRCS-$(CONFIG_SunOS) += compat.c solaris.c
> -SRCS-$(CONFIG_NetBSD) += compat.c netbsd.c
> +SRCS-$(CONFIG_NetBSD) += netbsd.c
> SRCS-$(CONFIG_MiniOS) += minios.c
>
> include $(XEN_ROOT)/tools/libs/libs.mk
> diff --git a/tools/libs/foreignmemory/netbsd.c b/tools/libs/foreignmemory/netbsd.c
> index 54a418ebd6..a7e1d72ffc 100644
> --- a/tools/libs/foreignmemory/netbsd.c
> +++ b/tools/libs/foreignmemory/netbsd.c
> @@ -19,7 +19,9 @@
>
> #include <unistd.h>
> #include <fcntl.h>
> +#include <errno.h>
> #include <sys/mman.h>
> +#include <sys/ioctl.h>
>
> #include "private.h"
>
> @@ -66,15 +68,17 @@ int osdep_xenforeignmemory_close(xenforeignmemory_handle *fmem)
> return close(fd);
> }
>
> -void *osdep_map_foreign_batch(xenforeignmem_handle *fmem, uint32_t dom,
> - void *addr, int prot, int flags,
> - xen_pfn_t *arr, int num)
> +void *osdep_xenforeignmemory_map(xenforeignmemory_handle *fmem,
> + uint32_t dom, void *addr,
> + int prot, int flags, size_t num,
> + const xen_pfn_t arr[/*num*/], int err[/*num*/])
> +
> {
> int fd = fmem->fd;
> - privcmd_mmapbatch_t ioctlx;
> - addr = mmap(addr, num*XC_PAGE_SIZE, prot, flags | MAP_ANON | MAP_SHARED, -1, 0);
> + privcmd_mmapbatch_v2_t ioctlx;
> + addr = mmap(addr, num*PAGE_SIZE, prot, flags | MAP_ANON | MAP_SHARED, -1, 0);
> if ( addr == MAP_FAILED ) {
> - PERROR("osdep_map_foreign_batch: mmap failed");
> + PERROR("osdep_xenforeignmemory_map: mmap failed");
> return NULL;
> }
>
> @@ -82,11 +86,12 @@ void *osdep_map_foreign_batch(xenforeignmem_handle *fmem, uint32_t dom,
> ioctlx.dom=dom;
> ioctlx.addr=(unsigned long)addr;
> ioctlx.arr=arr;
> - if ( ioctl(fd, IOCTL_PRIVCMD_MMAPBATCH, &ioctlx) < 0 )
> + ioctlx.err=err;
> + if ( ioctl(fd, IOCTL_PRIVCMD_MMAPBATCH_V2, &ioctlx) < 0 )
> {
> int saved_errno = errno;
> - PERROR("osdep_map_foreign_batch: ioctl failed");
> - (void)munmap(addr, num*XC_PAGE_SIZE);
> + PERROR("osdep_xenforeignmemory_map: ioctl failed");
> + (void)munmap(addr, num*PAGE_SIZE);
> errno = saved_errno;
> return NULL;
> }
> @@ -97,7 +102,48 @@ void *osdep_map_foreign_batch(xenforeignmem_handle *fmem, uint32_t dom,
> int osdep_xenforeignmemory_unmap(xenforeignmemory_handle *fmem,
> void *addr, size_t num)
> {
> - return munmap(addr, num*XC_PAGE_SIZE);
> + return munmap(addr, num*PAGE_SIZE);
> +}
> +
> +int osdep_xenforeignmemory_restrict(xenforeignmemory_handle *fmem,
> + domid_t domid)
> +{
> + errno = EOPNOTSUPP;
> + return -1;
> +}
> +
> +int osdep_xenforeignmemory_unmap_resource(
> + xenforeignmemory_handle *fmem, xenforeignmemory_resource_handle *fres)
> +{
> + return fres ? munmap(fres->addr, fres->nr_frames << PAGE_SHIFT) : 0;
> +}
> +
> +int osdep_xenforeignmemory_map_resource(
> + xenforeignmemory_handle *fmem, xenforeignmemory_resource_handle *fres)
> +{
> + privcmd_mmap_resource_t mr = {
> + .dom = fres->domid,
> + .type = fres->type,
> + .id = fres->id,
> + .idx = fres->frame,
> + .num = fres->nr_frames,
> + };
> + int rc;
> +
> + fres->addr = mmap(fres->addr, fres->nr_frames << PAGE_SHIFT,
> + fres->prot, fres->flags | MAP_ANON | MAP_SHARED, -1, 0);
> + if ( fres->addr == MAP_FAILED )
> + return -1;
> +
> + mr.addr = (uintptr_t)fres->addr;
> +
> + rc = ioctl(fmem->fd, IOCTL_PRIVCMD_MMAP_RESOURCE, &mr);
> + if ( rc )
> + {
> + PERROR("ioctl failed");
> + }
> +
> + return 0;
You need to return rc here, or else the failure won't be propagated to
the caller.
If you agree I don't think I have further comments:
Reviewed-by: Roger Pau Monné <roger.pau@citrix.com>
Thanks, Roger.
next prev parent reply other threads:[~2021-01-28 10:49 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-26 22:47 [PATCH v2] Fix error: array subscript has type 'char' Manuel Bouyer
2021-01-26 22:47 ` [PATCH v2] NetBSD hotplug: Introduce locking functions Manuel Bouyer
2021-01-26 22:47 ` [PATCH v2] NetBSD hotplug: fix block unconfigure on destroy Manuel Bouyer
2021-01-28 11:45 ` Roger Pau Monné
2021-01-29 11:00 ` Manuel Bouyer
2021-01-26 22:47 ` [PATCH v2] NetBSD: use system-provided headers Manuel Bouyer
2021-01-28 11:21 ` Roger Pau Monné
2021-01-29 10:57 ` Manuel Bouyer
2021-01-26 22:47 ` [PATCH v2] libs/call: fix build on NetBSD Manuel Bouyer
2021-01-26 22:47 ` [PATCH v2] libs/foreignmemory: Implement " Manuel Bouyer
2021-01-27 20:15 ` Andrew Cooper
2021-01-28 10:48 ` Roger Pau Monné [this message]
2021-01-28 10:52 ` Andrew Cooper
2021-01-28 11:42 ` Andrew Cooper
2021-01-29 10:51 ` Manuel Bouyer
2021-01-26 22:47 ` [PATCH v2] libs/gnttab: implement " Manuel Bouyer
2021-01-28 11:14 ` Roger Pau Monné
2021-01-26 22:47 ` [PATCH v2] libs/light: Switch NetBSD to QEMU_XEN Manuel Bouyer
2021-01-26 22:47 ` [PATCH v2] libs/light: fix tv_sec printf format Manuel Bouyer
2021-01-26 22:47 ` [PATCH v2] libs/light: fix uuid on NetBSD Manuel Bouyer
2021-01-26 22:47 ` [PATCH v2] libs/light: make it build without setresuid() Manuel Bouyer
2021-01-28 11:06 ` Ian Jackson
2021-01-29 22:51 ` Andrew Cooper
2021-01-29 23:01 ` Manuel Bouyer
2021-01-29 23:05 ` Andrew Cooper
2021-01-29 23:16 ` Manuel Bouyer
2021-01-30 18:28 ` Manuel Bouyer
2021-01-26 22:47 ` [PATCH v2] libs/light: pass some infos to qemu Manuel Bouyer
2021-01-28 11:08 ` Roger Pau Monné
2021-01-29 10:46 ` Manuel Bouyer
2021-01-29 14:52 ` Roger Pau Monné
2021-01-30 23:07 ` Manuel Bouyer
2021-01-30 11:50 ` Manuel Bouyer
2021-02-01 8:06 ` Roger Pau Monné
2021-02-01 9:39 ` Manuel Bouyer
2021-02-01 10:54 ` Roger Pau Monné
2021-02-01 11:21 ` Manuel Bouyer
2021-01-26 22:47 ` [PATCH v2] libs/store: make build without PTHREAD_STACK_MIN Manuel Bouyer
2021-01-28 10:57 ` Roger Pau Monné
2021-01-28 11:08 ` Andrew Cooper
2021-01-29 10:43 ` Manuel Bouyer
2021-01-26 22:48 ` [PATCH v2] xenpmd.c: use dynamic allocation Manuel Bouyer
2021-01-28 10:34 ` Roger Pau Monné
2021-01-27 19:30 ` [PATCH v2] Fix error: array subscript has type 'char' Andrew Cooper
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YBKWkc8mzlaIktD7@Air-de-Roger \
--to=roger.pau@citrix.com \
--cc=bouyer@netbsd.org \
--cc=iwj@xenproject.org \
--cc=wl@xen.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).