arm64: kexec: reduce calls to page_address()

wangrongwei · ctmarinas · commit 7afccde389dc · 2021-12-10T13:57:25.000Z
In kexec_page_alloc(), page_address() is called twice. This patch add a new variable to help to reduce calls to page_address(). Signed-off-by: Rongwei Wang <rongwei.wang@linux.alibaba.com> Link: https://lore.kernel.org/r/20211125170600.1608-3-rongwei.wang@linux.alibaba.com Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
diff --git a/arch/arm64/kernel/machine_kexec.c b/arch/arm64/kernel/machine_kexec.c
@@ -104,13 +104,15 @@ static void *kexec_page_alloc(void *arg)
 {
 	struct kimage *kimage = (struct kimage *)arg;
 	struct page *page = kimage_alloc_control_pages(kimage, 0);
+	void *vaddr = NULL;
 
 	if (!page)
 		return NULL;
 
-	memset(page_address(page), 0, PAGE_SIZE);
+	vaddr = page_address(page);
+	memset(vaddr, 0, PAGE_SIZE);
 
-	return page_address(page);
+	return vaddr;
 }
 
 int machine_kexec_post_load(struct kimage *kimage)

Original file line number	Diff line number	Diff line change
`@@ -104,13 +104,15 @@ static void kexec_page_alloc(void arg)`
`104`	`104`	`{`
`105`	`105`	`struct kimage kimage = (struct kimage )arg;`
`106`	`106`	`struct page *page = kimage_alloc_control_pages(kimage, 0);`
	`107`	`+ void *vaddr = NULL;`
`107`	`108`
`108`	`109`	`if (!page)`
`109`	`110`	`return NULL;`
`110`	`111`
`111`		`- memset(page_address(page), 0, PAGE_SIZE);`
	`112`	`+ vaddr = page_address(page);`
	`113`	`+ memset(vaddr, 0, PAGE_SIZE);`
`112`	`114`
`113`		`- return page_address(page);`
	`115`	`+ return vaddr;`
`114`	`116`	`}`
`115`	`117`
`116`	`118`	`int machine_kexec_post_load(struct kimage *kimage)`