Re: [PATCH v3 5/5] arm64: Add batched version of ptep_modify_prot_commit

[Dev Jain <dev.jain@arm.com>]

On 21/05/25 7:47 pm, Ryan Roberts wrote:
> On 19/05/2025 08:48, Dev Jain wrote:
>> Override the generic definition to simply use set_ptes() to map the new
>> ptes into the pagetable.
>>
>> Signed-off-by: Dev Jain <dev.jain@arm.com>
> Let's squash this into the previous patch; it doesn't make sense for an arch to
> implement one without the other. Otherwise, LGTM.


Sure. Thanks.


>
> Thanks,
> Ryan
>
>> ---
>>   arch/arm64/include/asm/pgtable.h | 5 +++++
>>   arch/arm64/mm/mmu.c              | 9 ++++++++-
>>   2 files changed, 13 insertions(+), 1 deletion(-)
>>
>> diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h
>> index 8872ea5f0642..0b13ca38f80c 100644
>> --- a/arch/arm64/include/asm/pgtable.h
>> +++ b/arch/arm64/include/asm/pgtable.h
>> @@ -1558,6 +1558,11 @@ extern pte_t modify_prot_start_ptes(struct vm_area_struct *vma,
>>   				    unsigned long addr, pte_t *ptep,
>>   				    unsigned int nr);
>>   
>> +#define modify_prot_commit_ptes modify_prot_commit_ptes
>> +extern void modify_prot_commit_ptes(struct vm_area_struct *vma, unsigned long addr,
>> +				    pte_t *ptep, pte_t old_pte, pte_t pte,
>> +				    unsigned int nr);
>> +
>>   #ifdef CONFIG_ARM64_CONTPTE
>>   
>>   /*
>> diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c
>> index fe60be8774f4..5f04bcdcd946 100644
>> --- a/arch/arm64/mm/mmu.c
>> +++ b/arch/arm64/mm/mmu.c
>> @@ -1543,10 +1543,17 @@ pte_t ptep_modify_prot_start(struct vm_area_struct *vma, unsigned long addr, pte
>>   	return modify_prot_start_ptes(vma, addr, ptep, 1);
>>   }
>>   
>> +void modify_prot_commit_ptes(struct vm_area_struct *vma, unsigned long addr,
>> +			     pte_t *ptep, pte_t old_pte, pte_t pte,
>> +			     unsigned int nr)
>> +{
>> +	set_ptes(vma->vm_mm, addr, ptep, pte, nr);
>> +}
>> +
>>   void ptep_modify_prot_commit(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep,
>>   			     pte_t old_pte, pte_t pte)
>>   {
>> -	set_pte_at(vma->vm_mm, addr, ptep, pte);
>> +	modify_prot_commit_ptes(vma, addr, ptep, old_pte, pte, 1);
>>   }
>>   
>>   /*
>