i915 vgpu PV to improve vgpu performance
v8 cover i915 vgpu PV to improve vgpu performance
To improve vgpu performance, it could implement some PV optimization such as to reduce the mmio access trap numbers or eliminate certain piece of HW emulation within guest driver to reduce vm exit/vm enter cost.
the solutions in this patch set are implemented two PV optimizations based on the shared memory region between guest and GVTg for data communication. The shared memory region is allocated by guest driver and this region's memory guest physical address will be passed to GVTg through PVINFO register and later GVTg can access this region directly without trap cost to achieve data exchange purpose between guest and GVTg.
in this patch set, 2 kind of PV optimization implemented controlled by pv_caps PVINO register with different pv bit.
1. workload PV submission (context submission): reduce 4 traps to 1 trap and eliminated execlists HW behaviour emulation.
2. ppgtt PV update: eliminate the cost of ppgtt write protection.
based on the experiment, for small workloads, specifally, glxgears with vblank_mode off, the average performance gain on single vgpu is 30~50%. for large workload such as media and 3D, the average performance gain is about 4%.
based on the PV mechanism, it could achive more vgpu feature optimization such as globle GTT update, display plane and water mark update.
v0: RFC patch set
v1: addressed RFC review comments
v2: addressed v1 review comments, added pv callbacks for pv operations v3:
1. addressed v2 review comments, removed pv callbacks code duplication in v2 and unified pv calls under g2v notification register. different g2v pv notifications defined.
2. dropped pv master irq feature due to hard conflict with recnet i915 change and take time to rework.
v4:
1. addressed v3 review comments.
2. extended workload PV submission by skip execlists HW behaviour emulation and context switch interrupt injection.
v5:
1. addressed v4 review comments from Chris for pv submission.
2. per-engine communication between PV guest and host.
v6:
1. addressed v5 review comments from Chris for pv submission.
2. addressed v5 review comments from Zhenyu for PV version support. v7:
1. addessed v6 review comments from Chris starting to use pv cmd buffer communication between pv guest and GVT.
v8: addressed v7 review comments from Chris to refine pv submssion code.
Xiaolin Zhang (9):
drm/i915: introduced vgpu pv capability
drm/i915: vgpu shared memory setup for pv optimization drm/i915: vgpu pv command buffer support
drm/i915: vgpu ppgtt update pv optimization drm/i915: vgpu context submission pv optimization drm/i915/gvt: GVTg handle pv_caps PVINFO register drm/i915/gvt: GVTg handle shared_page setup drm/i915/gvt: GVTg support ppgtt pv optimization drm/i915/gvt: GVTg support context submission pv optimization
drivers/gpu/drm/i915/Makefile | 2 +- drivers/gpu/drm/i915/gt/intel_lrc.c | 12 +- drivers/gpu/drm/i915/gvt/execlist.c | 6 + drivers/gpu/drm/i915/gvt/gtt.c | 298 +++++++++++++++++++++ drivers/gpu/drm/i915/gvt/gtt.h | 11 + drivers/gpu/drm/i915/gvt/gvt.h | 12 +- drivers/gpu/drm/i915/gvt/handlers.c | 181 ++++++++++++- drivers/gpu/drm/i915/gvt/vgpu.c | 50 ++++ drivers/gpu/drm/i915/i915_drv.h | 6 +- drivers/gpu/drm/i915/i915_gem.c | 3 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 10 +- drivers/gpu/drm/i915/i915_gem_gtt.h | 8 + drivers/gpu/drm/i915/i915_pvinfo.h | 9 +- drivers/gpu/drm/i915/i915_vgpu.c | 417 ++++++++++++++++++++++++++++- drivers/gpu/drm/i915/i915_vgpu.h | 133 +++++++++ drivers/gpu/drm/i915/intel_pv_submission.c | 187 +++++++++++++ 16 files changed, 1329 insertions(+), 16 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_pv_submission.c
Signature · 6 lines
1.8.3.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.CHECKPATCH: warning for i915 vgpu PV to improve vgpu performance
== Series Details ==
== Series Details ==
Series: i915 vgpu PV to improve vgpu performance
URL : https://patchwork.freedesktop.org/series/64041/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
966d9464feed drm/i915: introduced vgpu pv capability
-:91: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis
#91: FILE: drivers/gpu/drm/i915/i915_vgpu.c:105:
+ DRM_INFO("Virtual GPU for Intel GVT-g detected with pv_caps 0x%x.\n",
+ dev_priv->vgpu.pv_caps);-:115: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #115: FILE: drivers/gpu/drm/i915/i915_vgpu.c:323:
+bool intel_vgpu_check_pv_caps(struct drm_i915_private *dev_priv,
+ void __iomem *shared_area)
-:153: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #153: FILE: drivers/gpu/drm/i915/i915_vgpu.h:57:
+bool intel_vgpu_check_pv_caps(struct drm_i915_private *dev_priv,
+ void __iomem *shared_area);
total: 0 errors, 0 warnings, 3 checks, 100 lines checked 75aa49617e8c drm/i915: vgpu shared memory setup for pv optimization -:101: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #101: FILE: drivers/gpu/drm/i915/i915_vgpu.c:320:
+static int intel_vgpu_setup_shared_page(struct drm_i915_private *dev_priv,
+ void __iomem *shared_area)
-:159: CHECK:ALLOC_SIZEOF_STRUCT: Prefer kzalloc(sizeof(*pv)...) over kzalloc(sizeof(struct i915_virtual_gpu_pv)...) #159: FILE: drivers/gpu/drm/i915/i915_vgpu.c:378:
+ pv = kzalloc(sizeof(struct i915_virtual_gpu_pv), GFP_KERNEL);
total: 0 errors, 0 warnings, 2 checks, 158 lines checked abd7ac8eb46a drm/i915: vgpu pv command buffer support
-:51: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #51: FILE: drivers/gpu/drm/i915/i915_vgpu.c:333:
+static int wait_for_desc_update(struct vgpu_pv_ct_buffer_desc *desc,
+ u32 fence, u32 *status)
-:63: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #63: FILE: drivers/gpu/drm/i915/i915_vgpu.c:345:
+ DRM_ERROR("CT: fence %u failed; reported fence=%u\n",
+ fence, desc->fence);
-:88: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #88: FILE: drivers/gpu/drm/i915/i915_vgpu.c:370:
+static int pv_command_buffer_write(struct i915_virtual_gpu_pv *pv,
+ const u32 *action, u32 len /* in dwords */, u32 fence)
-:151: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #151: FILE: drivers/gpu/drm/i915/i915_vgpu.c:433:
+static int pv_send(struct drm_i915_private *dev_priv,
+ const u32 *action, u32 len, u32 *status)
-:186: CHECK:OPEN_ENDED_LINE: Lines should not end with a '(' #186: FILE: drivers/gpu/drm/i915/i915_vgpu.c:468:
+static int intel_vgpu_pv_send_command_buffer(
-:203: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #203: FILE: drivers/gpu/drm/i915/i915_vgpu.c:485:
+ DRM_ERROR("PV: send action %#x returned %d (%#x)\n",
+ action[0], ret, ret);
-:226: CHECK:SPACING: spaces preferred around that '/' (ctx:VxV) #226: FILE: drivers/gpu/drm/i915/i915_vgpu.c:573:
+ pv->ctb.desc->size = PAGE_SIZE/2;
^
-:245: CHECK:SPACING: spaces preferred around that '/' (ctx:VxV) #245: FILE: drivers/gpu/drm/i915/i915_vgpu.h:32:
+#define PV_DESC_OFF (PAGE_SIZE/4)
^
-:246: CHECK:SPACING: spaces preferred around that '/' (ctx:VxV) #246: FILE: drivers/gpu/drm/i915/i915_vgpu.h:33:
+#define PV_CMD_OFF (PAGE_SIZE/2)
^
-:323: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #323: FILE: drivers/gpu/drm/i915/i915_vgpu.h:130:
+intel_vgpu_pv_send(struct drm_i915_private *dev_priv,
+ u32 *action, u32 len)
total: 0 errors, 0 warnings, 10 checks, 299 lines checkedbc18f11d883b drm/i915: vgpu ppgtt update pv optimization
-:42: CHECK:LOGICAL_CONTINUATIONS: Logical continuations should be on the previous line #42: FILE: drivers/gpu/drm/i915/i915_gem.c:1423:
+ if ((intel_vgpu_active(dev_priv) && !intel_vgpu_has_huge_gtt(dev_priv))
+ || intel_vgpu_enabled_pv_caps(dev_priv, PV_PPGTT_UPDATE))
-:56: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #56: FILE: drivers/gpu/drm/i915/i915_gem_gtt.c:1001:
+void gen8_ppgtt_clear(struct i915_address_space *vm,
u64 start, u64 length)
-:65: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #65: FILE: drivers/gpu/drm/i915/i915_gem_gtt.c:1108:
+int gen8_ppgtt_alloc(struct i915_address_space *vm,
u64 start, u64 length)
-:74: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #74: FILE: drivers/gpu/drm/i915/i915_gem_gtt.c:1321:
+void gen8_ppgtt_insert_4lvl(struct i915_address_space *vm,
struct i915_vma *vma,
-:98: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #98: FILE: drivers/gpu/drm/i915/i915_gem_gtt.h:582:
+void gen8_ppgtt_clear(struct i915_address_space *vm,
+ u64 start, u64 length);
-:100: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #100: FILE: drivers/gpu/drm/i915/i915_gem_gtt.h:584:
+void gen8_ppgtt_insert_4lvl(struct i915_address_space *vm,
+ struct i915_vma *vma,
-:103: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #103: FILE: drivers/gpu/drm/i915/i915_gem_gtt.h:587:
+int gen8_ppgtt_alloc(struct i915_address_space *vm,
+ u64 start, u64 length);
-:127: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #127: FILE: drivers/gpu/drm/i915/i915_vgpu.c:320:
+static int vgpu_ppgtt_pv_update(struct drm_i915_private *dev_priv,
+ u32 action, u64 pdp, u64 start, u64 length, u32 cache_level)
-:144: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #144: FILE: drivers/gpu/drm/i915/i915_vgpu.c:337:
+static void gen8_ppgtt_clear_4lvl_pv(struct i915_address_space *vm,
+ u64 start, u64 length)
-:151: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #151: FILE: drivers/gpu/drm/i915/i915_vgpu.c:344:
+ vgpu_ppgtt_pv_update(dev_priv, PV_ACTION_PPGTT_L4_CLEAR,
+ px_dma(ppgtt->pd), start, length, 0);
-:155: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #155: FILE: drivers/gpu/drm/i915/i915_vgpu.c:348:
+static void gen8_ppgtt_insert_4lvl_pv(struct i915_address_space *vm,
+ struct i915_vma *vma,
-:165: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #165: FILE: drivers/gpu/drm/i915/i915_vgpu.c:358:
+ vgpu_ppgtt_pv_update(dev_priv, PV_ACTION_PPGTT_L4_INSERT,
+ px_dma(ppgtt->pd), start, length, cache_level);
-:169: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #169: FILE: drivers/gpu/drm/i915/i915_vgpu.c:362:
+static int gen8_ppgtt_alloc_4lvl_pv(struct i915_address_space *vm,
+ u64 start, u64 length)
-:187: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #187: FILE: drivers/gpu/drm/i915/i915_vgpu.c:380:
+void intel_vgpu_config_pv_caps(struct drm_i915_private *dev_priv,
+ enum pv_caps cap, void *data)
-:237: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #237: FILE: drivers/gpu/drm/i915/i915_vgpu.h:139:
+intel_vgpu_enabled_pv_caps(struct drm_i915_private *dev_priv,
+ enum pv_caps cap)
-:240: CHECK:LOGICAL_CONTINUATIONS: Logical continuations should be on the previous line #240: FILE: drivers/gpu/drm/i915/i915_vgpu.h:142:
+ return (dev_priv->vgpu.active) && intel_vgpu_has_pv_caps(dev_priv)
+ && (dev_priv->vgpu.pv_caps & cap);
-:251: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #251: FILE: drivers/gpu/drm/i915/i915_vgpu.h:165:
+void intel_vgpu_config_pv_caps(struct drm_i915_private *dev_priv,
+ enum pv_caps cap, void *data);
total: 0 errors, 0 warnings, 17 checks, 190 lines checked 2231819849bb drm/i915: vgpu context submission pv optimization -:136: CHECK:SPACING: spaces preferred around that '/' (ctx:VxV) #136: FILE: drivers/gpu/drm/i915/i915_vgpu.h:33:
+#define PV_ELSP_OFF (PAGE_SIZE/8)
^
-:164: CHECK:UNCOMMENTED_DEFINITION: spinlock_t definition without comment #164: FILE: drivers/gpu/drm/i915/i915_vgpu.h:67:
+ spinlock_t lock;
-:188: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #188:
new file mode 100644
-:208: CHECK:SPACING: spaces preferred around that '+' (ctx:VxV) #208: FILE: drivers/gpu/drm/i915/intel_pv_submission.c:16:
+ reg_state[CTX_RING_TAIL+1] = intel_ring_set_tail(rq->ring, rq->tail);
^
-:219: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #219: FILE: drivers/gpu/drm/i915/intel_pv_submission.c:27:
+static void pv_submit(struct intel_engine_cs *engine,
+ struct i915_request **out,
-:248: CHECK:BRACES: Blank lines aren't necessary before a close brace '}' #248: FILE: drivers/gpu/drm/i915/intel_pv_submission.c:56:
+
+}
-:316: CHECK:LINE_SPACING: Please don't use multiple blank lines #316: FILE: drivers/gpu/drm/i915/intel_pv_submission.c:124:
+
+
total: 0 errors, 1 warnings, 6 checks, 311 lines checked 64c18e7a7577 drm/i915/gvt: GVTg handle pv_caps PVINFO register a75d9802874e drm/i915/gvt: GVTg handle shared_page setup
-:51: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #51: FILE: drivers/gpu/drm/i915/gvt/gvt.h:693:
+int intel_gvt_read_shared_page(struct intel_vgpu *vgpu,
+ unsigned int offset, void *buf, unsigned long len);
-:53: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #53: FILE: drivers/gpu/drm/i915/gvt/gvt.h:695:
+int intel_gvt_write_shared_page(struct intel_vgpu *vgpu,
+ unsigned int offset, void *buf, unsigned long len);
-:131: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #131: FILE: drivers/gpu/drm/i915/gvt/vgpu.c:603:
+int intel_gvt_read_shared_page(struct intel_vgpu *vgpu,
+ unsigned int offset, void *buf, unsigned long len)
-:150: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #150: FILE: drivers/gpu/drm/i915/gvt/vgpu.c:622:
+int intel_gvt_write_shared_page(struct intel_vgpu *vgpu,
+ unsigned int offset, void *buf, unsigned long len)
total: 0 errors, 0 warnings, 4 checks, 122 lines checked 040d02e6598f drm/i915/gvt: GVTg support ppgtt pv optimization -:83: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #83: FILE: drivers/gpu/drm/i915/gvt/gtt.c:1836:
+ gvt_vgpu_err("fail to create ppgtt for pdp 0x%llx\n",
+ px_dma(mm->ppgtt->pd));
-:122: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'end' - possible side-effects? #122: FILE: drivers/gpu/drm/i915/gvt/gtt.c:2877:
+#define pml4_addr_end(addr, end) \
+({ unsigned long __boundary = \
+ ((addr) + GEN8_PML4E_SIZE) & GEN8_PML4E_SIZE_MASK; \
+ (__boundary < (end)) ? __boundary : (end); \
+})
-:128: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'end' - possible side-effects? #128: FILE: drivers/gpu/drm/i915/gvt/gtt.c:2883:
+#define pdp_addr_end(addr, end) \
+({ unsigned long __boundary = \
+ ((addr) + GEN8_PDPE_SIZE) & GEN8_PDPE_SIZE_MASK; \
+ (__boundary < (end)) ? __boundary : (end); \
+})
-:134: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'end' - possible side-effects? #134: FILE: drivers/gpu/drm/i915/gvt/gtt.c:2889:
+#define pd_addr_end(addr, end) \
+({ unsigned long __boundary = \
+ ((addr) + GEN8_PDE_SIZE) & GEN8_PDE_SIZE_MASK; \
+ (__boundary < (end)) ? __boundary : (end); \
+})
-:147: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #147: FILE: drivers/gpu/drm/i915/gvt/gtt.c:2902:
+static int walk_pt_range(struct intel_vgpu *vgpu, u64 pt,
+ u64 start, u64 end, struct ppgtt_walk *walk)
-:160: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #160: FILE: drivers/gpu/drm/i915/gvt/gtt.c:2915:
+ ret = intel_gvt_hypervisor_read_gpa(vgpu,
+ (pt & PAGE_MASK) + (start_index << info->gtt_entry_size_shift),
-:181: CHECK:LINE_SPACING: Please don't use multiple blank lines #181: FILE: drivers/gpu/drm/i915/gvt/gtt.c:2936:
+
+
-:183: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #183: FILE: drivers/gpu/drm/i915/gvt/gtt.c:2938:
+static int walk_pd_range(struct intel_vgpu *vgpu, u64 pd,
+ u64 start, u64 end, struct ppgtt_walk *walk)
-:195: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #195: FILE: drivers/gpu/drm/i915/gvt/gtt.c:2950:
+ ret = intel_gvt_hypervisor_read_gpa(vgpu,
+ (pd & PAGE_MASK) + (index <<
-:208: CHECK:LINE_SPACING: Please don't use multiple blank lines #208: FILE: drivers/gpu/drm/i915/gvt/gtt.c:2963:
+
+
-:210: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #210: FILE: drivers/gpu/drm/i915/gvt/gtt.c:2965:
+static int walk_pdp_range(struct intel_vgpu *vgpu, u64 pdp,
+ u64 start, u64 end, struct ppgtt_walk *walk)
-:222: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #222: FILE: drivers/gpu/drm/i915/gvt/gtt.c:2977:
+ ret = intel_gvt_hypervisor_read_gpa(vgpu,
+ (pdp & PAGE_MASK) + (index <<
-:234: CHECK:LINE_SPACING: Please don't use multiple blank lines #234: FILE: drivers/gpu/drm/i915/gvt/gtt.c:2989:
+
+
-:236: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #236: FILE: drivers/gpu/drm/i915/gvt/gtt.c:2991:
+static int walk_pml4_range(struct intel_vgpu *vgpu, u64 pml4,
+ u64 start, u64 end, struct ppgtt_walk *walk)
-:247: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #247: FILE: drivers/gpu/drm/i915/gvt/gtt.c:3002:
+ ret = intel_gvt_hypervisor_read_gpa(vgpu,
+ (pml4 & PAGE_MASK) + (index <<
-:260: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #260: FILE: drivers/gpu/drm/i915/gvt/gtt.c:3015:
+static int intel_vgpu_pv_ppgtt_insert_4lvl(struct intel_vgpu *vgpu,
+ struct intel_vgpu_mm *mm,
-:278: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #278: FILE: drivers/gpu/drm/i915/gvt/gtt.c:3033:
+ walk.mfns = kmalloc_array(num_pages,
+ sizeof(unsigned long), GFP_KERNEL);
-:323: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #323: FILE: drivers/gpu/drm/i915/gvt/gtt.c:3078:
+int intel_vgpu_handle_pv_ppgtt_update(struct intel_vgpu *vgpu,
+ u32 action, struct pv_ppgtt_update *pv_ppgtt)
-:355: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #355: FILE: drivers/gpu/drm/i915/gvt/gtt.c:3110:
+ ret = intel_vgpu_pv_ppgtt_insert_4lvl(vgpu, mm,
+ pdp, start, length, cache_level);
-:394: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #394: FILE: drivers/gpu/drm/i915/gvt/gtt.h:291:
+int intel_vgpu_handle_pv_ppgtt_update(struct intel_vgpu *vgpu,
+ u32 action, struct pv_ppgtt_update *pv_ppgtt);
-:404: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'vgpu' - possible side-effects? #404: FILE: drivers/gpu/drm/i915/gvt/gvt.h:56:
+#define VGPU_PVCAP(vgpu, cap) \
+ ((vgpu_vreg_t(vgpu, vgtif_reg(pv_caps)) & (cap)) \
+ && vgpu->shared_page_enabled)
-:406: CHECK:LOGICAL_CONTINUATIONS: Logical continuations should be on the previous line #406: FILE: drivers/gpu/drm/i915/gvt/gvt.h:58:
+ ((vgpu_vreg_t(vgpu, vgtif_reg(pv_caps)) & (cap)) \
+ && vgpu->shared_page_enabled)
-:430: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #430: FILE: drivers/gpu/drm/i915/gvt/handlers.c:1223:
+static int fetch_pv_command_buffer(struct intel_vgpu *vgpu,
+ struct vgpu_pv_ct_buffer_desc *desc,
-:451: CHECK:SPACING: spaces preferred around that '/' (ctx:VxV) #451: FILE: drivers/gpu/drm/i915/gvt/handlers.c:1244:
+ head = desc->head/4;
^
-:452: CHECK:SPACING: spaces preferred around that '/' (ctx:VxV) #452: FILE: drivers/gpu/drm/i915/gvt/handlers.c:1245:
+ tail = desc->tail/4;
^
-:453: CHECK:SPACING: spaces preferred around that '/' (ctx:VxV) #453: FILE: drivers/gpu/drm/i915/gvt/handlers.c:1246:
+ size = desc->size/4;
^
-:497: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #497: FILE: drivers/gpu/drm/i915/gvt/handlers.c:1290:
+ ret = intel_gvt_read_shared_page(vgpu, off, &data[avail],
+ (len - avail) * 4);
-:536: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #536: FILE: drivers/gpu/drm/i915/gvt/handlers.c:1329:
+ ret = intel_gvt_write_shared_page(vgpu, PV_DESC_OFF,
+ &desc, sizeof(desc));
total: 0 errors, 0 warnings, 28 checks, 521 lines checked 67bbc55025bd drm/i915/gvt: GVTg support context submission pv optimization -:72: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #72: FILE: drivers/gpu/drm/i915/gvt/handlers.c:1826:
+ if (intel_gvt_read_shared_page(vgpu, desc_off,
+ &execlist->elsp_dwords.data, 16))
-:93: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #93: FILE: drivers/gpu/drm/i915/gvt/handlers.c:1850:
+ if (VGPU_PVCAP(vgpu, PV_SUBMISSION) &&
+ data == PV_ACTION_ELSP_SUBMISSION)
total: 0 errors, 0 warnings, 2 checks, 69 lines checked
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.SPARSE: warning for i915 vgpu PV to improve vgpu performance
In reply to Xiaolin Zhang== Series Details ==
== Series Details ==
Series: i915 vgpu PV to improve vgpu performance
URL : https://patchwork.freedesktop.org/series/64041/
State : warning
== Summary ==
$ dim sparse origin/drm-tip Sparse version: v0.5.2 Commit: drm/i915: introduced vgpu pv capability Okay!
Commit: drm/i915: vgpu shared memory setup for pv optimization Okay!
Commit: drm/i915: vgpu pv command buffer support
Okay!
Commit: drm/i915: vgpu ppgtt update pv optimization Okay!
Commit: drm/i915: vgpu context submission pv optimization+./include/uapi/linux/perf_event.h:147:56: warning: cast truncates bits from constant value (8000000000000000 becomes 0)
Commit: drm/i915/gvt: GVTg handle pv_caps PVINFO register Okay!
Commit: drm/i915/gvt: GVTg handle shared_page setup Okay!
Commit: drm/i915/gvt: GVTg support ppgtt pv optimization +./include/linux/slab.h:672:13: error: undefined identifier '__builtin_mul_overflow' +./include/linux/slab.h:672:13: warning: call with no type!
Commit: drm/i915/gvt: GVTg support context submission pv optimization Okay!
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for i915 vgpu PV to improve vgpu performance
In reply to Xiaolin Zhang== Series Details ==
== Series Details ==
Series: i915 vgpu PV to improve vgpu performance
URL : https://patchwork.freedesktop.org/series/64041/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6535 -> Patchwork_13718
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13718/
Known issues
------------
Here are the changes found in Patchwork_13718 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_suspend@basic-s3:
- fi-blb-e6850: [PASS][1] -> [INCOMPLETE][2] ([fdo#107718])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6535/fi-blb-e6850/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13718/fi-blb-e6850/igt@[email protected]
* igt@i915_selftest@live_execlists:
- fi-icl-guc: [PASS][3] -> [INCOMPLETE][4] ([fdo#107713])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6535/fi-icl-guc/igt@i915_selftest@live_execlists.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13718/fi-icl-guc/igt@i915_selftest@live_execlists.html
#### Possible fixes ####
* igt@i915_module_load@reload-no-display:
- fi-icl-u3: [DMESG-WARN][5] ([fdo#107724]) -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6535/fi-icl-u3/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13718/fi-icl-u3/igt@[email protected]
* igt@i915_selftest@live_hangcheck:
- fi-kbl-guc: [INCOMPLETE][7] ([fdo#108744]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6535/fi-kbl-guc/igt@i915_selftest@live_hangcheck.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13718/fi-kbl-guc/igt@i915_selftest@live_hangcheck.html
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#108744]: https://bugs.freedesktop.org/show_bug.cgi?id=108744
Participating hosts (53 -> 46)
------------------------------
Additional (2): fi-hsw-peppy fi-icl-dsi
Missing (9): fi-kbl-soraka fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-cfl-8109u fi-icl-y fi-byt-clapper fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_6535 -> Patchwork_13718
CI_DRM_6535: ec297a234e92aa258bba523320898f408d0cf147 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5107: 1a5b48671e0863cb723e3d0239e54c828360dc99 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13718: 67bbc55025bd76f63e07cdfa53f314490513ca23 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
67bbc55025bd drm/i915/gvt: GVTg support context submission pv optimization 040d02e6598f drm/i915/gvt: GVTg support ppgtt pv optimization a75d9802874e drm/i915/gvt: GVTg handle shared_page setup 64c18e7a7577 drm/i915/gvt: GVTg handle pv_caps PVINFO register 2231819849bb drm/i915: vgpu context submission pv optimization bc18f11d883b drm/i915: vgpu ppgtt update pv optimization abd7ac8eb46a drm/i915: vgpu pv command buffer support 75aa49617e8c drm/i915: vgpu shared memory setup for pv optimization 966d9464feed drm/i915: introduced vgpu pv capability
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13718/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v8 1/9 drm/i915: introduced vgpu pv capability
In reply to Xiaolin Zhangpv capability for vgpu was introduced by pv_caps in struct i915_virtual_gpu and a new pv_caps register for host GVT was defined in struct vgt_if for vgpu pv optimization.
both of them are used to control different feature pv optimization supported and implemented by both guest and host.
These fields are default zero, no any pv feature enabled.
it also adds VGT_CAPS_PV capability BIT for guest to check GVTg can support PV feature or not.
v0: RFC, introudced enable_pvmmio module parameter.
v1: addressed RFC comment to remove enable_pvmmio module parameter by pv capability check.
v2: rebase.
v3: distinct pv caps from guest and host. renamed enable_pvmmio to pvmmio_caps which is used for host pv caps.
v4: consolidated all pv related functons into a single file i915_vgpu.c and renamed pvmmio to pv_caps.
v5: rebase.
v6: rebase.
v7: rebase.
--- drivers/gpu/drm/i915/i915_drv.h | 2 ++ drivers/gpu/drm/i915/i915_pvinfo.h | 5 ++++- drivers/gpu/drm/i915/i915_vgpu.c | 44 +++++++++++++++++++++++++++++++++++++- drivers/gpu/drm/i915/i915_vgpu.h | 9 ++++++++ 4 files changed, 58 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +2 -0
@@ -93,6 +93,7 @@#include "i915_vma.h" #include "intel_gvt.h" +#include "i915_pvinfo.h" /* General customization: */
@@ -1078,6 +1079,7 @@ struct i915_frontbuffer_tracking {struct i915_virtual_gpu {bool active;u32 caps; +u32 pv_caps; };/* used in computing the new watermarks state */
drivers/gpu/drm/i915/i915_pvinfo.h +4 -1
@@ -57,6 +57,7 @@ enum vgt_g2v_type {#define VGT_CAPS_FULL_PPGTT BIT(2)#define VGT_CAPS_HWSP_EMULATION BIT(3)#define VGT_CAPS_HUGE_GTT BIT(4) +#define VGT_CAPS_PV BIT(5)struct vgt_if {u64 magic;/* VGT_MAGIC */
@@ -109,7 +110,9 @@ struct vgt_if {u32 execlist_context_descriptor_lo;u32 execlist_context_descriptor_hi; -u32 rsv7[0x200 -24 ];/* pad to one page */ +u32 pv_caps; + +u32 rsv7[0x200 -25 ];/* pad to one page */ } __packed;#define vgtif_offset (x) (offsetof(struct vgt_if, x))
drivers/gpu/drm/i915/i915_vgpu.c +43 -1
53 lines not on this page · raw message
drivers/gpu/drm/i915/i915_vgpu.h +9 -0
@@ -43,7 +43,16 @@ return dev_priv->vgpu.caps & VGT_CAPS_HUGE_GTT; } +static inline bool +intel_vgpu_has_pv_caps (struct drm_i915_private *dev_priv) +{ +return dev_priv->vgpu.caps &VGT_CAPS_PV ; +} +int intel_vgt_balloon (struct i915_ggtt *ggtt);void intel_vgt_deballoon (struct i915_ggtt *ggtt); +/* i915 vgpu pv related functions */ +bool intel_vgpu_check_pv_caps (struct drm_i915_private *dev_priv, +void __iomem *shared_area);#endif /* _I915_VGPU_H_ */
Signature · 6 lines
1.8.3.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v8 1/9] drm/i915: introduced vgpu pv capability
Quoting Xiaolin Zhang (2019-07-23 12:31:56)
Quoted 7 lines
drivers/gpu/drm/i915/i915_vgpu.c +0
-0@@ -95,7 +95,14 @@ void i915_detect_vgpu(struct drm_i915_private *dev_priv) dev_priv->vgpu.caps =readl (shared_area +vgtif_offset (vgt_caps));
drivers/gpu/drm/i915/i915_vgpu.c void i915_detect_vgpu(struct drm_i915_private *dev_priv) · line 105
Quoted 10 lines
drivers/gpu/drm/i915/i915_vgpu.c +8
-1dev_priv->vgpu.active = true; -DRM_INFO ("Virtual GPU for Intel GVT-g detected.\n" ); + +if (!intel_vgpu_check_pv_caps (dev_priv, shared_area)) { +DRM_INFO ("Virtual GPU for Intel GVT-g detected.\n" ); +return ; + } + +DRM_INFO ("Virtual GPU for Intel GVT-g detected with pv_caps 0x%x.\n" , + dev_priv->vgpu.pv_caps);
This is a user-facing message, avoid using any jargon. Instead of pv_caps:%x, expand it to a set of strings if you think it's important for the user to know. It's probably not! But you probably want to include the caps in debugfs/i915_capabilities.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v8 1/9] drm/i915: introduced vgpu pv capability
Quoted 8 lines · Chris Wilson
Quoting Xiaolin Zhang (2019-07-23 12:31:56)
Quoted 7 lines
drivers/gpu/drm/i915/i915_vgpu.c +0
-0@@ -95,7 +95,14 @@ void i915_detect_vgpu(struct drm_i915_private *dev_priv) dev_priv->vgpu.caps =readl (shared_area +vgtif_offset (vgt_caps));
Quoted 16 lines
drivers/gpu/drm/i915/i915_vgpu.c void i915_detect_vgpu(struct drm_i915_private *dev_priv) · line 105
Quoted 10 lines
drivers/gpu/drm/i915/i915_vgpu.c +8
-1dev_priv->vgpu.active = true; -DRM_INFO ("Virtual GPU for Intel GVT-g detected.\n" ); + +if (!intel_vgpu_check_pv_caps (dev_priv, shared_area)) { +DRM_INFO ("Virtual GPU for Intel GVT-g detected.\n" ); +return ; + } + +DRM_INFO ("Virtual GPU for Intel GVT-g detected with pv_caps 0x%x.\n" , + dev_priv->vgpu.pv_caps);This is a user-facing message, avoid using any jargon. Instead of pv_caps:%x, expand it to a set of strings if you think it's important for the user to know. It's probably not! But you probably want to include the caps in debugfs/i915_capabilities.
-Chris
Chris, thanks your time to review and it is good point.
I will polish the message like this "xxx GVT-g detected with PV Optimizations."
and will include the pv caps in debugfs/i915_capabilities. do you think is it better?
-BRs, Xiaolin
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v8 2/9 drm/i915: vgpu shared memory setup for pv optimization
In reply to Xiaolin ZhangTo enable vgpu pv features, we need to setup a shared memory page which will be used for data exchange directly accessed between both guest and backend i915 driver to avoid emulation trap cost.
guest i915 will allocate this page memory and then pass it's physical address to backend i915 driver through PVINFO register so that backend i915 driver can access this shared page meory without any trap cost with the help form hyperviser's read guest gpa functionality.
guest i915 will send VGT_G2V_SHARED_PAGE_SETUP notification to host GVT once shared memory setup finished.
the layout of the shared_page also defined as well in this patch which is used for pv features implementation.
v0: RFC.
v1: addressed RFC comment to move both shared_page_lock and shared_page to i915_virtual_gpu structure.
v2: packed i915_virtual_gpu structure.
v3: added SHARED_PAGE_SETUP g2v notification for pv shared_page setup
v4: added intel_vgpu_setup_shared_page() in i915_vgpu_pv.c.
v5: per engine desc data in shared memory.
v6: added version support in shared memory (Zhenyu).
v7: rebase.
--- drivers/gpu/drm/i915/i915_drv.h | 4 +- drivers/gpu/drm/i915/i915_pvinfo.h | 5 ++- drivers/gpu/drm/i915/i915_vgpu.c | 85 ++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/i915_vgpu.h | 17 ++++++++ 4 files changed, 109 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +3 -1
@@ -1080,7 +1080,9 @@ struct i915_virtual_gpu {bool active;u32 caps;u32 pv_caps; -}; + +struct i915_virtual_gpu_pv *pv; +} __packed;/* used in computing the new watermarks state */ struct intel_wm_config {
drivers/gpu/drm/i915/i915_pvinfo.h +4 -1
@@ -48,6 +48,7 @@ enum vgt_g2v_type {VGT_G2V_PPGTT_L4_PAGE_TABLE_DESTROY ,VGT_G2V_EXECLIST_CONTEXT_CREATE ,VGT_G2V_EXECLIST_CONTEXT_DESTROY , +VGT_G2V_SHARED_PAGE_SETUP , VGT_G2V_MAX, };
@@ -112,7 +113,9 @@ struct vgt_if {u32 pv_caps; -u32 rsv7[0x200 -25 ];/* pad to one page */ +u64 shared_page_gpa; + +u32 rsv7[0x200 -27 ];/* pad to one page */ } __packed;#define vgtif_offset (x) (offsetof(struct vgt_if, x))
drivers/gpu/drm/i915/i915_vgpu.c +85 -0
108 lines not on this page · raw message
drivers/gpu/drm/i915/i915_vgpu.h +17 -0
@@ -27,6 +27,23 @@#include "i915_drv.h" #include "i915_pvinfo.h" +#define PV_MAJOR 1 +#define PV_MINOR 0 + +/* +* A shared page(4KB) between gvt and VM, could be allocated by guest driver +* or a fixed location in PCI bar 0 region +*/ +struct gvt_shared_page { +u16 ver_major; +u16 ver_minor; +}; + +struct i915_virtual_gpu_pv { +struct gvt_shared_page *shared_page; +bool enabled; +}; +void i915_detect_vgpu (struct drm_i915_private *dev_priv);bool intel_vgpu_has_full_ppgtt (struct drm_i915_private *dev_priv);
Signature · 6 lines
1.8.3.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v8 2/9] drm/i915: vgpu shared memory setup for pv optimization
Quoting Xiaolin Zhang (2019-07-23 12:31:57)
Quoted 76 lines
To enable vgpu pv features, we need to setup a shared memory page which will be used for data exchange directly accessed between both guest and backend i915 driver to avoid emulation trap cost.
guest i915 will allocate this page memory and then pass it's physical address to backend i915 driver through PVINFO register so that backend i915 driver can access this shared page meory without any trap cost with the help form hyperviser's read guest gpa functionality.
guest i915 will send
VGT_G2V_SHARED_PAGE_SETUPnotification to host GVT once shared memory setup finished.the layout of the
shared_pagealso defined as well in this patch which is used for pv features implementation.v0: RFC.
v1: addressed RFC comment to move bothshared_page_lockandshared_pagetoi915_virtual_gpustructure.
v2: packedi915_virtual_gpustructure.
v3: addedSHARED_PAGE_SETUPg2v notification for pvshared_pagesetup
v4: addedintel_vgpu_setup_shared_page()ini915_vgpu_pv.c.
v5: per engine desc data in shared memory.
v6: added version support in shared memory (Zhenyu).
v7: rebase.Signed-off-by Xiaolin Zhang <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 4 +- drivers/gpu/drm/i915/i915_pvinfo.h | 5 ++- drivers/gpu/drm/i915/i915_vgpu.c | 85 ++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/i915_vgpu.h | 17 ++++++++ 4 files changed, 109 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/i915_drv.h +3
-1@@ -1080,7 +1080,9 @@ struct i915_virtual_gpu {bool active;u32 caps;u32 pv_caps; -}; + +struct i915_virtual_gpu_pv *pv; +} __packed;/* used in computing the new watermarks state */ struct intel_wm_config {drivers/gpu/drm/i915/i915_pvinfo.h +4
-1@@ -48,6 +48,7 @@ enum vgt_g2v_type {VGT_G2V_PPGTT_L4_PAGE_TABLE_DESTROY ,VGT_G2V_EXECLIST_CONTEXT_CREATE ,VGT_G2V_EXECLIST_CONTEXT_DESTROY , +VGT_G2V_SHARED_PAGE_SETUP , VGT_G2V_MAX, };@@ -112,7 +113,9 @@ struct vgt_if {u32 pv_caps; -u32 rsv7[0x200 -25 ];/* pad to one page */ +u64 shared_page_gpa; + +u32 rsv7[0x200 -27 ];/* pad to one page */ } __packed;#define vgtif_offset (x) (offsetof(struct vgt_if, x))drivers/gpu/drm/i915/i915_vgpu.c +0
-0
drivers/gpu/drm/i915/i915_vgpu.c static void vgt_deballoon_space(struct i915_ggtt *ggtt, · line 146
Quoted 2 lines
drivers/gpu/drm/i915/i915_vgpu.c +0
-0@@ -145,6 +145,7 @@ static void vgt_deballoon_space(struct i915_ggtt *ggtt,*/ void intel_vgt_deballoon (struct i915_ggtt *ggtt)
This addendum is nothing to do with the i915_ggtt cleanup.
drivers/gpu/drm/i915/i915_vgpu.c void intel_vgt_deballoon(struct i915_ggtt *ggtt) · line 160
Quoted 12 lines
drivers/gpu/drm/i915/i915_vgpu.c +4
-0{ +struct drm_i915_private *i915 = ggtt->vm.i915;int i;if (!intel_vgpu_active (ggtt->vm.i915))@@ -154,6 +155,9 @@ void intel_vgt_deballoon(struct i915_ggtt *ggtt)for (i =0 ; i <4 ; i++)vgt_deballoon_space (ggtt, &bl_info.space[i]); + +if (i915->vgpu.pv) +free_page ((unsigned long )i915->vgpu.pv->shared_page);
__free_page(shared_page);
Quoted 34 lines
drivers/gpu/drm/i915/i915_vgpu.c +27
-0} static int vgt_balloon_space(struct i915_ggtt *ggtt,@@ -309,6 +313,81 @@ int intel_vgt_balloon(struct i915_ggtt *ggtt)* i915 vgpu PV support for Linux */ +/* +* shared_page setup for VGPU PV features +*/ +static int intel_vgpu_setup_shared_page (struct drm_i915_private *dev_priv, +void __iomem *shared_area) +{ +void __iomem *addr; +struct i915_virtual_gpu_pv *pv; +struct gvt_shared_page *base; +u64 gpa; +u16 ver_maj, ver_min; + +/* We allocate 1 page shared between guest and GVT for data exchange. +* ___________..................... +* |head | | +* |___________|.................. PAGE/8 +* |PV ELSP | +* :___________....................PAGE/4 +* |desc (SEND) | +* | | +* :_______________________________PAGE/2 +* |cmds (SEND) | +* | | +* | | +* | | +* | | +* |_______________________________|
drivers/gpu/drm/i915/i915_vgpu.c int intel_vgt_balloon(struct i915_ggtt *ggtt) · line 352
Quoted 10 lines
drivers/gpu/drm/i915/i915_vgpu.c +10
-0+* +* 0 offset: PV version area +* PAGE/8 offset: per engine workload submission data area +* PAGE/4 offset: PV command buffer command descriptor area +* PAGE/2 offset: PV command buffer command data area +*/ + + base = (struct gvt_shared_page *)get_zeroed_page (GFP_KERNEL ); +if (!base) { +DRM_INFO ("out of memory for shared page memory\n" );
DRM_INFO is for providing the user with useful information; not dropping debug messages. If you do want to address the user, I'd recommend dev_info
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v8 2/9] drm/i915: vgpu shared memory setup for pv optimization
Quoted 88 lines · Chris Wilson
Quoting Xiaolin Zhang (2019-07-23 12:31:57)
Quoted 76 lines
To enable vgpu pv features, we need to setup a shared memory page which will be used for data exchange directly accessed between both guest and backend i915 driver to avoid emulation trap cost.
guest i915 will allocate this page memory and then pass it's physical address to backend i915 driver through PVINFO register so that backend i915 driver can access this shared page meory without any trap cost with the help form hyperviser's read guest gpa functionality.
guest i915 will send
VGT_G2V_SHARED_PAGE_SETUPnotification to host GVT once shared memory setup finished.the layout of the
shared_pagealso defined as well in this patch which is used for pv features implementation.v0: RFC.
v1: addressed RFC comment to move bothshared_page_lockandshared_pagetoi915_virtual_gpustructure.
v2: packedi915_virtual_gpustructure.
v3: addedSHARED_PAGE_SETUPg2v notification for pvshared_pagesetup
v4: addedintel_vgpu_setup_shared_page()ini915_vgpu_pv.c.
v5: per engine desc data in shared memory.
v6: added version support in shared memory (Zhenyu).
v7: rebase.Signed-off-by Xiaolin Zhang <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 4 +- drivers/gpu/drm/i915/i915_pvinfo.h | 5 ++- drivers/gpu/drm/i915/i915_vgpu.c | 85 ++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/i915_vgpu.h | 17 ++++++++ 4 files changed, 109 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/i915_drv.h +3
-1@@ -1080,7 +1080,9 @@ struct i915_virtual_gpu {bool active;u32 caps;u32 pv_caps; -}; + +struct i915_virtual_gpu_pv *pv; +} __packed;/* used in computing the new watermarks state */ struct intel_wm_config {drivers/gpu/drm/i915/i915_pvinfo.h +4
-1@@ -48,6 +48,7 @@ enum vgt_g2v_type {VGT_G2V_PPGTT_L4_PAGE_TABLE_DESTROY ,VGT_G2V_EXECLIST_CONTEXT_CREATE ,VGT_G2V_EXECLIST_CONTEXT_DESTROY , +VGT_G2V_SHARED_PAGE_SETUP , VGT_G2V_MAX, };@@ -112,7 +113,9 @@ struct vgt_if {u32 pv_caps; -u32 rsv7[0x200 -25 ];/* pad to one page */ +u64 shared_page_gpa; + +u32 rsv7[0x200 -27 ];/* pad to one page */ } __packed;#define vgtif_offset (x) (offsetof(struct vgt_if, x))drivers/gpu/drm/i915/i915_vgpu.c +0
-0drivers/gpu/drm/i915/i915_vgpu.c static void vgt_deballoon_space(struct i915_ggtt *ggtt, · line 146
Quoted 2 lines
drivers/gpu/drm/i915/i915_vgpu.c +0
-0@@ -145,6 +145,7 @@ static void vgt_deballoon_space(struct i915_ggtt *ggtt,*/ void intel_vgt_deballoon (struct i915_ggtt *ggtt)This addendum is nothing to do with the
i915_ggttcleanup.Quoted 7 lines
drivers/gpu/drm/i915/i915_vgpu.c +1
-0{ +struct drm_i915_private *i915 = ggtt->vm.i915;int i;if (!intel_vgpu_active (ggtt->vm.i915))@@ -154,6 +155,9 @@ void intel_vgt_deballoon(struct i915_ggtt *ggtt)
Quoted 6 lines
drivers/gpu/drm/i915/i915_vgpu.c void intel_vgt_deballoon(struct i915_ggtt *ggtt) · line 160
Quoted 5 lines
drivers/gpu/drm/i915/i915_vgpu.c +3
-0for (i =0 ; i <4 ; i++)vgt_deballoon_space (ggtt, &bl_info.space[i]); + +if (i915->vgpu.pv) +free_page ((unsigned long )i915->vgpu.pv->shared_page);
__free_page(shared_page);
Thanks, will change this and move to another place in next revision. -BRs, Xiaolin
Quoted 41 lines
Quoted 41 lines
drivers/gpu/drm/i915/i915_vgpu.c +33
-0} static int vgt_balloon_space(struct i915_ggtt *ggtt,@@ -309,6 +313,81 @@ int intel_vgt_balloon(struct i915_ggtt *ggtt)* i915 vgpu PV support for Linux */ +/* +* shared_page setup for VGPU PV features +*/ +static int intel_vgpu_setup_shared_page (struct drm_i915_private *dev_priv, +void __iomem *shared_area) +{ +void __iomem *addr; +struct i915_virtual_gpu_pv *pv; +struct gvt_shared_page *base; +u64 gpa; +u16 ver_maj, ver_min; + +/* We allocate 1 page shared between guest and GVT for data exchange. +* ___________..................... +* |head | | +* |___________|.................. PAGE/8 +* |PV ELSP | +* :___________....................PAGE/4 +* |desc (SEND) | +* | | +* :_______________________________PAGE/2 +* |cmds (SEND) | +* | | +* | | +* | | +* | | +* |_______________________________| +* +* 0 offset: PV version area +* PAGE/8 offset: per engine workload submission data area +* PAGE/4 offset: PV command buffer command descriptor area +* PAGE/2 offset: PV command buffer command data area +*/
Quoted 8 lines
drivers/gpu/drm/i915/i915_vgpu.c int intel_vgt_balloon(struct i915_ggtt *ggtt) · line 352
Quoted 4 lines
drivers/gpu/drm/i915/i915_vgpu.c +4
-0+ + base = (struct gvt_shared_page *)get_zeroed_page (GFP_KERNEL ); +if (!base) { +DRM_INFO ("out of memory for shared page memory\n" );
DRM_INFOis for providing the user with useful information; not dropping debug messages. If you do want to address the user, I'd recommenddev_info
-Chris
thanks, will change this next revision.
-BRs, Xiaolin
Quoted 4 lines
_______________________________________________
intel-gvt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gvt-dev
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v8 3/9 drm/i915: vgpu pv command buffer support
In reply to Xiaolin Zhangbased on the shared memory setup between guest and GVT, the simple pv command buffer ring was introduced by this patch used to perform guest-2-gvt single direction communication.
v1: initial support, added to address i915 PV v6 patch set comment.
--- drivers/gpu/drm/i915/i915_pvinfo.h | 1 + drivers/gpu/drm/i915/i915_vgpu.c | 193 +++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/i915_vgpu.h | 66 +++++++++++++ 3 files changed, 260 insertions(+)
drivers/gpu/drm/i915/i915_pvinfo.h +1 -0
@@ -49,6 +49,7 @@ enum vgt_g2v_type {VGT_G2V_EXECLIST_CONTEXT_CREATE ,VGT_G2V_EXECLIST_CONTEXT_DESTROY ,VGT_G2V_SHARED_PAGE_SETUP , +VGT_G2V_PV_SEND_TRIGGER , VGT_G2V_MAX, };
drivers/gpu/drm/i915/i915_vgpu.c +193 -0
205 lines not on this page · raw message
drivers/gpu/drm/i915/i915_vgpu.h +66 -0
87 lines not on this page · raw message
Signature · 6 lines
1.8.3.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v8 4/9 drm/i915: vgpu ppgtt update pv optimization
In reply to Xiaolin ZhangThis patch extends vgpu ppgtt g2v notification to notify host GVT-g of ppgtt update from guest including alloc_4lvl, clear_4lv4 and insert_4lvl.
These updates use the shared memory page to pass struct pv_ppgtt_update from guest to GVT which is used for pv optimiation implemeation within host GVT side.
This patch also add one new pv_caps level to control ppgtt update.
Use PV_PPGTT_UPDATE to control this level of pv optimization.
v0: RFC.
v1: rebased.
v2: added pv callbacks for vm.{allocate_va_range, insert_entries, clear_range} within ppgtt.
v3: rebased, disable huge page ppgtt support when using PVMMIO ppgtt update due to complex and performance impact.
v4: moved alloc/insert/clear_4lvl pv callbacks into i915_vgpu_pv.c and added a single intel_vgpu_config_pv_caps() for vgpu pv callbacks setup.
v5: rebase.
v6: rebase.
v7: rebase.
--- drivers/gpu/drm/i915/i915_gem.c | 3 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 10 +++-- drivers/gpu/drm/i915/i915_gem_gtt.h | 8 ++++ drivers/gpu/drm/i915/i915_vgpu.c | 79 +++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/i915_vgpu.h | 25 ++++++++++++ 5 files changed, 120 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/i915_gem.c +2 -1
@@ -1419,7 +1419,8 @@ int i915_gem_init(struct drm_i915_private *dev_priv)int ret;/* We need to fallback to 4K pages if host doesn't support huge gtt. */ -if (intel_vgpu_active (dev_priv) && !intel_vgpu_has_huge_gtt (dev_priv)) +if ((intel_vgpu_active (dev_priv) && !intel_vgpu_has_huge_gtt (dev_priv)) + ||intel_vgpu_enabled_pv_caps (dev_priv,PV_PPGTT_UPDATE ))mkwrite_device_info (dev_priv)->page_sizes =I915_GTT_PAGE_SIZE_4K ;
drivers/gpu/drm/i915/i915_gem_gtt.c +6 -4
@@ -997,7 +997,7 @@ static u64 __gen8_ppgtt_clear(struct i915_address_space * const vm,return start; } -static void gen8_ppgtt_clear (struct i915_address_space *vm, +void gen8_ppgtt_clear (struct i915_address_space *vm,u64 start,u64 length) {GEM_BUG_ON (!IS_ALIGNED (start,BIT_ULL (GEN8_PTE_SHIFT )));
@@ -1104,7 +1104,7 @@ static int __gen8_ppgtt_alloc(struct i915_address_space * const vm,return ret; } -static int gen8_ppgtt_alloc (struct i915_address_space *vm, +int gen8_ppgtt_alloc (struct i915_address_space *vm,u64 start,u64 length) {u64 from;
@@ -1317,7 +1317,7 @@ static void gen8_ppgtt_insert_huge_entries(struct i915_vma *vma, }while (iter->sg); } -static void gen8_ppgtt_insert_4lvl (struct i915_address_space *vm, +void gen8_ppgtt_insert_4lvl (struct i915_address_space *vm,struct i915_vma *vma,enum i915_cache_level cache_level,u32 flags)
@@ -1510,8 +1510,10 @@ static struct i915_ppgtt *gen8_ppgtt_create(struct drm_i915_private *i915) ppgtt->vm.allocate_va_range = gen8_ppgtt_alloc; ppgtt->vm.clear_range = gen8_ppgtt_clear; -if (intel_vgpu_active (i915)) +if (intel_vgpu_active (i915)) { +intel_vgpu_config_pv_caps (i915,PV_PPGTT_UPDATE , ppgtt);gen8_ppgtt_notify_vgt (ppgtt, true); + } ppgtt->vm.cleanup = gen8_ppgtt_cleanup;
drivers/gpu/drm/i915/i915_gem_gtt.h +8 -0
@@ -578,6 +578,14 @@ static inline void i915_vm_put(struct i915_address_space *vm)void gen6_ppgtt_unpin (struct i915_ppgtt *base);void gen6_ppgtt_unpin_all (struct i915_ppgtt *base); +void gen8_ppgtt_clear (struct i915_address_space *vm, +u64 start,u64 length); +void gen8_ppgtt_insert_4lvl (struct i915_address_space *vm, +struct i915_vma *vma, +enum i915_cache_level cache_level,u32 flags); +int gen8_ppgtt_alloc (struct i915_address_space *vm, +u64 start,u64 length); +void i915_gem_suspend_gtt_mappings (struct drm_i915_private *dev_priv);void i915_gem_restore_gtt_mappings (struct drm_i915_private *dev_priv);
drivers/gpu/drm/i915/i915_vgpu.c +79 -0
91 lines not on this page · raw message
drivers/gpu/drm/i915/i915_vgpu.h +25 -0
@@ -33,6 +33,21 @@#define PV_CMD_OFF (PAGE_SIZE/2)/* +* define different capabilities of PV optimization +*/ +enum pv_caps { +PV_PPGTT_UPDATE =0x1 , +}; + +/* PV actions */ +enum intel_vgpu_pv_action { +PV_ACTION_DEFAULT =0x0 , +PV_ACTION_PPGTT_L4_ALLOC , +PV_ACTION_PPGTT_L4_CLEAR , +PV_ACTION_PPGTT_L4_INSERT , +}; + +/* * A shared page(4KB) between gvt and VM, could be allocated by guest driver * or a fixed location in PCI bar 0 region */
@@ -119,6 +134,14 @@ struct i915_virtual_gpu_pv {return dev_priv->vgpu.caps &VGT_CAPS_PV ; } +static inline bool +intel_vgpu_enabled_pv_caps (struct drm_i915_private *dev_priv, +enum pv_caps cap) +{ +return (dev_priv->vgpu.active) &&intel_vgpu_has_pv_caps (dev_priv) + && (dev_priv->vgpu.pv_caps & cap); +} +static inline void intel_vgpu_pv_notify (struct drm_i915_private *dev_priv) {
@@ -138,4 +161,6 @@ struct i915_virtual_gpu_pv {/* i915 vgpu pv related functions */ bool intel_vgpu_check_pv_caps (struct drm_i915_private *dev_priv,void __iomem *shared_area); +void intel_vgpu_config_pv_caps (struct drm_i915_private *dev_priv, +enum pv_caps cap,void *data);#endif /* _I915_VGPU_H_ */
Signature · 6 lines
1.8.3.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v8 5/9 drm/i915: vgpu context submission pv optimization
In reply to Xiaolin ZhangIt is performance optimization to override the actual submisison backend in order to eliminate execlists csb process and reduce mmio trap numbers for workload submission without context switch interrupt by talking with GVT via PV submisison notification mechanism between guest and GVT.
Use PV_SUBMISSION to control this level of pv optimization.
v0: RFC.
v1: rebase.
v2: added pv ops for pv context submission. to maximize code resuse, introduced 2 more ops (submit_ports & preempt_context) instead of 1 op (set_default_submission) in engine structure. pv version of submit_ports and preempt_context implemented.
v3:
1. to reduce more code duplication, code refactor and replaced 2 ops "submit_ports & preempt_contex" from v2 by 1 ops "write_desc" in engine structure. pv version of write_des implemented.
2. added VGT_G2V_ELSP_SUBMIT for g2v pv notification.
v4: implemented pv elsp submission tasklet as the backend workload submisison by talking to GVT with PV notificaiton mechanism and renamed VGT_G2V_ELSP_SUBMIT to VGT_G2V_PV_SUBMISIION.
v5: addressed v4 comments from Chris, intel_pv_submission.c added.
v6: addressed v5 comments from Chris, replaced engine id by hw_id.
v7: rebase.
v8: addressed v7 comments from Chris.
--- drivers/gpu/drm/i915/Makefile | 2 +- drivers/gpu/drm/i915/gt/intel_lrc.c | 12 +- drivers/gpu/drm/i915/i915_vgpu.c | 18 ++- drivers/gpu/drm/i915/i915_vgpu.h | 16 +++ drivers/gpu/drm/i915/intel_pv_submission.c | 187 +++++++++++++++++++++++++++++ 5 files changed, 229 insertions(+), 6 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_pv_submission.c
drivers/gpu/drm/i915/Makefile +1 -1
@@ -245,7 +245,7 @@ i915-$(CONFIG_DRM_I915_SELFTEST) += \ selftests/igt_spinner.o # virtual gpu code -i915-y += i915_vgpu.o +i915-y += i915_vgpu.o intel_pv_submission.o ifeq ($(CONFIG_DRM_I915_GVT),y) i915-y += intel_gvt.o
drivers/gpu/drm/i915/gt/intel_lrc.c +8 -4
@@ -2767,10 +2767,14 @@ void intel_execlists_set_default_submission(struct intel_engine_cs *engine) engine->unpark =NULL ; engine->flags |=I915_ENGINE_SUPPORTS_STATS ; -if (!intel_vgpu_active (engine->i915)) { - engine->flags |=I915_ENGINE_HAS_SEMAPHORES ; -if (HAS_LOGICAL_RING_PREEMPTION (engine->i915)) - engine->flags |=I915_ENGINE_HAS_PREEMPTION ; + engine->flags |=I915_ENGINE_HAS_SEMAPHORES ; +if (HAS_LOGICAL_RING_PREEMPTION (engine->i915)) + engine->flags |=I915_ENGINE_HAS_PREEMPTION ; + +if (intel_vgpu_active (engine->i915)) { + engine->flags &= ~I915_ENGINE_HAS_SEMAPHORES ; + engine->flags &= ~I915_ENGINE_HAS_PREEMPTION ; +intel_vgpu_config_pv_caps (engine->i915,PV_SUBMISSION , engine); } }
drivers/gpu/drm/i915/i915_vgpu.c +17 -1
@@ -97,7 +97,7 @@ void i915_detect_vgpu(struct drm_i915_private *dev_priv) dev_priv->vgpu.active = true;/* guest driver PV capability */ - dev_priv->vgpu.pv_caps =PV_PPGTT_UPDATE ; + dev_priv->vgpu.pv_caps =PV_PPGTT_UPDATE |PV_SUBMISSION ;if (!intel_vgpu_check_pv_caps (dev_priv, shared_area)) {DRM_INFO ("Virtual GPU for Intel GVT-g detected.\n" );
@@ -380,6 +380,7 @@ void intel_vgpu_config_pv_caps(struct drm_i915_private *dev_priv, enum pv_caps cap, void *data) { struct i915_ppgtt *ppgtt; +struct intel_engine_cs *engine;if (!intel_vgpu_enabled_pv_caps (dev_priv, cap))return ;
@@ -390,6 +391,11 @@ void intel_vgpu_config_pv_caps(struct drm_i915_private *dev_priv, ppgtt->vm.insert_entries = gen8_ppgtt_insert_4lvl_pv; ppgtt->vm.clear_range = gen8_ppgtt_clear_4lvl_pv; } + +if (cap ==PV_SUBMISSION ) { + engine = (struct intel_engine_cs *)data; +vgpu_set_pv_submission (engine); + } }/**
@@ -584,6 +590,8 @@ static int intel_vgpu_setup_shared_page(struct drm_i915_private *dev_priv,struct gvt_shared_page *base;u64 gpa;u16 ver_maj, ver_min; +int i; +u32 size;/* We allocate 1 page shared between guest and GVT for data exchange. * ___________.....................
@@ -657,6 +665,14 @@ static int intel_vgpu_setup_shared_page(struct drm_i915_private *dev_priv, pv->notify = intel_vgpu_pv_notify_mmio;mutex_init (&pv->send_mutex); +/* setup PV per engine data exchange structure */ + size =sizeof (struct pv_submission ); +for (i =0 ; i <PV_MAX_ENGINES_NUM ; i++) { + pv->pv_elsp[i] = (void *)base +PV_ELSP_OFF + size * i; + pv->pv_elsp[i]->submitted = false; +spin_lock_init (&pv->pv_elsp[i]->lock); + } +return 0 ; }
drivers/gpu/drm/i915/i915_vgpu.h +16 -0
@@ -29,6 +29,8 @@#define PV_MAJOR 1#define PV_MINOR 0 +#define PV_MAX_ENGINES_NUM (VECS1_HW + 1) +#define PV_ELSP_OFF (PAGE_SIZE/8)#define PV_DESC_OFF (PAGE_SIZE/4)#define PV_CMD_OFF (PAGE_SIZE/2)
@@ -37,6 +39,7 @@*/ enum pv_caps {PV_PPGTT_UPDATE =0x1 , +PV_SUBMISSION =0x2 , };/* PV actions */
@@ -45,6 +48,7 @@ enum intel_vgpu_pv_action {PV_ACTION_PPGTT_L4_ALLOC ,PV_ACTION_PPGTT_L4_CLEAR ,PV_ACTION_PPGTT_L4_INSERT , + PV_ACTION_ELSP_SUBMISSION, };/*
@@ -56,6 +60,13 @@ struct gvt_shared_page {u16 ver_minor; }; +/* workload submission pv support data structure */ +struct pv_submission { +u64 descs[EXECLIST_MAX_PORTS ]; +bool submitted; +spinlock_t lock; +}; +/* * Definition of the command transport message header (DW0) *
@@ -100,6 +111,9 @@ struct i915_virtual_gpu_pv {struct gvt_shared_page *shared_page;bool enabled; +/* per engine PV workload submission data */ +struct pv_submission *pv_elsp[PV_MAX_ENGINES_NUM ]; +/* PV command buffer support */ struct vgpu_pv_ct_buffer ctb;u32 next_fence;
@@ -163,4 +177,6 @@ bool intel_vgpu_check_pv_caps(struct drm_i915_private *dev_priv, void __iomem *shared_area);void intel_vgpu_config_pv_caps (struct drm_i915_private *dev_priv,enum pv_caps cap,void *data); +void vgpu_set_pv_submission (struct intel_engine_cs *engine); +#endif /* _I915_VGPU_H_ */
drivers/gpu/drm/i915/intel_pv_submission.c new file +187 -0
187 lines not on this page · raw message
Signature · 6 lines
1.8.3.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v8 6/9 drm/i915/gvt: GVTg handle pv_caps PVINFO register
In reply to Xiaolin Zhangimplement pv_caps PVINFO register handler in GVTg to control different level pv optimization within guest.
report VGT_CAPS_PV capability in pvinfo page for guest.
v0: RFC.
v1: rebase.
v2: rebase.
v3: renamed enable_pvmmio to pvmmio_caps which is used for host pv caps.
v4: renamed pvmmio_caps to pv_caps.
v5: rebase.
v6: rebase.
v7: rebase.
--- drivers/gpu/drm/i915/gvt/handlers.c | 4 ++++ drivers/gpu/drm/i915/gvt/vgpu.c | 3 +++ 2 files changed, 7 insertions(+)
drivers/gpu/drm/i915/gvt/handlers.c +4 -0
@@ -1194,6 +1194,7 @@ static int pvinfo_mmio_read(struct intel_vgpu *vgpu, unsigned int offset,break ;case 0x78010 :/* vgt_caps */ case 0x7881c : +case _vgtif_reg (pv_caps):break ;default : invalid_read = true;
@@ -1264,6 +1265,9 @@ static int pvinfo_mmio_write(struct intel_vgpu *vgpu, unsigned int offset,case _vgtif_reg (g2v_notify):handle_g2v_notification (vgpu, data);break ; +case _vgtif_reg (pv_caps): +DRM_INFO ("vgpu id=%d pv caps =0x%x\n" , vgpu->id, data); +break ;/* add xhot and yhot to handled list to avoid error log */ case _vgtif_reg (cursor_x_hot):case _vgtif_reg (cursor_y_hot):
drivers/gpu/drm/i915/gvt/vgpu.c +3 -0
@@ -47,6 +47,7 @@ void populate_pvinfo_page(struct intel_vgpu *vgpu)vgpu_vreg_t (vgpu,vgtif_reg (vgt_caps)) =VGT_CAPS_FULL_PPGTT ;vgpu_vreg_t (vgpu,vgtif_reg (vgt_caps)) |=VGT_CAPS_HWSP_EMULATION ;vgpu_vreg_t (vgpu,vgtif_reg (vgt_caps)) |=VGT_CAPS_HUGE_GTT ; +vgpu_vreg_t (vgpu,vgtif_reg (vgt_caps)) |=VGT_CAPS_PV ;vgpu_vreg_t (vgpu,vgtif_reg (avail_rs.mappable_gmadr.base)) =vgpu_aperture_gmadr_base (vgpu);
@@ -531,6 +532,7 @@ void intel_gvt_reset_vgpu_locked(struct intel_vgpu *vgpu, bool dmlr,struct intel_gvt *gvt = vgpu->gvt;struct intel_gvt_workload_scheduler *scheduler = &gvt->scheduler;intel_engine_mask_t resetting_eng = dmlr ?ALL_ENGINES : engine_mask; +int pv_caps =vgpu_vreg_t (vgpu,vgtif_reg (pv_caps));gvt_dbg_core ("------------------------------------------\n" ); gvt_dbg_core("resseting vgpu%d, dmlr %d, engine_mask %08x\n",
@@ -562,6 +564,7 @@ void intel_gvt_reset_vgpu_locked(struct intel_vgpu *vgpu, bool dmlr,intel_vgpu_reset_mmio (vgpu, dmlr);populate_pvinfo_page (vgpu); +vgpu_vreg_t (vgpu,vgtif_reg (pv_caps)) = pv_caps;intel_vgpu_reset_display (vgpu);if (dmlr) {
Signature · 6 lines
1.8.3.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v8 7/9 drm/i915/gvt: GVTg handle shared_page setup
In reply to Xiaolin ZhangGVTg implemented shared_page setup operation and read_shared_page functionality based on hypervisor_read_gpa().
the shared_page_gpa was passed from guest driver through PVINFO shared_page_gpa register.
v0: RFC.
v1: rebase.
v2: rebase.
v3: added shared_page_gpa check and if read_gpa failure, return zero memory and handle VGT_G2V_SHARED_PAGE_SETUP g2v notification
v4: rebase.
v5: rebase.
v6: rebase, added PV version support.
v7: rebase.
--- drivers/gpu/drm/i915/gvt/gvt.h | 8 ++++++- drivers/gpu/drm/i915/gvt/handlers.c | 20 +++++++++++++++++ drivers/gpu/drm/i915/gvt/vgpu.c | 43 +++++++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/gvt/gvt.h +7 -1
@@ -49,6 +49,7 @@#include "fb_decoder.h" #include "dmabuf.h" #include "page_track.h" +#include "i915_vgpu.h" #define GVT_MAX_VGPU 8
@@ -229,6 +230,8 @@ struct intel_vgpu {struct completion vblank_done;u32 scan_nonprivbb; +u64 shared_page_gpa; +bool shared_page_enabled; };/* validating GM healthy status*/
@@ -686,7 +689,10 @@ static inline void intel_gvt_mmio_set_in_ctx(void intel_gvt_debugfs_remove_vgpu (struct intel_vgpu *vgpu);int intel_gvt_debugfs_init (struct intel_gvt *gvt);void intel_gvt_debugfs_clean (struct intel_gvt *gvt); - +int intel_gvt_read_shared_page (struct intel_vgpu *vgpu, +unsigned int offset,void *buf,unsigned long len); +int intel_gvt_write_shared_page (struct intel_vgpu *vgpu, +unsigned int offset,void *buf,unsigned long len);#include "trace.h" #include "mpt.h"
drivers/gpu/drm/i915/gvt/handlers.c +20 -0
@@ -1195,6 +1195,8 @@ static int pvinfo_mmio_read(struct intel_vgpu *vgpu, unsigned int offset,case 0x78010 :/* vgt_caps */ case 0x7881c :case _vgtif_reg (pv_caps): +case _vgtif_reg (shared_page_gpa): +case _vgtif_reg (shared_page_gpa) +4 :break ;default : invalid_read = true;
@@ -1212,6 +1214,9 @@ static int handle_g2v_notification(struct intel_vgpu *vgpu, int notification)enum intel_gvt_gtt_type root_entry_type =GTT_TYPE_PPGTT_ROOT_L4_ENTRY ;struct intel_vgpu_mm *mm;u64 *pdps; +unsigned long gpa, gfn; +u16 ver_major =PV_MAJOR ; +u16 ver_minor =PV_MINOR ; pdps = (u64 *)&vgpu_vreg64_t (vgpu,vgtif_reg (pdp[0 ]));
@@ -1225,6 +1230,19 @@ static int handle_g2v_notification(struct intel_vgpu *vgpu, int notification)case VGT_G2V_PPGTT_L3_PAGE_TABLE_DESTROY :case VGT_G2V_PPGTT_L4_PAGE_TABLE_DESTROY :return intel_vgpu_put_ppgtt_mm (vgpu, pdps); +case VGT_G2V_SHARED_PAGE_SETUP : + gpa =vgpu_vreg64_t (vgpu,vgtif_reg (shared_page_gpa)); + gfn = gpa >>PAGE_SHIFT ; +if (!intel_gvt_hypervisor_is_valid_gfn (vgpu, gfn)) { +vgpu_vreg_t (vgpu,vgtif_reg (pv_caps)) =0 ; +return 0 ; + } + vgpu->shared_page_gpa = gpa; + vgpu->shared_page_enabled = true; + +intel_gvt_write_shared_page (vgpu,0 , &ver_major,2 ); +intel_gvt_write_shared_page (vgpu,2 , &ver_minor,2 ); +break ;case VGT_G2V_EXECLIST_CONTEXT_CREATE :case VGT_G2V_EXECLIST_CONTEXT_DESTROY :case 1 :/* Remove this in guest driver. */
@@ -1281,6 +1299,8 @@ static int pvinfo_mmio_write(struct intel_vgpu *vgpu, unsigned int offset,case _vgtif_reg (pdp[3 ].hi):case _vgtif_reg (execlist_context_descriptor_lo):case _vgtif_reg (execlist_context_descriptor_hi): +case _vgtif_reg (shared_page_gpa): +case _vgtif_reg (shared_page_gpa) +4 :break ; case _vgtif_reg(rsv5[0])..._vgtif_reg(rsv5[3]): invalid_write = true;
drivers/gpu/drm/i915/gvt/vgpu.c +43 -0
52 lines not on this page · raw message
Signature · 6 lines
1.8.3.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v8 8/9 drm/i915/gvt: GVTg support ppgtt pv optimization
In reply to Xiaolin ZhangThis patch handles ppgtt update from g2v notification.
It read out ppgtt pte entries from guest pte tables page and convert them to host pfns.
It creates local ppgtt tables and insert the content pages into the local ppgtt tables directly, which does not track the usage of guest page table and removes the cost of write protection from the original shadow page mechansim.
v0: RFC.
v1: rebase.
v2: rebase.
v3: report pv pggtt cap to guest.
v4: renamed VGPU_PVMMIO with VGPU_PVCAP for name consistance, no PV support if gfx vtd enabled.
v5: rebase.
v6: rebase.
v7: added command transport buffer support.
--- drivers/gpu/drm/i915/gvt/gtt.c | 298 ++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/gvt/gtt.h | 11 ++ drivers/gpu/drm/i915/gvt/gvt.h | 4 + drivers/gpu/drm/i915/gvt/handlers.c | 127 ++++++++++++++- drivers/gpu/drm/i915/gvt/vgpu.c | 2 + 5 files changed, 441 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/gvt/gtt.c +298 -0
@@ -1771,6 +1771,25 @@ static int ppgtt_handle_guest_write_page_table_bytes(return 0 ; } +static void invalidate_mm_pv (struct intel_vgpu_mm *mm) +{ +struct intel_vgpu *vgpu = mm->vgpu; +struct intel_gvt *gvt = vgpu->gvt; +struct intel_gvt_gtt *gtt = &gvt->gtt; +struct intel_gvt_gtt_pte_ops *ops = gtt->pte_ops; +struct intel_gvt_gtt_entry se; + +i915_vm_put (&mm->ppgtt->vm); + +ppgtt_get_shadow_root_entry (mm, &se,0 ); +if (!ops->test_present (&se)) +return ; + se.val64 =0 ; +ppgtt_set_shadow_root_entry (mm, &se,0 ); + + mm->ppgtt_mm.shadowed = false; +} +static void invalidate_ppgtt_mm (struct intel_vgpu_mm *mm) {struct intel_vgpu *vgpu = mm->vgpu;
@@ -1783,6 +1802,11 @@ static void invalidate_ppgtt_mm(struct intel_vgpu_mm *mm)if (!mm->ppgtt_mm.shadowed)return ; +if (VGPU_PVCAP (mm->vgpu,PV_PPGTT_UPDATE )) { +invalidate_mm_pv (mm); +return ; + } +for (index =0 ; index <ARRAY_SIZE (mm->ppgtt_mm.shadow_pdps); index++) {ppgtt_get_shadow_root_entry (mm, &se, index);
@@ -1800,6 +1824,26 @@ static void invalidate_ppgtt_mm(struct intel_vgpu_mm *mm) mm->ppgtt_mm.shadowed = false; } +static int shadow_mm_pv (struct intel_vgpu_mm *mm) +{ +struct intel_vgpu *vgpu = mm->vgpu; +struct intel_gvt *gvt = vgpu->gvt; +struct intel_gvt_gtt_entry se; + + mm->ppgtt =i915_ppgtt_create (gvt->dev_priv); +if (IS_ERR (mm->ppgtt)) { +gvt_vgpu_err ("fail to create ppgtt for pdp 0x%llx\n" , +px_dma (mm->ppgtt->pd)); +return PTR_ERR (mm->ppgtt); + } + + se.type =GTT_TYPE_PPGTT_ROOT_L4_ENTRY ; + se.val64 =px_dma (mm->ppgtt->pd); +ppgtt_set_shadow_root_entry (mm, &se,0 ); + mm->ppgtt_mm.shadowed = true; + +return 0 ; +}static int shadow_ppgtt_mm (struct intel_vgpu_mm *mm) {
@@ -1814,6 +1858,9 @@ static int shadow_ppgtt_mm(struct intel_vgpu_mm *mm)if (mm->ppgtt_mm.shadowed)return 0 ; +if (VGPU_PVCAP (mm->vgpu,PV_PPGTT_UPDATE )) +return shadow_mm_pv (mm); + mm->ppgtt_mm.shadowed = true;for (index =0 ; index <ARRAY_SIZE (mm->ppgtt_mm.guest_pdps); index++) {
@@ -2816,3 +2863,254 @@ void intel_vgpu_reset_gtt(struct intel_vgpu *vgpu)intel_vgpu_destroy_all_ppgtt_mm (vgpu);intel_vgpu_reset_ggtt (vgpu, true); } + +#define GEN8_PDE_SHIFT 21 +#define GEN8_PML4E_SHIFT 39 +#define GEN8_PDPE_SHIFT 30 +#define GEN8_PML4E_SIZE (1UL << GEN8_PML4E_SHIFT) +#define GEN8_PML4E_SIZE_MASK (~(GEN8_PML4E_SIZE - 1)) +#define GEN8_PDPE_SIZE (1UL << GEN8_PDPE_SHIFT) +#define GEN8_PDPE_SIZE_MASK (~(GEN8_PDPE_SIZE - 1)) +#define GEN8_PDE_SIZE (1UL << GEN8_PDE_SHIFT) +#define GEN8_PDE_SIZE_MASK (~(GEN8_PDE_SIZE - 1)) + +#define pml4_addr_end (addr, end) \ +({ unsigned long __boundary = \ + ((addr) + GEN8_PML4E_SIZE) & GEN8_PML4E_SIZE_MASK; \ + (__boundary < (end)) ? __boundary : (end); \ +}) + +#define pdp_addr_end (addr, end) \ +({ unsigned long __boundary = \ + ((addr) + GEN8_PDPE_SIZE) & GEN8_PDPE_SIZE_MASK; \ + (__boundary < (end)) ? __boundary : (end); \ +}) + +#define pd_addr_end (addr, end) \ +({ unsigned long __boundary = \ + ((addr) + GEN8_PDE_SIZE) & GEN8_PDE_SIZE_MASK; \ + (__boundary < (end)) ? __boundary : (end); \ +}) + +struct ppgtt_walk { +unsigned long *mfns; +int mfn_index; +unsigned long *pt; +}; + +static int walk_pt_range (struct intel_vgpu *vgpu,u64 pt, +u64 start,u64 end,struct ppgtt_walk *walk) +{ +const struct intel_gvt_device_info *info = &vgpu->gvt->device_info; +struct intel_gvt_gtt_gma_ops *gma_ops = vgpu->gvt->gtt.gma_ops; +unsigned long start_index, end_index; +int ret; +int i; +unsigned long mfn, gfn; + + start_index = gma_ops->gma_to_pte_index (start); + end_index = ((end - start) >>PAGE_SHIFT ) + start_index; + + ret =intel_gvt_hypervisor_read_gpa (vgpu, + (pt &PAGE_MASK ) + (start_index << info->gtt_entry_size_shift), + walk->pt + start_index, + (end_index - start_index) << info->gtt_entry_size_shift); +if (ret) { +gvt_vgpu_err ("fail to read gpa %llx\n" , pt); +return ret; + } + +for (i = start_index; i < end_index; i++) { + gfn = walk->pt[i] >>PAGE_SHIFT ; + mfn =intel_gvt_hypervisor_gfn_to_mfn (vgpu, gfn); +if (mfn ==INTEL_GVT_INVALID_ADDR ) { +gvt_vgpu_err ("fail to translate gfn: 0x%lx\n" , gfn); +return -ENXIO ; + } + walk->mfns[walk->mfn_index++] = mfn <<PAGE_SHIFT ; + } + +return 0 ; +} + + +static int walk_pd_range (struct intel_vgpu *vgpu,u64 pd, +u64 start,u64 end,struct ppgtt_walk *walk) +{ +const struct intel_gvt_device_info *info = &vgpu->gvt->device_info; +struct intel_gvt_gtt_gma_ops *gma_ops = vgpu->gvt->gtt.gma_ops; +unsigned long index; +u64 pt, next; +int ret =0 ; + +do { + index = gma_ops->gma_to_pde_index (start); + + ret =intel_gvt_hypervisor_read_gpa (vgpu, + (pd &PAGE_MASK ) + (index << + info->gtt_entry_size_shift), &pt,8 ); +if (ret) +return ret; + next =pd_addr_end (start, end); +walk_pt_range (vgpu, pt, start, next, walk); + + start = next; + }while (start != end); + +return ret; +} + + +static int walk_pdp_range (struct intel_vgpu *vgpu,u64 pdp, +u64 start,u64 end,struct ppgtt_walk *walk) +{ +const struct intel_gvt_device_info *info = &vgpu->gvt->device_info; +struct intel_gvt_gtt_gma_ops *gma_ops = vgpu->gvt->gtt.gma_ops; +unsigned long index; +u64 pd, next; +int ret =0 ; + +do { + index = gma_ops->gma_to_l4_pdp_index (start); + + ret =intel_gvt_hypervisor_read_gpa (vgpu, + (pdp &PAGE_MASK ) + (index << + info->gtt_entry_size_shift), &pd,8 ); +if (ret) +return ret; + next =pdp_addr_end (start, end); +walk_pd_range (vgpu, pd, start, next, walk); + start = next; + }while (start != end); + +return ret; +} + + +static int walk_pml4_range (struct intel_vgpu *vgpu,u64 pml4, +u64 start,u64 end,struct ppgtt_walk *walk) +{ +const struct intel_gvt_device_info *info = &vgpu->gvt->device_info; +struct intel_gvt_gtt_gma_ops *gma_ops = vgpu->gvt->gtt.gma_ops; +unsigned long index; +u64 pdp, next; +int ret =0 ; + +do { + index = gma_ops->gma_to_pml4_index (start); + ret =intel_gvt_hypervisor_read_gpa (vgpu, + (pml4 &PAGE_MASK ) + (index << + info->gtt_entry_size_shift), &pdp,8 ); +if (ret) +return ret; + next =pml4_addr_end (start, end); +walk_pdp_range (vgpu, pdp, start, next, walk); + start = next; + }while (start != end); + +return ret; +} + +static int intel_vgpu_pv_ppgtt_insert_4lvl (struct intel_vgpu *vgpu, +struct intel_vgpu_mm *mm, +u64 pml4,u64 start,u64 length,u32 cache_level) +{ +int ret =0 ; +struct sg_table st; +struct scatterlist *sg =NULL ; +int num_pages; +struct i915_vma vma; +struct ppgtt_walk walk; +int i; + + num_pages = length >>PAGE_SHIFT ; + + walk.mfn_index =0 ; + walk.mfns =NULL ; + walk.pt =NULL ; + + walk.mfns =kmalloc_array (num_pages, +sizeof (unsigned long ),GFP_KERNEL ); +if (!walk.mfns) { + ret = -ENOMEM ; + goto fail; + } + + walk.pt = (unsigned long *)__get_free_pages (GFP_KERNEL ,0 ); +if (!walk.pt) { + ret = -ENOMEM ; + goto fail; + } + +if (sg_alloc_table (&st, num_pages,GFP_KERNEL )) { + ret = -ENOMEM ; + goto fail; + } + + ret =walk_pml4_range (vgpu, pml4, start, start + length, &walk); +if (ret) + goto fail_free_sg; + +WARN_ON (num_pages != walk.mfn_index); + +for_each_sg (st.sgl, sg, num_pages, i) { + sg->offset =0 ; + sg->length =PAGE_SIZE ; +sg_dma_address (sg) = walk.mfns[i]; +sg_dma_len (sg) =PAGE_SIZE ; + } + +memset (&vma,0 ,sizeof (vma)); + vma.node.start = start; + vma.pages = &st; + mm->ppgtt->vm.insert_entries (&mm->ppgtt->vm, &vma, cache_level,0 ); + +fail_free_sg: +sg_free_table (&st); +fail: +kfree (walk.mfns); +free_page ((unsigned long )walk.pt); + +return ret; +} + +int intel_vgpu_handle_pv_ppgtt_update (struct intel_vgpu *vgpu, +u32 action,struct pv_ppgtt_update *pv_ppgtt) +{ +struct intel_vgpu_mm *mm; +u64 pdp, start, length; +u32 cache_level; +int ret =0 ; + + pdp = pv_ppgtt->pdp; + start = pv_ppgtt->start; + length = pv_ppgtt->length; + cache_level = pv_ppgtt->cache_level; + + mm =intel_vgpu_find_ppgtt_mm (vgpu, &pdp); +if (!mm) { +gvt_vgpu_err ("failed to find pdp 0x%llx\n" , pdp); + ret = -EINVAL ; + } + +if (action ==PV_ACTION_PPGTT_L4_ALLOC ) { + ret = mm->ppgtt->vm.allocate_va_range (&mm->ppgtt->vm, + start, length); +if (ret) +gvt_vgpu_err ("failed to alloc %llx\n" , pdp); + } + +if (action ==PV_ACTION_PPGTT_L4_CLEAR ) { + mm->ppgtt->vm.clear_range (&mm->ppgtt->vm, + start, length); + } + +if (action ==PV_ACTION_PPGTT_L4_INSERT ) { + ret =intel_vgpu_pv_ppgtt_insert_4lvl (vgpu, mm, + pdp, start, length, cache_level); +if (ret) +gvt_vgpu_err ("failed to insert %llx\n" , pdp); + } + +return ret; +}
drivers/gpu/drm/i915/gvt/gtt.h +11 -0
@@ -141,6 +141,7 @@ struct intel_gvt_partial_pte {struct intel_vgpu_mm {enum intel_gvt_mm_type type; +struct i915_ppgtt *ppgtt;struct intel_vgpu *vgpu;struct kref ref;
@@ -253,6 +254,14 @@ struct intel_vgpu_ppgtt_spt {struct list_head post_shadow_list; }; +/* ppgtt pv support data structure */ +struct pv_ppgtt_update { +u64 pdp; +u64 start; +u64 length; +u32 cache_level; +}; +int intel_vgpu_sync_oos_pages (struct intel_vgpu *vgpu);int intel_vgpu_flush_post_shadow (struct intel_vgpu *vgpu);
@@ -278,4 +287,6 @@ int intel_vgpu_emulate_ggtt_mmio_read(struct intel_vgpu *vgpu,int intel_vgpu_emulate_ggtt_mmio_write (struct intel_vgpu *vgpu,unsigned int off,void *p_data,unsigned int bytes); +int intel_vgpu_handle_pv_ppgtt_update (struct intel_vgpu *vgpu, +u32 action,struct pv_ppgtt_update *pv_ppgtt);#endif /* _GVT_GTT_H_ */
drivers/gpu/drm/i915/gvt/gvt.h +4 -0
@@ -53,6 +53,10 @@#define GVT_MAX_VGPU 8 +#define VGPU_PVCAP (vgpu, cap) \ + ((vgpu_vreg_t(vgpu, vgtif_reg(pv_caps)) & (cap)) \ + && vgpu->shared_page_enabled) +struct intel_gvt_host {struct device *dev;bool initialized;
drivers/gpu/drm/i915/gvt/handlers.c +126 -1
151 lines not on this page · raw message
drivers/gpu/drm/i915/gvt/vgpu.c +2 -0
@@ -49,6 +49,8 @@ void populate_pvinfo_page(struct intel_vgpu *vgpu)vgpu_vreg_t (vgpu,vgtif_reg (vgt_caps)) |=VGT_CAPS_HUGE_GTT ;vgpu_vreg_t (vgpu,vgtif_reg (vgt_caps)) |=VGT_CAPS_PV ; +if (!intel_vtd_active ()) +vgpu_vreg_t (vgpu,vgtif_reg (pv_caps)) =PV_PPGTT_UPDATE ;vgpu_vreg_t (vgpu,vgtif_reg (avail_rs.mappable_gmadr.base)) =vgpu_aperture_gmadr_base (vgpu); vgpu_vreg_t(vgpu, vgtif_reg(avail_rs.mappable_gmadr.size)) =
Signature · 6 lines
1.8.3.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v8 9/9 drm/i915/gvt: GVTg support context submission pv optimization
In reply to Xiaolin Zhangimplemented context submission pv optimizaiton within GVTg.
GVTg to read context submission data (elsp_data) from the shared_page directly without trap cost and eliminate execlist HW behavior emulation without injecting context switch interrupt to guest under PV submisison mechanism.
v0: RFC.
v1: rebase.
v2: rebase.
v3: report pv context submission cap and handle VGT_G2V_ELSP_SUBMIT g2v pv notification.
v4: eliminate execlist HW emulation and don't inject context switch interrupt to guest under PV submisison mechanism.
v5: rebase.
v6: rebase.
v7: rebase.
v8: addressed v7 pv submission comments.
--- drivers/gpu/drm/i915/gvt/execlist.c | 6 ++++++ drivers/gpu/drm/i915/gvt/handlers.c | 30 +++++++++++++++++++++++++++++- drivers/gpu/drm/i915/gvt/vgpu.c | 2 ++ 3 files changed, 37 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/gvt/execlist.c +6 -0
@@ -382,6 +382,9 @@ static int prepare_execlist_workload(struct intel_vgpu_workload *workload)int ring_id = workload->ring_id;int ret; +if (VGPU_PVCAP (vgpu,PV_SUBMISSION )) +return 0 ; +if (!workload->emulate_schedule_in)return 0 ;
@@ -429,6 +432,9 @@ static int complete_execlist_workload(struct intel_vgpu_workload *workload) goto out; } +if (VGPU_PVCAP (vgpu,PV_SUBMISSION )) + goto out; + ret =emulate_execlist_ctx_schedule_out (execlist, &workload->ctx_desc); out:intel_vgpu_unpin_mm (workload->shadow_mm);
drivers/gpu/drm/i915/gvt/handlers.c +29 -1
@@ -1810,6 +1810,31 @@ static int mmio_read_from_hw(struct intel_vgpu *vgpu,return intel_vgpu_default_mmio_read (vgpu, offset, p_data, bytes); } +static int handle_pv_submission (struct intel_vgpu *vgpu,int ring_id) +{ +struct intel_vgpu_execlist *execlist; +u32 hw_id = vgpu->gvt->dev_priv->engine[ring_id]->hw_id; +u32 base =PV_ELSP_OFF + hw_id *sizeof (struct pv_submission ); +u32 desc_off = offsetof(struct pv_submission , descs); +u32 submitted_off = offsetof(struct pv_submission , submitted); +bool submitted = false; +int ret; + + execlist = &vgpu->submission.execlist[ring_id]; + desc_off += base; +if (intel_gvt_read_shared_page (vgpu, desc_off, + &execlist->elsp_dwords.data,16 )) +return -EINVAL ; + + ret =intel_vgpu_submit_execlist (vgpu, ring_id); +if (ret) +gvt_vgpu_err ("fail submit workload on ring %d\n" , ring_id); + + submitted_off += base; + ret =intel_gvt_write_shared_page (vgpu, submitted_off, &submitted,1 ); +return ret; +} +static int elsp_mmio_write (struct intel_vgpu *vgpu,unsigned int offset,void *p_data,unsigned int bytes) {
@@ -1821,8 +1846,11 @@ static int elsp_mmio_write(struct intel_vgpu *vgpu, unsigned int offset,if (WARN_ON (ring_id <0 || ring_id >=I915_NUM_ENGINES ))return -EINVAL ; - execlist = &vgpu->submission.execlist[ring_id]; +if (VGPU_PVCAP (vgpu,PV_SUBMISSION ) && + data ==PV_ACTION_ELSP_SUBMISSION ) +return handle_pv_submission (vgpu, ring_id); + execlist = &vgpu->submission.execlist[ring_id]; execlist->elsp_dwords.data[3 - execlist->elsp_dwords.index] = data;if (execlist->elsp_dwords.index ==3 ) { ret =intel_vgpu_submit_execlist (vgpu, ring_id);
drivers/gpu/drm/i915/gvt/vgpu.c +2 -0
@@ -51,6 +51,8 @@ void populate_pvinfo_page(struct intel_vgpu *vgpu)if (!intel_vtd_active ())vgpu_vreg_t (vgpu,vgtif_reg (pv_caps)) =PV_PPGTT_UPDATE ; +vgpu_vreg_t (vgpu,vgtif_reg (pv_caps)) |=PV_SUBMISSION ; +vgpu_vreg_t (vgpu,vgtif_reg (avail_rs.mappable_gmadr.base)) =vgpu_aperture_gmadr_base (vgpu); vgpu_vreg_t(vgpu, vgtif_reg(avail_rs.mappable_gmadr.size)) =
Signature · 6 lines
1.8.3.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx