From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E5A35149C43; Fri, 29 Mar 2024 12:43:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711716221; cv=none; b=b9op+Z3zwsGjoTWk6snKwzKiMwyWgRwws5pD1Gvj/WHVoo+A12JVImu2Yk7HANSSvWNdNXF+hlKtRm0Lkj009r9YO/zhPCltj2vK/v374iPIXCHLUZPpmU160G/RwBjAfPMovUpqhz4MroYDziPZb3Dzh1njpDA9RDbgu71AYfA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711716221; c=relaxed/simple; bh=uVcTjXED8/Jzk0oHqHrJCMbpNGjUw4igMCiReFmmYv8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=lIyv0W0tdsB8CIy1Ep7tog/VrVtSxLKwMMKUc0m2yv4aHJHgsqOidtBDLz5eIoQ4n9L3nVw1rfu6V2U7krLF0AntOU09S6PXWvygFYMXesTLyUL1QRMioJpl85oPFRrJFOP7rydiuzJEI3li4qEQ5PW08US9wDkmwPltRN/0728= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Z5mZdzsm; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Z5mZdzsm" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 75C8FC433C7; Fri, 29 Mar 2024 12:43:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711716220; bh=uVcTjXED8/Jzk0oHqHrJCMbpNGjUw4igMCiReFmmYv8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Z5mZdzsmH1xIPAU8HLvtt8GBSZe2gZB+PzsJMh20LfTRS9SIQc7lb+gJaxjt50PAZ +zBl5jKx2Mc4mNIZPkhSvVDQgkuTv4etjSyISLhUZRRwyN4dkz1z1iBqYbxnp/2uVZ fOau5FIphQ8kuJ9/FoVGJ7wyQfu0D5bOi69t3s9e8rXX7969ACLzkoBMOV5Jx15Zcb mfEVBV8h7uvplttcizTRtud5Gp1Fin82R4WDj7lFf0Mofu3zvk3HoPcEi0MVaC5KGr JcySZ2qmYsDktO74Cx0gcWX30lTwNHUlpKHd3IaRl648LOxftVs5B4cyJo6/usXG8j K/Cih+pNyaUeQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: =?UTF-8?q?Christian=20K=C3=B6nig?= , Zack Rusin , =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= , Sasha Levin , ray.huang@amd.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@gmail.com, daniel@ffwll.ch, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 6.6 05/75] drm/ttm: return ENOSPC from ttm_bo_mem_space v3 Date: Fri, 29 Mar 2024 08:41:46 -0400 Message-ID: <20240329124330.3089520-5-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240329124330.3089520-1-sashal@kernel.org> References: <20240329124330.3089520-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.23 Content-Transfer-Encoding: 8bit From: Christian König [ Upstream commit 28e5126718c7b306b8c29d2ae8f48417e9303aa1 ] Only convert it to ENOMEM in ttm_bo_validate. This allows ttm_bo_validate to distinguish between an out of memory situation and just out of space in a placement domain. v2: improve commit message v3: fix kerneldoc typos Signed-off-by: Christian König Reviewed-by: Zack Rusin Reviewed-by: Thomas Hellström Link: https://patchwork.freedesktop.org/patch/msgid/20240112125158.2748-3-christian.koenig@amd.com Signed-off-by: Sasha Levin --- drivers/gpu/drm/ttm/ttm_bo.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index e58b7e2498166..b3e5185835c37 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -764,7 +764,7 @@ static int ttm_bo_mem_force_space(struct ttm_buffer_object *bo, * This function may sleep while waiting for space to become available. * Returns: * -EBUSY: No space available (only if no_wait == 1). - * -ENOMEM: Could not allocate memory for the buffer object, either due to + * -ENOSPC: Could not allocate space for the buffer object, either due to * fragmentation or concurrent allocators. * -ERESTARTSYS: An interruptible sleep was interrupted by a signal. */ @@ -824,7 +824,7 @@ int ttm_bo_mem_space(struct ttm_buffer_object *bo, goto error; } - ret = -ENOMEM; + ret = -ENOSPC; if (!type_found) { pr_err(TTM_PFX "No compatible memory type found\n"); ret = -EINVAL; @@ -910,6 +910,9 @@ int ttm_bo_validate(struct ttm_buffer_object *bo, return -EINVAL; ret = ttm_bo_move_buffer(bo, placement, ctx); + /* For backward compatibility with userspace */ + if (ret == -ENOSPC) + return -ENOMEM; if (ret) return ret; -- 2.43.0