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 8490C82C60; Tue, 29 Apr 2025 16:46:35 +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=1745945195; cv=none; b=aGYbj5jCIxu/sLItBOwkQyIaos9+v8RtZBJMbKwzQXjSI6t8VbU6DI4S6Bl6SkrewO8CftiMLImAeSpVLXk4nS3PVXv3n4U5G7vxhn6YsT8QKHWbWBLMQ0jGHZmsVks6ztlLKGVHnBjpnx7ZkF96zhKCIlUAhuR6H4WvV4ybllI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745945195; c=relaxed/simple; bh=T6HiDsI73nq16zSxlvFFHfwkOuZIUr8HrG8/wjOBTso=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=W8/1n7aXYTxZEQY++gbYB0Q6Pbpk4RZx8cQALutdcC32qW88xyDhL8ucdIGQnQYY2HZhqAHsjlGEqrX6yFo10m1oYpLjFcDkRqps2steanavQFBOjobg0pI1w71HfArmOqhAU3O2oXW6fRQKbrnm/OY8D4RcWTYbIvOkNQyAT1c= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=mzQXNtdR; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="mzQXNtdR" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0CB63C4CEE3; Tue, 29 Apr 2025 16:46:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1745945195; bh=T6HiDsI73nq16zSxlvFFHfwkOuZIUr8HrG8/wjOBTso=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mzQXNtdR2z/agoR0es/2OVnTb6pp4L3yy2R3YTIy8wBssiZQrg0KqAAjWnZ4WEdLd E2GQCNkKd9V7tZtcWYA9qdaC5T9eY+Q9KmBezKoTjp0e9+HGr2dIccrmLmruSe+ZRa 6J8SMiNE0kuidy4zFlwEBERD6sV/ij0izcpP8vTE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, David Yat Sin , Jay Cornwall , Harish Kasiviswanathan , Alex Deucher , Sasha Levin Subject: [PATCH 5.4 033/179] drm/amdkfd: clamp queue size to minimum Date: Tue, 29 Apr 2025 18:39:34 +0200 Message-ID: <20250429161050.750593709@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250429161049.383278312@linuxfoundation.org> References: <20250429161049.383278312@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.4-stable review patch. If anyone has any objections, please let me know. ------------------ 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 b99e6b2e0acac..a845eda14ece3 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c @@ -169,6 +169,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"); @@ -373,6 +378,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 20917c59f39c9..899e7c0f5f669 100644 --- a/include/uapi/linux/kfd_ioctl.h +++ b/include/uapi/linux/kfd_ioctl.h @@ -43,6 +43,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