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 B9601261E5A; Thu, 3 Apr 2025 19:14:22 +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=1743707662; cv=none; b=mPVgAAOKDFSR30FziVZ2Uh9nGva4E5JpJW1q9PmSdvdxs0CdHBGreHRo/bGVd//OW+KdPzWls1gi30JP6tzHkEBSXv3psMkt8HkekFjkjQbn/+wazgW2p4jFTsEdhETybwCe/+xY0AhA7VBc2yDnqnno/XGS/2c270Wd3vvClAU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743707662; c=relaxed/simple; bh=/+6uJgECy3WayQlYFX/FtZPH+05V1FIc+5IxYG12cKM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=mOJNZNAjeguPoQM4vgSsUnxm+M56mlGPrFTwPVduti+rd7cpkwtcO3qR8mQfFSg/tBdlrdU2teZuOSybtKx0AauxCtwGmsELMr3/tVloHf2SsIK4jfk3EEohx4QXtMShXwlveZxrj5CnCJ4t8JlqhO6ceX8CZzxWLIdsuWJP3wk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ZOjkMXVh; 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="ZOjkMXVh" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5085DC4CEEA; Thu, 3 Apr 2025 19:14:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743707662; bh=/+6uJgECy3WayQlYFX/FtZPH+05V1FIc+5IxYG12cKM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZOjkMXVh9OS82tykp6/w/Y1yxF1n58gojZqhe89Zheeh6HfICHLGpBJWw8cZARyxv PJiTMCsNpRNvbe+6EXpQMUTc/8LKbssOD495pz+YEzfsSD+GSkzBnjeYbtudjiQgEL YjgsrT3/7GCF3sfoHhUgV9dnoE8fvb2RSco/lF2DFftB9tAb6/NcC1PUAaVEtGDnJz 0HiMvFXwvzCws+uqI7gNKhPactYV9+8IYeq88RuWgHgRXRBiwvF336ofgNsza/XkR5 Hvy3OYULYc5So3kV2gC3gnvTPqiYmVxi0YEPb0zLL6QZtBWPVU7NXZ9Y27RnzkRb4v +GSsIkqRUnXiA== 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 6.14 22/44] drm/amdkfd: clamp queue size to minimum Date: Thu, 3 Apr 2025 15:12:51 -0400 Message-Id: <20250403191313.2679091-22-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250403191313.2679091-1-sashal@kernel.org> References: <20250403191313.2679091-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 6.14 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 065d878414591..33df35cab4679 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c @@ -212,6 +212,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"); @@ -461,6 +466,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 & 0xFF; diff --git a/include/uapi/linux/kfd_ioctl.h b/include/uapi/linux/kfd_ioctl.h index fa9f9846b88e4..b0160b09987c1 100644 --- a/include/uapi/linux/kfd_ioctl.h +++ b/include/uapi/linux/kfd_ioctl.h @@ -62,6 +62,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