From nobody Sat Feb 7 18:20:24 2026 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7DF171632DF for ; Sat, 11 Jan 2025 05:49:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736574546; cv=none; b=CEyamDvMD7pN14YoFzrU8Nk7jwIr0npJWy8mmOquhybiMbEhlGwK/rS4lqWSnki0vgqVkST8RGKsVg5twZO4W1TH5EtKIxhEOj1eTUQJXqfm+E1Qx41tZAwFtTnM1cP5egyM1DawGCUmunWylEP2Oh2QyMXO0t6t2++i0Mnf0HQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736574546; c=relaxed/simple; bh=fAhUoOeYK9fr2EpiTrdYpYKT9gvRJnt1fjb0VAfqM9o=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=a9AZGLsJBzR34LFgJ7bouJAxIMX61gLa08FCIosRrfWAW9OfyqhEYupgQ3tWCaLPNNrM9arfzTYaAaGSLj6kDnL86kvbNo3Ck9mjkUBEpIddbRzPilNToyv81Q+QOkD2YzyGrRlSmQzhlShRxGYo6Lnk7RA1vT7uwLFSEmnq+DI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=daynix.com; spf=pass smtp.mailfrom=daynix.com; dkim=pass (2048-bit key) header.d=daynix-com.20230601.gappssmtp.com header.i=@daynix-com.20230601.gappssmtp.com header.b=XWAH+o6X; arc=none smtp.client-ip=209.85.214.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=daynix.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=daynix.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=daynix-com.20230601.gappssmtp.com header.i=@daynix-com.20230601.gappssmtp.com header.b="XWAH+o6X" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-21661be2c2dso44739395ad.1 for ; Fri, 10 Jan 2025 21:49:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1736574541; x=1737179341; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=He/FF4mW6z63rm6Ez1fm+hLtPmYbF/A35f1xOajKz/c=; b=XWAH+o6XKym9MQmLQWn1VzXOO0rwnR9Af5HK04gFfKYWpaOXUthr/ONQUGiTojYCj2 iG1RBYd/FJcN1kttrOB9Un07OYlvgsbXZq3pBUQg00u1pFWJyCeU1iJUiOrzQ865pY/i +VDC3TmSidO+KO3QeXKJkRkNjZXCzcMuXMPTA9pHtn5LraTatzY6X1lQ+6ri+rtmQkYM eiOY7oceKVZnjqZevyNADZhmF0e20yRIr8HUC7PHuyvoaRaffZPDQ2t9TYbNjP6W6Fbk qk+8ypcfJWUH6YwZ9SO0aDwFE+B7KrrRiidnLj/SrNAJzuhqXMlIrx4RiL8K0BYo2o7q FPSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736574541; x=1737179341; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=He/FF4mW6z63rm6Ez1fm+hLtPmYbF/A35f1xOajKz/c=; b=UzR10MuJBXMj4gJpI2yiNYEVXZ5SDMBPpPzwgQ8uaIZ89hQFCDUfv5gn5NVPl7CcGN KHkk+kb12M9uufKKu9mlvQv1pQEUEn74dwvJgsfwbdSyJosbBhnHIQGvrEVi2NxkNFuT fuS3b8YTH/3YzT12VunVLJB6l3ASGXJSJtrORC3o6rvqIyo0ueHjQr5oez5a0/wMWbgW wkseAgNjtSSjY49PWXP+ugIGn+aiYMdeUwbJRyx/UA2TJJjwAJm4pqv4q8NmeEGlRtvG p4gIE0nHbz0KxB+hSuJXThvtrE4YFUI/qnwIFnhjvOoImpqdTAJ/+nyl9Jpend1lStDr /hew== X-Forwarded-Encrypted: i=1; AJvYcCXH3Ltuljg9QBQhlI3IExGQaJUdZuquXFiV7kPUZHVrv3cJBAnBUGT2uxChYMpDNvbGSd6WEO10Gk7MhE0=@vger.kernel.org X-Gm-Message-State: AOJu0Yx0+2zWK7JxSgYsmgUHncpNbBRCKNC2Bzbnw7eABihHCL9nOS/D 799ZOOcTF+LR0bj2odfIBaE1LT4QssEt33LK4nMOysi5rH6a/LIbisniM/mn9v8= X-Gm-Gg: ASbGncsLcEDCb13+LtfukdPQ+2ywvPHdHEPioyWMODad+IeJ2/PvTEAgt+GOrzI1Zsx 8LpehuH9KE3j/gVzuCoLbIPCevBUV6CjkHfRJKID5WVaUCOFaKfO1Ro3VUfVUTQvs6KoQw7YdSK wtjUtKwar9BqvdgVv+rBnxSxoqZ2xj+9LxqumqBrE8E4zKc/goEnvyK7K5wgQu1pcfCQXxwglBe j1Vh90mmLyQ+soymYulykuhx/QYbUcxshgi9KfYV0SG0uq6+XrpKTNNqC8= X-Google-Smtp-Source: AGHT+IHcpmdtla8m811pOhOWUKKg3mt5D2YgMgKQAi/FtxQToiO3ZEw9yK9yhc6mlxAM0lTabpo8Kw== X-Received: by 2002:a05:6a00:cd6:b0:729:9f1:69bc with SMTP id d2e1a72fcca58-72d21f45b2fmr19552247b3a.12.1736574541182; Fri, 10 Jan 2025 21:49:01 -0800 (PST) Received: from localhost ([157.82.203.37]) by smtp.gmail.com with UTF8SMTPSA id d2e1a72fcca58-72d405489e2sm2380384b3a.32.2025.01.10.21.48.56 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 10 Jan 2025 21:49:00 -0800 (PST) From: Akihiko Odaki Date: Sat, 11 Jan 2025 14:48:44 +0900 Subject: [PATCH v4 1/6] elf: Define note name macros Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250111-elf-v4-1-b3841fa0dcd9@daynix.com> References: <20250111-elf-v4-0-b3841fa0dcd9@daynix.com> In-Reply-To: <20250111-elf-v4-0-b3841fa0dcd9@daynix.com> To: Eric Biederman , Kees Cook , Catalin Marinas , Mark Brown , Dave Martin , Baoquan He , Vivek Goyal , Dave Young , LEROY Christophe Cc: 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, Akihiko Odaki X-Mailer: b4 0.14-dev-fd6e3 elf.h had a comment saying: > Notes used in ET_CORE. Architectures export some of the arch register > sets using the corresponding note types via the PTRACE_GETREGSET and > PTRACE_SETREGSET requests. > The note name for these types is "LINUX", except NT_PRFPREG that is > named "CORE". However, NT_PRSTATUS is also named "CORE". It is also unclear what "these types" refers to. To fix these problems, define a name for each note type. The added definitions are macros so the kernel and userspace can directly refer to them. Signed-off-by: Akihiko Odaki Acked-by: Baoquan He Reviewed-by: Dave Martin --- include/uapi/linux/elf.h | 86 ++++++++++++++++++++++++++++++++++++++++++++= ++-- 1 file changed, 83 insertions(+), 3 deletions(-) diff --git a/include/uapi/linux/elf.h b/include/uapi/linux/elf.h index b44069d29cec..343f5c40d03a 100644 --- a/include/uapi/linux/elf.h +++ b/include/uapi/linux/elf.h @@ -368,99 +368,179 @@ typedef struct elf64_shdr { #define ELF_OSABI ELFOSABI_NONE #endif =20 +/* Note definitions: NN_ defines names. NT_ defines types. */ + /* * Notes used in ET_CORE. Architectures export some of the arch register s= ets * using the corresponding note types via the PTRACE_GETREGSET and * PTRACE_SETREGSET requests. - * The note name for these types is "LINUX", except NT_PRFPREG that is nam= ed - * "CORE". */ +#define NN_PRSTATUS "CORE" #define NT_PRSTATUS 1 +#define NN_PRFPREG "CORE" #define NT_PRFPREG 2 +#define NN_PRPSINFO "CORE" #define NT_PRPSINFO 3 +#define NN_TASKSTRUCT "CORE" #define NT_TASKSTRUCT 4 +#define NN_AUXV "CORE" #define NT_AUXV 6 /* * Note to userspace developers: size of NT_SIGINFO note may increase * in the future to accomodate more fields, don't assume it is fixed! */ +#define NN_SIGINFO "CORE" #define NT_SIGINFO 0x53494749 +#define NN_FILE "CORE" #define NT_FILE 0x46494c45 +#define NN_PRXFPREG "LINUX" #define NT_PRXFPREG 0x46e62b7f /* copied from gdb5.1/include/elf/= common.h */ +#define NN_PPC_VMX "LINUX" #define NT_PPC_VMX 0x100 /* PowerPC Altivec/VMX registers */ +#define NN_PPC_SPE "LINUX" #define NT_PPC_SPE 0x101 /* PowerPC SPE/EVR registers */ +#define NN_PPC_VSX "LINUX" #define NT_PPC_VSX 0x102 /* PowerPC VSX registers */ +#define NN_PPC_TAR "LINUX" #define NT_PPC_TAR 0x103 /* Target Address Register */ +#define NN_PPC_PPR "LINUX" #define NT_PPC_PPR 0x104 /* Program Priority Register */ +#define NN_PPC_DSCR "LINUX" #define NT_PPC_DSCR 0x105 /* Data Stream Control Register */ +#define NN_PPC_EBB "LINUX" #define NT_PPC_EBB 0x106 /* Event Based Branch Registers */ +#define NN_PPC_PMU "LINUX" #define NT_PPC_PMU 0x107 /* Performance Monitor Registers */ +#define NN_PPC_TM_CGPR "LINUX" #define NT_PPC_TM_CGPR 0x108 /* TM checkpointed GPR Registers */ +#define NN_PPC_TM_CFPR "LINUX" #define NT_PPC_TM_CFPR 0x109 /* TM checkpointed FPR Registers */ +#define NN_PPC_TM_CVMX "LINUX" #define NT_PPC_TM_CVMX 0x10a /* TM checkpointed VMX Registers */ +#define NN_PPC_TM_CVSX "LINUX" #define NT_PPC_TM_CVSX 0x10b /* TM checkpointed VSX Registers */ +#define NN_PPC_TM_SPR "LINUX" #define NT_PPC_TM_SPR 0x10c /* TM Special Purpose Registers */ +#define NN_PPC_TM_CTAR "LINUX" #define NT_PPC_TM_CTAR 0x10d /* TM checkpointed Target Address Register */ +#define NN_PPC_TM_CPPR "LINUX" #define NT_PPC_TM_CPPR 0x10e /* TM checkpointed Program Priority Register= */ +#define NN_PPC_TM_CDSCR "LINUX" #define NT_PPC_TM_CDSCR 0x10f /* TM checkpointed Data Stream Control Regi= ster */ +#define NN_PPC_PKEY "LINUX" #define NT_PPC_PKEY 0x110 /* Memory Protection Keys registers */ +#define NN_PPC_DEXCR "LINUX" #define NT_PPC_DEXCR 0x111 /* PowerPC DEXCR registers */ +#define NN_PPC_HASHKEYR "LINUX" #define NT_PPC_HASHKEYR 0x112 /* PowerPC HASHKEYR register */ +#define NN_386_TLS "LINUX" #define NT_386_TLS 0x200 /* i386 TLS slots (struct user_desc) */ +#define NN_386_IOPERM "LINUX" #define NT_386_IOPERM 0x201 /* x86 io permission bitmap (1=3Ddeny) */ +#define NN_X86_XSTATE "LINUX" #define NT_X86_XSTATE 0x202 /* x86 extended state using xsave */ /* Old binutils treats 0x203 as a CET state */ +#define NN_X86_SHSTK "LINUX" #define NT_X86_SHSTK 0x204 /* x86 SHSTK state */ +#define NN_X86_XSAVE_LAYOUT "LINUX" #define NT_X86_XSAVE_LAYOUT 0x205 /* XSAVE layout description */ +#define NN_S390_HIGH_GPRS "LINUX" #define NT_S390_HIGH_GPRS 0x300 /* s390 upper register halves */ +#define NN_S390_TIMER "LINUX" #define NT_S390_TIMER 0x301 /* s390 timer register */ +#define NN_S390_TODCMP "LINUX" #define NT_S390_TODCMP 0x302 /* s390 TOD clock comparator register */ +#define NN_S390_TODPREG "LINUX" #define NT_S390_TODPREG 0x303 /* s390 TOD programmable register */ +#define NN_S390_CTRS "LINUX" #define NT_S390_CTRS 0x304 /* s390 control registers */ +#define NN_S390_PREFIX "LINUX" #define NT_S390_PREFIX 0x305 /* s390 prefix register */ +#define NN_S390_LAST_BREAK "LINUX" #define NT_S390_LAST_BREAK 0x306 /* s390 breaking event address */ +#define NN_S390_SYSTEM_CALL "LINUX" #define NT_S390_SYSTEM_CALL 0x307 /* s390 system call restart data */ +#define NN_S390_TDB "LINUX" #define NT_S390_TDB 0x308 /* s390 transaction diagnostic block */ +#define NN_S390_VXRS_LOW "LINUX" #define NT_S390_VXRS_LOW 0x309 /* s390 vector registers 0-15 upper half */ +#define NN_S390_VXRS_HIGH "LINUX" #define NT_S390_VXRS_HIGH 0x30a /* s390 vector registers 16-31 */ +#define NN_S390_GS_CB "LINUX" #define NT_S390_GS_CB 0x30b /* s390 guarded storage registers */ +#define NN_S390_GS_BC "LINUX" #define NT_S390_GS_BC 0x30c /* s390 guarded storage broadcast control blo= ck */ +#define NN_S390_RI_CB "LINUX" #define NT_S390_RI_CB 0x30d /* s390 runtime instrumentation */ +#define NN_S390_PV_CPU_DATA "LINUX" #define NT_S390_PV_CPU_DATA 0x30e /* s390 protvirt cpu dump data */ +#define NN_ARM_VFP "LINUX" #define NT_ARM_VFP 0x400 /* ARM VFP/NEON registers */ +#define NN_ARM_TLS "LINUX" #define NT_ARM_TLS 0x401 /* ARM TLS register */ +#define NN_ARM_HW_BREAK "LINUX" #define NT_ARM_HW_BREAK 0x402 /* ARM hardware breakpoint registers */ +#define NN_ARM_HW_WATCH "LINUX" #define NT_ARM_HW_WATCH 0x403 /* ARM hardware watchpoint registers */ +#define NN_ARM_SYSTEM_CALL "LINUX" #define NT_ARM_SYSTEM_CALL 0x404 /* ARM system call number */ +#define NN_ARM_SVE "LINUX" #define NT_ARM_SVE 0x405 /* ARM Scalable Vector Extension registers */ +#define NN_ARM_PAC_MASK "LINUX" #define NT_ARM_PAC_MASK 0x406 /* ARM pointer authentication code masks */ +#define NN_ARM_PACA_KEYS "LINUX" #define NT_ARM_PACA_KEYS 0x407 /* ARM pointer authentication address keys = */ +#define NN_ARM_PACG_KEYS "LINUX" #define NT_ARM_PACG_KEYS 0x408 /* ARM pointer authentication generic key */ +#define NN_ARM_TAGGED_ADDR_CTRL "LINUX" #define NT_ARM_TAGGED_ADDR_CTRL 0x409 /* arm64 tagged address control (prc= tl()) */ +#define NN_ARM_PAC_ENABLED_KEYS "LINUX" #define NT_ARM_PAC_ENABLED_KEYS 0x40a /* arm64 ptr auth enabled keys (prct= l()) */ +#define NN_ARM_SSVE "LINUX" #define NT_ARM_SSVE 0x40b /* ARM Streaming SVE registers */ +#define NN_ARM_ZA "LINUX" #define NT_ARM_ZA 0x40c /* ARM SME ZA registers */ +#define NN_ARM_ZT "LINUX" #define NT_ARM_ZT 0x40d /* ARM SME ZT registers */ +#define NN_ARM_FPMR "LINUX" #define NT_ARM_FPMR 0x40e /* ARM floating point mode register */ +#define NN_ARM_POE "LINUX" #define NT_ARM_POE 0x40f /* ARM POE registers */ +#define NN_ARM_GCS "LINUX" #define NT_ARM_GCS 0x410 /* ARM GCS state */ +#define NN_ARC_V2 "LINUX" #define NT_ARC_V2 0x600 /* ARCv2 accumulator/extra registers */ +#define NN_VMCOREDD "LINUX" #define NT_VMCOREDD 0x700 /* Vmcore Device Dump Note */ +#define NN_MIPS_DSP "LINUX" #define NT_MIPS_DSP 0x800 /* MIPS DSP ASE registers */ +#define NN_MIPS_FP_MODE "LINUX" #define NT_MIPS_FP_MODE 0x801 /* MIPS floating-point mode */ +#define NN_MIPS_MSA "LINUX" #define NT_MIPS_MSA 0x802 /* MIPS SIMD registers */ +#define NN_RISCV_CSR "LINUX" #define NT_RISCV_CSR 0x900 /* RISC-V Control and Status Registers */ +#define NN_RISCV_VECTOR "LINUX" #define NT_RISCV_VECTOR 0x901 /* RISC-V vector registers */ +#define NN_RISCV_TAGGED_ADDR_CTRL "LINUX" #define NT_RISCV_TAGGED_ADDR_CTRL 0x902 /* RISC-V tagged address control (= prctl()) */ +#define NN_LOONGARCH_CPUCFG "LINUX" #define NT_LOONGARCH_CPUCFG 0xa00 /* LoongArch CPU config registers */ +#define NN_LOONGARCH_CSR "LINUX" #define NT_LOONGARCH_CSR 0xa01 /* LoongArch control and status registers */ +#define NN_LOONGARCH_LSX "LINUX" #define NT_LOONGARCH_LSX 0xa02 /* LoongArch Loongson SIMD Extension regist= ers */ +#define NN_LOONGARCH_LASX "LINUX" #define NT_LOONGARCH_LASX 0xa03 /* LoongArch Loongson Advanced SIMD Extens= ion registers */ +#define NN_LOONGARCH_LBT "LINUX" #define NT_LOONGARCH_LBT 0xa04 /* LoongArch Loongson Binary Translation re= gisters */ +#define NN_LOONGARCH_HW_BREAK "LINUX" #define NT_LOONGARCH_HW_BREAK 0xa05 /* LoongArch hardware breakpoint reg= isters */ +#define NN_LOONGARCH_HW_WATCH "LINUX" #define NT_LOONGARCH_HW_WATCH 0xa06 /* LoongArch hardware watchpoint reg= isters */ =20 -/* Note types with note name "GNU" */ +/* Note used in other file types. */ +#define NN_GNU_PROPERTY_TYPE_0 "GNU" #define NT_GNU_PROPERTY_TYPE_0 5 =20 /* Note header in a PT_NOTE section */ --=20 2.47.1 From nobody Sat Feb 7 18:20:24 2026 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 27887171E49 for ; Sat, 11 Jan 2025 05:49:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736574557; cv=none; b=e7QmkAkfLc5EcVgoRYavybH36sUQWZIeItdsHAQgF1shREY7flcd1FPnLbqBCoKAay3LuqLBNPvJ2LcPGnrc134jqkDxTYmg2aa5D0JoEnXI5BkuDlLInMemRM2vFHJ6/irUErvkML43RJ1y0vyslcfexQcEPAxKXCH2bUdqmOk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736574557; c=relaxed/simple; bh=nHxDNiGj0kP+OrAR/r8E7Aht5XhcJNfHXGmXX9sgsJw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=QgrG3rL7q0BpJ4xcrBoxx3LIpxjUseTdk4+OTli5ALkalnf8njVHRhqk2n/A/v5xtgbO8ENXLQ/QHO40hceMvBja5oAoPO7DatcgDf4XSR6iVZn957xKWt8T4kp85AjIP1lfVjaAVqSL7d7agUQwcnk6/zdI3icViWOkOg2C32U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=daynix.com; spf=pass smtp.mailfrom=daynix.com; dkim=pass (2048-bit key) header.d=daynix-com.20230601.gappssmtp.com header.i=@daynix-com.20230601.gappssmtp.com header.b=xGtfDckJ; arc=none smtp.client-ip=209.85.214.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=daynix.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=daynix.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=daynix-com.20230601.gappssmtp.com header.i=@daynix-com.20230601.gappssmtp.com header.b="xGtfDckJ" Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-21669fd5c7cso47190395ad.3 for ; Fri, 10 Jan 2025 21:49:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1736574548; x=1737179348; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=To6WceQOVEAdrv9VIwdrgLUfIkfIZojfYpt2+tcFAZE=; b=xGtfDckJ8jOSDk5XNVp78Dfp2rqMZoBNfs46sAxdcOjrQ++dlh3L9kAFq0Jm7dfgaE F56Uci2SdFSDUs7s5S/b+WaUUaNIe10ZHrkOn1XAyYewzuFleSdM24c5XWclFi5nIsdh /KNOxJouLNZjbWll3qGj/6QAW5hsfSCzUgJc78foqc7T+RwMqT+vJEMCexpXQMk12Ats DTELd4bxo1r6yNSVOhfzb3rbb5rGnDhf2lg/THD7aORZ2NQyYGtQeydxHQpDb1FbBCI6 K+tL83y5SzNgnY0gIqfbe087SVa0JnR55B1QVGjUreujGFCJEToPKpjGQBFFrdYRlOqe wwKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736574548; x=1737179348; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=To6WceQOVEAdrv9VIwdrgLUfIkfIZojfYpt2+tcFAZE=; b=u47kBKv3BBmFNGAZhUwgWxWKkiP4CF3ZBwgp3lYoN9GKhyjXAOFrK3fjYUuwzM37Td bFt429qA7V7CsbbAJXWri1flZ3RoLE1YppoTENnxl0URWM5GWp+Oy3+noW2w0cW1BdBf 17K0jQnomxXQfxH1jE9XWNhvkg4YLNgklEBQ0zypq0gutAOv9snso51f5rY2VZtKegNd Gb/4QDyShr/B76Pezi+7pjeBYzFBrrnRHi1/Sudl1gpzRCyDLz3/ay9WkDJrooFtREoY Np5SexsqucSViwglbTQVEjZ0V8Pfw7xUnu2SJrk7m5CJoLMvNhGbQFU10fRclMD16rpL Y8Zw== X-Forwarded-Encrypted: i=1; AJvYcCUKzttxBsKaLVG4c50FCBPOKBcg8W8p/loCP/qgbt36VzmNcDIG/a/+JlajFl+Tu2NLc3QZrjFRHMW1BDg=@vger.kernel.org X-Gm-Message-State: AOJu0YxVsrO42OcFXC7PRLJyfMwRelzu4U+d8ZbRlY6QjfTnz1sgn3// uiN+f1STuvSYu+25DUKp4GCa8dJzgwU1WIbBYYGPSmqFzMnvbHL5UjjHPRHqW0sT+vifoKX/7KS 0wGw= X-Gm-Gg: ASbGncvN54ldwEQarcWIk1Bs8fK/5bbl7X70cRB6jIRnHyVM45ArLCNn4o2yXxd15U1 jYFqXl1FoiyEHwuD0amkpoFQTXWSrpKS9zsrbLkvnZbcREWBUOS96w4Q05LWsClOBPXbr6bu4K5 UCvJLq2ud+wqSndKEJqNGlJjm+FFV0ze3nOdWXelcO/3oQrdmXwX9F9VvHnZLl09jM47nySYCyA IB45UD9Bkw9QvOf9tvl8HaRXJmo72l7Ox2SuPxYonReGz8cYUjms4jVmx4= X-Google-Smtp-Source: AGHT+IHn65rwbd4gKdhst/GRdULarDOSLx1cuK1RthFbVp937QpJuhXkw/qwAunKCMjt+dsCYzpTGw== X-Received: by 2002:a17:902:ecc7:b0:216:760c:3879 with SMTP id d9443c01a7336-21a83fdf2d0mr185892965ad.46.1736574548582; Fri, 10 Jan 2025 21:49:08 -0800 (PST) Received: from localhost ([157.82.203.37]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-21a9f22d293sm21144365ad.185.2025.01.10.21.49.04 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 10 Jan 2025 21:49:08 -0800 (PST) From: Akihiko Odaki Date: Sat, 11 Jan 2025 14:48:45 +0900 Subject: [PATCH v4 2/6] binfmt_elf: Use note name macros Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250111-elf-v4-2-b3841fa0dcd9@daynix.com> References: <20250111-elf-v4-0-b3841fa0dcd9@daynix.com> In-Reply-To: <20250111-elf-v4-0-b3841fa0dcd9@daynix.com> To: Eric Biederman , Kees Cook , Catalin Marinas , Mark Brown , Dave Martin , Baoquan He , Vivek Goyal , Dave Young , LEROY Christophe Cc: 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, Akihiko Odaki X-Mailer: b4 0.14-dev-fd6e3 Use note name macros to match with the userspace's expectation. Signed-off-by: Akihiko Odaki Acked-by: Baoquan He Reviewed-by: Dave Martin --- fs/binfmt_elf.c | 21 ++++++++++----------- fs/binfmt_elf_fdpic.c | 8 ++++---- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index 106f0e8af177..5b4a92e5e508 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c @@ -762,8 +762,7 @@ static int parse_elf_property(const char *data, size_t = *off, size_t datasz, } =20 #define NOTE_DATA_SZ SZ_1K -#define GNU_PROPERTY_TYPE_0_NAME "GNU" -#define NOTE_NAME_SZ (sizeof(GNU_PROPERTY_TYPE_0_NAME)) +#define NOTE_NAME_SZ (sizeof(NN_GNU_PROPERTY_TYPE_0)) =20 static int parse_elf_properties(struct file *f, const struct elf_phdr *phd= r, struct arch_elf_state *arch) @@ -800,7 +799,7 @@ static int parse_elf_properties(struct file *f, const s= truct elf_phdr *phdr, if (note.nhdr.n_type !=3D NT_GNU_PROPERTY_TYPE_0 || note.nhdr.n_namesz !=3D NOTE_NAME_SZ || strncmp(note.data + sizeof(note.nhdr), - GNU_PROPERTY_TYPE_0_NAME, n - sizeof(note.nhdr))) + NN_GNU_PROPERTY_TYPE_0, n - sizeof(note.nhdr))) return -ENOEXEC; =20 off =3D round_up(sizeof(note.nhdr) + NOTE_NAME_SZ, @@ -1603,14 +1602,14 @@ static void fill_auxv_note(struct memelfnote *note,= struct mm_struct *mm) do i +=3D 2; while (auxv[i - 2] !=3D AT_NULL); - fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv); + fill_note(note, NN_AUXV, NT_AUXV, i * sizeof(elf_addr_t), auxv); } =20 static void fill_siginfo_note(struct memelfnote *note, user_siginfo_t *csi= gdata, const kernel_siginfo_t *siginfo) { copy_siginfo_to_external(csigdata, siginfo); - fill_note(note, "CORE", NT_SIGINFO, sizeof(*csigdata), csigdata); + fill_note(note, NN_SIGINFO, NT_SIGINFO, sizeof(*csigdata), csigdata); } =20 /* @@ -1706,7 +1705,7 @@ static int fill_files_note(struct memelfnote *note, s= truct coredump_params *cprm } =20 size =3D name_curpos - (char *)data; - fill_note(note, "CORE", NT_FILE, size, data); + fill_note(note, NN_FILE, NT_FILE, size, data); return 0; } =20 @@ -1767,7 +1766,7 @@ static int fill_thread_core_info(struct elf_thread_co= re_info *t, regset_get(t->task, &view->regsets[0], sizeof(t->prstatus.pr_reg), &t->prstatus.pr_reg); =20 - fill_note(&t->notes[0], "CORE", NT_PRSTATUS, + fill_note(&t->notes[0], NN_PRSTATUS, NT_PRSTATUS, PRSTATUS_SIZE, &t->prstatus); info->size +=3D notesize(&t->notes[0]); =20 @@ -1801,7 +1800,7 @@ static int fill_thread_core_info(struct elf_thread_co= re_info *t, if (is_fpreg) SET_PR_FPVALID(&t->prstatus); =20 - fill_note(&t->notes[note_iter], is_fpreg ? "CORE" : "LINUX", + fill_note(&t->notes[note_iter], is_fpreg ? NN_PRFPREG : "LINUX", note_type, ret, data); =20 info->size +=3D notesize(&t->notes[note_iter]); @@ -1821,7 +1820,7 @@ static int fill_thread_core_info(struct elf_thread_co= re_info *t, fill_prstatus(&t->prstatus.common, p, signr); elf_core_copy_task_regs(p, &t->prstatus.pr_reg); =20 - fill_note(&t->notes[0], "CORE", NT_PRSTATUS, sizeof(t->prstatus), + fill_note(&t->notes[0], NN_PRSTATUS, NT_PRSTATUS, sizeof(t->prstatus), &(t->prstatus)); info->size +=3D notesize(&t->notes[0]); =20 @@ -1832,7 +1831,7 @@ static int fill_thread_core_info(struct elf_thread_co= re_info *t, } =20 t->prstatus.pr_fpvalid =3D 1; - fill_note(&t->notes[1], "CORE", NT_PRFPREG, sizeof(*fpu), fpu); + fill_note(&t->notes[1], NN_PRFPREG, NT_PRFPREG, sizeof(*fpu), fpu); info->size +=3D notesize(&t->notes[1]); =20 return 1; @@ -1852,7 +1851,7 @@ static int fill_note_info(struct elfhdr *elf, int phd= rs, psinfo =3D kmalloc(sizeof(*psinfo), GFP_KERNEL); if (!psinfo) return 0; - fill_note(&info->psinfo, "CORE", NT_PRPSINFO, sizeof(*psinfo), psinfo); + fill_note(&info->psinfo, NN_PRPSINFO, NT_PRPSINFO, sizeof(*psinfo), psinf= o); =20 #ifdef CORE_DUMP_USE_REGSET view =3D task_user_regset_view(dump_task); diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c index f1a7c4875c4a..96bd9d2f23d7 100644 --- a/fs/binfmt_elf_fdpic.c +++ b/fs/binfmt_elf_fdpic.c @@ -1397,7 +1397,7 @@ static struct elf_thread_status *elf_dump_thread_stat= us(long signr, struct task_ regset_get(p, &view->regsets[0], sizeof(t->prstatus.pr_reg), &t->prstatus.pr_reg); =20 - fill_note(&t->notes[0], "CORE", NT_PRSTATUS, sizeof(t->prstatus), + fill_note(&t->notes[0], NN_PRSTATUS, NT_PRSTATUS, sizeof(t->prstatus), &t->prstatus); t->num_notes++; *sz +=3D notesize(&t->notes[0]); @@ -1415,7 +1415,7 @@ static struct elf_thread_status *elf_dump_thread_stat= us(long signr, struct task_ } =20 if (t->prstatus.pr_fpvalid) { - fill_note(&t->notes[1], "CORE", NT_PRFPREG, sizeof(t->fpu), + fill_note(&t->notes[1], NN_PRFPREG, NT_PRFPREG, sizeof(t->fpu), &t->fpu); t->num_notes++; *sz +=3D notesize(&t->notes[1]); @@ -1530,7 +1530,7 @@ static int elf_fdpic_core_dump(struct coredump_params= *cprm) */ =20 fill_psinfo(psinfo, current->group_leader, current->mm); - fill_note(&psinfo_note, "CORE", NT_PRPSINFO, sizeof(*psinfo), psinfo); + fill_note(&psinfo_note, NN_PRPSINFO, NT_PRPSINFO, sizeof(*psinfo), psinfo= ); thread_status_size +=3D notesize(&psinfo_note); =20 auxv =3D (elf_addr_t *) current->mm->saved_auxv; @@ -1538,7 +1538,7 @@ static int elf_fdpic_core_dump(struct coredump_params= *cprm) do i +=3D 2; while (auxv[i - 2] !=3D AT_NULL); - fill_note(&auxv_note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv); + fill_note(&auxv_note, NN_AUXV, NT_AUXV, i * sizeof(elf_addr_t), auxv); thread_status_size +=3D notesize(&auxv_note); =20 offset =3D sizeof(*elf); /* ELF header */ --=20 2.47.1 From nobody Sat Feb 7 18:20:24 2026 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9F11B155316 for ; Sat, 11 Jan 2025 05:49:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736574560; cv=none; b=X5CbEj59dk2VqD7XhOvjrWXEJcmKzobBrWhsajoViY1sPMW9XzaUf2cHeVxvr4HcDM0TdygDCLmdD7wTCdku2IN8o4YNEUr4d2PXSqtod4WemSN/PMzSdL3NLmBhnWgxyS6NBfQXJ/kNIN4G8MlKpst0zffxoFYBmg0uB+iSiXQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736574560; c=relaxed/simple; bh=+dyGO7LzstjjCAGXXiQqnw5sSHzhUQEkL0tM4qAP1Fs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=htk4D1STMhNA3x8dwGBlWoa51MK5T/yPeTGo1eQLzF14GIYSJXghisUV5Dqg1z/kXyj4jjM95BaNS8ARzejqmwDkQMwWTE8OziF6uKSwsjlC2z6n49KrUUhQkYbhReF9FUM9K1CaEF0uhfKMRS04dZWGJyw8aryLRvN0LMNNlRU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=daynix.com; spf=pass smtp.mailfrom=daynix.com; dkim=pass (2048-bit key) header.d=daynix-com.20230601.gappssmtp.com header.i=@daynix-com.20230601.gappssmtp.com header.b=tXwd+pWj; arc=none smtp.client-ip=209.85.214.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=daynix.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=daynix.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=daynix-com.20230601.gappssmtp.com header.i=@daynix-com.20230601.gappssmtp.com header.b="tXwd+pWj" Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-2162c0f6a39so67362545ad.0 for ; Fri, 10 Jan 2025 21:49:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1736574556; x=1737179356; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=NDoGkIZOBZADHox4rebBhOBkiub95NT2vaNCAf0u1/w=; b=tXwd+pWjozTqOQcy0akKciH9bt9+bmifQY/TKv9s2vIFlZz0rZv0pN2fabzAYMkVfX 7JcZxKzfGn9KcvSsT51kRpCiKzkieWLT1IkHpJD2gtK029bcwBOjXlwdX3In4HvIY5eD EQox9Met1nRv6AgAuKiNqa94evenJ985F+3BPfSuVcCJJqQKT73yFftthZjK7KNIjpYJ PDydYSVJteGcRnVrcgrihjGxRpskxHufsfhqfQB2/4anDj6aEmLwY75Vezc6ovXACeB4 dxVxKo9o1mIo2uMFNeVsm/iDlNmbF6UeiVMJ2eZqI69GEqqUyeXXxKZ5U277ccVs2IJW oOnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736574556; x=1737179356; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NDoGkIZOBZADHox4rebBhOBkiub95NT2vaNCAf0u1/w=; b=IKc/WgR8AcYW8NKL5enJXPf70QP/gVUGcFx9wFCcl5D9XOkQD59wzutzrssS84qBK0 ZIkbxE4WR/WLT1EpNSUK+Ug33a3f/5ivFqghhm2MiQF4x2BKBFqJmKps45WlTaTLl14P ZemAGjQOR8DrbJE0zdyfOEXw25qZb1x8OZY11VJfOZt2WU9BBhNmHI9HzAuENQW3aS+F qfwWaE1ZCoBCTJNAFxoFrW1pG19BUCQm8DM2gmoijgZ/QWUXg+/+IXfM9d7P0QUmxG7b 4fH+EwO15WbPfYFO3YgrnnanN6lRR5M66uBuysLP8r7LvMFDvukIjrSpWnTj8p2UM/Fm vgiQ== X-Forwarded-Encrypted: i=1; AJvYcCUGylBsPyqxUA/4ua349+7UIqppEsM+FKwJ1JNcaliNQvE970alst7+f2wHzkpr71v1JBL8az2R0EkHVjk=@vger.kernel.org X-Gm-Message-State: AOJu0YxJXigzwgYo3IIG6jPafONzX5fy3HhVnhK9v2Ou8o9TVBI54Qsr cJUHlm2MBPuXwDBOnmQcq4KB53+g9RRoBypqso2BOzomwRSz2+o0ZfTsKBwuDtY= X-Gm-Gg: ASbGncsMWi+npOKTZh4eqe6gQj1vTQUkTGjdy2Y2bsjGsR8M7pa1pdONYRLNOIVmzPM fFzVjpF+220AOmYb2jBsvXlMi0vKIznmS1bKpkSV/YwLICpB8mTn7AvuU2fjw8rRl7we48NWNQ0 qENthZvTBEgAW1ft/81xCk9Kyf57e1XkOHJtovngXpFh3Bq8927fw1hiVjAY4UX4F1eZacLCyT3 YxzC4a1nVZ30uogHxEy7BiSNqMNofc7FE5ucb+F474ymYh15LqwAFgJWv8= X-Google-Smtp-Source: AGHT+IGYDl29OCGY4z1owZDP0XWbhTx09xSMaaJapB97QNqOQhHfEZ2TmztXqViOu57Hf/bAEePhOw== X-Received: by 2002:a05:6a20:841d:b0:1d8:d5c0:ad74 with SMTP id adf61e73a8af0-1e89c89888cmr15576349637.1.1736574556053; Fri, 10 Jan 2025 21:49:16 -0800 (PST) Received: from localhost ([157.82.203.37]) by smtp.gmail.com with UTF8SMTPSA id 41be03b00d2f7-a31de806694sm3683573a12.69.2025.01.10.21.49.11 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 10 Jan 2025 21:49:15 -0800 (PST) From: Akihiko Odaki Date: Sat, 11 Jan 2025 14:48:46 +0900 Subject: [PATCH v4 3/6] powerpc: Use note name macros Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250111-elf-v4-3-b3841fa0dcd9@daynix.com> References: <20250111-elf-v4-0-b3841fa0dcd9@daynix.com> In-Reply-To: <20250111-elf-v4-0-b3841fa0dcd9@daynix.com> To: Eric Biederman , Kees Cook , Catalin Marinas , Mark Brown , Dave Martin , Baoquan He , Vivek Goyal , Dave Young , LEROY Christophe Cc: 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, Akihiko Odaki X-Mailer: b4 0.14-dev-fd6e3 Use note name macros to match with the userspace's expectation. Acked-by: Baoquan He Signed-off-by: Akihiko Odaki Reviewed-by: Dave Martin --- arch/powerpc/kernel/fadump.c | 2 +- arch/powerpc/platforms/powernv/opal-core.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/powerpc/kernel/fadump.c b/arch/powerpc/kernel/fadump.c index 4b371c738213..d44349fe8e2b 100644 --- a/arch/powerpc/kernel/fadump.c +++ b/arch/powerpc/kernel/fadump.c @@ -751,7 +751,7 @@ u32 *__init fadump_regs_to_elf_notes(u32 *buf, struct p= t_regs *regs) * prstatus.pr_pid =3D ???? */ elf_core_copy_regs(&prstatus.pr_reg, regs); - buf =3D append_elf_note(buf, CRASH_CORE_NOTE_NAME, NT_PRSTATUS, + buf =3D append_elf_note(buf, NN_PRSTATUS, NT_PRSTATUS, &prstatus, sizeof(prstatus)); return buf; } diff --git a/arch/powerpc/platforms/powernv/opal-core.c b/arch/powerpc/plat= forms/powernv/opal-core.c index c9a9b759cc92..a379ff86c120 100644 --- a/arch/powerpc/platforms/powernv/opal-core.c +++ b/arch/powerpc/platforms/powernv/opal-core.c @@ -149,7 +149,7 @@ static Elf64_Word *__init auxv_to_elf64_notes(Elf64_Wor= d *buf, /* end of vector */ bufp[idx++] =3D cpu_to_be64(AT_NULL); =20 - buf =3D append_elf64_note(buf, CRASH_CORE_NOTE_NAME, NT_AUXV, + buf =3D append_elf64_note(buf, NN_AUXV, NT_AUXV, oc_conf->auxv_buf, AUXV_DESC_SZ); return buf; } @@ -252,7 +252,7 @@ static Elf64_Word * __init opalcore_append_cpu_notes(El= f64_Word *buf) * crashing CPU's prstatus. */ first_cpu_note =3D buf; - buf =3D append_elf64_note(buf, CRASH_CORE_NOTE_NAME, NT_PRSTATUS, + buf =3D append_elf64_note(buf, NN_PRSTATUS, NT_PRSTATUS, &prstatus, sizeof(prstatus)); =20 for (i =3D 0; i < oc_conf->num_cpus; i++, bufp +=3D size_per_thread) { @@ -279,7 +279,7 @@ static Elf64_Word * __init opalcore_append_cpu_notes(El= f64_Word *buf) fill_prstatus(&prstatus, thread_pir, ®s); =20 if (thread_pir !=3D oc_conf->crashing_cpu) { - buf =3D append_elf64_note(buf, CRASH_CORE_NOTE_NAME, + buf =3D append_elf64_note(buf, NN_PRSTATUS, NT_PRSTATUS, &prstatus, sizeof(prstatus)); } else { @@ -287,7 +287,7 @@ static Elf64_Word * __init opalcore_append_cpu_notes(El= f64_Word *buf) * Add crashing CPU as the first NT_PRSTATUS note for * GDB to process the core file appropriately. */ - append_elf64_note(first_cpu_note, CRASH_CORE_NOTE_NAME, + append_elf64_note(first_cpu_note, NN_PRSTATUS, NT_PRSTATUS, &prstatus, sizeof(prstatus)); } --=20 2.47.1 From nobody Sat Feb 7 18:20:24 2026 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 26FDE188012 for ; Sat, 11 Jan 2025 05:49:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736574565; cv=none; b=ZYSI+htv+c1G9khyF2yc32HPz2cMYxyuGXXh2kLqsUEv9fso/gvT6w7AhKFXiIYDCAmt2vYH/1K+/ew9zQ0t6S41GO5np5RIJH/cl8M0zy7N5iH2kqDieyA9+/Bhc+3QhDoiTXKpcdNCpcddA2ey/TQAUjUo+KYko0fN9Hiu8T8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736574565; c=relaxed/simple; bh=N4IhUv6S3uRsh7HsLEUL+nZigf4kpss6dQVVVdHm5r4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=SQbF0jGMnaQBLpRcpk+jxqFS0JgV7r2cj0N5IL9HGgTaoM8dymSWscdXFXoK5w9oM/ER94+L1p2LsPQ/CFH4LlvqfLKDaB/DQ3eEu9zBEL9iHkB1RSrr4+33Mnl9gtI0qkchq/youPzZop7gR20eJYQcJTME5eGn6oZdAVokR38= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=daynix.com; spf=pass smtp.mailfrom=daynix.com; dkim=pass (2048-bit key) header.d=daynix-com.20230601.gappssmtp.com header.i=@daynix-com.20230601.gappssmtp.com header.b=FEgyz9Dt; arc=none smtp.client-ip=209.85.214.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=daynix.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=daynix.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=daynix-com.20230601.gappssmtp.com header.i=@daynix-com.20230601.gappssmtp.com header.b="FEgyz9Dt" Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-2164b662090so43417505ad.1 for ; Fri, 10 Jan 2025 21:49:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1736574563; x=1737179363; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=d5w0df8A0RGvduNGo/n7gECMAUl7ttjM0kfw51R7kHo=; b=FEgyz9DtODnl0e6HhVqYMvEaT0H0YUBQOSrlwmoJUlYgui/TH6daaCxK0ukBDljaUv z8o1YHFTNvOKOrDEHDoJyvUCsGiqtCGJighvZoaXBOTpzxnC+zUTYd2A7H8udk7jOANU ITFWZoo1yeTFbQUphNh+zrmLKjZ77SyyNRrYyLHBOp2pFM6ueRDFLecFd8ND44RSvQT3 8o6ZJNTqymu9q6L/JPkn2qNckQsFzFpJgnUOOhsFpVXibSbQg/VVRiBBS3NykyhcLq2F VLLXOc89gpj++SRicjB2A06BVdlCq3WxmXz3SZO8Pza8+vQWe3jE2Kolvf0zVKZrmr1K Dbqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736574563; x=1737179363; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=d5w0df8A0RGvduNGo/n7gECMAUl7ttjM0kfw51R7kHo=; b=pbjXJxawxHA/b7OLMZpVR+PAISSf/ehTki2thSTkt7FUodEd9gTo6YrtzhBNHWTX8p a6H0pCzj9utdi1nVpIpb3AgeuAy4JVz9yftp1zJpF20OveSsGbezXTxt7z7wpIALWAfU 291qk3Ebml3lZxvDrK00eo35CexFG3GeN7lqp2J4MmgJiTtA51E5U32sAXmISTQk2jpx Hk7KDa5UX0blbZEJz+whvphXrT/PJbAzcmZlvDjnaRSrP17fJHGY/mchY5v3z0EL3nXF iCbgCS1Uu9Imw/rmrLXMOntsTiNihbUGB7WvYff6LLn7jeij1Xi3UBD2e1aEVrvuC7Ht CxiA== X-Forwarded-Encrypted: i=1; AJvYcCXSvT5L8JB2pl/OIp5o9ycmuqfHVkFFwWphM0lPtygbLDMt31azi+IJZeTXC+BXNahvSDmccnyN13wvUyA=@vger.kernel.org X-Gm-Message-State: AOJu0YyQjMkjWWfCyMkIcRfOzpGS4nX9X9rs4fvgbtJGmvXCx69fmcLa bEzR23RxFkb77pucUVpAvmG/MHp2HS1bRxLcH/OOc5/L77s92p0m91KJmh8Ma0Sm+wkH3NaLaLU +1E4= X-Gm-Gg: ASbGncvuATcUUsMOtJNjP6L2chZ4jQNMbt21RdeklsHbT3+/5E/YcKioIw7GGw+0qZu u+viM36r7wsWsZhEWidF8woUnda+aAlYZxvRtc30qrqzo1flf1vSWfTddhxPinktvjlzXExxNDJ FPuMqcu/ARmMqVY7OfQms30qsjC4ZaQ8TQ3O4LBX3eL2m7XzjDdsBDJwZmzXAH/94zPx4cBzhXv Jenxqd8Z13wrcEsX/oE6zh2+th8+edffBaO19ba8qMjInzUvOuAz/77fK8= X-Google-Smtp-Source: AGHT+IEOaK6BOPAe/MUGiXyl+EyGiYmhbaq4qeXiFxMDU90Px7X9OtnxNRV5Ifu8FHX6K2PPpo86xQ== X-Received: by 2002:a17:902:d4cf:b0:216:3466:7414 with SMTP id d9443c01a7336-21a83fcaafdmr208931985ad.44.1736574563492; Fri, 10 Jan 2025 21:49:23 -0800 (PST) Received: from localhost ([157.82.203.37]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-21a9f22d0fcsm21166295ad.161.2025.01.10.21.49.19 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 10 Jan 2025 21:49:23 -0800 (PST) From: Akihiko Odaki Date: Sat, 11 Jan 2025 14:48:47 +0900 Subject: [PATCH v4 4/6] crash: Use note name macros Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250111-elf-v4-4-b3841fa0dcd9@daynix.com> References: <20250111-elf-v4-0-b3841fa0dcd9@daynix.com> In-Reply-To: <20250111-elf-v4-0-b3841fa0dcd9@daynix.com> To: Eric Biederman , Kees Cook , Catalin Marinas , Mark Brown , Dave Martin , Baoquan He , Vivek Goyal , Dave Young , LEROY Christophe Cc: 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, Akihiko Odaki X-Mailer: b4 0.14-dev-fd6e3 Use note name macros to match with the userspace's expectation. Signed-off-by: Akihiko Odaki Acked-by: Baoquan He Reviewed-by: Dave Martin --- fs/proc/kcore.c | 12 ++++++------ include/linux/vmcore_info.h | 2 +- kernel/crash_core.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c index e376f48c4b8b..e5612313b8b4 100644 --- a/fs/proc/kcore.c +++ b/fs/proc/kcore.c @@ -34,8 +34,6 @@ #include #include "internal.h" =20 -#define CORE_STR "CORE" - #ifndef ELF_CORE_EFLAGS #define ELF_CORE_EFLAGS 0 #endif @@ -119,7 +117,9 @@ static size_t get_kcore_size(int *nphdr, size_t *phdrs_= len, size_t *notes_len, =20 *phdrs_len =3D *nphdr * sizeof(struct elf_phdr); *notes_len =3D (4 * sizeof(struct elf_note) + - 3 * ALIGN(sizeof(CORE_STR), 4) + + ALIGN(sizeof(NN_PRSTATUS), 4) + + ALIGN(sizeof(NN_PRPSINFO), 4) + + ALIGN(sizeof(NN_TASKSTRUCT), 4) + VMCOREINFO_NOTE_NAME_BYTES + ALIGN(sizeof(struct elf_prstatus), 4) + ALIGN(sizeof(struct elf_prpsinfo), 4) + @@ -444,11 +444,11 @@ static ssize_t read_kcore_iter(struct kiocb *iocb, st= ruct iov_iter *iter) goto out; } =20 - append_kcore_note(notes, &i, CORE_STR, NT_PRSTATUS, &prstatus, + append_kcore_note(notes, &i, NN_PRSTATUS, NT_PRSTATUS, &prstatus, sizeof(prstatus)); - append_kcore_note(notes, &i, CORE_STR, NT_PRPSINFO, &prpsinfo, + append_kcore_note(notes, &i, NN_PRPSINFO, NT_PRPSINFO, &prpsinfo, sizeof(prpsinfo)); - append_kcore_note(notes, &i, CORE_STR, NT_TASKSTRUCT, current, + append_kcore_note(notes, &i, NN_TASKSTRUCT, NT_TASKSTRUCT, current, arch_task_struct_size); /* * vmcoreinfo_size is mostly constant after init time, but it diff --git a/include/linux/vmcore_info.h b/include/linux/vmcore_info.h index e1dec1a6a749..1672801fd98c 100644 --- a/include/linux/vmcore_info.h +++ b/include/linux/vmcore_info.h @@ -8,7 +8,7 @@ =20 #define CRASH_CORE_NOTE_NAME "CORE" #define CRASH_CORE_NOTE_HEAD_BYTES ALIGN(sizeof(struct elf_note), 4) -#define CRASH_CORE_NOTE_NAME_BYTES ALIGN(sizeof(CRASH_CORE_NOTE_NAME), 4) +#define CRASH_CORE_NOTE_NAME_BYTES ALIGN(sizeof(NN_PRSTATUS), 4) #define CRASH_CORE_NOTE_DESC_BYTES ALIGN(sizeof(struct elf_prstatus), 4) =20 /* diff --git a/kernel/crash_core.c b/kernel/crash_core.c index 078fe5bc5a74..335b8425dd4b 100644 --- a/kernel/crash_core.c +++ b/kernel/crash_core.c @@ -436,7 +436,7 @@ void crash_save_cpu(struct pt_regs *regs, int cpu) memset(&prstatus, 0, sizeof(prstatus)); prstatus.common.pr_pid =3D current->pid; elf_core_copy_regs(&prstatus.pr_reg, regs); - buf =3D append_elf_note(buf, KEXEC_CORE_NOTE_NAME, NT_PRSTATUS, + buf =3D append_elf_note(buf, NN_PRSTATUS, NT_PRSTATUS, &prstatus, sizeof(prstatus)); final_note(buf); } --=20 2.47.1 From nobody Sat Feb 7 18:20:24 2026 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A1AC617AE1D for ; Sat, 11 Jan 2025 05:49:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736574572; cv=none; b=E0koGsaTBKrgTRmdeqWLh4rNFJEGZBPFVkmL9PLTM5/JLAYmKP4NGEyvwDAv4bonjmz1coLYrsUn0jpZ7bE06AWOP2/eOqFrVjh0pGa+MF8VzOrT6sBZztXMXe8Koie+NuKLjcOgWS3l6nPzP08u50Qsl8lz2Yq+0L+cT44qhvM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736574572; c=relaxed/simple; bh=mHSW1WEkXDkBWrq6qMSxAX18x10mEd9VCZKfNzeGoSg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=L5qK4/VdttJduyFfFqFVPzfhdCoVbYbx46lFNiOyj9iG1z84ey8kBxBudKSLXZk3jWd9MKTOMtnkK/qY1wY26Eim68q8eR7l47jS7Xkrll2kp1NO+gfkZL6J+TvDx6KCIvvJmGLqQANaeZ0no7RGYqAmjLVrITjKSNgs9h4RCk8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=daynix.com; spf=pass smtp.mailfrom=daynix.com; dkim=pass (2048-bit key) header.d=daynix-com.20230601.gappssmtp.com header.i=@daynix-com.20230601.gappssmtp.com header.b=zTF1Faat; arc=none smtp.client-ip=209.85.214.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=daynix.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=daynix.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=daynix-com.20230601.gappssmtp.com header.i=@daynix-com.20230601.gappssmtp.com header.b="zTF1Faat" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-2164b1f05caso47690945ad.3 for ; Fri, 10 Jan 2025 21:49:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1736574570; x=1737179370; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=2jKrk3bVYPr7k5YkzhCVfFSlyEMyT0et7JHsh9IpwE8=; b=zTF1FaatlcDPd48iIBxUVAheWSPySalD706hxrZTAvkdn5zyRhKV1wX1tpMPC8NVHZ GTS8M7nR6i8VYG/CDw+T2O++wU1UVjI91Wx0I84/l2ChZjj/FHup027bN3BYPx/AHoJA CLTVTMiSDinnphuCDN+HnWMnEatUC6hWJU8C0QVB9dE6nsjZXzkT9y+hes3AP9Swo5r4 XGBw5+3q5tLfp85w0pmstssmvNVhony0RWva9oatBLknZwobuNkDHQQFlj7/t3Ry+Mur 7r4wJIcLw0mW7BG3VjkcrwMf/utrCXxqKNoTUYr45hmAnNG5Q1FNuXu/O4HkqDjkHMfL g4PA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736574570; x=1737179370; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2jKrk3bVYPr7k5YkzhCVfFSlyEMyT0et7JHsh9IpwE8=; b=IUQzT/X4dZTEJpPCAqFmkj+Qhog+E+K5Ckn8cSvGlHdo2srFKO7bScC15vPolmLZV+ fzIUrL3i1EhSYyGSqrAwgQlpbN4PLowEnnmI59ibhVkHAvlHA3T/IsubgHXaRSzqmlKD UQp9JNMjzc1SQmacDXEdacsBtL81ipMAlgqcZfO5GxUe2T3BEE5xI+hDx5pCfl1CHu5A oClirE86XCuvmF0P/cwQ5KeM32LH7JLQaMFbrnv0QuR1ugpneRDo09c2pT5kXWA5sR5B 1iQcF5vyUNIGGs/30i6Qz+FbiT3J5+leljI5X5h5mfVh+OlC3/7gFeh1kdpdFJa0FFi4 YMhg== X-Forwarded-Encrypted: i=1; AJvYcCVz6zcnDX7zPTIvpxzbNK/dlB6Kf7S41Kd2vvKRfs2d+RvWuFYrwlfejWD0aoMQBl9e04eXUXB1UVWDzRo=@vger.kernel.org X-Gm-Message-State: AOJu0YxZgKGcvTGVxpRMbks5Cw0ZEIcDr/TIYJYeZk84eA1zys+FGGMi lw5Wk2UM97pwZCZdrNEcI1gyiZWrUyO5KDGhCL8oze+LYYuUJiBVpHiQN8EP8pM= X-Gm-Gg: ASbGncs17IX5srHyzN8ErydgyfiWiEfQ0MGQy0chkm4NxLqhqaM2yk4HRpx05AMN/s7 dyOOWs/yPSe1d6voXH5uywWkwc70o7chHwS5+rLV9Xq1RGO8jTBFSdVNvqXsb0DBl7Me3HbZKdP vL+mZCvdZVwc8kh5kgBbXlntlPer8lVcTfSLDoF5UwUI6Esd01h1MFLJWWt5pNhxwSkpOn50n6J IC+RwQyYtoKdgIlsxHoiWmGOVmDpXy2KNfzc6jUHXUjrNJ400IfZu2RYfs= X-Google-Smtp-Source: AGHT+IF/DO7Xc25oCNYWji4iMt60P0/C5k2sp2lZQdBF9bk3Ar0+kFGVzpELgHH1uV8P5GY4v7KRrA== X-Received: by 2002:a17:902:e84f:b0:216:410d:4c53 with SMTP id d9443c01a7336-21a83fc6db1mr183636355ad.41.1736574570100; Fri, 10 Jan 2025 21:49:30 -0800 (PST) Received: from localhost ([157.82.203.37]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-21a9f217d56sm21372405ad.141.2025.01.10.21.49.25 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 10 Jan 2025 21:49:29 -0800 (PST) From: Akihiko Odaki Date: Sat, 11 Jan 2025 14:48:48 +0900 Subject: [PATCH v4 5/6] s390/crash: Use note name macros Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250111-elf-v4-5-b3841fa0dcd9@daynix.com> References: <20250111-elf-v4-0-b3841fa0dcd9@daynix.com> In-Reply-To: <20250111-elf-v4-0-b3841fa0dcd9@daynix.com> To: Eric Biederman , Kees Cook , Catalin Marinas , Mark Brown , Dave Martin , Baoquan He , Vivek Goyal , Dave Young , LEROY Christophe Cc: 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, Akihiko Odaki , Heiko Carstens X-Mailer: b4 0.14-dev-fd6e3 Use note name macros to match with the userspace's expectation. Signed-off-by: Akihiko Odaki Acked-by: Heiko Carstens --- 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); =20 -static const char *nt_name(Elf64_Word type) -{ - const char *name =3D "LINUX"; - - if (type =3D=3D NT_PRPSINFO || type =3D=3D NT_PRSTATUS || type =3D=3D NT_= PRFPREG) - name =3D 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); } =20 -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) =20 /* * Calculate the size of ELF note @@ -300,10 +289,7 @@ static size_t nt_size_name(int d_len, const char *name) return size; } =20 -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) =20 /* * Fill ELF notes for one CPU with save area registers @@ -324,18 +310,16 @@ static void *fill_cpu_elf_notes(void *ptr, int cpu, s= truct 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 =3D nt_init(ptr, NT_PRSTATUS, &nt_prstatus, sizeof(nt_prstatus)); - ptr =3D nt_init(ptr, NT_PRFPREG, &nt_fpregset, sizeof(nt_fpregset)); - ptr =3D nt_init(ptr, NT_S390_TIMER, &sa->timer, sizeof(sa->timer)); - ptr =3D nt_init(ptr, NT_S390_TODCMP, &sa->todcmp, sizeof(sa->todcmp)); - ptr =3D nt_init(ptr, NT_S390_TODPREG, &sa->todpreg, sizeof(sa->todpreg)); - ptr =3D nt_init(ptr, NT_S390_CTRS, &sa->ctrs, sizeof(sa->ctrs)); - ptr =3D nt_init(ptr, NT_S390_PREFIX, &sa->prefix, sizeof(sa->prefix)); + ptr =3D nt_init(ptr, PRSTATUS, nt_prstatus); + ptr =3D nt_init(ptr, PRFPREG, nt_fpregset); + ptr =3D nt_init(ptr, S390_TIMER, sa->timer); + ptr =3D nt_init(ptr, S390_TODCMP, sa->todcmp); + ptr =3D nt_init(ptr, S390_TODPREG, sa->todpreg); + ptr =3D nt_init(ptr, S390_CTRS, sa->ctrs); + ptr =3D nt_init(ptr, S390_PREFIX, sa->prefix); if (cpu_has_vx()) { - ptr =3D nt_init(ptr, NT_S390_VXRS_HIGH, - &sa->vxrs_high, sizeof(sa->vxrs_high)); - ptr =3D nt_init(ptr, NT_S390_VXRS_LOW, - &sa->vxrs_low, sizeof(sa->vxrs_low)); + ptr =3D nt_init(ptr, S390_VXRS_HIGH, sa->vxrs_high); + ptr =3D 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 =3D NULL; size_t size; =20 - size =3D nt_size(NT_PRSTATUS, sizeof(struct elf_prstatus)); - size +=3D nt_size(NT_PRFPREG, sizeof(elf_fpregset_t)); - size +=3D nt_size(NT_S390_TIMER, sizeof(sa->timer)); - size +=3D nt_size(NT_S390_TODCMP, sizeof(sa->todcmp)); - size +=3D nt_size(NT_S390_TODPREG, sizeof(sa->todpreg)); - size +=3D nt_size(NT_S390_CTRS, sizeof(sa->ctrs)); - size +=3D nt_size(NT_S390_PREFIX, sizeof(sa->prefix)); + size =3D nt_size(PRSTATUS, struct elf_prstatus); + size +=3D nt_size(PRFPREG, elf_fpregset_t); + size +=3D nt_size(S390_TIMER, sa->timer); + size +=3D nt_size(S390_TODCMP, sa->todcmp); + size +=3D nt_size(S390_TODPREG, sa->todpreg); + size +=3D nt_size(S390_CTRS, sa->ctrs); + size +=3D nt_size(S390_PREFIX, sa->prefix); if (cpu_has_vx()) { - size +=3D nt_size(NT_S390_VXRS_HIGH, sizeof(sa->vxrs_high)); - size +=3D nt_size(NT_S390_VXRS_LOW, sizeof(sa->vxrs_low)); + size +=3D nt_size(S390_VXRS_HIGH, sa->vxrs_high); + size +=3D nt_size(S390_VXRS_LOW, sa->vxrs_low); } =20 return size; @@ -373,7 +357,7 @@ static void *nt_prpsinfo(void *ptr) memset(&prpsinfo, 0, sizeof(prpsinfo)); prpsinfo.pr_sname =3D 'R'; strcpy(prpsinfo.pr_fname, "vmlinux"); - return nt_init(ptr, NT_PRPSINFO, &prpsinfo, sizeof(prpsinfo)); + return nt_init(ptr, PRPSINFO, prpsinfo); } =20 /* @@ -589,7 +573,7 @@ static size_t get_elfcorehdr_size(int phdr_count) /* PT_NOTES */ size +=3D sizeof(Elf64_Phdr); /* nt_prpsinfo */ - size +=3D nt_size(NT_PRPSINFO, sizeof(struct elf_prpsinfo)); + size +=3D nt_size(PRPSINFO, struct elf_prpsinfo); /* regsets */ size +=3D get_cpu_cnt() * get_cpu_elf_notes_size(); /* nt_vmcoreinfo */ --=20 2.47.1 From nobody Sat Feb 7 18:20:24 2026 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3AEF817CA1D for ; Sat, 11 Jan 2025 05:49:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736574578; cv=none; b=MX1nmfqDOQ6I8RtU/UEjiogHR5Vnc/pT/4N3/Z1xpvptMf/FG/04aHD9wK0KRVS5UZC9FXA7e20336FF0OxrqqCplOZsx+Ke5uGhCDWAc1W04IhJp1wG6jXv9wcvyNM+1xU2GEsLU/fpLZMl5SPcxIKGFEASD8KTBWOM3FMJVts= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736574578; c=relaxed/simple; bh=PDKDOEbG5wLU1DkJmdPQNhRgipqYHagmRVjwHv2hyKE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=N0DOR5kbgJhrDKWT58m3dxbbSJV53C+Om7ORtyaGlGi2jY+ofM1eCHUwm7sYQgikR/pskX4lb7jTBPGSJl21HWsrUBv0319h0IWGnRpRfWNQvG4I8AMOO341MBUhr68F1Xb8bVX63UxVgMYPEfayRrEc2IPMpqACXQYb8Hcb+iA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=daynix.com; spf=pass smtp.mailfrom=daynix.com; dkim=pass (2048-bit key) header.d=daynix-com.20230601.gappssmtp.com header.i=@daynix-com.20230601.gappssmtp.com header.b=Mrk5pi5+; arc=none smtp.client-ip=209.85.214.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=daynix.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=daynix.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=daynix-com.20230601.gappssmtp.com header.i=@daynix-com.20230601.gappssmtp.com header.b="Mrk5pi5+" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-2161eb95317so46355565ad.1 for ; Fri, 10 Jan 2025 21:49:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1736574576; x=1737179376; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=hJIM5PjsK5XkECqCUUoGiieCybrsun7CzYeIZbw5syM=; b=Mrk5pi5+LgbSuRWkugDhBASfg1fK14Frvx5xX58x3XsJlHhlhBseJCt/8a9h95QYzM xaYQ9Rx+MlCwUhjrlZ+YvdpjdgWzttjgNk0KQBWEtAlfEpq98sgViacNihhQi3UmMAAK lXRD4LPozpNnrGFygpu+mBgZ2KRewOVR+XHxwfXFaykiMmzX5xx7oIh/DDsYXXalOjsn 6DHn+qOCPnEqQIwkEYVh1hv/MXloWPHgR47uOD8uDZ5Ls6Y9sq+fEP2btlq2Ira97igG kIwKvrkDr3BunoQIRQJD85rsxBvLYWbJ3lcWn6Or/f3RsSpvZPQxV/yIxGqsxnm+aZBs zjiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736574576; x=1737179376; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hJIM5PjsK5XkECqCUUoGiieCybrsun7CzYeIZbw5syM=; b=vz+YsGI4I6VkTFOv3evr9BKErbkWpyg2digsWBfrdg8z2WtFav6lF3EeJrC6WT8O40 +Efre3JCg4BDuE/Q4QQ72ZSuuGNsxQdNauxjc7hI/F5IEWuWduJNYsrbYsXyCngqYcI7 9r6ILTKdDLIGJHt+l8Bjq3cFDJA4yhvEdEVSKgQ4iq/SlyOZwMQ0q4AIvDZz3Goc7R+d 6mU987lqAYpjxI1eLRFablaKmtK/X7kiMaKu5lE3ykbSeINSGqJ1EeUPEnsy+0HnPOUq Nhuj9wqVyTcPzhgr2JSnaqyN1WM2lTJq1PupQtmEMFq6cIDC2Ovlg7AkGcdM1TeNNsoG 8/tw== X-Forwarded-Encrypted: i=1; AJvYcCVGr/YI3QnaGHicklPSllfkH5UGCGFsOE/P1ODAI17zBEvPx7PbVvpDpIQ75UfUnfULGRtpJpmKDP4XzM4=@vger.kernel.org X-Gm-Message-State: AOJu0YytsBBvVEK220Fclk52gHavwvoQe3dmuNh8t1m33ZkJYruqnxAx fdj+Hx3QxNWueMvgHV2bV/3pSyss6VLyboXfMbxS2fifj4KFyERwJyrckCseWZ0= X-Gm-Gg: ASbGncv+BszTsUJRiYEDwL9LtLd4wSIIdWUYaa+ywdx+1IIqTi24RoZcfD7bEghoqgD fv+JL50WaJd4vEpz0H8uNR+LmSTU2gDEqiHMHGUkA3o0EPW7MwW4K9SkNgWZ0QS42eePhbuYLCx JIXvZuB6TVkmdJleGdogXOPlvuChvTtyhRnTVzUJ2PjOlD6Q+pu5siDjxebfingHYe2pzvi2r39 mhmhEL7VYXwuQV4+6Yiu1ncSd/UUy0p2q6htIhqL/cZu/9hxpE9+IoAErU= X-Google-Smtp-Source: AGHT+IGdQ/W+GdFqyOEQRaBJtYEIC3d/2Cs4dWBSsnFKDdtRyf3/E/GqQ6RNXv61x1Bb9PKDJOpeZw== X-Received: by 2002:a17:902:e552:b0:216:2426:7666 with SMTP id d9443c01a7336-21a83f36f14mr210827905ad.12.1736574576473; Fri, 10 Jan 2025 21:49:36 -0800 (PST) Received: from localhost ([157.82.203.37]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-21a9f10ddbesm21468195ad.2.2025.01.10.21.49.32 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 10 Jan 2025 21:49:36 -0800 (PST) From: Akihiko Odaki Date: Sat, 11 Jan 2025 14:48:49 +0900 Subject: [PATCH v4 6/6] crash: Remove KEXEC_CORE_NOTE_NAME Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250111-elf-v4-6-b3841fa0dcd9@daynix.com> References: <20250111-elf-v4-0-b3841fa0dcd9@daynix.com> In-Reply-To: <20250111-elf-v4-0-b3841fa0dcd9@daynix.com> To: Eric Biederman , Kees Cook , Catalin Marinas , Mark Brown , Dave Martin , Baoquan He , Vivek Goyal , Dave Young , LEROY Christophe Cc: 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, Akihiko Odaki X-Mailer: b4 0.14-dev-fd6e3 KEXEC_CORE_NOTE_NAME is no longer used. Signed-off-by: Akihiko Odaki Acked-by: Baoquan He --- include/linux/kexec.h | 2 -- include/linux/vmcore_info.h | 1 - 2 files changed, 3 deletions(-) diff --git a/include/linux/kexec.h b/include/linux/kexec.h index f0e9f8eda7a3..c840431eadda 100644 --- a/include/linux/kexec.h +++ b/include/linux/kexec.h @@ -68,8 +68,6 @@ extern note_buf_t __percpu *crash_notes; #define KEXEC_CRASH_MEM_ALIGN PAGE_SIZE #endif =20 -#define KEXEC_CORE_NOTE_NAME CRASH_CORE_NOTE_NAME - /* * This structure is used to hold the arguments that are used when loading * kernel binaries. diff --git a/include/linux/vmcore_info.h b/include/linux/vmcore_info.h index 1672801fd98c..37e003ae5262 100644 --- a/include/linux/vmcore_info.h +++ b/include/linux/vmcore_info.h @@ -6,7 +6,6 @@ #include #include =20 -#define CRASH_CORE_NOTE_NAME "CORE" #define CRASH_CORE_NOTE_HEAD_BYTES ALIGN(sizeof(struct elf_note), 4) #define CRASH_CORE_NOTE_NAME_BYTES ALIGN(sizeof(NN_PRSTATUS), 4) #define CRASH_CORE_NOTE_DESC_BYTES ALIGN(sizeof(struct elf_prstatus), 4) --=20 2.47.1