From nobody Thu Feb 12 21:49:25 2026 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) (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 8CFAA1C5F06 for ; Sat, 4 Jan 2025 14:38:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736001532; cv=none; b=YbJbpLBPpyX9ymmf2Z8+zcdJZLKGNyu13igNTfUGtfGNh2zToxBJe0RdXqmNiP5pMdb+3mBXIH2n4qIRI3G3PLKi0towU8QfPQ6BQ4So1lJN9+2lLRmbnHQVj+1vroyO+UH1MOfXM4P9IMA4PT5xZmpxD/sSYSK4DhOWqzAOztY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736001532; c=relaxed/simple; bh=+9AXsZEgivq8OXu9cFbVsgFlrM5UGkMjHGJQ78emYi4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=bm8HqmXdT1wEQUvC+Dds+vQaKbLG5+uUObreXBoC4PGju2jVVfMKbZINh1JvYwr5oPv8aCs61362EmVvZM31RHzE8rPm2gmIAJrulAt7GOGlwV0Ao5M8oa6jmYTwJUu82ggCcCQ783EseIFBcvRX34eaJPACiduGP+aXdgvcdGA= 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=m8ejexet; arc=none smtp.client-ip=209.85.214.177 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="m8ejexet" Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-21670dce0a7so110970215ad.1 for ; Sat, 04 Jan 2025 06:38:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1736001529; x=1736606329; 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=3DDRJB8oNZeq6N6MlMy+rUGIqaIntb5QA28c12Ptyck=; b=m8ejexetduw6tlJy/UtPG2y5lvEVPWFwuVqpRUJ4nB96q6O80hrRQPwPaTZADtz9ig lmfBShZkb8qh3LF6sYpcQGhnXOMbvtaPnsuWTZeZeqA2pV/9peWzGWtOg5iTnXAUKSyv h+3WVCy7dV7Ctaw/+y8qUQ0QGiAFLoMSZqR5TYG9GmMbpHjue19Ta4F7YboB6RDFCnbv cUue+VeXUNAldjhaegSfw1I7zmkhai3kjqVtboAh+Jq+joPS5qn56lrECmG3h/kXhNPt RkTOiPv15Xwd9zac1fIlV1yCl7oTU2XwpV5DVVM7a8mSdW0TSxI1B21bBCyaElvZHwwW DKjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736001529; x=1736606329; 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=3DDRJB8oNZeq6N6MlMy+rUGIqaIntb5QA28c12Ptyck=; b=BzAN0tbzK1nwrEgpTknKRsiewkwK4WYcNhpvEhecVZPdxf953zJqW/NhtB6pfwXE50 i2yzrY4cuX2yio8Yjd0aCQl35hPtzG8wuLbf0dnjCVWXS2rb+m8sf+L+thtq+qhy8gDl N8OnbkheKLrE/sMASd/VWjnsMFeArDysl18MDfoMrq2/An4spqNYsYmJVthBlraFo4NW SiMAt3Zki9HLOI91XrbhzSVZ1dZI3wGwxywxsdAh93pnSVInPHhShbA4Df+pLVtQ8+cR M+q6oZuwNFsyGpzEUNOVndwLugX+QzUnseacaee4KUFIUTX9DMD6e8ao7TvfP4DuvUTv T+Ag== X-Forwarded-Encrypted: i=1; AJvYcCVmE8sWxD8Dt10PPOhGVyOv5JD78maPRP2uRUjUjsYaGu4x8TkSTEtvMJzU33JHyrDd2uGJWbXq/Wcw7Ow=@vger.kernel.org X-Gm-Message-State: AOJu0YzcmFRIHTYB4WjQrF/vZ+pw5RwldWeF43QEDbaBnis7D23o1Z2J KwLxZUzOTexfWgEz7hRCW0hDGAwWc8ged0tQgnu9PoQOT/qAvMqlY4/7d1YXtYk= X-Gm-Gg: ASbGncvXbPsGN8nCWuGq1SKmwISrYfpyS+qxkqqfgHzK4NyC/fRNO1C5OZ4VXfV8i88 SNwMTgvhuyfx7IOVHU2+0oghEcYoRRv1RM78zYTepVaAaBDZmgJ20Iol6sDovUn5IN10lLUEitc EoeALTYoblBc0d8U7KpVvF2O2KTgMbIzUiYRWfFweHMyO0saJySJSqxm/fSJAjwdPA/dXaA8l6x GoQICpAl/aYkb66aWcFWg29i919h0YUysGnWg5z68i2nJZMPQJMfK3s7p+ZVdU= X-Google-Smtp-Source: AGHT+IHXNTPwYGpyoF2oIO9YtYeoBNZ9bkHyASDQWStwZpuI0NOPrSg1SLgfLCaPbrvbr04vYZJzgg== X-Received: by 2002:a17:902:e5c7:b0:215:bf1b:a894 with SMTP id d9443c01a7336-219e6eb5bffmr760628135ad.24.1736001528912; Sat, 04 Jan 2025 06:38:48 -0800 (PST) Received: from localhost ([2400:4050:b783:b00:4952:3c52:120a:27e9]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-219dc962c5esm260927675ad.12.2025.01.04.06.38.45 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 04 Jan 2025 06:38:48 -0800 (PST) From: Akihiko Odaki Date: Sat, 04 Jan 2025 23:38:34 +0900 Subject: [PATCH v2 1/5] 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: <20250104-elf-v2-1-77dc2e06db4e@daynix.com> References: <20250104-elf-v2-0-77dc2e06db4e@daynix.com> In-Reply-To: <20250104-elf-v2-0-77dc2e06db4e@daynix.com> To: Eric Biederman , Kees Cook , Catalin Marinas , Mark Brown , Dave Martin , Baoquan He , Vivek Goyal , Dave Young Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, kexec@lists.infradead.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 --- 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..014b705b97d7 100644 --- a/include/uapi/linux/elf.h +++ b/include/uapi/linux/elf.h @@ -372,8 +372,6 @@ typedef struct elf64_shdr { * 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 NT_PRSTATUS 1 #define NT_PRFPREG 2 @@ -460,9 +458,91 @@ typedef struct elf64_shdr { #define NT_LOONGARCH_HW_BREAK 0xa05 /* LoongArch hardware breakpoint reg= isters */ #define NT_LOONGARCH_HW_WATCH 0xa06 /* LoongArch hardware watchpoint reg= isters */ =20 -/* Note types with note name "GNU" */ +/* Note used in ET_EXEC and ET_DYN. */ #define NT_GNU_PROPERTY_TYPE_0 5 =20 +/* Note names */ +#define NN_PRSTATUS "CORE" +#define NN_PRFPREG "CORE" +#define NN_PRPSINFO "CORE" +#define NN_TASKSTRUCT "CORE" +#define NN_AUXV "CORE" +#define NN_SIGINFO "CORE" +#define NN_FILE "CORE" +#define NN_PRXFPREG "LINUX" +#define NN_PPC_VMX "LINUX" +#define NN_PPC_SPE "LINUX" +#define NN_PPC_VSX "LINUX" +#define NN_PPC_TAR "LINUX" +#define NN_PPC_PPR "LINUX" +#define NN_PPC_DSCR "LINUX" +#define NN_PPC_EBB "LINUX" +#define NN_PPC_PMU "LINUX" +#define NN_PPC_TM_CGPR "LINUX" +#define NN_PPC_TM_CFPR "LINUX" +#define NN_PPC_TM_CVMX "LINUX" +#define NN_PPC_TM_CVSX "LINUX" +#define NN_PPC_TM_SPR "LINUX" +#define NN_PPC_TM_CTAR "LINUX" +#define NN_PPC_TM_CPPR "LINUX" +#define NN_PPC_TM_CDSCR "LINUX" +#define NN_PPC_PKEY "LINUX" +#define NN_PPC_DEXCR "LINUX" +#define NN_PPC_HASHKEYR "LINUX" +#define NN_386_TLS "LINUX" +#define NN_386_IOPERM "LINUX" +#define NN_X86_XSTATE "LINUX" +#define NN_X86_SHSTK "LINUX" +#define NN_X86_XSAVE_LAYOUT "LINUX" +#define NN_S390_HIGH_GPRS "LINUX" +#define NN_S390_TIMER "LINUX" +#define NN_S390_TODCMP "LINUX" +#define NN_S390_TODPREG "LINUX" +#define NN_S390_CTRS "LINUX" +#define NN_S390_PREFIX "LINUX" +#define NN_S390_LAST_BREAK "LINUX" +#define NN_S390_SYSTEM_CALL "LINUX" +#define NN_S390_TDB "LINUX" +#define NN_S390_VXRS_LOW "LINUX" +#define NN_S390_VXRS_HIGH "LINUX" +#define NN_S390_GS_CB "LINUX" +#define NN_S390_GS_BC "LINUX" +#define NN_S390_RI_CB "LINUX" +#define NN_S390_PV_CPU_DATA "LINUX" +#define NN_ARM_VFP "LINUX" +#define NN_ARM_TLS "LINUX" +#define NN_ARM_HW_BREAK "LINUX" +#define NN_ARM_HW_WATCH "LINUX" +#define NN_ARM_SYSTEM_CALL "LINUX" +#define NN_ARM_SVE "LINUX" +#define NN_ARM_PAC_MASK "LINUX" +#define NN_ARM_PACA_KEYS "LINUX" +#define NN_ARM_PACG_KEYS "LINUX" +#define NN_ARM_TAGGED_ADDR_CTRL "LINUX" +#define NN_ARM_PAC_ENABLED_KEYS "LINUX" +#define NN_ARM_SSVE "LINUX" +#define NN_ARM_ZA "LINUX" +#define NN_ARM_ZT "LINUX" +#define NN_ARM_FPMR "LINUX" +#define NN_ARM_POE "LINUX" +#define NN_ARM_GCS "LINUX" +#define NN_ARC_V2 "LINUX" +#define NN_VMCOREDD "LINUX" +#define NN_MIPS_DSP "LINUX" +#define NN_MIPS_FP_MODE "LINUX" +#define NN_MIPS_MSA "LINUX" +#define NN_RISCV_CSR "LINUX" +#define NN_RISCV_VECTOR "LINUX" +#define NN_RISCV_TAGGED_ADDR_CTRL "LINUX" +#define NN_LOONGARCH_CPUCFG "LINUX" +#define NN_LOONGARCH_CSR "LINUX" +#define NN_LOONGARCH_LSX "LINUX" +#define NN_LOONGARCH_LASX "LINUX" +#define NN_LOONGARCH_LBT "LINUX" +#define NN_LOONGARCH_HW_BREAK "LINUX" +#define NN_LOONGARCH_HW_WATCH "LINUX" +#define NN_GNU_PROPERTY_TYPE_0 "GNU" + /* Note header in a PT_NOTE section */ typedef struct elf32_note { Elf32_Word n_namesz; /* Name size */ --=20 2.47.1 From nobody Thu Feb 12 21:49:25 2026 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (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 226631C9B62 for ; Sat, 4 Jan 2025 14:38:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736001537; cv=none; b=fEcSaCFTCInKTKv28+qx0a1R3j0zijUA7mZlV/p2RFICmCJsayyfKjzfwnWucV4ATvufhZsog6tuqQoMlgSDN7OlC/8EIk09dEh9MXLmXusKb1lutHoLZJm+Fu57UGz7xu9febOFc6f7+aSKZlG8OwE1V3vz2RA5k6a3RFm7Af0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736001537; c=relaxed/simple; bh=/OUUxnpcfLbabaS+hxM83Ay0fmFB4YJ/y1+nmO20Xrg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=qMJ7y17ImTIEPBKaLFSKUO8/aO/H3tB/hcnUtRNAXO0h8gZ5Gs7fVnLClOxUGgRt0Ea/vYydOL3goECA195IxkSYuljZ1TK83kMXPZq6U7IB8hLFxSCf3VCgv3CsOW9Ihoib0nVQ16TqbctMVsKxm6/CZvHHPd9ZcmNH5E3IaKc= 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=jWWapQid; arc=none smtp.client-ip=209.85.214.176 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="jWWapQid" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-21649a7bcdcso178992155ad.1 for ; Sat, 04 Jan 2025 06:38:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1736001535; x=1736606335; 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=isBOK5EkoVzx0+60SYTBYbzag/ZGKna5MSZ560y293s=; b=jWWapQid+i3g538DHEcM0xAO8/0lhWkYiGvF0QrH9u/ds7npr53ZDlazdB/rA7wGiJ V7I2BLLJV9i0ebUDFLhZ0rrkfQ3JCEkoyy/N1Ld2ZH9AJQnkPWLXl/8e5q5PgOykUXS9 hbZXUJ/glNTsh9rrszUP7Pf2rar1T/36rqzJyrPflEGHvrKDcYLJtEC0OfXNmE4E0AOo 2cBjW4LVZpNDLZ5bmsvKQ8qjx8kBa0v2DlYRXOtPP0JSWHtvzaTUioJiW8Uwj+3LtZ5O 86GUWCjDNtHIkvx1WZ6o22+WCEzHzeUa2B1YGlgJw5VQW0Pdip82ymfUOCppvtZF3EDJ 6x9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736001535; x=1736606335; 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=isBOK5EkoVzx0+60SYTBYbzag/ZGKna5MSZ560y293s=; b=BmcgEm2dxoujKlFQqFaFCgIzWTJW2MTJ2uE/LwZYZSuMz0uZKrpmrypBOgT7j/jeSo BWbUdH8jDVJWYKwiv833J+tX/EK5AA/UhUOafGajUIyjziZpfiUKJ7NaKfzpfXRnAKjn a+OBnMC573FvvMfGSllDUmbIkrctBQ3XO7kDYR89/JREo6pYulAjD7SWTr5LyPdJAIxc iMZj04YOT/+db5PMLzSX8jOMn/BVry0kO+f18SOIokIrXim7hdDvMegVXInB9Or4pf7q KOXp/+SHK+sH9MvwbD7dI9j46T7k/5wFYmF76xc6LQNvGBkQpwhEVY4LOnzW7JOf3x1/ ZelQ== X-Forwarded-Encrypted: i=1; AJvYcCVBtkm0/xMo99RwrRt3rylGODmvmY7cBnXpP2hwVQrYAQRfj8k8ulzpg1YP4ODVYukgSzT8LYmo5nzTDyg=@vger.kernel.org X-Gm-Message-State: AOJu0YzkbHbaju0aGtD86Y350Aswmi02XfxN+XNNao5axYPNjL2Ck2G3 av3RDJJppL/AMeVRPBkN2NfV6LBBQr+mVjg+Hp8JN064Xv3lzRaDPco/GwbEHXo= X-Gm-Gg: ASbGncvo7sklByYR5yGC/3FA4ZPiYipLUIwEI+f6azD5NL8f/gt+N1DwjxCvS9Fy4KN x5yZ/oL9+tieQCkO2GgiQgVeWUfZIesJVrcjAA6z91VGoLhrpeTssb2EQeca6vMZqd6Gn8TcXRZ 34CKTQHr0KHUxgkOdxR5sexj3rfIP1xWNTa8LjjX9yvF6WAXjl65j5VJnPjvoUf0xl5eKoFlI0e 1I55Tm1i2buUSJfOwi862ieU4eUHo/c7UnXNmxfE5Dlhiqa2fnzzNGDbBRJ5yc= X-Google-Smtp-Source: AGHT+IF6CIwlIeIPYhIfDdGvLEKVBUHmWt4TSRbGoWTRRPhul/Ngc0MsMOD2Yw2Im8h1VnwURPE7+A== X-Received: by 2002:a05:6a00:44cb:b0:725:1d37:ebff with SMTP id d2e1a72fcca58-72abe0960c6mr74590582b3a.22.1736001535492; Sat, 04 Jan 2025 06:38:55 -0800 (PST) Received: from localhost ([2400:4050:b783:b00:4952:3c52:120a:27e9]) by smtp.gmail.com with UTF8SMTPSA id 41be03b00d2f7-8427ab7830asm25799890a12.0.2025.01.04.06.38.51 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 04 Jan 2025 06:38:55 -0800 (PST) From: Akihiko Odaki Date: Sat, 04 Jan 2025 23:38:35 +0900 Subject: [PATCH v2 2/5] 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: <20250104-elf-v2-2-77dc2e06db4e@daynix.com> References: <20250104-elf-v2-0-77dc2e06db4e@daynix.com> In-Reply-To: <20250104-elf-v2-0-77dc2e06db4e@daynix.com> To: Eric Biederman , Kees Cook , Catalin Marinas , Mark Brown , Dave Martin , Baoquan He , Vivek Goyal , Dave Young Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, kexec@lists.infradead.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 --- 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 Thu Feb 12 21:49:25 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 19AC01CCB26 for ; Sat, 4 Jan 2025 14:39:02 +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=1736001544; cv=none; b=QdFTu+UOVHLGx6ciVhrlH2PqQjUuPLytVvSNU80xZVrCzQO5HeUhgbTJ8q/l8htP8zEzc9oLkVseAkkU4ECQ4Jxaq+ofkgwLsRlc3x/zfyO6g87ZfWSa9W/pN4n98HEA/3A671LpymXo5U3YO4ykVhQMd3octwoG0q2UYADIQx4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736001544; c=relaxed/simple; bh=n4yUt/8CTfVsdNp2Y/HwcFzJG4NA/osFdZPQ2b8qMZ8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=gQsHzwrtKhsdrvRLP7+/X/BVjzdAatFTh46XbsjMnSevJyeJvAYP25K92WvOlokXI/L3zQKbjuV//yWEgmY5EwR7Uw9ZxqG+h5MOIjemH4caPvnDh5tUPxBG7yHjjG/xFgNLkP33fto92R3FQUS/BZ0HABFgK0pHi0PiNQubxts= 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=vmT3w0L0; 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="vmT3w0L0" Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-2165448243fso219670035ad.1 for ; Sat, 04 Jan 2025 06:39:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1736001542; x=1736606342; 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=ffgGfa1tRdbMu1hKTw9Yyv/ZhjBJNeWsWiWpVjLRBnw=; b=vmT3w0L0b/G/aGrEu4xHCDL3ZPfvEuzSd5PypOgAVXO/JFqHz0TKuLofE4tB27HhpI 97ronqBXzNKs4KfzEHEN1rpayJQqK1cBfJMKUTBF51mJCjLm92ld5WhVj/gm5c1Dzva5 Ik/WufXQ9qzeHtw5dqQomCruzMftsxX96ukgmXpYNvIP/e/EPnswwkuU03W3nJg8T4Cw ObukW+rhX7l0EeT6khxSnyLC2iLh66i7DgMrl8LYzzzTxBnF/MRwGhZNjy180eW0xJbh HInEY0fyDVGmRPuSVQve3ToWz25R60EMY1FLWobKYKbbHj3pA2UaRY7NCXGKs4QewwRS qBoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736001542; x=1736606342; 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=ffgGfa1tRdbMu1hKTw9Yyv/ZhjBJNeWsWiWpVjLRBnw=; b=XSpGbLKn9t9+N/sQ459ZIiXu/IIVqL9SgEndHf4EkL77HvXUYIPB2C3A/5SFiPrdy6 vgNrx8QSq769DXPgVJRBFlQZrloqs0gUrPvtjZW+UqnLWy/cpSMeGjCoCfM2+RJvTXmV bajc3PC4jFbKwckW2+rcCes6OLDVbKeiuBUHiqMlu9jhNM8WwxYiVSK7fwTZtZad+y/Y 9zSgXs8y4kI5jL1tyVxB6ycFOS+lMv4+1SRtLZeayrlTgkoiT1DzHQnP0ByvAyuSh+Gi vSG+nc/wTE69P0Nxljyrs+WAJcnTRplc67wfeX+E1sLn8KuGgxukBn+xMR2ZsbMfp82T WVgw== X-Forwarded-Encrypted: i=1; AJvYcCXIAeazA8S0nor1zO3kTrc6L+P0T2YQUHhyM7uhCGVae9rs4WDbULHDAp7MhKokX93lp7DfQbG3IX3P8Uw=@vger.kernel.org X-Gm-Message-State: AOJu0YwIWtIdZH2dr7JKr02bgjC8MMzti7m/6taQ7r2O4XfCfZ2gWZnV jLZkdvt9M9ZNjkyWvclqk4Do78SHGFvt0/eBVn3XOZAlKY48CIBTSWxCeJTk2LA= X-Gm-Gg: ASbGncsaKtdFpP9T3nofiklsD0/P9HGok/vrSDn/Ru0meYPn2+7bBXgpPsmHghoFj4B 8cMSGmsfsfQ9spgiX54YepZzfa9jzqb8/fqTPQBGNrxTKySFnAdBYOAf42WmweT77ap4yHiR2km nEI8YlDAVnujY8RZqHzomdb8y8LxdtOyEECXQQNNfXtS0uS8F4VWk1gX8XQIqX5jh+rcILCxueB k8lCfEAQOp2V09GTVA6gxg3c3P2eXwJ/hYS6aKfSA/AEiItavV1qXSxwHaBang= X-Google-Smtp-Source: AGHT+IFOWxSlU7LboQeYrGu1ZapBf19hzzItaS6bjgdVpBMRFBzVa4lgIENsB6ZfRDlcb/evlyTHrw== X-Received: by 2002:a05:6a20:2d1f:b0:1e1:b1e4:e750 with SMTP id adf61e73a8af0-1e5e04717a2mr77843013637.18.1736001542441; Sat, 04 Jan 2025 06:39:02 -0800 (PST) Received: from localhost ([2400:4050:b783:b00:4952:3c52:120a:27e9]) by smtp.gmail.com with UTF8SMTPSA id d2e1a72fcca58-72aad8fd7b0sm17288107b3a.139.2025.01.04.06.38.58 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 04 Jan 2025 06:39:02 -0800 (PST) From: Akihiko Odaki Date: Sat, 04 Jan 2025 23:38:36 +0900 Subject: [PATCH v2 3/5] powwerpc: 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: <20250104-elf-v2-3-77dc2e06db4e@daynix.com> References: <20250104-elf-v2-0-77dc2e06db4e@daynix.com> In-Reply-To: <20250104-elf-v2-0-77dc2e06db4e@daynix.com> To: Eric Biederman , Kees Cook , Catalin Marinas , Mark Brown , Dave Martin , Baoquan He , Vivek Goyal , Dave Young Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, kexec@lists.infradead.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 --- 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 Thu Feb 12 21:49:25 2026 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (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 ACCCE1C9B7A for ; Sat, 4 Jan 2025 14:39:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736001551; cv=none; b=eGH7WosI/O254KHi9KzWLcmk9Yhap3yQs3WnL1A/5zwJBi4p1gk6v8LkIldFqoqLvjrhiOECAKX00FX5b9I1b7BEc2UnnErNUmUGjyjJKq7qNQ4pwbqh/BzVyTuYh+aN8OvilW+ICfJ4qrQD4PoH9Gq631ZGAnW4gCUVbguGM9E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736001551; c=relaxed/simple; bh=wCQpl7cAn/vCUbH0Vn+YujxXIXBJJFXyKJRaUtyuXrM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=o2FNZzBGjyd/LbMjJUay92G/zKADJ655k80svlI+hvYLpHmdhaxvIAu9rUN0VGplxK2XjHgQUS0WLCyPrG8K+Rj1p2JhWosxBavD6WLtsQ/GFczCA4Ve5TXKqPWUsLm/r8Ghp2xK1Cf0JIkAJYdIVElnM3fROH9PLLbZCGLvLR8= 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=Pv3nLWhB; arc=none smtp.client-ip=209.85.214.182 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="Pv3nLWhB" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-2166651f752so214487715ad.3 for ; Sat, 04 Jan 2025 06:39:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1736001549; x=1736606349; 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=SYIrxPsAVLm9525H8KmJlUUcKlEHI39WEeyICf7u0AY=; b=Pv3nLWhBe3mqTr/LfUcL72rzoWqsQ4Qs9vRkKkQ1qRIqLUa3KU75VqwJYjQ62jt9sH tA2TSAciVDlbzbss/JU2LbeODM1Wb/itAUzqKb2xZEN/4EhbdFQ1wpof2tDLWTnl5oHI o9rzZbQCmv+LVyuf1vFAdNfmm932DIRh42ypGMWCnb2f4DmHiYeBRJLfUBiGXLt66D6F sxmOr7GQvqrKaxkR7W20wqMDPODyPpowbWHpYngzoINqpmvHi1nwBw5M+TQB+nVDJF0U NtRIE2nY4pIZkr3LZLdA8AgK1eOk2uWhFWPfJypt/GyU6Cdsg9NFsEmAZIrYDoQO3lgu 9aoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736001549; x=1736606349; 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=SYIrxPsAVLm9525H8KmJlUUcKlEHI39WEeyICf7u0AY=; b=W8EiA0uZATgBKIMxeyqT0kfRcGYgy2BCxbTZ25cDh/EnY/t9MXTkr1A9ZfTwYOLpmb CxiUl52KDW4PGTBNGw/Ue2fJ72236NpESErwuEqNdOUNiVQWQ90urEggEleoOdEhSlm9 OXuYKNUmCwtxgkfAQBxnj0NZ0GS6BjTr1aNgI2t3viGBuAyVcffyHVa6EUHWzgMDPEYl J6jQAvuO8tiGwKyjebytEHpkH199OpjMVE2ychzlkNNKEGvRKIwm/z0CPuVPJCGQkO6g Zkpx3kqMXkg984l9sR1mYWAEymn0ODZfNxWuolMdzokl0am102phYlT4pM6GEBiEBqKF D7dw== X-Forwarded-Encrypted: i=1; AJvYcCV7S3hl0bxogDgUVwh92RN3ThGYvwvDXu5aqHDTBsVHHlHqT4p3QCskDiW6tXM2rQ4/Pwcaba26ePO5lvg=@vger.kernel.org X-Gm-Message-State: AOJu0Yy++WgHlr8pne6WUyAIWuIVJ72Ra/0WAQEgwWnn0TNGDButndWn /oMyWiqLkzN/GLu372vEv13Jhaxs3CIWxfcOE8k0lrETJ5i9AzAuoYyUvyMiHlU= X-Gm-Gg: ASbGncuihGXh6t+ukN0E7xB9FT0L2jirURoS6d+6KszjJPB6JEVgcsJM9WFlGXC4VWR 6nuX42FdGSw5kijw8GdOVr48FacXbigKHqf+sEczXkk1htf5qiHSJW/VXOpcZ0T8lt0HNa+w+L1 FWqPTFzmlHwUlF7ttJ79pCGD/PJdxuY7PRMWPBJ7neZRbKXfkYCnSyJaPRV5BfLRo5SLXxort8H OO9nEdLFLBYERA+J6XnBQrrXJGjz4/Ydr7I5YSNDmUQYJXDxEA8MfIT5URC9vU= X-Google-Smtp-Source: AGHT+IEy84cJ3h5ytJvCxSHHyFyZN9d/gzxb3RlphGjioGS1LvEPzNOYZA2OsynrQSHDV4AjG+98tg== X-Received: by 2002:a17:902:db0f:b0:215:4362:bc76 with SMTP id d9443c01a7336-219e6f29827mr814402335ad.54.1736001548953; Sat, 04 Jan 2025 06:39:08 -0800 (PST) Received: from localhost ([2400:4050:b783:b00:4952:3c52:120a:27e9]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-219dc963103sm262510765ad.52.2025.01.04.06.39.05 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 04 Jan 2025 06:39:08 -0800 (PST) From: Akihiko Odaki Date: Sat, 04 Jan 2025 23:38:37 +0900 Subject: [PATCH v2 4/5] 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: <20250104-elf-v2-4-77dc2e06db4e@daynix.com> References: <20250104-elf-v2-0-77dc2e06db4e@daynix.com> In-Reply-To: <20250104-elf-v2-0-77dc2e06db4e@daynix.com> To: Eric Biederman , Kees Cook , Catalin Marinas , Mark Brown , Dave Martin , Baoquan He , Vivek Goyal , Dave Young Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, kexec@lists.infradead.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 --- 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 Thu Feb 12 21:49:25 2026 Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) (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 3668A1CB9E2 for ; Sat, 4 Jan 2025 14:39:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736001557; cv=none; b=MVdjIySpQKE16gafrIMRfPeGPb/rg4jpp87UMdshGsadwGN1R1MR4tVZcLckWLF1G6TBUQ+n8kxu91SAgBtJRfGQvlfXC8oJs/lg2ZErBy0qcw8h2wOknibnB7gN6S4QyJn5vYciAkG2+iuWrNti6ndZTUwDE7rRYS5npfrrI64= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736001557; c=relaxed/simple; bh=S/8Mk6L29yj28C/cV7bfRVgvsICVDUajAazzt112PkQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=KfyUH9cpLH64iz6ebgsXGWf9YIcGJ7SbK2q0LkrLmYe/TaZdFj+Zh7VZlTHzJIaJQa7cg8xjMoDzYWqlxhbiBcjHofd3PHu6D3dJIzpaHZK7h8mQ0gtcbo1fV8NEtqVtWutcd0ueLyJEGMafyCT2hZAtlSuC7hnw1yF53uxAV9E= 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=VxEghG7j; arc=none smtp.client-ip=209.85.216.52 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="VxEghG7j" Received: by mail-pj1-f52.google.com with SMTP id 98e67ed59e1d1-2efb17478adso18397316a91.1 for ; Sat, 04 Jan 2025 06:39:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1736001555; x=1736606355; 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=lItEO8+vDf3ne2QEFaUdlfKMhS1868rwBEwl+2/8wc8=; b=VxEghG7jW+eoqNvToKT0BBQtFMH7qlpJdehP2LIV/h8Gb1bqpkexge8cVDzfkC+EXb 3vQg9beIrG309B/tXjZiCgczChOX1/NCyjASujmi8goCitQiKWbY0RRaHgVcBqyJboFv Hkna+GkEX/XY3OG7GEDeelcRgqScbSClG+qWNvFTCECestv/GMFgSczQcT5yrCeZE4bT Fg3WR+LJ6Nb8s2WWQ+bylOWcnAbj9p9uk+YDAtrmfWnOfLrKCeJ/f7ei2AXM4z6TID0z hrAUC1/kwSN/n6lhy3z6njpEyqLCNOpjB8imADi8fYv3unWuwjJH8uvRHNH5C+PbUM3N bYPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736001555; x=1736606355; 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=lItEO8+vDf3ne2QEFaUdlfKMhS1868rwBEwl+2/8wc8=; b=pB4rAXsxib08p+MnWuCUkohydaMKSgdYs3U02gubq+8sag81Qma1nZvXFyQrVFgxqa 5EyQKiBAP+VIdxoGthcvVBiZmYz19otqU7QHFvSEkepO3MUADV3m1N5uFFoUnoVFlY1R 8dgjnKWSzR7Ozzvb+7ovhqh025OE1hn7wF9bHO63Gn3g9j/9xxbWHiW0huvnlA4zOSRy 7DcMws7FNTub6URho+Ug/vuQRjRpil6JHQsrieqSDi07q58DIp5d4E+7bMPTkywyDSXg oROIayLfM12nmSz78RVFXFgPL/Ilo7hqt3hZ9Rw8IZ6x7ehAaeGbxGVXpxGCGpoSfLI+ 96rw== X-Forwarded-Encrypted: i=1; AJvYcCVwlKYuolxaNhcQycm4S5cXfDqBsecRZOqWHHHrvgMYS3wjqyWTEBHCJXTjTPdFpYpC2tYR+px3xoeA00Q=@vger.kernel.org X-Gm-Message-State: AOJu0Yw9+0upd0O2Q96kpavhmY0FJDGLI9Pt0iUCfruvoq7eIhTh8Bkq rYNDYjrDmYi4BSHC1o1+BREfnkq82CusiOomVOm3ZscbmbRBju6CyFAzCds/4Kg= X-Gm-Gg: ASbGncuRU4SYxxYDNYnfBJvGLmz5e4FxxCqo1Iazpf89nsGFk1ycL5lZq9v2M+z+Lzl BoHTL+JODt5zN3GHok9qejchlkYx6zmgJ8HyxwSVUN0eg5HbSXnpV+oFnoXbySzBQhMj877VHug D5kkTRr1Vqb94krpIQRd+lb4Nrwn5EKGY0n5PC/DrrhTcNHwtB4s4wgncm7CIBm6JrwHfsKflAS pgI1Hlin/wBUWelme010LNxt2oLbT9KtS3E6WTzhmlUSP1ej7ccYbA6QtqSCak= X-Google-Smtp-Source: AGHT+IE6l143okZ4K2hLdktIIklrvNPqE32MSRd/SLQaBZqLFpJB0ZcbHN/hLV+Lk0+UAUXZGQQd2Q== X-Received: by 2002:a05:6a00:4098:b0:725:c8ea:b30a with SMTP id d2e1a72fcca58-72abde2ab0emr75955118b3a.14.1736001555483; Sat, 04 Jan 2025 06:39:15 -0800 (PST) Received: from localhost ([2400:4050:b783:b00:4952:3c52:120a:27e9]) by smtp.gmail.com with UTF8SMTPSA id d2e1a72fcca58-72aad8f90b9sm28017661b3a.131.2025.01.04.06.39.11 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 04 Jan 2025 06:39:15 -0800 (PST) From: Akihiko Odaki Date: Sat, 04 Jan 2025 23:38:38 +0900 Subject: [PATCH v2 5/5] 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: <20250104-elf-v2-5-77dc2e06db4e@daynix.com> References: <20250104-elf-v2-0-77dc2e06db4e@daynix.com> In-Reply-To: <20250104-elf-v2-0-77dc2e06db4e@daynix.com> To: Eric Biederman , Kees Cook , Catalin Marinas , Mark Brown , Dave Martin , Baoquan He , Vivek Goyal , Dave Young Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, kexec@lists.infradead.org, devel@daynix.com, Akihiko Odaki X-Mailer: b4 0.14-dev-fd6e3 Now KEXEC_CORE_NOTE_NAME is only used at one place and it does not seem to provide any value anymore. Replace the remaining usage with the literal and remove the macro. Signed-off-by: Akihiko Odaki Acked-by: Baoquan He --- arch/s390/kernel/crash_dump.c | 2 +- include/linux/kexec.h | 2 -- include/linux/vmcore_info.h | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/arch/s390/kernel/crash_dump.c b/arch/s390/kernel/crash_dump.c index cd0c93a8fb8b..4a9817489e35 100644 --- a/arch/s390/kernel/crash_dump.c +++ b/arch/s390/kernel/crash_dump.c @@ -253,7 +253,7 @@ static const char *nt_name(Elf64_Word type) const char *name =3D "LINUX"; =20 if (type =3D=3D NT_PRPSINFO || type =3D=3D NT_PRSTATUS || type =3D=3D NT_= PRFPREG) - name =3D KEXEC_CORE_NOTE_NAME; + name =3D "CORE"; return name; } =20 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