From patchwork Mon Oct 24 23:19:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Bragg X-Patchwork-Id: 9393515 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7212760231 for ; Mon, 24 Oct 2016 23:20:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 61A5F29167 for ; Mon, 24 Oct 2016 23:20:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5470529187; Mon, 24 Oct 2016 23:20:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 17E5029167 for ; Mon, 24 Oct 2016 23:20:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 350306E602; Mon, 24 Oct 2016 23:19:48 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id BFDB86E5E2; Mon, 24 Oct 2016 23:19:40 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id c78so996901wme.3; Mon, 24 Oct 2016 16:19:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=GZPuJPOc0gGdQ6LxbO/OKvs2XqbHthjPrbqdoE+RuvQ=; b=yi5brkJaYF74nkZ1vweBuO6xWyxb6Db4ioe4gcNIm2HglKBousiYbvQg9QgUmScmRk MIjW635/Ua2JFk6cNVVUhjQEz5bC14p9CMZHqXcEr+jLxQoO6X/gYf6a/9mL8589ABV7 dj1WnKKgyauEAPBKP2YNA2jNI4hVGvuJt5Uv/k/dU/4b/CEXc7bnmJiXTh49wdJXiC16 rlMT4YeYP3ACBKXv0OvvTqzNCobL/dczdZMmYY2iItDd3biouJ14+CjOJQRkZdD77Z2E xojtSywNF1JXSoQoOqZresQpTYNBfZCpaX3oZR2TfXbrVGPaRD/lwh69yafdvWdhCFHA vjmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=GZPuJPOc0gGdQ6LxbO/OKvs2XqbHthjPrbqdoE+RuvQ=; b=LsQrvgrp+Lfi7Dbri29GTLVRP1Ejv/OvDpz9/B1ngE43EYJxDkA9HHA6mcV44MKThs ny8eCwcfYnD7V/2uGVlhdlfVx6xpTn+PG53jJWs0wctoK5Fj9PyHp/kaDoxJzOqo6x+D rMh01G2tOzOcJ6C9KNcg4Jyt4C2SYIs8w0Cdtv27jD6+Q7hHL+iCRnj8n2EJA7w2CeCR XRId2fAuo7khvBoj+MEI68cTP+AwlffE0VpHUeQkUf4eoifehd2Lbr7ZSvotkE/ZxsXf LGNYXqMqNmgSNavWJ4grbXGHnkBHAQ7XsnpiNtDK8Voa4lxqlw7B8Ax5JwkHnIPi/VEE dSbw== X-Gm-Message-State: ABUngvc07LXhywLWtbEm/jU09kVvCdY3u7o8yZvsATg0NyKnJhb2Nty9p1EVEO/NVxXoXg== X-Received: by 10.28.197.67 with SMTP id v64mr146878wmf.9.1477351179380; Mon, 24 Oct 2016 16:19:39 -0700 (PDT) Received: from sixbynine.org (cpc26-heme10-2-0-cust305.9-1.cable.virginm.net. [86.3.57.50]) by smtp.gmail.com with ESMTPSA id xq9sm21724323wjb.35.2016.10.24.16.19.38 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Oct 2016 16:19:38 -0700 (PDT) From: Robert Bragg To: intel-gfx@lists.freedesktop.org Subject: [PATCH v7 03/11] drm/i915: return EACCES for check_cmd() failures Date: Tue, 25 Oct 2016 00:19:26 +0100 Message-Id: <20161024231934.2243-4-robert@sixbynine.org> X-Mailer: git-send-email 2.10.1 In-Reply-To: <20161024231934.2243-1-robert@sixbynine.org> References: <20161024231934.2243-1-robert@sixbynine.org> Cc: dri-devel@lists.freedesktop.org, Matthew Auld , Sourab Gupta , Daniel Vetter , Robert Bragg X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP check_cmd() is checking whether a command adheres to certain restrictions that ensure it's safe to execute within a privileged batch buffer. Returning false implies a privilege problem, not that the command is invalid. The distinction makes the difference between allowing the buffer to be executed as an unprivileged batch buffer or returning an EINVAL error to userspace without executing anything. In a case where userspace may want to test whether it can successfully write to a register that needs privileges the distinction may be important and an EINVAL error may be considered fatal. In particular this is currently true for Mesa, which includes a test for whether OACONTROL can be written too, but Mesa treats any error when flushing a batch buffer as fatal, calling exit(1). As it is currently Mesa can gracefully handle a failure to write to OACONTROL if the command parser is disabled, but if we were to remove OACONTROL from the parser's whitelist then the returned EINVAL would break Mesa applications as they attempt an OACONTROL write. This bumps the command parser version from 7 to 8, as the change is visible to userspace. Signed-off-by: Robert Bragg Reviewed-by: Matthew Auld --- drivers/gpu/drm/i915/i915_cmd_parser.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_cmd_parser.c b/drivers/gpu/drm/i915/i915_cmd_parser.c index fe34470..c45dd83 100644 --- a/drivers/gpu/drm/i915/i915_cmd_parser.c +++ b/drivers/gpu/drm/i915/i915_cmd_parser.c @@ -1272,7 +1272,7 @@ int intel_engine_cmd_parser(struct intel_engine_cs *engine, if (!check_cmd(engine, desc, cmd, length, is_master, &oacontrol_set)) { - ret = -EINVAL; + ret = -EACCES; break; } @@ -1333,6 +1333,9 @@ int i915_cmd_parser_get_version(struct drm_i915_private *dev_priv) * 5. GPGPU dispatch compute indirect registers. * 6. TIMESTAMP register and Haswell CS GPR registers * 7. Allow MI_LOAD_REGISTER_REG between whitelisted registers. + * 8. Don't report cmd_check() failures as EINVAL errors to userspace; + * rely on the HW to NOOP disallowed commands as it would without + * the parser enabled. */ - return 7; + return 8; }