refactor the i915 GVT support and move to the modern mdev API v3
Subsystems (11)
Hi all,
the GVT code in the i915 is a bit of a mess right now due to strange abstractions and lots of indirect calls. This series refactors various bits to clean that up. The main user visible change is that almost all of the GVT code moves out of the main i915 driver and into the kvmgt module.
Tested on my Thinkpad with a Kaby Lake CPU and integrated graphics.
Git tree:
git://git.infradead.org/users/hch/misc.git i915-gvt
Gitweb:
http://git.infradead.org/users/hch/misc.git/shortlog/refs/heads/i915-gvt
Changes since v2:
- rebased on top of Linx 5.18-rc +
"Refactor GVT-g MMIO tracking table and handlers"
- don't fold the gvt Makefile into the main Makefile
- add the mdev patches to remove the legacy interface that is now unused to the end of the series
Changes since v1:
- rebased on Linux 5.15
- allow the kvmgvt module to be loaded at any time and thus solve the deadlock when both i915 amd kvmgvt are modular
- include the conversion to the modern mdev API
Note that I do expect to rebased this again against 5.16-rc1 once released, but I'd like to get this out for review ASAP.
Diffstat:
b/drivers/gpu/drm/i915/Kconfig | 33 b/drivers/gpu/drm/i915/Makefile | 31 b/drivers/gpu/drm/i915/gvt/cfg_space.c | 89 -- b/drivers/gpu/drm/i915/gvt/cmd_parser.c | 4 b/drivers/gpu/drm/i915/gvt/dmabuf.c | 36 - b/drivers/gpu/drm/i915/gvt/execlist.c | 12 b/drivers/gpu/drm/i915/gvt/gtt.c | 55 + b/drivers/gpu/drm/i915/gvt/gvt.h | 125 ++- b/drivers/gpu/drm/i915/gvt/interrupt.c | 38 + b/drivers/gpu/drm/i915/gvt/kvmgt.c | 1099 +++++++++++++++----------------- b/drivers/gpu/drm/i915/gvt/mmio.c | 4 b/drivers/gpu/drm/i915/gvt/opregion.c | 148 ---- b/drivers/gpu/drm/i915/gvt/page_track.c | 8 b/drivers/gpu/drm/i915/gvt/scheduler.c | 37 - b/drivers/gpu/drm/i915/gvt/trace.h | 2 b/drivers/gpu/drm/i915/gvt/vgpu.c | 22 b/drivers/gpu/drm/i915/i915_drv.c | 7 b/drivers/gpu/drm/i915/i915_drv.h | 1 b/drivers/gpu/drm/i915/i915_trace.h | 1 b/drivers/gpu/drm/i915/intel_gvt.c | 162 +++- b/drivers/gpu/drm/i915/intel_gvt.h | 17 drivers/gpu/drm/i915/gvt/Makefile | 9 drivers/gpu/drm/i915/gvt/gvt.c | 340 --------- drivers/gpu/drm/i915/gvt/hypercall.h | 82 -- drivers/gpu/drm/i915/gvt/mpt.h | 400 ----------- 25 files changed, 929 insertions(+), 1833 deletions(-)
PATCH 1/34 drm/i915/gvt: remove module refcounting in intel_gvt_{,un}register_hypervisor
THIS_MODULE always is reference when a symbol called by it is used, so don't bother with the additional reference.
--- drivers/gpu/drm/i915/gvt/gvt.c | 6 ------ 1 file changed, 6 deletions(-)
drivers/gpu/drm/i915/gvt/gvt.c +0 -6
@@ -308,10 +308,6 @@ intel_gvt_register_hypervisor(const struct intel_gvt_mpt *m) m->type != INTEL_GVT_HYPERVISOR_XEN)return -EINVAL ; -/* Get a reference for device model module */ -if (!try_module_get (THIS_MODULE )) -return -ENODEV ; - intel_gvt_host.mpt = m; intel_gvt_host.hypervisor_type = m->type; gvt = (void *)kdev_to_i915 (intel_gvt_host.dev)->gvt;
@@ -321,7 +317,6 @@ intel_gvt_register_hypervisor(const struct intel_gvt_mpt *m)if (ret <0 ) {gvt_err ("Failed to init %s hypervisor module\n" , supported_hypervisors[intel_gvt_host.hypervisor_type]); -module_put (THIS_MODULE );return -ENODEV ; } gvt_dbg_core("Running with hypervisor %s in host mode\n",
@@ -335,6 +330,5 @@ intel_gvt_unregister_hypervisor(void) {void *gvt = (void *)kdev_to_i915 (intel_gvt_host.dev)->gvt;intel_gvt_hypervisor_host_exit (intel_gvt_host.dev, gvt); -module_put (THIS_MODULE ); }EXPORT_SYMBOL_GPL (intel_gvt_unregister_hypervisor);
Signature · 1 line
2.30.2
PATCH 2/34 drm/i915/gvt: remove enum hypervisor_type
In reply to Christoph HellwigThe only supported hypervisor is KVM, so don't bother with dead code enumerating hypervisors.
--- drivers/gpu/drm/i915/gvt/gvt.c | 17 +-- drivers/gpu/drm/i915/gvt/gvt.h | 1 - drivers/gpu/drm/i915/gvt/hypercall.h | 6 -- drivers/gpu/drm/i915/gvt/kvmgt.c | 1 - drivers/gpu/drm/i915/gvt/opregion.c | 150 ++++++--------------------- 5 files changed, 34 insertions(+), 141 deletions(-)
drivers/gpu/drm/i915/gvt/gvt.c +1 -16
@@ -41,11 +41,6 @@struct intel_gvt_host intel_gvt_host; -static const char *const supported_hypervisors[] = { - [INTEL_GVT_HYPERVISOR_XEN ] ="XEN" , - [INTEL_GVT_HYPERVISOR_KVM ] ="KVM" , -}; -static const struct intel_gvt_ops intel_gvt_ops = { .emulate_cfg_read = intel_vgpu_emulate_cfg_read, .emulate_cfg_write = intel_vgpu_emulate_cfg_write,
@@ -304,23 +299,13 @@ intel_gvt_register_hypervisor(const struct intel_gvt_mpt *m)if (!intel_gvt_host.initialized)return -ENODEV ; -if (m->type !=INTEL_GVT_HYPERVISOR_KVM && - m->type !=INTEL_GVT_HYPERVISOR_XEN ) -return -EINVAL ; - intel_gvt_host.mpt = m; - intel_gvt_host.hypervisor_type = m->type; gvt = (void *)kdev_to_i915 (intel_gvt_host.dev)->gvt; ret =intel_gvt_hypervisor_host_init (intel_gvt_host.dev, gvt, &intel_gvt_ops); -if (ret <0 ) { -gvt_err ("Failed to init %s hypervisor module\n" , - supported_hypervisors[intel_gvt_host.hypervisor_type]); +if (ret <0 )return -ENODEV ; - } -gvt_dbg_core ("Running with hypervisor %s in host mode\n" , - supported_hypervisors[intel_gvt_host.hypervisor_type]);return 0 ; }EXPORT_SYMBOL_GPL (intel_gvt_register_hypervisor);
drivers/gpu/drm/i915/gvt/gvt.h +0 -1
@@ -60,7 +60,6 @@struct intel_gvt_host {struct device *dev;bool initialized; -int hypervisor_type;const struct intel_gvt_mpt *mpt; };
drivers/gpu/drm/i915/gvt/hypercall.h +0 -6
@@ -37,17 +37,11 @@struct device ; -enum hypervisor_type { -INTEL_GVT_HYPERVISOR_XEN =0 , -INTEL_GVT_HYPERVISOR_KVM , -}; -/* * Specific GVT-g MPT modules function collections. Currently GVT-g supports * both Xen and KVM by providing dedicated hypervisor-related MPT modules. */ struct intel_gvt_mpt { -enum hypervisor_type type;int (*host_init)(struct device *dev,void *gvt,const void *ops);void (*host_exit)(struct device *dev,void *gvt);int (*attach_vgpu)(void *vgpu,unsigned long *handle);
drivers/gpu/drm/i915/gvt/kvmgt.c +0 -1
@@ -2221,7 +2221,6 @@ static bool kvmgt_is_valid_gfn(unsigned long handle, unsigned long gfn) }static const struct intel_gvt_mpt kvmgt_mpt = { - .type =INTEL_GVT_HYPERVISOR_KVM , .host_init = kvmgt_host_init, .host_exit = kvmgt_host_exit, .attach_vgpu = kvmgt_attach_vgpu,
drivers/gpu/drm/i915/gvt/opregion.c +33 -117
185 lines not on this page · raw message
Signature · 1 line
2.30.2
Re: [PATCH 02/34] drm/i915/gvt: remove enum hypervisor_type
Quoted 11 lines · Christoph Hellwig
The only supported hypervisor is KVM, so don't bother with dead code enumerating hypervisors.
Signed-off-by Christoph Hellwig <[email protected]>--- drivers/gpu/drm/i915/gvt/gvt.c | 17 +-- drivers/gpu/drm/i915/gvt/gvt.h | 1 - drivers/gpu/drm/i915/gvt/hypercall.h | 6 -- drivers/gpu/drm/i915/gvt/kvmgt.c | 1 - drivers/gpu/drm/i915/gvt/opregion.c | 150 ++++++--------------------- 5 files changed, 34 insertions(+), 141 deletions(-)
Jason
PATCH 3/34 drm/i915/gvt: rename intel_vgpu_ops to intel_vgpu_mdev_ops
In reply to Christoph HellwigFree the intel_vgpu_ops symbol name for something that fits better.
--- drivers/gpu/drm/i915/gvt/kvmgt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/gvt/kvmgt.c +3 -3
@@ -1765,7 +1765,7 @@ static const struct attribute_group *intel_vgpu_groups[] = { NULL, }; -static struct mdev_parent_ops intel_vgpu_ops = { +static struct mdev_parent_ops intel_vgpu_mdev_ops = { .mdev_attr_groups = intel_vgpu_groups, .create = intel_vgpu_create, .remove = intel_vgpu_remove,
@@ -1788,9 +1788,9 @@ static int kvmgt_host_init(struct device *dev, void *gvt, const void *ops)return ret; intel_gvt_ops = ops; - intel_vgpu_ops.supported_type_groups = gvt_vgpu_type_groups; + intel_vgpu_mdev_ops.supported_type_groups = gvt_vgpu_type_groups; - ret =mdev_register_device (dev, &intel_vgpu_ops); + ret =mdev_register_device (dev, &intel_vgpu_mdev_ops);if (ret)intel_gvt_cleanup_vgpu_type_groups ((struct intel_gvt *)gvt);
Signature · 1 line
2.30.2
Re: [PATCH 03/34] drm/i915/gvt: rename intel_vgpu_ops to intel_vgpu_mdev_ops
Quoted 6 lines · Christoph Hellwig
Free the
intel_vgpu_opssymbol name for something that fits better.Signed-off-by Christoph Hellwig <[email protected]>--- drivers/gpu/drm/i915/gvt/kvmgt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
Jason
PATCH 4/34 drm/i915/gvt: don't override the include path
In reply to Christoph Hellwigdrivers/gpu/drm/i915/gvt/Makefile is included
from drivers/gpu/drm/i915/Makefile and thus inherits the normal include path relative to drivers/gpu/drm/i915/. Fix up the gvt-specific trace header and just do away with the include path manipulation.
--- drivers/gpu/drm/i915/gvt/Makefile | 1 - drivers/gpu/drm/i915/gvt/trace.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/i915/gvt/Makefile +0 -1
@@ -5,5 +5,4 @@ GVT_SOURCE := gvt.o aperture_gm.o handlers.o vgpu.o trace_points.o firmware.o \ execlist.o scheduler.o sched_policy.o mmio_context.o cmd_parser.o debugfs.o \ fb_decoder.o dmabuf.o page_track.o -ccflags-y += -I $(srctree)/$(src) -I $(srctree)/$(src)/$(GVT_DIR)/ i915-y += $(addprefix $(GVT_DIR)/, $(GVT_SOURCE))
drivers/gpu/drm/i915/gvt/trace.h +1 -1
@@ -379,5 +379,5 @@ TRACE_EVENT(render_mmio,#undef TRACE_INCLUDE_PATH#define TRACE_INCLUDE_PATH .#undef TRACE_INCLUDE_FILE -#define TRACE_INCLUDE_FILE trace +#define TRACE_INCLUDE_FILE gvt/trace#include <trace/define_trace.h>
Signature · 1 line
2.30.2
Re: [PATCH 04/34] drm/i915/gvt: don't override the include path
Quoted 10 lines · Christoph Hellwig
drivers/gpu/drm/i915/gvt/Makefileis included
fromdrivers/gpu/drm/i915/Makefileand thus inherits the normal include path relative todrivers/gpu/drm/i915/. Fix up the gvt-specific trace header and just do away with the include path manipulation.Signed-off-by Christoph Hellwig <[email protected]>--- drivers/gpu/drm/i915/gvt/Makefile | 1 - drivers/gpu/drm/i915/gvt/trace.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)
Jason
Jani Nikula
maintainerRe: [PATCH 04/34] drm/i915/gvt: don't override the include path
In reply to Christoph HellwigQuoted 26 lines · Christoph Hellwig
drivers/gpu/drm/i915/gvt/Makefileis included
fromdrivers/gpu/drm/i915/Makefileand thus inherits the normal include path relative todrivers/gpu/drm/i915/. Fix up the gvt-specific trace header and just do away with the include path manipulation.Signed-off-by Christoph Hellwig <[email protected]>--- drivers/gpu/drm/i915/gvt/Makefile | 1 - drivers/gpu/drm/i915/gvt/trace.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)drivers/gpu/drm/i915/gvt/Makefile +0
-1@@ -5,5 +5,4 @@ GVT_SOURCE := gvt.o aperture_gm.o handlers.o vgpu.o trace_points.o firmware.o \ execlist.o scheduler.o sched_policy.o mmio_context.o cmd_parser.o debugfs.o \ fb_decoder.o dmabuf.o page_track.o -ccflags-y += -I $(srctree)/$(src) -I $(srctree)/$(src)/$(GVT_DIR)/ i915-y += $(addprefix $(GVT_DIR)/, $(GVT_SOURCE))drivers/gpu/drm/i915/gvt/trace.h +0
-0
drivers/gpu/drm/i915/gvt/trace.h TRACE_EVENT(render_mmio, · line 382
Quoted 5 lines
drivers/gpu/drm/i915/gvt/trace.h +1
-1@@ -379,5 +379,5 @@ TRACE_EVENT(render_mmio,#undef TRACE_INCLUDE_PATH#define TRACE_INCLUDE_PATH .#undef TRACE_INCLUDE_FILE -#define TRACE_INCLUDE_FILE trace +#define TRACE_INCLUDE_FILE gvt/trace
This is not actually correct. Please see my gvt Makefile cleanup [1][2].
BR,
Jani.
[1] https://lore.kernel.org/all/[email protected]/
[2] https://lore.kernel.org/all/[email protected]/
Quoted 1 line
drivers/gpu/drm/i915/gvt/trace.h +0
-0#include <trace/define_trace.h>
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
PATCH 5/34 drm/i915/gvt: cleanup the Makefile
In reply to Christoph HellwigMatch the style of the main i915 Makefile in the gvt-specfic one and remove the GVT_DIR and GVT_SOURCE variables.
--- drivers/gpu/drm/i915/gvt/Makefile | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/gvt/Makefile +23 -6
@@ -1,8 +1,25 @@ # SPDX-License-Identifier: GPL-2.0 -GVT_DIR := gvt -GVT_SOURCE := gvt.o aperture_gm.o handlers.o vgpu.o trace_points.o firmware.o \ - interrupt.o gtt.o cfg_space.o opregion.o mmio.o display.o edid.o \ - execlist.o scheduler.o sched_policy.o mmio_context.o cmd_parser.o debugfs.o \ - fb_decoder.o dmabuf.o page_track.o -i915-y += $(addprefix $(GVT_DIR)/, $(GVT_SOURCE)) +i915-y += \ + gvt/gvt.o \ + gvt/aperture_gm.o \ + gvt/handlers.o \ + gvt/vgpu.o \ + gvt/trace_points.o \ + gvt/firmware.o \ + gvt/interrupt.o \ + gvt/gtt.o \ + gvt/cfg_space.o \ + gvt/opregion.o \ + gvt/mmio.o \ + gvt/display.o \ + gvt/edid.o \ + gvt/execlist.o \ + gvt/scheduler.o \ + gvt/sched_policy.o \ + gvt/mmio_context.o \ + gvt/cmd_parser.o \ + gvt/debugfs.o \ + gvt/fb_decoder.o \ + gvt/dmabuf.o \ + gvt/page_track.o
Signature · 1 line
2.30.2
Re: [PATCH 05/34] drm/i915/gvt: cleanup the Makefile
Quoted 32 lines · Christoph Hellwig
Match the style of the main i915
Makefilein the gvt-specfic one and remove theGVT_DIRandGVT_SOURCEvariables.Signed-off-by Christoph Hellwig <[email protected]>drivers/gpu/drm/i915/gvt/Makefile | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-)drivers/gpu/drm/i915/gvt/Makefile +14
-6+++ b/drivers/gpu/drm/i915/gvt/Makefile@@ -1,8 +1,25 @@ # SPDX-License-Identifier: GPL-2.0 -GVT_DIR := gvt -GVT_SOURCE := gvt.o aperture_gm.o handlers.o vgpu.o trace_points.o firmware.o \ - interrupt.o gtt.o cfg_space.o opregion.o mmio.o display.o edid.o \ - execlist.o scheduler.o sched_policy.o mmio_context.o cmd_parser.o debugfs.o \ - fb_decoder.o dmabuf.o page_track.o -i915-y += $(addprefix $(GVT_DIR)/, $(GVT_SOURCE)) +i915-y += \ + gvt/gvt.o \ + gvt/aperture_gm.o \ + gvt/handlers.o \ + gvt/vgpu.o \ + gvt/trace_points.o \ + gvt/firmware.o \ + gvt/interrupt.o \ + gvt/gtt.o \ + gvt/cfg_space.o \ + gvt/opregion.o \ + gvt/mmio.o \ + gvt/display.o \
drivers/gpu/drm/i915/gvt/Makefile line 25
Quoted 10 lines
drivers/gpu/drm/i915/gvt/Makefile +10
-0+ gvt/edid.o \ + gvt/execlist.o \ + gvt/scheduler.o \ + gvt/sched_policy.o \ + gvt/mmio_context.o \ + gvt/cmd_parser.o \ + gvt/debugfs.o \ + gvt/fb_decoder.o \ + gvt/dmabuf.o \ + gvt/page_track.o
Up to you but I usually sort these lists
Jason
Jani Nikula
maintainerRe: [PATCH 05/34] drm/i915/gvt: cleanup the Makefile
Quoted 37 lines · Jason Gunthorpe
Quoted 36 lines · Christoph Hellwig
Match the style of the main i915
Makefilein the gvt-specfic one and remove theGVT_DIRandGVT_SOURCEvariables.Signed-off-by Christoph Hellwig <[email protected]>drivers/gpu/drm/i915/gvt/Makefile | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-)drivers/gpu/drm/i915/gvt/Makefile +18
-6+++ b/drivers/gpu/drm/i915/gvt/Makefile@@ -1,8 +1,25 @@ # SPDX-License-Identifier: GPL-2.0 -GVT_DIR := gvt -GVT_SOURCE := gvt.o aperture_gm.o handlers.o vgpu.o trace_points.o firmware.o \ - interrupt.o gtt.o cfg_space.o opregion.o mmio.o display.o edid.o \ - execlist.o scheduler.o sched_policy.o mmio_context.o cmd_parser.o debugfs.o \ - fb_decoder.o dmabuf.o page_track.o -i915-y += $(addprefix $(GVT_DIR)/, $(GVT_SOURCE)) +i915-y += \ + gvt/gvt.o \ + gvt/aperture_gm.o \ + gvt/handlers.o \ + gvt/vgpu.o \ + gvt/trace_points.o \ + gvt/firmware.o \ + gvt/interrupt.o \ + gvt/gtt.o \ + gvt/cfg_space.o \ + gvt/opregion.o \ + gvt/mmio.o \ + gvt/display.o \ + gvt/edid.o \ + gvt/execlist.o \ + gvt/scheduler.o \ + gvt/sched_policy.o \
Quoted 8 lines
drivers/gpu/drm/i915/gvt/Makefile line 25
Quoted 6 lines
drivers/gpu/drm/i915/gvt/Makefile +6
-0+ gvt/mmio_context.o \ + gvt/cmd_parser.o \ + gvt/debugfs.o \ + gvt/fb_decoder.o \ + gvt/dmabuf.o \ + gvt/page_track.oUp to you but I usually sort these lists
Yeah, please do. Otherwise matches what I sent, so ack.
BR,
Jani.
Quoted 4 lines
Reviewed-by Jason Gunthorpe <[email protected]>Jason
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Re: [PATCH 05/34] drm/i915/gvt: cleanup the Makefile
Quoted 3 lines · Jani Nikula
Quoted 1 line
Up to you but I usually sort these lists
Yeah, please do. Otherwise matches what I sent, so ack.
Let's just merge your 2 patch series ASAP and I'll rebase on top of that.
What branch in drm-intel should I use as the base for the next version btw? Or does gvt go through yet another tree?
Jani Nikula
maintainerRe: [PATCH 05/34] drm/i915/gvt: cleanup the Makefile
Quoted 7 lines · Christoph Hellwig
Quoted 3 lines · Jani Nikula
Quoted 1 line
Up to you but I usually sort these lists
Yeah, please do. Otherwise matches what I sent, so ack.
Let's just merge your 2 patch series ASAP and I'll rebase on top of that.
I rebased them on top of current gvt-next and resent [1]. Zhenyu, Zhi, please pick them up if you approve.
Quoted 2 lines
What branch in drm-intel should I use as the base for the next version btw? Or does gvt go through yet another tree?
It's yet another tree... Basically gvt is developed on top of gvt-next (see MAINTAINERS) and Zhenyu and Zhi send pull requests for drm-intel-next.
BR,
Jani.
[1] https://lore.kernel.org/all/[email protected]
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Re: [PATCH 05/34] drm/i915/gvt: cleanup the Makefile
Quoted 12 lines · Jani Nikula
Quoted 7 lines · Christoph Hellwig
Quoted 3 lines · Jani Nikula
Quoted 1 line
Up to you but I usually sort these lists
Yeah, please do. Otherwise matches what I sent, so ack.
Let's just merge your 2 patch series ASAP and I'll rebase on top of that.
I rebased them on top of current gvt-next and resent [1]. Zhenyu, Zhi, please pick them up if you approve.
Quoted 7 lines
Quoted 2 lines
What branch in drm-intel should I use as the base for the next version btw? Or does gvt go through yet another tree?
It's yet another tree... Basically gvt is developed on top of gvt-next (see
MAINTAINERS) and Zhenyu and Zhi send pull requests for drm-intel-next.
Hi Jani and Christoph:
It seems Jani's makefile clean patch has already included this one, I can just simply drop this one so that Christoph won't need to re-send everything.
For the branch to move on, I am merging the patches and will re-generate the gvt-staging branch, which combines the newest drm-tip vfio-upstream and other gvt branches.
If you are in a rush of re-basing the patches of non-GVT-g stuff, you can use gvt-staging branch until my pull request landed in drm-intel-next.
Also our QA will test gvt-staging-branch before the pull request. I suppose it will take one or two days.
Again, thanks so much for making this happen.
Thanks,
Zhi.
Quoted 6 lines
Quoted 1 line
BR,
Jani.
Re: [PATCH 05/34] drm/i915/gvt: cleanup the Makefile
Quoted 7 lines · Zhi A
It seems Jani's makefile clean patch has already included this one, I can just simply drop this one so that Christoph won't need to re-send everything.
For the branch to move on, I am merging the patches and will re-generate the gvt-staging branch, which combines the newest drm-tip vfio-upstream and other gvt branches.
Quoted 5 lines
If you are in a rush of re-basing the patches of non-GVT-g stuff, you can use gvt-staging branch until my pull request landed in drm-intel-next.
Also our QA will test gvt-staging-branch before the pull request. I suppose it will take one or two days.
When you are wrangling the branches it would be great if Christoph's series and it's minimal dependencies could be on a single branch that could reasonably be pulled to the VFIO tree too, thanks
Jason
Re: [PATCH 05/34] drm/i915/gvt: cleanup the Makefile
Quoted 12 lines · Jason Gunthorpe
Quoted 10 lines · Zhi A
It seems Jani's makefile clean patch has already included this one, I can just simply drop this one so that Christoph won't need to re-send everything.
For the branch to move on, I am merging the patches and will re-generate the gvt-staging branch, which combines the newest drm-tip vfio-upstream and other gvt branches.
If you are in a rush of re-basing the patches of non-GVT-g stuff, you can use gvt-staging branch until my pull request landed in drm-intel-next.
Quoted 9 lines
Quoted 2 lines
Also our QA will test gvt-staging-branch before the pull request. I suppose it will take one or two days.
When you are wrangling the branches it would be great if Christoph's series and it's minimal dependencies could be on a single branch that could reasonably be pulled to the VFIO tree too, thanks
Jason
Hi Jason:
I am thinking about the process of merging process. Here are the dependence:
1) My patches depend on one patch in drm-intel/drm-intel-next. So it has to go through drm.
My patches of GVT-g will go through drm-intel-next -> drm -> upstream.
2) Christoph's patches depends on my patches, but part of them are for VFIO.
a. If they are fully going through VFIO repo, they might have to wait my patches to get landed first.
b. If only the GVT-g parts goes through GVT repo, and rest of them goes through VFIO, the rest part still needs to wait.
What would be a better process?
Thanks,
Zhi.
Re: [PATCH 05/34] drm/i915/gvt: cleanup the Makefile
Quoted 33 lines · Zhi A
Quoted 12 lines · Jason Gunthorpe
Quoted 10 lines · Zhi A
It seems Jani's makefile clean patch has already included this one, I can just simply drop this one so that Christoph won't need to re-send everything.
For the branch to move on, I am merging the patches and will re-generate the gvt-staging branch, which combines the newest drm-tip vfio-upstream and other gvt branches.
If you are in a rush of re-basing the patches of non-GVT-g stuff, you can use gvt-staging branch until my pull request landed in drm-intel-next.
Quoted 9 lines
Quoted 2 lines
Also our QA will test gvt-staging-branch before the pull request. I suppose it will take one or two days.
When you are wrangling the branches it would be great if Christoph's series and it's minimal dependencies could be on a single branch that could reasonably be pulled to the VFIO tree too, thanks
Jason
Hi Jason:
I am thinking about the process of merging process. Here are the dependence:
1) My patches depend on one patch in drm-intel/drm-intel-next. So it has to go through drm.
My patches of GVT-g will go through drm-intel-next -> drm -> upstream.2) Christoph's patches depends on my patches, but part of them are for VFIO.
Quoted 7 lines
a. If they are fully going through VFIO repo, they might have to wait my patches to get landed first.
b. If only the GVT-g parts goes through GVT repo, and rest of them goes through VFIO, the rest part still needs to wait.
What would be a better process?
You should organize everything onto one simple branch based on a rc to make this all work.
Make your #1 patch as a single patch PR based on rc to drm-intel so it gets to the right tree
Make your MMIO series as PR on the branch above that first PR and merge to the gvt tree
Make Christoph's series as a PR on the branch above the second PR's MMIO series and merge to the gvt tree
Merge the gvt toward DRM in the normal way - ie the main merge path for this should be through DRM.
Then ask Alex to merge the 3rd PR as well.
I don't see any intel-next stuff in linux-next yet so hopefully it is early enough to get #1 OK.
Jason
Joonas Lahtinen
maintainerRe: [PATCH 05/34] drm/i915/gvt: cleanup the Makefile
+ Tvrtko
Quoting Jason Gunthorpe (2022-04-13 17:45:48)
Quoted 63 lines · Zhi A
Quoted 33 lines · Jason Gunthorpe
Quoted 12 lines · Zhi A
Quoted 11 lines
It seems Jani's makefile clean patch has already included this one, I can just simply drop this one so that Christoph won't need to re-send everything.
For the branch to move on, I am merging the patches and will re-generate the gvt-staging branch, which combines the newest drm-tip vfio-upstream and other gvt branches.
If you are in a rush of re-basing the patches of non-GVT-g stuff, you can use gvt-staging branch until my pull request landed in drm-intel-next.
Quoted 9 lines
Quoted 2 lines
Also our QA will test gvt-staging-branch before the pull request. I suppose it will take one or two days.
When you are wrangling the branches it would be great if Christoph's series and it's minimal dependencies could be on a single branch that could reasonably be pulled to the VFIO tree too, thanks
Jason
Hi Jason:
I am thinking about the process of merging process. Here are the dependence:
1) My patches depend on one patch in drm-intel/drm-intel-next. So it has to go through drm.
My patches of GVT-g will go through drm-intel-next -> drm -> upstream.2) Christoph's patches depends on my patches, but part of them are for VFIO.
Quoted 7 lines
a. If they are fully going through VFIO repo, they might have to wait my patches to get landed first.
b. If only the GVT-g parts goes through GVT repo, and rest of them goes through VFIO, the rest part still needs to wait.
What would be a better process?
You should organize everything onto one simple branch based on a rc to make this all work.
Make your #1 patch as a single patch PR based on rc to drm-intel so it gets to the right tree
Make your MMIO series as PR on the branch above that first PR and merge to the gvt tree
Make Christoph's series as a PR on the branch above the second PR's MMIO series and merge to the gvt tree
Merge the gvt toward DRM in the normal way - ie the main merge path for this should be through DRM.
Then ask Alex to merge the 3rd PR as well.
I don't see any intel-next stuff in linux-next yet so hopefully it is early enough to get #1 OK.
Jason
PATCH 6/34 drm/i915/gvt: move the gvt code into kvmgt.ko
In reply to Christoph HellwigInstead of having an option to build the gvt code into the main i915 module, just move it into the kvmgt.ko module. This only requires a new struct with three entries that the KVMGT modules needs to register with the main i915 module, and a proper list of GVT-enabled devices instead of global device pointer.
--- drivers/gpu/drm/i915/Kconfig | 36 ++-- drivers/gpu/drm/i915/Makefile | 2 +- drivers/gpu/drm/i915/gvt/Makefile | 5 +- drivers/gpu/drm/i915/gvt/gvt.c | 55 ++---- drivers/gpu/drm/i915/gvt/gvt.h | 6 +- drivers/gpu/drm/i915/gvt/kvmgt.c | 14 +- drivers/gpu/drm/i915/gvt/mpt.h | 3 - drivers/gpu/drm/i915/i915_driver.c | 7 - drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_gvt.c | 200 +++++++++++++------- drivers/gpu/drm/i915/intel_gvt.h | 17 +- drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 1 + 12 files changed, 193 insertions(+), 154 deletions(-)
drivers/gpu/drm/i915/Kconfig +13 -23
@@ -102,40 +102,30 @@ config DRM_I915_USERPTR If in doubt, say "Y". config DRM_I915_GVT - bool "Enable Intel GVT-g graphics virtualization host support" + bool + +config DRM_I915_GVT_KVMGT + tristate "Enable KVM host support Intel GVT-g graphics virtualization" depends on DRM_I915 depends on X86 depends on 64BIT - default n + depends on KVM + depends on VFIO_MDEV + select DRM_I915_GVT + select KVM_EXTERNAL_WRITE_TRACKING + help Choose this option if you want to enable Intel GVT-g graphics virtualization technology host support with integrated graphics. With GVT-g, it's possible to have one integrated graphics - device shared by multiple VMs under different hypervisors. - - Note that at least one hypervisor like Xen or KVM is required for - this driver to work, and it only supports newer device from - Broadwell+. For further information and setup guide, you can - visit: http://01.org/igvt-g. + device shared by multiple VMs under KVM. - Now it's just a stub to support the modifications of i915 for - GVT device model. It requires at least one MPT modules for Xen/KVM - and other components of GVT device model to work. Use it under - you own risk. + Note that this driver only supports newer device from Broadwell on. + For further information and setup guide, you can visit: + http://01.org/igvt-g. If in doubt, say "N". -config DRM_I915_GVT_KVMGT - tristate "Enable KVM/VFIO support for Intel GVT-g" - depends on DRM_I915_GVT - depends on KVM - depends on VFIO_MDEV - select KVM_EXTERNAL_WRITE_TRACKING - default n - help - Choose this option if you want to enable KVMGT support for - Intel GVT-g. - config DRM_I915_PXP bool "Enable Intel PXP support" depends on DRM_I915
drivers/gpu/drm/i915/Makefile +1 -1
@@ -326,7 +326,7 @@ include $(src)/gvt/Makefile endif obj-$(CONFIG_DRM_I915) += i915.o -obj-$(CONFIG_DRM_I915_GVT_KVMGT) += gvt/kvmgt.o +obj-$(CONFIG_DRM_I915_GVT_KVMGT) += kvmgt.o # header test
drivers/gpu/drm/i915/gvt/Makefile +3 -2
@@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 -i915-y += \ +kvmgt-y += \ gvt/gvt.o \ gvt/aperture_gm.o \ gvt/handlers.o \
@@ -22,4 +22,5 @@ i915-y += \ gvt/debugfs.o \ gvt/fb_decoder.o \ gvt/dmabuf.o \ - gvt/page_track.o + gvt/page_track.o \ + gvt/kvmgt.o
drivers/gpu/drm/i915/gvt/gvt.c +19 -36
97 lines not on this page · raw message
drivers/gpu/drm/i915/gvt/gvt.h +2 -4
@@ -58,8 +58,6 @@#define GVT_MAX_VGPU 8struct intel_gvt_host { -struct device *dev; -bool initialized;const struct intel_gvt_mpt *mpt; };
@@ -728,9 +726,9 @@ void intel_gvt_debugfs_remove_vgpu(struct intel_vgpu *vgpu);void intel_gvt_debugfs_init (struct intel_gvt *gvt);void intel_gvt_debugfs_clean (struct intel_gvt *gvt); -int intel_gvt_pm_resume (struct intel_gvt *gvt); -#include "trace.h" #include "mpt.h" +extern const struct intel_vgpu_ops intel_gvt_vgpu_ops; +#endif
drivers/gpu/drm/i915/gvt/kvmgt.c +10 -4
@@ -49,8 +49,12 @@#include <drm/drm_edid.h> #include "i915_drv.h" +#include "intel_gvt.h" #include "gvt.h" +MODULE_IMPORT_NS (DMA_BUF ); +MODULE_IMPORT_NS (I915_GVT ); +static const struct intel_gvt_ops *intel_gvt_ops;/* helper macros copied from vfio-pci */
@@ -2242,16 +2246,18 @@ static const struct intel_gvt_mpt kvmgt_mpt = { .is_valid_gfn = kvmgt_is_valid_gfn, }; +struct intel_gvt_host intel_gvt_host = { + .mpt = &kvmgt_mpt, +}; +static int __init kvmgt_init (void ) { -if (intel_gvt_register_hypervisor (&kvmgt_mpt) <0 ) -return -ENODEV ; -return 0 ; +return intel_gvt_set_ops (&intel_gvt_vgpu_ops); } static void __exit kvmgt_exit(void) { -intel_gvt_unregister_hypervisor (); +intel_gvt_clear_ops (&intel_gvt_vgpu_ops); }module_init (kvmgt_init);
drivers/gpu/drm/i915/gvt/mpt.h +0 -3
@@ -394,7 +394,4 @@ static inline bool intel_gvt_hypervisor_is_valid_gfn( return intel_gvt_host.mpt->is_valid_gfn(vgpu->handle, gfn); } -int intel_gvt_register_hypervisor (const struct intel_gvt_mpt *); -void intel_gvt_unregister_hypervisor (void ); -#endif /* _GVT_MPT_H_ */
drivers/gpu/drm/i915/i915_driver.c +0 -7
@@ -468,11 +468,6 @@ static void i915_driver_mmio_release(struct drm_i915_private *dev_priv)pci_dev_put (dev_priv->bridge_dev); } -static void intel_sanitize_options (struct drm_i915_private *dev_priv) -{ -intel_gvt_sanitize_options (dev_priv); -} -/** * i915_set_dma_info - set all relevant PCI dma info as configured for the * platform
@@ -566,8 +561,6 @@ static int i915_driver_hw_probe(struct drm_i915_private *dev_priv) } } -intel_sanitize_options (dev_priv); -/* needs to be done before ggtt probe */ intel_dram_edram_detect (dev_priv);
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -434,6 +434,7 @@ struct i915_virtual_gpu {u32 caps;u32 *initial_mmio;u8 *initial_cfg_space; +struct list_head entry; };struct i915_selftest_stash {
drivers/gpu/drm/i915/intel_gvt.c +133 -67
255 lines not on this page · raw message
drivers/gpu/drm/i915/intel_gvt.h +10 -7
@@ -39,12 +39,19 @@ struct intel_gvt_mmio_table_iter {int intel_gvt_init (struct drm_i915_private *dev_priv);void intel_gvt_driver_remove (struct drm_i915_private *dev_priv); -int intel_gvt_init_device (struct drm_i915_private *dev_priv); -void intel_gvt_clean_device (struct drm_i915_private *dev_priv);int intel_gvt_init_host (void ); -void intel_gvt_sanitize_options (struct drm_i915_private *dev_priv);void intel_gvt_resume (struct drm_i915_private *dev_priv);int intel_gvt_iterate_mmio_table (struct intel_gvt_mmio_table_iter *iter); + +struct intel_vgpu_ops { +int (*init_device)(struct drm_i915_private *dev_priv); +void (*clean_device)(struct drm_i915_private *dev_priv); +void (*pm_resume)(struct drm_i915_private *i915); +}; + +int intel_gvt_set_ops (const struct intel_vgpu_ops *ops); +void intel_gvt_clear_ops (const struct intel_vgpu_ops *ops); +#else static inline int intel_gvt_init (struct drm_i915_private *dev_priv) {
@@ -55,10 +62,6 @@ static inline void intel_gvt_driver_remove(struct drm_i915_private *dev_priv) { } -static inline void intel_gvt_sanitize_options (struct drm_i915_private *dev_priv) -{ -} -static inline void intel_gvt_resume (struct drm_i915_private *dev_priv) { }
drivers/gpu/drm/i915/intel_gvt_mmio_table.c +1 -0
@@ -1288,3 +1288,4 @@ int intel_gvt_iterate_mmio_table(struct intel_gvt_mmio_table_iter *iter) err:return ret; } +EXPORT_SYMBOL_NS_GPL (intel_gvt_iterate_mmio_table,I915_GVT );
Signature · 1 line
2.30.2
Re: [PATCH 06/34] drm/i915/gvt: move the gvt code into kvmgt.ko
Quoted 7 lines · Christoph Hellwig
Instead of having an option to build the gvt code into the main i915 module, just move it into the kvmgt.ko module. This only requires a new struct with three entries that the KVMGT modules needs to register with the main i915 module, and a proper list of GVT-enabled devices instead of global device pointer.
Signed-off-by Christoph Hellwig <[email protected]>
Quoted 14 lines
--- drivers/gpu/drm/i915/Kconfig | 36 ++-- drivers/gpu/drm/i915/Makefile | 2 +- drivers/gpu/drm/i915/gvt/Makefile | 5 +- drivers/gpu/drm/i915/gvt/gvt.c | 55 ++---- drivers/gpu/drm/i915/gvt/gvt.h | 6 +- drivers/gpu/drm/i915/gvt/kvmgt.c | 14 +- drivers/gpu/drm/i915/gvt/mpt.h | 3 - drivers/gpu/drm/i915/i915_driver.c | 7 - drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_gvt.c | 200 +++++++++++++------- drivers/gpu/drm/i915/intel_gvt.h | 17 +- drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 1 + 12 files changed, 193 insertions(+), 154 deletions(-)
There is a few things going on in here, I looked a few times and didn't spot anything..
Jason
PATCH 7/34 drm/i915/gvt: remove intel_gvt_ops
In reply to Christoph HellwigRemove these pointless indirect alls by just calling the only instance of each method directly.
--- drivers/gpu/drm/i915/gvt/gvt.c | 20 +-------------- drivers/gpu/drm/i915/gvt/gvt.h | 24 ------------------ drivers/gpu/drm/i915/gvt/hypercall.h | 2 +- drivers/gpu/drm/i915/gvt/kvmgt.c | 37 +++++++++++----------------- drivers/gpu/drm/i915/gvt/mpt.h | 5 ++-- 5 files changed, 19 insertions(+), 69 deletions(-)
drivers/gpu/drm/i915/gvt/gvt.c +1 -19
@@ -39,23 +39,6 @@#include <linux/vfio.h> #include <linux/mdev.h> -static const struct intel_gvt_ops intel_gvt_ops = { - .emulate_cfg_read = intel_vgpu_emulate_cfg_read, - .emulate_cfg_write = intel_vgpu_emulate_cfg_write, - .emulate_mmio_read = intel_vgpu_emulate_mmio_read, - .emulate_mmio_write = intel_vgpu_emulate_mmio_write, - .vgpu_create = intel_gvt_create_vgpu, - .vgpu_destroy = intel_gvt_destroy_vgpu, - .vgpu_release = intel_gvt_release_vgpu, - .vgpu_reset = intel_gvt_reset_vgpu, - .vgpu_activate = intel_gvt_activate_vgpu, - .vgpu_deactivate = intel_gvt_deactivate_vgpu, - .vgpu_query_plane = intel_vgpu_query_plane, - .vgpu_get_dmabuf = intel_vgpu_get_dmabuf, - .write_protect_handler = intel_vgpu_page_track_handler, - .emulate_hotplug = intel_vgpu_emulate_hotplug, -}; -static void init_device_info (struct intel_gvt *gvt) {struct intel_gvt_device_info *info = &gvt->device_info;
@@ -252,8 +235,7 @@ static int intel_gvt_init_device(struct drm_i915_private *i915)intel_gvt_debugfs_init (gvt); - ret =intel_gvt_hypervisor_host_init (i915->drm.dev, gvt, - &intel_gvt_ops); + ret =intel_gvt_hypervisor_host_init (i915->drm.dev, gvt);if (ret) goto out_destroy_idle_vgpu;
drivers/gpu/drm/i915/gvt/gvt.h +0 -24
@@ -556,30 +556,6 @@ void populate_pvinfo_page(struct intel_vgpu *vgpu);int intel_gvt_scan_and_shadow_workload (struct intel_vgpu_workload *workload);void enter_failsafe_mode (struct intel_vgpu *vgpu,int reason); -struct intel_gvt_ops { -int (*emulate_cfg_read)(struct intel_vgpu *,unsigned int ,void *, -unsigned int ); -int (*emulate_cfg_write)(struct intel_vgpu *,unsigned int ,void *, -unsigned int ); -int (*emulate_mmio_read)(struct intel_vgpu *,u64 ,void *, -unsigned int ); -int (*emulate_mmio_write)(struct intel_vgpu *,u64 ,void *, -unsigned int ); -struct intel_vgpu *(*vgpu_create)(struct intel_gvt *, -struct intel_vgpu_type *); -void (*vgpu_destroy)(struct intel_vgpu *vgpu); -void (*vgpu_release)(struct intel_vgpu *vgpu); -void (*vgpu_reset)(struct intel_vgpu *); -void (*vgpu_activate)(struct intel_vgpu *); -void (*vgpu_deactivate)(struct intel_vgpu *); -int (*vgpu_query_plane)(struct intel_vgpu *vgpu,void *); -int (*vgpu_get_dmabuf)(struct intel_vgpu *vgpu,unsigned int ); -int (*write_protect_handler)(struct intel_vgpu *,u64 ,void *, -unsigned int ); -void (*emulate_hotplug)(struct intel_vgpu *vgpu,bool connected); -}; - -enum {GVT_FAILSAFE_UNSUPPORTED_GUEST ,GVT_FAILSAFE_INSUFFICIENT_RESOURCE ,
drivers/gpu/drm/i915/gvt/hypercall.h +1 -1
@@ -42,7 +42,7 @@ struct device;* both Xen and KVM by providing dedicated hypervisor-related MPT modules. */ struct intel_gvt_mpt { -int (*host_init)(struct device *dev,void *gvt,const void *ops); +int (*host_init)(struct device *dev,void *gvt);void (*host_exit)(struct device *dev,void *gvt);int (*attach_vgpu)(void *vgpu,unsigned long *handle);void (*detach_vgpu)(void *vgpu);
drivers/gpu/drm/i915/gvt/kvmgt.c +15 -22
@@ -55,8 +55,6 @@MODULE_IMPORT_NS (DMA_BUF );MODULE_IMPORT_NS (I915_GVT ); -static const struct intel_gvt_ops *intel_gvt_ops; -/* helper macros copied from vfio-pci */ #define VFIO_PCI_OFFSET_SHIFT 40#define VFIO_PCI_OFFSET_TO_INDEX (off) (off >> VFIO_PCI_OFFSET_SHIFT)
@@ -621,9 +619,9 @@ static int handle_edid_regs(struct intel_vgpu *vgpu,gvt_vgpu_err ("invalid EDID blob\n" );return -EINVAL ; } - intel_gvt_ops->emulate_hotplug (vgpu, true); +intel_vgpu_emulate_hotplug (vgpu, true); }else if (data ==VFIO_DEVICE_GFX_LINK_STATE_DOWN ) - intel_gvt_ops->emulate_hotplug (vgpu, false); +intel_vgpu_emulate_hotplug (vgpu, false);else {gvt_vgpu_err ("invalid EDID link state %d\n" , regs->link_state);
@@ -825,7 +823,7 @@ static int intel_vgpu_create(struct mdev_device *mdev) goto out; } - vgpu = intel_gvt_ops->vgpu_create (gvt, type); + vgpu =intel_gvt_create_vgpu (gvt, type);if (IS_ERR_OR_NULL (vgpu)) { ret = vgpu ==NULL ? -EFAULT :PTR_ERR (vgpu);gvt_err ("failed to create intel vgpu: %d\n" , ret);
@@ -852,7 +850,7 @@ static int intel_vgpu_remove(struct mdev_device *mdev)if (handle_valid (vgpu->handle))return -EBUSY ; - intel_gvt_ops->vgpu_destroy (vgpu); +intel_gvt_destroy_vgpu (vgpu);return 0 ; }
@@ -955,7 +953,7 @@ static int intel_vgpu_open_device(struct mdev_device *mdev)if (ret) goto undo_group; - intel_gvt_ops->vgpu_activate (vgpu); +intel_gvt_activate_vgpu (vgpu);atomic_set (&vdev->released,0 );return ret;
@@ -1000,7 +998,7 @@ static void __intel_vgpu_release(struct intel_vgpu *vgpu)if (atomic_cmpxchg (&vdev->released,0 ,1 ))return ; - intel_gvt_ops->vgpu_release (vgpu); +intel_gvt_release_vgpu (vgpu); ret =vfio_unregister_notifier (mdev_dev (vdev->mdev),VFIO_IOMMU_NOTIFY , &vdev->iommu_notifier);
@@ -1074,10 +1072,10 @@ static int intel_vgpu_bar_rw(struct intel_vgpu *vgpu, int bar, u64 off,int ret;if (is_write) - ret = intel_gvt_ops->emulate_mmio_write (vgpu, + ret =intel_vgpu_emulate_mmio_write (vgpu, bar_start + off, buf, count);else - ret = intel_gvt_ops->emulate_mmio_read (vgpu, + ret =intel_vgpu_emulate_mmio_read (vgpu, bar_start + off, buf, count);return ret; }
@@ -1133,10 +1131,10 @@ static ssize_t intel_vgpu_rw(struct mdev_device *mdev, char *buf,switch (index) {case VFIO_PCI_CONFIG_REGION_INDEX :if (is_write) - ret = intel_gvt_ops->emulate_cfg_write (vgpu, pos, + ret =intel_vgpu_emulate_cfg_write (vgpu, pos, buf, count);else - ret = intel_gvt_ops->emulate_cfg_read (vgpu, pos, + ret =intel_vgpu_emulate_cfg_read (vgpu, pos, buf, count);break ;case VFIO_PCI_BAR0_REGION_INDEX :
@@ -1704,7 +1702,7 @@ static long intel_vgpu_ioctl(struct mdev_device *mdev, unsigned int cmd,return ret; }else if (cmd ==VFIO_DEVICE_RESET ) { - intel_gvt_ops->vgpu_reset (vgpu); +intel_gvt_reset_vgpu (vgpu);return 0 ; }else if (cmd ==VFIO_DEVICE_QUERY_GFX_PLANE ) {struct vfio_device_gfx_plane_info dmabuf;
@@ -1717,7 +1715,7 @@ static long intel_vgpu_ioctl(struct mdev_device *mdev, unsigned int cmd,if (dmabuf.argsz < minsz)return -EINVAL ; - ret = intel_gvt_ops->vgpu_query_plane (vgpu, &dmabuf); + ret =intel_vgpu_query_plane (vgpu, &dmabuf);if (ret !=0 )return ret;
@@ -1725,14 +1723,10 @@ static long intel_vgpu_ioctl(struct mdev_device *mdev, unsigned int cmd, -EFAULT : 0; }else if (cmd ==VFIO_DEVICE_GET_GFX_DMABUF ) {__u32 dmabuf_id; -__s32 dmabuf_fd;if (get_user (dmabuf_id, (__u32 __user *)arg))return -EFAULT ; - - dmabuf_fd = intel_gvt_ops->vgpu_get_dmabuf (vgpu, dmabuf_id); -return dmabuf_fd; - +return intel_vgpu_get_dmabuf (vgpu, dmabuf_id); }return -ENOTTY ;
@@ -1783,7 +1777,7 @@ static struct mdev_parent_ops intel_vgpu_mdev_ops = { .ioctl = intel_vgpu_ioctl, }; -static int kvmgt_host_init (struct device *dev,void *gvt,const void *ops) +static int kvmgt_host_init (struct device *dev,void *gvt) {int ret;
@@ -1791,7 +1785,6 @@ static int kvmgt_host_init(struct device *dev, void *gvt, const void *ops)if (ret)return ret; - intel_gvt_ops = ops; intel_vgpu_mdev_ops.supported_type_groups = gvt_vgpu_type_groups; ret =mdev_register_device (dev, &intel_vgpu_mdev_ops);
@@ -1883,7 +1876,7 @@ static void kvmgt_page_track_write(struct kvm_vcpu *vcpu, gpa_t gpa, struct kvmgt_guest_info, track_node);if (kvmgt_gfn_is_write_protected (info,gpa_to_gfn (gpa))) - intel_gvt_ops->write_protect_handler (info->vgpu, gpa, +intel_vgpu_page_track_handler (info->vgpu, gpa, (void *)val, len); }
drivers/gpu/drm/i915/gvt/mpt.h +2 -3
@@ -51,13 +51,12 @@* Returns: * Zero on success, negative error code if failed */ -static inline int intel_gvt_hypervisor_host_init (struct device *dev, -void *gvt,const void *ops) +static inline int intel_gvt_hypervisor_host_init (struct device *dev,void *gvt) {if (!intel_gvt_host.mpt->host_init)return -ENODEV ; -return intel_gvt_host.mpt->host_init (dev, gvt, ops); +return intel_gvt_host.mpt->host_init (dev, gvt); }/**
Signature · 1 line
2.30.2
Re: [PATCH 07/34] drm/i915/gvt: remove intel_gvt_ops
Quoted 1 line · Christoph Hellwig
Remove these pointless indirect alls by just calling the only instance
'alls' -> 'calls'
Jason
PATCH 8/34 drm/i915/gvt: remove the map_gfn_to_mfn and set_trap_area ops
In reply to Christoph HellwigThe map_gfn_to_mfn and set_trap_area ops are never defined, so remove them and clean up code that depends on them in the callers.
--- drivers/gpu/drm/i915/gvt/cfg_space.c | 89 ++++++---------------------- drivers/gpu/drm/i915/gvt/hypercall.h | 4 -- drivers/gpu/drm/i915/gvt/mpt.h | 44 -------------- 3 files changed, 17 insertions(+), 120 deletions(-)
drivers/gpu/drm/i915/gvt/cfg_space.c +17 -72
@@ -129,60 +129,16 @@ int intel_vgpu_emulate_cfg_read(struct intel_vgpu *vgpu, unsigned int offset,return 0 ; } -static int map_aperture (struct intel_vgpu *vgpu,bool map) +static void map_aperture (struct intel_vgpu *vgpu,bool map) { -phys_addr_t aperture_pa =vgpu_aperture_pa_base (vgpu); -unsigned long aperture_sz =vgpu_aperture_sz (vgpu); -u64 first_gfn; -u64 val; -int ret; - -if (map == vgpu->cfg_space.bar[INTEL_GVT_PCI_BAR_APERTURE ].tracked) -return 0 ; - - val =vgpu_cfg_space (vgpu)[PCI_BASE_ADDRESS_2 ]; -if (val &PCI_BASE_ADDRESS_MEM_TYPE_64 ) - val = *(u64 *)(vgpu_cfg_space (vgpu) +PCI_BASE_ADDRESS_2 ); -else - val = *(u32 *)(vgpu_cfg_space (vgpu) +PCI_BASE_ADDRESS_2 ); - - first_gfn = (val +vgpu_aperture_offset (vgpu)) >>PAGE_SHIFT ; - - ret =intel_gvt_hypervisor_map_gfn_to_mfn (vgpu, first_gfn, - aperture_pa >>PAGE_SHIFT , - aperture_sz >>PAGE_SHIFT , - map); -if (ret) -return ret; - - vgpu->cfg_space.bar[INTEL_GVT_PCI_BAR_APERTURE ].tracked = map; -return 0 ; +if (map != vgpu->cfg_space.bar[INTEL_GVT_PCI_BAR_APERTURE ].tracked) + vgpu->cfg_space.bar[INTEL_GVT_PCI_BAR_APERTURE ].tracked = map; } -static int trap_gttmmio (struct intel_vgpu *vgpu,bool trap) +static void trap_gttmmio (struct intel_vgpu *vgpu,bool trap) { -u64 start, end; -u64 val; -int ret; - -if (trap == vgpu->cfg_space.bar[INTEL_GVT_PCI_BAR_GTTMMIO ].tracked) -return 0 ; - - val =vgpu_cfg_space (vgpu)[PCI_BASE_ADDRESS_0 ]; -if (val &PCI_BASE_ADDRESS_MEM_TYPE_64 ) - start = *(u64 *)(vgpu_cfg_space (vgpu) +PCI_BASE_ADDRESS_0 ); -else - start = *(u32 *)(vgpu_cfg_space (vgpu) +PCI_BASE_ADDRESS_0 ); - - start &= ~GENMASK (3 ,0 ); - end = start + vgpu->cfg_space.bar[INTEL_GVT_PCI_BAR_GTTMMIO ].size -1 ; - - ret =intel_gvt_hypervisor_set_trap_area (vgpu, start, end, trap); -if (ret) -return ret; - - vgpu->cfg_space.bar[INTEL_GVT_PCI_BAR_GTTMMIO ].tracked = trap; -return 0 ; +if (trap != vgpu->cfg_space.bar[INTEL_GVT_PCI_BAR_GTTMMIO ].tracked) + vgpu->cfg_space.bar[INTEL_GVT_PCI_BAR_GTTMMIO ].tracked = trap; } static int emulate_pci_command_write(struct intel_vgpu *vgpu,
@@ -191,26 +147,17 @@ static int emulate_pci_command_write(struct intel_vgpu *vgpu,u8 old =vgpu_cfg_space (vgpu)[offset];u8 new = *(u8 *)p_data;u8 changed = old ^ new; -int ret;vgpu_pci_cfg_mem_write (vgpu, offset, p_data, bytes);if (!(changed &PCI_COMMAND_MEMORY ))return 0 ;if (old &PCI_COMMAND_MEMORY ) { - ret =trap_gttmmio (vgpu, false); -if (ret) -return ret; - ret =map_aperture (vgpu, false); -if (ret) -return ret; +trap_gttmmio (vgpu, false); +map_aperture (vgpu, false); }else { - ret =trap_gttmmio (vgpu, true); -if (ret) -return ret; - ret =map_aperture (vgpu, true); -if (ret) -return ret; +trap_gttmmio (vgpu, true); +map_aperture (vgpu, true); }return 0 ;
@@ -230,13 +177,12 @@ static int emulate_pci_rom_bar_write(struct intel_vgpu *vgpu,return 0 ; } -static int emulate_pci_bar_write (struct intel_vgpu *vgpu,unsigned int offset, +static void emulate_pci_bar_write (struct intel_vgpu *vgpu,unsigned int offset,void *p_data,unsigned int bytes) {u32 new = *(u32 *)(p_data);bool lo =IS_ALIGNED (offset,8 );u64 size; -int ret =0 ;bool mmio_enabled =vgpu_cfg_space (vgpu)[PCI_COMMAND ] &PCI_COMMAND_MEMORY ;struct intel_vgpu_pci_bar *bars = vgpu->cfg_space.bar;
@@ -259,14 +205,14 @@ static int emulate_pci_bar_write(struct intel_vgpu *vgpu, unsigned int offset,* Untrap the BAR, since guest hasn't configured a * valid GPA */ - ret =trap_gttmmio (vgpu, false); +trap_gttmmio (vgpu, false);break ;case PCI_BASE_ADDRESS_2 :case PCI_BASE_ADDRESS_3 : size = ~(bars[INTEL_GVT_PCI_BAR_APERTURE ].size -1 );intel_vgpu_write_pci_bar (vgpu, offset, size >> (lo ?0 :32 ), lo); - ret =map_aperture (vgpu, false); +map_aperture (vgpu, false);break ;default :/* Unimplemented BARs */
@@ -282,19 +228,18 @@ static int emulate_pci_bar_write(struct intel_vgpu *vgpu, unsigned int offset,*/ trap_gttmmio (vgpu, false);intel_vgpu_write_pci_bar (vgpu, offset, new, lo); - ret =trap_gttmmio (vgpu, mmio_enabled); +trap_gttmmio (vgpu, mmio_enabled);break ;case PCI_BASE_ADDRESS_2 :case PCI_BASE_ADDRESS_3 :map_aperture (vgpu, false);intel_vgpu_write_pci_bar (vgpu, offset, new, lo); - ret =map_aperture (vgpu, mmio_enabled); +map_aperture (vgpu, mmio_enabled);break ;default :intel_vgpu_write_pci_bar (vgpu, offset, new, lo); } } -return ret; }/**
@@ -336,8 +281,8 @@ int intel_vgpu_emulate_cfg_write(struct intel_vgpu *vgpu, unsigned int offset, case PCI_BASE_ADDRESS_0 ... PCI_BASE_ADDRESS_5:if (drm_WARN_ON (&i915->drm, !IS_ALIGNED (offset,4 )))return -EINVAL ; -return emulate_pci_bar_write (vgpu, offset, p_data, bytes); - +emulate_pci_bar_write (vgpu, offset, p_data, bytes); +break ;case INTEL_GVT_PCI_SWSCI :if (drm_WARN_ON (&i915->drm, !IS_ALIGNED (offset,4 )))return -EINVAL ;
drivers/gpu/drm/i915/gvt/hypercall.h +0 -4
@@ -62,10 +62,6 @@ struct intel_gvt_mpt {int (*dma_pin_guest_page)(unsigned long handle,dma_addr_t dma_addr); -int (*map_gfn_to_mfn)(unsigned long handle,unsigned long gfn, -unsigned long mfn,unsigned int nr,bool map); -int (*set_trap_area)(unsigned long handle,u64 start,u64 end, -bool map);int (*set_opregion)(void *vgpu);int (*set_edid)(void *vgpu,int port_num);int (*get_vfio_device)(void *vgpu);
drivers/gpu/drm/i915/gvt/mpt.h +0 -44
50 lines not on this page · raw message
Signature · 1 line
2.30.2
Re: [PATCH 08/34] drm/i915/gvt: remove the map_gfn_to_mfn and set_trap_area ops
Quoted 9 lines · Christoph Hellwig
The
map_gfn_to_mfnandset_trap_areaops are never defined, so remove them and clean up code that depends on them in the callers.Signed-off-by Christoph Hellwig <[email protected]>--- drivers/gpu/drm/i915/gvt/cfg_space.c | 89 ++++++---------------------- drivers/gpu/drm/i915/gvt/hypercall.h | 4 -- drivers/gpu/drm/i915/gvt/mpt.h | 44 -------------- 3 files changed, 17 insertions(+), 120 deletions(-)
Jason
PATCH 9/34 drm/i915/gvt: remove the unused from_virt_to_mfn op
In reply to Christoph Hellwig--- drivers/gpu/drm/i915/gvt/hypercall.h | 1 - drivers/gpu/drm/i915/gvt/kvmgt.c | 6 ------ drivers/gpu/drm/i915/gvt/mpt.h | 12 ------------ 3 files changed, 19 deletions(-)
drivers/gpu/drm/i915/gvt/hypercall.h +0 -1
@@ -47,7 +47,6 @@ struct intel_gvt_mpt {int (*attach_vgpu)(void *vgpu,unsigned long *handle);void (*detach_vgpu)(void *vgpu);int (*inject_msi)(unsigned long handle,u32 addr,u16 data); -unsigned long (*from_virt_to_mfn)(void *p);int (*enable_page_track)(unsigned long handle,u64 gfn);int (*disable_page_track)(unsigned long handle,u64 gfn); int (*read_gpa)(unsigned long handle, unsigned long gpa, void *buf,
drivers/gpu/drm/i915/gvt/kvmgt.c +0 -6
@@ -2192,11 +2192,6 @@ static int kvmgt_write_gpa(unsigned long handle, unsigned long gpa,return kvmgt_rw_gpa (handle, gpa, buf, len, true); } -static unsigned long kvmgt_virt_to_pfn (void *addr) -{ -return PFN_DOWN (__pa (addr)); -} -static bool kvmgt_is_valid_gfn (unsigned long handle,unsigned long gfn) {struct kvmgt_guest_info *info;
@@ -2223,7 +2218,6 @@ static const struct intel_gvt_mpt kvmgt_mpt = { .attach_vgpu = kvmgt_attach_vgpu, .detach_vgpu = kvmgt_detach_vgpu, .inject_msi = kvmgt_inject_msi, - .from_virt_to_mfn = kvmgt_virt_to_pfn, .enable_page_track = kvmgt_page_track_add, .disable_page_track = kvmgt_page_track_remove, .read_gpa = kvmgt_read_gpa,
drivers/gpu/drm/i915/gvt/mpt.h +0 -12
@@ -140,18 +140,6 @@ static inline int intel_gvt_hypervisor_inject_msi(struct intel_vgpu *vgpu)return 0 ; } -/** -* intel_gvt_hypervisor_set_wp_page - translate a host VA into MFN -* @p: host kernel virtual address -* -* Returns: -* MFN on success, INTEL_GVT_INVALID_ADDR if failed. -*/ -static inline unsigned long intel_gvt_hypervisor_virt_to_mfn (void *p) -{ -return intel_gvt_host.mpt->from_virt_to_mfn (p); -} -/** * intel_gvt_hypervisor_enable_page_track - track a guest page * @vgpu: a vGPU
Signature · 1 line
2.30.2
Re: [PATCH 09/34] drm/i915/gvt: remove the unused from_virt_to_mfn op
Quoted 6 lines · Christoph Hellwig
Signed-off-by Christoph Hellwig <[email protected]>--- drivers/gpu/drm/i915/gvt/hypercall.h | 1 - drivers/gpu/drm/i915/gvt/kvmgt.c | 6 ------ drivers/gpu/drm/i915/gvt/mpt.h | 12 ------------ 3 files changed, 19 deletions(-)
Jason
PATCH 10/34 drm/i915/gvt: merge struct kvmgt_vdev into struct intel_vgpu
In reply to Christoph HellwigMove towards having only a single structure for the per-VGPU state.
--- drivers/gpu/drm/i915/gvt/gvt.h | 31 ++- drivers/gpu/drm/i915/gvt/hypercall.h | 1 - drivers/gpu/drm/i915/gvt/kvmgt.c | 288 ++++++++++----------------- drivers/gpu/drm/i915/gvt/mpt.h | 16 -- drivers/gpu/drm/i915/gvt/vgpu.c | 8 +- 5 files changed, 128 insertions(+), 216 deletions(-)
drivers/gpu/drm/i915/gvt/gvt.h +23 -8
@@ -207,21 +207,36 @@ struct intel_vgpu {struct dentry *debugfs; -/* Hypervisor-specific device state. */ -void *vdev; -struct list_head dmabuf_obj_list_head;struct mutex dmabuf_lock;struct idr object_idr;struct intel_vgpu_vblank_timer vblank_timer;u32 scan_nonprivbb; -}; -static inline void *intel_vgpu_vdev (struct intel_vgpu *vgpu) -{ -return vgpu->vdev; -} +struct mdev_device *mdev; +struct vfio_region *region; +int num_regions; +struct eventfd_ctx *intx_trigger; +struct eventfd_ctx *msi_trigger; + +/* +* Two caches are used to avoid mapping duplicated pages (eg. +* scratch pages). This help to reduce dma setup overhead. +*/ +struct rb_root gfn_cache; +struct rb_root dma_addr_cache; +unsigned long nr_cache_entries; +struct mutex cache_lock; + +struct notifier_block iommu_notifier; +struct notifier_block group_notifier; +struct kvm *kvm; +struct work_struct release_work; +atomic_t released; +struct vfio_device *vfio_device; +struct vfio_group *vfio_group; +};/* validating GM healthy status*/ #define vgpu_is_vm_unhealthy (ret_val) \
drivers/gpu/drm/i915/gvt/hypercall.h +0 -1
@@ -44,7 +44,6 @@ struct device;struct intel_gvt_mpt {int (*host_init)(struct device *dev,void *gvt);void (*host_exit)(struct device *dev,void *gvt); -int (*attach_vgpu)(void *vgpu,unsigned long *handle);void (*detach_vgpu)(void *vgpu);int (*inject_msi)(unsigned long handle,u32 addr,u16 data);int (*enable_page_track)(unsigned long handle,u64 gfn);
drivers/gpu/drm/i915/gvt/kvmgt.c +104 -184
726 lines not on this page · raw message
drivers/gpu/drm/i915/gvt/mpt.h +0 -16
@@ -71,22 +71,6 @@ static inline void intel_gvt_hypervisor_host_exit(struct device *dev, void *gvt) intel_gvt_host.mpt->host_exit (dev, gvt); } -/** -* intel_gvt_hypervisor_attach_vgpu - call hypervisor to initialize vGPU -* related stuffs inside hypervisor. -* -* Returns: -* Zero on success, negative error code if failed. -*/ -static inline int intel_gvt_hypervisor_attach_vgpu (struct intel_vgpu *vgpu) -{ -/* optional to provide */ -if (!intel_gvt_host.mpt->attach_vgpu) -return 0 ; - -return intel_gvt_host.mpt->attach_vgpu (vgpu, &vgpu->handle); -} -/** * intel_gvt_hypervisor_detach_vgpu - call hypervisor to release vGPU * related stuffs inside hypervisor.
drivers/gpu/drm/i915/gvt/vgpu.c +1 -7
@@ -405,13 +405,9 @@ static struct intel_vgpu *__intel_gvt_create_vgpu(struct intel_gvt *gvt,populate_pvinfo_page (vgpu); - ret =intel_gvt_hypervisor_attach_vgpu (vgpu); -if (ret) - goto out_clean_vgpu_resource; - ret =intel_vgpu_init_gtt (vgpu);if (ret) - goto out_detach_hypervisor_vgpu; + goto out_clean_vgpu_resource; ret =intel_vgpu_init_opregion (vgpu);if (ret)
@@ -454,8 +450,6 @@ static struct intel_vgpu *__intel_gvt_create_vgpu(struct intel_gvt *gvt,intel_vgpu_clean_opregion (vgpu); out_clean_gtt:intel_vgpu_clean_gtt (vgpu); -out_detach_hypervisor_vgpu: -intel_gvt_hypervisor_detach_vgpu (vgpu); out_clean_vgpu_resource:intel_vgpu_free_resource (vgpu); out_clean_vgpu_mmio:
Signature · 1 line
2.30.2
Re: [PATCH 10/34] drm/i915/gvt: merge struct kvmgt_vdev into struct intel_vgpu
Quoted 10 lines · Christoph Hellwig
Move towards having only a single structure for the per-VGPU state.
Signed-off-by Christoph Hellwig <[email protected]>--- drivers/gpu/drm/i915/gvt/gvt.h | 31 ++- drivers/gpu/drm/i915/gvt/hypercall.h | 1 - drivers/gpu/drm/i915/gvt/kvmgt.c | 288 ++++++++++----------------- drivers/gpu/drm/i915/gvt/mpt.h | 16 -- drivers/gpu/drm/i915/gvt/vgpu.c | 8 +- 5 files changed, 128 insertions(+), 216 deletions(-)
Happy to see it
Jason
PATCH 11/34 drm/i915/gvt: merge struct kvmgt_guest_info into strut intel_vgpu
In reply to Christoph HellwigConsolidate the per-VGPU structures into a single one.
--- drivers/gpu/drm/i915/gvt/gvt.h | 8 +++ drivers/gpu/drm/i915/gvt/kvmgt.c | 117 ++++++++++++------------------- 2 files changed, 52 insertions(+), 73 deletions(-)
drivers/gpu/drm/i915/gvt/gvt.h +8 -0
@@ -34,6 +34,7 @@#define _GVT_H_#include <uapi/linux/pci_regs.h> +#include <linux/kvm_host.h> #include "i915_drv.h" #include "intel_gvt.h"
@@ -174,6 +175,8 @@ struct intel_vgpu_submission { } last_ctx[I915_NUM_ENGINES ]; }; +#define KVMGT_DEBUGFS_FILENAME "kvmgt_nr_cache_entries" +struct intel_vgpu {struct intel_gvt *gvt;struct mutex vgpu_lock;
@@ -236,6 +239,11 @@ struct intel_vgpu {atomic_t released;struct vfio_device *vfio_device;struct vfio_group *vfio_group; + +struct kvm_page_track_notifier_node track_node; +#define NR_BKT (1 << 18) +struct hlist_head ptable[NR_BKT ]; +#undef NR_BKT };/* validating GM healthy status*/
drivers/gpu/drm/i915/gvt/kvmgt.c +44 -73
332 lines not on this page · raw message
Signature · 1 line
2.30.2
Re: [PATCH 11/34] drm/i915/gvt: merge struct kvmgt_guest_info into strut intel_vgpu
Quoted 7 lines · Christoph Hellwig
Consolidate the per-VGPU structures into a single one.
Signed-off-by Christoph Hellwig <[email protected]>--- drivers/gpu/drm/i915/gvt/gvt.h | 8 +++ drivers/gpu/drm/i915/gvt/kvmgt.c | 117 ++++++++++++------------------- 2 files changed, 52 insertions(+), 73 deletions(-)
drivers/gpu/drm/i915/gvt/gvt.h struct intel_vgpu { · line 246
Quoted 9 lines
drivers/gpu/drm/i915/gvt/gvt.h +5
-0@@ -236,6 +239,11 @@ struct intel_vgpu {atomic_t released;struct vfio_device *vfio_device;struct vfio_group *vfio_group; + +struct kvm_page_track_notifier_node track_node; +#define NR_BKT (1 << 18) +struct hlist_head ptable[NR_BKT ]; +#undef NR_BKT
It is what was there before, but it sure read oddly..
Jason
PATCH 12/34 drm/i915/gvt: remove vgpu->handle
In reply to Christoph HellwigAlways pass the actual vgpu structure instead of encoding it as a "handle" and add a bool flag to denote if a VGPU is attached.
--- drivers/gpu/drm/i915/gvt/gvt.h | 3 +- drivers/gpu/drm/i915/gvt/hypercall.h | 32 +++---- drivers/gpu/drm/i915/gvt/kvmgt.c | 126 +++++++++------------------ drivers/gpu/drm/i915/gvt/mpt.h | 20 ++--- drivers/gpu/drm/i915/gvt/vgpu.c | 6 +- 5 files changed, 71 insertions(+), 116 deletions(-)
drivers/gpu/drm/i915/gvt/gvt.h +1 -2
@@ -181,8 +181,8 @@ struct intel_vgpu {struct intel_gvt *gvt;struct mutex vgpu_lock;int id; -unsigned long handle;/* vGPU handle used by hypervisor MPT modules */ bool active; +bool attached;bool pv_notified;bool failsafe;unsigned int resetting_eng;
@@ -449,7 +449,6 @@ int intel_gvt_load_firmware(struct intel_gvt *gvt);#define RING_CTX_SIZE 320struct intel_vgpu_creation_params { -__u64 handle;__u64 low_gm_sz;/* in MB */ __u64 high_gm_sz;/* in MB */ __u64 fence_sz;
drivers/gpu/drm/i915/gvt/hypercall.h +17 -15
@@ -36,6 +36,7 @@#include <linux/types.h> struct device ; +struct intel_vgpu ;/* * Specific GVT-g MPT modules function collections. Currently GVT-g supports
@@ -44,27 +45,28 @@ struct device;struct intel_gvt_mpt {int (*host_init)(struct device *dev,void *gvt);void (*host_exit)(struct device *dev,void *gvt); -void (*detach_vgpu)(void *vgpu); -int (*inject_msi)(unsigned long handle,u32 addr,u16 data); -int (*enable_page_track)(unsigned long handle,u64 gfn); -int (*disable_page_track)(unsigned long handle,u64 gfn); -int (*read_gpa)(unsigned long handle,unsigned long gpa,void *buf, +void (*detach_vgpu)(struct intel_vgpu *vgpu); +int (*inject_msi)(struct intel_vgpu *vgpu,u32 addr,u16 data); +int (*enable_page_track)(struct intel_vgpu *vgpu,u64 gfn); +int (*disable_page_track)(struct intel_vgpu *vgpu,u64 gfn); +int (*read_gpa)(struct intel_vgpu *vgpu,unsigned long gpa,void *buf,unsigned long len); -int (*write_gpa)(unsigned long handle,unsigned long gpa,void *buf, +int (*write_gpa)(struct intel_vgpu *vgpu,unsigned long gpa,void *buf,unsigned long len); -unsigned long (*gfn_to_mfn)(unsigned long handle,unsigned long gfn); +unsigned long (*gfn_to_mfn)(struct intel_vgpu *vgpu,unsigned long gfn); -int (*dma_map_guest_page)(unsigned long handle,unsigned long gfn, +int (*dma_map_guest_page)(struct intel_vgpu *vgpu,unsigned long gfn,unsigned long size,dma_addr_t *dma_addr); -void (*dma_unmap_guest_page)(unsigned long handle,dma_addr_t dma_addr); +void (*dma_unmap_guest_page)(struct intel_vgpu *vgpu, +dma_addr_t dma_addr); -int (*dma_pin_guest_page)(unsigned long handle,dma_addr_t dma_addr); +int (*dma_pin_guest_page)(struct intel_vgpu *vgpu,dma_addr_t dma_addr); -int (*set_opregion)(void *vgpu); -int (*set_edid)(void *vgpu,int port_num); -int (*get_vfio_device)(void *vgpu); -void (*put_vfio_device)(void *vgpu); -bool (*is_valid_gfn)(unsigned long handle,unsigned long gfn); +int (*set_opregion)(struct intel_vgpu *vgpu); +int (*set_edid)(struct intel_vgpu *vgpu,int port_num); +int (*get_vfio_device)(struct intel_vgpu *vgpu); +void (*put_vfio_device)(struct intel_vgpu *vgpu); +bool (*is_valid_gfn)(struct intel_vgpu *vgpu,unsigned long gfn); };#endif /* _GVT_HYPERCALL_H_ */
drivers/gpu/drm/i915/gvt/kvmgt.c +41 -85
313 lines not on this page · raw message
drivers/gpu/drm/i915/gvt/mpt.h +10 -10
@@ -118,7 +118,7 @@ static inline int intel_gvt_hypervisor_inject_msi(struct intel_vgpu *vgpu)trace_inject_msi (vgpu->id, addr, data); - ret = intel_gvt_host.mpt->inject_msi (vgpu->handle, addr, data); + ret = intel_gvt_host.mpt->inject_msi (vgpu, addr, data);if (ret)return ret;return 0 ;
@@ -135,7 +135,7 @@ static inline int intel_gvt_hypervisor_inject_msi(struct intel_vgpu *vgpu)static inline int intel_gvt_hypervisor_enable_page_track (struct intel_vgpu *vgpu,unsigned long gfn) { -return intel_gvt_host.mpt->enable_page_track (vgpu->handle, gfn); +return intel_gvt_host.mpt->enable_page_track (vgpu, gfn); }/**
@@ -149,7 +149,7 @@ static inline int intel_gvt_hypervisor_enable_page_track(static inline int intel_gvt_hypervisor_disable_page_track (struct intel_vgpu *vgpu,unsigned long gfn) { -return intel_gvt_host.mpt->disable_page_track (vgpu->handle, gfn); +return intel_gvt_host.mpt->disable_page_track (vgpu, gfn); }/**
@@ -165,7 +165,7 @@ static inline int intel_gvt_hypervisor_disable_page_track(static inline int intel_gvt_hypervisor_read_gpa (struct intel_vgpu *vgpu,unsigned long gpa,void *buf,unsigned long len) { -return intel_gvt_host.mpt->read_gpa (vgpu->handle, gpa, buf, len); +return intel_gvt_host.mpt->read_gpa (vgpu, gpa, buf, len); }/**
@@ -181,7 +181,7 @@ static inline int intel_gvt_hypervisor_read_gpa(struct intel_vgpu *vgpu,static inline int intel_gvt_hypervisor_write_gpa (struct intel_vgpu *vgpu,unsigned long gpa,void *buf,unsigned long len) { -return intel_gvt_host.mpt->write_gpa (vgpu->handle, gpa, buf, len); +return intel_gvt_host.mpt->write_gpa (vgpu, gpa, buf, len); }/**
@@ -195,7 +195,7 @@ static inline int intel_gvt_hypervisor_write_gpa(struct intel_vgpu *vgpu,static inline unsigned long intel_gvt_hypervisor_gfn_to_mfn (struct intel_vgpu *vgpu,unsigned long gfn) { -return intel_gvt_host.mpt->gfn_to_mfn (vgpu->handle, gfn); +return intel_gvt_host.mpt->gfn_to_mfn (vgpu, gfn); }/**
@@ -212,7 +212,7 @@ static inline int intel_gvt_hypervisor_dma_map_guest_page( struct intel_vgpu *vgpu, unsigned long gfn, unsigned long size, dma_addr_t *dma_addr) { - return intel_gvt_host.mpt->dma_map_guest_page(vgpu->handle, gfn, size, + return intel_gvt_host.mpt->dma_map_guest_page(vgpu, gfn, size,dma_addr ); }
@@ -224,7 +224,7 @@ static inline int intel_gvt_hypervisor_dma_map_guest_page(static inline void intel_gvt_hypervisor_dma_unmap_guest_page (struct intel_vgpu *vgpu,dma_addr_t dma_addr) { - intel_gvt_host.mpt->dma_unmap_guest_page (vgpu->handle, dma_addr); + intel_gvt_host.mpt->dma_unmap_guest_page (vgpu, dma_addr); }/**
@@ -239,7 +239,7 @@ static inline int intel_gvt_hypervisor_dma_pin_guest_page(struct intel_vgpu *vgpu, dma_addr_t dma_addr) { -return intel_gvt_host.mpt->dma_pin_guest_page (vgpu->handle, dma_addr); +return intel_gvt_host.mpt->dma_pin_guest_page (vgpu, dma_addr); }/**
@@ -318,7 +318,7 @@ static inline bool intel_gvt_hypervisor_is_valid_gfn(if (!intel_gvt_host.mpt->is_valid_gfn)return true; - return intel_gvt_host.mpt->is_valid_gfn(vgpu->handle, gfn); + return intel_gvt_host.mpt->is_valid_gfn(vgpu, gfn); }#endif /* _GVT_MPT_H_ */
drivers/gpu/drm/i915/gvt/vgpu.c +2 -4
@@ -370,8 +370,8 @@ static struct intel_vgpu *__intel_gvt_create_vgpu(struct intel_gvt *gvt,struct intel_vgpu *vgpu;int ret; -gvt_dbg_core ("handle %llu low %llu MB high %llu MB fence %llu\n" , - param->handle, param->low_gm_sz, param->high_gm_sz, +gvt_dbg_core ("low %llu MB high %llu MB fence %llu\n" , + param->low_gm_sz, param->high_gm_sz, param->fence_sz); vgpu =vzalloc (sizeof (*vgpu));
@@ -384,7 +384,6 @@ static struct intel_vgpu *__intel_gvt_create_vgpu(struct intel_gvt *gvt, goto out_free_vgpu; vgpu->id = ret; - vgpu->handle = param->handle; vgpu->gvt = gvt; vgpu->sched_ctl.weight = param->weight;mutex_init (&vgpu->vgpu_lock);
@@ -477,7 +476,6 @@ struct intel_vgpu *intel_gvt_create_vgpu(struct intel_gvt *gvt,struct intel_vgpu_creation_params param;struct intel_vgpu *vgpu; - param.handle =0 ; param.primary =1 ; param.low_gm_sz = type->low_gm_size; param.high_gm_sz = type->high_gm_size;
Signature · 1 line
2.30.2
Re: [PATCH 12/34] drm/i915/gvt: remove vgpu->handle
Quoted 11 lines · Christoph Hellwig
Always pass the actual vgpu structure instead of encoding it as a "handle" and add a bool flag to denote if a VGPU is attached.
Signed-off-by Christoph Hellwig <[email protected]>--- drivers/gpu/drm/i915/gvt/gvt.h | 3 +- drivers/gpu/drm/i915/gvt/hypercall.h | 32 +++---- drivers/gpu/drm/i915/gvt/kvmgt.c | 126 +++++++++------------------ drivers/gpu/drm/i915/gvt/mpt.h | 20 ++--- drivers/gpu/drm/i915/gvt/vgpu.c | 6 +- 5 files changed, 71 insertions(+), 116 deletions(-)
Yay typesafety!
Jason
PATCH 13/34 drm/i915/gvt: devirtualize ->{read,write}_gpa
In reply to Christoph HellwigJust call the VFIO functions directly instead of through the method table.
--- drivers/gpu/drm/i915/gvt/cmd_parser.c | 4 +-- drivers/gpu/drm/i915/gvt/execlist.c | 12 ++++----- drivers/gpu/drm/i915/gvt/gtt.c | 6 ++--- drivers/gpu/drm/i915/gvt/gvt.h | 37 +++++++++++++++++++++++++++ drivers/gpu/drm/i915/gvt/hypercall.h | 4 --- drivers/gpu/drm/i915/gvt/kvmgt.c | 23 ----------------- drivers/gpu/drm/i915/gvt/mmio.c | 4 +-- drivers/gpu/drm/i915/gvt/mpt.h | 32 ----------------------- drivers/gpu/drm/i915/gvt/opregion.c | 10 +++----- drivers/gpu/drm/i915/gvt/scheduler.c | 37 +++++++++++++-------------- 10 files changed, 72 insertions(+), 97 deletions(-)
drivers/gpu/drm/i915/gvt/cmd_parser.c +2 -2
@@ -1011,7 +1011,7 @@ static int cmd_reg_handler(struct parser_exec_state *s,if (GRAPHICS_VER (s->engine->i915) ==9 &&intel_gvt_mmio_is_sr_in_ctx (gvt, offset) && !strncmp (cmd,"lri" ,3 )) { -intel_gvt_hypervisor_read_gpa (s->vgpu, +intel_gvt_read_gpa (s->vgpu, s->workload->ring_context_gpa +12 , &ctx_sr_ctl,4 );/* check inhibit context */ if (ctx_sr_ctl &1 ) {
@@ -1775,7 +1775,7 @@ static int copy_gma_to_hva(struct intel_vgpu *vgpu, struct intel_vgpu_mm *mm, copy_len = (end_gma - gma) >= (I915_GTT_PAGE_SIZE - offset) ?I915_GTT_PAGE_SIZE - offset : end_gma - gma; -intel_gvt_hypervisor_read_gpa (vgpu, gpa, va + len, copy_len); +intel_gvt_read_gpa (vgpu, gpa, va + len, copy_len); len += copy_len; gma += copy_len;
drivers/gpu/drm/i915/gvt/execlist.c +6 -6
@@ -159,12 +159,12 @@ static void emulate_csb_update(struct intel_vgpu_execlist *execlist, hwsp_gpa =intel_vgpu_gma_to_gpa (vgpu->gtt.ggtt_mm, vgpu->hws_pga[execlist->engine->id]);if (hwsp_gpa !=INTEL_GVT_INVALID_ADDR ) { -intel_gvt_hypervisor_write_gpa (vgpu, - hwsp_gpa +I915_HWS_CSB_BUF0_INDEX *4 + write_pointer *8 , - status,8 ); -intel_gvt_hypervisor_write_gpa (vgpu, - hwsp_gpa +INTEL_HWS_CSB_WRITE_INDEX (execlist->engine->i915) *4 , - &write_pointer,4 ); +intel_gvt_write_gpa (vgpu, + hwsp_gpa +I915_HWS_CSB_BUF0_INDEX *4 + write_pointer *8 , + status,8 ); +intel_gvt_write_gpa (vgpu, + hwsp_gpa +INTEL_HWS_CSB_WRITE_INDEX (execlist->engine->i915) *4 , + &write_pointer,4 ); } gvt_dbg_el("vgpu%d: w pointer %u reg %x csb l %x csb h %x\n",
drivers/gpu/drm/i915/gvt/gtt.c +3 -3
@@ -314,7 +314,7 @@ static inline int gtt_get_entry64(void *pt,return -EINVAL ;if (hypervisor_access) { - ret =intel_gvt_hypervisor_read_gpa (vgpu, gpa + + ret =intel_gvt_read_gpa (vgpu, gpa + (index << info->gtt_entry_size_shift), &e->val64,8 );if (WARN_ON (ret))
@@ -339,7 +339,7 @@ static inline int gtt_set_entry64(void *pt,return -EINVAL ;if (hypervisor_access) { - ret =intel_gvt_hypervisor_write_gpa (vgpu, gpa + + ret =intel_gvt_write_gpa (vgpu, gpa + (index << info->gtt_entry_size_shift), &e->val64,8 );if (WARN_ON (ret))
@@ -1497,7 +1497,7 @@ static int attach_oos_page(struct intel_vgpu_oos_page *oos_page,struct intel_gvt *gvt = spt->vgpu->gvt;int ret; - ret =intel_gvt_hypervisor_read_gpa (spt->vgpu, + ret =intel_gvt_read_gpa (spt->vgpu, spt->guest_page.gfn <<I915_GTT_PAGE_SHIFT , oos_page->mem,I915_GTT_PAGE_SIZE );if (ret)
drivers/gpu/drm/i915/gvt/gvt.h +37 -0
@@ -35,6 +35,7 @@#include <uapi/linux/pci_regs.h> #include <linux/kvm_host.h> +#include <linux/vfio.h> #include "i915_drv.h" #include "intel_gvt.h"
@@ -720,6 +721,42 @@ static inline bool intel_gvt_mmio_is_cmd_write_patch(return gvt->mmio.mmio_attribute[offset >>2 ] &F_CMD_WRITE_PATCH ; } +/** +* intel_gvt_read_gpa - copy data from GPA to host data buffer +* @vgpu: a vGPU +* @gpa: guest physical address +* @buf: host data buffer +* @len: data length +* +* Returns: +* Zero on success, negative error code if failed. +*/ +static inline int intel_gvt_read_gpa (struct intel_vgpu *vgpu,unsigned long gpa, +void *buf,unsigned long len) +{ +if (!vgpu->attached) +return -ESRCH ; +return vfio_dma_rw (vgpu->vfio_group, gpa, buf, len, false); +} + +/** +* intel_gvt_write_gpa - copy data from host data buffer to GPA +* @vgpu: a vGPU +* @gpa: guest physical address +* @buf: host data buffer +* @len: data length +* +* Returns: +* Zero on success, negative error code if failed. +*/ +static inline int intel_gvt_write_gpa (struct intel_vgpu *vgpu, +unsigned long gpa,void *buf,unsigned long len) +{ +if (!vgpu->attached) +return -ESRCH ; +return vfio_dma_rw (vgpu->vfio_group, gpa, buf, len, true); +} +void intel_gvt_debugfs_remove_vgpu (struct intel_vgpu *vgpu);void intel_gvt_debugfs_init (struct intel_gvt *gvt);void intel_gvt_debugfs_clean (struct intel_gvt *gvt);
drivers/gpu/drm/i915/gvt/hypercall.h +0 -4
@@ -49,10 +49,6 @@ struct intel_gvt_mpt {int (*inject_msi)(struct intel_vgpu *vgpu,u32 addr,u16 data);int (*enable_page_track)(struct intel_vgpu *vgpu,u64 gfn);int (*disable_page_track)(struct intel_vgpu *vgpu,u64 gfn); -int (*read_gpa)(struct intel_vgpu *vgpu,unsigned long gpa,void *buf, -unsigned long len); -int (*write_gpa)(struct intel_vgpu *vgpu,unsigned long gpa,void *buf, -unsigned long len);unsigned long (*gfn_to_mfn)(struct intel_vgpu *vgpu,unsigned long gfn); int (*dma_map_guest_page)(struct intel_vgpu *vgpu, unsigned long gfn,
drivers/gpu/drm/i915/gvt/kvmgt.c +0 -23
@@ -39,7 +39,6 @@#include <linux/spinlock.h> #include <linux/eventfd.h> #include <linux/uuid.h> -#include <linux/vfio.h> #include <linux/mdev.h> #include <linux/debugfs.h>
@@ -2024,26 +2023,6 @@ static void kvmgt_dma_unmap_guest_page(struct intel_vgpu *vgpu,mutex_unlock (&vgpu->cache_lock); } -static int kvmgt_rw_gpa (struct intel_vgpu *vgpu,unsigned long gpa, -void *buf,unsigned long len,bool write) -{ -if (!vgpu->attached) -return -ESRCH ; -return vfio_dma_rw (vgpu->vfio_group, gpa, buf, len, write); -} - -static int kvmgt_read_gpa (struct intel_vgpu *vgpu,unsigned long gpa, -void *buf,unsigned long len) -{ -return kvmgt_rw_gpa (vgpu, gpa, buf, len, false); -} - -static int kvmgt_write_gpa (struct intel_vgpu *vgpu,unsigned long gpa, -void *buf,unsigned long len) -{ -return kvmgt_rw_gpa (vgpu, gpa, buf, len, true); -} -static bool kvmgt_is_valid_gfn (struct intel_vgpu *vgpu,unsigned long gfn) {struct kvm *kvm = vgpu->kvm;
@@ -2067,8 +2046,6 @@ static const struct intel_gvt_mpt kvmgt_mpt = { .inject_msi = kvmgt_inject_msi, .enable_page_track = kvmgt_page_track_add, .disable_page_track = kvmgt_page_track_remove, - .read_gpa = kvmgt_read_gpa, - .write_gpa = kvmgt_write_gpa, .gfn_to_mfn = kvmgt_gfn_to_pfn, .dma_map_guest_page = kvmgt_dma_map_guest_page, .dma_unmap_guest_page = kvmgt_dma_unmap_guest_page,
drivers/gpu/drm/i915/gvt/mmio.c +2 -2
@@ -139,7 +139,7 @@ int intel_vgpu_emulate_mmio_read(struct intel_vgpu *vgpu, u64 pa, }if (drm_WARN_ON_ONCE (&i915->drm, !reg_is_mmio (gvt, offset))) { - ret =intel_gvt_hypervisor_read_gpa (vgpu, pa, p_data, bytes); + ret =intel_gvt_read_gpa (vgpu, pa, p_data, bytes); goto out; }
@@ -215,7 +215,7 @@ int intel_vgpu_emulate_mmio_write(struct intel_vgpu *vgpu, u64 pa, }if (drm_WARN_ON_ONCE (&i915->drm, !reg_is_mmio (gvt, offset))) { - ret =intel_gvt_hypervisor_write_gpa (vgpu, pa, p_data, bytes); + ret =intel_gvt_write_gpa (vgpu, pa, p_data, bytes); goto out; }
drivers/gpu/drm/i915/gvt/mpt.h +0 -32
@@ -152,38 +152,6 @@ static inline int intel_gvt_hypervisor_disable_page_track(return intel_gvt_host.mpt->disable_page_track (vgpu, gfn); } -/** -* intel_gvt_hypervisor_read_gpa - copy data from GPA to host data buffer -* @vgpu: a vGPU -* @gpa: guest physical address -* @buf: host data buffer -* @len: data length -* -* Returns: -* Zero on success, negative error code if failed. -*/ -static inline int intel_gvt_hypervisor_read_gpa (struct intel_vgpu *vgpu, -unsigned long gpa,void *buf,unsigned long len) -{ -return intel_gvt_host.mpt->read_gpa (vgpu, gpa, buf, len); -} - -/** -* intel_gvt_hypervisor_write_gpa - copy data from host data buffer to GPA -* @vgpu: a vGPU -* @gpa: guest physical address -* @buf: host data buffer -* @len: data length -* -* Returns: -* Zero on success, negative error code if failed. -*/ -static inline int intel_gvt_hypervisor_write_gpa (struct intel_vgpu *vgpu, -unsigned long gpa,void *buf,unsigned long len) -{ -return intel_gvt_host.mpt->write_gpa (vgpu, gpa, buf, len); -} -/** * intel_gvt_hypervisor_gfn_to_mfn - translate a GFN to MFN * @vgpu: a vGPU
drivers/gpu/drm/i915/gvt/opregion.c +4 -6
@@ -421,14 +421,14 @@ int intel_vgpu_emulate_opregion_request(struct intel_vgpu *vgpu, u32 swsci)INTEL_GVT_OPREGION_SCIC ; parm_pa = (vgpu_opregion (vgpu)->gfn[0 ] <<PAGE_SHIFT ) +INTEL_GVT_OPREGION_PARM ; - ret =intel_gvt_hypervisor_read_gpa (vgpu, scic_pa, &scic,sizeof (scic)); + ret =intel_gvt_read_gpa (vgpu, scic_pa, &scic,sizeof (scic));if (ret) {gvt_vgpu_err ("guest opregion read error %d, gpa 0x%llx, len %lu\n" , ret, scic_pa,sizeof (scic));return ret; } - ret =intel_gvt_hypervisor_read_gpa (vgpu, parm_pa, &parm,sizeof (parm)); + ret =intel_gvt_read_gpa (vgpu, parm_pa, &parm,sizeof (parm));if (ret) {gvt_vgpu_err ("guest opregion read error %d, gpa 0x%llx, len %lu\n" , ret, scic_pa,sizeof (scic));
@@ -465,16 +465,14 @@ int intel_vgpu_emulate_opregion_request(struct intel_vgpu *vgpu, u32 swsci) parm =0 ; out: - ret =intel_gvt_hypervisor_write_gpa (vgpu, scic_pa, &scic, -sizeof (scic)); + ret =intel_gvt_write_gpa (vgpu, scic_pa, &scic,sizeof (scic));if (ret) {gvt_vgpu_err ("guest opregion write error %d, gpa 0x%llx, len %lu\n" , ret, scic_pa,sizeof (scic));return ret; } - ret =intel_gvt_hypervisor_write_gpa (vgpu, parm_pa, &parm, -sizeof (parm)); + ret =intel_gvt_write_gpa (vgpu, parm_pa, &parm,sizeof (parm));if (ret) {gvt_vgpu_err ("guest opregion write error %d, gpa 0x%llx, len %lu\n" , ret, scic_pa,sizeof (scic));
drivers/gpu/drm/i915/gvt/scheduler.c +18 -19
@@ -150,10 +150,10 @@ static int populate_shadow_context(struct intel_vgpu_workload *workload)sr_oa_regs (workload, (u32 *)shadow_ring_context, true);#define COPY_REG (name) \ - intel_gvt_hypervisor_read_gpa(vgpu, workload->ring_context_gpa \ + intel_gvt_read_gpa(vgpu, workload->ring_context_gpa \ + RING_CTX_OFF(name.val), &shadow_ring_context->name.val, 4)#define COPY_REG_MASKED (name) {\ - intel_gvt_hypervisor_read_gpa(vgpu, workload->ring_context_gpa \ + intel_gvt_read_gpa(vgpu, workload->ring_context_gpa \ + RING_CTX_OFF(name.val),\ &shadow_ring_context->name.val, 4);\ shadow_ring_context->name.val |= 0xffff << 16;\
@@ -167,7 +167,7 @@ static int populate_shadow_context(struct intel_vgpu_workload *workload)COPY_REG (rcs_indirect_ctx);COPY_REG (rcs_indirect_ctx_offset); }else if (workload->engine->id ==BCS0 ) - intel_gvt_hypervisor_read_gpa(vgpu, + intel_gvt_read_gpa(vgpu, workload->ring_context_gpa + BCS_TILE_REGISTER_VAL_OFFSET, (void *)shadow_ring_context +
@@ -178,7 +178,7 @@ static int populate_shadow_context(struct intel_vgpu_workload *workload)/* don't copy Ring Context (the first 0x50 dwords), * only copy the Engine Context part from guest */ - intel_gvt_hypervisor_read_gpa(vgpu, + intel_gvt_read_gpa(vgpu, workload->ring_context_gpa + RING_CTX_SIZE, (void *)shadow_ring_context +
@@ -245,7 +245,7 @@ static int populate_shadow_context(struct intel_vgpu_workload *workload)continue ; read: -intel_gvt_hypervisor_read_gpa (vgpu, gpa_base, dst, gpa_size); +intel_gvt_read_gpa (vgpu, gpa_base, dst, gpa_size); gpa_base = context_gpa; gpa_size =I915_GTT_PAGE_SIZE ; dst = context_base + (i <<I915_GTT_PAGE_SHIFT );
@@ -911,8 +911,7 @@ static void update_guest_pdps(struct intel_vgpu *vgpu, gpa = ring_context_gpa +RING_CTX_OFF (pdps[0 ].val);for (i =0 ; i <8 ; i++) -intel_gvt_hypervisor_write_gpa (vgpu, - gpa + i *8 , &pdp[7 - i],4 ); +intel_gvt_write_gpa (vgpu, gpa + i *8 , &pdp[7 - i],4 ); } static __maybe_unused bool
@@ -1007,13 +1006,13 @@ static void update_guest_context(struct intel_vgpu_workload *workload)continue ; write: -intel_gvt_hypervisor_write_gpa (vgpu, gpa_base, src, gpa_size); +intel_gvt_write_gpa (vgpu, gpa_base, src, gpa_size); gpa_base = context_gpa; gpa_size =I915_GTT_PAGE_SIZE ; src = context_base + (i <<I915_GTT_PAGE_SHIFT ); } -intel_gvt_hypervisor_write_gpa (vgpu, workload->ring_context_gpa + +intel_gvt_write_gpa (vgpu, workload->ring_context_gpa +RING_CTX_OFF (ring_header.val), &workload->rb_tail,4 ); shadow_ring_context = (void *) ctx->lrc_reg_state;
@@ -1028,7 +1027,7 @@ static void update_guest_context(struct intel_vgpu_workload *workload) }#define COPY_REG (name) \ - intel_gvt_hypervisor_write_gpa(vgpu, workload->ring_context_gpa + \ + intel_gvt_write_gpa(vgpu, workload->ring_context_gpa + \ RING_CTX_OFF(name.val), &shadow_ring_context->name.val, 4)COPY_REG (ctx_ctrl);
@@ -1036,7 +1035,7 @@ static void update_guest_context(struct intel_vgpu_workload *workload)#undef COPY_REG - intel_gvt_hypervisor_write_gpa(vgpu, + intel_gvt_write_gpa(vgpu, workload->ring_context_gpa + sizeof(*shadow_ring_context), (void *)shadow_ring_context +
@@ -1573,7 +1572,7 @@ static void read_guest_pdps(struct intel_vgpu *vgpu, gpa = ring_context_gpa +RING_CTX_OFF (pdps[0 ].val);for (i =0 ; i <8 ; i++) -intel_gvt_hypervisor_read_gpa (vgpu, +intel_gvt_read_gpa (vgpu, gpa + i *8 , &pdp[7 - i],4 ); }
@@ -1644,10 +1643,10 @@ intel_vgpu_create_workload(struct intel_vgpu *vgpu,return ERR_PTR (-EINVAL ); } -intel_gvt_hypervisor_read_gpa (vgpu, ring_context_gpa + +intel_gvt_read_gpa (vgpu, ring_context_gpa +RING_CTX_OFF (ring_header.val), &head,4 ); -intel_gvt_hypervisor_read_gpa (vgpu, ring_context_gpa + +intel_gvt_read_gpa (vgpu, ring_context_gpa +RING_CTX_OFF (ring_tail.val), &tail,4 ); guest_head = head;
@@ -1674,11 +1673,11 @@ intel_vgpu_create_workload(struct intel_vgpu *vgpu,gvt_dbg_el ("ring %s begin a new workload\n" , engine->name);/* record some ring buffer register values for scan and shadow */ -intel_gvt_hypervisor_read_gpa (vgpu, ring_context_gpa + +intel_gvt_read_gpa (vgpu, ring_context_gpa +RING_CTX_OFF (rb_start.val), &start,4 ); -intel_gvt_hypervisor_read_gpa (vgpu, ring_context_gpa + +intel_gvt_read_gpa (vgpu, ring_context_gpa +RING_CTX_OFF (rb_ctrl.val), &ctl,4 ); -intel_gvt_hypervisor_read_gpa (vgpu, ring_context_gpa + +intel_gvt_read_gpa (vgpu, ring_context_gpa +RING_CTX_OFF (ctx_ctrl.val), &ctx_ctl,4 ); if (!intel_gvt_ggtt_validate_range(vgpu, start,
@@ -1701,9 +1700,9 @@ intel_vgpu_create_workload(struct intel_vgpu *vgpu, workload->rb_ctl = ctl;if (engine->id ==RCS0 ) { -intel_gvt_hypervisor_read_gpa (vgpu, ring_context_gpa + +intel_gvt_read_gpa (vgpu, ring_context_gpa +RING_CTX_OFF (bb_per_ctx_ptr.val), &per_ctx,4 ); -intel_gvt_hypervisor_read_gpa (vgpu, ring_context_gpa + +intel_gvt_read_gpa (vgpu, ring_context_gpa +RING_CTX_OFF (rcs_indirect_ctx.val), &indirect_ctx,4 ); workload->wa_ctx.indirect_ctx.guest_gma =
Signature · 1 line
2.30.2
Re: [PATCH 13/34] drm/i915/gvt: devirtualize ->{read,write}_gpa
Quoted 4 lines · Christoph Hellwig
Just call the VFIO functions directly instead of through the method table.
Signed-off-by Christoph Hellwig <[email protected]>
Quoted 12 lines
--- drivers/gpu/drm/i915/gvt/cmd_parser.c | 4 +-- drivers/gpu/drm/i915/gvt/execlist.c | 12 ++++----- drivers/gpu/drm/i915/gvt/gtt.c | 6 ++--- drivers/gpu/drm/i915/gvt/gvt.h | 37 +++++++++++++++++++++++++++ drivers/gpu/drm/i915/gvt/hypercall.h | 4 --- drivers/gpu/drm/i915/gvt/kvmgt.c | 23 ----------------- drivers/gpu/drm/i915/gvt/mmio.c | 4 +-- drivers/gpu/drm/i915/gvt/mpt.h | 32 ----------------------- drivers/gpu/drm/i915/gvt/opregion.c | 10 +++----- drivers/gpu/drm/i915/gvt/scheduler.c | 37 +++++++++++++-------------- 10 files changed, 72 insertions(+), 97 deletions(-)
Jason
PATCH 14/34 drm/i915/gvt: devirtualize ->{get,put}_vfio_device
In reply to Christoph HellwigJust open code the calls to the VFIO APIs.
--- drivers/gpu/drm/i915/gvt/dmabuf.c | 12 ++++++----- drivers/gpu/drm/i915/gvt/hypercall.h | 2 -- drivers/gpu/drm/i915/gvt/kvmgt.c | 22 -------------------- drivers/gpu/drm/i915/gvt/mpt.h | 30 ---------------------------- 4 files changed, 7 insertions(+), 59 deletions(-)
drivers/gpu/drm/i915/gvt/dmabuf.c +7 -5
@@ -29,7 +29,7 @@*/ #include <linux/dma-buf.h> -#include <linux/vfio.h> +#include <linux/mdev.h> #include <drm/drm_fourcc.h> #include <drm/drm_plane.h>
@@ -157,7 +157,7 @@ static void dmabuf_gem_object_free(struct kref *kref) dmabuf_obj = list_entry(pos, struct intel_vgpu_dmabuf_obj, list);if (dmabuf_obj == obj) {list_del (pos); -intel_gvt_hypervisor_put_vfio_device (vgpu); +vfio_device_put (vgpu->vfio_device);idr_remove (&vgpu->object_idr, dmabuf_obj->dmabuf_id);kfree (dmabuf_obj->info);
@@ -492,9 +492,11 @@ int intel_vgpu_query_plane(struct intel_vgpu *vgpu, void *args)kref_init (&dmabuf_obj->kref);mutex_lock (&vgpu->dmabuf_lock); -if (intel_gvt_hypervisor_get_vfio_device (vgpu)) { -gvt_vgpu_err ("get vfio device failed\n" ); + vgpu->vfio_device =vfio_device_get_from_dev (mdev_dev (vgpu->mdev)); +if (!vgpu->vfio_device) { +gvt_vgpu_err ("failed to get vfio device\n" );mutex_unlock (&vgpu->dmabuf_lock); + ret = -ENODEV ; goto out_free_info; }mutex_unlock (&vgpu->dmabuf_lock);
@@ -603,7 +605,7 @@ void intel_vgpu_dmabuf_cleanup(struct intel_vgpu *vgpu) dmabuf_obj->vgpu =NULL ;idr_remove (&vgpu->object_idr, dmabuf_obj->dmabuf_id); -intel_gvt_hypervisor_put_vfio_device (vgpu); +vfio_device_put (vgpu->vfio_device);list_del (pos);/* dmabuf_obj might be freed in dmabuf_obj_put */
drivers/gpu/drm/i915/gvt/hypercall.h +0 -2
@@ -60,8 +60,6 @@ struct intel_gvt_mpt {int (*set_opregion)(struct intel_vgpu *vgpu);int (*set_edid)(struct intel_vgpu *vgpu,int port_num); -int (*get_vfio_device)(struct intel_vgpu *vgpu); -void (*put_vfio_device)(struct intel_vgpu *vgpu);bool (*is_valid_gfn)(struct intel_vgpu *vgpu,unsigned long gfn); };
drivers/gpu/drm/i915/gvt/kvmgt.c +0 -22
@@ -662,18 +662,6 @@ static int intel_vgpu_register_reg(struct intel_vgpu *vgpu,return 0 ; } -static int kvmgt_get_vfio_device (struct intel_vgpu *vgpu) -{ - vgpu->vfio_device =vfio_device_get_from_dev ( -mdev_dev (vgpu->mdev)); -if (!vgpu->vfio_device) { -gvt_vgpu_err ("failed to get vfio device\n" ); -return -ENODEV ; - } -return 0 ; -} - -static int kvmgt_set_opregion (struct intel_vgpu *vgpu) {void *base;
@@ -730,14 +718,6 @@ static int kvmgt_set_edid(struct intel_vgpu *vgpu, int port_num)return ret; } -static void kvmgt_put_vfio_device (struct intel_vgpu *vgpu) -{ -if (WARN_ON (!vgpu->vfio_device)) -return ; - -vfio_device_put (vgpu->vfio_device); -} -static int intel_vgpu_create (struct mdev_device *mdev) {struct intel_vgpu *vgpu =NULL ;
@@ -2052,8 +2032,6 @@ static const struct intel_gvt_mpt kvmgt_mpt = { .dma_pin_guest_page = kvmgt_dma_pin_guest_page, .set_opregion = kvmgt_set_opregion, .set_edid = kvmgt_set_edid, - .get_vfio_device = kvmgt_get_vfio_device, - .put_vfio_device = kvmgt_put_vfio_device, .is_valid_gfn = kvmgt_is_valid_gfn, };
drivers/gpu/drm/i915/gvt/mpt.h +0 -30
@@ -242,36 +242,6 @@ static inline int intel_gvt_hypervisor_set_edid(struct intel_vgpu *vgpu,return intel_gvt_host.mpt->set_edid (vgpu, port_num); } -/** -* intel_gvt_hypervisor_get_vfio_device - increase vfio device ref count -* @vgpu: a vGPU -* -* Returns: -* Zero on success, negative error code if failed. -*/ -static inline int intel_gvt_hypervisor_get_vfio_device (struct intel_vgpu *vgpu) -{ -if (!intel_gvt_host.mpt->get_vfio_device) -return 0 ; - -return intel_gvt_host.mpt->get_vfio_device (vgpu); -} - -/** -* intel_gvt_hypervisor_put_vfio_device - decrease vfio device ref count -* @vgpu: a vGPU -* -* Returns: -* Zero on success, negative error code if failed. -*/ -static inline void intel_gvt_hypervisor_put_vfio_device (struct intel_vgpu *vgpu) -{ -if (!intel_gvt_host.mpt->put_vfio_device) -return ; - - intel_gvt_host.mpt->put_vfio_device (vgpu); -} -/** * intel_gvt_hypervisor_is_valid_gfn - check if a visible gfn * @vgpu: a vGPU
Signature · 1 line
2.30.2
Re: [PATCH 14/34] drm/i915/gvt: devirtualize ->{get,put}_vfio_device
Quoted 9 lines · Christoph Hellwig
Just open code the calls to the VFIO APIs.
Signed-off-by Christoph Hellwig <[email protected]>--- drivers/gpu/drm/i915/gvt/dmabuf.c | 12 ++++++----- drivers/gpu/drm/i915/gvt/hypercall.h | 2 -- drivers/gpu/drm/i915/gvt/kvmgt.c | 22 -------------------- drivers/gpu/drm/i915/gvt/mpt.h | 30 ---------------------------- 4 files changed, 7 insertions(+), 59 deletions(-)
Had to look ahead in the series to see that thevfio_device_get_from_dev() was removed too :)
Jason
PATCH 15/34 drm/i915/gvt: devirtualize ->set_edid and ->set_opregion
In reply to Christoph HellwigJust call the code to setup the opregions and EDID data directly.
--- drivers/gpu/drm/i915/gvt/gvt.h | 3 +++ drivers/gpu/drm/i915/gvt/hypercall.h | 3 --- drivers/gpu/drm/i915/gvt/kvmgt.c | 6 ++---- drivers/gpu/drm/i915/gvt/mpt.h | 32 ---------------------------- drivers/gpu/drm/i915/gvt/vgpu.c | 6 +++--- 5 files changed, 8 insertions(+), 42 deletions(-)
drivers/gpu/drm/i915/gvt/gvt.h +3 -0
@@ -517,6 +517,9 @@ void intel_gvt_reset_vgpu(struct intel_vgpu *vgpu);void intel_gvt_activate_vgpu (struct intel_vgpu *vgpu);void intel_gvt_deactivate_vgpu (struct intel_vgpu *vgpu); +int intel_gvt_set_opregion (struct intel_vgpu *vgpu); +int intel_gvt_set_edid (struct intel_vgpu *vgpu,int port_num); +/* validating GM functions */ #define vgpu_gmadr_is_aperture (vgpu, gmadr) \ ((gmadr >= vgpu_aperture_gmadr_base(vgpu)) && \
drivers/gpu/drm/i915/gvt/hypercall.h +0 -3
@@ -57,9 +57,6 @@ struct intel_gvt_mpt { dma_addr_t dma_addr);int (*dma_pin_guest_page)(struct intel_vgpu *vgpu,dma_addr_t dma_addr); - -int (*set_opregion)(struct intel_vgpu *vgpu); -int (*set_edid)(struct intel_vgpu *vgpu,int port_num);bool (*is_valid_gfn)(struct intel_vgpu *vgpu,unsigned long gfn); };
drivers/gpu/drm/i915/gvt/kvmgt.c +2 -4
@@ -662,7 +662,7 @@ static int intel_vgpu_register_reg(struct intel_vgpu *vgpu,return 0 ; } -static int kvmgt_set_opregion (struct intel_vgpu *vgpu) +int intel_gvt_set_opregion (struct intel_vgpu *vgpu) {void *base;int ret;
@@ -689,7 +689,7 @@ static int kvmgt_set_opregion(struct intel_vgpu *vgpu)return ret; } -static int kvmgt_set_edid (struct intel_vgpu *vgpu,int port_num) +int intel_gvt_set_edid (struct intel_vgpu *vgpu,int port_num) {struct intel_vgpu_port *port =intel_vgpu_port (vgpu, port_num);struct vfio_edid_region *base;
@@ -2030,8 +2030,6 @@ static const struct intel_gvt_mpt kvmgt_mpt = { .dma_map_guest_page = kvmgt_dma_map_guest_page, .dma_unmap_guest_page = kvmgt_dma_unmap_guest_page, .dma_pin_guest_page = kvmgt_dma_pin_guest_page, - .set_opregion = kvmgt_set_opregion, - .set_edid = kvmgt_set_edid, .is_valid_gfn = kvmgt_is_valid_gfn, };
drivers/gpu/drm/i915/gvt/mpt.h +0 -32
@@ -210,38 +210,6 @@ intel_gvt_hypervisor_dma_pin_guest_page(struct intel_vgpu *vgpu,return intel_gvt_host.mpt->dma_pin_guest_page (vgpu, dma_addr); } -/** -* intel_gvt_hypervisor_set_opregion - Set opregion for guest -* @vgpu: a vGPU -* -* Returns: -* Zero on success, negative error code if failed. -*/ -static inline int intel_gvt_hypervisor_set_opregion (struct intel_vgpu *vgpu) -{ -if (!intel_gvt_host.mpt->set_opregion) -return 0 ; - -return intel_gvt_host.mpt->set_opregion (vgpu); -} - -/** -* intel_gvt_hypervisor_set_edid - Set EDID region for guest -* @vgpu: a vGPU -* @port_num: display port number -* -* Returns: -* Zero on success, negative error code if failed. -*/ -static inline int intel_gvt_hypervisor_set_edid (struct intel_vgpu *vgpu, -int port_num) -{ -if (!intel_gvt_host.mpt->set_edid) -return 0 ; - -return intel_gvt_host.mpt->set_edid (vgpu, port_num); -} -/** * intel_gvt_hypervisor_is_valid_gfn - check if a visible gfn * @vgpu: a vGPU
drivers/gpu/drm/i915/gvt/vgpu.c +3 -3
@@ -426,14 +426,14 @@ static struct intel_vgpu *__intel_gvt_create_vgpu(struct intel_gvt *gvt,intel_gvt_debugfs_add_vgpu (vgpu); - ret =intel_gvt_hypervisor_set_opregion (vgpu); + ret =intel_gvt_set_opregion (vgpu);if (ret) goto out_clean_sched_policy;if (IS_BROADWELL (dev_priv) ||IS_BROXTON (dev_priv)) - ret =intel_gvt_hypervisor_set_edid (vgpu,PORT_B ); + ret =intel_gvt_set_edid (vgpu,PORT_B );else - ret =intel_gvt_hypervisor_set_edid (vgpu,PORT_D ); + ret =intel_gvt_set_edid (vgpu,PORT_D );if (ret) goto out_clean_sched_policy;
Signature · 1 line
2.30.2
Re: [PATCH 15/34] drm/i915/gvt: devirtualize ->set_edid and ->set_opregion
Quoted 10 lines · Christoph Hellwig
Just call the code to setup the opregions and EDID data directly.
Signed-off-by Christoph Hellwig <[email protected]>--- drivers/gpu/drm/i915/gvt/gvt.h | 3 +++ drivers/gpu/drm/i915/gvt/hypercall.h | 3 --- drivers/gpu/drm/i915/gvt/kvmgt.c | 6 ++---- drivers/gpu/drm/i915/gvt/mpt.h | 32 ---------------------------- drivers/gpu/drm/i915/gvt/vgpu.c | 6 +++--- 5 files changed, 8 insertions(+), 42 deletions(-)
Jason
PATCH 16/34 drm/i915/gvt: devirtualize ->detach_vgpu
In reply to Christoph HellwigJust call the function directly.
--- drivers/gpu/drm/i915/gvt/gvt.h | 1 + drivers/gpu/drm/i915/gvt/hypercall.h | 1 - drivers/gpu/drm/i915/gvt/kvmgt.c | 3 +-- drivers/gpu/drm/i915/gvt/mpt.h | 16 ---------------- drivers/gpu/drm/i915/gvt/vgpu.c | 2 +- 5 files changed, 3 insertions(+), 20 deletions(-)
drivers/gpu/drm/i915/gvt/gvt.h +1 -0
@@ -581,6 +581,7 @@ void populate_pvinfo_page(struct intel_vgpu *vgpu);int intel_gvt_scan_and_shadow_workload (struct intel_vgpu_workload *workload);void enter_failsafe_mode (struct intel_vgpu *vgpu,int reason); +void intel_vgpu_detach_regions (struct intel_vgpu *vgpu);enum {GVT_FAILSAFE_UNSUPPORTED_GUEST ,
drivers/gpu/drm/i915/gvt/hypercall.h +0 -1
@@ -45,7 +45,6 @@ struct intel_vgpu;struct intel_gvt_mpt {int (*host_init)(struct device *dev,void *gvt);void (*host_exit)(struct device *dev,void *gvt); -void (*detach_vgpu)(struct intel_vgpu *vgpu);int (*inject_msi)(struct intel_vgpu *vgpu,u32 addr,u16 data);int (*enable_page_track)(struct intel_vgpu *vgpu,u64 gfn);int (*disable_page_track)(struct intel_vgpu *vgpu,u64 gfn);
drivers/gpu/drm/i915/gvt/kvmgt.c +1 -2
@@ -1858,7 +1858,7 @@ static bool kvmgt_guest_exit(struct intel_vgpu *info)return true; } -static void kvmgt_detach_vgpu (struct intel_vgpu *vgpu) +void intel_vgpu_detach_regions (struct intel_vgpu *vgpu) {int i;
@@ -2022,7 +2022,6 @@ static bool kvmgt_is_valid_gfn(struct intel_vgpu *vgpu, unsigned long gfn)static const struct intel_gvt_mpt kvmgt_mpt = { .host_init = kvmgt_host_init, .host_exit = kvmgt_host_exit, - .detach_vgpu = kvmgt_detach_vgpu, .inject_msi = kvmgt_inject_msi, .enable_page_track = kvmgt_page_track_add, .disable_page_track = kvmgt_page_track_remove,
drivers/gpu/drm/i915/gvt/mpt.h +0 -16
@@ -71,22 +71,6 @@ static inline void intel_gvt_hypervisor_host_exit(struct device *dev, void *gvt) intel_gvt_host.mpt->host_exit (dev, gvt); } -/** -* intel_gvt_hypervisor_detach_vgpu - call hypervisor to release vGPU -* related stuffs inside hypervisor. -* -* Returns: -* Zero on success, negative error code if failed. -*/ -static inline void intel_gvt_hypervisor_detach_vgpu (struct intel_vgpu *vgpu) -{ -/* optional to provide */ -if (!intel_gvt_host.mpt->detach_vgpu) -return ; - - intel_gvt_host.mpt->detach_vgpu (vgpu); -} -#define MSI_CAP_CONTROL (offset) (offset + 2)#define MSI_CAP_ADDRESS (offset) (offset + 4)#define MSI_CAP_DATA (offset) (offset + 8)
drivers/gpu/drm/i915/gvt/vgpu.c +1 -1
@@ -293,7 +293,7 @@ void intel_gvt_destroy_vgpu(struct intel_vgpu *vgpu)intel_vgpu_clean_opregion (vgpu);intel_vgpu_reset_ggtt (vgpu, true);intel_vgpu_clean_gtt (vgpu); -intel_gvt_hypervisor_detach_vgpu (vgpu); +intel_vgpu_detach_regions (vgpu);intel_vgpu_free_resource (vgpu);intel_vgpu_clean_mmio (vgpu);intel_vgpu_dmabuf_cleanup (vgpu);
Signature · 1 line
2.30.2
Re: [PATCH 16/34] drm/i915/gvt: devirtualize ->detach_vgpu
Quoted 10 lines · Christoph Hellwig
Just call the function directly.
Signed-off-by Christoph Hellwig <[email protected]>--- drivers/gpu/drm/i915/gvt/gvt.h | 1 + drivers/gpu/drm/i915/gvt/hypercall.h | 1 - drivers/gpu/drm/i915/gvt/kvmgt.c | 3 +-- drivers/gpu/drm/i915/gvt/mpt.h | 16 ---------------- drivers/gpu/drm/i915/gvt/vgpu.c | 2 +- 5 files changed, 3 insertions(+), 20 deletions(-)
Jason
PATCH 17/34 drm/i915/gvt: devirtualize ->inject_msi
In reply to Christoph HellwigJust open code the MSI injection in a single place instead of going through the method table.
--- drivers/gpu/drm/i915/gvt/hypercall.h | 1 - drivers/gpu/drm/i915/gvt/interrupt.c | 38 +++++++++++++++++++++++++++- drivers/gpu/drm/i915/gvt/kvmgt.c | 24 ------------------ drivers/gpu/drm/i915/gvt/mpt.h | 37 --------------------------- 4 files changed, 37 insertions(+), 63 deletions(-)
drivers/gpu/drm/i915/gvt/hypercall.h +0 -1
@@ -45,7 +45,6 @@ struct intel_vgpu;struct intel_gvt_mpt {int (*host_init)(struct device *dev,void *gvt);void (*host_exit)(struct device *dev,void *gvt); -int (*inject_msi)(struct intel_vgpu *vgpu,u32 addr,u16 data);int (*enable_page_track)(struct intel_vgpu *vgpu,u64 gfn);int (*disable_page_track)(struct intel_vgpu *vgpu,u64 gfn);unsigned long (*gfn_to_mfn)(struct intel_vgpu *vgpu,unsigned long gfn);
drivers/gpu/drm/i915/gvt/interrupt.c +37 -1
@@ -397,9 +397,45 @@ static void init_irq_map(struct intel_gvt_irq *irq) }/* =======================vEvent injection===================== */ + +#define MSI_CAP_CONTROL (offset) (offset + 2) +#define MSI_CAP_ADDRESS (offset) (offset + 4) +#define MSI_CAP_DATA (offset) (offset + 8) +#define MSI_CAP_EN 0x1 +static int inject_virtual_interrupt (struct intel_vgpu *vgpu) { -return intel_gvt_hypervisor_inject_msi (vgpu); +unsigned long offset = vgpu->gvt->device_info.msi_cap_offset; +u16 control, data; +u32 addr; + + control = *(u16 *)(vgpu_cfg_space (vgpu) +MSI_CAP_CONTROL (offset)); + addr = *(u32 *)(vgpu_cfg_space (vgpu) +MSI_CAP_ADDRESS (offset)); + data = *(u16 *)(vgpu_cfg_space (vgpu) +MSI_CAP_DATA (offset)); + +/* Do not generate MSI if MSIEN is disabled */ +if (!(control &MSI_CAP_EN )) +return 0 ; + +if (WARN (control &GENMASK (15 ,1 ),"only support one MSI format\n" )) +return -EINVAL ; + +trace_inject_msi (vgpu->id, addr, data); + +/* +* When guest is powered off, msi_trigger is set to NULL, but vgpu's +* config and mmio register isn't restored to default during guest +* poweroff. If this vgpu is still used in next vm, this vgpu's pipe +* may be enabled, then once this vgpu is active, it will get inject +* vblank interrupt request. But msi_trigger is null until msi is +* enabled by guest. so if msi_trigger is null, success is still +* returned and don't inject interrupt into guest. +*/ +if (!vgpu->attached) +return -ESRCH ; +if (vgpu->msi_trigger &&eventfd_signal (vgpu->msi_trigger,1 ) !=1 ) +return -EFAULT ; +return 0 ; } static void propagate_event(struct intel_gvt_irq *irq,
drivers/gpu/drm/i915/gvt/kvmgt.c +0 -24
@@ -1874,29 +1874,6 @@ void intel_vgpu_detach_regions(struct intel_vgpu *vgpu) vgpu->region =NULL ; } -static int kvmgt_inject_msi (struct intel_vgpu *vgpu,u32 addr,u16 data) -{ -if (!vgpu->attached) -return -ESRCH ; - -/* -* When guest is poweroff, msi_trigger is set to NULL, but vgpu's -* config and mmio register isn't restored to default during guest -* poweroff. If this vgpu is still used in next vm, this vgpu's pipe -* may be enabled, then once this vgpu is active, it will get inject -* vblank interrupt request. But msi_trigger is null until msi is -* enabled by guest. so if msi_trigger is null, success is still -* returned and don't inject interrupt into guest. -*/ -if (vgpu->msi_trigger ==NULL ) -return 0 ; - -if (eventfd_signal (vgpu->msi_trigger,1 ) ==1 ) -return 0 ; - -return -EFAULT ; -} -static unsigned long kvmgt_gfn_to_pfn (struct intel_vgpu *vgpu,unsigned long gfn) {
@@ -2022,7 +1999,6 @@ static bool kvmgt_is_valid_gfn(struct intel_vgpu *vgpu, unsigned long gfn)static const struct intel_gvt_mpt kvmgt_mpt = { .host_init = kvmgt_host_init, .host_exit = kvmgt_host_exit, - .inject_msi = kvmgt_inject_msi, .enable_page_track = kvmgt_page_track_add, .disable_page_track = kvmgt_page_track_remove, .gfn_to_mfn = kvmgt_gfn_to_pfn,
drivers/gpu/drm/i915/gvt/mpt.h +0 -37
@@ -71,43 +71,6 @@ static inline void intel_gvt_hypervisor_host_exit(struct device *dev, void *gvt) intel_gvt_host.mpt->host_exit (dev, gvt); } -#define MSI_CAP_CONTROL (offset) (offset + 2) -#define MSI_CAP_ADDRESS (offset) (offset + 4) -#define MSI_CAP_DATA (offset) (offset + 8) -#define MSI_CAP_EN 0x1 - -/** -* intel_gvt_hypervisor_inject_msi - inject a MSI interrupt into vGPU -* -* Returns: -* Zero on success, negative error code if failed. -*/ -static inline int intel_gvt_hypervisor_inject_msi (struct intel_vgpu *vgpu) -{ -unsigned long offset = vgpu->gvt->device_info.msi_cap_offset; -u16 control, data; -u32 addr; -int ret; - - control = *(u16 *)(vgpu_cfg_space (vgpu) +MSI_CAP_CONTROL (offset)); - addr = *(u32 *)(vgpu_cfg_space (vgpu) +MSI_CAP_ADDRESS (offset)); - data = *(u16 *)(vgpu_cfg_space (vgpu) +MSI_CAP_DATA (offset)); - -/* Do not generate MSI if MSIEN is disable */ -if (!(control &MSI_CAP_EN )) -return 0 ; - -if (WARN (control &GENMASK (15 ,1 ),"only support one MSI format\n" )) -return -EINVAL ; - -trace_inject_msi (vgpu->id, addr, data); - - ret = intel_gvt_host.mpt->inject_msi (vgpu, addr, data); -if (ret) -return ret; -return 0 ; -} -/** * intel_gvt_hypervisor_enable_page_track - track a guest page * @vgpu: a vGPU
Signature · 1 line
2.30.2
Re: [PATCH 17/34] drm/i915/gvt: devirtualize ->inject_msi
Quoted 10 lines · Christoph Hellwig
Just open code the MSI injection in a single place instead of going through the method table.
Signed-off-by Christoph Hellwig <[email protected]>--- drivers/gpu/drm/i915/gvt/hypercall.h | 1 - drivers/gpu/drm/i915/gvt/interrupt.c | 38 +++++++++++++++++++++++++++- drivers/gpu/drm/i915/gvt/kvmgt.c | 24 ------------------ drivers/gpu/drm/i915/gvt/mpt.h | 37 --------------------------- 4 files changed, 37 insertions(+), 63 deletions(-)
Jason
PATCH 18/34 drm/i915/gvt: devirtualize ->is_valid_gfn
In reply to Christoph HellwigJust call the code directly and move towards the callers.
--- drivers/gpu/drm/i915/gvt/gtt.c | 20 ++++++++++++++++++-- drivers/gpu/drm/i915/gvt/hypercall.h | 1 - drivers/gpu/drm/i915/gvt/kvmgt.c | 17 ----------------- drivers/gpu/drm/i915/gvt/mpt.h | 17 ----------------- 4 files changed, 18 insertions(+), 37 deletions(-)
drivers/gpu/drm/i915/gvt/gtt.c +18 -2
@@ -49,6 +49,22 @@static bool enable_out_of_sync = false;static int preallocated_oos_pages =8192 ; +static bool intel_gvt_is_valid_gfn (struct intel_vgpu *vgpu,unsigned long gfn) +{ +struct kvm *kvm = vgpu->kvm; +int idx; +bool ret; + +if (!vgpu->attached) +return false; + + idx =srcu_read_lock (&kvm->srcu); + ret =kvm_is_visible_gfn (kvm, gfn); +srcu_read_unlock (&kvm->srcu, idx); + +return ret; +} +/* * validate a gm address and related range size, * translate it to host gm address
@@ -1331,7 +1347,7 @@ static int ppgtt_populate_spt(struct intel_vgpu_ppgtt_spt *spt)ppgtt_set_shadow_entry (spt, &se, i); }else { gfn = ops->get_pfn (&ge); -if (!intel_gvt_hypervisor_is_valid_gfn (vgpu, gfn)) { +if (!intel_gvt_is_valid_gfn (vgpu, gfn)) { ops->set_pfn (&se, gvt->gtt.scratch_mfn);ppgtt_set_shadow_entry (spt, &se, i);continue ;
@@ -2315,7 +2331,7 @@ static int emulate_ggtt_mmio_write(struct intel_vgpu *vgpu, unsigned int off,/* one PTE update may be issued in multiple writes and the * first write may not construct a valid gfn */ -if (!intel_gvt_hypervisor_is_valid_gfn (vgpu, gfn)) { +if (!intel_gvt_is_valid_gfn (vgpu, gfn)) { ops->set_pfn (&m, gvt->gtt.scratch_mfn); goto out; }
drivers/gpu/drm/i915/gvt/hypercall.h +0 -1
@@ -55,7 +55,6 @@ struct intel_gvt_mpt { dma_addr_t dma_addr); int (*dma_pin_guest_page)(struct intel_vgpu *vgpu, dma_addr_t dma_addr); - bool (*is_valid_gfn)(struct intel_vgpu *vgpu, unsigned long gfn); };#endif /* _GVT_HYPERCALL_H_ */
drivers/gpu/drm/i915/gvt/kvmgt.c +0 -17
@@ -1980,22 +1980,6 @@ static void kvmgt_dma_unmap_guest_page(struct intel_vgpu *vgpu,mutex_unlock (&vgpu->cache_lock); } -static bool kvmgt_is_valid_gfn (struct intel_vgpu *vgpu,unsigned long gfn) -{ -struct kvm *kvm = vgpu->kvm; -int idx; -bool ret; - -if (!vgpu->attached) -return false; - - idx =srcu_read_lock (&kvm->srcu); - ret =kvm_is_visible_gfn (kvm, gfn); -srcu_read_unlock (&kvm->srcu, idx); - -return ret; -} -static const struct intel_gvt_mpt kvmgt_mpt = { .host_init = kvmgt_host_init, .host_exit = kvmgt_host_exit,
@@ -2005,7 +1989,6 @@ static const struct intel_gvt_mpt kvmgt_mpt = { .dma_map_guest_page = kvmgt_dma_map_guest_page, .dma_unmap_guest_page = kvmgt_dma_unmap_guest_page, .dma_pin_guest_page = kvmgt_dma_pin_guest_page, - .is_valid_gfn = kvmgt_is_valid_gfn, };struct intel_gvt_host intel_gvt_host = {
drivers/gpu/drm/i915/gvt/mpt.h +0 -17
@@ -157,21 +157,4 @@ intel_gvt_hypervisor_dma_pin_guest_page(struct intel_vgpu *vgpu, return intel_gvt_host.mpt->dma_pin_guest_page(vgpu, dma_addr); } -/** -* intel_gvt_hypervisor_is_valid_gfn - check if a visible gfn -* @vgpu: a vGPU -* @gfn: guest PFN -* -* Returns: -* true on valid gfn, false on not. -*/ -static inline bool intel_gvt_hypervisor_is_valid_gfn ( -struct intel_vgpu *vgpu,unsigned long gfn) -{ -if (!intel_gvt_host.mpt->is_valid_gfn) -return true; - -return intel_gvt_host.mpt->is_valid_gfn (vgpu, gfn); -} -#endif /* _GVT_MPT_H_ */
Signature · 1 line
2.30.2
Re: [PATCH 18/34] drm/i915/gvt: devirtualize ->is_valid_gfn
Quoted 9 lines · Christoph Hellwig
Just call the code directly and move towards the callers.
Signed-off-by Christoph Hellwig <[email protected]>--- drivers/gpu/drm/i915/gvt/gtt.c | 20 ++++++++++++++++++-- drivers/gpu/drm/i915/gvt/hypercall.h | 1 - drivers/gpu/drm/i915/gvt/kvmgt.c | 17 ----------------- drivers/gpu/drm/i915/gvt/mpt.h | 17 ----------------- 4 files changed, 18 insertions(+), 37 deletions(-)
Jason
PATCH 19/34 drm/i915/gvt: devirtualize ->gfn_to_mfn
In reply to Christoph HellwigJust open code it in the only caller.
--- drivers/gpu/drm/i915/gvt/gtt.c | 9 +++++---- drivers/gpu/drm/i915/gvt/hypercall.h | 1 - drivers/gpu/drm/i915/gvt/kvmgt.c | 16 ---------------- drivers/gpu/drm/i915/gvt/mpt.h | 14 -------------- 4 files changed, 5 insertions(+), 35 deletions(-)
drivers/gpu/drm/i915/gvt/gtt.c +5 -4
@@ -1178,15 +1178,16 @@ static int is_2MB_gtt_possible(struct intel_vgpu *vgpu, struct intel_gvt_gtt_entry *entry) {const struct intel_gvt_gtt_pte_ops *ops = vgpu->gvt->gtt.pte_ops; -unsigned long pfn; +kvm_pfn_t pfn;if (!HAS_PAGE_SIZES (vgpu->gvt->gt->i915,I915_GTT_PAGE_SIZE_2M ))return 0 ; - pfn =intel_gvt_hypervisor_gfn_to_mfn (vgpu, ops->get_pfn (entry)); -if (pfn ==INTEL_GVT_INVALID_ADDR ) +if (!vgpu->attached) +return -EINVAL ; + pfn =gfn_to_pfn (vgpu->kvm, ops->get_pfn (entry)); +if (is_error_noslot_pfn (pfn))return -EINVAL ; -return PageTransHuge (pfn_to_page (pfn)); }
drivers/gpu/drm/i915/gvt/hypercall.h +0 -1
@@ -47,7 +47,6 @@ struct intel_gvt_mpt {void (*host_exit)(struct device *dev,void *gvt);int (*enable_page_track)(struct intel_vgpu *vgpu,u64 gfn);int (*disable_page_track)(struct intel_vgpu *vgpu,u64 gfn); -unsigned long (*gfn_to_mfn)(struct intel_vgpu *vgpu,unsigned long gfn);int (*dma_map_guest_page)(struct intel_vgpu *vgpu,unsigned long gfn,unsigned long size,dma_addr_t *dma_addr);
drivers/gpu/drm/i915/gvt/kvmgt.c +0 -16
@@ -1874,21 +1874,6 @@ void intel_vgpu_detach_regions(struct intel_vgpu *vgpu) vgpu->region =NULL ; } -static unsigned long kvmgt_gfn_to_pfn (struct intel_vgpu *vgpu, -unsigned long gfn) -{ -kvm_pfn_t pfn; - -if (!vgpu->attached) -return INTEL_GVT_INVALID_ADDR ; - - pfn =gfn_to_pfn (vgpu->kvm, gfn); -if (is_error_noslot_pfn (pfn)) -return INTEL_GVT_INVALID_ADDR ; - -return pfn; -} -static int kvmgt_dma_map_guest_page (struct intel_vgpu *vgpu,unsigned long gfn,unsigned long size,dma_addr_t *dma_addr) {
@@ -1985,7 +1970,6 @@ static const struct intel_gvt_mpt kvmgt_mpt = { .host_exit = kvmgt_host_exit, .enable_page_track = kvmgt_page_track_add, .disable_page_track = kvmgt_page_track_remove, - .gfn_to_mfn = kvmgt_gfn_to_pfn, .dma_map_guest_page = kvmgt_dma_map_guest_page, .dma_unmap_guest_page = kvmgt_dma_unmap_guest_page, .dma_pin_guest_page = kvmgt_dma_pin_guest_page,
drivers/gpu/drm/i915/gvt/mpt.h +0 -14
@@ -99,20 +99,6 @@ static inline int intel_gvt_hypervisor_disable_page_track(return intel_gvt_host.mpt->disable_page_track (vgpu, gfn); } -/** -* intel_gvt_hypervisor_gfn_to_mfn - translate a GFN to MFN -* @vgpu: a vGPU -* @gpfn: guest pfn -* -* Returns: -* MFN on success, INTEL_GVT_INVALID_ADDR if failed. -*/ -static inline unsigned long intel_gvt_hypervisor_gfn_to_mfn ( -struct intel_vgpu *vgpu,unsigned long gfn) -{ -return intel_gvt_host.mpt->gfn_to_mfn (vgpu, gfn); -} -/** * intel_gvt_hypervisor_dma_map_guest_page - setup dma map for guest page * @vgpu: a vGPU
Signature · 1 line
2.30.2
Re: [PATCH 19/34] drm/i915/gvt: devirtualize ->gfn_to_mfn
Quoted 9 lines · Christoph Hellwig
Just open code it in the only caller.
Signed-off-by Christoph Hellwig <[email protected]>--- drivers/gpu/drm/i915/gvt/gtt.c | 9 +++++---- drivers/gpu/drm/i915/gvt/hypercall.h | 1 - drivers/gpu/drm/i915/gvt/kvmgt.c | 16 ---------------- drivers/gpu/drm/i915/gvt/mpt.h | 14 -------------- 4 files changed, 5 insertions(+), 35 deletions(-)
Jason
PATCH 20/34 drm/i915/gvt: devirtualize ->{enable,disable}_page_track
In reply to Christoph HellwigJust call the kvmgt functions directly.
--- drivers/gpu/drm/i915/gvt/gvt.h | 3 +++ drivers/gpu/drm/i915/gvt/hypercall.h | 2 -- drivers/gpu/drm/i915/gvt/kvmgt.c | 6 ++---- drivers/gpu/drm/i915/gvt/mpt.h | 28 --------------------------- drivers/gpu/drm/i915/gvt/page_track.c | 8 ++++---- 5 files changed, 9 insertions(+), 38 deletions(-)
drivers/gpu/drm/i915/gvt/gvt.h +3 -0
@@ -765,6 +765,9 @@ void intel_gvt_debugfs_remove_vgpu(struct intel_vgpu *vgpu);void intel_gvt_debugfs_init (struct intel_gvt *gvt);void intel_gvt_debugfs_clean (struct intel_gvt *gvt); +int intel_gvt_page_track_add (struct intel_vgpu *info,u64 gfn); +int intel_gvt_page_track_remove (struct intel_vgpu *info,u64 gfn); +#include "trace.h" #include "mpt.h"
drivers/gpu/drm/i915/gvt/hypercall.h +0 -2
@@ -45,8 +45,6 @@ struct intel_vgpu;struct intel_gvt_mpt {int (*host_init)(struct device *dev,void *gvt);void (*host_exit)(struct device *dev,void *gvt); -int (*enable_page_track)(struct intel_vgpu *vgpu,u64 gfn); -int (*disable_page_track)(struct intel_vgpu *vgpu,u64 gfn);int (*dma_map_guest_page)(struct intel_vgpu *vgpu,unsigned long gfn,unsigned long size,dma_addr_t *dma_addr);
drivers/gpu/drm/i915/gvt/kvmgt.c +2 -4
@@ -1702,7 +1702,7 @@ static void kvmgt_host_exit(struct device *dev, void *gvt)intel_gvt_cleanup_vgpu_type_groups ((struct intel_gvt *)gvt); } -static int kvmgt_page_track_add (struct intel_vgpu *info,u64 gfn) +int intel_gvt_page_track_add (struct intel_vgpu *info,u64 gfn) {struct kvm *kvm = info->kvm;struct kvm_memory_slot *slot;
@@ -1732,7 +1732,7 @@ static int kvmgt_page_track_add(struct intel_vgpu *info, u64 gfn)return 0 ; } -static int kvmgt_page_track_remove (struct intel_vgpu *info,u64 gfn) +int intel_gvt_page_track_remove (struct intel_vgpu *info,u64 gfn) {struct kvm *kvm = info->kvm;struct kvm_memory_slot *slot;
@@ -1968,8 +1968,6 @@ static void kvmgt_dma_unmap_guest_page(struct intel_vgpu *vgpu,static const struct intel_gvt_mpt kvmgt_mpt = { .host_init = kvmgt_host_init, .host_exit = kvmgt_host_exit, - .enable_page_track = kvmgt_page_track_add, - .disable_page_track = kvmgt_page_track_remove, .dma_map_guest_page = kvmgt_dma_map_guest_page, .dma_unmap_guest_page = kvmgt_dma_unmap_guest_page, .dma_pin_guest_page = kvmgt_dma_pin_guest_page,
drivers/gpu/drm/i915/gvt/mpt.h +0 -28
@@ -71,34 +71,6 @@ static inline void intel_gvt_hypervisor_host_exit(struct device *dev, void *gvt) intel_gvt_host.mpt->host_exit (dev, gvt); } -/** -* intel_gvt_hypervisor_enable_page_track - track a guest page -* @vgpu: a vGPU -* @gfn: the gfn of guest -* -* Returns: -* Zero on success, negative error code if failed. -*/ -static inline int intel_gvt_hypervisor_enable_page_track ( -struct intel_vgpu *vgpu,unsigned long gfn) -{ -return intel_gvt_host.mpt->enable_page_track (vgpu, gfn); -} - -/** -* intel_gvt_hypervisor_disable_page_track - untrack a guest page -* @vgpu: a vGPU -* @gfn: the gfn of guest -* -* Returns: -* Zero on success, negative error code if failed. -*/ -static inline int intel_gvt_hypervisor_disable_page_track ( -struct intel_vgpu *vgpu,unsigned long gfn) -{ -return intel_gvt_host.mpt->disable_page_track (vgpu, gfn); -} -/** * intel_gvt_hypervisor_dma_map_guest_page - setup dma map for guest page * @vgpu: a vGPU
drivers/gpu/drm/i915/gvt/page_track.c +4 -4
@@ -87,7 +87,7 @@ void intel_vgpu_unregister_page_track(struct intel_vgpu *vgpu, track =radix_tree_delete (&vgpu->page_track_tree, gfn);if (track) {if (track->tracked) -intel_gvt_hypervisor_disable_page_track (vgpu, gfn); +intel_gvt_page_track_remove (vgpu, gfn);kfree (track); } }
@@ -112,7 +112,7 @@ int intel_vgpu_enable_page_track(struct intel_vgpu *vgpu, unsigned long gfn)if (track->tracked)return 0 ; - ret =intel_gvt_hypervisor_enable_page_track (vgpu, gfn); + ret =intel_gvt_page_track_add (vgpu, gfn);if (ret)return ret; track->tracked = true;
@@ -139,7 +139,7 @@ int intel_vgpu_disable_page_track(struct intel_vgpu *vgpu, unsigned long gfn)if (!track->tracked)return 0 ; - ret =intel_gvt_hypervisor_disable_page_track (vgpu, gfn); + ret =intel_gvt_page_track_remove (vgpu, gfn);if (ret)return ret; track->tracked = false;
@@ -172,7 +172,7 @@ int intel_vgpu_page_track_handler(struct intel_vgpu *vgpu, u64 gpa,if (unlikely (vgpu->failsafe)) {/* Remove write protection to prevent furture traps. */ -intel_vgpu_disable_page_track (vgpu, gpa >>PAGE_SHIFT ); +intel_gvt_page_track_remove (vgpu, gpa >>PAGE_SHIFT ); }else { ret = page_track->handler (page_track, gpa, data, bytes);if (ret)
Signature · 1 line
2.30.2
Re: [PATCH 20/34] drm/i915/gvt: devirtualize ->{enable,disable}_page_track
Quoted 10 lines · Christoph Hellwig
Just call the kvmgt functions directly.
Signed-off-by Christoph Hellwig <[email protected]>--- drivers/gpu/drm/i915/gvt/gvt.h | 3 +++ drivers/gpu/drm/i915/gvt/hypercall.h | 2 -- drivers/gpu/drm/i915/gvt/kvmgt.c | 6 ++---- drivers/gpu/drm/i915/gvt/mpt.h | 28 --------------------------- drivers/gpu/drm/i915/gvt/page_track.c | 8 ++++---- 5 files changed, 9 insertions(+), 38 deletions(-)
Jason
PATCH 21/34 drm/i915/gvt: devirtualize ->dma_{,un}map_guest_page
In reply to Christoph HellwigJust call the functions directly. Also remove a pointless wrapper.
--- drivers/gpu/drm/i915/gvt/dmabuf.c | 10 ++-------- drivers/gpu/drm/i915/gvt/gtt.c | 20 +++++++++---------- drivers/gpu/drm/i915/gvt/gvt.h | 4 ++++ drivers/gpu/drm/i915/gvt/hypercall.h | 5 ----- drivers/gpu/drm/i915/gvt/kvmgt.c | 6 ++---- drivers/gpu/drm/i915/gvt/mpt.h | 29 ---------------------------- 6 files changed, 17 insertions(+), 57 deletions(-)
drivers/gpu/drm/i915/gvt/dmabuf.c +2 -8
@@ -54,12 +54,6 @@ static int vgpu_pin_dma_address(struct intel_vgpu *vgpu,return ret; } -static void vgpu_unpin_dma_address (struct intel_vgpu *vgpu, -dma_addr_t dma_addr) -{ -intel_gvt_hypervisor_dma_unmap_guest_page (vgpu, dma_addr); -} -static int vgpu_gem_get_pages (struct drm_i915_gem_object *obj) {
@@ -114,7 +108,7 @@ static int vgpu_gem_get_pages(for_each_sg (st->sgl, sg, i, j) { dma_addr =sg_dma_address (sg);if (dma_addr) -vgpu_unpin_dma_address (vgpu, dma_addr); +intel_gvt_dma_unmap_guest_page (vgpu, dma_addr); }sg_free_table (st);kfree (st);
@@ -136,7 +130,7 @@ static void vgpu_gem_put_pages(struct drm_i915_gem_object *obj,int i;for_each_sg (pages->sgl, sg, fb_info->size, i) -vgpu_unpin_dma_address (vgpu, +intel_gvt_dma_unmap_guest_page (vgpu,sg_dma_address (sg)); }
drivers/gpu/drm/i915/gvt/gtt.c +9 -11
@@ -1013,7 +1013,7 @@ static inline void ppgtt_invalidate_pte(struct intel_vgpu_ppgtt_spt *spt,if (!pfn || pfn == vgpu->gtt.scratch_pt[type].page_mfn)return ; -intel_gvt_hypervisor_dma_unmap_guest_page (vgpu, pfn <<PAGE_SHIFT ); +intel_gvt_dma_unmap_guest_page (vgpu, pfn <<PAGE_SHIFT ); }static int ppgtt_invalidate_spt (struct intel_vgpu_ppgtt_spt *spt)
@@ -1212,8 +1212,8 @@ static int split_2MB_gtt_entry(struct intel_vgpu *vgpu,return PTR_ERR (sub_spt);for_each_shadow_entry (sub_spt, &sub_se, sub_index) { - ret =intel_gvt_hypervisor_dma_map_guest_page (vgpu, - start_gfn + sub_index,PAGE_SIZE , &dma_addr); + ret =intel_gvt_dma_map_guest_page (vgpu, start_gfn + sub_index, +PAGE_SIZE , &dma_addr);if (ret) {ppgtt_invalidate_spt (spt);return ret;
@@ -1258,8 +1258,8 @@ static int split_64KB_gtt_entry(struct intel_vgpu *vgpu, ops->set_64k_splited (&entry);for (i =0 ; i <GTT_64K_PTE_STRIDE ; i++) { - ret =intel_gvt_hypervisor_dma_map_guest_page (vgpu, - start_gfn + i,PAGE_SIZE , &dma_addr); + ret =intel_gvt_dma_map_guest_page (vgpu, start_gfn + i, +PAGE_SIZE , &dma_addr);if (ret)return ret;
@@ -1313,8 +1313,7 @@ static int ppgtt_populate_shadow_entry(struct intel_vgpu *vgpu, }/* direct shadow */ - ret =intel_gvt_hypervisor_dma_map_guest_page (vgpu, gfn, page_size, - &dma_addr); + ret =intel_gvt_dma_map_guest_page (vgpu, gfn, page_size, &dma_addr);if (ret)return -ENXIO ;
@@ -2245,8 +2244,7 @@ static void ggtt_invalidate_pte(struct intel_vgpu *vgpu, pfn = pte_ops->get_pfn (entry);if (pfn != vgpu->gvt->gtt.scratch_mfn) -intel_gvt_hypervisor_dma_unmap_guest_page (vgpu, - pfn <<PAGE_SHIFT ); +intel_gvt_dma_unmap_guest_page (vgpu, pfn <<PAGE_SHIFT ); } static int emulate_ggtt_mmio_write(struct intel_vgpu *vgpu, unsigned int off,
@@ -2337,8 +2335,8 @@ static int emulate_ggtt_mmio_write(struct intel_vgpu *vgpu, unsigned int off, goto out; } - ret =intel_gvt_hypervisor_dma_map_guest_page (vgpu, gfn, -PAGE_SIZE , &dma_addr); + ret =intel_gvt_dma_map_guest_page (vgpu, gfn,PAGE_SIZE , + &dma_addr);if (ret) {gvt_vgpu_err ("fail to populate guest ggtt entry\n" );/* guest driver may read/write the entry when partial
drivers/gpu/drm/i915/gvt/gvt.h +4 -0
@@ -767,6 +767,10 @@ void intel_gvt_debugfs_clean(struct intel_gvt *gvt);int intel_gvt_page_track_add (struct intel_vgpu *info,u64 gfn);int intel_gvt_page_track_remove (struct intel_vgpu *info,u64 gfn); +int intel_gvt_dma_map_guest_page (struct intel_vgpu *vgpu,unsigned long gfn, +unsigned long size,dma_addr_t *dma_addr); +void intel_gvt_dma_unmap_guest_page (struct intel_vgpu *vgpu, +dma_addr_t dma_addr);#include "trace.h" #include "mpt.h"
drivers/gpu/drm/i915/gvt/hypercall.h +0 -5
@@ -46,11 +46,6 @@ struct intel_gvt_mpt {int (*host_init)(struct device *dev,void *gvt);void (*host_exit)(struct device *dev,void *gvt); -int (*dma_map_guest_page)(struct intel_vgpu *vgpu,unsigned long gfn, -unsigned long size,dma_addr_t *dma_addr); -void (*dma_unmap_guest_page)(struct intel_vgpu *vgpu, -dma_addr_t dma_addr); -int (*dma_pin_guest_page)(struct intel_vgpu *vgpu,dma_addr_t dma_addr); };
drivers/gpu/drm/i915/gvt/kvmgt.c +2 -4
@@ -1874,7 +1874,7 @@ void intel_vgpu_detach_regions(struct intel_vgpu *vgpu) vgpu->region =NULL ; } -static int kvmgt_dma_map_guest_page (struct intel_vgpu *vgpu,unsigned long gfn, +int intel_gvt_dma_map_guest_page (struct intel_vgpu *vgpu,unsigned long gfn,unsigned long size,dma_addr_t *dma_addr) {struct gvt_dma *entry;
@@ -1950,7 +1950,7 @@ static void __gvt_dma_release(struct kref *ref)__gvt_cache_remove_entry (entry->vgpu, entry); } -static void kvmgt_dma_unmap_guest_page (struct intel_vgpu *vgpu, +void intel_gvt_dma_unmap_guest_page (struct intel_vgpu *vgpu,dma_addr_t dma_addr) {struct gvt_dma *entry;
@@ -1968,8 +1968,6 @@ static void kvmgt_dma_unmap_guest_page(struct intel_vgpu *vgpu,static const struct intel_gvt_mpt kvmgt_mpt = { .host_init = kvmgt_host_init, .host_exit = kvmgt_host_exit, - .dma_map_guest_page = kvmgt_dma_map_guest_page, - .dma_unmap_guest_page = kvmgt_dma_unmap_guest_page, .dma_pin_guest_page = kvmgt_dma_pin_guest_page, };
drivers/gpu/drm/i915/gvt/mpt.h +0 -29
@@ -71,35 +71,6 @@ static inline void intel_gvt_hypervisor_host_exit(struct device *dev, void *gvt) intel_gvt_host.mpt->host_exit (dev, gvt); } -/** -* intel_gvt_hypervisor_dma_map_guest_page - setup dma map for guest page -* @vgpu: a vGPU -* @gfn: guest pfn -* @size: page size -* @dma_addr: retrieve allocated dma addr -* -* Returns: -* 0 on success, negative error code if failed. -*/ -static inline int intel_gvt_hypervisor_dma_map_guest_page ( -struct intel_vgpu *vgpu,unsigned long gfn,unsigned long size, -dma_addr_t *dma_addr) -{ -return intel_gvt_host.mpt->dma_map_guest_page (vgpu, gfn, size, - dma_addr); -} - -/** -* intel_gvt_hypervisor_dma_unmap_guest_page - cancel dma map for guest page -* @vgpu: a vGPU -* @dma_addr: the mapped dma addr -*/ -static inline void intel_gvt_hypervisor_dma_unmap_guest_page ( -struct intel_vgpu *vgpu,dma_addr_t dma_addr) -{ - intel_gvt_host.mpt->dma_unmap_guest_page (vgpu, dma_addr); -} -/** * intel_gvt_hypervisor_dma_pin_guest_page - pin guest dma buf * @vgpu: a vGPU
Signature · 1 line
2.30.2
Re: [PATCH 21/34] drm/i915/gvt: devirtualize ->dma_{,un}map_guest_page
Quoted 11 lines · Christoph Hellwig
Just call the functions directly. Also remove a pointless wrapper.
Signed-off-by Christoph Hellwig <[email protected]>--- drivers/gpu/drm/i915/gvt/dmabuf.c | 10 ++-------- drivers/gpu/drm/i915/gvt/gtt.c | 20 +++++++++---------- drivers/gpu/drm/i915/gvt/gvt.h | 4 ++++ drivers/gpu/drm/i915/gvt/hypercall.h | 5 ----- drivers/gpu/drm/i915/gvt/kvmgt.c | 6 ++---- drivers/gpu/drm/i915/gvt/mpt.h | 29 ---------------------------- 6 files changed, 17 insertions(+), 57 deletions(-)
Jason
PATCH 22/34 drm/i915/gvt: devirtualize dma_pin_guest_page
In reply to Christoph HellwigJust call the function directly and remove a pointless wrapper.
--- drivers/gpu/drm/i915/gvt/dmabuf.c | 14 +------------- drivers/gpu/drm/i915/gvt/gvt.h | 1 + drivers/gpu/drm/i915/gvt/hypercall.h | 2 -- drivers/gpu/drm/i915/gvt/kvmgt.c | 4 +--- drivers/gpu/drm/i915/gvt/mpt.h | 15 --------------- 5 files changed, 3 insertions(+), 33 deletions(-)
drivers/gpu/drm/i915/gvt/dmabuf.c +1 -13
@@ -42,18 +42,6 @@#define GEN8_DECODE_PTE (pte) (pte & GENMASK_ULL(63, 12)) -static int vgpu_pin_dma_address (struct intel_vgpu *vgpu, -unsigned long size, -dma_addr_t dma_addr) -{ -int ret =0 ; - -if (intel_gvt_hypervisor_dma_pin_guest_page (vgpu, dma_addr)) - ret = -EINVAL ; - -return ret; -} -static int vgpu_gem_get_pages (struct drm_i915_gem_object *obj) {
@@ -89,7 +77,7 @@ static int vgpu_gem_get_pages(for_each_sg (st->sgl, sg, page_num, i) {dma_addr_t dma_addr =GEN8_DECODE_PTE (readq (>t_entries[i])); -if (vgpu_pin_dma_address (vgpu,PAGE_SIZE , dma_addr)) { +if (intel_gvt_dma_pin_guest_page (vgpu, dma_addr)) { ret = -EINVAL ; goto out; }
drivers/gpu/drm/i915/gvt/gvt.h +1 -0
@@ -767,6 +767,7 @@ void intel_gvt_debugfs_clean(struct intel_gvt *gvt);int intel_gvt_page_track_add (struct intel_vgpu *info,u64 gfn);int intel_gvt_page_track_remove (struct intel_vgpu *info,u64 gfn); +int intel_gvt_dma_pin_guest_page (struct intel_vgpu *vgpu,dma_addr_t dma_addr);int intel_gvt_dma_map_guest_page (struct intel_vgpu *vgpu,unsigned long gfn,unsigned long size,dma_addr_t *dma_addr); void intel_gvt_dma_unmap_guest_page(struct intel_vgpu *vgpu,
drivers/gpu/drm/i915/gvt/hypercall.h +0 -2
@@ -45,8 +45,6 @@ struct intel_vgpu;struct intel_gvt_mpt {int (*host_init)(struct device *dev,void *gvt);void (*host_exit)(struct device *dev,void *gvt); - -int (*dma_pin_guest_page)(struct intel_vgpu *vgpu,dma_addr_t dma_addr); };#endif /* _GVT_HYPERCALL_H_ */
drivers/gpu/drm/i915/gvt/kvmgt.c +1 -3
@@ -1921,8 +1921,7 @@ int intel_gvt_dma_map_guest_page(struct intel_vgpu *vgpu, unsigned long gfn,return ret; } -static int kvmgt_dma_pin_guest_page (struct intel_vgpu *vgpu, -dma_addr_t dma_addr) +int intel_gvt_dma_pin_guest_page (struct intel_vgpu *vgpu,dma_addr_t dma_addr) {struct gvt_dma *entry;int ret =0 ;
@@ -1968,7 +1967,6 @@ void intel_gvt_dma_unmap_guest_page(struct intel_vgpu *vgpu,static const struct intel_gvt_mpt kvmgt_mpt = { .host_init = kvmgt_host_init, .host_exit = kvmgt_host_exit, - .dma_pin_guest_page = kvmgt_dma_pin_guest_page, };struct intel_gvt_host intel_gvt_host = {
drivers/gpu/drm/i915/gvt/mpt.h +0 -15
@@ -71,19 +71,4 @@ static inline void intel_gvt_hypervisor_host_exit(struct device *dev, void *gvt) intel_gvt_host.mpt->host_exit(dev, gvt); } -/** -* intel_gvt_hypervisor_dma_pin_guest_page - pin guest dma buf -* @vgpu: a vGPU -* @dma_addr: guest dma addr -* -* Returns: -* 0 on success, negative error code if failed. -*/ -static inline int -intel_gvt_hypervisor_dma_pin_guest_page (struct intel_vgpu *vgpu, -dma_addr_t dma_addr) -{ -return intel_gvt_host.mpt->dma_pin_guest_page (vgpu, dma_addr); -} -#endif /* _GVT_MPT_H_ */
Signature · 1 line
2.30.2
Re: [PATCH 22/34] drm/i915/gvt: devirtualize dma_pin_guest_page
Quoted 10 lines · Christoph Hellwig
Just call the function directly and remove a pointless wrapper.
Signed-off-by Christoph Hellwig <[email protected]>--- drivers/gpu/drm/i915/gvt/dmabuf.c | 14 +------------- drivers/gpu/drm/i915/gvt/gvt.h | 1 + drivers/gpu/drm/i915/gvt/hypercall.h | 2 -- drivers/gpu/drm/i915/gvt/kvmgt.c | 4 +--- drivers/gpu/drm/i915/gvt/mpt.h | 15 --------------- 5 files changed, 3 insertions(+), 33 deletions(-)
Jason
PATCH 23/34 drm/i915/gvt: remove struct intel_gvt_mpt
In reply to Christoph HellwigJust call the initializion and exit functions directly and remove this abstraction entirely.
--- drivers/gpu/drm/i915/gvt/gvt.c | 11 ++++- drivers/gpu/drm/i915/gvt/gvt.h | 12 ++--- drivers/gpu/drm/i915/gvt/hypercall.h | 50 ------------------- drivers/gpu/drm/i915/gvt/kvmgt.c | 39 ++------------- drivers/gpu/drm/i915/gvt/mpt.h | 74 ---------------------------- 5 files changed, 17 insertions(+), 169 deletions(-) delete mode 100644 drivers/gpu/drm/i915/gvt/hypercall.h delete mode 100644 drivers/gpu/drm/i915/gvt/mpt.h
drivers/gpu/drm/i915/gvt/gvt.c +9 -2
@@ -135,7 +135,8 @@ static void intel_gvt_clean_device(struct drm_i915_private *i915)if (drm_WARN_ON (&i915->drm, !gvt))return ; -intel_gvt_hypervisor_host_exit (i915->drm.dev, gvt); +mdev_unregister_device (i915->drm.dev); +intel_gvt_cleanup_vgpu_type_groups (gvt);intel_gvt_destroy_idle_vgpu (gvt->idle_vgpu);intel_gvt_clean_vgpu_types (gvt);
@@ -235,13 +236,19 @@ static int intel_gvt_init_device(struct drm_i915_private *i915)intel_gvt_debugfs_init (gvt); - ret =intel_gvt_hypervisor_host_init (i915->drm.dev, gvt); + ret =intel_gvt_init_vgpu_type_groups (gvt);if (ret) goto out_destroy_idle_vgpu; + ret =mdev_register_device (i915->drm.dev, &intel_vgpu_mdev_ops); +if (ret) + goto out_cleanup_vgpu_type_groups; +gvt_dbg_core ("gvt device initialization is done\n" );return 0 ; +out_cleanup_vgpu_type_groups: +intel_gvt_cleanup_vgpu_type_groups (gvt); out_destroy_idle_vgpu:intel_gvt_destroy_idle_vgpu (gvt->idle_vgpu);intel_gvt_debugfs_clean (gvt);
drivers/gpu/drm/i915/gvt/gvt.h +4 -8
@@ -41,7 +41,6 @@#include "intel_gvt.h" #include "debug.h" -#include "hypercall.h" #include "mmio.h" #include "reg.h" #include "interrupt.h"
@@ -59,12 +58,6 @@#define GVT_MAX_VGPU 8 -struct intel_gvt_host { -const struct intel_gvt_mpt *mpt; -}; - -extern struct intel_gvt_host intel_gvt_host; -/* Describe per-platform limitations. */ struct intel_gvt_device_info {u32 max_support_vgpus;
@@ -773,9 +766,12 @@ int intel_gvt_dma_map_guest_page(struct intel_vgpu *vgpu, unsigned long gfn,void intel_gvt_dma_unmap_guest_page (struct intel_vgpu *vgpu,dma_addr_t dma_addr); +int intel_gvt_init_vgpu_type_groups (struct intel_gvt *gvt); +void intel_gvt_cleanup_vgpu_type_groups (struct intel_gvt *gvt); +#include "trace.h" -#include "mpt.h" extern const struct intel_vgpu_ops intel_gvt_vgpu_ops; +extern const struct mdev_parent_ops intel_vgpu_mdev_ops;#endif
drivers/gpu/drm/i915/gvt/hypercall.h deleted +0 -50
50 lines not on this page · raw message
drivers/gpu/drm/i915/gvt/kvmgt.c +4 -35
@@ -172,7 +172,7 @@ static struct attribute_group *gvt_vgpu_type_groups[] = { [0 ... NR_MAX_INTEL_VGPU_TYPES - 1] = NULL, }; -static int intel_gvt_init_vgpu_type_groups (struct intel_gvt *gvt) +int intel_gvt_init_vgpu_type_groups (struct intel_gvt *gvt) {int i, j;struct intel_vgpu_type *type;
@@ -201,7 +201,7 @@ static int intel_gvt_init_vgpu_type_groups(struct intel_gvt *gvt)return -ENOMEM ; } -static void intel_gvt_cleanup_vgpu_type_groups (struct intel_gvt *gvt) +void intel_gvt_cleanup_vgpu_type_groups (struct intel_gvt *gvt) {int i;struct attribute_group *group;
@@ -1665,8 +1665,9 @@ static const struct attribute_group *intel_vgpu_groups[] = { NULL, }; -static struct mdev_parent_ops intel_vgpu_mdev_ops = { +const struct mdev_parent_ops intel_vgpu_mdev_ops = { .mdev_attr_groups = intel_vgpu_groups, + .supported_type_groups = gvt_vgpu_type_groups, .create = intel_vgpu_create, .remove = intel_vgpu_remove,
@@ -1679,29 +1680,6 @@ static struct mdev_parent_ops intel_vgpu_mdev_ops = { .ioctl = intel_vgpu_ioctl, }; -static int kvmgt_host_init (struct device *dev,void *gvt) -{ -int ret; - - ret =intel_gvt_init_vgpu_type_groups ((struct intel_gvt *)gvt); -if (ret) -return ret; - - intel_vgpu_mdev_ops.supported_type_groups = gvt_vgpu_type_groups; - - ret =mdev_register_device (dev, &intel_vgpu_mdev_ops); -if (ret) -intel_gvt_cleanup_vgpu_type_groups ((struct intel_gvt *)gvt); - -return ret; -} - -static void kvmgt_host_exit (struct device *dev,void *gvt) -{ -mdev_unregister_device (dev); -intel_gvt_cleanup_vgpu_type_groups ((struct intel_gvt *)gvt); -} -int intel_gvt_page_track_add (struct intel_vgpu *info,u64 gfn) {struct kvm *kvm = info->kvm;
@@ -1964,15 +1942,6 @@ void intel_gvt_dma_unmap_guest_page(struct intel_vgpu *vgpu,mutex_unlock (&vgpu->cache_lock); } -static const struct intel_gvt_mpt kvmgt_mpt = { - .host_init = kvmgt_host_init, - .host_exit = kvmgt_host_exit, -}; - -struct intel_gvt_host intel_gvt_host = { - .mpt = &kvmgt_mpt, -}; -static int __init kvmgt_init (void ) {return intel_gvt_set_ops (&intel_gvt_vgpu_ops);
drivers/gpu/drm/i915/gvt/mpt.h deleted +0 -74
74 lines not on this page · raw message
Signature · 1 line
2.30.2
Re: [PATCH 23/34] drm/i915/gvt: remove struct intel_gvt_mpt
Quoted 4 lines · Christoph Hellwig
Just call the initializion and exit functions directly and remove this abstraction entirely.
Signed-off-by Christoph Hellwig <[email protected]>
Quoted 9 lines
--- drivers/gpu/drm/i915/gvt/gvt.c | 11 ++++- drivers/gpu/drm/i915/gvt/gvt.h | 12 ++--- drivers/gpu/drm/i915/gvt/hypercall.h | 50 ------------------- drivers/gpu/drm/i915/gvt/kvmgt.c | 39 ++------------- drivers/gpu/drm/i915/gvt/mpt.h | 74 ---------------------------- 5 files changed, 17 insertions(+), 169 deletions(-) delete mode 100644 drivers/gpu/drm/i915/gvt/hypercall.h delete mode 100644 drivers/gpu/drm/i915/gvt/mpt.h
That gvt_vgpu_type_groups stuff is pretty wonky, but it can be left
Jason
PATCH 24/34 drm/i915/gvt: remove the extra vfio_device refcounting for dmabufs
In reply to Christoph HellwigAll the dmabufs are torn down when th VGPU is released, so there is no need for extra refcounting here.
Based on an patch from Jason Gunthorpe.
--- drivers/gpu/drm/i915/gvt/dmabuf.c | 12 ------------ drivers/gpu/drm/i915/gvt/gvt.h | 1 - 2 files changed, 13 deletions(-)
drivers/gpu/drm/i915/gvt/dmabuf.c +0 -12
@@ -139,7 +139,6 @@ static void dmabuf_gem_object_free(struct kref *kref) dmabuf_obj = list_entry(pos, struct intel_vgpu_dmabuf_obj, list);if (dmabuf_obj == obj) {list_del (pos); -vfio_device_put (vgpu->vfio_device);idr_remove (&vgpu->object_idr, dmabuf_obj->dmabuf_id);kfree (dmabuf_obj->info);
@@ -473,16 +472,6 @@ int intel_vgpu_query_plane(struct intel_vgpu *vgpu, void *args)kref_init (&dmabuf_obj->kref); -mutex_lock (&vgpu->dmabuf_lock); - vgpu->vfio_device =vfio_device_get_from_dev (mdev_dev (vgpu->mdev)); -if (!vgpu->vfio_device) { -gvt_vgpu_err ("failed to get vfio device\n" ); -mutex_unlock (&vgpu->dmabuf_lock); - ret = -ENODEV ; - goto out_free_info; - } -mutex_unlock (&vgpu->dmabuf_lock); -update_fb_info (gfx_plane_info, &fb_info);INIT_LIST_HEAD (&dmabuf_obj->list);
@@ -587,7 +576,6 @@ void intel_vgpu_dmabuf_cleanup(struct intel_vgpu *vgpu) dmabuf_obj->vgpu =NULL ;idr_remove (&vgpu->object_idr, dmabuf_obj->dmabuf_id); -vfio_device_put (vgpu->vfio_device);list_del (pos);/* dmabuf_obj might be freed in dmabuf_obj_put */
drivers/gpu/drm/i915/gvt/gvt.h +0 -1
@@ -231,7 +231,6 @@ struct intel_vgpu {struct kvm *kvm;struct work_struct release_work;atomic_t released; -struct vfio_device *vfio_device;struct vfio_group *vfio_group;struct kvm_page_track_notifier_node track_node;
Signature · 1 line
2.30.2
Re: [PATCH 24/34] drm/i915/gvt: remove the extra vfio_device refcounting for dmabufs
Quoted 2 lines · Christoph Hellwig
All the dmabufs are torn down when th VGPU is released, so there is no need for extra refcounting here.
'th' -> 'the'
I think the specific argument is that intel_vgpu_query_plane() is only called from intel_vgpu_ioctl() which has to happen while the device is open so intel_vgpu_query_plane() has no issue.
dmabuf_gem_object_free() is OK because:
intel_vgpu_close_device
__intel_vgpu_release
intel_gvt_release_vgpu
intel_vgpu_dmabuf_cleanup
Menaing dmabuf->vgpu was already NULL once close_device is passed, and the vfio_device reference is held automatically from open_device->close_device
And similarly intel_vgpu_dmabuf_cleanup() is OK because it is called by the above.
The other places that call intel_vgpu_dmabuf_cleanup() are redundant with the close_device path.
Though the 'release_work' callpath is buggy, for many reasons, but not for this series.
drivers/gpu/drm/i915/gvt/dmabuf.c static void dmabuf_gem_object_free(struct kref *kref) · line 140
Quoted 6 lines
drivers/gpu/drm/i915/gvt/dmabuf.c +1
-0+++ b/drivers/gpu/drm/i915/gvt/dmabuf.c@@ -139,7 +139,6 @@ static void dmabuf_gem_object_free(struct kref *kref) dmabuf_obj = list_entry(pos, struct intel_vgpu_dmabuf_obj, list);if (dmabuf_obj == obj) {
Not for this series but it seems like there is something off about the locking here:
if (vgpu && vgpu->active && !list_empty(&vgpu->dmabuf_obj_list_head)) {This is called under the dmabuf lock but active is protected by the vgpu_lock.. It seems strange that vgpu->active could be false but the device is still open, so maybe it is not possible.
Jason
PATCH 25/34 drm/i915/gvt: streamline intel_vgpu_create
In reply to Christoph HellwigInitialize variables at declaration time, avoid pointless gotos and cater for the fact that intel_gvt_create_vgpu can't return NULL.
--- drivers/gpu/drm/i915/gvt/kvmgt.c | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-)
drivers/gpu/drm/i915/gvt/kvmgt.c +9 -19
@@ -720,26 +720,19 @@ int intel_gvt_set_edid(struct intel_vgpu *vgpu, int port_num)static int intel_vgpu_create (struct mdev_device *mdev) { -struct intel_vgpu *vgpu =NULL ; +struct device *pdev =mdev_parent_dev (mdev); +struct intel_gvt *gvt =kdev_to_i915 (pdev)->gvt;struct intel_vgpu_type *type; -struct device *pdev; -struct intel_gvt *gvt; -int ret; - - pdev =mdev_parent_dev (mdev); - gvt =kdev_to_i915 (pdev)->gvt; +struct intel_vgpu *vgpu; type = &gvt->types[mdev_get_type_group_id (mdev)]; -if (!type) { - ret = -EINVAL ; - goto out; - } +if (!type) +return -EINVAL ; vgpu =intel_gvt_create_vgpu (gvt, type); -if (IS_ERR_OR_NULL (vgpu)) { - ret = vgpu ==NULL ? -EFAULT :PTR_ERR (vgpu); -gvt_err ("failed to create intel vgpu: %d\n" , ret); - goto out; +if (IS_ERR (vgpu)) { +gvt_err ("failed to create intel vgpu: %ld\n" ,PTR_ERR (vgpu)); +return PTR_ERR (vgpu); }INIT_WORK (&vgpu->release_work, intel_vgpu_release_work);
@@ -749,10 +742,7 @@ static int intel_vgpu_create(struct mdev_device *mdev)gvt_dbg_core ("intel_vgpu_create succeeded for mdev: %s\n" ,dev_name (mdev_dev (mdev))); - ret =0 ; - -out: -return ret; +return 0 ; }static int intel_vgpu_remove (struct mdev_device *mdev)
Signature · 1 line
2.30.2
Re: [PATCH 25/34] drm/i915/gvt: streamline intel_vgpu_create
Quoted 7 lines · Christoph Hellwig
Initialize variables at declaration time, avoid pointless gotos and cater for the fact that
intel_gvt_create_vgpucan't return NULL.Signed-off-by Christoph Hellwig <[email protected]>--- drivers/gpu/drm/i915/gvt/kvmgt.c | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-)
Jason
PATCH 26/34 drm/i915/gvt: pass a struct intel_vgpu to the vfio read/write helpers
In reply to Christoph HellwigPass the structure we actually care about instead of deriving it from the mdev_device in the lower level code.
--- drivers/gpu/drm/i915/gvt/kvmgt.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)
drivers/gpu/drm/i915/gvt/kvmgt.c +14 -14
@@ -1007,10 +1007,9 @@ static int intel_vgpu_aperture_rw(struct intel_vgpu *vgpu, u64 off,return 0 ; } -static ssize_t intel_vgpu_rw (struct mdev_device *mdev,char *buf, +static ssize_t intel_vgpu_rw (struct intel_vgpu *vgpu,char *buf,size_t count,loff_t *ppos,bool is_write) { -struct intel_vgpu *vgpu =mdev_get_drvdata (mdev);unsigned int index =VFIO_PCI_OFFSET_TO_INDEX (*ppos);u64 pos = *ppos &VFIO_PCI_OFFSET_MASK ;int ret = -EINVAL ;
@@ -1056,9 +1055,8 @@ static ssize_t intel_vgpu_rw(struct mdev_device *mdev, char *buf,return ret ==0 ? count : ret; } -static bool gtt_entry (struct mdev_device *mdev,loff_t *ppos) +static bool gtt_entry (struct intel_vgpu *vgpu,loff_t *ppos) { -struct intel_vgpu *vgpu =mdev_get_drvdata (mdev);unsigned int index =VFIO_PCI_OFFSET_TO_INDEX (*ppos);struct intel_gvt *gvt = vgpu->gvt;int offset;
@@ -1078,6 +1076,7 @@ static bool gtt_entry(struct mdev_device *mdev, loff_t *ppos)static ssize_t intel_vgpu_read (struct mdev_device *mdev,char __user *buf,size_t count,loff_t *ppos) { +struct intel_vgpu *vgpu =mdev_get_drvdata (mdev);unsigned int done =0 ;int ret;
@@ -1086,10 +1085,10 @@ static ssize_t intel_vgpu_read(struct mdev_device *mdev, char __user *buf,/* Only support GGTT entry 8 bytes read */ if (count >=8 && !(*ppos %8 ) && -gtt_entry (mdev, ppos)) { +gtt_entry (vgpu, ppos)) {u64 val; - ret =intel_vgpu_rw (mdev, (char *)&val,sizeof (val), + ret =intel_vgpu_rw (vgpu, (char *)&val,sizeof (val), ppos, false);if (ret <=0 ) goto read_err;
@@ -1101,7 +1100,7 @@ static ssize_t intel_vgpu_read(struct mdev_device *mdev, char __user *buf, }else if (count >=4 && !(*ppos %4 )) {u32 val; - ret =intel_vgpu_rw (mdev, (char *)&val,sizeof (val), + ret =intel_vgpu_rw (vgpu, (char *)&val,sizeof (val), ppos, false);if (ret <=0 ) goto read_err;
@@ -1113,7 +1112,7 @@ static ssize_t intel_vgpu_read(struct mdev_device *mdev, char __user *buf, }else if (count >=2 && !(*ppos %2 )) {u16 val; - ret =intel_vgpu_rw (mdev, (char *)&val,sizeof (val), + ret =intel_vgpu_rw (vgpu, (char *)&val,sizeof (val), ppos, false);if (ret <=0 ) goto read_err;
@@ -1125,7 +1124,7 @@ static ssize_t intel_vgpu_read(struct mdev_device *mdev, char __user *buf, }else {u8 val; - ret =intel_vgpu_rw (mdev, &val,sizeof (val), ppos, + ret =intel_vgpu_rw (vgpu, &val,sizeof (val), ppos, false);if (ret <=0 ) goto read_err;
@@ -1152,6 +1151,7 @@ static ssize_t intel_vgpu_write(struct mdev_device *mdev,const char __user *buf, size_t count, loff_t *ppos) { + struct intel_vgpu *vgpu = mdev_get_drvdata(mdev);unsigned int done =0 ;int ret;
@@ -1160,13 +1160,13 @@ static ssize_t intel_vgpu_write(struct mdev_device *mdev,/* Only support GGTT entry 8 bytes write */ if (count >=8 && !(*ppos %8 ) && -gtt_entry (mdev, ppos)) { +gtt_entry (vgpu, ppos)) {u64 val;if (copy_from_user (&val, buf,sizeof (val))) goto write_err; - ret =intel_vgpu_rw (mdev, (char *)&val,sizeof (val), + ret =intel_vgpu_rw (vgpu, (char *)&val,sizeof (val), ppos, true);if (ret <=0 ) goto write_err;
@@ -1178,7 +1178,7 @@ static ssize_t intel_vgpu_write(struct mdev_device *mdev,if (copy_from_user (&val, buf,sizeof (val))) goto write_err; - ret =intel_vgpu_rw (mdev, (char *)&val,sizeof (val), + ret =intel_vgpu_rw (vgpu, (char *)&val,sizeof (val), ppos, true);if (ret <=0 ) goto write_err;
@@ -1190,7 +1190,7 @@ static ssize_t intel_vgpu_write(struct mdev_device *mdev,if (copy_from_user (&val, buf,sizeof (val))) goto write_err; - ret =intel_vgpu_rw (mdev, (char *)&val, + ret =intel_vgpu_rw (vgpu, (char *)&val,sizeof (val), ppos, true);if (ret <=0 ) goto write_err;
@@ -1202,7 +1202,7 @@ static ssize_t intel_vgpu_write(struct mdev_device *mdev,if (copy_from_user (&val, buf,sizeof (val))) goto write_err; - ret =intel_vgpu_rw (mdev, &val,sizeof (val), + ret =intel_vgpu_rw (vgpu, &val,sizeof (val), ppos, true);if (ret <=0 ) goto write_err;
Signature · 1 line
2.30.2
Re: [PATCH 26/34] drm/i915/gvt: pass a struct intel_vgpu to the vfio read/write helpers
Quoted 7 lines · Christoph Hellwig
Pass the structure we actually care about instead of deriving it from the
mdev_devicein the lower level code.Signed-off-by Christoph Hellwig <[email protected]>--- drivers/gpu/drm/i915/gvt/kvmgt.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)
Jason
PATCH 27/34 drm/i915/gvt: remove kvmgt_guest_{init,exit}
In reply to Christoph HellwigMerge these into their only callers.
--- drivers/gpu/drm/i915/gvt/kvmgt.c | 129 ++++++++++++++----------------- 1 file changed, 60 insertions(+), 69 deletions(-)
drivers/gpu/drm/i915/gvt/kvmgt.c +60 -69
@@ -100,6 +100,13 @@ struct gvt_dma {struct kref ref; }; +static void kvmgt_page_track_write (struct kvm_vcpu *vcpu,gpa_t gpa, +const u8 *val,int len, +struct kvm_page_track_notifier_node *node); +static void kvmgt_page_track_flush_slot (struct kvm *kvm, +struct kvm_memory_slot *slot, +struct kvm_page_track_notifier_node *node); +static ssize_t available_instances_show (struct mdev_type *mtype,struct mdev_type_attribute *attr,char *buf)
@@ -213,9 +220,7 @@ void intel_gvt_cleanup_vgpu_type_groups(struct intel_gvt *gvt) } } -static int kvmgt_guest_init (struct mdev_device *mdev);static void intel_vgpu_release_work (struct work_struct *work); -static bool kvmgt_guest_exit (struct intel_vgpu *info);static void gvt_unpin_guest_page (struct intel_vgpu *vgpu,unsigned long gfn,unsigned long size)
@@ -803,6 +808,27 @@ static int intel_vgpu_group_notifier(struct notifier_block *nb,return NOTIFY_OK ; } +static bool __kvmgt_vgpu_exist (struct intel_vgpu *vgpu) +{ +struct intel_vgpu *itr; +int id; +bool ret = false; + +mutex_lock (&vgpu->gvt->lock); +for_each_active_vgpu (vgpu->gvt, itr, id) { +if (!itr->attached) +continue ; + +if (vgpu->kvm == itr->kvm) { + ret = true; + goto out; + } + } +out: +mutex_unlock (&vgpu->gvt->lock); +return ret; +} +static int intel_vgpu_open_device (struct mdev_device *mdev) {struct intel_vgpu *vgpu =mdev_get_drvdata (mdev);
@@ -847,14 +873,37 @@ static int intel_vgpu_open_device(struct mdev_device *mdev) goto undo_group; } - ret =kvmgt_guest_init (mdev); -if (ret) + ret = -EEXIST ; +if (vgpu->attached) + goto undo_group; + + ret = -ESRCH ; +if (!vgpu->kvm || vgpu->kvm->mm != current->mm) { +gvt_vgpu_err ("KVM is required to use Intel vGPU\n" ); + goto undo_group; + } + + ret = -EEXIST ; +if (__kvmgt_vgpu_exist (vgpu)) goto undo_group; + vgpu->attached = true; +kvm_get_kvm (vgpu->kvm); + +kvmgt_protect_table_init (vgpu); +gvt_cache_init (vgpu); + + vgpu->track_node.track_write = kvmgt_page_track_write; + vgpu->track_node.track_flush_slot = kvmgt_page_track_flush_slot; +kvm_page_track_register_notifier (vgpu->kvm, &vgpu->track_node); + +debugfs_create_ulong (KVMGT_DEBUGFS_FILENAME ,0444 , vgpu->debugfs, + &vgpu->nr_cache_entries); +intel_gvt_activate_vgpu (vgpu);atomic_set (&vgpu->released,0 ); -return ret; +return 0 ; undo_group:vfio_group_put_external_user (vgpu->vfio_group);
@@ -908,7 +957,12 @@ static void __intel_vgpu_release(struct intel_vgpu *vgpu)/* dereference module reference taken at open */ module_put (THIS_MODULE ); -kvmgt_guest_exit (vgpu); +debugfs_remove (debugfs_lookup (KVMGT_DEBUGFS_FILENAME , vgpu->debugfs)); + +kvm_page_track_unregister_notifier (vgpu->kvm, &vgpu->track_node); +kvm_put_kvm (vgpu->kvm); +kvmgt_protect_table_destroy (vgpu); +gvt_cache_destroy (vgpu);intel_vgpu_release_msi_eventfd_ctx (vgpu);vfio_group_put_external_user (vgpu->vfio_group);
@@ -1763,69 +1817,6 @@ static void kvmgt_page_track_flush_slot(struct kvm *kvm,write_unlock (&kvm->mmu_lock); } -static bool __kvmgt_vgpu_exist (struct intel_vgpu *vgpu,struct kvm *kvm) -{ -struct intel_vgpu *itr; -int id; -bool ret = false; - -mutex_lock (&vgpu->gvt->lock); -for_each_active_vgpu (vgpu->gvt, itr, id) { -if (!itr->attached) -continue ; - -if (kvm && kvm == itr->kvm) { - ret = true; - goto out; - } - } -out: -mutex_unlock (&vgpu->gvt->lock); -return ret; -} - -static int kvmgt_guest_init (struct mdev_device *mdev) -{ -struct intel_vgpu *vgpu =mdev_get_drvdata (mdev); -struct kvm *kvm = vgpu->kvm; - -if (vgpu->attached) -return -EEXIST ; - -if (!kvm || kvm->mm != current->mm) { -gvt_vgpu_err ("KVM is required to use Intel vGPU\n" ); -return -ESRCH ; - } - -if (__kvmgt_vgpu_exist (vgpu, kvm)) -return -EEXIST ; - - vgpu->attached = true; -kvm_get_kvm (vgpu->kvm); - -kvmgt_protect_table_init (vgpu); -gvt_cache_init (vgpu); - - vgpu->track_node.track_write = kvmgt_page_track_write; - vgpu->track_node.track_flush_slot = kvmgt_page_track_flush_slot; -kvm_page_track_register_notifier (kvm, &vgpu->track_node); - -debugfs_create_ulong (KVMGT_DEBUGFS_FILENAME ,0444 , vgpu->debugfs, - &vgpu->nr_cache_entries); -return 0 ; -} - -static bool kvmgt_guest_exit (struct intel_vgpu *info) -{ -debugfs_remove (debugfs_lookup (KVMGT_DEBUGFS_FILENAME , info->debugfs)); - -kvm_page_track_unregister_notifier (info->kvm, &info->track_node); -kvm_put_kvm (info->kvm); -kvmgt_protect_table_destroy (info); -gvt_cache_destroy (info); -return true; -} -void intel_vgpu_detach_regions (struct intel_vgpu *vgpu) {int i;
Signature · 1 line
2.30.2
Re: [PATCH 27/34] drm/i915/gvt: remove kvmgt_guest_{init,exit}
Quoted 6 lines · Christoph Hellwig
Merge these into their only callers.
Signed-off-by Christoph Hellwig <[email protected]>--- drivers/gpu/drm/i915/gvt/kvmgt.c | 129 ++++++++++++++----------------- 1 file changed, 60 insertions(+), 69 deletions(-)
It is nice
drivers/gpu/drm/i915/gvt/kvmgt.c static int intel_vgpu_open_device(struct mdev_device *mdev) · line 881
Quoted 12 lines
drivers/gpu/drm/i915/gvt/kvmgt.c +6
-2@@ -847,14 +873,37 @@ static int intel_vgpu_open_device(struct mdev_device *mdev) goto undo_group; } - ret =kvmgt_guest_init (mdev); -if (ret) + ret = -EEXIST ; +if (vgpu->attached) + goto undo_group; + + ret = -ESRCH ; +if (!vgpu->kvm || vgpu->kvm->mm != current->mm) {
For instance once all the obfuscation is stripped away it is easy to see how the vgpu->kvm access here is unlocked against the notifier and racy.
Jason
PATCH 28/34 drm/i915/gvt: convert to use vfio_register_emulated_iommu_dev
In reply to Christoph HellwigThis is straightforward conversion, the intel_vgpu already has a pointer to the vfio_dev, which can be replaced with the embedded structure and we can replace all the mdev_get_drvdata() with a simple container_of().
Based on an patch from Jason Gunthorpe.
--- drivers/gpu/drm/i915/gvt/gvt.h | 2 +- drivers/gpu/drm/i915/gvt/kvmgt.c | 190 ++++++++++++++++--------------- 2 files changed, 102 insertions(+), 90 deletions(-)
drivers/gpu/drm/i915/gvt/gvt.h +1 -1
@@ -211,7 +211,7 @@ struct intel_vgpu {u32 scan_nonprivbb; -struct mdev_device *mdev; +struct vfio_device vfio_device;struct vfio_region *region;int num_regions;struct eventfd_ctx *intx_trigger;
drivers/gpu/drm/i915/gvt/kvmgt.c +101 -89
324 lines not on this page · raw message
Signature · 1 line
2.30.2
Re: [PATCH 28/34] drm/i915/gvt: convert to use vfio_register_emulated_iommu_dev
Quoted 14 lines · Christoph Hellwig
drivers/gpu/drm/i915/gvt/kvmgt.c +0
-14-static int intel_vgpu_create (struct mdev_device *mdev) -{ -struct device *pdev =mdev_parent_dev (mdev); -struct intel_gvt *gvt =kdev_to_i915 (pdev)->gvt; -struct intel_vgpu_type *type; -struct intel_vgpu *vgpu; - - type = &gvt->types[mdev_get_type_group_id (mdev)]; -if (!type) -return -EINVAL ; - - vgpu =intel_gvt_create_vgpu (gvt, type); -if (IS_ERR (vgpu)) { -gvt_err ("failed to create intel vgpu: %ld\n" ,PTR_ERR (vgpu));
drivers/gpu/drm/i915/gvt/kvmgt.c int intel_gvt_set_edid(struct intel_vgpu *vgpu, int port_num) · line 749
Quoted 10 lines
drivers/gpu/drm/i915/gvt/kvmgt.c +0
-10-return PTR_ERR (vgpu); - } - -INIT_WORK (&vgpu->release_work, intel_vgpu_release_work); - - vgpu->mdev = mdev; -mdev_set_drvdata (mdev, vgpu); - -gvt_dbg_core ("intel_vgpu_create succeeded for mdev: %s\n" , -dev_name (mdev_dev (mdev)));
nit: the debug print has the wrong function name now
Rest looks OK
Jason
PATCH 29/34 drm/i915/gvt: merge gvt.c into kvmgvt.c
In reply to Christoph HellwigThe code in both files is deeply interconnected, so merge it and keep a bunch of structures and functions static.
--- drivers/gpu/drm/i915/gvt/Makefile | 1 - drivers/gpu/drm/i915/gvt/gvt.c | 291 ------------------------------ drivers/gpu/drm/i915/gvt/gvt.h | 6 - drivers/gpu/drm/i915/gvt/kvmgt.c | 264 ++++++++++++++++++++++++++- 4 files changed, 260 insertions(+), 302 deletions(-) delete mode 100644 drivers/gpu/drm/i915/gvt/gvt.c
drivers/gpu/drm/i915/gvt/Makefile +0 -1
@@ -1,7 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 kvmgt-y += \ - gvt/gvt.o \ gvt/aperture_gm.o \ gvt/handlers.o \ gvt/vgpu.o \
drivers/gpu/drm/i915/gvt/gvt.c deleted +0 -291
291 lines not on this page · raw message
drivers/gpu/drm/i915/gvt/gvt.h +0 -6
@@ -765,12 +765,6 @@ int intel_gvt_dma_map_guest_page(struct intel_vgpu *vgpu, unsigned long gfn,void intel_gvt_dma_unmap_guest_page (struct intel_vgpu *vgpu,dma_addr_t dma_addr); -int intel_gvt_init_vgpu_type_groups (struct intel_gvt *gvt); -void intel_gvt_cleanup_vgpu_type_groups (struct intel_gvt *gvt); -#include "trace.h" -extern const struct intel_vgpu_ops intel_gvt_vgpu_ops; -extern const struct mdev_parent_ops intel_vgpu_mdev_ops; -#endif
drivers/gpu/drm/i915/gvt/kvmgt.c +260 -4
300 lines not on this page · raw message
Signature · 1 line
2.30.2
Re: [PATCH 29/34] drm/i915/gvt: merge gvt.c into kvmgvt.c
Quoted 11 lines · Christoph Hellwig
The code in both files is deeply interconnected, so merge it and keep a bunch of structures and functions static.
Signed-off-by Christoph Hellwig <[email protected]>--- drivers/gpu/drm/i915/gvt/Makefile | 1 - drivers/gpu/drm/i915/gvt/gvt.c | 291 ------------------------------ drivers/gpu/drm/i915/gvt/gvt.h | 6 - drivers/gpu/drm/i915/gvt/kvmgt.c | 264 ++++++++++++++++++++++++++- 4 files changed, 260 insertions(+), 302 deletions(-) delete mode 100644 drivers/gpu/drm/i915/gvt/gvt.c
Jason
PATCH 30/34 vfio/mdev: Remove vfio_mdev.c
In reply to Christoph HellwigFrom: Jason Gunthorpe <[email protected]>
Now that all mdev drivers directly create their own mdev_device driver and directly register with the vfio core's vfio_device_ops this is all dead code.
Delete vfio_mdev.c and the mdev_parent_ops members that are connected to it.
--- .../driver-api/vfio-mediated-device.rst | 3 - drivers/vfio/mdev/Makefile | 2 +- drivers/vfio/mdev/mdev_core.c | 40 +---- drivers/vfio/mdev/mdev_driver.c | 10 -- drivers/vfio/mdev/mdev_private.h | 2 - drivers/vfio/mdev/vfio_mdev.c | 152 ------------------ include/linux/mdev.h | 48 +----- 7 files changed, 6 insertions(+), 251 deletions(-) delete mode 100644 drivers/vfio/mdev/vfio_mdev.c
Documentation/driver-api/vfio-mediated-device.rst +0 -3
@@ -138,9 +138,6 @@ The structures in the mdev_parent_ops structure are as follows: * supported_config: attributes to define supported configurations * device_driver: device driver to bind for mediated device instances -The mdev_parent_ops also still has various functions pointers. Theses exist -for historical reasons only and shall not be used for new drivers. - When a driver wants to add the GUID creation sysfs to an existing device it has probe'd to then it should call::
drivers/vfio/mdev/Makefile +1 -1
@@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -mdev-y := mdev_core.o mdev_sysfs.o mdev_driver.o vfio_mdev.o +mdev-y := mdev_core.o mdev_sysfs.o mdev_driver.o obj-$(CONFIG_VFIO_MDEV) += mdev.o
drivers/vfio/mdev/mdev_core.c +4 -36
@@ -89,17 +89,10 @@ void mdev_release_parent(struct kref *kref)static void mdev_device_remove_common (struct mdev_device *mdev) {struct mdev_parent *parent = mdev->type->parent; -int ret;mdev_remove_sysfs_files (mdev);device_del (&mdev->dev);lockdep_assert_held (&parent->unreg_sem); -if (parent->ops->remove) { - ret = parent->ops->remove (mdev); -if (ret) -dev_err (&mdev->dev,"Remove failed: err=%d\n" , ret); - } -/* Balances with device_initialize() */ put_device (&mdev->dev); }
@@ -131,7 +124,7 @@ int mdev_register_device(struct device *dev, const struct mdev_parent_ops *ops)/* check for mandatory ops */ if (!ops || !ops->supported_type_groups)return -EINVAL ; -if (!ops->device_driver && (!ops->create || !ops->remove)) +if (!ops->device_driver)return -EINVAL ; dev =get_device (dev);
@@ -297,18 +290,10 @@ int mdev_device_create(struct mdev_type *type, const guid_t *uuid) goto out_put_device; } -if (parent->ops->create) { - ret = parent->ops->create (mdev); -if (ret) - goto out_unlock; - } - ret =device_add (&mdev->dev);if (ret) - goto out_remove; + goto out_unlock; -if (!drv) - drv = &vfio_mdev_driver; ret =device_driver_attach (&drv->driver, &mdev->dev);if (ret) goto out_del;
@@ -325,9 +310,6 @@ int mdev_device_create(struct mdev_type *type, const guid_t *uuid) out_del:device_del (&mdev->dev); -out_remove: -if (parent->ops->remove) - parent->ops->remove (mdev); out_unlock:up_read (&parent->unreg_sem); out_put_device:
@@ -370,28 +352,14 @@ int mdev_device_remove(struct mdev_device *mdev)static int __init mdev_init (void ) { -int rc; - - rc =mdev_bus_register (); -if (rc) -return rc; - rc =mdev_register_driver (&vfio_mdev_driver); -if (rc) - goto err_bus; -return 0 ; -err_bus: -mdev_bus_unregister (); -return rc; +return bus_register (&mdev_bus_type); } static void __exit mdev_exit(void) { -mdev_unregister_driver (&vfio_mdev_driver); -if (mdev_bus_compat_class)class_compat_unregister (mdev_bus_compat_class); - -mdev_bus_unregister (); +bus_unregister (&mdev_bus_type); }subsys_initcall (mdev_init)
drivers/vfio/mdev/mdev_driver.c +0 -10
@@ -74,13 +74,3 @@ void mdev_unregister_driver(struct mdev_driver *drv)driver_unregister (&drv->driver); }EXPORT_SYMBOL (mdev_unregister_driver); - -int mdev_bus_register (void ) -{ -return bus_register (&mdev_bus_type); -} - -void mdev_bus_unregister (void ) -{ -bus_unregister (&mdev_bus_type); -}
drivers/vfio/mdev/mdev_private.h +0 -2
@@ -37,8 +37,6 @@ struct mdev_type {#define to_mdev_type (_kobj) \ container_of(_kobj, struct mdev_type, kobj) -extern struct mdev_driver vfio_mdev_driver; -int parent_create_sysfs_files (struct mdev_parent *parent);void parent_remove_sysfs_files (struct mdev_parent *parent);
drivers/vfio/mdev/vfio_mdev.c deleted +0 -152
152 lines not on this page · raw message
include/linux/mdev.h +1 -47
60 lines not on this page · raw message
Signature · 1 line
2.30.2
Re: [PATCH 30/34] vfio/mdev: Remove vfio_mdev.c
Quoted 11 lines · Christoph Hellwig
From: Jason Gunthorpe <[email protected]>
Now that all mdev drivers directly create their own
mdev_devicedriver and directly register with the vfio core'svfio_device_opsthis is all dead code.Delete
vfio_mdev.cand themdev_parent_opsmembers that are connected to it.Signed-off-by Jason Gunthorpe <[email protected]>Signed-off-by Christoph Hellwig <[email protected]>
PATCH 31/34 vfio/mdev: Remove mdev_parent_ops dev_attr_groups
In reply to Christoph HellwigFrom: Jason Gunthorpe <[email protected]>
This is only used by one sample to print a fixed string that is pointless.
In general, having a device driver attach sysfs attributes to the parent is horrific. This should never happen, and always leads to some kind of liftime bug as it become very difficult for the sysfs attribute to go back to any data owned by the device driver.
Remove the general mechanism to create this abuse.
--- drivers/vfio/mdev/mdev_sysfs.c | 12 ++---------- include/linux/mdev.h | 2 -- samples/vfio-mdev/mtty.c | 30 +----------------------------- 3 files changed, 3 insertions(+), 41 deletions(-)
drivers/vfio/mdev/mdev_sysfs.c +2 -10
@@ -197,7 +197,6 @@ void parent_remove_sysfs_files(struct mdev_parent *parent)remove_mdev_supported_type (type); } -sysfs_remove_groups (&parent->dev->kobj, parent->ops->dev_attr_groups);kset_unregister (parent->mdev_types_kset); }
@@ -213,17 +212,10 @@ int parent_create_sysfs_files(struct mdev_parent *parent)INIT_LIST_HEAD (&parent->type_list); - ret =sysfs_create_groups (&parent->dev->kobj, - parent->ops->dev_attr_groups); -if (ret) - goto create_err; - ret =add_mdev_supported_type_groups (parent);if (ret) -sysfs_remove_groups (&parent->dev->kobj, - parent->ops->dev_attr_groups); -else -return ret; + goto create_err; +return 0 ; create_err:kset_unregister (parent->mdev_types_kset);
include/linux/mdev.h +0 -2
@@ -36,7 +36,6 @@ struct device *mtype_get_parent_dev(struct mdev_type *mtype);* * @owner: The module owner. * @device_driver: Which device driver to probe() on newly created devices -* @dev_attr_groups: Attributes of the parent device. * @mdev_attr_groups: Attributes of the mediated device. * @supported_type_groups: Attributes to define supported types. It is mandatory * to provide supported types.
@@ -47,7 +46,6 @@ struct device *mtype_get_parent_dev(struct mdev_type *mtype);struct mdev_parent_ops {struct module *owner;struct mdev_driver *device_driver; -const struct attribute_group **dev_attr_groups;const struct attribute_group **mdev_attr_groups;struct attribute_group **supported_type_groups; };
samples/vfio-mdev/mtty.c +1 -29
@@ -1207,38 +1207,11 @@ static long mtty_ioctl(struct vfio_device *vdev, unsigned int cmd,return -ENOTTY ; } -static ssize_t -sample_mtty_dev_show (struct device *dev,struct device_attribute *attr, -char *buf) -{ -return sprintf (buf,"This is phy device\n" ); -} - -static DEVICE_ATTR_RO (sample_mtty_dev); - -static struct attribute *mtty_dev_attrs[] = { - &dev_attr_sample_mtty_dev.attr, -NULL , -}; - -static const struct attribute_group mtty_dev_group = { - .name ="mtty_dev" , - .attrs = mtty_dev_attrs, -}; - -static const struct attribute_group *mtty_dev_groups[] = { - &mtty_dev_group, -NULL , -}; -static ssize_t sample_mdev_dev_show (struct device *dev,struct device_attribute *attr,char *buf) { -if (mdev_from_dev (dev)) -return sprintf (buf,"This is MDEV %s\n" ,dev_name (dev)); - -return sprintf (buf,"\n" ); +return sprintf (buf,"This is MDEV %s\n" ,dev_name (dev)); }static DEVICE_ATTR_RO (sample_mdev_dev);
@@ -1333,7 +1306,6 @@ static struct mdev_driver mtty_driver = {static const struct mdev_parent_ops mdev_fops = { .owner =THIS_MODULE , .device_driver = &mtty_driver, - .dev_attr_groups = mtty_dev_groups, .supported_type_groups = mdev_type_groups, };
Signature · 1 line
2.30.2
Kirti Wankhede
maintainerRe: [PATCH 31/34] vfio/mdev: Remove mdev_parent_ops dev_attr_groups
Quoted 11 lines · Christoph Hellwig
From: Jason Gunthorpe <[email protected]>
This is only used by one sample to print a fixed string that is pointless.
In general, having a device driver attach sysfs attributes to the parent is horrific. This should never happen, and always leads to some kind of liftime bug as it become very difficult for the sysfs attribute to go back to any data owned by the device driver.
Remove the general mechanism to create this abuse.
Quoted 8 lines
Signed-off-by Jason Gunthorpe <[email protected]>Signed-off-by Christoph Hellwig <[email protected]>--- drivers/vfio/mdev/mdev_sysfs.c | 12 ++---------- include/linux/mdev.h | 2 -- samples/vfio-mdev/mtty.c | 30 +----------------------------- 3 files changed, 3 insertions(+), 41 deletions(-)
Update Documentation/driver-api/vfio-mediated-device.rst where mtty sample code explained. Tree command output should be updated, i.e remove below 2 lines.
|-- mtty_dev
| `-- sample_mtty_devRest looks good to me.
Thanks,
Kirti
PATCH 32/34 vfio/mdev: Remove mdev_parent_ops
In reply to Christoph HellwigFrom: Jason Gunthorpe <[email protected]>
The last useful member in this struct is the supported_type_groups, move it to the mdev_driver and delete mdev_parent_ops.
Replace it with mdev_driver as an argument to mdev_register_device()
--- .../driver-api/vfio-mediated-device.rst | 24 ++++-------------- drivers/gpu/drm/i915/gvt/kvmgt.c | 7 +----- drivers/s390/cio/vfio_ccw_ops.c | 7 +----- drivers/s390/crypto/vfio_ap_ops.c | 9 ++----- drivers/vfio/mdev/mdev_core.c | 13 ++++------ drivers/vfio/mdev/mdev_private.h | 2 +- drivers/vfio/mdev/mdev_sysfs.c | 6 ++--- include/linux/mdev.h | 25 +++---------------- samples/vfio-mdev/mbochs.c | 9 ++----- samples/vfio-mdev/mdpy.c | 9 ++----- samples/vfio-mdev/mtty.c | 9 ++----- 11 files changed, 28 insertions(+), 92 deletions(-)
Documentation/driver-api/vfio-mediated-device.rst +5 -19
@@ -105,6 +105,7 @@ structure to represent a mediated device's driver:: struct mdev_driver { int (*probe) (struct mdev_device *dev); void (*remove) (struct mdev_device *dev); + struct attribute_group **supported_type_groups; struct device_driver driver; };
@@ -119,30 +120,15 @@ to register and unregister itself with the core driver: extern void mdev_unregister_driver(struct mdev_driver *drv); -The mediated bus driver is responsible for adding mediated devices to the VFIO -group when devices are bound to the driver and removing mediated devices from -the VFIO when devices are unbound from the driver. - - -Physical Device Driver Interface --------------------------------- - -The physical device driver interface provides the mdev_parent_ops[3] structure -to define the APIs to manage work in the mediated core driver that is related -to the physical device. - -The structures in the mdev_parent_ops structure are as follows: - -* dev_attr_groups: attributes of the parent device -* mdev_attr_groups: attributes of the mediated device -* supported_config: attributes to define supported configurations -* device_driver: device driver to bind for mediated device instances +The mediated bus driver's probe function should create a vfio_device on top of +the mdev_device and connect it to an appropriate implementation of +vfio_device_ops. When a driver wants to add the GUID creation sysfs to an existing device it has probe'd to then it should call:: extern int mdev_register_device(struct device *dev, - const struct mdev_parent_ops *ops); + struct mdev_driver *mdev_driver); This will provide the 'mdev_supported_types/XX/create' files which can then be used to trigger the creation of a mdev_device. The created mdev_device will be
drivers/gpu/drm/i915/gvt/kvmgt.c +1 -6
@@ -1723,12 +1723,7 @@ static struct mdev_driver intel_vgpu_mdev_driver = { }, .probe = intel_vgpu_probe, .remove = intel_vgpu_remove, -}; - -static const struct mdev_parent_ops intel_vgpu_mdev_ops = { - .owner =THIS_MODULE , .supported_type_groups = gvt_vgpu_type_groups, - .device_driver = &intel_vgpu_mdev_driver, };int intel_gvt_page_track_add (struct intel_vgpu *info,u64 gfn)
@@ -2131,7 +2126,7 @@ static int intel_gvt_init_device(struct drm_i915_private *i915)if (ret) goto out_destroy_idle_vgpu; - ret =mdev_register_device (i915->drm.dev, &intel_vgpu_mdev_ops); + ret =mdev_register_device (i915->drm.dev, &intel_vgpu_mdev_driver);if (ret) goto out_cleanup_vgpu_type_groups;
drivers/s390/cio/vfio_ccw_ops.c +1 -6
@@ -656,17 +656,12 @@ struct mdev_driver vfio_ccw_mdev_driver = { }, .probe = vfio_ccw_mdev_probe, .remove = vfio_ccw_mdev_remove, -}; - -static const struct mdev_parent_ops vfio_ccw_mdev_ops = { - .owner =THIS_MODULE , - .device_driver = &vfio_ccw_mdev_driver, .supported_type_groups = mdev_type_groups, };int vfio_ccw_mdev_reg (struct subchannel *sch) { -return mdev_register_device (&sch->dev, &vfio_ccw_mdev_ops); +return mdev_register_device (&sch->dev, &vfio_ccw_mdev_driver); }void vfio_ccw_mdev_unreg (struct subchannel *sch)
drivers/s390/crypto/vfio_ap_ops.c +2 -7
@@ -1496,12 +1496,7 @@ static struct mdev_driver vfio_ap_matrix_driver = { }, .probe = vfio_ap_mdev_probe, .remove = vfio_ap_mdev_remove, -}; - -static const struct mdev_parent_ops vfio_ap_matrix_ops = { - .owner =THIS_MODULE , - .device_driver = &vfio_ap_matrix_driver, - .supported_type_groups = vfio_ap_mdev_type_groups, + .supported_type_groups = vfio_ap_mdev_type_groups, };int vfio_ap_mdev_register (void )
@@ -1514,7 +1509,7 @@ int vfio_ap_mdev_register(void)if (ret)return ret; - ret =mdev_register_device (&matrix_dev->device, &vfio_ap_matrix_ops); + ret =mdev_register_device (&matrix_dev->device, &vfio_ap_matrix_driver);if (ret) goto err_driver;return 0 ;
drivers/vfio/mdev/mdev_core.c +5 -8
@@ -109,12 +109,12 @@ static int mdev_device_remove_cb(struct device *dev, void *data)/* * mdev_register_device : Register a device * @dev: device structure representing parent device. -* @ops: Parent device operation structure to be registered. +* @mdev_driver: Device driver to bind to the newly created mdev * * Add device to list of registered parent devices. * Returns a negative value on error, otherwise 0. */ -int mdev_register_device (struct device *dev,const struct mdev_parent_ops *ops) +int mdev_register_device (struct device *dev,struct mdev_driver *mdev_driver) {int ret;struct mdev_parent *parent;
@@ -122,9 +122,7 @@ int mdev_register_device(struct device *dev, const struct mdev_parent_ops *ops)char *envp[] = { env_string,NULL };/* check for mandatory ops */ -if (!ops || !ops->supported_type_groups) -return -EINVAL ; -if (!ops->device_driver) +if (!mdev_driver->supported_type_groups)return -EINVAL ; dev =get_device (dev);
@@ -151,7 +149,7 @@ int mdev_register_device(struct device *dev, const struct mdev_parent_ops *ops)init_rwsem (&parent->unreg_sem); parent->dev = dev; - parent->ops = ops; + parent->mdev_driver = mdev_driver;if (!mdev_bus_compat_class) { mdev_bus_compat_class =class_compat_register ("mdev_bus" );
@@ -249,7 +247,7 @@ int mdev_device_create(struct mdev_type *type, const guid_t *uuid)int ret;struct mdev_device *mdev, *tmp;struct mdev_parent *parent = type->parent; -struct mdev_driver *drv = parent->ops->device_driver; +struct mdev_driver *drv = parent->mdev_driver;mutex_lock (&mdev_list_lock);
@@ -271,7 +269,6 @@ int mdev_device_create(struct mdev_type *type, const guid_t *uuid) mdev->dev.parent = parent->dev; mdev->dev.bus = &mdev_bus_type; mdev->dev.release = mdev_device_release; - mdev->dev.groups = parent->ops->mdev_attr_groups; mdev->type = type;/* Pairs with the put in mdev_device_release() */ kobject_get (&type->kobj);
drivers/vfio/mdev/mdev_private.h +1 -1
@@ -15,7 +15,7 @@ void mdev_bus_unregister(void);struct mdev_parent {struct device *dev; -const struct mdev_parent_ops *ops; +struct mdev_driver *mdev_driver;struct kref ref;struct list_head next;struct kset *mdev_types_kset;
drivers/vfio/mdev/mdev_sysfs.c +3 -3
@@ -97,7 +97,7 @@ static struct mdev_type *add_mdev_supported_type(struct mdev_parent *parent, {struct mdev_type *type;struct attribute_group *group = - parent->ops->supported_type_groups[type_group_id]; + parent->mdev_driver->supported_type_groups[type_group_id];int ret;if (!group->name) {
@@ -154,7 +154,7 @@ static struct mdev_type *add_mdev_supported_type(struct mdev_parent *parent,static void remove_mdev_supported_type (struct mdev_type *type) {struct attribute_group *group = - type->parent->ops->supported_type_groups[type->type_group_id]; + type->parent->mdev_driver->supported_type_groups[type->type_group_id];sysfs_remove_files (&type->kobj, (const struct attribute **)group->attrs);
@@ -168,7 +168,7 @@ static int add_mdev_supported_type_groups(struct mdev_parent *parent) {int i; -for (i =0 ; parent->ops->supported_type_groups[i]; i++) { +for (i =0 ; parent->mdev_driver->supported_type_groups[i]; i++) {struct mdev_type *type; type =add_mdev_supported_type (parent, i);
include/linux/mdev.h +4 -21
@@ -30,26 +30,6 @@ unsigned int mdev_get_type_group_id(struct mdev_device *mdev);unsigned int mtype_get_type_group_id (struct mdev_type *mtype);struct device *mtype_get_parent_dev (struct mdev_type *mtype); -/** -* struct mdev_parent_ops - Structure to be registered for each parent device to -* register the device to mdev module. -* -* @owner: The module owner. -* @device_driver: Which device driver to probe() on newly created devices -* @mdev_attr_groups: Attributes of the mediated device. -* @supported_type_groups: Attributes to define supported types. It is mandatory -* to provide supported types. -* -* Parent device that support mediated device should be registered with mdev -* module with mdev_parent_ops structure. -**/ -struct mdev_parent_ops { -struct module *owner; -struct mdev_driver *device_driver; -const struct attribute_group **mdev_attr_groups; -struct attribute_group **supported_type_groups; -}; -/* interface for exporting mdev supported type attributes */ struct mdev_type_attribute {struct attribute attr;
@@ -74,12 +54,15 @@ struct mdev_type_attribute mdev_type_attr_##_name = \* struct mdev_driver - Mediated device driver * @probe: called when new device created * @remove: called when device removed +* @supported_type_groups: Attributes to define supported types. It is mandatory +* to provide supported types. * @driver: device driver structure * **/ struct mdev_driver {int (*probe)(struct mdev_device *dev);void (*remove)(struct mdev_device *dev); +struct attribute_group **supported_type_groups;struct device_driver driver; };
@@ -98,7 +81,7 @@ static inline const guid_t *mdev_uuid(struct mdev_device *mdev)extern struct bus_type mdev_bus_type; -int mdev_register_device (struct device *dev,const struct mdev_parent_ops *ops); +int mdev_register_device (struct device *dev,struct mdev_driver *mdev_driver);void mdev_unregister_device (struct device *dev);int mdev_register_driver (struct mdev_driver *drv);
samples/vfio-mdev/mbochs.c +2 -7
@@ -1412,12 +1412,7 @@ static struct mdev_driver mbochs_driver = { }, .probe = mbochs_probe, .remove = mbochs_remove, -}; - -static const struct mdev_parent_ops mdev_fops = { - .owner =THIS_MODULE , - .device_driver = &mbochs_driver, - .supported_type_groups = mdev_type_groups, + .supported_type_groups = mdev_type_groups, };static const struct file_operations vd_fops = {
@@ -1462,7 +1457,7 @@ static int __init mbochs_dev_init(void)if (ret) goto err_class; - ret =mdev_register_device (&mbochs_dev, &mdev_fops); + ret =mdev_register_device (&mbochs_dev, &mbochs_driver);if (ret) goto err_device;
samples/vfio-mdev/mdpy.c +2 -7
@@ -723,12 +723,7 @@ static struct mdev_driver mdpy_driver = { }, .probe = mdpy_probe, .remove = mdpy_remove, -}; - -static const struct mdev_parent_ops mdev_fops = { - .owner =THIS_MODULE , - .device_driver = &mdpy_driver, - .supported_type_groups = mdev_type_groups, + .supported_type_groups = mdev_type_groups, };static const struct file_operations vd_fops = {
@@ -771,7 +766,7 @@ static int __init mdpy_dev_init(void)if (ret) goto err_class; - ret =mdev_register_device (&mdpy_dev, &mdev_fops); + ret =mdev_register_device (&mdpy_dev, &mdpy_driver);if (ret) goto err_device;
samples/vfio-mdev/mtty.c +2 -7
@@ -1301,12 +1301,7 @@ static struct mdev_driver mtty_driver = { }, .probe = mtty_probe, .remove = mtty_remove, -}; - -static const struct mdev_parent_ops mdev_fops = { - .owner =THIS_MODULE , - .device_driver = &mtty_driver, - .supported_type_groups = mdev_type_groups, + .supported_type_groups = mdev_type_groups, };static void mtty_device_release (struct device *dev)
@@ -1357,7 +1352,7 @@ static int __init mtty_dev_init(void)if (ret) goto err_class; - ret =mdev_register_device (&mtty_dev.dev, &mdev_fops); + ret =mdev_register_device (&mtty_dev.dev, &mtty_driver);if (ret) goto err_device;return 0 ;
Signature · 1 line
2.30.2
Re: [PATCH 32/34] vfio/mdev: Remove mdev_parent_ops
Quoted 9 lines · Christoph Hellwig
From: Jason Gunthorpe <[email protected]>
The last useful member in this struct is the
supported_type_groups, move it to themdev_driverand deletemdev_parent_ops.Replace it with
mdev_driveras an argument tomdev_register_device()Signed-off-by Jason Gunthorpe <[email protected]>Signed-off-by Christoph Hellwig <[email protected]>
Quoted 14 lines
--- .../driver-api/vfio-mediated-device.rst | 24 ++++-------------- drivers/gpu/drm/i915/gvt/kvmgt.c | 7 +----- drivers/s390/cio/vfio_ccw_ops.c | 7 +----- drivers/s390/crypto/vfio_ap_ops.c | 9 ++----- drivers/vfio/mdev/mdev_core.c | 13 ++++------ drivers/vfio/mdev/mdev_private.h | 2 +- drivers/vfio/mdev/mdev_sysfs.c | 6 ++--- include/linux/mdev.h | 25 +++---------------- samples/vfio-mdev/mbochs.c | 9 ++----- samples/vfio-mdev/mdpy.c | 9 ++----- samples/vfio-mdev/mtty.c | 9 ++----- 11 files changed, 28 insertions(+), 92 deletions(-)
PATCH 33/34 vfio/mdev: Use the driver core to create the 'remove' file
In reply to Christoph HellwigFrom: Jason Gunthorpe <[email protected]>
The device creator is supposed to use the dev.groups value to add sysfs files before device_add is called, not call sysfs_create_files() after device_add() returns. This creates a race with uevent delivery where the extra attribute will not be visible.
This was being done because the groups had been co-opted by the mdev driver, now that prior patches have moved the driver's groups to the struct device_driver the dev.group is properly free for use here.
--- drivers/vfio/mdev/mdev_core.c | 1 + drivers/vfio/mdev/mdev_private.h | 2 ++ drivers/vfio/mdev/mdev_sysfs.c | 19 ++++++++++--------- 3 files changed, 13 insertions(+), 9 deletions(-)
drivers/vfio/mdev/mdev_core.c +1 -0
@@ -269,6 +269,7 @@ int mdev_device_create(struct mdev_type *type, const guid_t *uuid) mdev->dev.parent = parent->dev; mdev->dev.bus = &mdev_bus_type; mdev->dev.release = mdev_device_release; + mdev->dev.groups = mdev_device_groups; mdev->type = type;/* Pairs with the put in mdev_device_release() */ kobject_get (&type->kobj);
drivers/vfio/mdev/mdev_private.h +2 -0
@@ -32,6 +32,8 @@ struct mdev_type {unsigned int type_group_id; }; +extern const struct attribute_group *mdev_device_groups[]; +#define to_mdev_type_attr (_attr) \ container_of(_attr, struct mdev_type_attribute, attr)#define to_mdev_type (_kobj) \
drivers/vfio/mdev/mdev_sysfs.c +10 -9
@@ -244,11 +244,20 @@ static ssize_t remove_store(struct device *dev, struct device_attribute *attr,static DEVICE_ATTR_WO (remove); -static const struct attribute *mdev_device_attrs[] = { +static struct attribute *mdev_device_attrs[] = { &dev_attr_remove.attr,NULL , }; +static const struct attribute_group mdev_device_group = { + .attrs = mdev_device_attrs, +}; + +const struct attribute_group *mdev_device_groups[] = { + &mdev_device_group, +NULL +}; +int mdev_create_sysfs_files (struct mdev_device *mdev) {struct mdev_type *type = mdev->type;
@@ -262,15 +271,8 @@ int mdev_create_sysfs_files(struct mdev_device *mdev) ret =sysfs_create_link (kobj, &type->kobj,"mdev_type" );if (ret) goto type_link_failed; - - ret =sysfs_create_files (kobj, mdev_device_attrs); -if (ret) - goto create_files_failed; -return ret; -create_files_failed: -sysfs_remove_link (kobj,"mdev_type" ); type_link_failed:sysfs_remove_link (mdev->type->devices_kobj,dev_name (&mdev->dev));return ret;
@@ -280,7 +282,6 @@ void mdev_remove_sysfs_files(struct mdev_device *mdev) {struct kobject *kobj = &mdev->dev.kobj; -sysfs_remove_files (kobj, mdev_device_attrs);sysfs_remove_link (kobj,"mdev_type" );sysfs_remove_link (mdev->type->devices_kobj,dev_name (&mdev->dev)); }
Signature · 1 line
2.30.2
Re: [PATCH 33/34] vfio/mdev: Use the driver core to create the 'remove' file
Quoted 11 lines · Christoph Hellwig
From: Jason Gunthorpe <[email protected]>
The device creator is supposed to use the dev.groups value to add sysfs files before
device_addis called, not callsysfs_create_files()afterdevice_add()returns. This creates a race with uevent delivery where the extra attribute will not be visible.This was being done because the groups had been co-opted by the mdev driver, now that prior patches have moved the driver's groups to the struct
device_driverthe dev.group is properly free for use here.
Quoted 8 lines
Signed-off-by Jason Gunthorpe <[email protected]>Signed-off-by Christoph Hellwig <[email protected]>--- drivers/vfio/mdev/mdev_core.c | 1 + drivers/vfio/mdev/mdev_private.h | 2 ++ drivers/vfio/mdev/mdev_sysfs.c | 19 ++++++++++--------- 3 files changed, 13 insertions(+), 9 deletions(-)
PATCH 34/34 vfio/mdev: Remove mdev drvdata
In reply to Christoph HellwigFrom: Jason Gunthorpe <[email protected]>
This is no longer used, remove it.
All usages were moved over to either use container_of() from a vfio_device or to use dev_drvdata() directly on the mdev.
--- include/linux/mdev.h | 9 --------- 1 file changed, 9 deletions(-)
include/linux/mdev.h +0 -9
@@ -15,7 +15,6 @@ struct mdev_type;struct mdev_device {struct device dev;guid_t uuid; -void *driver_data;struct list_head next;struct mdev_type *type;bool active;
@@ -66,14 +65,6 @@ struct mdev_driver {struct device_driver driver; }; -static inline void *mdev_get_drvdata (struct mdev_device *mdev) -{ -return mdev->driver_data; -} -static inline void mdev_set_drvdata (struct mdev_device *mdev,void *data) -{ - mdev->driver_data = data; -}static inline const guid_t *mdev_uuid (struct mdev_device *mdev) {return &mdev->uuid;
Signature · 1 line
2.30.2
Re: [PATCH 34/34] vfio/mdev: Remove mdev drvdata
Quoted 4 lines · Christoph Hellwig
From: Jason Gunthorpe <[email protected]>
This is no longer used, remove it.
Quoted 9 lines
All usages were moved over to either use
container_of()from avfio_deviceor to usedev_drvdata()directly on the mdev.Signed-off-by Jason Gunthorpe <[email protected]>Signed-off-by Christoph Hellwig <[email protected]>--- include/linux/mdev.h | 9 --------- 1 file changed, 9 deletions(-)
Quoted 7 lines · Christoph Hellwig
Hi all,
the GVT code in the i915 is a bit of a mess right now due to strange abstractions and lots of indirect calls. This series refactors various bits to clean that up. The main user visible change is that almost all of the GVT code moves out of the main i915 driver and into the kvmgt module.
Hi Christoph:
Do you want me to merge the GVT-g patches in this series? Or you want them to get merged from your side?
Thanks,
Zhi.
Quoted 55 lines
Tested on my Thinkpad with a Kaby Lake CPU and integrated graphics.
Git tree:
git://git.infradead.org/users/hch/misc.git i915-gvtGitweb:
http://git.infradead.org/users/hch/misc.git/shortlog/refs/heads/i915-gvt
Changes since v2:
- rebased on top of Linx 5.18-rc +
"Refactor GVT-g MMIO tracking table and handlers"
- don't fold the gvtMakefileinto the mainMakefile
- add the mdev patches to remove the legacy interface that is now unused to the end of the seriesChanges since v1:
- rebased on Linux 5.15
- allow the kvmgvt module to be loaded at any time and thus solve the deadlock when both i915 amd kvmgvt are modular
- include the conversion to the modern mdev APINote that I do expect to rebased this again against 5.16-rc1 once released, but I'd like to get this out for review ASAP.
Diffstat:
b/drivers/gpu/drm/i915/Kconfig | 33 b/drivers/gpu/drm/i915/Makefile | 31 b/drivers/gpu/drm/i915/gvt/cfg_space.c | 89 -- b/drivers/gpu/drm/i915/gvt/cmd_parser.c | 4 b/drivers/gpu/drm/i915/gvt/dmabuf.c | 36 - b/drivers/gpu/drm/i915/gvt/execlist.c | 12 b/drivers/gpu/drm/i915/gvt/gtt.c | 55 + b/drivers/gpu/drm/i915/gvt/gvt.h | 125 ++- b/drivers/gpu/drm/i915/gvt/interrupt.c | 38 + b/drivers/gpu/drm/i915/gvt/kvmgt.c | 1099 +++++++++++++++----------------- b/drivers/gpu/drm/i915/gvt/mmio.c | 4 b/drivers/gpu/drm/i915/gvt/opregion.c | 148 ---- b/drivers/gpu/drm/i915/gvt/page_track.c | 8 b/drivers/gpu/drm/i915/gvt/scheduler.c | 37 - b/drivers/gpu/drm/i915/gvt/trace.h | 2 b/drivers/gpu/drm/i915/gvt/vgpu.c | 22 b/drivers/gpu/drm/i915/i915_drv.c | 7 b/drivers/gpu/drm/i915/i915_drv.h | 1 b/drivers/gpu/drm/i915/i915_trace.h | 1 b/drivers/gpu/drm/i915/intel_gvt.c | 162 +++- b/drivers/gpu/drm/i915/intel_gvt.h | 17 drivers/gpu/drm/i915/gvt/Makefile | 9 drivers/gpu/drm/i915/gvt/gvt.c | 340 --------- drivers/gpu/drm/i915/gvt/hypercall.h | 82 -- drivers/gpu/drm/i915/gvt/mpt.h | 400 ----------- 25 files changed, 929 insertions(+), 1833 deletions(-)
Quoted 9 lines · Zhi A
Quoted 5 lines
the GVT code in the i915 is a bit of a mess right now due to strange abstractions and lots of indirect calls. This series refactors various bits to clean that up. The main user visible change is that almost all of the GVT code moves out of the main i915 driver and into the kvmgt module.
Hi Christoph:
Do you want me to merge the GVT-g patches in this series? Or you want them to get merged from your side?
The two option here are drm tree via gvt and i915 trees or the vfio tree, neither of which really is my tree.
We already have a fair bit of vfio changes at the tail end of the series, and Jason has some more that should sit on top of it, and I have some more that I haven't sent yet.
So if we could get the MMIO table and Makefile cleanups into a topic branch that we could pull into the vfio tree and merge it through that that would seem easiest to me, assuming that is ok with the i915, drm and vfio maintainers.
Quoted 14 lines · Christoph Hellwig
Quoted 9 lines · Zhi A
Quoted 5 lines
the GVT code in the i915 is a bit of a mess right now due to strange abstractions and lots of indirect calls. This series refactors various bits to clean that up. The main user visible change is that almost all of the GVT code moves out of the main i915 driver and into the kvmgt module.
Hi Christoph:
Do you want me to merge the GVT-g patches in this series? Or you want them to get merged from your side?
The two option here are drm tree via gvt and i915 trees or the vfio tree, neither of which really is my tree.
Quoted 8 lines
We already have a fair bit of vfio changes at the tail end of the series, and Jason has some more that should sit on top of it, and I have some more that I haven't sent yet.
So if we could get the MMIO table and
Makefilecleanups into a topic branch that we could pull into the vfio tree and merge it through that that would seem easiest to me, assuming that is ok with the i915, drm and vfio maintainers.
AFAICS the changes are mostly to gvt/, and at least I'm fine with the minor changes to i915 (in this series and in my two patches) being merged via whichever tree you all see fit.
Joonas, Tvrtko, Rodrigo, chime in now if you have any issues with that.
BR,
Jani.
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Quoted 1 line · Jani Nikula
Acked-by Jani Nikula <[email protected]>
I've only added this to the i915 patches for now, let me know if you also want me to add it to the vfio/mdev ones.
Hi folks:
Thanks so much for the efforts. I prepared a branch which contains all our patches.The aim of the branch is for the VFIO maintainers to pull the whole bunch easily after the drm-intel-next got merged through drm (as one of the MMIO patches depends on a patch in drm-intel-next).
I dropped patch 4 and patch 5 as they have been covered by Jani's patches. Some conflicts was solved. QA is going to test it today.
You can find it here:
git clone https://github.com/intel/gvt-linux -b for-christoph
Thanks,
Zhi.
Quoted 37 lines · Jani Nikula
Quoted 14 lines · Christoph Hellwig
Quoted 9 lines · Zhi A
Quoted 5 lines
the GVT code in the i915 is a bit of a mess right now due to strange abstractions and lots of indirect calls. This series refactors various bits to clean that up. The main user visible change is that almost all of the GVT code moves out of the main i915 driver and into the kvmgt module.
Hi Christoph:
Do you want me to merge the GVT-g patches in this series? Or you want them to get merged from your side?
The two option here are drm tree via gvt and i915 trees or the vfio tree, neither of which really is my tree.
Quoted 8 lines
We already have a fair bit of vfio changes at the tail end of the series, and Jason has some more that should sit on top of it, and I have some more that I haven't sent yet.
So if we could get the MMIO table and
Makefilecleanups into a topic branch that we could pull into the vfio tree and merge it through that that would seem easiest to me, assuming that is ok with the i915, drm and vfio maintainers.AFAICS the changes are mostly to gvt/, and at least I'm fine with the minor changes to i915 (in this series and in my two patches) being merged via whichever tree you all see fit.
Acked-by Jani Nikula <[email protected]>Joonas, Tvrtko, Rodrigo, chime in now if you have any issues with that.
BR,
Jani.
Quoted 10 lines · Zhi A
Hi folks:
Thanks so much for the efforts. I prepared a branch which contains all our patches.The aim of the branch is for the VFIO maintainers to pull the whole bunch easily after the drm-intel-next got merged through drm (as one of the MMIO patches depends on a patch in drm-intel-next).
I dropped patch 4 and patch 5 as they have been covered by Jani's patches. Some conflicts was solved. QA is going to test it today.
You can find it here:
git clone https://github.com/intel/gvt-linux -b for-christoph
There are alot of extra commits on there - is it possible to base this straight on rc1 not on some kind of existing DRM tree?
Why did you choose drm/i915/fbc: Call intel_fbc_activate() directly from frontbuffer flush as a base?
Jason
Quoted 12 lines · Jason Gunthorpe
Quoted 10 lines · Zhi A
Hi folks:
Thanks so much for the efforts. I prepared a branch which contains all our patches.The aim of the branch is for the VFIO maintainers to pull the whole bunch easily after the drm-intel-next got merged through drm (as one of the MMIO patches depends on a patch in drm-intel-next).
I dropped patch 4 and patch 5 as they have been covered by Jani's patches. Some conflicts was solved. QA is going to test it today.
You can find it here:
git clone https://github.com/intel/gvt-linux -b for-christoph
Quoted 8 lines
There are alot of extra commits on there - is it possible to base this straight on rc1 not on some kind of existing DRM tree?
Why did you choose drm/i915/fbc: Call
intel_fbc_activate()directly from frontbuffer flush as a base?Jason
Hi Jason:
I updated the branch. You can check if those are what you are expecting. :)
Thanks,
Zhi.
Quoted 19 lines · Zhi A
Quoted 18 lines · Jason Gunthorpe
Quoted 10 lines · Zhi A
Hi folks:
Thanks so much for the efforts. I prepared a branch which contains all our patches.The aim of the branch is for the VFIO maintainers to pull the whole bunch easily after the drm-intel-next got merged through drm (as one of the MMIO patches depends on a patch in drm-intel-next).
I dropped patch 4 and patch 5 as they have been covered by Jani's patches. Some conflicts was solved. QA is going to test it today.
You can find it here:
git clone https://github.com/intel/gvt-linux -b for-christoph
There are alot of extra commits on there - is it possible to base this straight on rc1 not on some kind of existing DRM tree?
Why did you choose drm/i915/fbc: Call
intel_fbc_activate()directly from frontbuffer flush as a base?
Quoted 6 lines
Quoted 2 lines
Jason
Hi Jason:
I updated the branch. You can check if those are what you are expecting. :)
This is better, except for the first commit:
[DON'T PULL] drm/i915/dmc: split out dmc registers to a separate file THIS PATCH WILL GO THROUGH DRM-INTEL-NEXT TO UPSTREAM
Clean up the massive i915_reg.h a bit with this isolated set of registers.
v2: Remove stale comment (Lucas)
Clean the commit message and send that as a proper PR to drm-intel-next, then everything else is OK.
Jason
Quoted 17 lines · Jason Gunthorpe
Quoted 16 lines · Zhi A
Quoted 15 lines · Jason Gunthorpe
Quoted 10 lines · Zhi A
Hi folks:
Thanks so much for the efforts. I prepared a branch which contains all our patches.The aim of the branch is for the VFIO maintainers to pull the whole bunch easily after the drm-intel-next got merged through drm (as one of the MMIO patches depends on a patch in drm-intel-next).
I dropped patch 4 and patch 5 as they have been covered by Jani's patches. Some conflicts was solved. QA is going to test it today.
You can find it here:
git clone https://github.com/intel/gvt-linux -b for-christoph
There are alot of extra commits on there - is it possible to base this straight on rc1 not on some kind of existing DRM tree?
Quoted 8 lines
Quoted 8 lines
Quoted 5 lines
Why did you choose drm/i915/fbc: Call
intel_fbc_activate()directly from frontbuffer flush as a base?Jason
Hi Jason:
This one belongs to i915, which has already been queued in drm-intel-next, but not yet reached to the top. When it is landed in -rc, I will rebase this branch on it, then we can drop this patch in this branch.
Quoted 17 lines
Quoted 1 line
I updated the branch. You can check if those are what you are expecting. :)
This is better, except for the first commit:
[DON'T PULL] drm/i915/dmc: split out dmc registers to a separate file THIS PATCH WILL GO THROUGH DRM-INTEL-NEXT TO UPSTREAM
Clean up the massive
i915_reg.ha bit with this isolated set of registers.v2: Remove stale comment (Lucas)
Clean the commit message and send that as a proper PR to drm-intel-next, then everything else is OK.
Jason
Quoted 21 lines · Zhi A
Quoted 20 lines · Jason Gunthorpe
Quoted 19 lines · Zhi A
Quoted 18 lines · Jason Gunthorpe
Quoted 10 lines · Zhi A
Hi folks:
Thanks so much for the efforts. I prepared a branch which contains all our patches.The aim of the branch is for the VFIO maintainers to pull the whole bunch easily after the drm-intel-next got merged through drm (as one of the MMIO patches depends on a patch in drm-intel-next).
I dropped patch 4 and patch 5 as they have been covered by Jani's patches. Some conflicts was solved. QA is going to test it today.
You can find it here:
git clone https://github.com/intel/gvt-linux -b for-christoph
There are alot of extra commits on there - is it possible to base this straight on rc1 not on some kind of existing DRM tree?
Why did you choose drm/i915/fbc: Call
intel_fbc_activate()directly from frontbuffer flush as a base?
Quoted 8 lines
Quoted 5 lines
Quoted 5 lines
Quoted 2 lines
Jason
Hi Jason:
This one belongs to i915, which has already been queued in drm-intel-next, but not yet reached to the top. When it is landed in -rc, I will rebase this branch on it, then we can drop this patch in this branch.
A commit called 'split out dmc registers' with no Fixes: will be sent to a rc?
Jason
Jani Nikula
maintainerQuoted 7 lines · Jason Gunthorpe
Quoted 3 lines · Zhi A
This one belongs to i915, which has already been queued in drm-intel-next, but not yet reached to the top. When it is landed in -rc, I will rebase this branch on it, then we can drop this patch in this branch.
A commit called 'split out dmc registers' with no Fixes: will be sent to a rc?
Won't. It's in drm-intel-next (and drm-next), headed to v5.19.
BR,
Jani.
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Jani Nikula
maintainerQuoted 32 lines · Jason Gunthorpe
Quoted 19 lines · Zhi A
Quoted 18 lines · Jason Gunthorpe
Quoted 10 lines · Zhi A
Hi folks:
Thanks so much for the efforts. I prepared a branch which contains all our patches.The aim of the branch is for the VFIO maintainers to pull the whole bunch easily after the drm-intel-next got merged through drm (as one of the MMIO patches depends on a patch in drm-intel-next).
I dropped patch 4 and patch 5 as they have been covered by Jani's patches. Some conflicts was solved. QA is going to test it today.
You can find it here:
git clone https://github.com/intel/gvt-linux -b for-christoph
There are alot of extra commits on there - is it possible to base this straight on rc1 not on some kind of existing DRM tree?
Why did you choose drm/i915/fbc: Call
intel_fbc_activate()directly from frontbuffer flush as a base?Quoted 6 lines
Quoted 2 lines
Jason
Hi Jason:
I updated the branch. You can check if those are what you are expecting. :)
This is better, except for the first commit:
[DON'T PULL] drm/i915/dmc: split out dmc registers to a separate file THIS PATCH WILL GO THROUGH DRM-INTEL-NEXT TO UPSTREAM
Quoted 7 lines
Clean up the massive
i915_reg.ha bit with this isolated set of registers.v2: Remove stale comment (Lucas)
Clean the commit message and send that as a proper PR to drm-intel-next, then everything else is OK.
It's already in drm-intel-next, I guess the problem is basing the branch on something that doesn't have it. I'd probably just base everything cleanly on -rc1, and whoever does the merge between the two will need to account for the missing include in the result. It's just adding one line in the right place.
BR,
Jani.
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Quoted 25 lines · Jani Nikula
Quoted 25 lines
Quoted 8 lines
Quoted 8 lines
Quoted 1 line
git clone https://github.com/intel/gvt-linux -b for-christoph
There are alot of extra commits on there - is it possible to base this straight on rc1 not on some kind of existing DRM tree?
Why did you choose drm/i915/fbc: Call
intel_fbc_activate()directly from frontbuffer flush as a base?Quoted 6 lines
Quoted 2 lines
Jason
Hi Jason:
I updated the branch. You can check if those are what you are expecting. :)
This is better, except for the first commit:
[DON'T PULL] drm/i915/dmc: split out dmc registers to a separate file THIS PATCH WILL GO THROUGH DRM-INTEL-NEXT TO UPSTREAM
Clean up the massive
i915_reg.ha bit with this isolated set of registers.v2: Remove stale comment (Lucas)
Quoted 8 lines
Quoted 2 lines
Clean the commit message and send that as a proper PR to drm-intel-next, then everything else is OK.
It's already in drm-intel-next, I guess the problem is basing the branch on something that doesn't have it. I'd probably just base everything cleanly on -rc1, and whoever does the merge between the two will need to account for the missing include in the result. It's just adding one line in the right place.
That makes sense to me, especially if you can do the merge fixup internally in DRM.
So drop the '[DONT PULL]' commit and send a PR to the next DRM tree - when that is confirmed send the same PR to vfio,
Thanks,
Jason
Quoted 36 lines · Jason Gunthorpe
Quoted 25 lines · Jani Nikula
Quoted 25 lines
Quoted 8 lines
Quoted 8 lines
Quoted 1 line
git clone https://github.com/intel/gvt-linux -b for-christoph
There are alot of extra commits on there - is it possible to base this straight on rc1 not on some kind of existing DRM tree?
Why did you choose drm/i915/fbc: Call
intel_fbc_activate()directly from frontbuffer flush as a base?Quoted 6 lines
Quoted 2 lines
Jason
Hi Jason:
I updated the branch. You can check if those are what you are expecting. :)
This is better, except for the first commit:
[DON'T PULL] drm/i915/dmc: split out dmc registers to a separate file THIS PATCH WILL GO THROUGH DRM-INTEL-NEXT TO UPSTREAM
Clean up the massive
i915_reg.ha bit with this isolated set of registers.v2: Remove stale comment (Lucas)
Quoted 8 lines
Quoted 2 lines
Clean the commit message and send that as a proper PR to drm-intel-next, then everything else is OK.
It's already in drm-intel-next, I guess the problem is basing the branch on something that doesn't have it. I'd probably just base everything cleanly on -rc1, and whoever does the merge between the two will need to account for the missing include in the result. It's just adding one line in the right place.
Quoted 5 lines
That makes sense to me, especially if you can do the merge fixup internally in DRM.
So drop the '[DONT PULL]' commit and send a PR to the next DRM tree - when that is confirmed send the same PR to vfio,
I updated the branch again, but I am confused. What is the purpose of sending the PR to next DRM tree? I suppose all the patches will go through VFIO? If I understand correctly?
Quoted 4 lines
Thanks,
Jason
Quoted 6 lines · Zhi A
Quoted 2 lines
So drop the '[DONT PULL]' commit and send a PR to the next DRM tree - when that is confirmed send the same PR to vfio,
I updated the branch again, but I am confused. What is the purpose of sending the PR to next DRM tree? I suppose all the patches will go through VFIO? If I understand correctly?
pull requests can flow through more than one tree concurrently. The purpose of the topic branch is to allow all the commits to be in all the trees they need to be in at once.
So you should send this branch as a PR to the next logical upstream tree gvt patches normally go through, in the usual way that you send PRs. Especially in this case where there is a small merge conflict internal to DRM to resolve. I'm assuming this is the drm-intel-next tree?
Once DRM is internally happy then VFIO can merge it as well. You can view VFIO as the secondary path to Linus, DRM as primary. Alex will mention in his pull request that VFIO has a 'shared branch with DRM for gvt'.
Jason
Quoted 10 lines · Jason Gunthorpe
pull requests can flow through more than one tree concurrently. The purpose of the topic branch is to allow all the commits to be in all the trees they need to be in at once.
So you should send this branch as a PR to the next logical upstream tree gvt patches normally go through, in the usual way that you send PRs. Especially in this case where there is a small merge conflict internal to DRM to resolve. I'm assuming this is the drm-intel-next tree?
Quoted 4 lines
Once DRM is internally happy then VFIO can merge it as well. You can view VFIO as the secondary path to Linus, DRM as primary. Alex will mention in his pull request that VFIO has a 'shared branch with DRM for gvt'.
Where do we stand here? The (somewhat misnamed) topic/for-christoph branch looks fine to me now except for the mіssing "static inline" on the intel_gvt_iterate_mmio_table stub.
When can we expect it in the i915 tree and linux-next?
Quoted 16 lines · Christoph Hellwig
Quoted 10 lines · Jason Gunthorpe
pull requests can flow through more than one tree concurrently. The purpose of the topic branch is to allow all the commits to be in all the trees they need to be in at once.
So you should send this branch as a PR to the next logical upstream tree gvt patches normally go through, in the usual way that you send PRs. Especially in this case where there is a small merge conflict internal to DRM to resolve. I'm assuming this is the drm-intel-next tree?
Quoted 4 lines
Once DRM is internally happy then VFIO can merge it as well. You can view VFIO as the secondary path to Linus, DRM as primary. Alex will mention in his pull request that VFIO has a 'shared branch with DRM for gvt'.
Quoted 6 lines
Where do we stand here? The (somewhat misnamed) topic/for-christoph branch looks fine to me now except for the mіssing "static inline" on the
intel_gvt_iterate_mmio_tablestub.When can we expect it in the i915 tree and linux-next?
Qur QA finished the test yesterday and I just made a tag. The pull request is going to be sent today. Yes, I will fix that.
Thanks,
Zhi.