Commit ef770d18 authored by Liam R. Howlett's avatar Liam R. Howlett Committed by Andrew Morton
Browse files

arm64: Change elfcore for_each_mte_vma() to use VMA iterator 

Rework for_each_mte_vma() to use a VMA iterator instead of an explicit
linked-list.

Link: https://lkml.kernel.org/r/20220906194824.2110408-32-Liam.Howlett@oracle.com


Signed-off-by: default avatarLiam R. Howlett <Liam.Howlett@oracle.com>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Link: https://lore.kernel.org/r/20220218023650.672072-1-Liam.Howlett@oracle.com


Signed-off-by: default avatarWill Deacon <will@kernel.org>
Reviewed-by: default avatarDavidlohr Bueso <dave@stgolabs.net>
Tested-by: default avatarYu Zhao <yuzhao@google.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: David Howells <dhowells@redhat.com>
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>
Cc: SeongJae Park <sj@kernel.org>
Cc: Sven Schnelle <svens@linux.ibm.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent de2b84d2

arch/arm64/kernel/elfcore.c

+10 −6
Original line number Diff line number Diff line
@@ -8,9 +8,9 @@ 
#include <asm/cpufeature.h>

#include <asm/mte.h>



#define for_each_mte_vma(tsk, vma)					\

#define for_each_mte_vma(vmi, vma)					\

	if (system_supports_mte())					\

		for (vma = tsk->mm->mmap; vma; vma = vma->vm_next)	\

		for_each_vma(vmi, vma)					\

			if (vma->vm_flags & VM_MTE)



static unsigned long mte_vma_tag_dump_size(struct vm_area_struct *vma)
@@ -81,8 +81,9 @@ Elf_Half elf_core_extra_phdrs(void) 
{

	struct vm_area_struct *vma;

	int vma_count = 0;

	VMA_ITERATOR(vmi, current->mm, 0);



	for_each_mte_vma(current, vma)

	for_each_mte_vma(vmi, vma)

		vma_count++;



	return vma_count;
@@ -91,8 +92,9 @@ Elf_Half elf_core_extra_phdrs(void) 
int elf_core_write_extra_phdrs(struct coredump_params *cprm, loff_t offset)

{

	struct vm_area_struct *vma;

	VMA_ITERATOR(vmi, current->mm, 0);



	for_each_mte_vma(current, vma) {

	for_each_mte_vma(vmi, vma) {

		struct elf_phdr phdr;



		phdr.p_type = PT_AARCH64_MEMTAG_MTE;
@@ -116,8 +118,9 @@ size_t elf_core_extra_data_size(void) 
{

	struct vm_area_struct *vma;

	size_t data_size = 0;

	VMA_ITERATOR(vmi, current->mm, 0);



	for_each_mte_vma(current, vma)

	for_each_mte_vma(vmi, vma)

		data_size += mte_vma_tag_dump_size(vma);



	return data_size;
@@ -126,8 +129,9 @@ size_t elf_core_extra_data_size(void) 
int elf_core_write_extra_data(struct coredump_params *cprm)

{

	struct vm_area_struct *vma;

	VMA_ITERATOR(vmi, current->mm, 0);



	for_each_mte_vma(current, vma) {

	for_each_mte_vma(vmi, vma) {

		if (vma->vm_flags & VM_DONTDUMP)

			continue;