[libdrm] amdgpu: When couldn't find bo, need to return error.

Submitted by Deng, Emily on Sept. 1, 2018, 4:24 a.m.

Details

Message ID 1535775863-27689-1-git-send-email-Emily.Deng@amd.com
State New
Headers show
Series "amdgpu: When couldn't find bo, need to return error." ( rev: 1 ) in AMD X.Org drivers

Not browsing as part of any series.

Commit Message

Deng, Emily Sept. 1, 2018, 4:24 a.m.
The startx will have segmant fault if return success.

SWDEV-163962

Change-Id: I56b189fa26efdcd1d96e5100af3f3e0b1208b0c3
Signed-off-by: Emily Deng <Emily.Deng@amd.com>
---
 amdgpu/amdgpu_bo.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/amdgpu/amdgpu_bo.c b/amdgpu/amdgpu_bo.c
index f25cacc..7e297fa 100644
--- a/amdgpu/amdgpu_bo.c
+++ b/amdgpu/amdgpu_bo.c
@@ -760,6 +760,7 @@  int amdgpu_find_bo_by_cpu_mapping(amdgpu_device_handle dev,
 				  uint64_t *offset_in_bo)
 {
 	uint32_t i;
+	int r = 0;
 	struct amdgpu_bo *bo;
 
 	if (cpu == NULL || size == 0)
@@ -787,10 +788,11 @@  int amdgpu_find_bo_by_cpu_mapping(amdgpu_device_handle dev,
 	} else {
 		*buf_handle = NULL;
 		*offset_in_bo = 0;
+		r = -errno;
 	}
 	pthread_mutex_unlock(&dev->bo_table_mutex);
 
-	return 0;
+	return r;
 }
 
 int amdgpu_create_bo_from_user_mem(amdgpu_device_handle dev,

Comments

Am 01.09.2018 um 06:24 schrieb Emily Deng:
> The startx will have segmant fault if return success.
>
> SWDEV-163962
>
> Change-Id: I56b189fa26efdcd1d96e5100af3f3e0b1208b0c3
> Signed-off-by: Emily Deng <Emily.Deng@amd.com>

Jerry already send a much better patch for this.

> ---
>   amdgpu/amdgpu_bo.c | 4 +++-
>   1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/amdgpu/amdgpu_bo.c b/amdgpu/amdgpu_bo.c
> index f25cacc..7e297fa 100644
> --- a/amdgpu/amdgpu_bo.c
> +++ b/amdgpu/amdgpu_bo.c
> @@ -760,6 +760,7 @@ int amdgpu_find_bo_by_cpu_mapping(amdgpu_device_handle dev,
>   				  uint64_t *offset_in_bo)
>   {
>   	uint32_t i;
> +	int r = 0;
>   	struct amdgpu_bo *bo;
>   
>   	if (cpu == NULL || size == 0)
> @@ -787,10 +788,11 @@ int amdgpu_find_bo_by_cpu_mapping(amdgpu_device_handle dev,
>   	} else {
>   		*buf_handle = NULL;
>   		*offset_in_bo = 0;
> +		r = -errno;

errno doesn't contain any error in this case.

>   	}
>   	pthread_mutex_unlock(&dev->bo_table_mutex);
>   
> -	return 0;
> +	return r;
>   }
>   
>   int amdgpu_create_bo_from_user_mem(amdgpu_device_handle dev,
Ok, then just ignore this patch. But seems didn't saw the patch on branch amd-staging-hybrid-master20180315.

Best wishes
Emily Deng

>-----Original Message-----

>From: Christian König <ckoenig.leichtzumerken@gmail.com>

>Sent: Saturday, September 1, 2018 4:17 PM

>To: Deng, Emily <Emily.Deng@amd.com>; amd-gfx@lists.freedesktop.org

>Subject: Re: [PATCH libdrm] amdgpu: When couldn't find bo, need to return

>error.

>

>Am 01.09.2018 um 06:24 schrieb Emily Deng:

>> The startx will have segmant fault if return success.

>>

>> SWDEV-163962

>>

>> Change-Id: I56b189fa26efdcd1d96e5100af3f3e0b1208b0c3

>> Signed-off-by: Emily Deng <Emily.Deng@amd.com>

>

>Jerry already send a much better patch for this.

>

>> ---

>>   amdgpu/amdgpu_bo.c | 4 +++-

>>   1 file changed, 3 insertions(+), 1 deletion(-)

>>

>> diff --git a/amdgpu/amdgpu_bo.c b/amdgpu/amdgpu_bo.c index

>> f25cacc..7e297fa 100644

>> --- a/amdgpu/amdgpu_bo.c

>> +++ b/amdgpu/amdgpu_bo.c

>> @@ -760,6 +760,7 @@ int

>amdgpu_find_bo_by_cpu_mapping(amdgpu_device_handle dev,

>>   				  uint64_t *offset_in_bo)

>>   {

>>   	uint32_t i;

>> +	int r = 0;

>>   	struct amdgpu_bo *bo;

>>

>>   	if (cpu == NULL || size == 0)

>> @@ -787,10 +788,11 @@ int

>amdgpu_find_bo_by_cpu_mapping(amdgpu_device_handle dev,

>>   	} else {

>>   		*buf_handle = NULL;

>>   		*offset_in_bo = 0;

>> +		r = -errno;

>

>errno doesn't contain any error in this case.

>

>>   	}

>>   	pthread_mutex_unlock(&dev->bo_table_mutex);

>>

>> -	return 0;

>> +	return r;

>>   }

>>

>>   int amdgpu_create_bo_from_user_mem(amdgpu_device_handle dev,
On 09/01/2018 04:58 PM, Deng, Emily wrote:
> Ok, then just ignore this patch. But seems didn't saw the patch on branch amd-staging-hybrid-master20180315.

Thanks to take care of this as well.

I'm waiting some verification, and now push the patch to internal staging branch
mainline will be pushed later for another verification.

About master branch, needs someone's help with correct permission.

Regards,
Jerry
>
> Best wishes
> Emily Deng
>
>> -----Original Message-----
>> From: Christian König <ckoenig.leichtzumerken@gmail.com>
>> Sent: Saturday, September 1, 2018 4:17 PM
>> To: Deng, Emily <Emily.Deng@amd.com>; amd-gfx@lists.freedesktop.org
>> Subject: Re: [PATCH libdrm] amdgpu: When couldn't find bo, need to return
>> error.
>>
>> Am 01.09.2018 um 06:24 schrieb Emily Deng:
>>> The startx will have segmant fault if return success.
>>>
>>> SWDEV-163962
>>>
>>> Change-Id: I56b189fa26efdcd1d96e5100af3f3e0b1208b0c3
>>> Signed-off-by: Emily Deng <Emily.Deng@amd.com>
>>
>> Jerry already send a much better patch for this.
>>
>>> ---
>>>    amdgpu/amdgpu_bo.c | 4 +++-
>>>    1 file changed, 3 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/amdgpu/amdgpu_bo.c b/amdgpu/amdgpu_bo.c index
>>> f25cacc..7e297fa 100644
>>> --- a/amdgpu/amdgpu_bo.c
>>> +++ b/amdgpu/amdgpu_bo.c
>>> @@ -760,6 +760,7 @@ int
>> amdgpu_find_bo_by_cpu_mapping(amdgpu_device_handle dev,
>>>    				  uint64_t *offset_in_bo)
>>>    {
>>>    	uint32_t i;
>>> +	int r = 0;
>>>    	struct amdgpu_bo *bo;
>>>
>>>    	if (cpu == NULL || size == 0)
>>> @@ -787,10 +788,11 @@ int
>> amdgpu_find_bo_by_cpu_mapping(amdgpu_device_handle dev,
>>>    	} else {
>>>    		*buf_handle = NULL;
>>>    		*offset_in_bo = 0;
>>> +		r = -errno;
>>
>> errno doesn't contain any error in this case.
>>
>>>    	}
>>>    	pthread_mutex_unlock(&dev->bo_table_mutex);
>>>
>>> -	return 0;
>>> +	return r;
>>>    }
>>>
>>>    int amdgpu_create_bo_from_user_mem(amdgpu_device_handle dev,
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
>
> About master branch, needs someone's help with correct permission. 
I've already took care of that on the weekend.

Regards,
Christian.

Am 03.09.2018 um 03:42 schrieb Zhang, Jerry (Junwei):
> On 09/01/2018 04:58 PM, Deng, Emily wrote:
>> Ok, then just ignore this patch. But seems didn't saw the patch on 
>> branch amd-staging-hybrid-master20180315.
>
> Thanks to take care of this as well.
>
> I'm waiting some verification, and now push the patch to internal 
> staging branch
> mainline will be pushed later for another verification.
>
> About master branch, needs someone's help with correct permission.
>
> Regards,
> Jerry
>>
>> Best wishes
>> Emily Deng
>>
>>> -----Original Message-----
>>> From: Christian König <ckoenig.leichtzumerken@gmail.com>
>>> Sent: Saturday, September 1, 2018 4:17 PM
>>> To: Deng, Emily <Emily.Deng@amd.com>; amd-gfx@lists.freedesktop.org
>>> Subject: Re: [PATCH libdrm] amdgpu: When couldn't find bo, need to 
>>> return
>>> error.
>>>
>>> Am 01.09.2018 um 06:24 schrieb Emily Deng:
>>>> The startx will have segmant fault if return success.
>>>>
>>>> SWDEV-163962
>>>>
>>>> Change-Id: I56b189fa26efdcd1d96e5100af3f3e0b1208b0c3
>>>> Signed-off-by: Emily Deng <Emily.Deng@amd.com>
>>>
>>> Jerry already send a much better patch for this.
>>>
>>>> ---
>>>>    amdgpu/amdgpu_bo.c | 4 +++-
>>>>    1 file changed, 3 insertions(+), 1 deletion(-)
>>>>
>>>> diff --git a/amdgpu/amdgpu_bo.c b/amdgpu/amdgpu_bo.c index
>>>> f25cacc..7e297fa 100644
>>>> --- a/amdgpu/amdgpu_bo.c
>>>> +++ b/amdgpu/amdgpu_bo.c
>>>> @@ -760,6 +760,7 @@ int
>>> amdgpu_find_bo_by_cpu_mapping(amdgpu_device_handle dev,
>>>>                      uint64_t *offset_in_bo)
>>>>    {
>>>>        uint32_t i;
>>>> +    int r = 0;
>>>>        struct amdgpu_bo *bo;
>>>>
>>>>        if (cpu == NULL || size == 0)
>>>> @@ -787,10 +788,11 @@ int
>>> amdgpu_find_bo_by_cpu_mapping(amdgpu_device_handle dev,
>>>>        } else {
>>>>            *buf_handle = NULL;
>>>>            *offset_in_bo = 0;
>>>> +        r = -errno;
>>>
>>> errno doesn't contain any error in this case.
>>>
>>>>        }
>>>>        pthread_mutex_unlock(&dev->bo_table_mutex);
>>>>
>>>> -    return 0;
>>>> +    return r;
>>>>    }
>>>>
>>>>    int amdgpu_create_bo_from_user_mem(amdgpu_device_handle dev,
>>
>> _______________________________________________
>> amd-gfx mailing list
>> amd-gfx@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
>>
On 09/03/2018 03:11 PM, Christian König wrote:
>> About master branch, needs someone's help with correct permission.
> I've already took care of that on the weekend.

Thank you again.
BTW, how to apply that permission?

Regards,
Jerry

>
> Regards,
> Christian.
>
> Am 03.09.2018 um 03:42 schrieb Zhang, Jerry (Junwei):
>> On 09/01/2018 04:58 PM, Deng, Emily wrote:
>>> Ok, then just ignore this patch. But seems didn't saw the patch on branch amd-staging-hybrid-master20180315.
>>
>> Thanks to take care of this as well.
>>
>> I'm waiting some verification, and now push the patch to internal staging branch
>> mainline will be pushed later for another verification.
>>
>> About master branch, needs someone's help with correct permission.
>>
>> Regards,
>> Jerry
>>>
>>> Best wishes
>>> Emily Deng
>>>
>>>> -----Original Message-----
>>>> From: Christian König <ckoenig.leichtzumerken@gmail.com>
>>>> Sent: Saturday, September 1, 2018 4:17 PM
>>>> To: Deng, Emily <Emily.Deng@amd.com>; amd-gfx@lists.freedesktop.org
>>>> Subject: Re: [PATCH libdrm] amdgpu: When couldn't find bo, need to return
>>>> error.
>>>>
>>>> Am 01.09.2018 um 06:24 schrieb Emily Deng:
>>>>> The startx will have segmant fault if return success.
>>>>>
>>>>> SWDEV-163962
>>>>>
>>>>> Change-Id: I56b189fa26efdcd1d96e5100af3f3e0b1208b0c3
>>>>> Signed-off-by: Emily Deng <Emily.Deng@amd.com>
>>>>
>>>> Jerry already send a much better patch for this.
>>>>
>>>>> ---
>>>>>    amdgpu/amdgpu_bo.c | 4 +++-
>>>>>    1 file changed, 3 insertions(+), 1 deletion(-)
>>>>>
>>>>> diff --git a/amdgpu/amdgpu_bo.c b/amdgpu/amdgpu_bo.c index
>>>>> f25cacc..7e297fa 100644
>>>>> --- a/amdgpu/amdgpu_bo.c
>>>>> +++ b/amdgpu/amdgpu_bo.c
>>>>> @@ -760,6 +760,7 @@ int
>>>> amdgpu_find_bo_by_cpu_mapping(amdgpu_device_handle dev,
>>>>>                      uint64_t *offset_in_bo)
>>>>>    {
>>>>>        uint32_t i;
>>>>> +    int r = 0;
>>>>>        struct amdgpu_bo *bo;
>>>>>
>>>>>        if (cpu == NULL || size == 0)
>>>>> @@ -787,10 +788,11 @@ int
>>>> amdgpu_find_bo_by_cpu_mapping(amdgpu_device_handle dev,
>>>>>        } else {
>>>>>            *buf_handle = NULL;
>>>>>            *offset_in_bo = 0;
>>>>> +        r = -errno;
>>>>
>>>> errno doesn't contain any error in this case.
>>>>
>>>>>        }
>>>>>        pthread_mutex_unlock(&dev->bo_table_mutex);
>>>>>
>>>>> -    return 0;
>>>>> +    return r;
>>>>>    }
>>>>>
>>>>>    int amdgpu_create_bo_from_user_mem(amdgpu_device_handle dev,
>>>
>>> _______________________________________________
>>> amd-gfx mailing list
>>> amd-gfx@lists.freedesktop.org
>>> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
>>>
>
Am 03.09.2018 um 09:16 schrieb Zhang, Jerry (Junwei):
> On 09/03/2018 03:11 PM, Christian König wrote:
>>> About master branch, needs someone's help with correct permission.
>> I've already took care of that on the weekend.
>
> Thank you again.
> BTW, how to apply that permission?

Previously that was done by opening a bugzilla ticket, but since the 
migration to gitlab that might be outdated now.

A good start is to go to https://gitlab.freedesktop.org and register an 
account, then somebody from the admin team needs to add that account to 
the appropriate groups.

Regards,
Christian.

>
> Regards,
> Jerry
>
>>
>> Regards,
>> Christian.
>>
>> Am 03.09.2018 um 03:42 schrieb Zhang, Jerry (Junwei):
>>> On 09/01/2018 04:58 PM, Deng, Emily wrote:
>>>> Ok, then just ignore this patch. But seems didn't saw the patch on 
>>>> branch amd-staging-hybrid-master20180315.
>>>
>>> Thanks to take care of this as well.
>>>
>>> I'm waiting some verification, and now push the patch to internal 
>>> staging branch
>>> mainline will be pushed later for another verification.
>>>
>>> About master branch, needs someone's help with correct permission.
>>>
>>> Regards,
>>> Jerry
>>>>
>>>> Best wishes
>>>> Emily Deng
>>>>
>>>>> -----Original Message-----
>>>>> From: Christian König <ckoenig.leichtzumerken@gmail.com>
>>>>> Sent: Saturday, September 1, 2018 4:17 PM
>>>>> To: Deng, Emily <Emily.Deng@amd.com>; amd-gfx@lists.freedesktop.org
>>>>> Subject: Re: [PATCH libdrm] amdgpu: When couldn't find bo, need to 
>>>>> return
>>>>> error.
>>>>>
>>>>> Am 01.09.2018 um 06:24 schrieb Emily Deng:
>>>>>> The startx will have segmant fault if return success.
>>>>>>
>>>>>> SWDEV-163962
>>>>>>
>>>>>> Change-Id: I56b189fa26efdcd1d96e5100af3f3e0b1208b0c3
>>>>>> Signed-off-by: Emily Deng <Emily.Deng@amd.com>
>>>>>
>>>>> Jerry already send a much better patch for this.
>>>>>
>>>>>> ---
>>>>>>    amdgpu/amdgpu_bo.c | 4 +++-
>>>>>>    1 file changed, 3 insertions(+), 1 deletion(-)
>>>>>>
>>>>>> diff --git a/amdgpu/amdgpu_bo.c b/amdgpu/amdgpu_bo.c index
>>>>>> f25cacc..7e297fa 100644
>>>>>> --- a/amdgpu/amdgpu_bo.c
>>>>>> +++ b/amdgpu/amdgpu_bo.c
>>>>>> @@ -760,6 +760,7 @@ int
>>>>> amdgpu_find_bo_by_cpu_mapping(amdgpu_device_handle dev,
>>>>>>                      uint64_t *offset_in_bo)
>>>>>>    {
>>>>>>        uint32_t i;
>>>>>> +    int r = 0;
>>>>>>        struct amdgpu_bo *bo;
>>>>>>
>>>>>>        if (cpu == NULL || size == 0)
>>>>>> @@ -787,10 +788,11 @@ int
>>>>> amdgpu_find_bo_by_cpu_mapping(amdgpu_device_handle dev,
>>>>>>        } else {
>>>>>>            *buf_handle = NULL;
>>>>>>            *offset_in_bo = 0;
>>>>>> +        r = -errno;
>>>>>
>>>>> errno doesn't contain any error in this case.
>>>>>
>>>>>>        }
>>>>>> pthread_mutex_unlock(&dev->bo_table_mutex);
>>>>>>
>>>>>> -    return 0;
>>>>>> +    return r;
>>>>>>    }
>>>>>>
>>>>>>    int amdgpu_create_bo_from_user_mem(amdgpu_device_handle dev,
>>>>
>>>> _______________________________________________
>>>> amd-gfx mailing list
>>>> amd-gfx@lists.freedesktop.org
>>>> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
>>>>
>>
On 09/03/2018 04:44 PM, Christian König wrote:
> Am 03.09.2018 um 09:16 schrieb Zhang, Jerry (Junwei):
>> On 09/03/2018 03:11 PM, Christian König wrote:
>>>> About master branch, needs someone's help with correct permission.
>>> I've already took care of that on the weekend.
>>
>> Thank you again.
>> BTW, how to apply that permission?
>
> Previously that was done by opening a bugzilla ticket, but since the migration to gitlab that might be outdated now.
>
> A good start is to go to https://gitlab.freedesktop.org and register an account, then somebody from the admin team needs to add that account to the appropriate groups.

Thanks, will give a try.

Regards,
Jerry

>
> Regards,
> Christian.
>
>>
>> Regards,
>> Jerry
>>
>>>
>>> Regards,
>>> Christian.
>>>
>>> Am 03.09.2018 um 03:42 schrieb Zhang, Jerry (Junwei):
>>>> On 09/01/2018 04:58 PM, Deng, Emily wrote:
>>>>> Ok, then just ignore this patch. But seems didn't saw the patch on branch amd-staging-hybrid-master20180315.
>>>>
>>>> Thanks to take care of this as well.
>>>>
>>>> I'm waiting some verification, and now push the patch to internal staging branch
>>>> mainline will be pushed later for another verification.
>>>>
>>>> About master branch, needs someone's help with correct permission.
>>>>
>>>> Regards,
>>>> Jerry
>>>>>
>>>>> Best wishes
>>>>> Emily Deng
>>>>>
>>>>>> -----Original Message-----
>>>>>> From: Christian König <ckoenig.leichtzumerken@gmail.com>
>>>>>> Sent: Saturday, September 1, 2018 4:17 PM
>>>>>> To: Deng, Emily <Emily.Deng@amd.com>; amd-gfx@lists.freedesktop.org
>>>>>> Subject: Re: [PATCH libdrm] amdgpu: When couldn't find bo, need to return
>>>>>> error.
>>>>>>
>>>>>> Am 01.09.2018 um 06:24 schrieb Emily Deng:
>>>>>>> The startx will have segmant fault if return success.
>>>>>>>
>>>>>>> SWDEV-163962
>>>>>>>
>>>>>>> Change-Id: I56b189fa26efdcd1d96e5100af3f3e0b1208b0c3
>>>>>>> Signed-off-by: Emily Deng <Emily.Deng@amd.com>
>>>>>>
>>>>>> Jerry already send a much better patch for this.
>>>>>>
>>>>>>> ---
>>>>>>>    amdgpu/amdgpu_bo.c | 4 +++-
>>>>>>>    1 file changed, 3 insertions(+), 1 deletion(-)
>>>>>>>
>>>>>>> diff --git a/amdgpu/amdgpu_bo.c b/amdgpu/amdgpu_bo.c index
>>>>>>> f25cacc..7e297fa 100644
>>>>>>> --- a/amdgpu/amdgpu_bo.c
>>>>>>> +++ b/amdgpu/amdgpu_bo.c
>>>>>>> @@ -760,6 +760,7 @@ int
>>>>>> amdgpu_find_bo_by_cpu_mapping(amdgpu_device_handle dev,
>>>>>>>                      uint64_t *offset_in_bo)
>>>>>>>    {
>>>>>>>        uint32_t i;
>>>>>>> +    int r = 0;
>>>>>>>        struct amdgpu_bo *bo;
>>>>>>>
>>>>>>>        if (cpu == NULL || size == 0)
>>>>>>> @@ -787,10 +788,11 @@ int
>>>>>> amdgpu_find_bo_by_cpu_mapping(amdgpu_device_handle dev,
>>>>>>>        } else {
>>>>>>>            *buf_handle = NULL;
>>>>>>>            *offset_in_bo = 0;
>>>>>>> +        r = -errno;
>>>>>>
>>>>>> errno doesn't contain any error in this case.
>>>>>>
>>>>>>>        }
>>>>>>> pthread_mutex_unlock(&dev->bo_table_mutex);
>>>>>>>
>>>>>>> -    return 0;
>>>>>>> +    return r;
>>>>>>>    }
>>>>>>>
>>>>>>>    int amdgpu_create_bo_from_user_mem(amdgpu_device_handle dev,
>>>>>
>>>>> _______________________________________________
>>>>> amd-gfx mailing list
>>>>> amd-gfx@lists.freedesktop.org
>>>>> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
>>>>>
>>>
>