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 AA21625FA06; Thu, 3 Apr 2025 19:20:20 +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=1743708020; cv=none; b=RoWsdrGPSNssmugAW9Bj6OL7v7L18z39BO+DwpaMYS9OwiLx3R1jRckRoUbuEcN87g/NrvlhPZgrBvwRgy2tyBkG7AFtGRj4WxkyIH9FRWXjwNjrZ9T4++jFCMOSc1qDJc8O1XvBaLdRW3uO7jbRBXcfI7csbp0X5Z6pZ8aTo1s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743708020; c=relaxed/simple; bh=er1MmH+M82FspL5jq9X8etCH4kBkgrTGFvmfL3u1tC8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=uoSgbtBCmb/s1IE2+PBR8j0YblJUAV9yMPERD4mRm0cy84OyeB+9lyVbiMIeMYgCFOerrfTmGail2P7IUiNSZifBEjFTF4cylCZVKq0N0etfr3Ph+ffBJj7WWPc6pu6yv94Q+2ARKR6/X7mLjnC5/esCTDA4SV9Zr4hdj8QuxUg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=d59gyW7r; 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="d59gyW7r" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 38221C4CEE8; Thu, 3 Apr 2025 19:20:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743708020; bh=er1MmH+M82FspL5jq9X8etCH4kBkgrTGFvmfL3u1tC8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=d59gyW7rHX/eoJ6AoSS5rJRlrZfEyLGz/ocI0s0ixo+A9QI1NXj1rNvJjjF9dEJqz CBz8hxGu3fLKWXzRWAzFbPrBdR5GWFaOedZRXqqu1uEEMe8wcKT9K9Wp/wzfM41OzS cVY0Zuc/VOG7lutfSD2nC8e8ASnB88E02OesqLTLhTFPyHtEz2C9wi78SxO8u5gwBa 1aIwQnmojLX8TjxR3JQD+mI4fKDivYtefctTioXOiPAGTCDqkVSJq4AwIRLvaolQPO XlCW74MxRnvE0J/Krir/H8SlI04KRg7leIgw4kG1zpPMIBrVSMPpq1O036Yb3ybKhD 6MfYdCW4ZtCQw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: David Yat Sin , Jay Cornwall , Harish Kasiviswanathan , Alex Deucher , Sasha Levin , Felix.Kuehling@amd.com, christian.koenig@amd.com, airlied@gmail.com, simona@ffwll.ch, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.15 07/12] drm/amdkfd: clamp queue size to minimum Date: Thu, 3 Apr 2025 15:19:56 -0400 Message-Id: <20250403192001.2682149-7-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250403192001.2682149-1-sashal@kernel.org> References: <20250403192001.2682149-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.15.179 Content-Transfer-Encoding: 8bit From: David Yat Sin [ Upstream commit e90711946b53590371ecce32e8fcc381a99d6333 ] If queue size is less than minimum, clamp it to minimum to prevent underflow when writing queue mqd. Signed-off-by: David Yat Sin Reviewed-by: Jay Cornwall Reviewed-by: Harish Kasiviswanathan Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 10 ++++++++++ include/uapi/linux/kfd_ioctl.h | 2 ++ 2 files changed, 12 insertions(+) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c index 34c466e8eee98..7b2111be3019a 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c @@ -191,6 +191,11 @@ static int set_queue_properties_from_user(struct queue_properties *q_properties, return -EINVAL; } + if (args->ring_size < KFD_MIN_QUEUE_RING_SIZE) { + args->ring_size = KFD_MIN_QUEUE_RING_SIZE; + pr_debug("Size lower. clamped to KFD_MIN_QUEUE_RING_SIZE"); + } + if (!access_ok((const void __user *) args->read_pointer_address, sizeof(uint32_t))) { pr_err("Can't access read pointer\n"); @@ -395,6 +400,11 @@ static int kfd_ioctl_update_queue(struct file *filp, struct kfd_process *p, return -EINVAL; } + if (args->ring_size < KFD_MIN_QUEUE_RING_SIZE) { + args->ring_size = KFD_MIN_QUEUE_RING_SIZE; + pr_debug("Size lower. clamped to KFD_MIN_QUEUE_RING_SIZE"); + } + properties.queue_address = args->ring_base_address; properties.queue_size = args->ring_size; properties.queue_percent = args->queue_percentage; diff --git a/include/uapi/linux/kfd_ioctl.h b/include/uapi/linux/kfd_ioctl.h index af96af174dc47..48d747f3ee8db 100644 --- a/include/uapi/linux/kfd_ioctl.h +++ b/include/uapi/linux/kfd_ioctl.h @@ -50,6 +50,8 @@ struct kfd_ioctl_get_version_args { #define KFD_MAX_QUEUE_PERCENTAGE 100 #define KFD_MAX_QUEUE_PRIORITY 15 +#define KFD_MIN_QUEUE_RING_SIZE 1024 + struct kfd_ioctl_create_queue_args { __u64 ring_base_address; /* to KFD */ __u64 write_pointer_address; /* from KFD */ -- 2.39.5