Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4;
Message-ID: <80ea6067-c531-4765-8576-265e565525fa@amd.com>
Date:   Thu, 23 Nov 2023 09:11:46 +0100
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH v2] drm/amdgpu: Fix cat debugfs amdgpu_regs_didt causes
 kernel null pointer
Content-Language: en-US
To:     Lu Yao <yaolu@kylinos.cn>, airlied@gmail.com, daniel@ffwll.ch
Cc:     alexander.deucher@amd.com, amd-gfx@lists.freedesktop.org,
        dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
References: <20231122093509.34302-1-yaolu@kylinos.cn>
 <20231123012234.5783-1-yaolu@kylinos.cn>
From:   =?UTF-8?Q?Christian_K=C3=B6nig?= <christian.koenig@amd.com>
In-Reply-To: <20231123012234.5783-1-yaolu@kylinos.cn>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Ni9FdkdENkdpeDl3K2pJZmluNUdaMnlhNHNDOHRtZi9DNCtwZ2UyNUxqM1pS?=
 =?utf-8?B?REd0VW0rRmhGa21JM3U5bnNPMWdQNTNLVEhYUlZKWjJ3ZXpsWWJkcCsrZ2U2?=
 =?utf-8?B?VXZOL3lvb2lpQmtFeEZ1U0RZWjFVUVVzZWhyN0I2N2NzOEs2NFJRc2c3Q2hB?=
 =?utf-8?B?Q2J1TnpLL1hEUGtsY3Qramd6a2s4cjRRMnFLNXZoclVXeFdvaE51ZVQyWTdO?=
 =?utf-8?B?NmdzTGVPdmwzWUlvR1gzL1VIRldBNDVlMVFFaTJtOFZiYnBqd2xmNjVzRkEy?=
 =?utf-8?B?R2w5Y245M3NDV3pkTFhDT20zZ0JMYmFneFErSlozUWQ4citTemlpRCs3YjZW?=
 =?utf-8?B?Wjg2YVZJbW9RZElFZUZHcjlBYU5CT25BSnM4eHNQUGpoa0xWSGRiZ1RyeEdS?=
 =?utf-8?B?bVc0a2g5cFhLOHNoWC9hUDFJODNySW1Nd1ErMFpNQm9lTXU1eko3UVIzVitF?=
 =?utf-8?B?NFFsbWtPYUIxUjQwOHJGdzZWYXF1SGNxZVREUlFmcmJvbnY1NWo1ZUsvNWNF?=
 =?utf-8?B?MnBRbW5BWHhDWHBtSHZ0NVY2ckRheXk4OGlJYlJwTnIvWXR4QVFPZThPRzJ0?=
 =?utf-8?B?dmtFMnVneUdoL21MUXJKSnVqTnVKc1lzTmZPYkROSkl6Z2E2dEJ1c1RoSWxO?=
 =?utf-8?B?djNRU3pPRWJFYjBiby9Raks3TGZyUU8zYndyUUdZVWllR0pDb3NKcDRpb1I2?=
 =?utf-8?B?Mmc0MXcwajB2S2FheTZWOWxsTUpDZk4vOW1rOFUwb2ljVXlVQmZ1NDZaZnJw?=
 =?utf-8?B?QjhXZ1A4cHlDUVFsTnBFRmk3S1ZQNmFLYnBwZGNKNXJGbGkrcmo3NnVwL0pB?=
 =?utf-8?B?dys4Ujd6K0xxcnJxODNoUXlHU1NTTzFvRDV3b0xpbWpSWW9oc2RGNjFRT1VT?=
 =?utf-8?B?YmtPRE5oRkNDdmpBUitPWHZOeWhUZFU2b1Q4N2t2cERtanlQeXJ6ZWRSMkFO?=
 =?utf-8?B?VHZjR2pEcUJObEVlQlhwb1ZHNFFBeENDdFhSUjZ5dUx5bjdhL21zMXRIMUlB?=
 =?utf-8?B?MjFRVlF1LzVRakhtbXdLQ3ZjMnNtcmcrdU5uaG9UQlZHQ2lsaUNTRitSZjZT?=
 =?utf-8?B?bUdZeTRSM0VSUGJyNXpjVjMwRG9aVExCV2lUWkRtWFM2MmZ0VkxzeGd5N3VV?=
 =?utf-8?B?Z1p2dzAzemswMDlTU2M1Vi9yU3poUUZwZ1ZRWm1LSHM1LzFxOWZhcHNmVmV1?=
 =?utf-8?B?N0d0SFk0VENhVWNCckJkTFJscFk0eFlhQnMvN0F6dFpYZXJNZHUyUlFPaWh3?=
 =?utf-8?B?YUFmdGZZVXNTbHRBZVB4VEpRVVAzOWl2ZGI1bzdhMzgxeVR4eVE3VTVqMUpJ?=
 =?utf-8?B?SWFEMVdPZnBMR3BLL01rVDdXWmlRWjFia3YycXQ5bndZSkQ3NG10cVRweWxC?=
 =?utf-8?B?SEd4Mk1QbVB6cnBLUGpnMTZwN1VObCtiZWxIa2I3QXlFbm1PYmwxZnNvdEU2?=
 =?utf-8?B?ZWNxejROMStXQmhBWHk1dDBVZEIxQjVweW9NdnArYzBQbS9jOG5GdHR2QlFE?=
 =?utf-8?B?UW9Lb1BRT3pGRDhxSDZzL0pJUGpRc2dIbEE4bERPdjZHdHBOb0EyRnczUFNi?=
 =?utf-8?B?dTdtMnFycnkvYXUvdTNRd1JieDIvMURqallpT25Va0YxeU9UMXNjemVhWWlV?=
 =?utf-8?B?bzFRck9WNmVzZGZ4akdaY1cvNnRPOEx4byszb3VyTllVRmNEZktRRlMwTUJk?=
 =?utf-8?B?bFowbGQyeFB3Tkd3YlZENjBjRDFVRWpIYXhTMXJBL2hWYWJFZ0EwYWJQQVVH?=
 =?utf-8?B?a3pPb21rM1RRZFl6TCtBbW44dnlkNzlXb0JXMGVEMWxvYTJERk5ob29YM3dF?=
 =?utf-8?B?R1NkTDhVVS90alVHVnpyNnJmNklGNllUaTJYTXRIK2hna0ZZckpmSE5PWTZN?=
 =?utf-8?B?VTgrK3AyajB0SThKWjBzSVByOEtDNmd6czBDSk9IOWJHdWRvelhWajgzRDdW?=
 =?utf-8?B?blRiZGllYjBpK0xWZ2lIMlluSUgrMG9TM3ErbzB6TVJ1cHU0L0pKL21EaGg3?=
 =?utf-8?B?WGg5Mm5YenBYbmdneWRyWnVoamZJNmpPYjlsdnR2NTlmTU1Hend0NVMxOEtq?=
 =?utf-8?B?anpzS2pISFAvdkJiTzFEZEdlWGJyVW9ENGlyeHVDazMxQVlXWFJiRnI5WnZn?=
 =?utf-8?Q?EPZulcoi2np6+W3/VU1tns5cz?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 6b2e7dae-e44b-49a0-9513-08dbebfbd86e
X-MS-Exchange-CrossTenant-AuthSource: BN8PR12MB3587.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2023 08:11:50.4874
 (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: zlVNJOeoVDwaZtVOGaYtJp6QG0WrAvP1rP9UOmhRnpbv8qG8xKQZy67kPpGK3j5F
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB7313
X-Spam-Status: No, score=-1.3 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE
	autolearn=unavailable autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on howler.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Thu, 23 Nov 2023 00:12:07 -0800 (PST)

Am 23.11.23 um 02:22 schrieb Lu Yao:
> For 'AMDGPU_FAMILY_SI' family cards, in 'si_common_early_init' func, init
> 'didt_rreg' and 'didt_wreg' to 'NULL'. But in func
> 'amdgpu_debugfs_regs_didt_read/write', using 'RREG32_DIDT' 'WREG32_DIDT'
> lacks of relevant judgment. And other 'amdgpu_ip_block_version' that use
> these two definitions won't be added for 'AMDGPU_FAMILY_SI'.
>
> So, add null pointer judgment before calling.
>
> Signed-off-by: Lu Yao <yaolu@kylinos.cn>

Reviewed-by: Christian König <christian.koenig@amd.com>

> ---
> Changes in v2:
>    1. Drop dev_err message.
>    2. Change error code from 'EPERM' to 'EOPNOTSUPP'
> Link to v1: https://lore.kernel.org/all/20231122093509.34302-1-yaolu@kylinos.cn/
> Thanks Christian for his comments.
> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 6 ++++++
>   1 file changed, 6 insertions(+)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
> index a53f436fa9f1..e098cd66fa2a 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
> @@ -638,6 +638,9 @@ static ssize_t amdgpu_debugfs_regs_didt_read(struct file *f, char __user *buf,
>   	if (size & 0x3 || *pos & 0x3)
>   		return -EINVAL;
>   
> +	if (adev->didt_rreg == NULL)
> +		return -EOPNOTSUPP;
> +
>   	r = pm_runtime_get_sync(adev_to_drm(adev)->dev);
>   	if (r < 0) {
>   		pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);
> @@ -694,6 +697,9 @@ static ssize_t amdgpu_debugfs_regs_didt_write(struct file *f, const char __user
>   	if (size & 0x3 || *pos & 0x3)
>   		return -EINVAL;
>   
> +	if (adev->didt_wreg == NULL)
> +		return -EOPNOTSUPP;
> +
>   	r = pm_runtime_get_sync(adev_to_drm(adev)->dev);
>   	if (r < 0) {
>   		pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);