From mboxrd@z Thu Jan 1 00:00:00 1970 From: Felix Kuehling Subject: Re: [PATCH 2/2] drm/amdkfd: Avoid using doorbell_off as offset in process doorbell pages Date: Mon, 11 Nov 2019 15:51:41 -0500 Message-ID: <78f9e381-e490-5555-c84d-ca76dcee7c83@amd.com> References: <20191101201016.5973-1-Yong.Zhao@amd.com> <20191101201016.5973-2-Yong.Zhao@amd.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1118907235==" Return-path: In-Reply-To: Content-Language: en-US List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: "Zhao, Yong" , "amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org" --===============1118907235== Content-Type: multipart/alternative; boundary="------------73D544273117CC1468E49BC0" Content-Language: en-US --------------73D544273117CC1468E49BC0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit On 2019-11-11 15:43, Felix Kuehling wrote: > On 2019-11-01 16:10, Zhao, Yong wrote: >> dorbell_off in the queue properties is mainly used for the doorbell dw >> offset in pci bar. We should not set it to the doorbell byte offset in >> process doorbell pages. This makes the code much easier to read. > > I kind of agree. I think what's confusing is that the queue_properties > structure is used for two different purposes. > > 1. For storing queue properties provided by user mode through KFD ioctls > 2. A subset of struct queue passed to mqd_manager and elsewhere > (that's why some driver state is creeping into it) > > Maybe a follow-up could cleanly separate the queue properties from the > queue driver state. That would probably change some internal > interfaces to use struct queue instead of queue_properties. > > Anyway, this patch is > > Reviewed-by: Felix Kuehling > I pointed out a missing NULL pointer check inline near the end of the patch. I should have mentioned it here. Please fix that before you submit. Thanks,   Felix >> Change-Id: I553045ff9fcb3676900c92d10426f2ceb3660005 >> Signed-off-by: Yong Zhao >> --- >> drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 12 ++++++------ >> drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c | 2 +- >> drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 3 ++- >> .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 8 ++++++-- >> 4 files changed, 15 insertions(+), 10 deletions(-) >> >> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c >> index d9e36dbf13d5..b91993753b82 100644 >> --- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c >> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c >> @@ -258,6 +258,7 @@ static int kfd_ioctl_create_queue(struct file *filep, struct kfd_process *p, >> unsigned int queue_id; >> struct kfd_process_device *pdd; >> struct queue_properties q_properties; >> + uint32_t doorbell_offset_in_process = 0; >> >> memset(&q_properties, 0, sizeof(struct queue_properties)); >> >> @@ -286,7 +287,8 @@ static int kfd_ioctl_create_queue(struct file *filep, struct kfd_process *p, >> p->pasid, >> dev->id); >> >> - err = pqm_create_queue(&p->pqm, dev, filep, &q_properties, &queue_id); >> + err = pqm_create_queue(&p->pqm, dev, filep, &q_properties, &queue_id, >> + &doorbell_offset_in_process); >> if (err != 0) >> goto err_create_queue; >> >> @@ -298,12 +300,10 @@ static int kfd_ioctl_create_queue(struct file *filep, struct kfd_process *p, >> args->doorbell_offset |= KFD_MMAP_GPU_ID(args->gpu_id); >> args->doorbell_offset <<= PAGE_SHIFT; >> if (KFD_IS_SOC15(dev->device_info->asic_family)) >> - /* On SOC15 ASICs, doorbell allocation must be >> - * per-device, and independent from the per-process >> - * queue_id. Return the doorbell offset within the >> - * doorbell aperture to user mode. >> + /* On SOC15 ASICs, include the doorbell offset within the >> + * process doorbell frame, which could be 1 page or 2 pages. >> */ >> - args->doorbell_offset |= q_properties.doorbell_off; >> + args->doorbell_offset |= doorbell_offset_in_process; >> >> mutex_unlock(&p->mutex); >> >> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c b/drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c >> index d59f2cd056c6..1d33c4f25263 100644 >> --- a/drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c >> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c >> @@ -185,7 +185,7 @@ static int dbgdev_register_diq(struct kfd_dbgdev *dbgdev) >> properties.type = KFD_QUEUE_TYPE_DIQ; >> >> status = pqm_create_queue(dbgdev->pqm, dbgdev->dev, NULL, >> - &properties, &qid); >> + &properties, &qid, NULL); >> >> if (status) { >> pr_err("Failed to create DIQ\n"); >> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h >> index 7c561c98f2e2..66bae8f2dad1 100644 >> --- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h >> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h >> @@ -907,7 +907,8 @@ int pqm_create_queue(struct process_queue_manager *pqm, >> struct kfd_dev *dev, >> struct file *f, >> struct queue_properties *properties, >> - unsigned int *qid); >> + unsigned int *qid, >> + uint32_t *p_doorbell_offset_in_process); >> int pqm_destroy_queue(struct process_queue_manager *pqm, unsigned int qid); >> int pqm_update_queue(struct process_queue_manager *pqm, unsigned int qid, >> struct queue_properties *p); >> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c >> index 8509814a6ff0..48185d2957e9 100644 >> --- a/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c >> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c >> @@ -192,7 +192,8 @@ int pqm_create_queue(struct process_queue_manager *pqm, >> struct kfd_dev *dev, >> struct file *f, >> struct queue_properties *properties, >> - unsigned int *qid) >> + unsigned int *qid, >> + uint32_t *p_doorbell_offset_in_process) >> { >> int retval; >> struct kfd_process_device *pdd; >> @@ -307,8 +308,11 @@ int pqm_create_queue(struct process_queue_manager *pqm, >> /* Return the doorbell offset within the doorbell page >> * to the caller so it can be passed up to user mode >> * (in bytes). >> + * There are always 1024 doorbells per process, so in case >> + * of 8-byte doorbells, there are two doorbell pages per >> + * process. >> */ >> - properties->doorbell_off = >> *p_doorbell_offset_in_process = > > You need a NULL pointer check here because you call this with a NULL > pointer from the DIQ code. > > >> (q->properties.doorbell_off * sizeof(uint32_t)) & >> (kfd_doorbell_process_slice(dev) - 1); >> > > _______________________________________________ > amd-gfx mailing list > amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx --------------73D544273117CC1468E49BC0 Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: 8bit
On 2019-11-11 15:43, Felix Kuehling wrote:
On 2019-11-01 16:10, Zhao, Yong wrote:
dorbell_off in the queue properties is mainly used for the doorbell dw
offset in pci bar. We should not set it to the doorbell byte offset in
process doorbell pages. This makes the code much easier to read.

I kind of agree. I think what's confusing is that the queue_properties structure is used for two different purposes.

  1. For storing queue properties provided by user mode through KFD ioctls
  2. A subset of struct queue passed to mqd_manager and elsewhere (that's why some driver state is creeping into it)

Maybe a follow-up could cleanly separate the queue properties from the queue driver state. That would probably change some internal interfaces to use struct queue instead of queue_properties.

Anyway, this patch is

Reviewed-by: Felix Kuehling <Felix.Kuehling-5C7GfCeVMHo@public.gmane.org>

I pointed out a missing NULL pointer check inline near the end of the patch. I should have mentioned it here. Please fix that before you submit.

Thanks,
  Felix


Change-Id: I553045ff9fcb3676900c92d10426f2ceb3660005
Signed-off-by: Yong Zhao <Yong.Zhao-5C7GfCeVMHo@public.gmane.org>
---
 drivers/gpu/drm/amd/amdkfd/kfd_chardev.c             | 12 ++++++------
 drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c              |  2 +-
 drivers/gpu/drm/amd/amdkfd/kfd_priv.h                |  3 ++-
 .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c   |  8 ++++++--
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
index d9e36dbf13d5..b91993753b82 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
@@ -258,6 +258,7 @@ static int kfd_ioctl_create_queue(struct file *filep, struct kfd_process *p,
 	unsigned int queue_id;
 	struct kfd_process_device *pdd;
 	struct queue_properties q_properties;
+	uint32_t doorbell_offset_in_process = 0;
 
 	memset(&q_properties, 0, sizeof(struct queue_properties));
 
@@ -286,7 +287,8 @@ static int kfd_ioctl_create_queue(struct file *filep, struct kfd_process *p,
 			p->pasid,
 			dev->id);
 
-	err = pqm_create_queue(&p->pqm, dev, filep, &q_properties, &queue_id);
+	err = pqm_create_queue(&p->pqm, dev, filep, &q_properties, &queue_id,
+			&doorbell_offset_in_process);
 	if (err != 0)
 		goto err_create_queue;
 
@@ -298,12 +300,10 @@ static int kfd_ioctl_create_queue(struct file *filep, struct kfd_process *p,
 	args->doorbell_offset |= KFD_MMAP_GPU_ID(args->gpu_id);
 	args->doorbell_offset <<= PAGE_SHIFT;
 	if (KFD_IS_SOC15(dev->device_info->asic_family))
-		/* On SOC15 ASICs, doorbell allocation must be
-		 * per-device, and independent from the per-process
-		 * queue_id. Return the doorbell offset within the
-		 * doorbell aperture to user mode.
+		/* On SOC15 ASICs, include the doorbell offset within the
+		 * process doorbell frame, which could be 1 page or 2 pages.
 		 */
-		args->doorbell_offset |= q_properties.doorbell_off;
+		args->doorbell_offset |= doorbell_offset_in_process;
 
 	mutex_unlock(&p->mutex);
 
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c b/drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c
index d59f2cd056c6..1d33c4f25263 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c
@@ -185,7 +185,7 @@ static int dbgdev_register_diq(struct kfd_dbgdev *dbgdev)
 	properties.type = KFD_QUEUE_TYPE_DIQ;
 
 	status = pqm_create_queue(dbgdev->pqm, dbgdev->dev, NULL,
-				&properties, &qid);
+				&properties, &qid, NULL);
 
 	if (status) {
 		pr_err("Failed to create DIQ\n");
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
index 7c561c98f2e2..66bae8f2dad1 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
@@ -907,7 +907,8 @@ int pqm_create_queue(struct process_queue_manager *pqm,
 			    struct kfd_dev *dev,
 			    struct file *f,
 			    struct queue_properties *properties,
-			    unsigned int *qid);
+			    unsigned int *qid,
+			    uint32_t *p_doorbell_offset_in_process);
 int pqm_destroy_queue(struct process_queue_manager *pqm, unsigned int qid);
 int pqm_update_queue(struct process_queue_manager *pqm, unsigned int qid,
 			struct queue_properties *p);
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c
index 8509814a6ff0..48185d2957e9 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c
@@ -192,7 +192,8 @@ int pqm_create_queue(struct process_queue_manager *pqm,
 			    struct kfd_dev *dev,
 			    struct file *f,
 			    struct queue_properties *properties,
-			    unsigned int *qid)
+			    unsigned int *qid,
+			    uint32_t *p_doorbell_offset_in_process)
 {
 	int retval;
 	struct kfd_process_device *pdd;
@@ -307,8 +308,11 @@ int pqm_create_queue(struct process_queue_manager *pqm,
 		/* Return the doorbell offset within the doorbell page
 		 * to the caller so it can be passed up to user mode
 		 * (in bytes).
+		 * There are always 1024 doorbells per process, so in case
+		 * of 8-byte doorbells, there are two doorbell pages per
+		 * process.
 		 */
-		properties->doorbell_off =
		*p_doorbell_offset_in_process =

You need a NULL pointer check here because you call this with a NULL pointer from the DIQ code.


 			(q->properties.doorbell_off * sizeof(uint32_t)) &
 			(kfd_doorbell_process_slice(dev) - 1);
 


_______________________________________________
amd-gfx mailing list
amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
--------------73D544273117CC1468E49BC0-- --===============1118907235== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYW1kLWdmeCBt YWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4 --===============1118907235==-- From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, HTML_MESSAGE,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1DD50C43331 for ; Mon, 11 Nov 2019 20:51:46 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C9A7F206A3 for ; Mon, 11 Nov 2019 20:51:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C9A7F206A3 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=amd-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 94AA26E9D9; Mon, 11 Nov 2019 20:51:45 +0000 (UTC) Received: from NAM01-BN3-obe.outbound.protection.outlook.com (mail-eopbgr740078.outbound.protection.outlook.com [40.107.74.78]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9C2796E9D9 for ; Mon, 11 Nov 2019 20:51:43 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EPdZjtUnrBhJlXSzyNWSneKKgunCibfTg126zazK+EeUVsl5peJOjW13lgR+WwlPmnj+f8f7oeMjBXrcFbaHfVe3Qp8+oUsov2EDstlMUPiepyIy7mjmNhps2X3cOZJ6yjQf27VtlDi++bAA2e1u8YAb/R7OeBsQR1Ey62sNpjyI/ZOFqfEeelZR3UyG0LnrhFLbQTHUetPVFlPilXdLm1X5Rtaejt2CQskNCrp6lEWwSPMo/mOMJBbmvLZD0hQqLKRj9IJdsFMMuYduKHbELyYn7ntfwWtUgi0Qfh+7JWQUJzxjUFRcaKO4Z9BBaKZh4jNHgMyFZ3nV1YqEMz9Kbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ixKZNDhs/s73680SoTV6G/DrqdlNYtWt4KwsbLWW2hg=; b=bBvmxPCLD7/8mSU6LhtgjiTP/dj3XMJ/ocYKNkza1iLWuUCTvIrgsXqsMWwiiu5nP2429HXnW++HDIHAFe1o+kagIdnzNZKGCZ3kG7jDtLb/aUVi0NRq36XhsO3xhBMXvazZA8tJVdILzXivVhj1tt9qke6Xi6KOlQcRhWSlYI6SKHChuR+xh7r4JogZHzMvn+oWbEj8A+1Rqwe/tOLmPPooqYyoMe74jfZMXvuAZ/sycXXAFnFBB1mDD2vn4qbxTFEyAOFbg8ZzAGGPuYXvhnX/XKyz/oewXw4PybUxWZD2q+UvPRzs8zrVEpQaB3PFCABGVXL7Aow4p8mWER7aAQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none Received: from DM6PR12MB3947.namprd12.prod.outlook.com (10.255.174.156) by DM6PR12MB3868.namprd12.prod.outlook.com (10.255.173.213) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2430.20; Mon, 11 Nov 2019 20:51:41 +0000 Received: from DM6PR12MB3947.namprd12.prod.outlook.com ([fe80::288c:66ec:203d:aede]) by DM6PR12MB3947.namprd12.prod.outlook.com ([fe80::288c:66ec:203d:aede%4]) with mapi id 15.20.2430.023; Mon, 11 Nov 2019 20:51:41 +0000 Subject: Re: [PATCH 2/2] drm/amdkfd: Avoid using doorbell_off as offset in process doorbell pages From: Felix Kuehling To: "Zhao, Yong" , "amd-gfx@lists.freedesktop.org" References: <20191101201016.5973-1-Yong.Zhao@amd.com> <20191101201016.5973-2-Yong.Zhao@amd.com> Message-ID: <78f9e381-e490-5555-c84d-ca76dcee7c83@amd.com> Date: Mon, 11 Nov 2019 15:51:41 -0500 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.9.1 In-Reply-To: Content-Language: en-US X-ClientProxiedBy: YT1PR01CA0023.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01::36) To DM6PR12MB3947.namprd12.prod.outlook.com (2603:10b6:5:1cb::28) MIME-Version: 1.0 X-Originating-IP: [142.116.193.252] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 7287ac1c-457e-4c40-4ffd-08d766e8f47c X-MS-TrafficTypeDiagnostic: DM6PR12MB3868: X-MS-Exchange-PUrlCount: 1 X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6790; X-Forefront-PRVS: 0218A015FA X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4636009)(39860400002)(366004)(396003)(136003)(376002)(346002)(52314003)(199004)(189003)(229853002)(53546011)(76176011)(31686004)(6506007)(386003)(26005)(37036004)(110136005)(606006)(966005)(99286004)(2906002)(486006)(6512007)(54896002)(236005)(6306002)(446003)(8936002)(81166006)(81156014)(2616005)(8676002)(476003)(11346002)(71190400001)(36756003)(33964004)(2501003)(6436002)(14454004)(186003)(14444005)(6486002)(66946007)(66476007)(66556008)(478600001)(4001150100001)(6246003)(6116002)(86362001)(5660300002)(3846002)(65956001)(66066001)(31696002)(65806001)(58126008)(52116002)(25786009)(7736002)(30864003)(44832011)(316002)(16586007); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR12MB3868; H:DM6PR12MB3947.namprd12.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5IuNHV/VznlapCaDXei023+v4bSu1l8CUuKAGHSJM12H41a6D6bQ3s7CocK0NLzvAIpX43owxyZab2Dvc5i/M6NN5M3jpEupzbyCfwFxxzUzmm5qNt4xst5vHoMX0D7uQcREsKJfbsqoQs7JbLQnce1AOckKKIwqlgOrA1FyLXv6YOPh2vur2B7sgpmPBbJSC1h/5agLnWfB6VbMUQh26DCqQUdKjzFy70VZQKGpZv32ZPdy/2sxMIIVQgbSnneZ3RPaqDVOXPrr567BYUkqtvTFjAAuH8ifqk2HoNlxOOSZ/CGAS5bwRZHhhr+pK8a3eu08gqVmKReY9LS5Cl+k26HqPEN2I6zf9ZWk1z/7IArHTI3yX8avP4/3gDTmyoiJc/hexV01N1MjUfEuw2R9dfNSDpMVAX5ue74zereMlzqwsYVeqjnbR0gEPoKJk1j0SODbcyIBWtYZGPRUSHsjMtC5ZdQJE6N6PpUsgTHmG+s= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7287ac1c-457e-4c40-4ffd-08d766e8f47c X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2019 20:51:41.8556 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: DO98V6rYJUVBCAc56oZSM7I+W0nFkbmSz4IYyRVDioBvpqIq/q+Ug5RZZvO+jgDfbwDcuwxKRHnLoOfJGW0TcQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3868 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector2-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ixKZNDhs/s73680SoTV6G/DrqdlNYtWt4KwsbLWW2hg=; b=B5G3SLlWdEM3DbiV3mKVoSfbxiKBmskf04JgJWVGn/gDUXI1NoVlU7dPUS9uoJG7lqSbIhH9WbkM2sjdboa0G3/a0T2/h+WW/DzHa3OlC0sptVN+wO6DBMWPKUuSh4gNs4vsM2p5kNeDIhEVi2AlOnIxm2bRw9Yy3zRQRVUeU5A= X-Mailman-Original-Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Felix.Kuehling@amd.com; X-BeenThere: amd-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============1118907235==" Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" Message-ID: <20191111205141.hVeTlkiyRB2gSIIaBkHTWB4M5CVMrkwYEnb-XLfac3E@z> --===============1118907235== Content-Type: multipart/alternative; boundary="------------73D544273117CC1468E49BC0" Content-Language: en-US --------------73D544273117CC1468E49BC0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit On 2019-11-11 15:43, Felix Kuehling wrote: > On 2019-11-01 16:10, Zhao, Yong wrote: >> dorbell_off in the queue properties is mainly used for the doorbell dw >> offset in pci bar. We should not set it to the doorbell byte offset in >> process doorbell pages. This makes the code much easier to read. > > I kind of agree. I think what's confusing is that the queue_properties > structure is used for two different purposes. > > 1. For storing queue properties provided by user mode through KFD ioctls > 2. A subset of struct queue passed to mqd_manager and elsewhere > (that's why some driver state is creeping into it) > > Maybe a follow-up could cleanly separate the queue properties from the > queue driver state. That would probably change some internal > interfaces to use struct queue instead of queue_properties. > > Anyway, this patch is > > Reviewed-by: Felix Kuehling > I pointed out a missing NULL pointer check inline near the end of the patch. I should have mentioned it here. Please fix that before you submit. Thanks,   Felix >> Change-Id: I553045ff9fcb3676900c92d10426f2ceb3660005 >> Signed-off-by: Yong Zhao >> --- >> drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 12 ++++++------ >> drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c | 2 +- >> drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 3 ++- >> .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 8 ++++++-- >> 4 files changed, 15 insertions(+), 10 deletions(-) >> >> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c >> index d9e36dbf13d5..b91993753b82 100644 >> --- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c >> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c >> @@ -258,6 +258,7 @@ static int kfd_ioctl_create_queue(struct file *filep, struct kfd_process *p, >> unsigned int queue_id; >> struct kfd_process_device *pdd; >> struct queue_properties q_properties; >> + uint32_t doorbell_offset_in_process = 0; >> >> memset(&q_properties, 0, sizeof(struct queue_properties)); >> >> @@ -286,7 +287,8 @@ static int kfd_ioctl_create_queue(struct file *filep, struct kfd_process *p, >> p->pasid, >> dev->id); >> >> - err = pqm_create_queue(&p->pqm, dev, filep, &q_properties, &queue_id); >> + err = pqm_create_queue(&p->pqm, dev, filep, &q_properties, &queue_id, >> + &doorbell_offset_in_process); >> if (err != 0) >> goto err_create_queue; >> >> @@ -298,12 +300,10 @@ static int kfd_ioctl_create_queue(struct file *filep, struct kfd_process *p, >> args->doorbell_offset |= KFD_MMAP_GPU_ID(args->gpu_id); >> args->doorbell_offset <<= PAGE_SHIFT; >> if (KFD_IS_SOC15(dev->device_info->asic_family)) >> - /* On SOC15 ASICs, doorbell allocation must be >> - * per-device, and independent from the per-process >> - * queue_id. Return the doorbell offset within the >> - * doorbell aperture to user mode. >> + /* On SOC15 ASICs, include the doorbell offset within the >> + * process doorbell frame, which could be 1 page or 2 pages. >> */ >> - args->doorbell_offset |= q_properties.doorbell_off; >> + args->doorbell_offset |= doorbell_offset_in_process; >> >> mutex_unlock(&p->mutex); >> >> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c b/drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c >> index d59f2cd056c6..1d33c4f25263 100644 >> --- a/drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c >> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c >> @@ -185,7 +185,7 @@ static int dbgdev_register_diq(struct kfd_dbgdev *dbgdev) >> properties.type = KFD_QUEUE_TYPE_DIQ; >> >> status = pqm_create_queue(dbgdev->pqm, dbgdev->dev, NULL, >> - &properties, &qid); >> + &properties, &qid, NULL); >> >> if (status) { >> pr_err("Failed to create DIQ\n"); >> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h >> index 7c561c98f2e2..66bae8f2dad1 100644 >> --- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h >> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h >> @@ -907,7 +907,8 @@ int pqm_create_queue(struct process_queue_manager *pqm, >> struct kfd_dev *dev, >> struct file *f, >> struct queue_properties *properties, >> - unsigned int *qid); >> + unsigned int *qid, >> + uint32_t *p_doorbell_offset_in_process); >> int pqm_destroy_queue(struct process_queue_manager *pqm, unsigned int qid); >> int pqm_update_queue(struct process_queue_manager *pqm, unsigned int qid, >> struct queue_properties *p); >> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c >> index 8509814a6ff0..48185d2957e9 100644 >> --- a/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c >> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c >> @@ -192,7 +192,8 @@ int pqm_create_queue(struct process_queue_manager *pqm, >> struct kfd_dev *dev, >> struct file *f, >> struct queue_properties *properties, >> - unsigned int *qid) >> + unsigned int *qid, >> + uint32_t *p_doorbell_offset_in_process) >> { >> int retval; >> struct kfd_process_device *pdd; >> @@ -307,8 +308,11 @@ int pqm_create_queue(struct process_queue_manager *pqm, >> /* Return the doorbell offset within the doorbell page >> * to the caller so it can be passed up to user mode >> * (in bytes). >> + * There are always 1024 doorbells per process, so in case >> + * of 8-byte doorbells, there are two doorbell pages per >> + * process. >> */ >> - properties->doorbell_off = >> *p_doorbell_offset_in_process = > > You need a NULL pointer check here because you call this with a NULL > pointer from the DIQ code. > > >> (q->properties.doorbell_off * sizeof(uint32_t)) & >> (kfd_doorbell_process_slice(dev) - 1); >> > > _______________________________________________ > amd-gfx mailing list > amd-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx --------------73D544273117CC1468E49BC0 Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: 8bit
On 2019-11-11 15:43, Felix Kuehling wrote:
On 2019-11-01 16:10, Zhao, Yong wrote:
dorbell_off in the queue properties is mainly used for the doorbell dw
offset in pci bar. We should not set it to the doorbell byte offset in
process doorbell pages. This makes the code much easier to read.

I kind of agree. I think what's confusing is that the queue_properties structure is used for two different purposes.

  1. For storing queue properties provided by user mode through KFD ioctls
  2. A subset of struct queue passed to mqd_manager and elsewhere (that's why some driver state is creeping into it)

Maybe a follow-up could cleanly separate the queue properties from the queue driver state. That would probably change some internal interfaces to use struct queue instead of queue_properties.

Anyway, this patch is

Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>

I pointed out a missing NULL pointer check inline near the end of the patch. I should have mentioned it here. Please fix that before you submit.

Thanks,
  Felix


Change-Id: I553045ff9fcb3676900c92d10426f2ceb3660005
Signed-off-by: Yong Zhao <Yong.Zhao@amd.com>
---
 drivers/gpu/drm/amd/amdkfd/kfd_chardev.c             | 12 ++++++------
 drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c              |  2 +-
 drivers/gpu/drm/amd/amdkfd/kfd_priv.h                |  3 ++-
 .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c   |  8 ++++++--
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
index d9e36dbf13d5..b91993753b82 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
@@ -258,6 +258,7 @@ static int kfd_ioctl_create_queue(struct file *filep, struct kfd_process *p,
 	unsigned int queue_id;
 	struct kfd_process_device *pdd;
 	struct queue_properties q_properties;
+	uint32_t doorbell_offset_in_process = 0;
 
 	memset(&q_properties, 0, sizeof(struct queue_properties));
 
@@ -286,7 +287,8 @@ static int kfd_ioctl_create_queue(struct file *filep, struct kfd_process *p,
 			p->pasid,
 			dev->id);
 
-	err = pqm_create_queue(&p->pqm, dev, filep, &q_properties, &queue_id);
+	err = pqm_create_queue(&p->pqm, dev, filep, &q_properties, &queue_id,
+			&doorbell_offset_in_process);
 	if (err != 0)
 		goto err_create_queue;
 
@@ -298,12 +300,10 @@ static int kfd_ioctl_create_queue(struct file *filep, struct kfd_process *p,
 	args->doorbell_offset |= KFD_MMAP_GPU_ID(args->gpu_id);
 	args->doorbell_offset <<= PAGE_SHIFT;
 	if (KFD_IS_SOC15(dev->device_info->asic_family))
-		/* On SOC15 ASICs, doorbell allocation must be
-		 * per-device, and independent from the per-process
-		 * queue_id. Return the doorbell offset within the
-		 * doorbell aperture to user mode.
+		/* On SOC15 ASICs, include the doorbell offset within the
+		 * process doorbell frame, which could be 1 page or 2 pages.
 		 */
-		args->doorbell_offset |= q_properties.doorbell_off;
+		args->doorbell_offset |= doorbell_offset_in_process;
 
 	mutex_unlock(&p->mutex);
 
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c b/drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c
index d59f2cd056c6..1d33c4f25263 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c
@@ -185,7 +185,7 @@ static int dbgdev_register_diq(struct kfd_dbgdev *dbgdev)
 	properties.type = KFD_QUEUE_TYPE_DIQ;
 
 	status = pqm_create_queue(dbgdev->pqm, dbgdev->dev, NULL,
-				&properties, &qid);
+				&properties, &qid, NULL);
 
 	if (status) {
 		pr_err("Failed to create DIQ\n");
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
index 7c561c98f2e2..66bae8f2dad1 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
@@ -907,7 +907,8 @@ int pqm_create_queue(struct process_queue_manager *pqm,
 			    struct kfd_dev *dev,
 			    struct file *f,
 			    struct queue_properties *properties,
-			    unsigned int *qid);
+			    unsigned int *qid,
+			    uint32_t *p_doorbell_offset_in_process);
 int pqm_destroy_queue(struct process_queue_manager *pqm, unsigned int qid);
 int pqm_update_queue(struct process_queue_manager *pqm, unsigned int qid,
 			struct queue_properties *p);
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c
index 8509814a6ff0..48185d2957e9 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c
@@ -192,7 +192,8 @@ int pqm_create_queue(struct process_queue_manager *pqm,
 			    struct kfd_dev *dev,
 			    struct file *f,
 			    struct queue_properties *properties,
-			    unsigned int *qid)
+			    unsigned int *qid,
+			    uint32_t *p_doorbell_offset_in_process)
 {
 	int retval;
 	struct kfd_process_device *pdd;
@@ -307,8 +308,11 @@ int pqm_create_queue(struct process_queue_manager *pqm,
 		/* Return the doorbell offset within the doorbell page
 		 * to the caller so it can be passed up to user mode
 		 * (in bytes).
+		 * There are always 1024 doorbells per process, so in case
+		 * of 8-byte doorbells, there are two doorbell pages per
+		 * process.
 		 */
-		properties->doorbell_off =
		*p_doorbell_offset_in_process =

You need a NULL pointer check here because you call this with a NULL pointer from the DIQ code.


 			(q->properties.doorbell_off * sizeof(uint32_t)) &
 			(kfd_doorbell_process_slice(dev) - 1);
 


_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
--------------73D544273117CC1468E49BC0-- --===============1118907235== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYW1kLWdmeCBt YWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4 --===============1118907235==--