* [PATCH v2 0/5] tools/libxendevicemodel
@ 2017-02-22 13:27 Paul Durrant
2017-02-22 13:27 ` [PATCH v2 1/5] tools/libxenctrl: fix error check after opening libxenforeignmemory Paul Durrant
` (4 more replies)
0 siblings, 5 replies; 18+ messages in thread
From: Paul Durrant @ 2017-02-22 13:27 UTC (permalink / raw)
To: xen-devel; +Cc: Paul Durrant
Paul Durrant (5):
tools/libxenctrl: fix error check after opening libxenforeignmemory
tools/libxendevicemodel: introduce the new library
tools/libxendevicemodel: extract functions and add a compat layer
tools/libxendevicemodel: introduce a Linux-specific implementation
tools/libxendevicemodel: add a call to restrict the handle
Config.mk | 12 +-
stubdom/Makefile | 17 +-
tools/Makefile | 2 +
tools/Rules.mk | 10 +-
tools/include/xen-sys/Linux/privcmd.h | 15 +
tools/libs/Makefile | 1 +
tools/libs/devicemodel/Makefile | 72 ++++
tools/libs/devicemodel/compat.c | 54 +++
tools/libs/devicemodel/core.c | 508 ++++++++++++++++++++++++
tools/libs/devicemodel/include/xendevicemodel.h | 308 ++++++++++++++
tools/libs/devicemodel/libxendevicemodel.map | 23 ++
tools/libs/devicemodel/linux.c | 134 +++++++
tools/libs/devicemodel/private.h | 48 +++
tools/libxc/Makefile | 4 +-
tools/libxc/include/xenctrl.h | 197 ---------
tools/libxc/include/xenctrl_compat.h | 47 +++
tools/libxc/xc_devicemodel_compat.c | 139 +++++++
tools/libxc/xc_domain.c | 201 ----------
tools/libxc/xc_misc.c | 154 -------
tools/libxc/xc_private.c | 82 +---
tools/libxc/xc_private.h | 4 +
21 files changed, 1395 insertions(+), 637 deletions(-)
create mode 100644 tools/libs/devicemodel/Makefile
create mode 100644 tools/libs/devicemodel/compat.c
create mode 100644 tools/libs/devicemodel/core.c
create mode 100644 tools/libs/devicemodel/include/xendevicemodel.h
create mode 100644 tools/libs/devicemodel/libxendevicemodel.map
create mode 100644 tools/libs/devicemodel/linux.c
create mode 100644 tools/libs/devicemodel/private.h
create mode 100644 tools/libxc/xc_devicemodel_compat.c
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 18+ messages in thread* [PATCH v2 1/5] tools/libxenctrl: fix error check after opening libxenforeignmemory 2017-02-22 13:27 [PATCH v2 0/5] tools/libxendevicemodel Paul Durrant @ 2017-02-22 13:27 ` Paul Durrant 2017-02-22 14:09 ` Wei Liu 2017-02-22 14:09 ` Ian Jackson 2017-02-22 13:27 ` [PATCH v2 2/5] tools/libxendevicemodel: introduce the new library Paul Durrant ` (3 subsequent siblings) 4 siblings, 2 replies; 18+ messages in thread From: Paul Durrant @ 2017-02-22 13:27 UTC (permalink / raw) To: xen-devel; +Cc: Wei Liu, Paul Durrant, Ian Jackson Checking the value of xch->xcall is clearly incorrect. The code should be checking xch->fmem (i.e. the return of the previously called function). Signed-off-by: Paul Durrant <paul.durrant@citrix.com> --- Cc: Ian Jackson <ian.jackson@eu.citrix.com> Cc: Wei Liu <wei.liu2@citrix.com> --- tools/libxc/xc_private.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/libxc/xc_private.c b/tools/libxc/xc_private.c index f0e089c..9df6925 100644 --- a/tools/libxc/xc_private.c +++ b/tools/libxc/xc_private.c @@ -64,8 +64,7 @@ struct xc_interface_core *xc_interface_open(xentoollog_logger *logger, goto err; xch->fmem = xenforeignmemory_open(xch->error_handler, 0); - - if ( xch->xcall == NULL ) + if ( xch->fmem == NULL ) goto err; return xch; -- 2.1.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [PATCH v2 1/5] tools/libxenctrl: fix error check after opening libxenforeignmemory 2017-02-22 13:27 ` [PATCH v2 1/5] tools/libxenctrl: fix error check after opening libxenforeignmemory Paul Durrant @ 2017-02-22 14:09 ` Wei Liu 2017-04-05 13:25 ` Ian Jackson 2017-02-22 14:09 ` Ian Jackson 1 sibling, 1 reply; 18+ messages in thread From: Wei Liu @ 2017-02-22 14:09 UTC (permalink / raw) To: Paul Durrant; +Cc: xen-devel, Ian Jackson, Wei Liu On Wed, Feb 22, 2017 at 01:27:34PM +0000, Paul Durrant wrote: > Checking the value of xch->xcall is clearly incorrect. The code should be > checking xch->fmem (i.e. the return of the previously called function). > > Signed-off-by: Paul Durrant <paul.durrant@citrix.com> Acked-by: Wei Liu <wei.liu2@citrix.com> Ian, please backport this. > --- > Cc: Ian Jackson <ian.jackson@eu.citrix.com> > Cc: Wei Liu <wei.liu2@citrix.com> > --- > tools/libxc/xc_private.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/tools/libxc/xc_private.c b/tools/libxc/xc_private.c > index f0e089c..9df6925 100644 > --- a/tools/libxc/xc_private.c > +++ b/tools/libxc/xc_private.c > @@ -64,8 +64,7 @@ struct xc_interface_core *xc_interface_open(xentoollog_logger *logger, > goto err; > > xch->fmem = xenforeignmemory_open(xch->error_handler, 0); > - > - if ( xch->xcall == NULL ) > + if ( xch->fmem == NULL ) > goto err; > > return xch; > -- > 2.1.4 > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v2 1/5] tools/libxenctrl: fix error check after opening libxenforeignmemory 2017-02-22 14:09 ` Wei Liu @ 2017-04-05 13:25 ` Ian Jackson 0 siblings, 0 replies; 18+ messages in thread From: Ian Jackson @ 2017-04-05 13:25 UTC (permalink / raw) To: Wei Liu; +Cc: xen-devel, Paul Durrant Wei Liu writes ("Re: [PATCH v2 1/5] tools/libxenctrl: fix error check after opening libxenforeignmemory"): > On Wed, Feb 22, 2017 at 01:27:34PM +0000, Paul Durrant wrote: > > Checking the value of xch->xcall is clearly incorrect. The code should be > > checking xch->fmem (i.e. the return of the previously called function). > > > > Signed-off-by: Paul Durrant <paul.durrant@citrix.com> > > Acked-by: Wei Liu <wei.liu2@citrix.com> > > Ian, please backport this. I hvae applied this to 4.7 and 4.8. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v2 1/5] tools/libxenctrl: fix error check after opening libxenforeignmemory 2017-02-22 13:27 ` [PATCH v2 1/5] tools/libxenctrl: fix error check after opening libxenforeignmemory Paul Durrant 2017-02-22 14:09 ` Wei Liu @ 2017-02-22 14:09 ` Ian Jackson 1 sibling, 0 replies; 18+ messages in thread From: Ian Jackson @ 2017-02-22 14:09 UTC (permalink / raw) To: Paul Durrant; +Cc: xen-devel, Wei Liu Paul Durrant writes ("[PATCH v2 1/5] tools/libxenctrl: fix error check after opening libxenforeignmemory"): > Checking the value of xch->xcall is clearly incorrect. The code should be > checking xch->fmem (i.e. the return of the previously called function). Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH v2 2/5] tools/libxendevicemodel: introduce the new library 2017-02-22 13:27 [PATCH v2 0/5] tools/libxendevicemodel Paul Durrant 2017-02-22 13:27 ` [PATCH v2 1/5] tools/libxenctrl: fix error check after opening libxenforeignmemory Paul Durrant @ 2017-02-22 13:27 ` Paul Durrant 2017-02-22 14:11 ` Ian Jackson 2017-02-22 13:27 ` [PATCH v2 3/5] tools/libxendevicemodel: extract functions and add a compat layer Paul Durrant ` (2 subsequent siblings) 4 siblings, 1 reply; 18+ messages in thread From: Paul Durrant @ 2017-02-22 13:27 UTC (permalink / raw) To: xen-devel; +Cc: Wei Liu, Paul Durrant, Ian Jackson The new xendevicemodel library is intended to be used by all Xen device models such that the only hypercall that use will be the dm_op hypercall added by commit 524a98c2. This patch adds the boilerplate for the new library, with only open() and close() entry points, and calls to those from libxenctrl in preparation for the compat layer added by a subsequent patch. Signed-off-by: Paul Durrant <paul.durrant@citrix.com> Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org> --- Cc: Ian Jackson <ian.jackson@eu.citrix.com> Cc: Wei Liu <wei.liu2@citrix.com> NOTE TO COMMITTERS: The URLs and tags for qemu-xen-traditional and mini-is in the patch to Config.mk need to be substituted with the correct URLs and tags after the appropriate (recently posted) patches have been committed into the master branches. v2: - Added patch to Config.mk --- Config.mk | 12 ++--- stubdom/Makefile | 17 ++++++- tools/Makefile | 1 + tools/Rules.mk | 10 +++- tools/libs/Makefile | 1 + tools/libs/devicemodel/Makefile | 66 ++++++++++++++++++++++++ tools/libs/devicemodel/core.c | 68 +++++++++++++++++++++++++ tools/libs/devicemodel/include/xendevicemodel.h | 40 +++++++++++++++ tools/libs/devicemodel/libxendevicemodel.map | 6 +++ tools/libs/devicemodel/private.h | 22 ++++++++ tools/libxc/Makefile | 3 +- tools/libxc/xc_private.c | 8 +++ tools/libxc/xc_private.h | 4 ++ 13 files changed, 247 insertions(+), 11 deletions(-) create mode 100644 tools/libs/devicemodel/Makefile create mode 100644 tools/libs/devicemodel/core.c create mode 100644 tools/libs/devicemodel/include/xendevicemodel.h create mode 100644 tools/libs/devicemodel/libxendevicemodel.map create mode 100644 tools/libs/devicemodel/private.h diff --git a/Config.mk b/Config.mk index 9a28d15..d6d40cb 100644 --- a/Config.mk +++ b/Config.mk @@ -257,19 +257,19 @@ endif ifeq ($(GIT_HTTP),y) OVMF_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/ovmf.git QEMU_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/qemu-xen.git -QEMU_TRADITIONAL_URL ?= http://xenbits.xen.org/git-http/qemu-xen-traditional.git +QEMU_TRADITIONAL_URL ?= http://xenbits.xen.org/git-http/people/pauldu/qemu-xen-traditional.git SEABIOS_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/seabios.git -MINIOS_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/mini-os.git +MINIOS_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/people/pauldu/mini-os.git else OVMF_UPSTREAM_URL ?= git://xenbits.xen.org/ovmf.git QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-xen.git -QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-traditional.git +QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/people/pauldu/qemu-xen-traditional.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git -MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git +MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/people/pauldu/mini-os.git endif OVMF_UPSTREAM_REVISION ?= 5734d486b6aa0b69a39b2c8d52b355400bcf2551 QEMU_UPSTREAM_REVISION ?= master -MINIOS_UPSTREAM_REVISION ?= 1e8e464febb32428c7651b0b585866e5ee5f786e +MINIOS_UPSTREAM_REVISION ?= master # Tue Dec 13 15:02:02 2016 +0000 # build: prepend OBJ_DIR to linker script @@ -280,7 +280,7 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.10.0 ETHERBOOT_NICS ?= rtl8139 8086100e -QEMU_TRADITIONAL_REVISION ?= b669e922b37b8957248798a5eb7aa96a666cd3fe +QEMU_TRADITIONAL_REVISION ?= master # Mon Nov 14 17:19:46 2016 +0000 # qemu: ioport_read, ioport_write: be defensive about 32-bit addresses diff --git a/stubdom/Makefile b/stubdom/Makefile index f858210..39b81c9 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -337,13 +337,16 @@ libs-$(XEN_TARGET_ARCH)/call/stamp: $(XEN_ROOT)/tools/libs/call/Makefile libs-$(XEN_TARGET_ARCH)/foreignmemory/stamp: $(XEN_ROOT)/tools/libs/foreignmemory/Makefile $(do_links) +libs-$(XEN_TARGET_ARCH)/devicemodel/stamp: $(XEN_ROOT)/tools/libs/devicemodel/Makefile + $(do_links) + libxc-$(XEN_TARGET_ARCH)/stamp: $(XEN_ROOT)/tools/libxc/Makefile $(do_links) xenstore/stamp: $(XEN_ROOT)/tools/xenstore/Makefile $(do_links) -LINK_LIBS_DIRS := toollog evtchn gnttab call foreignmemory +LINK_LIBS_DIRS := toollog evtchn gnttab call foreignmemory devicemodel LINK_DIRS := libxc-$(XEN_TARGET_ARCH) xenstore $(foreach dir,$(LINK_LIBS_DIRS),libs-$(XEN_TARGET_ARCH)/$(dir)) LINK_STAMPS := $(foreach dir,$(LINK_DIRS),$(dir)/stamp) @@ -414,12 +417,21 @@ libs-$(XEN_TARGET_ARCH)/foreignmemory/libxenforeignmemory.a: mk-headers-$(XEN_TA CPPFLAGS="$(TARGET_CPPFLAGS)" CFLAGS="$(TARGET_CFLAGS)" $(MAKE) DESTDIR= -C libs-$(XEN_TARGET_ARCH)/foreignmemory ####### +# libxendevicemodel +####### + +.PHONY: libxendevicemodel +libxendevicemodel: libs-$(XEN_TARGET_ARCH)/devicemodel/libxendevicemodel.a +libs-$(XEN_TARGET_ARCH)/devicemodel/libxendevicemodel.a: mk-headers-$(XEN_TARGET_ARCH) $(NEWLIB_STAMPFILE) + CPPFLAGS="$(TARGET_CPPFLAGS)" CFLAGS="$(TARGET_CFLAGS)" $(MAKE) DESTDIR= -C libs-$(XEN_TARGET_ARCH)/devicemodel + +####### # libxc ####### .PHONY: libxc libxc: libxc-$(XEN_TARGET_ARCH)/libxenctrl.a libxc-$(XEN_TARGET_ARCH)/libxenguest.a -libxc-$(XEN_TARGET_ARCH)/libxenctrl.a: mk-headers-$(XEN_TARGET_ARCH) libxentoollog libxenevtchn libxengnttab libxencall libxenforeignmemory cross-zlib +libxc-$(XEN_TARGET_ARCH)/libxenctrl.a: mk-headers-$(XEN_TARGET_ARCH) libxentoollog libxenevtchn libxengnttab libxencall libxenforeignmemory libxendevicemodel cross-zlib CPPFLAGS="$(TARGET_CPPFLAGS)" CFLAGS="$(TARGET_CFLAGS)" $(MAKE) DESTDIR= CONFIG_LIBXC_MINIOS=y -C libxc-$(XEN_TARGET_ARCH) libxc-$(XEN_TARGET_ARCH)/libxenguest.a: libxc-$(XEN_TARGET_ARCH)/libxenctrl.a @@ -616,6 +628,7 @@ clean: [ ! -e libs-$(XEN_TARGET_ARCH)/gnttab/Makefile ] || $(MAKE) DESTDIR= -C libs-$(XEN_TARGET_ARCH)/gnttab clean [ ! -e libs-$(XEN_TARGET_ARCH)/call/Makefile ] || $(MAKE) DESTDIR= -C libs-$(XEN_TARGET_ARCH)/call clean [ ! -e libs-$(XEN_TARGET_ARCH)/foreignmemory/Makefile ] || $(MAKE) DESTDIR= -C libs-$(XEN_TARGET_ARCH)/foreignmemory clean + [ ! -e libs-$(XEN_TARGET_ARCH)/devicemodel/Makefile ] || $(MAKE) DESTDIR= -C libs-$(XEN_TARGET_ARCH)/devicemodel clean [ ! -e libxc-$(XEN_TARGET_ARCH)/Makefile ] || $(MAKE) DESTDIR= -C libxc-$(XEN_TARGET_ARCH) clean -[ ! -d ioemu ] || $(MAKE) DESTDIR= -C ioemu clean -[ ! -d xenstore ] || $(MAKE) DESTDIR= -C xenstore clean diff --git a/tools/Makefile b/tools/Makefile index 77e0723..0890cc9 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -281,6 +281,7 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find -Wl,-rpath-link=$(XEN_ROOT)/tools/libs/gnttab \ -Wl,-rpath-link=$(XEN_ROOT)/tools/libs/call \ -Wl,-rpath-link=$(XEN_ROOT)/tools/libs/foreignmemory \ + -Wl,-rpath-link=$(XEN_ROOT)/tools/libs/devicemodel \ $(QEMU_UPSTREAM_RPATH)" \ --bindir=$(LIBEXEC_BIN) \ --datadir=$(SHAREDIR)/qemu-xen \ diff --git a/tools/Rules.mk b/tools/Rules.mk index b35999b..e3415f0 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -15,6 +15,7 @@ XEN_LIBXENEVTCHN = $(XEN_ROOT)/tools/libs/evtchn XEN_LIBXENGNTTAB = $(XEN_ROOT)/tools/libs/gnttab XEN_LIBXENCALL = $(XEN_ROOT)/tools/libs/call XEN_LIBXENFOREIGNMEMORY = $(XEN_ROOT)/tools/libs/foreignmemory +XEN_LIBXENDEVICEMODEL = $(XEN_ROOT)/tools/libs/devicemodel XEN_LIBXC = $(XEN_ROOT)/tools/libxc XEN_XENLIGHT = $(XEN_ROOT)/tools/libxl XEN_XENSTORE = $(XEN_ROOT)/tools/xenstore @@ -117,10 +118,15 @@ CFLAGS_libxenforeignmemory = -I$(XEN_LIBXENFOREIGNMEMORY)/include $(CFLAGS_xenin LDLIBS_libxenforeignmemory = $(XEN_LIBXENFOREIGNMEMORY)/libxenforeignmemory$(libextension) SHLIB_libxenforeignmemory = -Wl,-rpath-link=$(XEN_LIBXENFOREIGNMEMORY) +CFLAGS_libxendevicemodel = -I$(XEN_LIBXENDEVICEMODEL)/include $(CFLAGS_xeninclude) +SHDEPS_libxendevicemodel = $(SHLIB_libxentoollog) +LDLIBS_libxendevicemodel = $(XEN_LIBXENDEVICEMODEL)/libxendevicemodel$(libextension) +SHLIB_libxendevicemodel = -Wl,-rpath-link=$(XEN_LIBXENDEVICEMODEL) + # code which compiles against libxenctrl get __XEN_TOOLS__ and # therefore sees the unstable hypercall interfaces. -CFLAGS_libxenctrl = -I$(XEN_LIBXC)/include $(CFLAGS_libxentoollog) $(CFLAGS_libxenforeignmemory) $(CFLAGS_xeninclude) -D__XEN_TOOLS__ -SHDEPS_libxenctrl = $(SHLIB_libxentoollog) $(SHLIB_libxenevtchn) $(SHLIB_libxengnttab) $(SHLIB_libxengntshr) $(SHLIB_libxencall) $(SHLIB_libxenforeignmemory) +CFLAGS_libxenctrl = -I$(XEN_LIBXC)/include $(CFLAGS_libxentoollog) $(CFLAGS_libxenforeignmemory) $(CFLAGS_libxendevicemodel) $(CFLAGS_xeninclude) -D__XEN_TOOLS__ +SHDEPS_libxenctrl = $(SHLIB_libxentoollog) $(SHLIB_libxenevtchn) $(SHLIB_libxengnttab) $(SHLIB_libxengntshr) $(SHLIB_libxencall) $(SHLIB_libxenforeignmemory) $(SHLIB_libxendevicemodel) LDLIBS_libxenctrl = $(SHDEPS_libxenctrl) $(XEN_LIBXC)/libxenctrl$(libextension) SHLIB_libxenctrl = $(SHDEPS_libxenctrl) -Wl,-rpath-link=$(XEN_LIBXC) diff --git a/tools/libs/Makefile b/tools/libs/Makefile index dc5726d..deae4ae 100644 --- a/tools/libs/Makefile +++ b/tools/libs/Makefile @@ -7,5 +7,6 @@ SUBDIRS-y += evtchn SUBDIRS-y += gnttab SUBDIRS-y += call SUBDIRS-y += foreignmemory +SUBDIRS-y += devicemodel all clean install distclean: %: subdirs-% diff --git a/tools/libs/devicemodel/Makefile b/tools/libs/devicemodel/Makefile new file mode 100644 index 0000000..4f1e616 --- /dev/null +++ b/tools/libs/devicemodel/Makefile @@ -0,0 +1,66 @@ +XEN_ROOT = $(CURDIR)/../../.. +include $(XEN_ROOT)/tools/Rules.mk + +MAJOR = 1 +MINOR = 0 +SHLIB_LDFLAGS += -Wl,--version-script=libxendevicemodel.map + +CFLAGS += -Werror -Wmissing-prototypes +CFLAGS += -I./include $(CFLAGS_xeninclude) +CFLAGS += $(CFLAGS_libxentoollog) + +SRCS-y += core.c + +LIB_OBJS := $(patsubst %.c,%.o,$(SRCS-y)) +PIC_OBJS := $(patsubst %.c,%.opic,$(SRCS-y)) + +LIB := libxendevicemodel.a +ifneq ($(nosharedlibs),y) +LIB += libxendevicemodel.so +endif + +.PHONY: all +all: build + +.PHONY: build +build: + $(MAKE) libs + +.PHONY: libs +libs: headers.chk $(LIB) + +headers.chk: $(wildcard include/*.h) + +libxendevicemodel.a: $(LIB_OBJS) + $(AR) rc $@ $^ + +libxendevicemodel.so: libxendevicemodel.so.$(MAJOR) + $(SYMLINK_SHLIB) $< $@ +libxendevicemodel.so.$(MAJOR): libxendevicemodel.so.$(MAJOR).$(MINOR) + $(SYMLINK_SHLIB) $< $@ + +libxendevicemodel.so.$(MAJOR).$(MINOR): $(PIC_OBJS) libxendevicemodel.map + $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxendevicemodel.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(PIC_OBJS) $(LDLIBS_libxentoollog) $(APPEND_LDFLAGS) + +.PHONY: install +install: build + $(INSTALL_DIR) $(DESTDIR)$(libdir) + $(INSTALL_DIR) $(DESTDIR)$(includedir) + $(INSTALL_SHLIB) libxendevicemodel.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir) + $(INSTALL_DATA) libxendevicemodel.a $(DESTDIR)$(libdir) + $(SYMLINK_SHLIB) libxendevicemodel.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)/libxendevicemodel.so.$(MAJOR) + $(SYMLINK_SHLIB) libxendevicemodel.so.$(MAJOR) $(DESTDIR)$(libdir)/libxendevicemodel.so + $(INSTALL_DATA) include/xendevicemodel.h $(DESTDIR)$(includedir) + +.PHONY: TAGS +TAGS: + etags -t *.c *.h + +.PHONY: clean +clean: + rm -rf *.rpm $(LIB) *~ $(DEPS) $(LIB_OBJS) $(PIC_OBJS) + rm -f libxendevicemodel.so.$(MAJOR).$(MINOR) libxendevicemodel.so.$(MAJOR) + rm -f headers.chk + +.PHONY: distclean +distclean: clean diff --git a/tools/libs/devicemodel/core.c b/tools/libs/devicemodel/core.c new file mode 100644 index 0000000..ec18142 --- /dev/null +++ b/tools/libs/devicemodel/core.c @@ -0,0 +1,68 @@ +/* + * Copyright (c) 2017 Citrix Systems Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; If not, see <http://www.gnu.org/licenses/>. + */ + +#include <stdlib.h> + +#include "private.h" + +xendevicemodel_handle *xendevicemodel_open(xentoollog_logger *logger, + unsigned open_flags) +{ + xendevicemodel_handle *dmod = malloc(sizeof(*dmod)); + + if (!dmod) + return NULL; + + dmod->flags = open_flags; + dmod->logger = logger; + dmod->logger_tofree = NULL; + + if (!dmod->logger) { + dmod->logger = dmod->logger_tofree = + (xentoollog_logger*) + xtl_createlogger_stdiostream(stderr, XTL_PROGRESS, 0); + if (!dmod->logger) + goto err; + } + + return dmod; + +err: + xtl_logger_destroy(dmod->logger_tofree); + free(dmod); + return NULL; +} + +int xendevicemodel_close(xendevicemodel_handle *dmod) +{ + if (!dmod) + return 0; + + xtl_logger_destroy(dmod->logger_tofree); + free(dmod); + return 0; +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/tools/libs/devicemodel/include/xendevicemodel.h b/tools/libs/devicemodel/include/xendevicemodel.h new file mode 100644 index 0000000..f977b0e --- /dev/null +++ b/tools/libs/devicemodel/include/xendevicemodel.h @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2017 Citrix Systems Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; If not, see <http://www.gnu.org/licenses/>. + */ +#ifndef XENDEVICEMODEL_H +#define XENDEVICEMODEL_H + +/* Callers who don't care don't need to #include <xentoollog.h> */ +struct xentoollog_logger; + +typedef struct xendevicemodel_handle xendevicemodel_handle; + +xendevicemodel_handle *xendevicemodel_open(struct xentoollog_logger *logger, + unsigned int open_flags); + +int xendevicemodel_close(xendevicemodel_handle *dmod); + +#endif /* XENDEVICEMODEL_H */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/tools/libs/devicemodel/libxendevicemodel.map b/tools/libs/devicemodel/libxendevicemodel.map new file mode 100644 index 0000000..980c429 --- /dev/null +++ b/tools/libs/devicemodel/libxendevicemodel.map @@ -0,0 +1,6 @@ +VERS_1.0 { + global: + xendevicemodel_open; + xendevicemodel_close; + local: *; /* Do not expose anything by default */ +}; diff --git a/tools/libs/devicemodel/private.h b/tools/libs/devicemodel/private.h new file mode 100644 index 0000000..cf1e4b0 --- /dev/null +++ b/tools/libs/devicemodel/private.h @@ -0,0 +1,22 @@ +#ifndef XENDEVICEMODEL_PRIVATE_H +#define XENDEVICEMODEL_PRIVATE_H + +#include <xentoollog.h> +#include <xendevicemodel.h> + +struct xendevicemodel_handle { + xentoollog_logger *logger, *logger_tofree; + unsigned int flags; +}; + +#endif + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile index 37235e3..af5e49c 100644 --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile @@ -113,6 +113,7 @@ CFLAGS-$(CONFIG_Linux) += -D_GNU_SOURCE CFLAGS += $(PTHREAD_CFLAGS) CFLAGS += $(CFLAGS_libxentoollog) CFLAGS += $(CFLAGS_libxenevtchn) +CFLAGS += $(CFLAGS_libxendevicemodel) CTRL_LIB_OBJS := $(patsubst %.c,%.o,$(CTRL_SRCS-y)) CTRL_PIC_OBJS := $(patsubst %.c,%.opic,$(CTRL_SRCS-y)) @@ -217,7 +218,7 @@ libxenctrl.so.$(MAJOR): libxenctrl.so.$(MAJOR).$(MINOR) $(SYMLINK_SHLIB) $< $@ libxenctrl.so.$(MAJOR).$(MINOR): $(CTRL_PIC_OBJS) - $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenctrl.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(LDLIBS_libxentoollog) $(LDLIBS_libxenevtchn) $(LDLIBS_libxengnttab) $(LDLIBS_libxengntshr) $(LDLIBS_libxencall) $(LDLIBS_libxenforeignmemory) $(PTHREAD_LIBS) $(APPEND_LDFLAGS) + $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenctrl.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(LDLIBS_libxentoollog) $(LDLIBS_libxenevtchn) $(LDLIBS_libxengnttab) $(LDLIBS_libxengntshr) $(LDLIBS_libxencall) $(LDLIBS_libxenforeignmemory) $(LDLIBS_libxendevicemodel) $(PTHREAD_LIBS) $(APPEND_LDFLAGS) # libxenguest diff --git a/tools/libxc/xc_private.c b/tools/libxc/xc_private.c index 9df6925..bce7797 100644 --- a/tools/libxc/xc_private.c +++ b/tools/libxc/xc_private.c @@ -67,9 +67,14 @@ struct xc_interface_core *xc_interface_open(xentoollog_logger *logger, if ( xch->fmem == NULL ) goto err; + xch->dmod = xendevicemodel_open(xch->error_handler, 0); + if ( xch->dmod == NULL ) + goto err; + return xch; err: + xenforeignmemory_close(xch->fmem); xencall_close(xch->xcall); xtl_logger_destroy(xch->error_handler_tofree); if (xch != &xch_buf) free(xch); @@ -89,6 +94,9 @@ int xc_interface_close(xc_interface *xch) rc = xenforeignmemory_close(xch->fmem); if (rc) PERROR("Could not close foreign memory interface"); + rc = xendevicemodel_close(xch->dmod); + if (rc) PERROR("Could not close device model interface"); + xtl_logger_destroy(xch->dombuild_logger_tofree); xtl_logger_destroy(xch->error_handler_tofree); diff --git a/tools/libxc/xc_private.h b/tools/libxc/xc_private.h index d0ff4b5..1c27b0f 100644 --- a/tools/libxc/xc_private.h +++ b/tools/libxc/xc_private.h @@ -36,6 +36,7 @@ #include <xencall.h> #include <xenforeignmemory.h> +#include <xendevicemodel.h> #include <xen/sys/privcmd.h> @@ -97,6 +98,9 @@ struct xc_interface_core { /* Foreign mappings */ xenforeignmemory_handle *fmem; + + /* Device model */ + xendevicemodel_handle *dmod; }; int osdep_privcmd_open(xc_interface *xch); -- 2.1.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [PATCH v2 2/5] tools/libxendevicemodel: introduce the new library 2017-02-22 13:27 ` [PATCH v2 2/5] tools/libxendevicemodel: introduce the new library Paul Durrant @ 2017-02-22 14:11 ` Ian Jackson 0 siblings, 0 replies; 18+ messages in thread From: Ian Jackson @ 2017-02-22 14:11 UTC (permalink / raw) To: Paul Durrant; +Cc: xen-devel, Wei Liu Paul Durrant writes ("[PATCH v2 2/5] tools/libxendevicemodel: introduce the new library"): > The new xendevicemodel library is intended to be used by all Xen device > models such that the only hypercall that use will be the dm_op hypercall > added by commit 524a98c2. Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> > NOTE TO COMMITTERS: > > The URLs and tags for qemu-xen-traditional and mini-is in the patch to > Config.mk need to be substituted with the correct URLs and tags after > the appropriate (recently posted) patches have been committed into the > master branches. Just quoting this to avoid it being dropped... Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH v2 3/5] tools/libxendevicemodel: extract functions and add a compat layer 2017-02-22 13:27 [PATCH v2 0/5] tools/libxendevicemodel Paul Durrant 2017-02-22 13:27 ` [PATCH v2 1/5] tools/libxenctrl: fix error check after opening libxenforeignmemory Paul Durrant 2017-02-22 13:27 ` [PATCH v2 2/5] tools/libxendevicemodel: introduce the new library Paul Durrant @ 2017-02-22 13:27 ` Paul Durrant 2017-02-22 14:20 ` Ian Jackson 2017-02-22 13:27 ` [PATCH v2 4/5] tools/libxendevicemodel: introduce a Linux-specific implementation Paul Durrant 2017-02-22 13:27 ` [PATCH v2 5/5] tools/libxendevicemodel: add a call to restrict the handle Paul Durrant 4 siblings, 1 reply; 18+ messages in thread From: Paul Durrant @ 2017-02-22 13:27 UTC (permalink / raw) To: xen-devel; +Cc: Wei Liu, Paul Durrant, Ian Jackson This patch extracts all functions resulting in a dm_op hypercall from libxenctrl and moves them into libxendevicemodel. It also adds a compat layer into libxenctrl, which can be selected by defining XC_WANT_COMPAT_DEVICEMODEL_API to 1 before including xenctrl.h. With this patch the core of libxendevicemodel still uses libxencall to issue the dm_op hypercalls, but this is done by calling through code that can be modified on a per-OS basis. A subsequent patch will add a Linux- specific variant. Signed-off-by: Paul Durrant <paul.durrant@citrix.com> --- Cc: Ian Jackson <ian.jackson@eu.citrix.com> Cc: Wei Liu <wei.liu2@citrix.com> v2: - Re-based on 78da0c2a "libxc: don't pass uninitialized data to do_dm_op()" and corrected implementation of xendevicemodel_track_dirty_vram() accordingly. --- tools/Makefile | 1 + tools/Rules.mk | 2 +- tools/libs/devicemodel/Makefile | 10 +- tools/libs/devicemodel/compat.c | 45 +++ tools/libs/devicemodel/core.c | 435 ++++++++++++++++++++++++ tools/libs/devicemodel/include/xendevicemodel.h | 258 ++++++++++++++ tools/libs/devicemodel/libxendevicemodel.map | 16 + tools/libs/devicemodel/private.h | 19 ++ tools/libxc/Makefile | 1 + tools/libxc/include/xenctrl.h | 197 ----------- tools/libxc/include/xenctrl_compat.h | 47 +++ tools/libxc/xc_devicemodel_compat.c | 139 ++++++++ tools/libxc/xc_domain.c | 201 ----------- tools/libxc/xc_misc.c | 154 --------- tools/libxc/xc_private.c | 73 ---- 15 files changed, 970 insertions(+), 628 deletions(-) create mode 100644 tools/libs/devicemodel/compat.c create mode 100644 tools/libxc/xc_devicemodel_compat.c diff --git a/tools/Makefile b/tools/Makefile index 0890cc9..e6c0cc5 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -262,6 +262,7 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find --extra-cflags="-DXC_WANT_COMPAT_EVTCHN_API=1 \ -DXC_WANT_COMPAT_GNTTAB_API=1 \ -DXC_WANT_COMPAT_MAP_FOREIGN_API=1 \ + -DXC_WANT_COMPAT_DEVICEMODEL_API=1 \ -I$(XEN_ROOT)/tools/include \ -I$(XEN_ROOT)/tools/libs/toollog/include \ -I$(XEN_ROOT)/tools/libs/evtchn/include \ diff --git a/tools/Rules.mk b/tools/Rules.mk index e3415f0..8ea3901 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -119,7 +119,7 @@ LDLIBS_libxenforeignmemory = $(XEN_LIBXENFOREIGNMEMORY)/libxenforeignmemory$(lib SHLIB_libxenforeignmemory = -Wl,-rpath-link=$(XEN_LIBXENFOREIGNMEMORY) CFLAGS_libxendevicemodel = -I$(XEN_LIBXENDEVICEMODEL)/include $(CFLAGS_xeninclude) -SHDEPS_libxendevicemodel = $(SHLIB_libxentoollog) +SHDEPS_libxendevicemodel = $(SHLIB_libxentoollog) $(SHLIB_xencall) LDLIBS_libxendevicemodel = $(XEN_LIBXENDEVICEMODEL)/libxendevicemodel$(libextension) SHLIB_libxendevicemodel = -Wl,-rpath-link=$(XEN_LIBXENDEVICEMODEL) diff --git a/tools/libs/devicemodel/Makefile b/tools/libs/devicemodel/Makefile index 4f1e616..b87bf84 100644 --- a/tools/libs/devicemodel/Makefile +++ b/tools/libs/devicemodel/Makefile @@ -8,8 +8,14 @@ SHLIB_LDFLAGS += -Wl,--version-script=libxendevicemodel.map CFLAGS += -Werror -Wmissing-prototypes CFLAGS += -I./include $(CFLAGS_xeninclude) CFLAGS += $(CFLAGS_libxentoollog) - -SRCS-y += core.c +CFLAGS += $(CFLAGS_libxencall) + +SRCS-y += core.c +SRCS-$(CONFIG_Linux) += compat.c +SRCS-$(CONFIG_FreeBSD) += compat.c +SRCS-$(CONFIG_SunOS) += compat.c +SRCS-$(CONFIG_NetBSD) += compat.c +SRCS-$(CONFIG_MiniOS) += compat.c LIB_OBJS := $(patsubst %.c,%.o,$(SRCS-y)) PIC_OBJS := $(patsubst %.c,%.opic,$(SRCS-y)) diff --git a/tools/libs/devicemodel/compat.c b/tools/libs/devicemodel/compat.c new file mode 100644 index 0000000..245e907 --- /dev/null +++ b/tools/libs/devicemodel/compat.c @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2017 Citrix Systems Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; If not, see <http://www.gnu.org/licenses/>. + */ + +#include "private.h" + +int osdep_xendevicemodel_open(xendevicemodel_handle *dmod) +{ + return 0; +} + +int osdep_xendevicemodel_close(xendevicemodel_handle *dmod) +{ + return 0; +} + +int osdep_xendevicemodel_op(xendevicemodel_handle *dmod, + domid_t domid, unsigned int nr_bufs, + struct xendevicemodel_buf bufs[]) +{ + return xendevicemodel_xcall(dmod, domid, nr_bufs, bufs); +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/tools/libs/devicemodel/core.c b/tools/libs/devicemodel/core.c index ec18142..33ee157 100644 --- a/tools/libs/devicemodel/core.c +++ b/tools/libs/devicemodel/core.c @@ -16,6 +16,8 @@ */ #include <stdlib.h> +#include <string.h> +#include <errno.h> #include "private.h" @@ -23,6 +25,7 @@ xendevicemodel_handle *xendevicemodel_open(xentoollog_logger *logger, unsigned open_flags) { xendevicemodel_handle *dmod = malloc(sizeof(*dmod)); + int rc; if (!dmod) return NULL; @@ -39,6 +42,14 @@ xendevicemodel_handle *xendevicemodel_open(xentoollog_logger *logger, goto err; } + dmod->xcall = xencall_open(dmod->logger, 0); + if (!dmod->xcall) + goto err; + + rc = osdep_xendevicemodel_open(dmod); + if (rc) + goto err; + return dmod; err: @@ -49,14 +60,438 @@ err: int xendevicemodel_close(xendevicemodel_handle *dmod) { + int rc; + if (!dmod) return 0; + rc = osdep_xendevicemodel_close(dmod); + + xencall_close(dmod->xcall); xtl_logger_destroy(dmod->logger_tofree); free(dmod); + return rc; +} + +int xendevicemodel_xcall(xendevicemodel_handle *dmod, + domid_t domid, unsigned int nr_bufs, + struct xendevicemodel_buf bufs[]) +{ + int ret = -1; + void **xcall_bufs; + xen_dm_op_buf_t *op_bufs; + unsigned int i; + + xcall_bufs = calloc(nr_bufs, sizeof(*xcall_bufs)); + if (xcall_bufs == NULL) + goto out; + + op_bufs = xencall_alloc_buffer(dmod->xcall, sizeof(xen_dm_op_buf_t) * + nr_bufs); + if (op_bufs == NULL) + goto out; + + for (i = 0; i < nr_bufs; i++) { + xcall_bufs[i] = xencall_alloc_buffer(dmod->xcall, bufs[i].size); + if ( xcall_bufs[i] == NULL ) + goto out; + + memcpy(xcall_bufs[i], bufs[i].ptr, bufs[i].size); + set_xen_guest_handle_raw(op_bufs[i].h, xcall_bufs[i]); + + op_bufs[i].size = bufs[i].size; + } + + ret = xencall3(dmod->xcall, __HYPERVISOR_dm_op, + domid, nr_bufs, (unsigned long)op_bufs); + if (ret < 0) + goto out; + + for (i = 0; i < nr_bufs; i++) + memcpy(bufs[i].ptr, xcall_bufs[i], bufs[i].size); + +out: + if (xcall_bufs) + for (i = 0; i < nr_bufs; i++) + xencall_free_buffer(dmod->xcall, xcall_bufs[i]); + + xencall_free_buffer(dmod->xcall, op_bufs); + free(xcall_bufs); + + return ret; +} + +static int xendevicemodel_op( + xendevicemodel_handle *dmod, domid_t domid, unsigned int nr_bufs, ...) +{ + struct xendevicemodel_buf *bufs; + va_list args; + unsigned int i; + int ret; + + bufs = calloc(nr_bufs, sizeof(*bufs)); + if (!bufs) + return -1; + + va_start(args, nr_bufs); + for (i = 0; i < nr_bufs; i++) { + bufs[i].ptr = va_arg(args, void *); + bufs[i].size = va_arg(args, size_t); + } + va_end(args); + + ret = osdep_xendevicemodel_op(dmod, domid, nr_bufs, bufs); + + free(bufs); + + return ret; +} + +int xendevicemodel_create_ioreq_server( + xendevicemodel_handle *dmod, domid_t domid, int handle_bufioreq, + ioservid_t *id) +{ + struct xen_dm_op op; + struct xen_dm_op_create_ioreq_server *data; + int rc; + + memset(&op, 0, sizeof(op)); + + op.op = XEN_DMOP_create_ioreq_server; + data = &op.u.create_ioreq_server; + + data->handle_bufioreq = handle_bufioreq; + + rc = xendevicemodel_op(dmod, domid, 1, &op, sizeof(op)); + if (rc) + return rc; + + *id = data->id; + + return 0; +} + +int xendevicemodel_get_ioreq_server_info( + xendevicemodel_handle *dmod, domid_t domid, ioservid_t id, + xen_pfn_t *ioreq_pfn, xen_pfn_t *bufioreq_pfn, + evtchn_port_t *bufioreq_port) +{ + struct xen_dm_op op; + struct xen_dm_op_get_ioreq_server_info *data; + int rc; + + memset(&op, 0, sizeof(op)); + + op.op = XEN_DMOP_get_ioreq_server_info; + data = &op.u.get_ioreq_server_info; + + data->id = id; + + rc = xendevicemodel_op(dmod, domid, 1, &op, sizeof(op)); + if (rc) + return rc; + + if (ioreq_pfn) + *ioreq_pfn = data->ioreq_pfn; + + if (bufioreq_pfn) + *bufioreq_pfn = data->bufioreq_pfn; + + if (bufioreq_port) + *bufioreq_port = data->bufioreq_port; + return 0; } +int xendevicemodel_map_io_range_to_ioreq_server( + xendevicemodel_handle *dmod, domid_t domid, ioservid_t id, int is_mmio, + uint64_t start, uint64_t end) +{ + struct xen_dm_op op; + struct xen_dm_op_ioreq_server_range *data; + + memset(&op, 0, sizeof(op)); + + op.op = XEN_DMOP_map_io_range_to_ioreq_server; + data = &op.u.map_io_range_to_ioreq_server; + + data->id = id; + data->type = is_mmio ? XEN_DMOP_IO_RANGE_MEMORY : XEN_DMOP_IO_RANGE_PORT; + data->start = start; + data->end = end; + + return xendevicemodel_op(dmod, domid, 1, &op, sizeof(op)); +} + +int xendevicemodel_unmap_io_range_from_ioreq_server( + xendevicemodel_handle *dmod, domid_t domid, ioservid_t id, int is_mmio, + uint64_t start, uint64_t end) +{ + struct xen_dm_op op; + struct xen_dm_op_ioreq_server_range *data; + + memset(&op, 0, sizeof(op)); + + op.op = XEN_DMOP_unmap_io_range_from_ioreq_server; + data = &op.u.unmap_io_range_from_ioreq_server; + + data->id = id; + data->type = is_mmio ? XEN_DMOP_IO_RANGE_MEMORY : XEN_DMOP_IO_RANGE_PORT; + data->start = start; + data->end = end; + + return xendevicemodel_op(dmod, domid, 1, &op, sizeof(op)); +} + +int xendevicemodel_map_pcidev_to_ioreq_server( + xendevicemodel_handle *dmod, domid_t domid, ioservid_t id, + uint16_t segment, uint8_t bus, uint8_t device, uint8_t function) +{ + struct xen_dm_op op; + struct xen_dm_op_ioreq_server_range *data; + + if (device > 0x1f || function > 0x7) { + errno = EINVAL; + return -1; + } + + memset(&op, 0, sizeof(op)); + + op.op = XEN_DMOP_map_io_range_to_ioreq_server; + data = &op.u.map_io_range_to_ioreq_server; + + data->id = id; + data->type = XEN_DMOP_IO_RANGE_PCI; + + /* + * The underlying hypercall will deal with ranges of PCI SBDF + * but, for simplicity, the API only uses singletons. + */ + data->start = data->end = XEN_DMOP_PCI_SBDF((uint64_t)segment, + (uint64_t)bus, + (uint64_t)device, + (uint64_t)function); + + return xendevicemodel_op(dmod, domid, 1, &op, sizeof(op)); +} + +int xendevicemodel_unmap_pcidev_from_ioreq_server( + xendevicemodel_handle *dmod, domid_t domid, ioservid_t id, + uint16_t segment, uint8_t bus, uint8_t device, uint8_t function) +{ + struct xen_dm_op op; + struct xen_dm_op_ioreq_server_range *data; + + if (device > 0x1f || function > 0x7) { + errno = EINVAL; + return -1; + } + + memset(&op, 0, sizeof(op)); + + op.op = XEN_DMOP_unmap_io_range_from_ioreq_server; + data = &op.u.unmap_io_range_from_ioreq_server; + + data->id = id; + data->type = XEN_DMOP_IO_RANGE_PCI; + + /* + * The underlying hypercall will deal with ranges of PCI SBDF + * but, for simplicity, the API only uses singletons. + */ + data->start = data->end = XEN_DMOP_PCI_SBDF((uint64_t)segment, + (uint64_t)bus, + (uint64_t)device, + (uint64_t)function); + + return xendevicemodel_op(dmod, domid, 1, &op, sizeof(op)); +} + +int xendevicemodel_destroy_ioreq_server( + xendevicemodel_handle *dmod, domid_t domid, ioservid_t id) +{ + struct xen_dm_op op; + struct xen_dm_op_destroy_ioreq_server *data; + + memset(&op, 0, sizeof(op)); + + op.op = XEN_DMOP_destroy_ioreq_server; + data = &op.u.destroy_ioreq_server; + + data->id = id; + + return xendevicemodel_op(dmod, domid, 1, &op, sizeof(op)); +} + +int xendevicemodel_set_ioreq_server_state( + xendevicemodel_handle *dmod, domid_t domid, ioservid_t id, int enabled) +{ + struct xen_dm_op op; + struct xen_dm_op_set_ioreq_server_state *data; + + memset(&op, 0, sizeof(op)); + + op.op = XEN_DMOP_set_ioreq_server_state; + data = &op.u.set_ioreq_server_state; + + data->id = id; + data->enabled = !!enabled; + + return xendevicemodel_op(dmod, domid, 1, &op, sizeof(op)); +} + +int xendevicemodel_set_pci_intx_level( + xendevicemodel_handle *dmod, domid_t domid, uint16_t segment, + uint8_t bus, uint8_t device, uint8_t intx, unsigned int level) +{ + struct xen_dm_op op; + struct xen_dm_op_set_pci_intx_level *data; + + memset(&op, 0, sizeof(op)); + + op.op = XEN_DMOP_set_pci_intx_level; + data = &op.u.set_pci_intx_level; + + data->domain = segment; + data->bus = bus; + data->device = device; + data->intx = intx; + data->level = level; + + return xendevicemodel_op(dmod, domid, 1, &op, sizeof(op)); +} + +int xendevicemodel_set_isa_irq_level( + xendevicemodel_handle *dmod, domid_t domid, uint8_t irq, + unsigned int level) +{ + struct xen_dm_op op; + struct xen_dm_op_set_isa_irq_level *data; + + memset(&op, 0, sizeof(op)); + + op.op = XEN_DMOP_set_isa_irq_level; + data = &op.u.set_isa_irq_level; + + data->isa_irq = irq; + data->level = level; + + return xendevicemodel_op(dmod, domid, 1, &op, sizeof(op)); +} + +int xendevicemodel_set_pci_link_route( + xendevicemodel_handle *dmod, domid_t domid, uint8_t link, uint8_t irq) +{ + struct xen_dm_op op; + struct xen_dm_op_set_pci_link_route *data; + + memset(&op, 0, sizeof(op)); + + op.op = XEN_DMOP_set_pci_link_route; + data = &op.u.set_pci_link_route; + + data->link = link; + data->isa_irq = irq; + + return xendevicemodel_op(dmod, domid, 1, &op, sizeof(op)); +} + +int xendevicemodel_inject_msi( + xendevicemodel_handle *dmod, domid_t domid, uint64_t msi_addr, + uint32_t msi_data) +{ + struct xen_dm_op op; + struct xen_dm_op_inject_msi *data; + + memset(&op, 0, sizeof(op)); + + op.op = XEN_DMOP_inject_msi; + data = &op.u.inject_msi; + + data->addr = msi_addr; + data->data = msi_data; + + return xendevicemodel_op(dmod, domid, 1, &op, sizeof(op)); +} + +int xendevicemodel_track_dirty_vram( + xendevicemodel_handle *dmod, domid_t domid, uint64_t first_pfn, + uint32_t nr, unsigned long *dirty_bitmap) +{ + struct xen_dm_op op; + struct xen_dm_op_track_dirty_vram *data; + + memset(&op, 0, sizeof(op)); + + op.op = XEN_DMOP_track_dirty_vram; + data = &op.u.track_dirty_vram; + + data->first_pfn = first_pfn; + data->nr = nr; + + return xendevicemodel_op(dmod, domid, 2, &op, sizeof(op), + dirty_bitmap, (size_t)(nr + 7) / 8); +} + +int xendevicemodel_modified_memory( + xendevicemodel_handle *dmod, domid_t domid, uint64_t first_pfn, + uint32_t nr) +{ + struct xen_dm_op op; + struct xen_dm_op_modified_memory *data; + + memset(&op, 0, sizeof(op)); + + op.op = XEN_DMOP_modified_memory; + data = &op.u.modified_memory; + + data->first_pfn = first_pfn; + data->nr = nr; + + return xendevicemodel_op(dmod, domid, 1, &op, sizeof(op)); +} + +int xendevicemodel_set_mem_type( + xendevicemodel_handle *dmod, domid_t domid, hvmmem_type_t mem_type, + uint64_t first_pfn, uint32_t nr) +{ + struct xen_dm_op op; + struct xen_dm_op_set_mem_type *data; + + memset(&op, 0, sizeof(op)); + + op.op = XEN_DMOP_set_mem_type; + data = &op.u.set_mem_type; + + data->mem_type = mem_type; + data->first_pfn = first_pfn; + data->nr = nr; + + return xendevicemodel_op(dmod, domid, 1, &op, sizeof(op)); +} + +int xendevicemodel_inject_event( + xendevicemodel_handle *dmod, domid_t domid, int vcpu, uint8_t vector, + uint8_t type, uint32_t error_code, uint8_t insn_len, uint64_t cr2) +{ + struct xen_dm_op op; + struct xen_dm_op_inject_event *data; + + memset(&op, 0, sizeof(op)); + + op.op = XEN_DMOP_inject_event; + data = &op.u.inject_event; + + data->vcpuid = vcpu; + data->vector = vector; + data->type = type; + data->error_code = error_code; + data->insn_len = insn_len; + data->cr2 = cr2; + + return xendevicemodel_op(dmod, domid, 1, &op, sizeof(op)); +} + /* * Local variables: * mode: C diff --git a/tools/libs/devicemodel/include/xendevicemodel.h b/tools/libs/devicemodel/include/xendevicemodel.h index f977b0e..e00f8da 100644 --- a/tools/libs/devicemodel/include/xendevicemodel.h +++ b/tools/libs/devicemodel/include/xendevicemodel.h @@ -17,6 +17,14 @@ #ifndef XENDEVICEMODEL_H #define XENDEVICEMODEL_H +#ifdef __XEN_TOOLS__ + +#include <stdint.h> + +#include <xen/xen.h> +#include <xen/hvm/dm_op.h> +#include <xen/hvm/hvm_op.h> + /* Callers who don't care don't need to #include <xentoollog.h> */ struct xentoollog_logger; @@ -27,6 +35,256 @@ xendevicemodel_handle *xendevicemodel_open(struct xentoollog_logger *logger, int xendevicemodel_close(xendevicemodel_handle *dmod); +/* + * IOREQ Server API. (See section on IOREQ Servers in public/hvm_op.h). + */ + +/** + * This function instantiates an IOREQ Server. + * + * @parm dmod a handle to an open devicemodel interface. + * @parm domid the domain id to be serviced + * @parm handle_bufioreq how should the IOREQ Server handle buffered + * requests (HVM_IOREQSRV_BUFIOREQ_*)? + * @parm id pointer to an ioservid_t to receive the IOREQ Server id. + * @return 0 on success, -1 on failure. + */ +int xendevicemodel_create_ioreq_server( + xendevicemodel_handle *dmod, domid_t domid, int handle_bufioreq, + ioservid_t *id); + +/** + * This function retrieves the necessary information to allow an + * emulator to use an IOREQ Server. + * + * @parm dmod a handle to an open devicemodel interface. + * @parm domid the domain id to be serviced + * @parm id the IOREQ Server id. + * @parm ioreq_pfn pointer to a xen_pfn_t to receive the synchronous ioreq + * gmfn + * @parm bufioreq_pfn pointer to a xen_pfn_t to receive the buffered ioreq + * gmfn + * @parm bufioreq_port pointer to a evtchn_port_t to receive the buffered + * ioreq event channel + * @return 0 on success, -1 on failure. + */ +int xendevicemodel_get_ioreq_server_info( + xendevicemodel_handle *dmod, domid_t domid, ioservid_t id, + xen_pfn_t *ioreq_pfn, xen_pfn_t *bufioreq_pfn, + evtchn_port_t *bufioreq_port); + +/** + * This function registers a range of memory or I/O ports for emulation. + * + * @parm dmod a handle to an open devicemodel interface. + * @parm domid the domain id to be serviced + * @parm id the IOREQ Server id. + * @parm is_mmio is this a range of ports or memory + * @parm start start of range + * @parm end end of range (inclusive). + * @return 0 on success, -1 on failure. + */ +int xendevicemodel_map_io_range_to_ioreq_server( + xendevicemodel_handle *dmod, domid_t domid, ioservid_t id, int is_mmio, + uint64_t start, uint64_t end); + +/** + * This function deregisters a range of memory or I/O ports for emulation. + * + * @parm dmod a handle to an open devicemodel interface. + * @parm domid the domain id to be serviced + * @parm id the IOREQ Server id. + * @parm is_mmio is this a range of ports or memory + * @parm start start of range + * @parm end end of range (inclusive). + * @return 0 on success, -1 on failure. + */ +int xendevicemodel_unmap_io_range_from_ioreq_server( + xendevicemodel_handle *dmod, domid_t domid, ioservid_t id, int is_mmio, + uint64_t start, uint64_t end); + +/** + * This function registers a PCI device for config space emulation. + * + * @parm dmod a handle to an open devicemodel interface. + * @parm domid the domain id to be serviced + * @parm id the IOREQ Server id. + * @parm segment the PCI segment of the device + * @parm bus the PCI bus of the device + * @parm device the 'slot' number of the device + * @parm function the function number of the device + * @return 0 on success, -1 on failure. + */ +int xendevicemodel_map_pcidev_to_ioreq_server( + xendevicemodel_handle *dmod, domid_t domid, ioservid_t id, + uint16_t segment, uint8_t bus, uint8_t device, uint8_t function); + +/** + * This function deregisters a PCI device for config space emulation. + * + * @parm dmod a handle to an open devicemodel interface. + * @parm domid the domain id to be serviced + * @parm id the IOREQ Server id. + * @parm segment the PCI segment of the device + * @parm bus the PCI bus of the device + * @parm device the 'slot' number of the device + * @parm function the function number of the device + * @return 0 on success, -1 on failure. + */ +int xendevicemodel_unmap_pcidev_from_ioreq_server( + xendevicemodel_handle *dmod, domid_t domid, ioservid_t id, + uint16_t segment, uint8_t bus, uint8_t device, uint8_t function); + +/** + * This function destroys an IOREQ Server. + * + * @parm dmod a handle to an open devicemodel interface. + * @parm domid the domain id to be serviced + * @parm id the IOREQ Server id. + * @return 0 on success, -1 on failure. + */ +int xendevicemodel_destroy_ioreq_server( + xendevicemodel_handle *dmod, domid_t domid, ioservid_t id); + +/** + * This function sets IOREQ Server state. An IOREQ Server + * will not be passed emulation requests until it is in + * the enabled state. + * Note that the contents of the ioreq_pfn and bufioreq_pfn are + * not meaningful until the IOREQ Server is in the enabled state. + * + * @parm dmod a handle to an open devicemodel interface. + * @parm domid the domain id to be serviced + * @parm id the IOREQ Server id. + * @parm enabled the state. + * @return 0 on success, -1 on failure. + */ +int xendevicemodel_set_ioreq_server_state( + xendevicemodel_handle *dmod, domid_t domid, ioservid_t id, int enabled); + +/** + * This function sets the level of INTx pin of an emulated PCI device. + * + * @parm dmod a handle to an open devicemodel interface. + * @parm domid the domain id to be serviced + * @parm segment the PCI segment number of the emulated device + * @parm bus the PCI bus number of the emulated device + * @parm device the PCI device number of the emulated device + * @parm intx the INTx pin to modify (0 => A .. 3 => D) + * @parm level the level (1 for asserted, 0 for de-asserted) + * @return 0 on success, -1 on failure. + */ +int xendevicemodel_set_pci_intx_level( + xendevicemodel_handle *dmod, domid_t domid, uint16_t segment, + uint8_t bus, uint8_t device, uint8_t intx, unsigned int level); + +/** + * This function sets the level of an ISA IRQ line. + * + * @parm dmod a handle to an open devicemodel interface. + * @parm domid the domain id to be serviced + * @parm irq the IRQ number (0 - 15) + * @parm level the level (1 for asserted, 0 for de-asserted) + * @return 0 on success, -1 on failure. + */ +int xendevicemodel_set_isa_irq_level( + xendevicemodel_handle *dmod, domid_t domid, uint8_t irq, + unsigned int level); + +/** + * This function maps a PCI INTx line to a an IRQ line. + * + * @parm dmod a handle to an open devicemodel interface. + * @parm domid the domain id to be serviced + * @parm line the INTx line (0 => A .. 3 => B) + * @parm irq the IRQ number (0 - 15) + * @return 0 on success, -1 on failure. + */ +int xendevicemodel_set_pci_link_route( + xendevicemodel_handle *dmod, domid_t domid, uint8_t link, uint8_t irq); + +/** + * This function injects an MSI into a guest. + * + * @parm dmod a handle to an open devicemodel interface. + * @parm domid the domain id to be serviced + * @parm msi_addr the MSI address (0xfeexxxxx) + * @parm msi_data the MSI data + * @return 0 on success, -1 on failure. +*/ +int xendevicemodel_inject_msi( + xendevicemodel_handle *dmod, domid_t domid, uint64_t msi_addr, + uint32_t msi_data); + +/** + * This function enables tracking of changes in the VRAM area. + * + * The following is done atomically: + * - get the dirty bitmap since the last call. + * - set up dirty tracking area for period up to the next call. + * - clear the dirty tracking area. + * + * @parm dmod a handle to an open devicemodel interface. + * @parm domid the domain id to be serviced + * @parm first_pfn the start of the area to track + * @parm nr the number of pages to track + * @parm dirty_bitmal a pointer to the bitmap to be updated + * @return 0 on success, -1 on failure. + */ +int xendevicemodel_track_dirty_vram( + xendevicemodel_handle *dmod, domid_t domid, uint64_t first_pfn, + uint32_t nr, unsigned long *dirty_bitmap); + +/** + * This function notifies the hypervisor that a set of domain pages + * have been modified. + * + * @parm dmod a handle to an open devicemodel interface. + * @parm domid the domain id to be serviced + * @parm first_pfn the start of the modified area + * @parm nr the number of pages modified + * @return 0 on success, -1 on failure. + */ +int xendevicemodel_modified_memory( + xendevicemodel_handle *dmod, domid_t domid, uint64_t first_pfn, + uint32_t nr); + +/** + * This function notifies the hypervisor that a set of domain pages + * are to be treated in a specific way. (See the definition of + * hvmmem_type_t). + * + * @parm dmod a handle to an open devicemodel interface. + * @parm domid the domain id to be serviced + * @parm mem_type determines how the set is to be treated + * @parm first_pfn the start of the set + * @parm nr the number of pages in the set + * @return 0 on success, -1 on failure. + */ +int xendevicemodel_set_mem_type( + xendevicemodel_handle *dmod, domid_t domid, hvmmem_type_t mem_type, + uint64_t first_pfn, uint32_t nr); + +/** + * This function injects an event into a vCPU to take effect the next + * time it resumes. + * + * @parm dmod a handle to an open devicemodel interface. + * @parm domid the domain id to be serviced + * @parm vcpu the vcpu id + * @parm vector the interrupt vector + * @parm type the event type (see the definition of enum x86_event_type) + * @parm error_code the error code or ~0 to skip + * @parm insn_len the instruction length + * @parm cr2 the value of CR2 for page faults + * @return 0 on success, -1 on failure. + */ +int xendevicemodel_inject_event( + xendevicemodel_handle *dmod, domid_t domid, int vcpu, uint8_t vector, + uint8_t type, uint32_t error_code, uint8_t insn_len, uint64_t cr2); + +#endif /* __XEN_TOOLS__ */ + #endif /* XENDEVICEMODEL_H */ /* diff --git a/tools/libs/devicemodel/libxendevicemodel.map b/tools/libs/devicemodel/libxendevicemodel.map index 980c429..abc6d06 100644 --- a/tools/libs/devicemodel/libxendevicemodel.map +++ b/tools/libs/devicemodel/libxendevicemodel.map @@ -1,6 +1,22 @@ VERS_1.0 { global: xendevicemodel_open; + xendevicemodel_create_ioreq_server; + xendevicemodel_get_ioreq_server_info; + xendevicemodel_map_io_range_to_ioreq_server; + xendevicemodel_unmap_io_range_from_ioreq_server; + xendevicemodel_map_pcidev_to_ioreq_server; + xendevicemodel_unmap_pcidev_from_ioreq_server; + xendevicemodel_destroy_ioreq_server; + xendevicemodel_set_ioreq_server_state; + xendevicemodel_set_pci_intx_level; + xendevicemodel_set_isa_irq_level; + xendevicemodel_set_pci_link_route; + xendevicemodel_inject_msi; + xendevicemodel_track_dirty_vram; + xendevicemodel_modified_memory; + xendevicemodel_set_mem_type; + xendevicemodel_inject_event; xendevicemodel_close; local: *; /* Do not expose anything by default */ }; diff --git a/tools/libs/devicemodel/private.h b/tools/libs/devicemodel/private.h index cf1e4b0..7c7acf2 100644 --- a/tools/libs/devicemodel/private.h +++ b/tools/libs/devicemodel/private.h @@ -1,14 +1,33 @@ #ifndef XENDEVICEMODEL_PRIVATE_H #define XENDEVICEMODEL_PRIVATE_H +#define __XEN_TOOLS__ 1 + #include <xentoollog.h> #include <xendevicemodel.h> +#include <xencall.h> struct xendevicemodel_handle { xentoollog_logger *logger, *logger_tofree; unsigned int flags; + xencall_handle *xcall; +}; + +struct xendevicemodel_buf { + void *ptr; + size_t size; }; +int xendevicemodel_xcall(xendevicemodel_handle *dmod, + domid_t domid, unsigned int nr_bufs, + struct xendevicemodel_buf bufs[]); + +int osdep_xendevicemodel_open(xendevicemodel_handle *dmod); +int osdep_xendevicemodel_close(xendevicemodel_handle *dmod); +int osdep_xendevicemodel_op(xendevicemodel_handle *dmod, + domid_t domid, unsigned int nr_bufs, + struct xendevicemodel_buf bufs[]); + #endif /* diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile index af5e49c..da689c4 100644 --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile @@ -50,6 +50,7 @@ CTRL_SRCS-$(CONFIG_NetBSDRump) += xc_netbsd.c CTRL_SRCS-$(CONFIG_MiniOS) += xc_minios.c CTRL_SRCS-y += xc_evtchn_compat.c CTRL_SRCS-y += xc_gnttab_compat.c +CTRL_SRCS-y += xc_devicemodel_compat.c GUEST_SRCS-y := GUEST_SRCS-y += xg_private.c xc_suspend.c diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index 927e373..a48981a 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -1594,59 +1594,6 @@ int xc_physdev_unmap_pirq(xc_interface *xch, int domid, int pirq); -int xc_hvm_set_pci_intx_level( - xc_interface *xch, domid_t dom, - uint16_t domain, uint8_t bus, uint8_t device, uint8_t intx, - unsigned int level); -int xc_hvm_set_isa_irq_level( - xc_interface *xch, domid_t dom, - uint8_t isa_irq, - unsigned int level); - -int xc_hvm_set_pci_link_route( - xc_interface *xch, domid_t dom, uint8_t link, uint8_t isa_irq); - -int xc_hvm_inject_msi( - xc_interface *xch, domid_t dom, uint64_t addr, uint32_t data); - -/* - * Track dirty bit changes in the VRAM area - * - * All of this is done atomically: - * - get the dirty bitmap since the last call - * - set up dirty tracking area for period up to the next call - * - clear the dirty tracking area. - * - * Returns -ENODATA and does not fill bitmap if the area has changed since the - * last call. - */ -int xc_hvm_track_dirty_vram( - xc_interface *xch, domid_t dom, - uint64_t first_pfn, uint32_t nr, - unsigned long *bitmap); - -/* - * Notify that some pages got modified by the Device Model - */ -int xc_hvm_modified_memory( - xc_interface *xch, domid_t dom, uint64_t first_pfn, uint32_t nr); - -/* - * Set a range of memory to a specific type. - * Allowed types are HVMMEM_ram_rw, HVMMEM_ram_ro, HVMMEM_mmio_dm - */ -int xc_hvm_set_mem_type( - xc_interface *xch, domid_t dom, hvmmem_type_t memtype, uint64_t first_pfn, uint32_t nr); - -/* - * Injects a hardware/software CPU trap, to take effect the next time the HVM - * resumes. - */ -int xc_hvm_inject_trap( - xc_interface *xch, domid_t dom, int vcpu, uint8_t vector, - uint8_t type, uint32_t error_code, uint8_t insn_len, - uint64_t cr2); - /* * LOGGING AND ERROR REPORTING */ @@ -1691,150 +1638,6 @@ int xc_hvm_param_get(xc_interface *handle, domid_t dom, uint32_t param, uint64_t int xc_set_hvm_param(xc_interface *handle, domid_t dom, int param, unsigned long value); int xc_get_hvm_param(xc_interface *handle, domid_t dom, int param, unsigned long *value); -/* - * IOREQ Server API. (See section on IOREQ Servers in public/hvm_op.h). - */ - -/** - * This function instantiates an IOREQ Server. - * - * @parm xch a handle to an open hypervisor interface. - * @parm domid the domain id to be serviced - * @parm handle_bufioreq how should the IOREQ Server handle buffered requests - * (HVM_IOREQSRV_BUFIOREQ_*)? - * @parm id pointer to an ioservid_t to receive the IOREQ Server id. - * @return 0 on success, -1 on failure. - */ -int xc_hvm_create_ioreq_server(xc_interface *xch, - domid_t domid, - int handle_bufioreq, - ioservid_t *id); - -/** - * This function retrieves the necessary information to allow an - * emulator to use an IOREQ Server. - * - * @parm xch a handle to an open hypervisor interface. - * @parm domid the domain id to be serviced - * @parm id the IOREQ Server id. - * @parm ioreq_pfn pointer to a xen_pfn_t to receive the synchronous ioreq gmfn - * @parm bufioreq_pfn pointer to a xen_pfn_t to receive the buffered ioreq gmfn - * @parm bufioreq_port pointer to a evtchn_port_t to receive the buffered ioreq event channel - * @return 0 on success, -1 on failure. - */ -int xc_hvm_get_ioreq_server_info(xc_interface *xch, - domid_t domid, - ioservid_t id, - xen_pfn_t *ioreq_pfn, - xen_pfn_t *bufioreq_pfn, - evtchn_port_t *bufioreq_port); - -/** - * This function sets IOREQ Server state. An IOREQ Server - * will not be passed emulation requests until it is in - * the enabled state. - * Note that the contents of the ioreq_pfn and bufioreq_pfn are - * not meaningful until the IOREQ Server is in the enabled state. - * - * @parm xch a handle to an open hypervisor interface. - * @parm domid the domain id to be serviced - * @parm id the IOREQ Server id. - * @parm enabled the state. - * @return 0 on success, -1 on failure. - */ -int xc_hvm_set_ioreq_server_state(xc_interface *xch, - domid_t domid, - ioservid_t id, - int enabled); - -/** - * This function registers a range of memory or I/O ports for emulation. - * - * @parm xch a handle to an open hypervisor interface. - * @parm domid the domain id to be serviced - * @parm id the IOREQ Server id. - * @parm is_mmio is this a range of ports or memory - * @parm start start of range - * @parm end end of range (inclusive). - * @return 0 on success, -1 on failure. - */ -int xc_hvm_map_io_range_to_ioreq_server(xc_interface *xch, - domid_t domid, - ioservid_t id, - int is_mmio, - uint64_t start, - uint64_t end); - -/** - * This function deregisters a range of memory or I/O ports for emulation. - * - * @parm xch a handle to an open hypervisor interface. - * @parm domid the domain id to be serviced - * @parm id the IOREQ Server id. - * @parm is_mmio is this a range of ports or memory - * @parm start start of range - * @parm end end of range (inclusive). - * @return 0 on success, -1 on failure. - */ -int xc_hvm_unmap_io_range_from_ioreq_server(xc_interface *xch, - domid_t domid, - ioservid_t id, - int is_mmio, - uint64_t start, - uint64_t end); - -/** - * This function registers a PCI device for config space emulation. - * - * @parm xch a handle to an open hypervisor interface. - * @parm domid the domain id to be serviced - * @parm id the IOREQ Server id. - * @parm segment the PCI segment of the device - * @parm bus the PCI bus of the device - * @parm device the 'slot' number of the device - * @parm function the function number of the device - * @return 0 on success, -1 on failure. - */ -int xc_hvm_map_pcidev_to_ioreq_server(xc_interface *xch, - domid_t domid, - ioservid_t id, - uint16_t segment, - uint8_t bus, - uint8_t device, - uint8_t function); - -/** - * This function deregisters a PCI device for config space emulation. - * - * @parm xch a handle to an open hypervisor interface. - * @parm domid the domain id to be serviced - * @parm id the IOREQ Server id. - * @parm segment the PCI segment of the device - * @parm bus the PCI bus of the device - * @parm device the 'slot' number of the device - * @parm function the function number of the device - * @return 0 on success, -1 on failure. - */ -int xc_hvm_unmap_pcidev_from_ioreq_server(xc_interface *xch, - domid_t domid, - ioservid_t id, - uint16_t segment, - uint8_t bus, - uint8_t device, - uint8_t function); - -/** - * This function destroys an IOREQ Server. - * - * @parm xch a handle to an open hypervisor interface. - * @parm domid the domain id to be serviced - * @parm id the IOREQ Server id. - * @return 0 on success, -1 on failure. - */ -int xc_hvm_destroy_ioreq_server(xc_interface *xch, - domid_t domid, - ioservid_t id); - /* HVM guest pass-through */ int xc_assign_device(xc_interface *xch, uint32_t domid, diff --git a/tools/libxc/include/xenctrl_compat.h b/tools/libxc/include/xenctrl_compat.h index 93ccadb..040e7b2 100644 --- a/tools/libxc/include/xenctrl_compat.h +++ b/tools/libxc/include/xenctrl_compat.h @@ -120,6 +120,53 @@ int xc_gntshr_munmap(xc_gntshr *xcg, void *start_address, uint32_t count); #endif /* XC_WANT_COMPAT_GNTTAB_API */ +#ifdef XC_WANT_COMPAT_DEVICEMODEL_API + +int xc_hvm_create_ioreq_server( + xc_interface *xch, domid_t domid, int handle_bufioreq, + ioservid_t *id); +int xc_hvm_get_ioreq_server_info( + xc_interface *xch, domid_t domid, ioservid_t id, xen_pfn_t *ioreq_pfn, + xen_pfn_t *bufioreq_pfn, evtchn_port_t *bufioreq_port); +int xc_hvm_map_io_range_to_ioreq_server( + xc_interface *xch, domid_t domid, ioservid_t id, int is_mmio, + uint64_t start, uint64_t end); +int xc_hvm_unmap_io_range_from_ioreq_server( + xc_interface *xch, domid_t domid, ioservid_t id, int is_mmio, + uint64_t start, uint64_t end); +int xc_hvm_map_pcidev_to_ioreq_server( + xc_interface *xch, domid_t domid, ioservid_t id, uint16_t segment, + uint8_t bus, uint8_t device, uint8_t function); +int xc_hvm_unmap_pcidev_from_ioreq_server( + xc_interface *xch, domid_t domid, ioservid_t id, uint16_t segment, + uint8_t bus, uint8_t device, uint8_t function); +int xc_hvm_destroy_ioreq_server( + xc_interface *xch, domid_t domid, ioservid_t id); +int xc_hvm_set_ioreq_server_state( + xc_interface *xch, domid_t domid, ioservid_t id, int enabled); +int xc_hvm_set_pci_intx_level( + xc_interface *xch, domid_t domid, uint16_t segment, uint8_t bus, + uint8_t device, uint8_t intx, unsigned int level); +int xc_hvm_set_isa_irq_level( + xc_interface *xch, domid_t domid, uint8_t irq, unsigned int level); +int xc_hvm_set_pci_link_route( + xc_interface *xch, domid_t domid, uint8_t link, uint8_t irq); +int xc_hvm_inject_msi( + xc_interface *xch, domid_t domid, uint64_t msi_addr, uint32_t msi_data); +int xc_hvm_track_dirty_vram( + xc_interface *xch, domid_t domid, uint64_t first_pfn, uint32_t nr, + unsigned long *dirty_bitmap); +int xc_hvm_modified_memory( + xc_interface *xch, domid_t domid, uint64_t first_pfn, uint32_t nr); +int xc_hvm_set_mem_type( + xc_interface *xch, domid_t domid, hvmmem_type_t type, + uint64_t first_pfn, uint32_t nr); +int xc_hvm_inject_trap( + xc_interface *xch, domid_t domid, int vcpu, uint8_t vector, + uint8_t type, uint32_t error_code, uint8_t insn_len, uint64_t cr2); + +#endif /* XC_WANT_COMPAT_DEVICEMODEL_API */ + #endif /* diff --git a/tools/libxc/xc_devicemodel_compat.c b/tools/libxc/xc_devicemodel_compat.c new file mode 100644 index 0000000..e4edeea --- /dev/null +++ b/tools/libxc/xc_devicemodel_compat.c @@ -0,0 +1,139 @@ +/* + * Compat shims for use of 3rd party consumers of libxenctrl device model + * functionality which has been split into separate libraries. + */ + +#define XC_WANT_COMPAT_DEVICEMODEL_API +#include "xc_private.h" + +int xc_hvm_create_ioreq_server( + xc_interface *xch, domid_t domid, int handle_bufioreq, + ioservid_t *id) +{ + return xendevicemodel_create_ioreq_server(xch->dmod, domid, + handle_bufioreq, id); +} + +int xc_hvm_get_ioreq_server_info( + xc_interface *xch, domid_t domid, ioservid_t id, xen_pfn_t *ioreq_pfn, + xen_pfn_t *bufioreq_pfn, evtchn_port_t *bufioreq_port) +{ + return xendevicemodel_get_ioreq_server_info(xch->dmod, domid, id, + ioreq_pfn, bufioreq_pfn, + bufioreq_port); +} + +int xc_hvm_map_io_range_to_ioreq_server( + xc_interface *xch, domid_t domid, ioservid_t id, int is_mmio, + uint64_t start, uint64_t end) +{ + return xendevicemodel_map_io_range_to_ioreq_server(xch->dmod, domid, + id, is_mmio, start, + end); +} + +int xc_hvm_unmap_io_range_from_ioreq_server( + xc_interface *xch, domid_t domid, ioservid_t id, int is_mmio, + uint64_t start, uint64_t end) +{ + return xendevicemodel_unmap_io_range_from_ioreq_server(xch->dmod, domid, + id, is_mmio, + start, end); +} + +int xc_hvm_map_pcidev_to_ioreq_server( + xc_interface *xch, domid_t domid, ioservid_t id, uint16_t segment, + uint8_t bus, uint8_t device, uint8_t function) +{ + return xendevicemodel_map_pcidev_to_ioreq_server(xch->dmod, domid, id, + segment, bus, device, + function); +} + +int xc_hvm_unmap_pcidev_from_ioreq_server( + xc_interface *xch, domid_t domid, ioservid_t id, uint16_t segment, + uint8_t bus, uint8_t device, uint8_t function) +{ + return xendevicemodel_unmap_pcidev_from_ioreq_server(xch->dmod, domid, + id, segment, bus, + device, function); +} + +int xc_hvm_destroy_ioreq_server( + xc_interface *xch, domid_t domid, ioservid_t id) +{ + return xendevicemodel_destroy_ioreq_server(xch->dmod, domid, id); +} + +int xc_hvm_set_ioreq_server_state( + xc_interface *xch, domid_t domid, ioservid_t id, int enabled) +{ + return xendevicemodel_set_ioreq_server_state(xch->dmod, domid, id, + enabled); +} + +int xc_hvm_set_pci_intx_level( + xc_interface *xch, domid_t domid, uint16_t segment, uint8_t bus, + uint8_t device, uint8_t intx, unsigned int level) +{ + return xendevicemodel_set_pci_intx_level(xch->dmod, domid, segment, + bus, device, intx, level); +} + +int xc_hvm_set_isa_irq_level( + xc_interface *xch, domid_t domid, uint8_t irq, unsigned int level) +{ + return xendevicemodel_set_isa_irq_level(xch->dmod, domid, irq, level); +} + +int xc_hvm_set_pci_link_route( + xc_interface *xch, domid_t domid, uint8_t link, uint8_t irq) +{ + return xendevicemodel_set_pci_link_route(xch->dmod, domid, link, irq); +} + +int xc_hvm_inject_msi( + xc_interface *xch, domid_t domid, uint64_t msi_addr, uint32_t msi_data) +{ + return xendevicemodel_inject_msi(xch->dmod, domid, msi_addr, msi_data); +} + +int xc_hvm_track_dirty_vram( + xc_interface *xch, domid_t domid, uint64_t first_pfn, uint32_t nr, + unsigned long *dirty_bitmap) +{ + return xendevicemodel_track_dirty_vram(xch->dmod, domid, first_pfn, + nr, dirty_bitmap); +} + +int xc_hvm_modified_memory( + xc_interface *xch, domid_t domid, uint64_t first_pfn, uint32_t nr) +{ + return xendevicemodel_modified_memory(xch->dmod, domid, first_pfn, nr); +} + +int xc_hvm_set_mem_type( + xc_interface *xch, domid_t domid, hvmmem_type_t type, + uint64_t first_pfn, uint32_t nr) +{ + return xendevicemodel_set_mem_type(xch->dmod, domid, type, first_pfn, + nr); +} + +int xc_hvm_inject_trap( + xc_interface *xch, domid_t domid, int vcpu, uint8_t vector, + uint8_t type, uint32_t error_code, uint8_t insn_len, uint64_t cr2) +{ + return xendevicemodel_inject_event(xch->dmod, domid, vcpu, vector, + type, error_code, insn_len, cr2); +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index fa1daeb..d862e53 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -1412,207 +1412,6 @@ int xc_get_hvm_param(xc_interface *handle, domid_t dom, int param, unsigned long return 0; } -int xc_hvm_create_ioreq_server(xc_interface *xch, - domid_t domid, - int handle_bufioreq, - ioservid_t *id) -{ - struct xen_dm_op op; - struct xen_dm_op_create_ioreq_server *data; - int rc; - - memset(&op, 0, sizeof(op)); - - op.op = XEN_DMOP_create_ioreq_server; - data = &op.u.create_ioreq_server; - - data->handle_bufioreq = handle_bufioreq; - - rc = do_dm_op(xch, domid, 1, &op, sizeof(op)); - if ( rc ) - return rc; - - *id = data->id; - - return 0; -} - -int xc_hvm_get_ioreq_server_info(xc_interface *xch, - domid_t domid, - ioservid_t id, - xen_pfn_t *ioreq_pfn, - xen_pfn_t *bufioreq_pfn, - evtchn_port_t *bufioreq_port) -{ - struct xen_dm_op op; - struct xen_dm_op_get_ioreq_server_info *data; - int rc; - - memset(&op, 0, sizeof(op)); - - op.op = XEN_DMOP_get_ioreq_server_info; - data = &op.u.get_ioreq_server_info; - - data->id = id; - - rc = do_dm_op(xch, domid, 1, &op, sizeof(op)); - if ( rc ) - return rc; - - if ( ioreq_pfn ) - *ioreq_pfn = data->ioreq_pfn; - - if ( bufioreq_pfn ) - *bufioreq_pfn = data->bufioreq_pfn; - - if ( bufioreq_port ) - *bufioreq_port = data->bufioreq_port; - - return 0; -} - -int xc_hvm_map_io_range_to_ioreq_server(xc_interface *xch, domid_t domid, - ioservid_t id, int is_mmio, - uint64_t start, uint64_t end) -{ - struct xen_dm_op op; - struct xen_dm_op_ioreq_server_range *data; - - memset(&op, 0, sizeof(op)); - - op.op = XEN_DMOP_map_io_range_to_ioreq_server; - data = &op.u.map_io_range_to_ioreq_server; - - data->id = id; - data->type = is_mmio ? XEN_DMOP_IO_RANGE_MEMORY : XEN_DMOP_IO_RANGE_PORT; - data->start = start; - data->end = end; - - return do_dm_op(xch, domid, 1, &op, sizeof(op)); -} - -int xc_hvm_unmap_io_range_from_ioreq_server(xc_interface *xch, domid_t domid, - ioservid_t id, int is_mmio, - uint64_t start, uint64_t end) -{ - struct xen_dm_op op; - struct xen_dm_op_ioreq_server_range *data; - - memset(&op, 0, sizeof(op)); - - op.op = XEN_DMOP_unmap_io_range_from_ioreq_server; - data = &op.u.unmap_io_range_from_ioreq_server; - - data->id = id; - data->type = is_mmio ? XEN_DMOP_IO_RANGE_MEMORY : XEN_DMOP_IO_RANGE_PORT; - data->start = start; - data->end = end; - - return do_dm_op(xch, domid, 1, &op, sizeof(op)); -} - -int xc_hvm_map_pcidev_to_ioreq_server(xc_interface *xch, domid_t domid, - ioservid_t id, uint16_t segment, - uint8_t bus, uint8_t device, - uint8_t function) -{ - struct xen_dm_op op; - struct xen_dm_op_ioreq_server_range *data; - - if (device > 0x1f || function > 0x7) { - errno = EINVAL; - return -1; - } - - memset(&op, 0, sizeof(op)); - - op.op = XEN_DMOP_map_io_range_to_ioreq_server; - data = &op.u.map_io_range_to_ioreq_server; - - data->id = id; - data->type = XEN_DMOP_IO_RANGE_PCI; - - /* - * The underlying hypercall will deal with ranges of PCI SBDF - * but, for simplicity, the API only uses singletons. - */ - data->start = data->end = XEN_DMOP_PCI_SBDF((uint64_t)segment, - (uint64_t)bus, - (uint64_t)device, - (uint64_t)function); - - return do_dm_op(xch, domid, 1, &op, sizeof(op)); -} - -int xc_hvm_unmap_pcidev_from_ioreq_server(xc_interface *xch, domid_t domid, - ioservid_t id, uint16_t segment, - uint8_t bus, uint8_t device, - uint8_t function) -{ - struct xen_dm_op op; - struct xen_dm_op_ioreq_server_range *data; - - if (device > 0x1f || function > 0x7) { - errno = EINVAL; - return -1; - } - - memset(&op, 0, sizeof(op)); - - op.op = XEN_DMOP_unmap_io_range_from_ioreq_server; - data = &op.u.unmap_io_range_from_ioreq_server; - - data->id = id; - data->type = XEN_DMOP_IO_RANGE_PCI; - - /* - * The underlying hypercall will deal with ranges of PCI SBDF - * but, for simplicity, the API only uses singletons. - */ - data->start = data->end = XEN_DMOP_PCI_SBDF((uint64_t)segment, - (uint64_t)bus, - (uint64_t)device, - (uint64_t)function); - - return do_dm_op(xch, domid, 1, &op, sizeof(op)); -} - -int xc_hvm_destroy_ioreq_server(xc_interface *xch, - domid_t domid, - ioservid_t id) -{ - struct xen_dm_op op; - struct xen_dm_op_destroy_ioreq_server *data; - - memset(&op, 0, sizeof(op)); - - op.op = XEN_DMOP_destroy_ioreq_server; - data = &op.u.destroy_ioreq_server; - - data->id = id; - - return do_dm_op(xch, domid, 1, &op, sizeof(op)); -} - -int xc_hvm_set_ioreq_server_state(xc_interface *xch, - domid_t domid, - ioservid_t id, - int enabled) -{ - struct xen_dm_op op; - struct xen_dm_op_set_ioreq_server_state *data; - - memset(&op, 0, sizeof(op)); - - op.op = XEN_DMOP_set_ioreq_server_state; - data = &op.u.set_ioreq_server_state; - - data->id = id; - data->enabled = !!enabled; - - return do_dm_op(xch, domid, 1, &op, sizeof(op)); -} - int xc_domain_setdebugging(xc_interface *xch, uint32_t domid, unsigned int enable) diff --git a/tools/libxc/xc_misc.c b/tools/libxc/xc_misc.c index 5159475..88084fd 100644 --- a/tools/libxc/xc_misc.c +++ b/tools/libxc/xc_misc.c @@ -467,160 +467,6 @@ int xc_getcpuinfo(xc_interface *xch, int max_cpus, return rc; } - -int xc_hvm_set_pci_intx_level( - xc_interface *xch, domid_t dom, - uint16_t domain, uint8_t bus, uint8_t device, uint8_t intx, - unsigned int level) -{ - struct xen_dm_op op; - struct xen_dm_op_set_pci_intx_level *data; - - memset(&op, 0, sizeof(op)); - - op.op = XEN_DMOP_set_pci_intx_level; - data = &op.u.set_pci_intx_level; - - data->domain = domain; - data->bus = bus; - data->device = device; - data->intx = intx; - data->level = level; - - return do_dm_op(xch, dom, 1, &op, sizeof(op)); -} - -int xc_hvm_set_isa_irq_level( - xc_interface *xch, domid_t dom, - uint8_t isa_irq, - unsigned int level) -{ - struct xen_dm_op op; - struct xen_dm_op_set_isa_irq_level *data; - - memset(&op, 0, sizeof(op)); - - op.op = XEN_DMOP_set_isa_irq_level; - data = &op.u.set_isa_irq_level; - - data->isa_irq = isa_irq; - data->level = level; - - return do_dm_op(xch, dom, 1, &op, sizeof(op)); -} - -int xc_hvm_set_pci_link_route( - xc_interface *xch, domid_t dom, uint8_t link, uint8_t isa_irq) -{ - struct xen_dm_op op; - struct xen_dm_op_set_pci_link_route *data; - - memset(&op, 0, sizeof(op)); - - op.op = XEN_DMOP_set_pci_link_route; - data = &op.u.set_pci_link_route; - - data->link = link; - data->isa_irq = isa_irq; - - return do_dm_op(xch, dom, 1, &op, sizeof(op)); -} - -int xc_hvm_inject_msi( - xc_interface *xch, domid_t dom, uint64_t msi_addr, uint32_t msi_data) -{ - struct xen_dm_op op; - struct xen_dm_op_inject_msi *data; - - memset(&op, 0, sizeof(op)); - - op.op = XEN_DMOP_inject_msi; - data = &op.u.inject_msi; - - data->addr = msi_addr; - data->data = msi_data; - - return do_dm_op(xch, dom, 1, &op, sizeof(op)); -} - -int xc_hvm_track_dirty_vram( - xc_interface *xch, domid_t dom, - uint64_t first_pfn, uint32_t nr, - unsigned long *dirty_bitmap) -{ - struct xen_dm_op op; - struct xen_dm_op_track_dirty_vram *data; - - memset(&op, 0, sizeof(op)); - - op.op = XEN_DMOP_track_dirty_vram; - data = &op.u.track_dirty_vram; - - data->first_pfn = first_pfn; - data->nr = nr; - - return do_dm_op(xch, dom, 2, &op, sizeof(op), - dirty_bitmap, (size_t)((nr + 7) / 8)); -} - -int xc_hvm_modified_memory( - xc_interface *xch, domid_t dom, uint64_t first_pfn, uint32_t nr) -{ - struct xen_dm_op op; - struct xen_dm_op_modified_memory *data; - - memset(&op, 0, sizeof(op)); - - op.op = XEN_DMOP_modified_memory; - data = &op.u.modified_memory; - - data->first_pfn = first_pfn; - data->nr = nr; - - return do_dm_op(xch, dom, 1, &op, sizeof(op)); -} - -int xc_hvm_set_mem_type( - xc_interface *xch, domid_t dom, hvmmem_type_t mem_type, uint64_t first_pfn, uint32_t nr) -{ - struct xen_dm_op op; - struct xen_dm_op_set_mem_type *data; - - memset(&op, 0, sizeof(op)); - - op.op = XEN_DMOP_set_mem_type; - data = &op.u.set_mem_type; - - data->mem_type = mem_type; - data->first_pfn = first_pfn; - data->nr = nr; - - return do_dm_op(xch, dom, 1, &op, sizeof(op)); -} - -int xc_hvm_inject_trap( - xc_interface *xch, domid_t dom, int vcpu, uint8_t vector, - uint8_t type, uint32_t error_code, uint8_t insn_len, - uint64_t cr2) -{ - struct xen_dm_op op; - struct xen_dm_op_inject_event *data; - - memset(&op, 0, sizeof(op)); - - op.op = XEN_DMOP_inject_event; - data = &op.u.inject_event; - - data->vcpuid = vcpu; - data->vector = vector; - data->type = type; - data->error_code = error_code; - data->insn_len = insn_len; - data->cr2 = cr2; - - return do_dm_op(xch, dom, 1, &op, sizeof(op)); -} - int xc_livepatch_upload(xc_interface *xch, char *name, unsigned char *payload, diff --git a/tools/libxc/xc_private.c b/tools/libxc/xc_private.c index bce7797..72e6242 100644 --- a/tools/libxc/xc_private.c +++ b/tools/libxc/xc_private.c @@ -783,79 +783,6 @@ int xc_ffs64(uint64_t x) return l ? xc_ffs32(l) : h ? xc_ffs32(h) + 32 : 0; } -int do_dm_op(xc_interface *xch, domid_t domid, unsigned int nr_bufs, ...) -{ - int ret = -1; - struct { - void *u; - void *h; - } *bounce; - DECLARE_HYPERCALL_BUFFER(xen_dm_op_buf_t, bufs); - va_list args; - unsigned int idx; - - bounce = calloc(nr_bufs, sizeof(*bounce)); - if ( bounce == NULL ) - goto fail1; - - bufs = xc_hypercall_buffer_alloc(xch, bufs, sizeof(*bufs) * nr_bufs); - if ( bufs == NULL ) - goto fail2; - - va_start(args, nr_bufs); - for ( idx = 0; idx < nr_bufs; idx++ ) - { - void *u = va_arg(args, void *); - size_t size = va_arg(args, size_t); - - bounce[idx].h = xencall_alloc_buffer(xch->xcall, size); - if ( bounce[idx].h == NULL ) - break; /* Error path handled after va_end(). */ - - memcpy(bounce[idx].h, u, size); - bounce[idx].u = u; - - set_xen_guest_handle_raw(bufs[idx].h, bounce[idx].h); - bufs[idx].size = size; - } - va_end(args); - - if ( idx != nr_bufs ) - goto fail3; - - ret = xencall3(xch->xcall, __HYPERVISOR_dm_op, - domid, nr_bufs, HYPERCALL_BUFFER_AS_ARG(bufs)); - if ( ret < 0 ) - goto fail4; - - while ( idx-- != 0 ) - { - memcpy(bounce[idx].u, bounce[idx].h, bufs[idx].size); - xencall_free_buffer(xch->xcall, bounce[idx].h); - } - - xc_hypercall_buffer_free(xch, bufs); - - free(bounce); - - return 0; - - fail4: - idx = nr_bufs; - - fail3: - while ( idx-- != 0 ) - xencall_free_buffer(xch->xcall, bounce[idx].h); - - xc_hypercall_buffer_free(xch, bufs); - - fail2: - free(bounce); - - fail1: - return ret; -} - /* * Local variables: * mode: C -- 2.1.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [PATCH v2 3/5] tools/libxendevicemodel: extract functions and add a compat layer 2017-02-22 13:27 ` [PATCH v2 3/5] tools/libxendevicemodel: extract functions and add a compat layer Paul Durrant @ 2017-02-22 14:20 ` Ian Jackson 2017-02-22 14:33 ` Andrew Cooper 0 siblings, 1 reply; 18+ messages in thread From: Ian Jackson @ 2017-02-22 14:20 UTC (permalink / raw) To: Paul Durrant; +Cc: xen-devel, Wei Liu Paul Durrant writes ("[PATCH v2 3/5] tools/libxendevicemodel: extract functions and add a compat layer"): > This patch extracts all functions resulting in a dm_op hypercall from > libxenctrl and moves them into libxendevicemodel. It also adds a compat > layer into libxenctrl, which can be selected by defining > XC_WANT_COMPAT_DEVICEMODEL_API to 1 before including xenctrl.h. > > With this patch the core of libxendevicemodel still uses libxencall to > issue the dm_op hypercalls, but this is done by calling through code that > can be modified on a per-OS basis. A subsequent patch will add a Linux- > specific variant. ... > +int xendevicemodel_track_dirty_vram( > + xendevicemodel_handle *dmod, domid_t domid, uint64_t first_pfn, > + uint32_t nr, unsigned long *dirty_bitmap) > +{ > + struct xen_dm_op op; > + struct xen_dm_op_track_dirty_vram *data; > + > + memset(&op, 0, sizeof(op)); > + > + op.op = XEN_DMOP_track_dirty_vram; > + data = &op.u.track_dirty_vram; > + > + data->first_pfn = first_pfn; > + data->nr = nr; > + > + return xendevicemodel_op(dmod, domid, 2, &op, sizeof(op), > + dirty_bitmap, (size_t)(nr + 7) / 8); > +} As I think we discussed some time last week (?), this function cannot be a DMOP. This is because enabling track_dirty_vram causes the hypervisor to remember the memory referred to by dirty_bitmap, but the dmop privcmd restriction mechanism only guarantees that the memory is valid and belonging to this guest _during the hypercall_. Are there more like this ? How does ioreq server registration work ? Can we add a note to the hypervisor side of the DMOP buffer interface, saying something like Code in Xen MUST NOT save copies of the pointers in the dmop buffers. Only copying to and from guest memory, during the hypercall, is permitted. ? Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v2 3/5] tools/libxendevicemodel: extract functions and add a compat layer 2017-02-22 14:20 ` Ian Jackson @ 2017-02-22 14:33 ` Andrew Cooper 2017-02-22 14:37 ` Ian Jackson 0 siblings, 1 reply; 18+ messages in thread From: Andrew Cooper @ 2017-02-22 14:33 UTC (permalink / raw) To: Ian Jackson, Paul Durrant; +Cc: xen-devel, Wei Liu On 22/02/17 14:20, Ian Jackson wrote: > Paul Durrant writes ("[PATCH v2 3/5] tools/libxendevicemodel: extract functions and add a compat layer"): >> This patch extracts all functions resulting in a dm_op hypercall from >> libxenctrl and moves them into libxendevicemodel. It also adds a compat >> layer into libxenctrl, which can be selected by defining >> XC_WANT_COMPAT_DEVICEMODEL_API to 1 before including xenctrl.h. >> >> With this patch the core of libxendevicemodel still uses libxencall to >> issue the dm_op hypercalls, but this is done by calling through code that >> can be modified on a per-OS basis. A subsequent patch will add a Linux- >> specific variant. > ... >> +int xendevicemodel_track_dirty_vram( >> + xendevicemodel_handle *dmod, domid_t domid, uint64_t first_pfn, >> + uint32_t nr, unsigned long *dirty_bitmap) >> +{ >> + struct xen_dm_op op; >> + struct xen_dm_op_track_dirty_vram *data; >> + >> + memset(&op, 0, sizeof(op)); >> + >> + op.op = XEN_DMOP_track_dirty_vram; >> + data = &op.u.track_dirty_vram; >> + >> + data->first_pfn = first_pfn; >> + data->nr = nr; >> + >> + return xendevicemodel_op(dmod, domid, 2, &op, sizeof(op), >> + dirty_bitmap, (size_t)(nr + 7) / 8); >> +} > As I think we discussed some time last week (?), this function cannot > be a DMOP. This is because enabling track_dirty_vram causes the > hypervisor to remember the memory referred to by dirty_bitmap, but the > dmop privcmd restriction mechanism only guarantees that the memory is > valid and belonging to this guest _during the hypercall_. Sorry to jump in here, but what? Since when? track-dirty-vram stashes where the DM thinks the vram is in guest physical address space, so if a new range is requested, we can set appropriate bits in the dirty map. However, the interesting pointer for the DMOP (i.e. where the DM would like Xen to write the bitmap to) is not stored across distinct calls at all. It is stored as part of a continuation, but that is still logically part of a single invocation. ~Andrew _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v2 3/5] tools/libxendevicemodel: extract functions and add a compat layer 2017-02-22 14:33 ` Andrew Cooper @ 2017-02-22 14:37 ` Ian Jackson 2017-02-22 14:41 ` Andrew Cooper 0 siblings, 1 reply; 18+ messages in thread From: Ian Jackson @ 2017-02-22 14:37 UTC (permalink / raw) To: Andrew Cooper; +Cc: xen-devel, Paul Durrant, Wei Liu Andrew Cooper writes ("Re: [Xen-devel] [PATCH v2 3/5] tools/libxendevicemodel: extract functions and add a compat layer"): > On 22/02/17 14:20, Ian Jackson wrote: > > As I think we discussed some time last week (?), this function cannot > > be a DMOP. This is because enabling track_dirty_vram causes the > > hypervisor to remember the memory referred to by dirty_bitmap, but the > > dmop privcmd restriction mechanism only guarantees that the memory is > > valid and belonging to this guest _during the hypercall_. > > Sorry to jump in here, but what? Since when? Maybe I have misunderstood. > track-dirty-vram stashes where the DM thinks the vram is in guest > physical address space, so if a new range is requested, we can set > appropriate bits in the dirty map. Does this ... > >> + return xendevicemodel_op(dmod, domid, 2, &op, sizeof(op), > >> + dirty_bitmap, (size_t)(nr + 7) / 8); > >> +} ... not result in the hypervisor asynchronously updating the contents of dirty_bitmap[whatever], later ? > However, the interesting pointer for the DMOP (i.e. where the DM would > like Xen to write the bitmap to) is not stored across distinct calls at > all. It is stored as part of a continuation, but that is still > logically part of a single invocation. Is the bitmap copied in each dmop call ? Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v2 3/5] tools/libxendevicemodel: extract functions and add a compat layer 2017-02-22 14:37 ` Ian Jackson @ 2017-02-22 14:41 ` Andrew Cooper 2017-02-22 15:04 ` Ian Jackson 0 siblings, 1 reply; 18+ messages in thread From: Andrew Cooper @ 2017-02-22 14:41 UTC (permalink / raw) To: Ian Jackson; +Cc: xen-devel, Paul Durrant, Wei Liu On 22/02/17 14:37, Ian Jackson wrote: > Andrew Cooper writes ("Re: [Xen-devel] [PATCH v2 3/5] tools/libxendevicemodel: extract functions and add a compat layer"): >> On 22/02/17 14:20, Ian Jackson wrote: >>> As I think we discussed some time last week (?), this function cannot >>> be a DMOP. This is because enabling track_dirty_vram causes the >>> hypervisor to remember the memory referred to by dirty_bitmap, but the >>> dmop privcmd restriction mechanism only guarantees that the memory is >>> valid and belonging to this guest _during the hypercall_. >> Sorry to jump in here, but what? Since when? > Maybe I have misunderstood. > >> track-dirty-vram stashes where the DM thinks the vram is in guest >> physical address space, so if a new range is requested, we can set >> appropriate bits in the dirty map. > Does this ... > >>>> + return xendevicemodel_op(dmod, domid, 2, &op, sizeof(op), >>>> + dirty_bitmap, (size_t)(nr + 7) / 8); >>>> +} > ... not result in the hypervisor asynchronously updating the contents > of dirty_bitmap[whatever], later ? No. > >> However, the interesting pointer for the DMOP (i.e. where the DM would >> like Xen to write the bitmap to) is not stored across distinct calls at >> all. It is stored as part of a continuation, but that is still >> logically part of a single invocation. > Is the bitmap copied in each dmop call ? Yes, and hence... ... one optimisation I want to do in the future is for the DM to be able to make a Read-only mapping of Xens logdirty bitmap, so the bitmap can be passed by shared memory rather than memcpy(), because I expect it would be rather more efficient during some of the time-sensitive bits of live migrate. ~Andrew _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v2 3/5] tools/libxendevicemodel: extract functions and add a compat layer 2017-02-22 14:41 ` Andrew Cooper @ 2017-02-22 15:04 ` Ian Jackson 2017-02-22 15:27 ` Andrew Cooper 0 siblings, 1 reply; 18+ messages in thread From: Ian Jackson @ 2017-02-22 15:04 UTC (permalink / raw) To: Andrew Cooper; +Cc: xen-devel, Paul Durrant, Wei Liu Andrew Cooper writes ("Re: [Xen-devel] [PATCH v2 3/5] tools/libxendevicemodel: extract functions and add a compat layer"): > On 22/02/17 14:37, Ian Jackson wrote: > > Is the bitmap copied in each dmop call ? > > Yes, and hence... Oh! I had assumed that this wouldn't be the case because it would obviously be slow. > ... one optimisation I want to do in the future is for the DM to be able > to make a Read-only mapping of Xens logdirty bitmap, so the bitmap can > be passed by shared memory rather than memcpy(), because I expect it > would be rather more efficient during some of the time-sensitive bits of > live migrate. Well, err, yes. (What about the ioreq ring?) Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v2 3/5] tools/libxendevicemodel: extract functions and add a compat layer 2017-02-22 15:04 ` Ian Jackson @ 2017-02-22 15:27 ` Andrew Cooper 0 siblings, 0 replies; 18+ messages in thread From: Andrew Cooper @ 2017-02-22 15:27 UTC (permalink / raw) To: Ian Jackson; +Cc: xen-devel, Paul Durrant, Wei Liu On 22/02/17 15:04, Ian Jackson wrote: > Andrew Cooper writes ("Re: [Xen-devel] [PATCH v2 3/5] tools/libxendevicemodel: extract functions and add a compat layer"): >> On 22/02/17 14:37, Ian Jackson wrote: >>> Is the bitmap copied in each dmop call ? >> Yes, and hence... > Oh! > > I had assumed that this wouldn't be the case because it would > obviously be slow. > >> ... one optimisation I want to do in the future is for the DM to be able >> to make a Read-only mapping of Xens logdirty bitmap, so the bitmap can >> be passed by shared memory rather than memcpy(), because I expect it >> would be rather more efficient during some of the time-sensitive bits of >> live migrate. > Well, err, yes. > > (What about the ioreq ring?) That is a piece of shared memory. But shared memory is not interesting to DMOP. You already *must* defer to your kernel to create the shared memory in the first place, so the resulting pointer is definitely ok as far as the kernel is concerned. ~Andrew _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH v2 4/5] tools/libxendevicemodel: introduce a Linux-specific implementation 2017-02-22 13:27 [PATCH v2 0/5] tools/libxendevicemodel Paul Durrant ` (2 preceding siblings ...) 2017-02-22 13:27 ` [PATCH v2 3/5] tools/libxendevicemodel: extract functions and add a compat layer Paul Durrant @ 2017-02-22 13:27 ` Paul Durrant 2017-02-22 14:22 ` Ian Jackson 2017-02-22 13:27 ` [PATCH v2 5/5] tools/libxendevicemodel: add a call to restrict the handle Paul Durrant 4 siblings, 1 reply; 18+ messages in thread From: Paul Durrant @ 2017-02-22 13:27 UTC (permalink / raw) To: xen-devel; +Cc: Paul Durrant, Ian Jackson My recent patch [1] to the Linux privcmd module introduced a dedicated mechanism for making dm_op hypercalls. This patch adds the necessary code to libxendevicemodel to take advantage of that mechanism if it is implemented in the tools domain kernel. [1] https://git.kernel.org/cgit/linux/kernel/git/ostr/linux.git/commit/?id=ab520be8 Signed-off-by: Paul Durrant <paul.durrant@citrix.com> Acked-by: Wei Liu <wei.liu2@citrix.com> --- Cc: Ian Jackson <ian.jackson@eu.citrix.com> --- tools/include/xen-sys/Linux/privcmd.h | 13 ++++ tools/libs/devicemodel/Makefile | 2 +- tools/libs/devicemodel/linux.c | 123 ++++++++++++++++++++++++++++++++++ tools/libs/devicemodel/private.h | 4 ++ 4 files changed, 141 insertions(+), 1 deletion(-) create mode 100644 tools/libs/devicemodel/linux.c diff --git a/tools/include/xen-sys/Linux/privcmd.h b/tools/include/xen-sys/Linux/privcmd.h index e4e666a..c80eb5e 100644 --- a/tools/include/xen-sys/Linux/privcmd.h +++ b/tools/include/xen-sys/Linux/privcmd.h @@ -75,6 +75,17 @@ typedef struct privcmd_mmapbatch_v2 { int __user *err; /* array of error codes */ } privcmd_mmapbatch_v2_t; +typedef struct privcmd_dm_op_buf { + void __user *uptr; + size_t size; +} privcmd_dm_op_buf_t; + +typedef struct privcmd_dm_op { + domid_t dom; + __u16 num; + const privcmd_dm_op_buf_t __user *ubufs; +} privcmd_dm_op_t; + /* * @cmd: IOCTL_PRIVCMD_HYPERCALL * @arg: &privcmd_hypercall_t @@ -88,5 +99,7 @@ typedef struct privcmd_mmapbatch_v2 { _IOC(_IOC_NONE, 'P', 3, sizeof(privcmd_mmapbatch_t)) #define IOCTL_PRIVCMD_MMAPBATCH_V2 \ _IOC(_IOC_NONE, 'P', 4, sizeof(privcmd_mmapbatch_v2_t)) +#define IOCTL_PRIVCMD_DM_OP \ + _IOC(_IOC_NONE, 'P', 5, sizeof(privcmd_dm_op_t)) #endif /* __LINUX_PUBLIC_PRIVCMD_H__ */ diff --git a/tools/libs/devicemodel/Makefile b/tools/libs/devicemodel/Makefile index b87bf84..1803942 100644 --- a/tools/libs/devicemodel/Makefile +++ b/tools/libs/devicemodel/Makefile @@ -11,7 +11,7 @@ CFLAGS += $(CFLAGS_libxentoollog) CFLAGS += $(CFLAGS_libxencall) SRCS-y += core.c -SRCS-$(CONFIG_Linux) += compat.c +SRCS-$(CONFIG_Linux) += linux.c SRCS-$(CONFIG_FreeBSD) += compat.c SRCS-$(CONFIG_SunOS) += compat.c SRCS-$(CONFIG_NetBSD) += compat.c diff --git a/tools/libs/devicemodel/linux.c b/tools/libs/devicemodel/linux.c new file mode 100644 index 0000000..7511ee7 --- /dev/null +++ b/tools/libs/devicemodel/linux.c @@ -0,0 +1,123 @@ +/* + * Copyright (c) 2017 Citrix Systems Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; If not, see <http://www.gnu.org/licenses/>. + */ + +#include <errno.h> +#include <fcntl.h> +#include <stdint.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> + +#include <sys/ioctl.h> +#include <sys/stat.h> +#include <sys/types.h> + +#include <xen/xen.h> +#include <xen/sys/privcmd.h> + +#include "private.h" + +int osdep_xendevicemodel_open(xendevicemodel_handle *dmod) +{ + int fd = open("/dev/xen/privcmd", O_RDWR | O_CLOEXEC); + privcmd_dm_op_t uop; + int rc; + + if (fd < 0) { + /* + * If the 'new' privcmd interface doesn't exist then don't treat + * this as an error, but an old privcmd clearly won't implement + * IOCTL_PRIVCMD_DM_OP so don't bother trying to open it. + */ + if (errno == ENOENT || errno == ENXIO || errno == ENODEV) + goto out; + + PERROR("Could not obtain handle on privileged command interface"); + return -1; + } + + /* + * Check to see if IOCTL_PRIVCMD_DM_OP is implemented as we want to + * use that in preference to libxencall. + */ + uop.dom = DOMID_INVALID; + uop.num = 0; + uop.ubufs = NULL; + + rc = ioctl(fd, IOCTL_PRIVCMD_DM_OP, &uop); + if (rc < 0) { + close(fd); + fd = -1; + } + +out: + dmod->fd = fd; + return 0; +} + +int osdep_xendevicemodel_close(xendevicemodel_handle *dmod) +{ + if (dmod->fd < 0) + return 0; + + return close(dmod->fd); +} + +int osdep_xendevicemodel_op(xendevicemodel_handle *dmod, + domid_t domid, unsigned int nr_bufs, + struct xendevicemodel_buf bufs[]) +{ + privcmd_dm_op_buf_t *ubufs; + privcmd_dm_op_t uop; + unsigned int i; + int rc; + + if (dmod->fd < 0) + return xendevicemodel_xcall(dmod, domid, nr_bufs, bufs); + + ubufs = calloc(nr_bufs, sizeof (*ubufs)); + if (!ubufs) + return -1; + + for (i = 0; i < nr_bufs; i++) { + ubufs[i].uptr = bufs[i].ptr; + ubufs[i].size = bufs[i].size; + } + + uop.dom = domid; + uop.num = nr_bufs; + uop.ubufs = ubufs; + + rc = ioctl(dmod->fd, IOCTL_PRIVCMD_DM_OP, &uop); + + free(ubufs); + + if (rc < 0) + return -1; + + return 0; +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/tools/libs/devicemodel/private.h b/tools/libs/devicemodel/private.h index 7c7acf2..5ce3b45 100644 --- a/tools/libs/devicemodel/private.h +++ b/tools/libs/devicemodel/private.h @@ -11,6 +11,7 @@ struct xendevicemodel_handle { xentoollog_logger *logger, *logger_tofree; unsigned int flags; xencall_handle *xcall; + int fd; }; struct xendevicemodel_buf { @@ -28,6 +29,9 @@ int osdep_xendevicemodel_op(xendevicemodel_handle *dmod, domid_t domid, unsigned int nr_bufs, struct xendevicemodel_buf bufs[]); +#define PERROR(_f...) \ + xtl_log(dmod->logger, XTL_ERROR, errno, "xendevicemodel", _f) + #endif /* -- 2.1.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [PATCH v2 4/5] tools/libxendevicemodel: introduce a Linux-specific implementation 2017-02-22 13:27 ` [PATCH v2 4/5] tools/libxendevicemodel: introduce a Linux-specific implementation Paul Durrant @ 2017-02-22 14:22 ` Ian Jackson 0 siblings, 0 replies; 18+ messages in thread From: Ian Jackson @ 2017-02-22 14:22 UTC (permalink / raw) To: Paul Durrant; +Cc: xen-devel Paul Durrant writes ("[PATCH v2 4/5] tools/libxendevicemodel: introduce a Linux-specific implementation"): > My recent patch [1] to the Linux privcmd module introduced a dedicated > mechanism for making dm_op hypercalls. > > This patch adds the necessary code to libxendevicemodel to take > advantage of that mechanism if it is implemented in the tools domain > kernel. Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH v2 5/5] tools/libxendevicemodel: add a call to restrict the handle 2017-02-22 13:27 [PATCH v2 0/5] tools/libxendevicemodel Paul Durrant ` (3 preceding siblings ...) 2017-02-22 13:27 ` [PATCH v2 4/5] tools/libxendevicemodel: introduce a Linux-specific implementation Paul Durrant @ 2017-02-22 13:27 ` Paul Durrant 2017-02-22 14:22 ` Ian Jackson 4 siblings, 1 reply; 18+ messages in thread From: Paul Durrant @ 2017-02-22 13:27 UTC (permalink / raw) To: xen-devel; +Cc: Paul Durrant, Ian Jackson My recent patch [1] to the Linux privcmd module introduced a mechanism to restrict an open file handle to subsequently only accept operations for a specified domain. This patch extends the libxendevicemodel API and make use of the mechanism in the Linux-specific code to restrict operations on the interface handle. [1] https://git.kernel.org/cgit/linux/kernel/git/ostr/linux.git/commit/?id=4610d240 Signed-off-by: Paul Durrant <paul.durrant@citrix.com> Acked-by: Wei Liu <wei.liu2@citrix.com> --- Cc: Ian Jackson <ian.jackson@eu.citrix.com> --- tools/include/xen-sys/Linux/privcmd.h | 2 ++ tools/libs/devicemodel/compat.c | 9 +++++++++ tools/libs/devicemodel/core.c | 5 +++++ tools/libs/devicemodel/include/xendevicemodel.h | 10 ++++++++++ tools/libs/devicemodel/libxendevicemodel.map | 1 + tools/libs/devicemodel/linux.c | 11 +++++++++++ tools/libs/devicemodel/private.h | 3 +++ 7 files changed, 41 insertions(+) diff --git a/tools/include/xen-sys/Linux/privcmd.h b/tools/include/xen-sys/Linux/privcmd.h index c80eb5e..732ff7c 100644 --- a/tools/include/xen-sys/Linux/privcmd.h +++ b/tools/include/xen-sys/Linux/privcmd.h @@ -101,5 +101,7 @@ typedef struct privcmd_dm_op { _IOC(_IOC_NONE, 'P', 4, sizeof(privcmd_mmapbatch_v2_t)) #define IOCTL_PRIVCMD_DM_OP \ _IOC(_IOC_NONE, 'P', 5, sizeof(privcmd_dm_op_t)) +#define IOCTL_PRIVCMD_RESTRICT \ + _IOC(_IOC_NONE, 'P', 6, sizeof(domid_t)) #endif /* __LINUX_PUBLIC_PRIVCMD_H__ */ diff --git a/tools/libs/devicemodel/compat.c b/tools/libs/devicemodel/compat.c index 245e907..5b4fdae 100644 --- a/tools/libs/devicemodel/compat.c +++ b/tools/libs/devicemodel/compat.c @@ -15,6 +15,8 @@ * License along with this library; If not, see <http://www.gnu.org/licenses/>. */ +#include <errno.h> + #include "private.h" int osdep_xendevicemodel_open(xendevicemodel_handle *dmod) @@ -34,6 +36,13 @@ int osdep_xendevicemodel_op(xendevicemodel_handle *dmod, return xendevicemodel_xcall(dmod, domid, nr_bufs, bufs); } +int osdep_xendevicemodel_restrict(xendevicemodel_handle *dmod, + domid_t domid) +{ + errno = EOPNOTSUPP; + return -1; +} + /* * Local variables: * mode: C diff --git a/tools/libs/devicemodel/core.c b/tools/libs/devicemodel/core.c index 33ee157..504543c 100644 --- a/tools/libs/devicemodel/core.c +++ b/tools/libs/devicemodel/core.c @@ -492,6 +492,11 @@ int xendevicemodel_inject_event( return xendevicemodel_op(dmod, domid, 1, &op, sizeof(op)); } +int xendevicemodel_restrict(xendevicemodel_handle *dmod, domid_t domid) +{ + return osdep_xendevicemodel_restrict(dmod, domid); +} + /* * Local variables: * mode: C diff --git a/tools/libs/devicemodel/include/xendevicemodel.h b/tools/libs/devicemodel/include/xendevicemodel.h index e00f8da..b3f600e 100644 --- a/tools/libs/devicemodel/include/xendevicemodel.h +++ b/tools/libs/devicemodel/include/xendevicemodel.h @@ -283,6 +283,16 @@ int xendevicemodel_inject_event( xendevicemodel_handle *dmod, domid_t domid, int vcpu, uint8_t vector, uint8_t type, uint32_t error_code, uint8_t insn_len, uint64_t cr2); +/** + * This function restricts the use of this handle to the specified + * domain. + * + * @parm dmod handle to the open devicemodel interface + * @parm domid the domain id + * @return 0 on success, -1 on failure. + */ +int xendevicemodel_restrict(xendevicemodel_handle *dmod, domid_t domid); + #endif /* __XEN_TOOLS__ */ #endif /* XENDEVICEMODEL_H */ diff --git a/tools/libs/devicemodel/libxendevicemodel.map b/tools/libs/devicemodel/libxendevicemodel.map index abc6d06..45c773e 100644 --- a/tools/libs/devicemodel/libxendevicemodel.map +++ b/tools/libs/devicemodel/libxendevicemodel.map @@ -17,6 +17,7 @@ VERS_1.0 { xendevicemodel_modified_memory; xendevicemodel_set_mem_type; xendevicemodel_inject_event; + xendevicemodel_restrict; xendevicemodel_close; local: *; /* Do not expose anything by default */ }; diff --git a/tools/libs/devicemodel/linux.c b/tools/libs/devicemodel/linux.c index 7511ee7..438c55b 100644 --- a/tools/libs/devicemodel/linux.c +++ b/tools/libs/devicemodel/linux.c @@ -112,6 +112,17 @@ int osdep_xendevicemodel_op(xendevicemodel_handle *dmod, return 0; } +int osdep_xendevicemodel_restrict(xendevicemodel_handle *dmod, + domid_t domid) +{ + if (dmod->fd < 0) { + errno = EOPNOTSUPP; + return -1; + } + + return ioctl(dmod->fd, IOCTL_PRIVCMD_RESTRICT, &domid); +} + /* * Local variables: * mode: C diff --git a/tools/libs/devicemodel/private.h b/tools/libs/devicemodel/private.h index 5ce3b45..4ce5aac 100644 --- a/tools/libs/devicemodel/private.h +++ b/tools/libs/devicemodel/private.h @@ -29,6 +29,9 @@ int osdep_xendevicemodel_op(xendevicemodel_handle *dmod, domid_t domid, unsigned int nr_bufs, struct xendevicemodel_buf bufs[]); +int osdep_xendevicemodel_restrict( + xendevicemodel_handle *dmod, domid_t domid); + #define PERROR(_f...) \ xtl_log(dmod->logger, XTL_ERROR, errno, "xendevicemodel", _f) -- 2.1.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [PATCH v2 5/5] tools/libxendevicemodel: add a call to restrict the handle 2017-02-22 13:27 ` [PATCH v2 5/5] tools/libxendevicemodel: add a call to restrict the handle Paul Durrant @ 2017-02-22 14:22 ` Ian Jackson 0 siblings, 0 replies; 18+ messages in thread From: Ian Jackson @ 2017-02-22 14:22 UTC (permalink / raw) To: Paul Durrant; +Cc: xen-devel Paul Durrant writes ("[PATCH v2 5/5] tools/libxendevicemodel: add a call to restrict the handle"): > My recent patch [1] to the Linux privcmd module introduced a mechanism > to restrict an open file handle to subsequently only accept operations for > a specified domain. Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply [flat|nested] 18+ messages in thread
end of thread, other threads:[~2017-04-05 13:25 UTC | newest] Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2017-02-22 13:27 [PATCH v2 0/5] tools/libxendevicemodel Paul Durrant 2017-02-22 13:27 ` [PATCH v2 1/5] tools/libxenctrl: fix error check after opening libxenforeignmemory Paul Durrant 2017-02-22 14:09 ` Wei Liu 2017-04-05 13:25 ` Ian Jackson 2017-02-22 14:09 ` Ian Jackson 2017-02-22 13:27 ` [PATCH v2 2/5] tools/libxendevicemodel: introduce the new library Paul Durrant 2017-02-22 14:11 ` Ian Jackson 2017-02-22 13:27 ` [PATCH v2 3/5] tools/libxendevicemodel: extract functions and add a compat layer Paul Durrant 2017-02-22 14:20 ` Ian Jackson 2017-02-22 14:33 ` Andrew Cooper 2017-02-22 14:37 ` Ian Jackson 2017-02-22 14:41 ` Andrew Cooper 2017-02-22 15:04 ` Ian Jackson 2017-02-22 15:27 ` Andrew Cooper 2017-02-22 13:27 ` [PATCH v2 4/5] tools/libxendevicemodel: introduce a Linux-specific implementation Paul Durrant 2017-02-22 14:22 ` Ian Jackson 2017-02-22 13:27 ` [PATCH v2 5/5] tools/libxendevicemodel: add a call to restrict the handle Paul Durrant 2017-02-22 14:22 ` Ian Jackson
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.