Received: by 2002:a05:6358:4e97:b0:b3:742d:4702 with SMTP id ce23csp3475901rwb; Tue, 16 Aug 2022 03:53:31 -0700 (PDT) X-Google-Smtp-Source: AA6agR5ZAvBW4RcCzkhILcIFGFkSyLB/Q0gB0wsbnJkcrxHXbg662Xw1f7r+RdAPW143zIOecVkm X-Received: by 2002:a17:902:b489:b0:171:5091:d53b with SMTP id y9-20020a170902b48900b001715091d53bmr21639364plr.44.1660647211191; Tue, 16 Aug 2022 03:53:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660647211; cv=none; d=google.com; s=arc-20160816; b=AAkhMtFEpWR17d0nxLX+P/xl4UtFHYvS0yC9SuB2IRmkW/YBkdgXGBRcNny3LpkNzz 3Tf9v6jrz5fYoPj5T4DrgEICUvE9dY50xEH5hfp1tgLSA9wJ9MJvA4Jv0i87E1W4ok+c dv3SEzJLb9v7iDd/bwLe18/x+N6KBDKcg+0qS92rHtlI+xLAlsoVCvvECzWCq1A9/EQ8 fX0oiVhgUQONMasp+iTvQHnwEvLOSQLqgYKUR2GLv92jA8klUvkyO4ivLsivw3UOQKXV L3VnM2RDcfkY5PgDIiwLjJOat3bakMDNGOeAM8wQre0JYeh57RtyKfkNK9p/FeSpd8No kxHA== 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=sqclwXfLvhh5cRPT4vAnGd/gbh6Oj90B4y5nko9YrxE=; b=S5tKS9lf6W4BpsW9aemCB5FXmrxh0r+FYw6NhSZaK6kncoqnDo5IxpOH5Lm3LsZS9Q bL1NGDfxLwLdz9CGprabmO+zpIbW/sXlInCt7JT1EJC6LNj9LOOe/PeusNl7mQTmEPPD Efg5fFfVH5ZKpWnfYNTJxpfwHZhxQiVF1BrlXeXcsLm7usCENsOz/KTX284IcT+rOhVf P9E5hR6a77B9LN5eEtbDjKWFo+8q2ibYmic+WyDsMPHuvcXz1M4EIz/7naS2qJyg/3Ir hr1iJr/QPcj00PEFwvK0RDipvMjlEMZD5oEEa+UEOgSthuKwm9ja3ShVTWiZAexJzjIb I7Kw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=LzBVBZ1i; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a27-20020a634d1b000000b004117e8114casi11805907pgb.483.2022.08.16.03.53.20; Tue, 16 Aug 2022 03:53:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=LzBVBZ1i; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233890AbiHPKPK (ORCPT + 99 others); Tue, 16 Aug 2022 06:15:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33480 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234365AbiHPKO2 (ORCPT ); Tue, 16 Aug 2022 06:14:28 -0400 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3AE53D6B86 for ; Tue, 16 Aug 2022 02:37:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1660642666; x=1692178666; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=YbTZ5iIy9piEvqt+t49zjJcJD4S60yZwdImbMwTaINQ=; b=LzBVBZ1i9ynbky0ifrIIeD2XlLNxy7Q9eNNAgAGbyQP+qkZHSzCB8la6 GBMGFK/GFdYNNVuiGXKFgltEXrE4x++K336BFoUQg1Jeu1lpXc8rYZNRG 9L84Bk+pdK1CiVkcinnyMCGAcPS3zFfbvS4vPfvsgC1tUw5GN0mNdKE+I P54pjZYEpVkyCK24+b5YXlABNts6NdR0UdYz2u9YjxCaDdT97uYyDgLU0 rjGjPn2orrAXUjbkJjigeOMuD82BIz47MccJsmFVj5v7B7SSNv3CVixEI +BsfbFwzs/Af9S9VoIxm1GxKuM3nA+iUeXcC5IOffIynBPNjcE9bi16v2 A==; X-IronPort-AV: E=McAfee;i="6400,9594,10440"; a="293446823" X-IronPort-AV: E=Sophos;i="5.93,240,1654585200"; d="scan'208";a="293446823" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Aug 2022 02:35:58 -0700 X-IronPort-AV: E=Sophos;i="5.93,240,1654585200"; d="scan'208";a="733231051" Received: from clbarnes-mobl.amr.corp.intel.com (HELO paris.amr.corp.intel.com) ([10.254.7.166]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Aug 2022 02:35:55 -0700 From: Gwan-gyeong Mun To: intel-gfx@lists.freedesktop.org Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, mchehab@kernel.org, chris@chris-wilson.co.uk, matthew.auld@intel.com, thomas.hellstrom@linux.intel.com, jani.nikula@intel.com, nirmoy.das@intel.com, airlied@linux.ie, daniel@ffwll.ch, andi.shyti@linux.intel.com, andrzej.hajda@intel.com Subject: [PATCH v7 5/8] drm/i915: Check for integer truncation on the configuration of ttm place Date: Tue, 16 Aug 2022 18:35:22 +0900 Message-Id: <20220816093525.184940-6-gwan-gyeong.mun@intel.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220816093525.184940-1-gwan-gyeong.mun@intel.com> References: <20220816093525.184940-1-gwan-gyeong.mun@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There is an impedance mismatch between the first/last valid page frame number of ttm place in unsigned and our memory/page accounting in unsigned long. As the object size is under the control of userspace, we have to be prudent and catch the conversion errors. To catch the implicit truncation as we switch from unsigned long to unsigned, we use overflows_type check and report E2BIG or overflow_type prior to the operation. v3: Not to change execution inside a macro. (Mauro) Add safe_conversion_gem_bug_on() macro and remove temporal SAFE_CONVERSION() macro. v4: Fix unhandled GEM_BUG_ON() macro call from safe_conversion_gem_bug_on() v6: Fix to follow general use case for GEM_BUG_ON(). (Jani) v7: Fix to use WARN_ON() macro where GEM_BUG_ON() macro was used. (Jani) Signed-off-by: Gwan-gyeong Mun Cc: Chris Wilson Cc: Matthew Auld Cc: Thomas Hellström Cc: Jani Nikula Reviewed-by: Nirmoy Das (v2) Reviewed-by: Mauro Carvalho Chehab (v3) Reported-by: kernel test robot Reviewed-by: Andrzej Hajda (v5) --- drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 6 +++--- drivers/gpu/drm/i915/intel_region_ttm.c | 17 ++++++++++++++--- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c index 9f2be1892b6c..69805cbe850c 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c @@ -140,14 +140,14 @@ i915_ttm_place_from_region(const struct intel_memory_region *mr, if (flags & I915_BO_ALLOC_CONTIGUOUS) place->flags |= TTM_PL_FLAG_CONTIGUOUS; if (offset != I915_BO_INVALID_OFFSET) { - place->fpfn = offset >> PAGE_SHIFT; - place->lpfn = place->fpfn + (size >> PAGE_SHIFT); + WARN_ON(!safe_conversion(&place->fpfn, offset >> PAGE_SHIFT)); + WARN_ON(!safe_conversion(&place->lpfn, place->fpfn + (size >> PAGE_SHIFT))); } else if (mr->io_size && mr->io_size < mr->total) { if (flags & I915_BO_ALLOC_GPU_ONLY) { place->flags |= TTM_PL_FLAG_TOPDOWN; } else { place->fpfn = 0; - place->lpfn = mr->io_size >> PAGE_SHIFT; + WARN_ON(!safe_conversion(&place->lpfn, mr->io_size >> PAGE_SHIFT)); } } } diff --git a/drivers/gpu/drm/i915/intel_region_ttm.c b/drivers/gpu/drm/i915/intel_region_ttm.c index 575d67bc6ffe..c8c6c2e22e01 100644 --- a/drivers/gpu/drm/i915/intel_region_ttm.c +++ b/drivers/gpu/drm/i915/intel_region_ttm.c @@ -209,14 +209,23 @@ intel_region_ttm_resource_alloc(struct intel_memory_region *mem, if (flags & I915_BO_ALLOC_CONTIGUOUS) place.flags |= TTM_PL_FLAG_CONTIGUOUS; if (offset != I915_BO_INVALID_OFFSET) { - place.fpfn = offset >> PAGE_SHIFT; - place.lpfn = place.fpfn + (size >> PAGE_SHIFT); + if (WARN_ON(!safe_conversion(&place.fpfn, offset >> PAGE_SHIFT))) { + ret = -E2BIG; + goto out; + } + if (WARN_ON(!safe_conversion(&place.lpfn, place.fpfn + (size >> PAGE_SHIFT)))) { + ret = -E2BIG; + goto out; + } } else if (mem->io_size && mem->io_size < mem->total) { if (flags & I915_BO_ALLOC_GPU_ONLY) { place.flags |= TTM_PL_FLAG_TOPDOWN; } else { place.fpfn = 0; - place.lpfn = mem->io_size >> PAGE_SHIFT; + if (WARN_ON(!safe_conversion(&place.lpfn, mem->io_size >> PAGE_SHIFT))) { + ret = -E2BIG; + goto out; + } } } @@ -224,6 +233,8 @@ intel_region_ttm_resource_alloc(struct intel_memory_region *mem, mock_bo.bdev = &mem->i915->bdev; ret = man->func->alloc(man, &mock_bo, &place, &res); + +out: if (ret == -ENOSPC) ret = -ENXIO; if (!ret) -- 2.37.1