19 files changed, 604 insertions, 440 deletions

diff --git a/drivers/gpu/drm/i915/gvt/Makefile b/drivers/gpu/drm/i915/gvt/Makefile
index b123c20e2097..f5486cb94818 100644
--- a/drivers/gpu/drm/i915/gvt/Makefile
+++ b/drivers/gpu/drm/i915/gvt/Makefile
@@ -3,6 +3,6 @@ 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 render.o cmd_parser.o
 
-ccflags-y                               += -I$(src) -I$(src)/$(GVT_DIR) -Wall
+ccflags-y                               += -I$(src) -I$(src)/$(GVT_DIR)
 i915-y                                  += $(addprefix $(GVT_DIR)/, $(GVT_SOURCE))
 obj-$(CONFIG_DRM_I915_GVT_KVMGT)        += $(GVT_DIR)/kvmgt.o
diff --git a/drivers/gpu/drm/i915/gvt/cmd_parser.c b/drivers/gpu/drm/i915/gvt/cmd_parser.c
index 41b2c3aaa04a..51241de5e7a7 100644
--- a/drivers/gpu/drm/i915/gvt/cmd_parser.c
+++ b/drivers/gpu/drm/i915/gvt/cmd_parser.c
@@ -2414,53 +2414,13 @@ static void add_cmd_entry(struct intel_gvt *gvt, struct cmd_entry *e)
         hash_add(gvt->cmd_table, &e->hlist, e->info->opcode);
 }
 
-#define GVT_MAX_CMD_LENGTH     20  /* In Dword */
-
-static void trace_cs_command(struct parser_exec_state *s,
-                cycles_t cost_pre_cmd_handler, cycles_t cost_cmd_handler)
-{
-        /* This buffer is used by ftrace to store all commands copied from
-         * guest gma space. Sometimes commands can cross pages, this should
-         * not be handled in ftrace logic. So this is just used as a
-         * 'bounce buffer'
-         */
-        u32 cmd_trace_buf[GVT_MAX_CMD_LENGTH];
-        int i;
-        u32 cmd_len = cmd_length(s);
-        /* The chosen value of GVT_MAX_CMD_LENGTH are just based on
-         * following two considerations:
-         * 1) From observation, most common ring commands is not that long.
-         *    But there are execeptions. So it indeed makes sence to observe
-         *    longer commands.
-         * 2) From the performance and debugging point of view, dumping all
-         *    contents of very commands is not necessary.
-         * We mgith shrink GVT_MAX_CMD_LENGTH or remove this trace event in
-         * future for performance considerations.
-         */
-        if (unlikely(cmd_len > GVT_MAX_CMD_LENGTH)) {
-                gvt_dbg_cmd("cmd length exceed tracing limitation!\n");
-                cmd_len = GVT_MAX_CMD_LENGTH;
-        }
-
-        for (i = 0; i < cmd_len; i++)
-                cmd_trace_buf[i] = cmd_val(s, i);
-
-        trace_gvt_command(s->vgpu->id, s->ring_id, s->ip_gma, cmd_trace_buf,
-                        cmd_len, s->buf_type == RING_BUFFER_INSTRUCTION,
-                        cost_pre_cmd_handler, cost_cmd_handler);
-}
-
 /* call the cmd handler, and advance ip */
 static int cmd_parser_exec(struct parser_exec_state *s)
 {
+        struct intel_vgpu *vgpu = s->vgpu;
         struct cmd_info *info;
         u32 cmd;
         int ret = 0;
-        cycles_t t0, t1, t2;
-        struct parser_exec_state s_before_advance_custom;
-        struct intel_vgpu *vgpu = s->vgpu;
-
-        t0 = get_cycles();
 
         cmd = cmd_val(s, 0);
 
@@ -2471,13 +2431,10 @@ static int cmd_parser_exec(struct parser_exec_state *s)
                 return -EINVAL;
         }
 
-        gvt_dbg_cmd("%s\n", info->name);
-
         s->info = info;
 
-        t1 = get_cycles();
-
-        s_before_advance_custom = *s;
+        trace_gvt_command(vgpu->id, s->ring_id, s->ip_gma, s->ip_va,
+                          cmd_length(s), s->buf_type);
 
         if (info->handler) {
                 ret = info->handler(s);
@@ -2486,9 +2443,6 @@ static int cmd_parser_exec(struct parser_exec_state *s)
                         return ret;
                 }
         }
-        t2 = get_cycles();
-
-        trace_cs_command(&s_before_advance_custom, t1 - t0, t2 - t1);
 
         if (!(info->flag & F_IP_ADVANCE_CUSTOM)) {
                 ret = cmd_advance_default(s);
@@ -2522,8 +2476,6 @@ static int command_scan(struct parser_exec_state *s,
         gma_tail = rb_start + rb_tail;
         gma_bottom = rb_start +  rb_len;
 
-        gvt_dbg_cmd("scan_start: start=%lx end=%lx\n", gma_head, gma_tail);
-
         while (s->ip_gma != gma_tail) {
                 if (s->buf_type == RING_BUFFER_INSTRUCTION) {
                         if (!(s->ip_gma >= rb_start) ||
@@ -2552,8 +2504,6 @@ static int command_scan(struct parser_exec_state *s,
                 }
         }
 
-        gvt_dbg_cmd("scan_end\n");
-
         return ret;
 }
 
diff --git a/drivers/gpu/drm/i915/gvt/execlist.c b/drivers/gpu/drm/i915/gvt/execlist.c
index dca989eb2d42..8bba38fa19b8 100644
--- a/drivers/gpu/drm/i915/gvt/execlist.c
+++ b/drivers/gpu/drm/i915/gvt/execlist.c
@@ -708,53 +708,43 @@ static int submit_context(struct intel_vgpu *vgpu, int ring_id,
 int intel_vgpu_submit_execlist(struct intel_vgpu *vgpu, int ring_id)
 {
         struct intel_vgpu_execlist *execlist = &vgpu->execlist[ring_id];
-        struct execlist_ctx_descriptor_format *desc[2], valid_desc[2];
-        unsigned long valid_desc_bitmap = 0;
-        bool emulate_schedule_in = true;
-        int ret;
-        int i;
+        struct execlist_ctx_descriptor_format desc[2];
+        int i, ret;
 
-        memset(valid_desc, 0, sizeof(valid_desc));
+        desc[0] = *get_desc_from_elsp_dwords(&execlist->elsp_dwords, 1);
+        desc[1] = *get_desc_from_elsp_dwords(&execlist->elsp_dwords, 0);
 
-        desc[0] = get_desc_from_elsp_dwords(&execlist->elsp_dwords, 1);
-        desc[1] = get_desc_from_elsp_dwords(&execlist->elsp_dwords, 0);
+        if (!desc[0].valid) {
+                gvt_vgpu_err("invalid elsp submission, desc0 is invalid\n");
+                goto inv_desc;
+        }
 
-        for (i = 0; i < 2; i++) {
-                if (!desc[i]->valid)
+        for (i = 0; i < ARRAY_SIZE(desc); i++) {
+                if (!desc[i].valid)
                         continue;
-
-                if (!desc[i]->privilege_access) {
+                if (!desc[i].privilege_access) {
                         gvt_vgpu_err("unexpected GGTT elsp submission\n");
-                        return -EINVAL;
+                        goto inv_desc;
                 }
-
-                /* TODO: add another guest context checks here. */
-                set_bit(i, &valid_desc_bitmap);
-                valid_desc[i] = *desc[i];
-        }
-
-        if (!valid_desc_bitmap) {