From patchwork Wed Nov 8 00:12:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danilo Krummrich X-Patchwork-Id: 162826 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:aa0b:0:b0:403:3b70:6f57 with SMTP id k11csp599739vqo; Tue, 7 Nov 2023 16:14:38 -0800 (PST) X-Google-Smtp-Source: AGHT+IFJhJn91vwNk4GafyPte50vBC/nqpXuZVXvviCWOxZ2F2r+j+PP2CxAQ7YRMy0+q3hOOcP6 X-Received: by 2002:a05:6a20:9756:b0:16b:9886:7eda with SMTP id hs22-20020a056a20975600b0016b98867edamr510297pzc.35.1699402477925; Tue, 07 Nov 2023 16:14:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699402477; cv=none; d=google.com; s=arc-20160816; b=PwbXzlg9SNEjtt9ZTXN7UVjibQ5FPZcrNIFjrbB/Q6eVERdwjwATxxTSOxhuXx7Upo MZJL3jr1dUk2rP29NuZv2wk+vmN5QlMhm9DlsQdRvq2nawtCLpieZ6t3Z10jyk4kkfN9 dFVhfdjEc9qUwETfGIZK4t1cX6vQHPbazhYTvGaxWmT+SoffkJC+/YOVTFBxEyfCz0mj uj/rfCtJyuj2Fh2wuB0Mmj5P4GKq2da3bl9oZEmq1TAHaE+n1+TyKkmqp6BD6zEepUIh Ee5Rs9pbXxUu8YoUHyZhbIDEtmgaNxCY70jCMXH7l/g0WrD44hDRY21YnFq/hFJOJzCz L/ag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=s6qqEPqKINJozX4kiVm6oeIhikVcMg+GmtiPQ0sRpWA=; fh=K7JOvjr1TRljriUj4BKGhkKLkDAji2T6Unlfet0smkU=; b=WUdz6AXkgN3S4IzdkrJ1A9S3ffrurgA+IySNS7Ao2Bwr1BtsXMvy3LIB8G6uIwj5+z A25nf5fB8qWtNk3bbHhaZCDm1XJsW5t1UMfCIgQX/F/Wqpr3WV91pSA8rmU30bjGw7i9 4AOyrpn62cok0F04w53n1TvFB76eA+PSf5Monnoi3+4VQNzw2Y34Lj1UBNeB1F4V1apq C+3VlanvC2LZJ21mF4mBSP2P0fgJNuZ9+7H7GXEF9H3qYmwfIxgK1bP+TBtEu4cAmGpg MDYNKDUfhFCkLii6zw+hwE0HgM7Gl1z+45gIkngSg7ZvJlWwICksrVulq8T5CKaH5hSM bDmg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Wc97O2eq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id l10-20020a170902e2ca00b001ca6809f9e7si793156plc.261.2023.11.07.16.14.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 16:14:37 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Wc97O2eq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id F375280DF5C9; Tue, 7 Nov 2023 16:14:36 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343830AbjKHAOV (ORCPT + 32 others); Tue, 7 Nov 2023 19:14:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38288 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344133AbjKHAOL (ORCPT ); Tue, 7 Nov 2023 19:14:11 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 443FB10F1 for ; Tue, 7 Nov 2023 16:13:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1699402402; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=s6qqEPqKINJozX4kiVm6oeIhikVcMg+GmtiPQ0sRpWA=; b=Wc97O2eqaBihmI38/4glVdf1I3kMr/+2+vrDXNNx6Ph6zmrv+2yDI8ZQimi3K8nP8mCctr loD9SAtRnGnRivDFwseMAoD7CFKN2mxq+qo+kwBOWbUQStHFLRiKn+NawePssCkXVu6K97 SNMxTUb+7gQcPQIrTeXtdHvwQtiP8ok= Received: from mail-lj1-f197.google.com (mail-lj1-f197.google.com [209.85.208.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-186-ZS7Cl2dJMeiLYZx82wsOhA-1; Tue, 07 Nov 2023 19:13:19 -0500 X-MC-Unique: ZS7Cl2dJMeiLYZx82wsOhA-1 Received: by mail-lj1-f197.google.com with SMTP id 38308e7fff4ca-2c5161838d8so63107361fa.1 for ; Tue, 07 Nov 2023 16:13:19 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699402398; x=1700007198; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=s6qqEPqKINJozX4kiVm6oeIhikVcMg+GmtiPQ0sRpWA=; b=iLnamZOzFglYpvY4i8dkilpRVCSg55GGjbvdwWbywO2qIrpr54Y4u0UsH5sTOU2kZ0 QcpIr/z651S+PeouCmO/OVqksbMFMT/W7AQOFgDduEs/pAeWPR6d+RuFxFEYqIjNnfZq JpuJSlGiwuIJRYy7OBO00zrevAH+F/PBODTEqPA75aw0ycAfqFgAEJD3Sw7U/XlUutu7 U81OF0ocF/s5ix3cFX/kdIrrRQIABESoTTkPOA9egtRMzeH4+HM7qPMS/4xn0b+1TBi7 Ny4oIbwJyobTX16yFQjwD/FKXIk0+uDbHGcIT8pzF5oFTauYOESmphJDd9Ky0FFNWCEq 18Rw== X-Gm-Message-State: AOJu0Yy631rYvXnVc64kxALjheKQJ0RbKSw/gep7FQ213164sawI+NR2 B2sBTY+EVQfj0cwbd+L0yzQRG7Zkiet+iymqeqwZywcTm4SeAWiapgno+u/xjXzREMpRc7possJ XsQEqcYzDavc4w4XPgx0kUds4 X-Received: by 2002:ac2:5104:0:b0:507:a58f:79ad with SMTP id q4-20020ac25104000000b00507a58f79admr97839lfb.61.1699402398210; Tue, 07 Nov 2023 16:13:18 -0800 (PST) X-Received: by 2002:ac2:5104:0:b0:507:a58f:79ad with SMTP id q4-20020ac25104000000b00507a58f79admr97816lfb.61.1699402397864; Tue, 07 Nov 2023 16:13:17 -0800 (PST) Received: from cassiopeiae.. ([2a02:810d:4b3f:de9c:642:1aff:fe31:a19f]) by smtp.gmail.com with ESMTPSA id m9-20020a1709060d8900b0099cd1c0cb21sm168299eji.129.2023.11.07.16.13.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 16:13:17 -0800 (PST) From: Danilo Krummrich To: airlied@gmail.com, daniel@ffwll.ch, matthew.brost@intel.com, thomas.hellstrom@linux.intel.com, sarah.walker@imgtec.com, donald.robson@imgtec.com, boris.brezillon@collabora.com, christian.koenig@amd.com, faith@gfxstrand.net Cc: dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org, Danilo Krummrich , Dave Airlie Subject: [PATCH drm-misc-next v9 04/12] drm/nouveau: make use of drm_gpuvm_range_valid() Date: Wed, 8 Nov 2023 01:12:34 +0100 Message-ID: <20231108001259.15123-5-dakr@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231108001259.15123-1-dakr@redhat.com> References: <20231108001259.15123-1-dakr@redhat.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Tue, 07 Nov 2023 16:14:37 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781952652808727098 X-GMAIL-MSGID: 1781952652808727098 Use drm_gpuvm_range_valid() in order to validate userspace requests. Reviewed-by: Dave Airlie Signed-off-by: Danilo Krummrich --- drivers/gpu/drm/nouveau/nouveau_uvmm.c | 17 +---------------- drivers/gpu/drm/nouveau/nouveau_uvmm.h | 3 --- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_uvmm.c b/drivers/gpu/drm/nouveau/nouveau_uvmm.c index aaf5d28bd587..641a911528db 100644 --- a/drivers/gpu/drm/nouveau/nouveau_uvmm.c +++ b/drivers/gpu/drm/nouveau/nouveau_uvmm.c @@ -929,25 +929,13 @@ nouveau_uvmm_sm_unmap_cleanup(struct nouveau_uvmm *uvmm, static int nouveau_uvmm_validate_range(struct nouveau_uvmm *uvmm, u64 addr, u64 range) { - u64 end = addr + range; - u64 kernel_managed_end = uvmm->kernel_managed_addr + - uvmm->kernel_managed_size; - if (addr & ~PAGE_MASK) return -EINVAL; if (range & ~PAGE_MASK) return -EINVAL; - if (end <= addr) - return -EINVAL; - - if (addr < NOUVEAU_VA_SPACE_START || - end > NOUVEAU_VA_SPACE_END) - return -EINVAL; - - if (addr < kernel_managed_end && - end > uvmm->kernel_managed_addr) + if (!drm_gpuvm_range_valid(&uvmm->base, addr, range)) return -EINVAL; return 0; @@ -1834,9 +1822,6 @@ nouveau_uvmm_init(struct nouveau_uvmm *uvmm, struct nouveau_cli *cli, goto out_unlock; } - uvmm->kernel_managed_addr = kernel_managed_addr; - uvmm->kernel_managed_size = kernel_managed_size; - drm_gpuvm_init(&uvmm->base, cli->name, drm, NOUVEAU_VA_SPACE_START, NOUVEAU_VA_SPACE_END, diff --git a/drivers/gpu/drm/nouveau/nouveau_uvmm.h b/drivers/gpu/drm/nouveau/nouveau_uvmm.h index a308c59760a5..06a0c36de392 100644 --- a/drivers/gpu/drm/nouveau/nouveau_uvmm.h +++ b/drivers/gpu/drm/nouveau/nouveau_uvmm.h @@ -14,9 +14,6 @@ struct nouveau_uvmm { struct mutex mutex; struct dma_resv resv; - u64 kernel_managed_addr; - u64 kernel_managed_size; - bool disabled; };