From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7E8C8C433E0 for ; Tue, 2 Mar 2021 08:50:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4489E64DE8 for ; Tue, 2 Mar 2021 08:50:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242980AbhCBIk7 (ORCPT ); Tue, 2 Mar 2021 03:40:59 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:45890 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235703AbhCBIVI (ORCPT ); Tue, 2 Mar 2021 03:21:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614673162; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=9zKjm3eQ7NiVum4dqopzeJFlLmqcjV5S2gllw6JZT34=; b=hqw01NcqecoAkX88HK+gulujXCG1OoHGLe9f4ZdI5RjeoTQmV/flS7lrs8DEjdkNMcWM8L OIfrl7PZI2fwEhqATs4daSth5o700hST5iBW22lWEctMcUCOcb8TNWipvPVq4nTNUkBYt/ FQI89IUfn+fpce2NHd9+7mxFIWDwjP4= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-223-3KMuztsBP56cC614y1Nj7g-1; Tue, 02 Mar 2021 03:19:18 -0500 X-MC-Unique: 3KMuztsBP56cC614y1Nj7g-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 763CC1966320; Tue, 2 Mar 2021 08:19:16 +0000 (UTC) Received: from localhost (ovpn-12-78.pek2.redhat.com [10.72.12.78]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9D2F910013DB; Tue, 2 Mar 2021 08:19:12 +0000 (UTC) Date: Tue, 2 Mar 2021 16:19:09 +0800 From: Baoquan He To: Stephen Boyd Cc: Andrew Morton , Jessica Yu , kexec@lists.infradead.org, linux-kernel@vger.kernel.org, Evan Green , Alexei Starovoitov , Jiri Olsa , Hsin-Yi Wang , Dave Young , Vivek Goyal Subject: Re: [PATCH 7/7] kdump: Use vmlinux_build_id() to simplify Message-ID: <20210302081909.GA28599@MiWiFi-R3L-srv> References: <20210301174749.1269154-1-swboyd@chromium.org> <20210301174749.1269154-8-swboyd@chromium.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210301174749.1269154-8-swboyd@chromium.org> User-Agent: Mutt/1.10.1 (2018-07-13) X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 03/01/21 at 09:47am, Stephen Boyd wrote: > We can use the vmlinux_build_id() helper here now instead of open coding > it. This consolidates code and possibly avoids calculating the build ID > twice in the case of a crash with a stacktrace. > > Cc: Jiri Olsa > Cc: Alexei Starovoitov > Cc: Jessica Yu > Cc: Evan Green > Cc: Hsin-Yi Wang > Cc: Dave Young > Cc: Baoquan He > Cc: Vivek Goyal > Cc: > Signed-off-by: Stephen Boyd > --- > kernel/crash_core.c | 46 ++++++++------------------------------------- > 1 file changed, 8 insertions(+), 38 deletions(-) > > diff --git a/kernel/crash_core.c b/kernel/crash_core.c > index 825284baaf46..07d3e1109a8c 100644 > --- a/kernel/crash_core.c > +++ b/kernel/crash_core.c > @@ -4,6 +4,7 @@ > * Copyright (C) 2002-2004 Eric Biederman > */ > > +#include > #include > #include > #include > @@ -378,51 +379,20 @@ phys_addr_t __weak paddr_vmcoreinfo_note(void) > } > EXPORT_SYMBOL(paddr_vmcoreinfo_note); > > -#define NOTES_SIZE (&__stop_notes - &__start_notes) > -#define BUILD_ID_MAX SHA1_DIGEST_SIZE > -#define NT_GNU_BUILD_ID 3 > - > -struct elf_note_section { > - struct elf_note n_hdr; > - u8 n_data[]; > -}; > - > /* > * Add build ID from .notes section as generated by the GNU ld(1) > * or LLVM lld(1) --build-id option. > */ > static void add_build_id_vmcoreinfo(void) > { > - char build_id[BUILD_ID_MAX * 2 + 1]; > - int n_remain = NOTES_SIZE; > - > - while (n_remain >= sizeof(struct elf_note)) { > - const struct elf_note_section *note_sec = > - &__start_notes + NOTES_SIZE - n_remain; > - const u32 n_namesz = note_sec->n_hdr.n_namesz; > - > - if (note_sec->n_hdr.n_type == NT_GNU_BUILD_ID && > - n_namesz != 0 && > - !strcmp((char *)¬e_sec->n_data[0], "GNU")) { > - if (note_sec->n_hdr.n_descsz <= BUILD_ID_MAX) { > - const u32 n_descsz = note_sec->n_hdr.n_descsz; > - const u8 *s = ¬e_sec->n_data[n_namesz]; > - > - s = PTR_ALIGN(s, 4); > - bin2hex(build_id, s, n_descsz); > - build_id[2 * n_descsz] = '\0'; > - VMCOREINFO_BUILD_ID(build_id); > - return; > - } > - pr_warn("Build ID is too large to include in vmcoreinfo: %u > %u\n", > - note_sec->n_hdr.n_descsz, > - BUILD_ID_MAX); > - return; > - } > - n_remain -= sizeof(struct elf_note) + > - ALIGN(note_sec->n_hdr.n_namesz, 4) + > - ALIGN(note_sec->n_hdr.n_descsz, 4); > + const char *build_id = vmlinux_build_id(); It's strange that I can only see the cover letter and this patch 7, couldn't find the patch where vmlinux_build_id() is introduced in lkml. > + > + if (build_id[0] == '\0') { > + pr_warn("Build ID cannot be included in vmcoreinfo\n"); > + return; > } > + > + VMCOREINFO_BUILD_ID(build_id); > } > > static int __init crash_save_vmcoreinfo_init(void) > -- > https://chromeos.dev > > > _______________________________________________ > kexec mailing list > kexec@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/kexec >