From patchwork Thu Jul 8 15:48:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Ekstrand X-Patchwork-Id: 12365455 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=-16.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 9035FC07E96 for ; Thu, 8 Jul 2021 15:49:12 +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 612D861483 for ; Thu, 8 Jul 2021 15:49:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 612D861483 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=jlekstrand.net Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id ABB376E901; Thu, 8 Jul 2021 15:48:54 +0000 (UTC) Received: from mail-oi1-x22e.google.com (mail-oi1-x22e.google.com [IPv6:2607:f8b0:4864:20::22e]) by gabe.freedesktop.org (Postfix) with ESMTPS id 616306E8FB for ; Thu, 8 Jul 2021 15:48:53 +0000 (UTC) Received: by mail-oi1-x22e.google.com with SMTP id u11so8322957oiv.1 for ; Thu, 08 Jul 2021 08:48:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jlekstrand-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=p9LihMbkz0D/b2xxGApls+quCG+XTK2bjRKq93kZNxc=; b=ejeeRrBCxcV71b+0zKdd+CAMyzM+QaWLBKDEvU7XFDFDhtFLdovRADZqq2OqvfkSPz QNvpUGR2e6+dD+cSIFgSeZIvrC9vfiioWuTQPBR54Ve8uRSAnXuu+8EK830DkN+GFzhj RNvfo94inO/DNZGYTdRu2913ojTs7r+lVja5oCx8VxtsyUv9XtE51JwZ6Yt+HNsQ1CWO dbczHaf9h+zZ0qutfLi9gIKRsVLt9XOBeEylpO3/NKYx3PASEZObumn+ctRhfjY2ZQNG aJwtUWQwzUaaEK59ryK5eTlPpIa0OFaNyz4zZLdk//h6tSmso5XzK7AhUF0uHz6UQH9l 5hqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=p9LihMbkz0D/b2xxGApls+quCG+XTK2bjRKq93kZNxc=; b=uQxn/DWdCL8yPAryRHxLz8iajI9IAH7CdlucS39Jjh7/jf/ZEg9OsK2cYnsHIqIjku RjOf3/96DDfwEnD8yxKn93ieU1cEseMeFPjmqFFfEzYRr+cCvGtLhFD4tK9BFECL40UF 7/nfh5hBS+hQmDizT+xxVgwiV9gn8TrPzdFRnKInI85RhX9OY3euVghHKHsPcvRFyPtO Ax4zeq6ZMH3TLJlHK0Z/I1Mu0hiAqQcB85fIv5iHkxszfM4bSrJU0Cd9d/KsYrE5SUUr Y6csBZ+FwG7Wyq6xgKXlKngLjHTHvLBp/Fj7nkLoExRs8YqOggkN5zEzAtqe94NAgJ3a /Fqw== X-Gm-Message-State: AOAM530bXTA4kEL+13r76AYuI6/bGHZz70CV9i8tRmXZA83AZe5ZSQQ0 DqFOuPRXJdFRsSYQ4CQIWQl1Fg== X-Google-Smtp-Source: ABdhPJw02aU2H50NshOn2AYegMNk/ayuXJ4lk+tFrVhYUBPlmBeZ7LnDeX0qXX0wzmcGIDwWeZ2BCw== X-Received: by 2002:a05:6808:159d:: with SMTP id t29mr23387217oiw.159.1625759332689; Thu, 08 Jul 2021 08:48:52 -0700 (PDT) Received: from omlet.lan ([68.203.99.148]) by smtp.gmail.com with ESMTPSA id d20sm548356otq.62.2021.07.08.08.48.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jul 2021 08:48:52 -0700 (PDT) From: Jason Ekstrand To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH 12/30] drm/i915/gem: Disallow creating contexts with too many engines Date: Thu, 8 Jul 2021 10:48:17 -0500 Message-Id: <20210708154835.528166-13-jason@jlekstrand.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210708154835.528166-1-jason@jlekstrand.net> References: <20210708154835.528166-1-jason@jlekstrand.net> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Jason Ekstrand Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" There's no sense in allowing userspace to create more engines than it can possibly access via execbuf. Signed-off-by: Jason Ekstrand Reviewed-by: Daniel Vetter --- drivers/gpu/drm/i915/gem/i915_gem_context.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.c b/drivers/gpu/drm/i915/gem/i915_gem_context.c index 5eca91ded3423..0ba8506fb966f 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_context.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c @@ -1639,11 +1639,11 @@ set_engines(struct i915_gem_context *ctx, return -EINVAL; } - /* - * Note that I915_EXEC_RING_MASK limits execbuf to only using the - * first 64 engines defined here. - */ num_engines = (args->size - sizeof(*user)) / sizeof(*user->engines); + /* RING_MASK has no shift so we can use it directly here */ + if (num_engines > I915_EXEC_RING_MASK + 1) + return -EINVAL; + set.engines = alloc_engines(num_engines); if (!set.engines) return -ENOMEM;