3 files changed, 52 insertions, 38 deletions

diff --git a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c
index 5ea6a016..309a395a 100644
--- a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c
@@ -461,28 +461,38 @@ static int vgpu_fifo_preempt_tsg(struct gk20a *g, u32 tsgid)
 static int vgpu_submit_runlist(struct gk20a *g, u64 handle, u8 runlist_id,
                                u16 *runlist, u32 num_entries)
 {
-        struct tegra_vgpu_cmd_msg *msg;
+        struct tegra_vgpu_cmd_msg msg;
         struct tegra_vgpu_runlist_params *p;
-        size_t size = sizeof(*msg) + sizeof(*runlist) * num_entries;
-        char *ptr;
         int err;
+        void *oob_handle;
+        void *oob;
+        size_t size, oob_size;
+
+        oob_handle = tegra_gr_comm_oob_get_ptr(TEGRA_GR_COMM_CTX_CLIENT,
+                        tegra_gr_comm_get_server_vmid(), TEGRA_VGPU_QUEUE_CMD,
+                        &oob, &oob_size);
+        if (!oob_handle)
+                return -EINVAL;
+
+        size = sizeof(*runlist) * num_entries;
+        if (oob_size < size) {
+                err = -ENOMEM;
+                goto done;
+        }
 
-        msg = nvgpu_kmalloc(g, size);
-        if (!msg)
-                return -1;
-
-        msg->cmd = TEGRA_VGPU_CMD_SUBMIT_RUNLIST;
-        msg->handle = handle;
-        p = &msg->params.runlist;
+        msg.cmd = TEGRA_VGPU_CMD_SUBMIT_RUNLIST;
+        msg.handle = handle;
+        p = &msg.params.runlist;
         p->runlist_id = runlist_id;
         p->num_entries = num_entries;
 
-        ptr = (char *)msg + sizeof(*msg);
-        memcpy(ptr, runlist, sizeof(*runlist) * num_entries);
-        err = vgpu_comm_sendrecv(msg, size, sizeof(*msg));
+        memcpy(oob, runlist, size);
+        err = vgpu_comm_sendrecv(&msg, sizeof(msg), sizeof(msg));
+
+        err = (err || msg.ret) ? -1 : 0;
 
-        err = (err || msg->ret) ? -1 : 0;
-        nvgpu_kfree(g, msg);
+done:
+        tegra_gr_comm_oob_put_ptr(oob_handle);
         return err;
 }
 
diff --git a/drivers/gpu/nvgpu/vgpu/gr_vgpu.c b/drivers/gpu/nvgpu/vgpu/gr_vgpu.c
index dd515f41..42af9ee1 100644
--- a/drivers/gpu/nvgpu/vgpu/gr_vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/gr_vgpu.c
@@ -1100,41 +1100,47 @@ static int vgpu_gr_suspend_resume_contexts(struct gk20a *g,
                 int *ctx_resident_ch_fd, u32 cmd)
 {
         struct dbg_session_channel_data *ch_data;
-        struct tegra_vgpu_cmd_msg *msg;
+        struct tegra_vgpu_cmd_msg msg;
         struct tegra_vgpu_suspend_resume_contexts *p;
-        size_t size_out = offsetof(struct tegra_vgpu_cmd_msg,
-                        params.suspend_contexts.chids);
-        size_t size_in;
         size_t n;
         int channel_fd = -1;
         int err = 0;
+        void *handle = NULL;
+        u16 *oob;
+        size_t oob_size;
 
         nvgpu_mutex_acquire(&g->dbg_sessions_lock);
         nvgpu_mutex_acquire(&dbg_s->ch_list_lock);
 
+        handle = tegra_gr_comm_oob_get_ptr(TEGRA_GR_COMM_CTX_CLIENT,
+                        tegra_gr_comm_get_server_vmid(), TEGRA_VGPU_QUEUE_CMD,
+                        (void **)&oob, &oob_size);
+        if (!handle) {
+                err = -EINVAL;
+                goto done;
+        }
+
         n = 0;
         list_for_each_entry(ch_data, &dbg_s->ch_list, ch_entry)
                 n++;
 
-        size_in = size_out + n * sizeof(u16);
-
-        msg = nvgpu_kmalloc(g, size_in);
-        if (!msg)
-                return -ENOMEM;
+        if (oob_size < n * sizeof(u16)) {
+                err = -ENOMEM;
+                goto done;
+        }
 
-        msg->cmd = cmd;
-        msg->handle = vgpu_get_handle(g);
-        p = &msg->params.suspend_contexts;
+        msg.cmd = cmd;
+        msg.handle = vgpu_get_handle(g);
+        p = &msg.params.suspend_contexts;
         p->num_channels = n;
         n = 0;
-        list_for_each_entry(ch_data, &dbg_s->ch_list, ch_entry) {
-                p->chids[n++] = (u16)ch_data->chid;
-        }
+        list_for_each_entry(ch_data, &dbg_s->ch_list, ch_entry)
+                oob[n++] = (u16)ch_data->chid;
 
-        err = vgpu_comm_sendrecv(msg, size_in, size_out);
-        if (err || msg->ret) {
+        err = vgpu_comm_sendrecv(&msg, sizeof(msg), sizeof(msg));
+        if (err || msg.ret) {
                 err = -ENOMEM;
-                goto fail;
+                goto done;
         }
 
         if (p->resident_chid != (u16)~0) {
@@ -1146,13 +1152,12 @@ static int vgpu_gr_suspend_resume_contexts(struct gk20a *g,
                 }
         }
 
-fail:
+done:
+        if (handle)
+                tegra_gr_comm_oob_put_ptr(handle);
         nvgpu_mutex_release(&dbg_s->ch_list_lock);
         nvgpu_mutex_release(&g->dbg_sessions_lock);
-
         *ctx_resident_ch_fd = channel_fd;
-        nvgpu_kfree(g, msg);
-
         return err;
 }
 
diff --git a/include/linux/tegra_vgpu.h b/include/linux/tegra_vgpu.h
index 2c30ff06..ecdc3014 100644
--- a/include/linux/tegra_vgpu.h
+++ b/include/linux/tegra_vgpu.h
@@ -475,7 +475,6 @@ struct tegra_vgpu_gpu_load_params {
 struct tegra_vgpu_suspend_resume_contexts {
         u32 num_channels;
         u16 resident_chid;
-        u16 chids[];
 };
 
 struct tegra_vgpu_clear_sm_error_state {