From mboxrd@z Thu Jan 1 00:00:00 1970 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=-6.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 C21FFC2BCA1 for ; Fri, 7 Jun 2019 15:51:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9C20D20657 for ; Fri, 7 Jun 2019 15:51:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559922713; bh=DnNeCLQx4HO+1hlXeb/DClw5HFQxojEBibonIOcjEjc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=mc40ooN2mgznhFgr+CQ8TOFi00tO0h5FqXX9EQOUBB6e/l3jvNdK1TBVyNcla63dL U2cKND8cSHA0SEsC/hvaPQf4LnY/+sCPuA3uxVKpJeB8raq+MMkeXRsfCss44cVamL rolc/aJs/3eoqjXRYSpuMw6SLNgWz7U+X2ZzLpeg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731686AbfFGPuF (ORCPT ); Fri, 7 Jun 2019 11:50:05 -0400 Received: from mail.kernel.org ([198.145.29.99]:36554 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731220AbfFGPuE (ORCPT ); Fri, 7 Jun 2019 11:50:04 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 738CF2146E; Fri, 7 Jun 2019 15:50:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559922604; bh=DnNeCLQx4HO+1hlXeb/DClw5HFQxojEBibonIOcjEjc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eVGlYuOC572qdy/ZQ33jufeubRMIAO4HYFzy2fZcqqk9lR4k21LwN+bJl06M99QQW 6YDo9uED81jb3JU4hzw0mbMBY6j7T1T87w0QnUFsxCusBJMvxvPasQaxwCbrHZwHkO IQ4vNVpV5VVMXKa0q3iyXv6KpToJGSli1gl+x2VI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Thomas Hellstrom , Brian Paul Subject: [PATCH 5.1 73/85] drm/vmwgfx: Fix compat mode shader operation Date: Fri, 7 Jun 2019 17:39:58 +0200 Message-Id: <20190607153857.196916937@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190607153849.101321647@linuxfoundation.org> References: <20190607153849.101321647@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Thomas Hellstrom commit e41c20cf50a8a7d0dfa337a7530590aacef4193b upstream. In compat mode, we allowed host-backed user-space with guest-backed kernel / device. In this mode, set shader commands was broken since no relocations were emitted. Fix this. Cc: Fixes: e8c66efbfe3a ("drm/vmwgfx: Make user resource lookups reference-free during validation") Signed-off-by: Thomas Hellstrom Reviewed-by: Brian Paul Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) --- a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c @@ -2129,6 +2129,11 @@ static int vmw_cmd_set_shader(struct vmw return 0; if (cmd->body.shid != SVGA3D_INVALID_ID) { + /* + * This is the compat shader path - Per device guest-backed + * shaders, but user-space thinks it's per context host- + * backed shaders. + */ res = vmw_shader_lookup(vmw_context_res_man(ctx), cmd->body.shid, cmd->body.type); @@ -2137,6 +2142,14 @@ static int vmw_cmd_set_shader(struct vmw ret = vmw_execbuf_res_noctx_val_add(sw_context, res); if (unlikely(ret != 0)) return ret; + + ret = vmw_resource_relocation_add + (sw_context, res, + vmw_ptr_diff(sw_context->buf_start, + &cmd->body.shid), + vmw_res_rel_normal); + if (unlikely(ret != 0)) + return ret; } }