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=-15.7 required=3.0 tests=BAYES_00,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 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 939AEC5519F for ; Wed, 18 Nov 2020 15:52:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 09121247AF for ; Wed, 18 Nov 2020 15:52:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="OAdS8LDU" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727349AbgKRPwe (ORCPT ); Wed, 18 Nov 2020 10:52:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51982 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726680AbgKRPwe (ORCPT ); Wed, 18 Nov 2020 10:52:34 -0500 Received: from mail-ot1-x344.google.com (mail-ot1-x344.google.com [IPv6:2607:f8b0:4864:20::344]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A7F4EC0613D6 for ; Wed, 18 Nov 2020 07:52:33 -0800 (PST) Received: by mail-ot1-x344.google.com with SMTP id y22so2161716oti.10 for ; Wed, 18 Nov 2020 07:52:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=DFXKiu/ERXnudaHqdsCHh1K/eIT7Qae3dBT4rxeusqg=; b=OAdS8LDUggC0FXriez47qL8WNDAMUSPazv+Mfc5iILP4RyTyNpUBaUMTbYwuW7e7U6 zyLnTgGsCRSymLHbNCr1NeBhd3Snd2fzGvSe1959jijWGpJd4UqJ4HNgz/8pG00i5jEl W7/63FIe0+PmrWyupmuUzNz3vw7GUoAwyBt+h30Fo5kCWfD0kVm6vqlmK4TJuLuoWKiv LY2OC8NYtToauD6NHEaUeEWiAbm3wMl8tOPryvEw6HCnhDy2uulQIbGz6Ut/fYI9/ytI GFGKBa59jZTTjb2IxORahnFczbZM+dMaWmnh+4Fy16A7KD5etW55xzN2Rs+1FucVqoZw y1ZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=DFXKiu/ERXnudaHqdsCHh1K/eIT7Qae3dBT4rxeusqg=; b=MMuYVbWYoHSuyrvFcDXbUXDhXDuoZyA5d34CojJIOGHN8rZffloSSjUKaR+UJ19One g/EbcdWoif8zemrqULcOSshw6eaKp7d9UKGv1q8jnnxZFeV0D9DGws1Iv4W1odihWPE+ pTxlSM+bxpwZNeb4o7HD2QhdUNdRZo0nYAGBAN4jnYhPUunjwWhA1J8bPu5mj+uBl5xc Ku9GINqCxCjnVyoXkD6/j/hXnB1Tq8S198188seCgQwOvowF1JhQF4B3MID9OmUxJXLi 7bbkoedBWkOuFHrO+CLcPFxN8/mmQjC9F9cPlFeEvBcPdRRAddpushY32fD7M8FxhlQL PbKQ== X-Gm-Message-State: AOAM532bT7glQej17ZmRZJNjO0zYviprwfTUAWnDXuK0fYNHm6BJYvYG Jh4C/Prh8tej1l57NyCeDDqbFQ== X-Google-Smtp-Source: ABdhPJyn1vqIt2ovBr+7cKKkoPRWJKkNo90BRYL67zjiT7nlEzvnWxJe7KogmDAHqB4ivOFYvXAZFA== X-Received: by 2002:a05:6830:2368:: with SMTP id r8mr7021148oth.75.1605714752949; Wed, 18 Nov 2020 07:52:32 -0800 (PST) Received: from builder.lan (104-57-184-186.lightspeed.austtx.sbcglobal.net. [104.57.184.186]) by smtp.gmail.com with ESMTPSA id i12sm8111876oon.26.2020.11.18.07.52.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2020 07:52:32 -0800 (PST) Date: Wed, 18 Nov 2020 09:52:30 -0600 From: Bjorn Andersson To: Siddharth Gupta Cc: agross@kernel.org, ohad@wizery.com, linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, tsoni@codeaurora.org, psodagud@codeaurora.org, rishabhb@codeaurora.org, linux-doc@vger.kernel.org Subject: Re: [PATCH v7 2/4] remoteproc: coredump: Add minidump functionality Message-ID: <20201118155230.GB9177@builder.lan> References: <1604395160-12443-1-git-send-email-sidgup@codeaurora.org> <1604395160-12443-3-git-send-email-sidgup@codeaurora.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1604395160-12443-3-git-send-email-sidgup@codeaurora.org> Precedence: bulk List-ID: X-Mailing-List: linux-doc@vger.kernel.org On Tue 03 Nov 03:19 CST 2020, Siddharth Gupta wrote: > This change adds a new kind of core dump mechanism which instead of dumping > entire program segments of the firmware, dumps sections of the remoteproc > memory which are sufficient to allow debugging the firmware. This function > thus uses section headers instead of program headers during creation of the > core dump elf. > > Signed-off-by: Rishabh Bhatnagar Co-developed-by: Rishabh > Signed-off-by: Siddharth Gupta > --- > drivers/remoteproc/remoteproc_coredump.c | 140 ++++++++++++++++++++++++++++ > drivers/remoteproc/remoteproc_elf_helpers.h | 26 ++++++ > include/linux/remoteproc.h | 1 + > 3 files changed, 167 insertions(+) > > diff --git a/drivers/remoteproc/remoteproc_coredump.c b/drivers/remoteproc/remoteproc_coredump.c > index 34530dc..a6c0099 100644 > --- a/drivers/remoteproc/remoteproc_coredump.c > +++ b/drivers/remoteproc/remoteproc_coredump.c > @@ -323,3 +323,143 @@ void rproc_coredump(struct rproc *rproc) > */ > wait_for_completion(&dump_state.dump_done); > } > + > +/** > + * rproc_minidump() - perform minidump > + * @rproc: rproc handle > + * > + * This function will generate an ELF header for the registered sections of > + * segments and create a devcoredump device associated with rproc. Based on > + * the coredump configuration this function will directly copy the segments > + * from device memory to userspace or copy segments from device memory to > + * a separate buffer, which can then be read by userspace. > + * The first approach avoids using extra vmalloc memory. But it will stall > + * recovery flow until dump is read by userspace. > + */ > +void rproc_minidump(struct rproc *rproc) Implementation wise I think this looks good now! But the name "minidump" isn't descriptive - nor is the "perform minidump". I think you should name this rproc_coredump_using_sections() > +{ > + struct rproc_dump_segment *segment; > + void *shdr; > + void *ehdr; > + size_t data_size; > + size_t strtbl_size = 0; > + size_t strtbl_index = 1; > + size_t offset; > + void *data; > + u8 class = rproc->elf_class; > + int shnum; > + struct rproc_coredump_state dump_state; > + unsigned int dump_conf = rproc->dump_conf; > + char *str_tbl = "STR_TBL"; > + > + if (list_empty(&rproc->dump_segments) || > + dump_conf == RPROC_COREDUMP_DISABLED) > + return; > + > + if (class == ELFCLASSNONE) { > + dev_err(&rproc->dev, "Elf class is not set\n"); > + return; > + } > + > + /* > + * We allocate two extra section headers. The first one is null. > + * Second section header is for the string table. Also space is > + * allocated for string table. > + */ > + data_size = elf_size_of_hdr(class) + 2 * elf_size_of_shdr(class); > + shnum = 2; > + > + /* the extra byte is for the null character at index 0 */ > + strtbl_size += strlen(str_tbl) + 2; > + > + list_for_each_entry(segment, &rproc->dump_segments, node) { > + data_size += elf_size_of_shdr(class); > + strtbl_size += strlen(segment->priv) + 1; > + if (dump_conf == RPROC_COREDUMP_ENABLED) > + data_size += segment->size; > + shnum++; > + } > + > + data_size += strtbl_size; > + > + data = vmalloc(data_size); > + if (!data) > + return; > + > + ehdr = data; > + memset(ehdr, 0, elf_size_of_hdr(class)); > + /* e_ident field is common for both elf32 and elf64 */ > + elf_hdr_init_ident(ehdr, class); > + > + elf_hdr_set_e_type(class, ehdr, ET_CORE); > + elf_hdr_set_e_machine(class, ehdr, rproc->elf_machine); > + elf_hdr_set_e_version(class, ehdr, EV_CURRENT); > + elf_hdr_set_e_entry(class, ehdr, rproc->bootaddr); > + elf_hdr_set_e_shoff(class, ehdr, elf_size_of_hdr(class)); > + elf_hdr_set_e_ehsize(class, ehdr, elf_size_of_hdr(class)); > + elf_hdr_set_e_shentsize(class, ehdr, elf_size_of_shdr(class)); > + elf_hdr_set_e_shnum(class, ehdr, shnum); > + elf_hdr_set_e_shstrndx(class, ehdr, 1); > + > + /* > + * The zeroth index of the section header is reserved and is rarely used. > + * Set the section header as null (SHN_UNDEF) and move to the next one. > + */ > + shdr = data + elf_hdr_get_e_shoff(class, ehdr); > + memset(shdr, 0, elf_size_of_shdr(class)); > + shdr += elf_size_of_shdr(class); > + > + /* Initialize the string table. */ > + offset = elf_hdr_get_e_shoff(class, ehdr) + > + elf_size_of_shdr(class) * elf_hdr_get_e_shnum(class, ehdr); > + memset(data + offset, 0, strtbl_size); > + > + /* Fill in the string table section header. */ > + memset(shdr, 0, elf_size_of_shdr(class)); > + elf_shdr_set_sh_type(class, shdr, SHT_STRTAB); > + elf_shdr_set_sh_offset(class, shdr, offset); > + elf_shdr_set_sh_size(class, shdr, strtbl_size); > + elf_shdr_set_sh_entsize(class, shdr, 0); > + elf_shdr_set_sh_flags(class, shdr, 0); > + elf_shdr_set_sh_name(class, shdr, set_section_name(str_tbl, ehdr, class, &strtbl_index)); > + offset += elf_shdr_get_sh_size(class, shdr); > + shdr += elf_size_of_shdr(class); > + > + list_for_each_entry(segment, &rproc->dump_segments, node) { > + memset(shdr, 0, elf_size_of_shdr(class)); > + elf_shdr_set_sh_type(class, shdr, SHT_PROGBITS); > + elf_shdr_set_sh_offset(class, shdr, offset); > + elf_shdr_set_sh_addr(class, shdr, segment->da); > + elf_shdr_set_sh_size(class, shdr, segment->size); > + elf_shdr_set_sh_entsize(class, shdr, 0); > + elf_shdr_set_sh_flags(class, shdr, SHF_WRITE); > + elf_shdr_set_sh_name(class, shdr, > + set_section_name(segment->priv, ehdr, class, &strtbl_index)); > + > + /* No need to copy segments for inline dumps */ > + if (dump_conf == RPROC_COREDUMP_ENABLED) > + rproc_copy_segment(rproc, data + offset, segment, 0, > + segment->size); > + offset += elf_shdr_get_sh_size(class, shdr); > + shdr += elf_size_of_shdr(class); > + } > + > + if (dump_conf == RPROC_COREDUMP_ENABLED) { > + dev_coredumpv(&rproc->dev, data, data_size, GFP_KERNEL); > + return; > + } > + > + /* Initialize the dump state struct to be used by rproc_coredump_read */ > + dump_state.rproc = rproc; > + dump_state.header = data; > + init_completion(&dump_state.dump_done); > + > + dev_coredumpm(&rproc->dev, NULL, &dump_state, data_size, GFP_KERNEL, > + rproc_coredump_read, rproc_coredump_free); > + > + /* Wait until the dump is read and free is called. Data is freed > + * by devcoredump framework automatically after 5 minutes. > + */ > + wait_for_completion(&dump_state.dump_done); > +} > +EXPORT_SYMBOL(rproc_minidump); > diff --git a/drivers/remoteproc/remoteproc_elf_helpers.h b/drivers/remoteproc/remoteproc_elf_helpers.h > index 4b6be7b..fa669ad 100644 > --- a/drivers/remoteproc/remoteproc_elf_helpers.h > +++ b/drivers/remoteproc/remoteproc_elf_helpers.h > @@ -65,6 +65,7 @@ ELF_GEN_FIELD_GET_SET(hdr, e_type, u16) > ELF_GEN_FIELD_GET_SET(hdr, e_version, u32) > ELF_GEN_FIELD_GET_SET(hdr, e_ehsize, u32) > ELF_GEN_FIELD_GET_SET(hdr, e_phentsize, u16) > +ELF_GEN_FIELD_GET_SET(hdr, e_shentsize, u16) > > ELF_GEN_FIELD_GET_SET(phdr, p_paddr, u64) > ELF_GEN_FIELD_GET_SET(phdr, p_vaddr, u64) > @@ -75,6 +76,9 @@ ELF_GEN_FIELD_GET_SET(phdr, p_offset, u64) > ELF_GEN_FIELD_GET_SET(phdr, p_flags, u32) > ELF_GEN_FIELD_GET_SET(phdr, p_align, u64) > > +ELF_GEN_FIELD_GET_SET(shdr, sh_type, u32) > +ELF_GEN_FIELD_GET_SET(shdr, sh_flags, u32) > +ELF_GEN_FIELD_GET_SET(shdr, sh_entsize, u16) > ELF_GEN_FIELD_GET_SET(shdr, sh_size, u64) > ELF_GEN_FIELD_GET_SET(shdr, sh_offset, u64) > ELF_GEN_FIELD_GET_SET(shdr, sh_name, u32) > @@ -93,4 +97,26 @@ ELF_STRUCT_SIZE(shdr) > ELF_STRUCT_SIZE(phdr) > ELF_STRUCT_SIZE(hdr) > > +static inline unsigned int set_section_name(const char *name, void *ehdr, u8 class, size_t *index) I think set_section_name() is a rather generic name for a function living in a header file. So I think you should prefix this with "elf_". Also, doesn't this function just "adds strings to a string table", rather than "set a section name"? Is it elf_strtbl_add() ? Regards, Bjorn > +{ > + u16 shstrndx = elf_hdr_get_e_shstrndx(class, ehdr); > + void *shdr; > + char *strtab; > + size_t idx, ret; > + > + shdr = ehdr + elf_size_of_hdr(class) + shstrndx * elf_size_of_shdr(class); > + strtab = ehdr + elf_shdr_get_sh_offset(class, shdr); > + idx = index ? *index : 0; > + if (!strtab || !name) > + return 0; > + > + ret = idx; > + strcpy((strtab + idx), name); > + idx += strlen(name) + 1; > + if (index) > + *index = idx; > + > + return ret; > +} > + > #endif /* REMOTEPROC_ELF_LOADER_H */ > diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h > index a419878..844021e 100644 > --- a/include/linux/remoteproc.h > +++ b/include/linux/remoteproc.h > @@ -656,6 +656,7 @@ rproc_of_resm_mem_entry_init(struct device *dev, u32 of_resm_idx, size_t len, > int rproc_boot(struct rproc *rproc); > void rproc_shutdown(struct rproc *rproc); > void rproc_report_crash(struct rproc *rproc, enum rproc_crash_type type); > +void rproc_minidump(struct rproc *rproc); > int rproc_coredump_add_segment(struct rproc *rproc, dma_addr_t da, size_t size); > int rproc_coredump_add_custom_segment(struct rproc *rproc, > dma_addr_t da, size_t size, > -- > Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, > a Linux Foundation Collaborative Project >