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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8B2ECC02183 for ; Tue, 14 Jan 2025 12:23:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 288F86B0089; Tue, 14 Jan 2025 07:23:42 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 239096B008A; Tue, 14 Jan 2025 07:23:42 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1008D6B008C; Tue, 14 Jan 2025 07:23:42 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id E8F2B6B0089 for ; Tue, 14 Jan 2025 07:23:41 -0500 (EST) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 1798412099D for ; Tue, 14 Jan 2025 12:23:34 +0000 (UTC) X-FDA: 83005973148.15.DB53F94 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf06.hostedemail.com (Postfix) with ESMTP id 73B18180008 for ; Tue, 14 Jan 2025 12:23:32 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf06.hostedemail.com: domain of Dave.Martin@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=Dave.Martin@arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1736857412; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=A8dqgwESPx9R9DWrPKarf13obRDixoLP/xCqeJ+xU0U=; b=nCKRaLRXfw5l74d7FKASTxr9kNlUP7Yh6lpTSB+48PvEKt2WVEniCDa+8LfYLYFGn99W5h wO4mLYj++EsVyD9Lst89ydZNXYXK2PmCue3qKcsHSJEgvZfawcQk5nuIQDRO02TdWopFf5 646r/Sv5uzwn+Tn8IFeak6Erw463XjQ= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1736857412; a=rsa-sha256; cv=none; b=W6kaM5sQW+nkQT1mbxc8UBieVIm5gbPKn0d0JXdNX3vB/O+lDFgPI2+0PbvScW71JsCObz LetrZJ/R5WXBWFEkkZKFOa0IbSs8AUis/tcJhaUgiFUBr/X1fgGgm2YWbAHMWXT5w1E0V8 0ax+WxXr9hHma7i5j4YpDE0x13D3tck= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf06.hostedemail.com: domain of Dave.Martin@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=Dave.Martin@arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id CDB2511FB; Tue, 14 Jan 2025 04:23:59 -0800 (PST) Received: from e133380.arm.com (e133380.arm.com [10.1.197.43]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 1E0623F66E; Tue, 14 Jan 2025 04:23:28 -0800 (PST) Date: Tue, 14 Jan 2025 12:23:26 +0000 From: Dave Martin To: Akihiko Odaki Cc: Eric Biederman , Kees Cook , Catalin Marinas , Mark Brown , Baoquan He , Vivek Goyal , Dave Young , LEROY Christophe , linux-mm@kvack.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, kexec@lists.infradead.org, binutils@sourceware.org, devel@daynix.com, Heiko Carstens Subject: Re: [PATCH v4 5/6] s390/crash: Use note name macros Message-ID: References: <20250111-elf-v4-0-b3841fa0dcd9@daynix.com> <20250111-elf-v4-5-b3841fa0dcd9@daynix.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20250111-elf-v4-5-b3841fa0dcd9@daynix.com> X-Rspamd-Queue-Id: 73B18180008 X-Rspam-User: X-Rspamd-Server: rspam07 X-Stat-Signature: xapfhnywutwb3k9uiuffrbpau8cszkje X-HE-Tag: 1736857412-425133 X-HE-Meta: U2FsdGVkX19Qh2tP/F2pUu3gCVOVi/na7v5EN7TWPBWjYGaVEYDz1P53YWf/D0j/YmWVUyhsd4bEAb6OzzQPSI/OlbsI2FauTUFFFAeJMk/iyw9pp49OjMjDlwtI8jM6PHKSiyI5UBjaZBRZU44tCLiuDQSRBwkTlHnUeA65soEvL7hMqWFvugGGLd8dJ+KLQMy9EeVU8rVa14qgUW+MtQWXx15yQ78nPgcnV9lzOouWb73ymfhQUJv5IhqqbK+njvuAXhZChKRrFIRAs62EMGIun1H0kr4FqKpZZkIBe00m5SL1lswxxnO/ZD2BnUYHagrF1cUb43JjOCspLF4cooFRcXwuuzfZ79MvahGKEDMDhUyF+3e5Azx1ZZIVfzd7CYfY3vJZMoiBl5stOzos9JONeZeEHl51p/fg/ixuL+9+IQI0EL5RlIHp6cKw7rw/R1/VJho0EIxPjfC16c2aTRMZ6pyUv2/uD5stjvDrQ1uACitlF3FxXlvTmjiQrqqoiC4/Sd0BHN6Xgptrxei4ynm+tZ6fALDjpQ32/WfzOb3z64e0vOKv4jlzPoNwDtm+b8PZBK/25DlFywQIwDTBVZ0+5CGSYffy9I37X29vXx2oEG7xa8E8DQ2l2blBswZz+I8KqGvJcWm9L1kesNjj+Zd2Kpw881E+UYZejEKA5uJVWjVCL1wazaQaj6s7SdPpWhzjPSAPHIWq4+k7ftwTehchzp+gpfIVkNmIydSkudWBE8rDAthGGGFicFpdnxmg/ZPC5lAzn0JozlfsimiKN5klHs0eeF57mUiwx+K3mk+ApMtsH8yRz31qJpADyoddtzDlU+tjyrLZrFwQ4hhVY6UHXu4OWyjzXkxfhvr9ucLJGj70ich/ffmBEliNFg2GDBj7ytuB73NhewDOfWdDp4b+/E6CXUpe/n3Pnbbza3+2pT3vNsRVGVk75Mh3DElr3dKoqyR5LE3HEKQ22Rk 8k/g/7PQ 1bfjf5OpRteEswQHQCBOlpNYgjlOHeWBrtp579kyN9BawJ0KgmJnOubOvHF3/pXSrplXLACBkeW69b5n0R/osQqUz3tRnAeYXejDOaiyCVIHxoxyBmWuEVyxdW7igmmmMBpX5lcM8cMZgg/ZpKqFb3Nz+C9LRZEFjzoalAm3XE8Mf2IAEG5vVR4WCCSFJQGAyoLFeWWqmwZtE7VoGsjrrCgihco2FxX8SudmiWX9LyYs7k1ubws0/9EZZFL1kco756RwuhiOkuEfxsKbKYciecgcERnQ8qOUMlm9e X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Hi, On Sat, Jan 11, 2025 at 02:48:48PM +0900, Akihiko Odaki wrote: > Use note name macros to match with the userspace's expectation. > > Signed-off-by: Akihiko Odaki > Acked-by: Heiko Carstens Reviewed-by: Dave Martin (I'm not in a position to test this, though.) > --- > arch/s390/kernel/crash_dump.c | 62 ++++++++++++++++--------------------------- > 1 file changed, 23 insertions(+), 39 deletions(-) > > diff --git a/arch/s390/kernel/crash_dump.c b/arch/s390/kernel/crash_dump.c > index cd0c93a8fb8b..022f4f198edf 100644 > --- a/arch/s390/kernel/crash_dump.c > +++ b/arch/s390/kernel/crash_dump.c > @@ -248,15 +248,6 @@ bool is_kdump_kernel(void) > } > EXPORT_SYMBOL_GPL(is_kdump_kernel); > > -static const char *nt_name(Elf64_Word type) > -{ > - const char *name = "LINUX"; > - > - if (type == NT_PRPSINFO || type == NT_PRSTATUS || type == NT_PRFPREG) > - name = KEXEC_CORE_NOTE_NAME; > - return name; > -} > - > /* > * Initialize ELF note > */ > @@ -281,10 +272,8 @@ static void *nt_init_name(void *buf, Elf64_Word type, void *desc, int d_len, > return PTR_ADD(buf, len); > } > > -static inline void *nt_init(void *buf, Elf64_Word type, void *desc, int d_len) > -{ > - return nt_init_name(buf, type, desc, d_len, nt_name(type)); > -} > +#define nt_init(buf, type, desc) \ > + nt_init_name(buf, NT_ ## type, &(desc), sizeof(desc), NN_ ## type) > > /* > * Calculate the size of ELF note > @@ -300,10 +289,7 @@ static size_t nt_size_name(int d_len, const char *name) > return size; > } > > -static inline size_t nt_size(Elf64_Word type, int d_len) > -{ > - return nt_size_name(d_len, nt_name(type)); > -} > +#define nt_size(type, desc) nt_size_name(sizeof(desc), NN_ ## type) > > /* > * Fill ELF notes for one CPU with save area registers > @@ -324,18 +310,16 @@ static void *fill_cpu_elf_notes(void *ptr, int cpu, struct save_area *sa) > memcpy(&nt_fpregset.fpc, &sa->fpc, sizeof(sa->fpc)); > memcpy(&nt_fpregset.fprs, &sa->fprs, sizeof(sa->fprs)); > /* Create ELF notes for the CPU */ > - ptr = nt_init(ptr, NT_PRSTATUS, &nt_prstatus, sizeof(nt_prstatus)); > - ptr = nt_init(ptr, NT_PRFPREG, &nt_fpregset, sizeof(nt_fpregset)); > - ptr = nt_init(ptr, NT_S390_TIMER, &sa->timer, sizeof(sa->timer)); > - ptr = nt_init(ptr, NT_S390_TODCMP, &sa->todcmp, sizeof(sa->todcmp)); > - ptr = nt_init(ptr, NT_S390_TODPREG, &sa->todpreg, sizeof(sa->todpreg)); > - ptr = nt_init(ptr, NT_S390_CTRS, &sa->ctrs, sizeof(sa->ctrs)); > - ptr = nt_init(ptr, NT_S390_PREFIX, &sa->prefix, sizeof(sa->prefix)); > + ptr = nt_init(ptr, PRSTATUS, nt_prstatus); > + ptr = nt_init(ptr, PRFPREG, nt_fpregset); > + ptr = nt_init(ptr, S390_TIMER, sa->timer); > + ptr = nt_init(ptr, S390_TODCMP, sa->todcmp); > + ptr = nt_init(ptr, S390_TODPREG, sa->todpreg); > + ptr = nt_init(ptr, S390_CTRS, sa->ctrs); > + ptr = nt_init(ptr, S390_PREFIX, sa->prefix); > if (cpu_has_vx()) { > - ptr = nt_init(ptr, NT_S390_VXRS_HIGH, > - &sa->vxrs_high, sizeof(sa->vxrs_high)); > - ptr = nt_init(ptr, NT_S390_VXRS_LOW, > - &sa->vxrs_low, sizeof(sa->vxrs_low)); > + ptr = nt_init(ptr, S390_VXRS_HIGH, sa->vxrs_high); > + ptr = nt_init(ptr, S390_VXRS_LOW, sa->vxrs_low); > } > return ptr; > } > @@ -348,16 +332,16 @@ static size_t get_cpu_elf_notes_size(void) > struct save_area *sa = NULL; > size_t size; > > - size = nt_size(NT_PRSTATUS, sizeof(struct elf_prstatus)); > - size += nt_size(NT_PRFPREG, sizeof(elf_fpregset_t)); > - size += nt_size(NT_S390_TIMER, sizeof(sa->timer)); > - size += nt_size(NT_S390_TODCMP, sizeof(sa->todcmp)); > - size += nt_size(NT_S390_TODPREG, sizeof(sa->todpreg)); > - size += nt_size(NT_S390_CTRS, sizeof(sa->ctrs)); > - size += nt_size(NT_S390_PREFIX, sizeof(sa->prefix)); > + size = nt_size(PRSTATUS, struct elf_prstatus); > + size += nt_size(PRFPREG, elf_fpregset_t); > + size += nt_size(S390_TIMER, sa->timer); > + size += nt_size(S390_TODCMP, sa->todcmp); > + size += nt_size(S390_TODPREG, sa->todpreg); > + size += nt_size(S390_CTRS, sa->ctrs); > + size += nt_size(S390_PREFIX, sa->prefix); > if (cpu_has_vx()) { > - size += nt_size(NT_S390_VXRS_HIGH, sizeof(sa->vxrs_high)); > - size += nt_size(NT_S390_VXRS_LOW, sizeof(sa->vxrs_low)); > + size += nt_size(S390_VXRS_HIGH, sa->vxrs_high); > + size += nt_size(S390_VXRS_LOW, sa->vxrs_low); > } > > return size; > @@ -373,7 +357,7 @@ static void *nt_prpsinfo(void *ptr) > memset(&prpsinfo, 0, sizeof(prpsinfo)); > prpsinfo.pr_sname = 'R'; > strcpy(prpsinfo.pr_fname, "vmlinux"); > - return nt_init(ptr, NT_PRPSINFO, &prpsinfo, sizeof(prpsinfo)); > + return nt_init(ptr, PRPSINFO, prpsinfo); > } > > /* > @@ -589,7 +573,7 @@ static size_t get_elfcorehdr_size(int phdr_count) > /* PT_NOTES */ > size += sizeof(Elf64_Phdr); > /* nt_prpsinfo */ > - size += nt_size(NT_PRPSINFO, sizeof(struct elf_prpsinfo)); > + size += nt_size(PRPSINFO, struct elf_prpsinfo); > /* regsets */ > size += get_cpu_cnt() * get_cpu_elf_notes_size(); > /* nt_vmcoreinfo */ > > -- > 2.47.1 > >