From patchwork Tue Mar 6 10:23:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 10261321 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C660B602BD for ; Tue, 6 Mar 2018 10:26:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B6757289C9 for ; Tue, 6 Mar 2018 10:26:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AB7D328DD5; Tue, 6 Mar 2018 10:26:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 14F4E289C9 for ; Tue, 6 Mar 2018 10:26:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=Pxu3VEKTXGnVgw/QyA2dyAn7c3HOmxZrzyuDErhRy1g=; b=Lnv62f3hxfCCaTRvugo/ZEYptW 2FEl2vfgVQ2Ugxsd5hD+xmZqpK8arFTyjwNMuiBCrYP2X9TtTNfznceu4dgUuTp2RixOECsXtN9VW 2g4jIu7qhzit3+k9lQoAZACviTMzx3NlGAVFN1s8XI3sB08qWOrgvu+n7YHZg01i/T3R9l+7oKwb5 /t/wuf7WsSh+te96Uc4XA/XXIf1jiyD/RebnIg66nT6Am+ODgbDnh1gMAM2Sm5kInjJduYgt5Oxve LQ63ty9Q07P64gKITdqUJt0Qq8o0uTDPvbXLpnl0q6VFt0ZcvFfDulxU6QvjAceV/9dK9sfk1mLTi EmJXEs5w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1et9nC-0001d6-AV; Tue, 06 Mar 2018 10:25:58 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1et9lF-0007g7-MJ for linux-arm-kernel@bombadil.infradead.org; Tue, 06 Mar 2018 10:23:57 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=cvruR1fK+YTngn6oDfuQqc3wPWykq+0V2AulaM5gBOY=; b=t5vx4XUN9rFywYp7pip1eXGH/ cOrZgFeBvUtOENiQdC5kmzbbsRWPpS/vVzcTsCCVaDAbqI4mQ1R6Hq2ZoPPD8eJetTL+dfpcfhDKn ho+nPctWC3K0I0q6wVhpbP79LydhqKKaXk1Y+6RqkMcC1O5IcgKGKOC8DDzaiOGQgnTFDOCchWwa2 V7JUxfhZ4smVzp/Cm2zcRvN8oPDe4fGXfwaxp/OqAfLiqtd8lRpZ29fD4R+v20tzPJKV9FpX1qVlI 5MUxBxYiPx3xPI5lC8rl1hJgvGktuo8ARebpBtcg8CPCHM2pA5xxzllZattBzJudd8/0OmR/ORTd9 3TEKUWTmA==; Received: from mail-io0-x241.google.com ([2607:f8b0:4001:c06::241]) by merlin.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1et9lC-0000MQ-4m for linux-arm-kernel@lists.infradead.org; Tue, 06 Mar 2018 10:23:55 +0000 Received: by mail-io0-x241.google.com with SMTP id p78so21481569iod.13 for ; Tue, 06 Mar 2018 02:23:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=cvruR1fK+YTngn6oDfuQqc3wPWykq+0V2AulaM5gBOY=; b=E83ezOS7joLwYiR1oFoCW9mbVBxVMzbx8Th2Qkzg6g4NOhrAs4MTwj9e+zBnI3HUV3 lrNH6SL1PzC6JemSGWg5ugv9fao45TQxWyyW9nl5mLoztkF0Cqx85/2upNW2M3UobIO4 dYKIjPKjsMKM0xFaEGu28uGpyTSfiJm2N+w/E= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=cvruR1fK+YTngn6oDfuQqc3wPWykq+0V2AulaM5gBOY=; b=dXBLg4NQdOirsoRGxYyMsKoqkXdrJMLdmxuRiFLdDZ18/fnMi9a+WzlcO9YYPfa7QN JnYfW1SgVyqSa/TwRt5aC19tYjvKPz3y45fxzQePgPpTUFLcRcwThRV5b4HYD/ViAB/5 vyxG0vc9/eOI5kQsKmye9kUed4Rf80lem8EPAyvipUP0mXulI12IJ/FKvelcxQw7XGld oUhRRVIsrzTHq0iaiVSlykdlEVBBye7TsvM/tgIKwSAYfCrCTqsjoh7PAOdEChG6raRP dW9wpf+DNsBEgqRPmHkHBousgOpM3LxQjfbMtEcfUEsmq9IV9n8XXO+7cc/bKc5d4sxy yYkg== X-Gm-Message-State: APf1xPA98fV3c5O6On9Sti8GpDUlkGawSVJ53u7KFLGZ0TLby6asq722 7NPEnZElhBNLly5opd+ZQXAbXA== X-Google-Smtp-Source: AG47ELu+YCK1SwYvlw+iejjeuprHK/yQyomlKBRgAcER/4stkhzDH2+GUkwi+UJsyS0M8uH4ON8Grg== X-Received: by 10.107.175.151 with SMTP id p23mr20299484ioo.215.1520331818831; Tue, 06 Mar 2018 02:23:38 -0800 (PST) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id i197sm9909999ioe.54.2018.03.06.02.23.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Mar 2018 02:23:38 -0800 (PST) From: AKASHI Takahiro To: dyoung@redhat.com, vgoyal@redhat.com, bhe@redhat.com, mpe@ellerman.id.au, bauerman@linux.vnet.ibm.com, prudo@linux.vnet.ibm.com Subject: [PATCH v2 6/7] x86: kexec_file: clean up prepare_elf64_headers() Date: Tue, 6 Mar 2018 19:23:02 +0900 Message-Id: <20180306102303.9063-7-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180306102303.9063-1-takahiro.akashi@linaro.org> References: <20180306102303.9063-1-takahiro.akashi@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180306_052354_228159_9DDBFD57 X-CRM114-Status: GOOD ( 11.67 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-s390@vger.kernel.org, kexec@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, AKASHI Takahiro MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP removing bufp variable in prepare_elf64_headers() makes the code simpler and more understandable. Signed-off-by: AKASHI Takahiro Cc: Dave Young Cc: Vivek Goyal Cc: Baoquan He --- arch/x86/kernel/crash.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c index 0f20a6330bd6..24de3f13f40c 100644 --- a/arch/x86/kernel/crash.c +++ b/arch/x86/kernel/crash.c @@ -336,7 +336,7 @@ static int prepare_elf64_headers(struct crash_mem *cmem, bool kernel_map, Elf64_Ehdr *ehdr; Elf64_Phdr *phdr; unsigned long nr_cpus = num_possible_cpus(), nr_phdr, elf_sz; - unsigned char *buf, *bufp; + unsigned char *buf; unsigned int cpu, i; unsigned long long notes_addr; unsigned long mstart, mend; @@ -361,9 +361,8 @@ static int prepare_elf64_headers(struct crash_mem *cmem, bool kernel_map, if (!buf) return -ENOMEM; - bufp = buf; - ehdr = (Elf64_Ehdr *)bufp; - bufp += sizeof(Elf64_Ehdr); + ehdr = (Elf64_Ehdr *)buf; + phdr = (Elf64_Phdr *)(ehdr + 1); memcpy(ehdr->e_ident, ELFMAG, SELFMAG); ehdr->e_ident[EI_CLASS] = ELFCLASS64; ehdr->e_ident[EI_DATA] = ELFDATA2LSB; @@ -379,33 +378,30 @@ static int prepare_elf64_headers(struct crash_mem *cmem, bool kernel_map, /* Prepare one phdr of type PT_NOTE for each present cpu */ for_each_present_cpu(cpu) { - phdr = (Elf64_Phdr *)bufp; - bufp += sizeof(Elf64_Phdr); phdr->p_type = PT_NOTE; notes_addr = per_cpu_ptr_to_phys(per_cpu_ptr(crash_notes, cpu)); phdr->p_offset = phdr->p_paddr = notes_addr; phdr->p_filesz = phdr->p_memsz = sizeof(note_buf_t); (ehdr->e_phnum)++; + phdr++; } /* Prepare one PT_NOTE header for vmcoreinfo */ - phdr = (Elf64_Phdr *)bufp; - bufp += sizeof(Elf64_Phdr); phdr->p_type = PT_NOTE; phdr->p_offset = phdr->p_paddr = paddr_vmcoreinfo_note(); phdr->p_filesz = phdr->p_memsz = VMCOREINFO_NOTE_SIZE; (ehdr->e_phnum)++; + phdr++; /* Prepare PT_LOAD type program header for kernel text region */ if (kernel_map) { - phdr = (Elf64_Phdr *)bufp; - bufp += sizeof(Elf64_Phdr); phdr->p_type = PT_LOAD; phdr->p_flags = PF_R|PF_W|PF_X; phdr->p_vaddr = (Elf64_Addr)_text; phdr->p_filesz = phdr->p_memsz = _end - _text; phdr->p_offset = phdr->p_paddr = __pa_symbol(_text); - (ehdr->e_phnum)++; + ehdr->e_phnum++; + phdr++; } /* Go through all the ranges in cmem->ranges[] and prepare phdr */