Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <bccdb508-0ced-24ff-3c27-a95d4b1a662e@amd.com>
Date:   Thu, 20 Oct 2022 12:50:29 -0400
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.2.2
Subject: Re: [PATCH] drm/amdkfd: use vma_lookup() instead of find_vma()
Content-Language: en-US
To:     Deming Wang <wangdeming@inspur.com>, alexander.deucher@amd.com,
        christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com,
        daniel@ffwll.ch
Cc:     amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
        linux-kernel@vger.kernel.org
References: <20221020082020.1589-1-wangdeming@inspur.com>
From:   Felix Kuehling <felix.kuehling@amd.com>
In-Reply-To: <20221020082020.1589-1-wangdeming@inspur.com>
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?UlVsTHhXZld1S1JEY2Y3OVNEUE5EQmdBY0tGK2Z6ck9xdFBRYjZGWHN4M0NE?=
 =?utf-8?B?WXVyTU1CRk9XZ21wVkduTWFsVngycUE2dXVqSW5aSkNueXZhNW1qVnplUW0r?=
 =?utf-8?B?MFVPNmJpMU9CMFplTmUzdndoMDVxM2NQSUxaNVVhR0x4djhHZ3JkUmFpNURh?=
 =?utf-8?B?QmxBSUdzd2xiSGdBKytVWkh2alZQN2llTGxqOC9MUk5hdFEwckhod0tEK2dh?=
 =?utf-8?B?ZFROR2hPRWthUksyVXcrSUdoSmFscG5MNGxmWUZ2LzFxUVBhTllUNkEyYXdp?=
 =?utf-8?B?Ryt6QnBTaVZScFZVUjE3akhaSTByMTBacVl5WXNpclBDczZEM0llNHJ3bC9j?=
 =?utf-8?B?UnhycVVTUHl6L0YyWGpFQk51TTdVeU8rRkM5OEtZanlCS0JML1laMUdqRWdF?=
 =?utf-8?B?eXZlVW5jSEVMN2czcFJPODJ5VWQ0MVdtRkZ5OHROaTZraUxHMEFZYzFja0p0?=
 =?utf-8?B?QzFVMWFFK2pvMEsvSk1LVlR0RHB0bHA5TmpaNWd0elg0cFhENGFNb29iZjkx?=
 =?utf-8?B?WFpVallHSm9LSklZSzcrRlpMbFpISEc2NnJyWll6SGN0b1dmRnVMNEt1emRK?=
 =?utf-8?B?MHcxODVYTnEzaXdwUGx0OVZVK2V0V1NXK1NheVZnamRqTzltdnZWR0F4cFVh?=
 =?utf-8?B?VmVEMVI2YitWeStDa29jbjhqeUNpU1I3YWdST29XV256Z3RqemhwOWtRenMz?=
 =?utf-8?B?cERFTmF1VnFuWmJCUUtDajZvdDVTSzM5SDhkSmtBMHBHaFhQZVhEOXd3SUI4?=
 =?utf-8?B?SUNsZWJ2LzByaEN2SFlYZDlEc1pQRUJjajVWTmFFUGFTTkxzemluYjBKTGps?=
 =?utf-8?B?S1BUZTBLdStGS0VXVktkYzZsSFRiRzJyRUY5RWR2Tlg0cnJUMTIzT3hvWnUy?=
 =?utf-8?B?cWhGSWcwZ2p5cnJJa1dRd2MwTllRWFVnWi9KVVFKUHJkT0FYVzQ3WW5sVFdM?=
 =?utf-8?B?Tm5sRUVWMHpOekVpY2JYejZUaTg5MW9zMC93Q1YyWEVnQkFJRlZRU2IxRmo1?=
 =?utf-8?B?ZlRPWVd2SU5lRmFjekRqaFRyQWRweTlTMzJGQ1FIQjVIR3VWcXllUm1SbzdV?=
 =?utf-8?B?TFRWSkc4ZWwyK0g5ZlA0TCtreEhaa1R6TlBBeTBGVWhidjNrd0piVUR0T2ls?=
 =?utf-8?B?Sm1VcVVxUDMwVEw3OHhDYnZQOTVNNUxDTTA2Ny9uclFYVmZFeTJHZkdaYzZz?=
 =?utf-8?B?RnluSENzYmZadStKUVRwQzcxZldMZVh6YnFTT1h3TklkaXhvaDRjcnVzb1NR?=
 =?utf-8?B?SnA1alB3TC83Zk81dnRrRnE0czJDaWdkbEFPdEdPYTRKTG9RcE52bVNCUDVs?=
 =?utf-8?B?U09PNXJYeVM1N0JOQjM1MGJCbG1BUG5ybWhYWmpOQnBYM0N4bEllcHhLSWlD?=
 =?utf-8?B?WWl5d3NoMHFWc3JFZWY0N2x2Y1hYTlpOcU4xVlZpaWRZTk10bEljY0dzYU1m?=
 =?utf-8?B?Ky9BMVdJcldIeERpcTg4TXRlZTVDMU1tTUc5bFdDaW45NlRhcytNYlJzV29F?=
 =?utf-8?B?bmFnZXRORkpwczFOQW5Cby85WkdvQkRjU2FHbUZjMVJzdjljdFBRTDRwMFc4?=
 =?utf-8?B?WDJHd0NRQWdmeTVNZ0FwUUhvdUdiemZMbVNUcUtxVFU1VDd2d0tLbTd0S2V3?=
 =?utf-8?B?Q0tSMGxmWE1uL0Zjd3dGYkhHS3dva3hqK0xxb0o5WHpWVzNxNlR0K1ZkVzBJ?=
 =?utf-8?B?emNyYWx5MzlJM0ZCS1VmS2VuMmtoNVZYU2o5bGdnZHpMdTArS3pBZDlwQ29Z?=
 =?utf-8?B?WlI0bnNEeXdBdHJVeWo3Zm9ka2YzcDlNclk4YVUzTUNCWm1kNGl0b0JUOFF4?=
 =?utf-8?B?RytVOWRDV0VjSWRKRi8yOTlaZW9sa0xBeng3QlpDenZENnhVRy9KQlFVbDJz?=
 =?utf-8?B?cEZseXZXSmxNamF2NXIyUVVlYXkyeWkwZGFPNVYxek1haFZQS2kyMEFUWWFl?=
 =?utf-8?B?b1k1WHZmVjJHU1F4S1dONXVlTmp2elk2WWRuOUpQS2o0U0JnYzRLRy9ZTFI1?=
 =?utf-8?B?c09seUxwNzNJVGJ2WmFyZWNoT2l6VlRRNXhZY1lMR2pMWEVmOUpNOXE1L0NJ?=
 =?utf-8?B?THRQOC9NNVZTZEV4aitMcWxRQi9tSWxTdEc1bjFLREZsN2FnNU9IN3hFOTJk?=
 =?utf-8?Q?U64A+H63Zjg6AMpYyIRiRjI64?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: fd171e6a-a4c0-4cdf-cf60-08dab2bb3312
X-MS-Exchange-CrossTenant-AuthSource: BN9PR12MB5115.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2022 16:50:31.3094
 (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: folDD66xi+/2G3reWq78aED7DIyrhI6bK9SjsMmsFeCHi3zTfDDjf9gtkljxUIBGn7JoQBkbE5FrQzu3O0GJzQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4056
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,URIBL_BLOCKED autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Am 2022-10-20 um 04:20 schrieb Deming Wang:
> Using vma_lookup() verifies the start address is contained in the found
> vma.  This results in easier to read the code.
>
> Signed-off-by: Deming Wang <wangdeming@inspur.com>

Thank you. This patch is

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

I squashed it with your earlier patch in kfd_migrate.c and submitted it 
to our amd-staging-drm-next branch.

Regards,
   Felix


> ---
>   drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 17 ++++++++---------
>   1 file changed, 8 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
> index 64fdf63093a0..0100812478b2 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
> @@ -1586,8 +1586,8 @@ static int svm_range_validate_and_map(struct mm_struct *mm,
>   		unsigned long npages;
>   		bool readonly;
>   
> -		vma = find_vma(mm, addr);
> -		if (!vma || addr < vma->vm_start) {
> +		vma = vma_lookup(mm, addr);
> +		if (!vma) {
>   			r = -EFAULT;
>   			goto unreserve_out;
>   		}
> @@ -2542,8 +2542,8 @@ svm_range_get_range_boundaries(struct kfd_process *p, int64_t addr,
>   	struct interval_tree_node *node;
>   	unsigned long start_limit, end_limit;
>   
> -	vma = find_vma(p->mm, addr << PAGE_SHIFT);
> -	if (!vma || (addr << PAGE_SHIFT) < vma->vm_start) {
> +	vma = vma_lookup(p->mm, addr << PAGE_SHIFT);
> +	if (!vma) {
>   		pr_debug("VMA does not exist in address [0x%llx]\n", addr);
>   		return -EFAULT;
>   	}
> @@ -2871,8 +2871,8 @@ svm_range_restore_pages(struct amdgpu_device *adev, unsigned int pasid,
>   	/* __do_munmap removed VMA, return success as we are handling stale
>   	 * retry fault.
>   	 */
> -	vma = find_vma(mm, addr << PAGE_SHIFT);
> -	if (!vma || (addr << PAGE_SHIFT) < vma->vm_start) {
> +	vma = vma_lookup(mm, addr << PAGE_SHIFT);
> +	if (!vma) {
>   		pr_debug("address 0x%llx VMA is removed\n", addr);
>   		r = 0;
>   		goto out_unlock_range;
> @@ -3152,9 +3152,8 @@ svm_range_is_valid(struct kfd_process *p, uint64_t start, uint64_t size)
>   	start <<= PAGE_SHIFT;
>   	end = start + (size << PAGE_SHIFT);
>   	do {
> -		vma = find_vma(p->mm, start);
> -		if (!vma || start < vma->vm_start ||
> -		    (vma->vm_flags & device_vma))
> +		vma = vma_lookup(p->mm, start);
> +		if (!vma || (vma->vm_flags & device_vma))
>   			return -EFAULT;
>   		start = min(end, vma->vm_end);
>   	} while (start < end);