Received: by 2002:a05:6359:c8b:b0:c7:702f:21d4 with SMTP id go11csp628252rwb; Fri, 23 Sep 2022 01:46:55 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6LWnRrGpa739YpGESMlBjy2/zCd5hxlvYelqcgNo4nOYjm2UYik7ELbTZ+9DYCYsearRAS X-Received: by 2002:a17:907:72cd:b0:782:287f:d21c with SMTP id du13-20020a17090772cd00b00782287fd21cmr6170049ejc.200.1663922814742; Fri, 23 Sep 2022 01:46:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663922814; cv=none; d=google.com; s=arc-20160816; b=ScDi8IM5QnP/FR7hisdqTNCLt7YmWJyqw0CpNYI1cd3v2OA6jEElk+MEww6lZFaG20 jUXH4hiMcg90TWJR+y+12yVw4gNHeLnL8m55/gVqODeEUtNU5yJCikOpLKobdz/HslMX P/X0EsZfsXlWnt9xdU1KloQJzEn8baAqvZbxc3LvSLXlP7yCP7fD9Ajjy3jiwZTln6Xu zXXLUHvyfK8gdB989K7v0O9bXeADLgSKFJDm8/1EXHqEmZoqthlVk8ewcqa+3vtE5FlS W6nnn/s+1TWeWln5RilFCERUX7dRKVU5YXkbbfGzfLQ77AlR783FReNkfqt2ZM6xYUL3 vnWA== 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=ySPGbRscoS50iboMF72jM/LgHLCHGTa1UT3R587GKh4=; b=gbXSRkU7x5iyoBZ5XsmkZm32i/obrbAuEXu84iSECVuVrKAmgVXqHvOH4GoPbQCWw4 v7FuPRWelxCRTw35KgFyUF7wMDNMNWtR1wMwgRe8NbETIxier2QsNj6xyEsuLg5E3K6H 406lUAWHH6wBsqORywqRWgopGoJqvDpx8TWpdoArc1qLHAmkEJmTVa5iLoWmR/bxOo4A +JlHJ2uAO697D7mqBZojXtC47FOPxc3b5aHKnzoNRmLK/Y4WPc4SmkSAEGEOwjKzxw+4 mYvCwFbVjVn5Naf5yhWlAqAgzBzfrSrlIJbJCsCWByvT69qxEklbT84APKr2X8i9pjET uz+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=dgVarYZI; 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 y1-20020a170906470100b007707edd5487si6224178ejq.947.2022.09.23.01.46.28; Fri, 23 Sep 2022 01:46:54 -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=dgVarYZI; 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 S231310AbiIWI2u (ORCPT + 99 others); Fri, 23 Sep 2022 04:28:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59792 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231431AbiIWI2R (ORCPT ); Fri, 23 Sep 2022 04:28:17 -0400 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E48C11DF36 for ; Fri, 23 Sep 2022 01:27:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1663921661; x=1695457661; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=YqIgDiPhDFPxLISU3qiexRQnID3yCWHnQG5z64x4Sp8=; b=dgVarYZIseultyjU0fn3ZgiG0ztvd3jTGiiVFPkquB8r3/BbKJ1BKqPR SndZRMHhZ1hpX1O86c6oX4TYlWCVUKw/n+QouMP4LBIhOtPN5znWaq+dw PGXJ0QBamh+8CW9A8P7bACfi95J/S69nAZnlxdWeps00di/Bl7WZRN51m +qKWwXj38zjTlK63WfBcZPZIKtFIWqyGqfbhXOg9vfoFoJlIzbbPm4GyJ b+bqVcceydABgC9PaPXGR1pqy9b7ewYt03L2G4F5KMhubEr/tNpLYn4Jx HF1DZKxglWIknTNkV1dTlldMS5pp0DBRk9stq++I3ZfeDTHWmDrzlLqN7 Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10478"; a="386833575" X-IronPort-AV: E=Sophos;i="5.93,337,1654585200"; d="scan'208";a="386833575" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Sep 2022 01:27:36 -0700 X-IronPort-AV: E=Sophos;i="5.93,337,1654585200"; d="scan'208";a="622444278" Received: from ngoncia-mobl2.ger.corp.intel.com (HELO paris.ger.corp.intel.com) ([10.249.143.58]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Sep 2022 01:27:30 -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@redhat.com, daniel@ffwll.ch, andi.shyti@linux.intel.com, andrzej.hajda@intel.com, keescook@chromium.org, mauro.chehab@linux.intel.com, linux@rasmusvillemoes.dk, vitor@massaru.org, dlatypov@google.com, ndesaulniers@google.com Subject: [PATCH v11 8/9] drm/i915: Use error code as -E2BIG when the size of gem ttm object is too large Date: Fri, 23 Sep 2022 11:26:27 +0300 Message-Id: <20220923082628.3061408-9-gwan-gyeong.mun@intel.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220923082628.3061408-1-gwan-gyeong.mun@intel.com> References: <20220923082628.3061408-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 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 The ttm_bo_init_reserved() functions returns -ENOSPC if the size is too big to add vma. The direct function that returns -ENOSPC is drm_mm_insert_node_in_range(). To handle the same error as other code returning -E2BIG when the size is too large, it converts return value to -E2BIG. Signed-off-by: Gwan-gyeong Mun Cc: Chris Wilson Cc: Matthew Auld Cc: Thomas Hellström Reviewed-by: Nirmoy Das Reviewed-by: Mauro Carvalho Chehab Reviewed-by: Andrzej Hajda --- drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c index e6bbc0f8b7e6..62d3924a6377 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c @@ -1242,6 +1242,17 @@ int __i915_gem_ttm_object_init(struct intel_memory_region *mem, ret = ttm_bo_init_reserved(&i915->bdev, i915_gem_to_ttm(obj), bo_type, &i915_sys_placement, page_size >> PAGE_SHIFT, &ctx, NULL, NULL, i915_ttm_bo_destroy); + + /* + * XXX: The ttm_bo_init_reserved() functions returns -ENOSPC if the size + * is too big to add vma. The direct function that returns -ENOSPC is + * drm_mm_insert_node_in_range(). To handle the same error as other code + * that returns -E2BIG when the size is too large, it converts -ENOSPC to + * -E2BIG. + */ + if (size >> PAGE_SHIFT > INT_MAX && ret == -ENOSPC) + ret = -E2BIG; + if (ret) return i915_ttm_err_to_gem(ret); -- 2.37.1