From patchwork Wed Nov 8 00:12:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Danilo Krummrich X-Patchwork-Id: 162829 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:aa0b:0:b0:403:3b70:6f57 with SMTP id k11csp600483vqo; Tue, 7 Nov 2023 16:16:11 -0800 (PST) X-Google-Smtp-Source: AGHT+IEllvRcZ7IVw1Czxej3JrnOOqaVYTNb81GIAX54NbhmgCZNiYY3ZV4XBsLW9DJB0OjUvmL0 X-Received: by 2002:a17:902:e890:b0:1cc:5c49:6af8 with SMTP id w16-20020a170902e89000b001cc5c496af8mr530687plg.25.1699402571337; Tue, 07 Nov 2023 16:16:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699402571; cv=none; d=google.com; s=arc-20160816; b=V8+q+rLhRdcqGYswC1oGIpetBoKlnFb8PtB2BEmMQ2/tcZ1d3Mi569c/3ijiusXYbE 79KO6brJvBLvH5zpbyu0tDL7pLZ58YsuKsMPxfALejuEvfJgdr+qxaxXTmqC3ad013sK 2RPFPumheQK2vWPhLnYQFMffcxz4QTbt6cTKICUfw76W6Sxm/EvZJcHkmNkRg+TeZWoE seUqQd+MLQ1ZKurUvjCwlo8GEObuIAkr3JCdqQpN5+Qw3A0rejeR2ldavoD8FyO9DuXu 9rxkhjbIE9Z9Pqm/w0a4Jrg8WqsiXVKDdnI5pClT5KyPSZ42Tq6gyKAztSZmCFJjJpIl wrEQ== 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=1lD0COgBfwH5UYAd332SA45aE7haVTJhuDDmzsBJW6I=; fh=8dtrvlz6eC1As92HJPwYWdp8qGhbMzdOhqcu6vG4iUM=; b=CYs/48vfsYFMbmh4pba1wq7oF0IeHKpxV430kbNfl2xPptMu3d4Km1NraYawlobwU/ tra5KP/tTEdrlweoNMpMOct1BvHqMiQm4zcCugnqylZ+fCorOLu3KBS2ZXe293XeUbiw qpAwacTETk3HAEYddMXQIS8SIhcpSgb3QugrFYH1ugO1pQxOYQZhyblJbGF8dMtE4vu8 I776DU25HOpObtwaWF6wz/p51LoQ6vfgsrv4zKjpNq9PUBtylASkET+jGUJW2WrOW2mk srWw0U/lwxtpsnyobdNu/uVs1dqRr9+t7ZV4Y7SbKsxcGCFCwkOL+wYRSwuybmklCghX ZJTw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=LPZX32ej; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id d10-20020a170903230a00b001c9d22299e2si993238plh.437.2023.11.07.16.16.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 16:16:11 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=LPZX32ej; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (Postfix) with ESMTP id F3FF6805F3F7; Tue, 7 Nov 2023 16:15:46 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235165AbjKHAN7 (ORCPT + 32 others); Tue, 7 Nov 2023 19:13:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36420 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235261AbjKHANz (ORCPT ); Tue, 7 Nov 2023 19:13:55 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A6EED10EC for ; Tue, 7 Nov 2023 16:13:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1699402392; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1lD0COgBfwH5UYAd332SA45aE7haVTJhuDDmzsBJW6I=; b=LPZX32ejYTYOs+h8HEUlDcywROLF3yb/6xPGcRAhoaVZWh2aX5eauZzfrkK/jcvnW4zfIt PnP7Upjxs+MZuIhWxaIS3CtZwdXGUQpuwmFpVTQURX5iCkO99cYAo8dSl8TxqumKtz1IpV PclaednWXNpjezRkHG1ZVOrG3kE8TTE= Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-267-ssFLEtEcPGORHd7ooVs7hw-1; Tue, 07 Nov 2023 19:13:08 -0500 X-MC-Unique: ssFLEtEcPGORHd7ooVs7hw-1 Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-53fa5cd4480so4904903a12.0 for ; Tue, 07 Nov 2023 16:13:08 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699402387; x=1700007187; 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=1lD0COgBfwH5UYAd332SA45aE7haVTJhuDDmzsBJW6I=; b=UPCZbecbBYFjhLPtPlT+xHcaRuVM1YNTQUcFxhJ7bGCGFv2eE325FubVyjY7ZRlOXL Y+9AmgxxK0irvvTn6v5nLmD6y0uD3gEHixboapsQgTIBzFBrcJNrtgsuET7bqIC1jHgP XA2VCFYnQm1MGK+j3ZCfCyQ3hH647bxkXcvKvhhb5mHvMn6Fp1ZBe4cXJbQD7tsJBxBX IJJ5SSwTA5YfBO6nNfDR+6lUqvLatDjpoFXvsYSMXJpEIW7MbztYTS7MP672FRK7JXpB T8rxNYyrVqLMEHwSY9qR4mjQySc4oXATwvdJgULrJOLhrzZhdq2C8iB/1DJd+0enobIM 9Cqw== X-Gm-Message-State: AOJu0Ywv+TXNJDVlRo/Na5Y56459Yn/LP3zDRHR6VfVxXhjZQcL1ZIPo IAcBnheQSp+hUF9KKa8xOurpAtRVghe9bYKWlUsXSaF3BjGH/gXSfEVYjYyZ78w0M+UFFCEwoDu zrXQsqAvld7uG9qwlht89NtnS X-Received: by 2002:a17:906:c104:b0:9b2:b786:5e9c with SMTP id do4-20020a170906c10400b009b2b7865e9cmr165784ejc.28.1699402387472; Tue, 07 Nov 2023 16:13:07 -0800 (PST) X-Received: by 2002:a17:906:c104:b0:9b2:b786:5e9c with SMTP id do4-20020a170906c10400b009b2b7865e9cmr165766ejc.28.1699402387236; Tue, 07 Nov 2023 16:13:07 -0800 (PST) Received: from cassiopeiae.. ([2a02:810d:4b3f:de9c:642:1aff:fe31:a19f]) by smtp.gmail.com with ESMTPSA id qx11-20020a170906fccb00b009b2f2451381sm169643ejb.182.2023.11.07.16.13.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 16:13:06 -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 Subject: [PATCH drm-misc-next v9 01/12] drm/gpuvm: convert WARN() to drm_WARN() variants Date: Wed, 8 Nov 2023 01:12:31 +0100 Message-ID: <20231108001259.15123-2-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 (agentk.vger.email [0.0.0.0]); Tue, 07 Nov 2023 16:15:47 -0800 (PST) X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781952750706438262 X-GMAIL-MSGID: 1781952750706438262 Use drm_WARN() and drm_WARN_ON() variants to indicate drivers the context the failing VM resides in. Reviewed-by: Boris Brezillon Reviewed-by: Thomas Hellström Signed-off-by: Danilo Krummrich --- drivers/gpu/drm/drm_gpuvm.c | 32 ++++++++++++++------------ drivers/gpu/drm/nouveau/nouveau_uvmm.c | 3 ++- include/drm/drm_gpuvm.h | 7 ++++++ 3 files changed, 26 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/drm_gpuvm.c b/drivers/gpu/drm/drm_gpuvm.c index 08c088319652..d7367a202fee 100644 --- a/drivers/gpu/drm/drm_gpuvm.c +++ b/drivers/gpu/drm/drm_gpuvm.c @@ -614,12 +614,12 @@ static int __drm_gpuva_insert(struct drm_gpuvm *gpuvm, static void __drm_gpuva_remove(struct drm_gpuva *va); static bool -drm_gpuvm_check_overflow(u64 addr, u64 range) +drm_gpuvm_check_overflow(struct drm_gpuvm *gpuvm, u64 addr, u64 range) { u64 end; - return WARN(check_add_overflow(addr, range, &end), - "GPUVA address limited to %zu bytes.\n", sizeof(end)); + return drm_WARN(gpuvm->drm, check_add_overflow(addr, range, &end), + "GPUVA address limited to %zu bytes.\n", sizeof(end)); } static bool @@ -647,7 +647,7 @@ static bool drm_gpuvm_range_valid(struct drm_gpuvm *gpuvm, u64 addr, u64 range) { - return !drm_gpuvm_check_overflow(addr, range) && + return !drm_gpuvm_check_overflow(gpuvm, addr, range) && drm_gpuvm_in_mm_range(gpuvm, addr, range) && !drm_gpuvm_in_kernel_node(gpuvm, addr, range); } @@ -656,6 +656,7 @@ drm_gpuvm_range_valid(struct drm_gpuvm *gpuvm, * drm_gpuvm_init() - initialize a &drm_gpuvm * @gpuvm: pointer to the &drm_gpuvm to initialize * @name: the name of the GPU VA space + * @drm: the &drm_device this VM resides in * @start_offset: the start offset of the GPU VA space * @range: the size of the GPU VA space * @reserve_offset: the start of the kernel reserved GPU VA area @@ -668,8 +669,8 @@ drm_gpuvm_range_valid(struct drm_gpuvm *gpuvm, * &name is expected to be managed by the surrounding driver structures. */ void -drm_gpuvm_init(struct drm_gpuvm *gpuvm, - const char *name, +drm_gpuvm_init(struct drm_gpuvm *gpuvm, const char *name, + struct drm_device *drm, u64 start_offset, u64 range, u64 reserve_offset, u64 reserve_range, const struct drm_gpuvm_ops *ops) @@ -677,20 +678,20 @@ drm_gpuvm_init(struct drm_gpuvm *gpuvm, gpuvm->rb.tree = RB_ROOT_CACHED; INIT_LIST_HEAD(&gpuvm->rb.list); - drm_gpuvm_check_overflow(start_offset, range); - gpuvm->mm_start = start_offset; - gpuvm->mm_range = range; - gpuvm->name = name ? name : "unknown"; gpuvm->ops = ops; + gpuvm->drm = drm; - memset(&gpuvm->kernel_alloc_node, 0, sizeof(struct drm_gpuva)); + drm_gpuvm_check_overflow(gpuvm, start_offset, range); + gpuvm->mm_start = start_offset; + gpuvm->mm_range = range; + memset(&gpuvm->kernel_alloc_node, 0, sizeof(struct drm_gpuva)); if (reserve_range) { gpuvm->kernel_alloc_node.va.addr = reserve_offset; gpuvm->kernel_alloc_node.va.range = reserve_range; - if (likely(!drm_gpuvm_check_overflow(reserve_offset, + if (likely(!drm_gpuvm_check_overflow(gpuvm, reserve_offset, reserve_range))) __drm_gpuva_insert(gpuvm, &gpuvm->kernel_alloc_node); } @@ -712,8 +713,8 @@ drm_gpuvm_destroy(struct drm_gpuvm *gpuvm) if (gpuvm->kernel_alloc_node.va.range) __drm_gpuva_remove(&gpuvm->kernel_alloc_node); - WARN(!RB_EMPTY_ROOT(&gpuvm->rb.tree.rb_root), - "GPUVA tree is not empty, potentially leaking memory."); + drm_WARN(gpuvm->drm, !RB_EMPTY_ROOT(&gpuvm->rb.tree.rb_root), + "GPUVA tree is not empty, potentially leaking memory.\n"); } EXPORT_SYMBOL_GPL(drm_gpuvm_destroy); @@ -795,7 +796,8 @@ drm_gpuva_remove(struct drm_gpuva *va) struct drm_gpuvm *gpuvm = va->vm; if (unlikely(va == &gpuvm->kernel_alloc_node)) { - WARN(1, "Can't destroy kernel reserved node.\n"); + drm_WARN(gpuvm->drm, 1, + "Can't destroy kernel reserved node.\n"); return; } diff --git a/drivers/gpu/drm/nouveau/nouveau_uvmm.c b/drivers/gpu/drm/nouveau/nouveau_uvmm.c index 5cf892c50f43..aaf5d28bd587 100644 --- a/drivers/gpu/drm/nouveau/nouveau_uvmm.c +++ b/drivers/gpu/drm/nouveau/nouveau_uvmm.c @@ -1808,6 +1808,7 @@ int nouveau_uvmm_init(struct nouveau_uvmm *uvmm, struct nouveau_cli *cli, u64 kernel_managed_addr, u64 kernel_managed_size) { + struct drm_device *drm = cli->drm->dev; int ret; u64 kernel_managed_end = kernel_managed_addr + kernel_managed_size; @@ -1836,7 +1837,7 @@ nouveau_uvmm_init(struct nouveau_uvmm *uvmm, struct nouveau_cli *cli, uvmm->kernel_managed_addr = kernel_managed_addr; uvmm->kernel_managed_size = kernel_managed_size; - drm_gpuvm_init(&uvmm->base, cli->name, + drm_gpuvm_init(&uvmm->base, cli->name, drm, NOUVEAU_VA_SPACE_START, NOUVEAU_VA_SPACE_END, kernel_managed_addr, kernel_managed_size, diff --git a/include/drm/drm_gpuvm.h b/include/drm/drm_gpuvm.h index bdfafc4a7705..687fd5893624 100644 --- a/include/drm/drm_gpuvm.h +++ b/include/drm/drm_gpuvm.h @@ -29,6 +29,7 @@ #include #include +#include #include struct drm_gpuvm; @@ -201,6 +202,11 @@ struct drm_gpuvm { */ const char *name; + /** + * @drm: the &drm_device this VM lives in + */ + struct drm_device *drm; + /** * @mm_start: start of the VA space */ @@ -241,6 +247,7 @@ struct drm_gpuvm { }; void drm_gpuvm_init(struct drm_gpuvm *gpuvm, const char *name, + struct drm_device *drm, u64 start_offset, u64 range, u64 reserve_offset, u64 reserve_range, const struct drm_gpuvm_ops *ops);