Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp2035127rwd; Fri, 2 Jun 2023 04:03:45 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4GPQK/YGGoH+M/f18mgAkrvZ0eJsJW6TKRNgW+zPF7GiflWPJlBraSCzTW7gXg/OxKJ0Lc X-Received: by 2002:a05:6a20:a10c:b0:103:7b89:d70a with SMTP id q12-20020a056a20a10c00b001037b89d70amr8542686pzk.54.1685703824949; Fri, 02 Jun 2023 04:03:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685703824; cv=none; d=google.com; s=arc-20160816; b=nt7S8Jrcx9FOKnlb2lAfy+0nHwxrpXW2xibWaB4lLShGKAkU5W9ke5NqwC7TRmBUVX Jbi5zUO0PBw0pW9+PhATAlHHOjpuavMY/yYNN85uwo9JB+CseUa1jy0sE5Nx/eUledrq Z8mwcTt1+X3OHBUCwpYj+u3BalEq73l5LyudtkP04YNTPEiSQHmjpbY0gmPU3FB75lgR kvBSKM5sg8CHAoIxUQk9FSQ3wt+nWrccP7UmZPNPlv7hkSmcBlBmbQBh73cplw7i+9G8 AkAuaKenwCv0n25DZ4hQdAvDLoLOWrDti12Ytvvo9+ZnffWH5KCzTmQbXw8YtH6/jL3K Mqfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=EQ4deVSrETY02G6iyLK8i9UVFPUSXI2W2w2Rz148P1Q=; b=FY5OADQ/y+161NSfogtG6jsNZLJUuQhi7jBLhfUQprSrrWIIXnTTz39PQqh9B7ePXs 99Hs8M11YlxiX8rNm8URMjYdrdEhMK1BNDlKeTLuMIK5Wj1MQDMCK97gBiaSgBfrRpTe 3lZS4TkyaURxPq5VRRNzQqSaQBy91/fJQfx7AHmJCJA8ZTW/i+X4gkSzXM3KmmBRK5Mf 7k/ALYK2SSMt2n5OlgjZR4Mgigyf+WTEa74I8yZCvbuTA6Wrryz0ugASDaqFGKfzVzxs /HXDRcYkgSnUHI8emHfxxcLBcIJm1mV9phAm0a6lFCHPPvS54VDqKZ9fcpjw2ZpYrM9y 67Jg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=fujitsu.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g185-20020a636bc2000000b004c259db61fdsi791707pgc.561.2023.06.02.04.03.32; Fri, 02 Jun 2023 04:03:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=fujitsu.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235617AbjFBKbm (ORCPT + 99 others); Fri, 2 Jun 2023 06:31:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51280 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236371AbjFBKa5 (ORCPT ); Fri, 2 Jun 2023 06:30:57 -0400 Received: from esa12.hc1455-7.c3s2.iphmx.com (esa12.hc1455-7.c3s2.iphmx.com [139.138.37.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 393C110E6 for ; Fri, 2 Jun 2023 03:29:17 -0700 (PDT) X-IronPort-AV: E=McAfee;i="6600,9927,10728"; a="98690281" X-IronPort-AV: E=Sophos;i="6.00,212,1681138800"; d="scan'208";a="98690281" Received: from unknown (HELO oym-r2.gw.nic.fujitsu.com) ([210.162.30.90]) by esa12.hc1455-7.c3s2.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Jun 2023 19:27:10 +0900 Received: from oym-m3.gw.nic.fujitsu.com (oym-nat-oym-m3.gw.nic.fujitsu.com [192.168.87.60]) by oym-r2.gw.nic.fujitsu.com (Postfix) with ESMTP id CE75FD4256 for ; Fri, 2 Jun 2023 19:27:08 +0900 (JST) Received: from kws-ab4.gw.nic.fujitsu.com (kws-ab4.gw.nic.fujitsu.com [192.51.206.22]) by oym-m3.gw.nic.fujitsu.com (Postfix) with ESMTP id 0949DD9A88 for ; Fri, 2 Jun 2023 19:27:08 +0900 (JST) Received: from localhost.localdomain (unknown [10.167.234.230]) by kws-ab4.gw.nic.fujitsu.com (Postfix) with ESMTP id 0034040FE2; Fri, 2 Jun 2023 19:27:06 +0900 (JST) From: Li Zhijian To: kexec@lists.infradead.org, nvdimm@lists.linux.dev Cc: linux-kernel@vger.kernel.org, dan.j.williams@intel.com, bhe@redhat.com, ruansy.fnst@fujitsu.com, y-goto@fujitsu.com, yangx.jy@fujitsu.com, Li Zhijian , Vivek Goyal , Dave Young Subject: [RFC PATCH makedumpfile v3 1/3] elf_info.c: Introduce is_pmem_pt_load_range Date: Fri, 2 Jun 2023 18:26:54 +0800 Message-Id: <20230602102656.131654-6-lizhijian@fujitsu.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230602102656.131654-1-lizhijian@fujitsu.com> References: <20230602102656.131654-1-lizhijian@fujitsu.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-TM-AS-Product-Ver: IMSS-9.1.0.1417-9.0.0.1002-27666.006 X-TM-AS-User-Approved-Sender: Yes X-TMASE-Version: IMSS-9.1.0.1417-9.0.1002-27666.006 X-TMASE-Result: 10--6.061400-10.000000 X-TMASE-MatchedRID: uYOEf1I6Oo115zj/0di3Q+6bo2/Lq3c20MQw+++ihy86FHRWx2FGsL8F Hrw7frluf146W0iUu2uMQUNNVv3RZFsSYoQIc1cjSHCU59h5KrHjLrHqvAiSy0/cRvj5stP609D 6Rw2zIrP6Ss9HyBHBXv2MF5HVqqgBYwDOL7t3RyGeAiCmPx4NwBnUJ0Ek6yhjxEHRux+uk8h+IC quNi0WJEs4O5JlDkki+KxOPxgcX3fuuoHGzHNMZnPOHbXzO9lIftwZ3X11IV0= X-TMASE-SNAP-Result: 1.821001.0001-0-1-22:0,33:0,34:0-0 X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_PASS,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org It checks BIT(4) of Elf64_Phdr, currently only the former 3 bits are used by ELF. In kexec-tool, we extend the BIT(4) to indicate pmem or not. dump_Elf_load: phys_start phys_end virt_start virt_end is_pmem dump_Elf_load: LOAD[ 0] 6b800000 6e42c000 ffffffffbcc00000 ffffffffbf82c000 false dump_Elf_load: LOAD[ 1] 1000 9fc00 ffff975980001000 ffff97598009fc00 false dump_Elf_load: LOAD[ 2] 100000 7f000000 ffff975980100000 ffff9759ff000000 false dump_Elf_load: LOAD[ 3] bf000000 bffd7000 ffff975a3f000000 ffff975a3ffd7000 false dump_Elf_load: LOAD[ 4] 100000000 140000000 ffff975a80000000 ffff975ac0000000 false dump_Elf_load: LOAD[ 5] 140000000 23e200000 ffff975ac0000000 ffff975bbe200000 true CC: Baoquan He CC: Vivek Goyal CC: Dave Young CC: kexec@lists.infradead.org Signed-off-by: Li Zhijian --- elf_info.c | 31 +++++++++++++++++++++++++++---- elf_info.h | 1 + 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/elf_info.c b/elf_info.c index bc24083655d6..41b36b2804d2 100644 --- a/elf_info.c +++ b/elf_info.c @@ -43,6 +43,7 @@ struct pt_load_segment { unsigned long long phys_end; unsigned long long virt_start; unsigned long long virt_end; + int is_pmem; }; static int nr_cpus; /* number of cpu */ @@ -153,6 +154,8 @@ check_elf_format(int fd, char *filename, int *phnum, unsigned int *num_load) return FALSE; } +#define PF_DEV (1 << 4) + static int dump_Elf_load(Elf64_Phdr *prog, int num_load) { @@ -170,17 +173,37 @@ dump_Elf_load(Elf64_Phdr *prog, int num_load) pls->virt_end = pls->virt_start + prog->p_memsz; pls->file_offset = prog->p_offset; pls->file_size = prog->p_filesz; + pls->is_pmem = !!(prog->p_flags & PF_DEV); if (num_load == 0) - DEBUG_MSG("%8s %16s %16s %16s %16s\n", "", - "phys_start", "phys_end", "virt_start", "virt_end"); + DEBUG_MSG("%8s %16s %16s %16s %16s %8s\n", "", + "phys_start", "phys_end", "virt_start", "virt_end", + "is_pmem"); - DEBUG_MSG("LOAD[%2d] %16llx %16llx %16llx %16llx\n", num_load, - pls->phys_start, pls->phys_end, pls->virt_start, pls->virt_end); + DEBUG_MSG("LOAD[%2d] %16llx %16llx %16llx %16llx %8s\n", num_load, + pls->phys_start, pls->phys_end, pls->virt_start, pls->virt_end, + pls->is_pmem ? "true": "false"); return TRUE; } +int is_pmem_pt_load_range(unsigned long long start, unsigned long long end) +{ + int i; + struct pt_load_segment *pls; + + for (i = 0; i < num_pt_loads; i++) { + pls = &pt_loads[i]; + if (pls->is_pmem && pls->phys_start == NOT_PADDR) + return TRUE; + if (pls->is_pmem && pls->phys_start != NOT_PADDR && + pls->phys_start <= start && pls->phys_end >= end) + return TRUE; + } + + return FALSE; +} + static off_t offset_next_note(void *note) { diff --git a/elf_info.h b/elf_info.h index d5416b32cdd7..a08d59a331f6 100644 --- a/elf_info.h +++ b/elf_info.h @@ -64,6 +64,7 @@ int get_pt_load_extents(int idx, off_t *file_offset, off_t *file_size); unsigned int get_num_pt_loads(void); +int is_pmem_pt_load_range(unsigned long long start, unsigned long long end); void set_nr_cpus(int num); int get_nr_cpus(void); -- 2.29.2