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 50AFB221F23; Thu, 3 Apr 2025 19:17:39 +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=1743707860; cv=none; b=tx6TPxsDDCYRDwF1SzYI7prc8IsuKCNfS4pnuI0Y3/UlDgZCf44neL+MRpzHossGrvJ9HxiRbltnFSFJkdgBjPsDaoXIMMpNQxCpZr9dyHWlqpe0+uxCyw5DurAWevyN71/qqtjACxlsB1t2aLHP+2PJVZeQgwVz64lXN52qpzg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743707860; c=relaxed/simple; bh=zQ7uo1I4o7otR/RrCwJMpp10dY/s99pCrBMDey7nOC4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ZEnlhY56hyRZpDBNXEL6nfQKzE/J0Eb2XAOlLvn9dtl7SJCEgU0kdvl1kiLzJzbjOImsTtsN89yiFlDeY2yykbdtfwrWIWYJeX1hu87kav5Rh96UaRD/oAPNR7TQdWTUTA5Wger5J84MN8dd4cQn3khYdPjjdDIFep9MWI7BCaw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=OeL2CxFz; 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="OeL2CxFz" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6DD20C4CEEA; Thu, 3 Apr 2025 19:17:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743707859; bh=zQ7uo1I4o7otR/RrCwJMpp10dY/s99pCrBMDey7nOC4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OeL2CxFzWKoH2P4QT4R3BH/ZtoAhJUTJ+TCvSsnOFGyEAVq13ycgJIlaQFjQ+T4No CEp+Yp0XXM7QpTxnkZ0PC6LUS54UB7Cxm87ReXRrNxvIQXvLDbT6k7IKdhPho3Ku65 63yyDJ+ZqeS9Ju2POFoGSt4FaE449GSzSp5GL+9d2UWDKl/VMdp5FWyDp3HVsxWrg/ BOSxqdNWbLfG49zRCtAJS/wQ4Tv94hqYl7GJ/W+asYG3mXdqAd9lgT2N4XC8nwCylc /m2nuGHH/ve1cIsWsWH7HmwefBYhuUt2S7K5WT+satnFX1iEFrCMhZdcPb2EkZSw1/ 6VwGKhJFkqZvw== 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.12 15/33] drm/amdkfd: clamp queue size to minimum Date: Thu, 3 Apr 2025 15:16:38 -0400 Message-Id: <20250403191656.2680995-15-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250403191656.2680995-1-sashal@kernel.org> References: <20250403191656.2680995-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.12.21 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 3e6b4736a7fea..67b5f3d7ff8e9 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 717307d6b5b74..3e1c11d9d9808 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