From: Philipp Rudo <prudo@linux.vnet.ibm.com>
To: kexec@lists.infradead.org, linux-s390@vger.kernel.org
Cc: linux-kernel@vger.kernel.org,
Eric Biederman <ebiederm@xmission.com>,
Vivek Goyal <vgoyal@redhat.com>,
Michael Ellerman <mpe@ellerman.id.au>,
Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com>,
Martin Schwidefsky <schwidefsky@de.ibm.com>,
Heiko Carstens <heiko.carstens@de.ibm.com>,
Andrew Morton <akpm@linux-foundation.org>,
x86@kernel.org, Dave Young <dyoung@redhat.com>,
AKASHI Takahiro <takahiro.akashi@linaro.org>
Subject: [PATCH 08/11] kexec_file: Simplify kexec_purgatory_setup_sechdrs 2
Date: Mon, 26 Feb 2018 16:16:17 +0100 [thread overview]
Message-ID: <20180226151620.20970-9-prudo@linux.vnet.ibm.com> (raw)
In-Reply-To: <20180226151620.20970-1-prudo@linux.vnet.ibm.com>
The main loop currently uses quite a lot of variables to update the section
headers. Some of them are unnecessary. So clean them up a little.
Signed-off-by: Philipp Rudo <prudo@linux.vnet.ibm.com>
---
kernel/kexec_file.c | 34 ++++++++++++----------------------
1 file changed, 12 insertions(+), 22 deletions(-)
diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c
index bb31a3b627c2..746b91e46e34 100644
--- a/kernel/kexec_file.c
+++ b/kernel/kexec_file.c
@@ -724,12 +724,8 @@ static int kexec_purgatory_setup_kbuf(struct purgatory_info *pi,
static int kexec_purgatory_setup_sechdrs(struct purgatory_info *pi,
struct kexec_buf *kbuf)
{
- unsigned long curr_load_addr;
- unsigned long load_addr;
unsigned long bss_addr;
unsigned long offset;
- unsigned char *buf_addr;
- unsigned char *src;
Elf_Shdr *sechdrs;
int i;
@@ -762,20 +758,18 @@ static int kexec_purgatory_setup_sechdrs(struct purgatory_info *pi,
sechdrs[i].sh_offset;
}
- /* Load SHF_ALLOC sections */
- buf_addr = kbuf->buffer;
- load_addr = curr_load_addr = kbuf->mem;
- bss_addr = load_addr + kbuf->bufsz;
+ offset = 0;
+ bss_addr = kbuf->mem + kbuf->bufsz;
kbuf->image->start = pi->ehdr->e_entry;
for (i = 0; i < pi->ehdr->e_shnum; i++) {
unsigned long align;
+ void *src, *dst;
if (!(sechdrs[i].sh_flags & SHF_ALLOC))
continue;
align = sechdrs[i].sh_addralign;
-
if (sechdrs[i].sh_type == SHT_NOBITS) {
bss_addr = ALIGN(bss_addr, align);
sechdrs[i].sh_addr = bss_addr;
@@ -783,31 +777,27 @@ static int kexec_purgatory_setup_sechdrs(struct purgatory_info *pi,
continue;
}
- curr_load_addr = ALIGN(curr_load_addr, align);
- offset = curr_load_addr - load_addr;
- /* We already modifed ->sh_offset to keep src addr */
- src = (char *)sechdrs[i].sh_offset;
- memcpy(buf_addr + offset, src, sechdrs[i].sh_size);
-
+ offset = ALIGN(offset, align);
if (sechdrs[i].sh_flags & SHF_EXECINSTR &&
pi->ehdr->e_entry >= sechdrs[i].sh_addr &&
pi->ehdr->e_entry < (sechdrs[i].sh_addr
+ sechdrs[i].sh_size)) {
kbuf->image->start -= sechdrs[i].sh_addr;
- kbuf->image->start += curr_load_addr
+ kbuf->image->start += kbuf->mem + offset;
}
- /* Store load address and source address of section */
- sechdrs[i].sh_addr = curr_load_addr;
+ src = (void *)sechdrs[i].sh_offset;
+ dst = pi->purgatory_buf + offset;
+ memcpy(dst, src, sechdrs[i].sh_size);
+
+ sechdrs[i].sh_addr = kbuf->mem + offset;
/*
* This section got copied to temporary buffer. Update
* ->sh_offset accordingly.
*/
- sechdrs[i].sh_offset = (unsigned long)(buf_addr + offset);
-
- /* Advance to the next address */
- curr_load_addr += sechdrs[i].sh_size;
+ sechdrs[i].sh_offset = (unsigned long)dst;
+ offset += sechdrs[i].sh_size;
}
return 0;
--
2.13.5
next prev parent reply other threads:[~2018-02-26 15:40 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-26 15:16 [PATCH 00/11] kexec_file: Clean up purgatory load Philipp Rudo
2018-02-26 15:16 ` [PATCH 01/11] kexec_file: Silence compile warnings Philipp Rudo
2018-02-26 15:16 ` [PATCH 02/11] kexec_file: Remove checks in kexec_purgatory_load Philipp Rudo
2018-02-26 15:16 ` [PATCH 03/11] kexec_file: Make purgatory_info->ehdr const Philipp Rudo
2018-02-26 15:16 ` [PATCH 04/11] kexec_file: Search symbols in read-only kexec_purgatory Philipp Rudo
2018-02-26 15:16 ` [PATCH 05/11] kexec_file: Use read-only sections in arch_kexec_apply_relocations* Philipp Rudo
2018-02-28 15:37 ` kbuild test robot
2018-02-28 16:32 ` kbuild test robot
2018-02-26 15:16 ` [PATCH 06/11] kexec_file: Split up __kexec_load_puragory Philipp Rudo
2018-02-26 15:16 ` [PATCH 07/11] kexec_file: Simplify kexec_purgatory_setup_sechdrs 1 Philipp Rudo
2018-02-28 22:49 ` kbuild test robot
2018-02-26 15:16 ` Philipp Rudo [this message]
2018-03-09 3:18 ` [PATCH 08/11] kexec_file: Simplify kexec_purgatory_setup_sechdrs 2 Dave Young
2018-03-09 9:54 ` Philipp Rudo
2018-02-26 15:16 ` [PATCH 09/11] kexec_file: Remove mis-use of sh_offset field Philipp Rudo
2018-03-09 3:14 ` Dave Young
2018-03-09 10:02 ` Philipp Rudo
2018-03-12 7:42 ` Dave Young
2018-03-12 9:42 ` Philipp Rudo
2018-02-26 15:16 ` [PATCH 10/11] kexec_file: Allow archs to set purgatory load address Philipp Rudo
2018-02-28 15:50 ` kbuild test robot
2018-02-28 16:02 ` kbuild test robot
2018-02-26 15:16 ` [PATCH 11/11] kexec_file: Move purgatories sha256 to common code Philipp Rudo
2018-03-09 4:43 ` Dave Young
2018-03-09 10:11 ` Philipp Rudo
2018-03-09 5:19 ` [PATCH 00/11] kexec_file: Clean up purgatory load Dave Young
2018-03-09 5:33 ` Dave Young
2018-03-09 10:13 ` Philipp Rudo
2018-03-09 14:25 ` Philipp Rudo
2018-03-12 7:40 ` Dave Young
2018-03-14 9:51 ` Philipp Rudo
2018-03-15 7:34 ` Dave Young
2018-03-15 10:13 ` Philipp Rudo
2018-03-16 6:41 ` Dave Young
2018-03-20 9:39 ` Philipp Rudo
2018-03-20 9:49 ` Dave Young
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180226151620.20970-9-prudo@linux.vnet.ibm.com \
--to=prudo@linux.vnet.ibm.com \
--cc=akpm@linux-foundation.org \
--cc=bauerman@linux.vnet.ibm.com \
--cc=dyoung@redhat.com \
--cc=ebiederm@xmission.com \
--cc=heiko.carstens@de.ibm.com \
--cc=kexec@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=mpe@ellerman.id.au \
--cc=schwidefsky@de.ibm.com \
--cc=takahiro.akashi@linaro.org \
--cc=vgoyal@redhat.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).