Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.2 required=3.0 tests=BAYES_00,DATE_IN_PAST_06_12, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1A17FC433E7 for ; Fri, 9 Oct 2020 09:42:37 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BB447206B2 for ; Fri, 9 Oct 2020 09:42:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BB447206B2 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3D4496ECA9; Fri, 9 Oct 2020 09:42:36 +0000 (UTC) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 610FE6ECA9; Fri, 9 Oct 2020 09:42:34 +0000 (UTC) IronPort-SDR: Jjag79IfXj5R7TqHVXM7A5Em9wc7d7WGN5g8qybJX4ZbvMdG41PFR0ncNsXJDdHjdFGcmTYAzd 580w8O9NwVdQ== X-IronPort-AV: E=McAfee;i="6000,8403,9768"; a="165526021" X-IronPort-AV: E=Sophos;i="5.77,354,1596524400"; d="scan'208";a="165526021" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Oct 2020 02:42:34 -0700 IronPort-SDR: JrawxZMY/ieShMT5YxUvrh0UCU55wh2EqCEzKxSqLPC+PrAkjv6hQzWAXQrwjmbwOsCfQJ8IXD BokgUdr/UJzw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,354,1596524400"; d="scan'208";a="316982942" Received: from unknown (HELO xzhan34-mobl2.bj.intel.com) ([10.238.154.62]) by orsmga006.jf.intel.com with ESMTP; 09 Oct 2020 02:42:31 -0700 From: Xiaolin Zhang To: intel-gvt-dev@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Date: Fri, 9 Oct 2020 08:04:43 +0800 Message-Id: <1602201883-27829-13-git-send-email-xiaolin.zhang@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1602201883-27829-1-git-send-email-xiaolin.zhang@intel.com> References: <1602201883-27829-1-git-send-email-xiaolin.zhang@intel.com> Subject: [Intel-gfx] [PATCH v2 12/12] drm/i915/gvt: GVTg support pv workload submssion X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: chris@chris-wilson.co.uk, zhiyuan.lv@intel.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" implemented pv workload submission support within GVTg. GVTg to read engine submission data (engine lrc) from the shared_page with pv interface to reduce mmio trap cost and then eliminate execlist HW behavior emulation by removing injecting context switch interrupt to guest under workload submisison pv mode to improve efficiency. Signed-off-by: Xiaolin Zhang --- drivers/gpu/drm/i915/gvt/gvt.h | 1 + drivers/gpu/drm/i915/gvt/handlers.c | 102 ++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/gvt/vgpu.c | 1 + 3 files changed, 104 insertions(+) diff --git a/drivers/gpu/drm/i915/gvt/gvt.h b/drivers/gpu/drm/i915/gvt/gvt.h index 605488c..5cd78aa 100644 --- a/drivers/gpu/drm/i915/gvt/gvt.h +++ b/drivers/gpu/drm/i915/gvt/gvt.h @@ -217,6 +217,7 @@ struct intel_vgpu { u32 pv_caps; u64 shared_page_gpa; bool shared_page_enabled; + u64 pv_sub_gpa; }; static inline void *intel_vgpu_vdev(struct intel_vgpu *vgpu) diff --git a/drivers/gpu/drm/i915/gvt/handlers.c b/drivers/gpu/drm/i915/gvt/handlers.c index 7f83b77..4c19496 100644 --- a/drivers/gpu/drm/i915/gvt/handlers.c +++ b/drivers/gpu/drm/i915/gvt/handlers.c @@ -1322,6 +1322,7 @@ static int pv_command_buffer_read(struct intel_vgpu *vgpu, static int handle_pv_commands(struct intel_vgpu *vgpu) { + struct intel_vgpu_pv_cap_addr *cap_addr; struct intel_vgpu_mm *mm; struct intel_vgpu_pv_vma *vma; u64 pdp; @@ -1335,6 +1336,17 @@ static int handle_pv_commands(struct intel_vgpu *vgpu) return ret; switch (cmd) { + case PV_CMD_REGISTER_CAP_GPA: + cap_addr = (struct intel_vgpu_pv_cap_addr *)data; + switch (cap_addr->cap) { + case PV_SUBMISSION: + vgpu->pv_sub_gpa = cap_addr->gpa; + break; + default: + gvt_vgpu_err("invalid pv cap 0x%x\n", cap_addr->cap); + break; + } + break; case PV_CMD_BIND_PPGTT: case PV_CMD_UNBIND_PPGTT: vma = (struct intel_vgpu_pv_vma *)data; @@ -1857,6 +1869,92 @@ static int mmio_read_from_hw(struct intel_vgpu *vgpu, return intel_vgpu_default_mmio_read(vgpu, offset, p_data, bytes); } +static int pv_prepare_workload(struct intel_vgpu_workload *workload) +{ + return 0; +} + +static int pv_complete_workload(struct intel_vgpu_workload *workload) +{ + return 0; +} + +static int submit_context_pv(struct intel_vgpu *vgpu, + const struct intel_engine_cs *engine, + struct execlist_ctx_descriptor_format *desc, + bool emulate_schedule_in) +{ + struct intel_vgpu_workload *workload = NULL; + + workload = intel_vgpu_create_workload(vgpu, engine, desc); + if (IS_ERR(workload)) + return PTR_ERR(workload); + + workload->prepare = pv_prepare_workload; + workload->complete = pv_complete_workload; + + intel_vgpu_queue_workload(workload); + return 0; +} + +#define get_desc_from_elsp_dwords(ed, i) \ + ((struct execlist_ctx_descriptor_format *)&((ed)->data[(i) * 2])) + +static int handle_pv_submission(struct intel_vgpu *vgpu, + const struct intel_engine_cs *engine) +{ + struct intel_vgpu_execlist *execlist; + struct intel_vgpu_pv_submission sub_data; + struct execlist_ctx_descriptor_format *desc[2]; + u32 ring_id = engine->id; + u64 base = vgpu->pv_sub_gpa + ring_id * sizeof(struct intel_vgpu_pv_submission); + u32 submitted_off = offsetof(struct intel_vgpu_pv_submission, submitted); + bool submitted = false; + int i, ret; + + execlist = &vgpu->submission.execlist[ring_id]; + if (intel_gvt_hypervisor_read_gpa(vgpu, base, &sub_data, sizeof(sub_data))) + return -EINVAL; + + desc[0] = (struct execlist_ctx_descriptor_format *)&sub_data.descs[0]; + desc[1] = (struct execlist_ctx_descriptor_format *)&sub_data.descs[1]; + + if (!desc[0]->valid) { + gvt_vgpu_err("invalid elsp submission, desc0 is invalid\n"); + goto inv_desc; + } + + for (i = 0; i < ARRAY_SIZE(desc); i++) { + if (!desc[i]->valid) + continue; + if (!desc[i]->privilege_access) { + gvt_vgpu_err("unexpected GGTT elsp submission\n"); + goto inv_desc; + } + } + + /* submit workload */ + for (i = 0; i < ARRAY_SIZE(desc); i++) { + if (!desc[i]->valid) + continue; + + ret = submit_context_pv(vgpu, engine, desc[i], i == 0); + if (ret) { + gvt_vgpu_err("failed to submit desc %d\n", i); + return ret; + } + } + + base += submitted_off; + ret = intel_gvt_hypervisor_write_gpa(vgpu, base, &submitted, 1); + return ret; + +inv_desc: + gvt_vgpu_err("descriptors content: desc0 %08x %08x desc1 %08x %08x\n", + desc[0]->udw, desc[0]->ldw, desc[1]->udw, desc[1]->ldw); + return -EINVAL; +} + static int elsp_mmio_write(struct intel_vgpu *vgpu, unsigned int offset, void *p_data, unsigned int bytes) { @@ -1869,6 +1967,10 @@ static int elsp_mmio_write(struct intel_vgpu *vgpu, unsigned int offset, if (drm_WARN_ON(&i915->drm, !engine)) return -EINVAL; + if (intel_vgpu_enabled_pv_cap(vgpu, PV_SUBMISSION) && + data == PV_CMD_SUBMIT_WORKLOAD) + return handle_pv_submission(vgpu, engine); + execlist = &vgpu->submission.execlist[engine->id]; execlist->elsp_dwords.data[3 - execlist->elsp_dwords.index] = data; diff --git a/drivers/gpu/drm/i915/gvt/vgpu.c b/drivers/gpu/drm/i915/gvt/vgpu.c index c1e2f82..6ed2a3c 100644 --- a/drivers/gpu/drm/i915/gvt/vgpu.c +++ b/drivers/gpu/drm/i915/gvt/vgpu.c @@ -51,6 +51,7 @@ void populate_pvinfo_page(struct intel_vgpu *vgpu) vgpu_vreg_t(vgpu, vgtif_reg(vgt_caps)) |= VGT_CAPS_PV; vgpu_vreg_t(vgpu, vgtif_reg(pv_caps)) = PV_PPGTT | PV_GGTT; + 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); -- 2.7.4 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx