From patchwork Wed Nov 8 00:12:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Danilo Krummrich X-Patchwork-Id: 162823 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:aa0b:0:b0:403:3b70:6f57 with SMTP id k11csp599619vqo; Tue, 7 Nov 2023 16:14:19 -0800 (PST) X-Google-Smtp-Source: AGHT+IEHP+2wtBaCZVeBATgDGkcAHMrMzB0ErQhiWzXyKS/VnBRkD/TIGps5JbCB0bt9TmN2NFwD X-Received: by 2002:a17:903:32cc:b0:1cc:4985:fbf8 with SMTP id i12-20020a17090332cc00b001cc4985fbf8mr549130plr.59.1699402459146; Tue, 07 Nov 2023 16:14:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699402459; cv=none; d=google.com; s=arc-20160816; b=gZ5Ipz8UR8zzDqyL7oDvpnXSSsqAQSjr2rXGxu9t4Xoq7AyzN3YnUgzfSLwYVMq26v jPmtrry1JhUeqESw8mtHkElebvXGpgVTk7NOl1hCZF1CyEnhOjM5GStNRxMheMJFk3R3 UAkzm8WQylAvhRySXNqMF1nqHyimGsHe7pLyLEcTagyYgbAUwNZ1TGCyQSoARsht3keQ jrCFgxWyRuOJNFaYOBJjjmSwUuCB2zgHYuCIv+YyfO/NtBoP14pDZavDSzJRficCjyoN SDyFQyNB/md+EkPwbEWC5tq42m6tAiOznykCz3Pd+jDx3KKmFkkm8UsEl7AJEVvAIFKS NXGQ== 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=4ctUbNYpz6tzYpOeogS+HZIyW2krgJWmH5IZy1f/TTs=; fh=8dtrvlz6eC1As92HJPwYWdp8qGhbMzdOhqcu6vG4iUM=; b=BRmJ4n4IIsqH+v4cgTD5jkjjQlZh5XBvn/cAX+sXxqto3OLSmyojMOA/+fku2deIoC nnRHgeIeW89ueQjuuNx9FM1WxXc3wSEF0b/8epkhmRyWlvUjTgQLtTChnrRC/ajkKMlW nKTImE9ks9bThOELH8DyUpJemwzloJnd4OTseyrwUwaXuuyFn83iGbIio4VdtLq5vZIw M7/B7KqMopJ0fLpx77JlDMXzXKS+kkJWz1SRtScuiTmGxnQH3rfZxZzdIhzdP2ZO6Yh7 1GPdYzQ/yefFxLzZu5D1m4g+cVOdaFLP5fShtYxmEKyFkxGFnOh4z7a4en5T8JUcEqZz UcvA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=UTVAWsKT; 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 b16-20020a170902d51000b001c5bb1f0cccsi1025979plg.275.2023.11.07.16.14.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 16:14:19 -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=UTVAWsKT; 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 6E83482CC40F; Tue, 7 Nov 2023 16:14:18 -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 S1343517AbjKHAOJ (ORCPT + 32 others); Tue, 7 Nov 2023 19:14:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36430 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235408AbjKHAOD (ORCPT ); Tue, 7 Nov 2023 19:14:03 -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 4229D10EB for ; Tue, 7 Nov 2023 16:13:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1699402393; 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=4ctUbNYpz6tzYpOeogS+HZIyW2krgJWmH5IZy1f/TTs=; b=UTVAWsKTyd0S0AIS1Cq/2T7F1Cmfyc5iF7g/+LLdp5G9dRAqMIgBoNq7qKY7lNeRmuxwU1 wLXLkBded5aK2R5G18SwcmJaHLzzeZPPRCEeRrId1bRUO72g6T8UO+dX/EigYy/FE79yEy E639w81uHOiUuQCGN4CaW1hHh6e08fY= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-652-2Tf6Qnt2MXuqVd9lX8z8hg-1; Tue, 07 Nov 2023 19:13:12 -0500 X-MC-Unique: 2Tf6Qnt2MXuqVd9lX8z8hg-1 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-9de267de2a0so273019766b.3 for ; Tue, 07 Nov 2023 16:13:12 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699402391; x=1700007191; 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=4ctUbNYpz6tzYpOeogS+HZIyW2krgJWmH5IZy1f/TTs=; b=GAtzfDl4OBcfYBdNdPOViR8UnPRfyE65H4Gbwk9HyT1lccyymqFLMkQpkQPxQGTHi5 m44TNLGWs71kucV1MX0AnjIyjg9JRLpnAmbeLQdh9uFZqByloGUJH/DkShHPd8IqEKm2 k31Z10XR367cVAFXM6nrxtszbF0iPGIznRsHM1fx6okwuAioTsSL2wSMle7UUyT6hrfb dJCOjpvCamcKp0eIqHionxMbKix8AtAgtq75UeDqqBLjKIaWam20T4WDzewAg/+WZNcM bsSd917jXBZ9OHM7X86f2ecL/r5j6bOW6RhZlhI+WKiYozGngXDk2lUwcuIUCXtuI7jo 9EaA== X-Gm-Message-State: AOJu0Yx4TAB97yC6fg5MDG6KLMQJUOAxnkGgFkyeTXnmSNaqIE7nEoyl l6mXqZRjfEF/gr/+qTMP72tQhm5IqDeYw1h8TXAW39qoakVsMYnd2wm9xOu+P3nqbJ2ssw+ZSO0 EybU8BLwmdHwDvfcJpQUfQU9r X-Received: by 2002:a17:907:72c2:b0:9b2:6d09:847c with SMTP id du2-20020a17090772c200b009b26d09847cmr128991ejc.10.1699402391141; Tue, 07 Nov 2023 16:13:11 -0800 (PST) X-Received: by 2002:a17:907:72c2:b0:9b2:6d09:847c with SMTP id du2-20020a17090772c200b009b26d09847cmr128975ejc.10.1699402390838; Tue, 07 Nov 2023 16:13:10 -0800 (PST) Received: from cassiopeiae.. ([2a02:810d:4b3f:de9c:642:1aff:fe31:a19f]) by smtp.gmail.com with ESMTPSA id f4-20020a170906048400b00988e953a586sm177311eja.61.2023.11.07.16.13.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 16:13:10 -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 02/12] drm/gpuvm: don't always WARN in drm_gpuvm_check_overflow() Date: Wed, 8 Nov 2023 01:12:32 +0100 Message-ID: <20231108001259.15123-3-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:18 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781952632592209140 X-GMAIL-MSGID: 1781952632592209140 Don't always WARN in drm_gpuvm_check_overflow() and separate it into a drm_gpuvm_check_overflow() and a dedicated drm_gpuvm_warn_check_overflow() variant. This avoids printing warnings due to invalid userspace requests. Reviewed-by: Thomas Hellström Signed-off-by: Danilo Krummrich Reviewed-by: Boris Brezillon --- drivers/gpu/drm/drm_gpuvm.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/drm_gpuvm.c b/drivers/gpu/drm/drm_gpuvm.c index d7367a202fee..445767f8fbc4 100644 --- a/drivers/gpu/drm/drm_gpuvm.c +++ b/drivers/gpu/drm/drm_gpuvm.c @@ -614,12 +614,18 @@ static int __drm_gpuva_insert(struct drm_gpuvm *gpuvm, static void __drm_gpuva_remove(struct drm_gpuva *va); static bool -drm_gpuvm_check_overflow(struct drm_gpuvm *gpuvm, u64 addr, u64 range) +drm_gpuvm_check_overflow(u64 addr, u64 range) { u64 end; - return drm_WARN(gpuvm->drm, check_add_overflow(addr, range, &end), - "GPUVA address limited to %zu bytes.\n", sizeof(end)); + return check_add_overflow(addr, range, &end); +} + +static bool +drm_gpuvm_warn_check_overflow(struct drm_gpuvm *gpuvm, u64 addr, u64 range) +{ + return drm_WARN(gpuvm->drm, drm_gpuvm_check_overflow(addr, range), + "GPUVA address limited to %zu bytes.\n", sizeof(addr)); } static bool @@ -647,7 +653,7 @@ static bool drm_gpuvm_range_valid(struct drm_gpuvm *gpuvm, u64 addr, u64 range) { - return !drm_gpuvm_check_overflow(gpuvm, addr, range) && + return !drm_gpuvm_check_overflow(addr, range) && drm_gpuvm_in_mm_range(gpuvm, addr, range) && !drm_gpuvm_in_kernel_node(gpuvm, addr, range); } @@ -682,7 +688,7 @@ drm_gpuvm_init(struct drm_gpuvm *gpuvm, const char *name, gpuvm->ops = ops; gpuvm->drm = drm; - drm_gpuvm_check_overflow(gpuvm, start_offset, range); + drm_gpuvm_warn_check_overflow(gpuvm, start_offset, range); gpuvm->mm_start = start_offset; gpuvm->mm_range = range; @@ -691,8 +697,8 @@ drm_gpuvm_init(struct drm_gpuvm *gpuvm, const char *name, gpuvm->kernel_alloc_node.va.addr = reserve_offset; gpuvm->kernel_alloc_node.va.range = reserve_range; - if (likely(!drm_gpuvm_check_overflow(gpuvm, reserve_offset, - reserve_range))) + if (likely(!drm_gpuvm_warn_check_overflow(gpuvm, reserve_offset, + reserve_range))) __drm_gpuva_insert(gpuvm, &gpuvm->kernel_alloc_node); } }