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 82A72263F2B; Thu, 3 Apr 2025 19:20:43 +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=1743708043; cv=none; b=I7p77u5/BNWNf1wRyzgXwx+RWcJ6VIHmL4D/nj7r27ORCfiF0gjqf2psV0uTJu+IBKfeome0dAeyHjE1tRuvKab4BDG0O1AMfpYWeMqrjF8CQo+2ehvF0XdUm0PMLxaz+eLnH7UDZ8ezJCgia7Fbjy/ajRkI9/qqR6nwKNqkmSA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743708043; c=relaxed/simple; bh=/TiEd8QpjwjTY2cLqZ9I7SAJBki2PToxR+Wm5w5FtxQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=oV4h+VO3xNRjK/P9WIvLAgaSK+7bE+vdMxhkPnqX761b8FALmSRqm0IBnQApuUoJZmbTni6G0z7ij8MdyWN3k4GftO0Vok16YKJLmpuapnnBritUpbvlTTmv7iucaW4b6QlMs3xIGClFuB54+FlGEITpTZze8R3IPCKBA6K6Wpo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=jovVBsXq; 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="jovVBsXq" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0FA10C4CEE9; Thu, 3 Apr 2025 19:20:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743708043; bh=/TiEd8QpjwjTY2cLqZ9I7SAJBki2PToxR+Wm5w5FtxQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jovVBsXqzLoX0J4Nlf5irfs1BkCtp/euV0G1swQT6396N4m17lJbNHHg0l+lrNvvA zDi90zPzjyMzWqyUa6mRt5GzcipILNye6hkJHhaxdUEo+qLMSKJzJrTnb2R5DiqCUY DU/ZXZ1oOzFBrgN3QblArdqgLhnbkfjgq27vm5+Vvu4MM7MGcZX+ZvB1mRnwJDfihd kc3Ey5FSmlZANmjCbENaoBrDE7oJ78PVKkArxi/ztLcEYoKJXinitBjN2zSE1YiU0Y YMV2XOXjAfCv76KxCsr87RyYjDLqPXwyv9yncpoREyEgtNo2FyEicVQ5Xz6uX8yIlY MYh96CbmtaW2w== 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.10 5/8] drm/amdkfd: clamp queue size to minimum Date: Thu, 3 Apr 2025 15:20:27 -0400 Message-Id: <20250403192031.2682315-5-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250403192031.2682315-1-sashal@kernel.org> References: <20250403192031.2682315-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.10.235 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 9a444b17530a4..869c8786df5c9 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c @@ -190,6 +190,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"); @@ -394,6 +399,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 695b606da4b15..94af84e845549 100644 --- a/include/uapi/linux/kfd_ioctl.h +++ b/include/uapi/linux/kfd_ioctl.h @@ -47,6 +47,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