From nobody Fri Apr 10 15:50:58 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 31BEFC00140 for ; Wed, 24 Aug 2022 08:47:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235923AbiHXIrs (ORCPT ); Wed, 24 Aug 2022 04:47:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55664 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236064AbiHXIpq (ORCPT ); Wed, 24 Aug 2022 04:45:46 -0400 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D5B3E6EF37 for ; Wed, 24 Aug 2022 01:45:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1661330745; x=1692866745; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=bNeVdVfZ7gqb0naDT5qkkW6jZqVEr8L6HjhifYEvt0M=; b=GHvvxUUqhzu50DE6xeWbyyFj3IrflJr44EfKudQQuHtbzsI4FKlor0qp rNJP2Qxfbl2IM2vL+48fMhmyodSu3FFDVy0ZYDu7cRGMQr4BXh1v5A9xZ ST+JHhggrfAUQ2c49Vmr8pydUTK41BLYgsPPkUgxY8Pr0IuFVscOOim3U JhGP/NNzG4gOQTjDj1y8i8aO0hUEawLd6VQbQ2ChbX83/Du2x64TAg889 4Jk80zr4QrKJDjlmgWyHpvWBB3D8VZ7MU0L5jLTEkZCTeMLUZ3itinzbH WbflUI076asvh04xj2Wwegrn8J4x7XHsj2aMvcjBmu/LTZdwJ93ikRn3c A==; X-IronPort-AV: E=McAfee;i="6500,9779,10448"; a="357882524" X-IronPort-AV: E=Sophos;i="5.93,260,1654585200"; d="scan'208";a="357882524" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Aug 2022 01:45:45 -0700 X-IronPort-AV: E=Sophos;i="5.93,260,1654585200"; d="scan'208";a="785554023" Received: from yuhsuanc-mobl.gar.corp.intel.com (HELO paris.amr.corp.intel.com) ([10.254.38.238]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Aug 2022 01:45:41 -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, keescook@chromium.org, mauro.chehab@linux.intel.com, intel-gfx-trybot@lists.freedesktop.org Subject: [PATCH v9 5/8] drm/i915: Check for integer truncation on the configuration of ttm place Date: Wed, 24 Aug 2022 17:45:11 +0900 Message-Id: <20220824084514.2261614-6-gwan-gyeong.mun@intel.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220824084514.2261614-1-gwan-gyeong.mun@intel.com> References: <20220824084514.2261614-1-gwan-gyeong.mun@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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) v8: Replace safe_conversion() with check_assign() (Kees) Signed-off-by: Gwan-gyeong Mun Cc: Chris Wilson Cc: Matthew Auld Cc: Thomas Hellstr=C3=B6m 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 d708c4c2a9bd..615541b650fa 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 |=3D TTM_PL_FLAG_CONTIGUOUS; if (offset !=3D I915_BO_INVALID_OFFSET) { - place->fpfn =3D offset >> PAGE_SHIFT; - place->lpfn =3D place->fpfn + (size >> PAGE_SHIFT); + WARN_ON(check_assign(offset >> PAGE_SHIFT, &place->fpfn)); + WARN_ON(check_assign(place->fpfn + (size >> PAGE_SHIFT), &place->lpfn)); } else if (mr->io_size && mr->io_size < mr->total) { if (flags & I915_BO_ALLOC_GPU_ONLY) { place->flags |=3D TTM_PL_FLAG_TOPDOWN; } else { place->fpfn =3D 0; - place->lpfn =3D mr->io_size >> PAGE_SHIFT; + WARN_ON(check_assign(mr->io_size >> PAGE_SHIFT, &place->lpfn)); } } } diff --git a/drivers/gpu/drm/i915/intel_region_ttm.c b/drivers/gpu/drm/i915= /intel_region_ttm.c index 575d67bc6ffe..37a964b20b36 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_r= egion *mem, if (flags & I915_BO_ALLOC_CONTIGUOUS) place.flags |=3D TTM_PL_FLAG_CONTIGUOUS; if (offset !=3D I915_BO_INVALID_OFFSET) { - place.fpfn =3D offset >> PAGE_SHIFT; - place.lpfn =3D place.fpfn + (size >> PAGE_SHIFT); + if (WARN_ON(check_assign(offset >> PAGE_SHIFT, &place.fpfn))) { + ret =3D -E2BIG; + goto out; + } + if (WARN_ON(check_assign(place.fpfn + (size >> PAGE_SHIFT), &place.lpfn)= )) { + ret =3D -E2BIG; + goto out; + } } else if (mem->io_size && mem->io_size < mem->total) { if (flags & I915_BO_ALLOC_GPU_ONLY) { place.flags |=3D TTM_PL_FLAG_TOPDOWN; } else { place.fpfn =3D 0; - place.lpfn =3D mem->io_size >> PAGE_SHIFT; + if (WARN_ON(check_assign(mem->io_size >> PAGE_SHIFT, &place.lpfn))) { + ret =3D -E2BIG; + goto out; + } } } =20 @@ -224,6 +233,8 @@ intel_region_ttm_resource_alloc(struct intel_memory_reg= ion *mem, mock_bo.bdev =3D &mem->i915->bdev; =20 ret =3D man->func->alloc(man, &mock_bo, &place, &res); + +out: if (ret =3D=3D -ENOSPC) ret =3D -ENXIO; if (!ret) --=20 2.37.1