From patchwork Tue Jan 7 12:45:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akihiko Odaki X-Patchwork-Id: 104238 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D2019385DC27 for ; Tue, 7 Jan 2025 13:04:16 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D2019385DC27 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=daynix-com.20230601.gappssmtp.com header.i=@daynix-com.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=cL4Hzhj3 X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-pj1-x1032.google.com (mail-pj1-x1032.google.com [IPv6:2607:f8b0:4864:20::1032]) by sourceware.org (Postfix) with ESMTPS id 1D9383858C41 for ; Tue, 7 Jan 2025 12:48:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1D9383858C41 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=daynix.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=daynix.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 1D9383858C41 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::1032 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1736254100; cv=none; b=FLZFF08vJSXnrgdXEWsKEaLFiCMfddguh7PpzYTgZqruOlak6dOE91Ad68mu8wrlQvBlkPCBwYFE+PLmBFmF5LUhkEwWsOjstCXkTh6NzgssWayuPBXCAKpf3ABNU2HDhdTS8uMVMXTwFMVrnlYSCx2EoU948M2LCw4kpSD6z2E= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1736254100; c=relaxed/simple; bh=N4IhUv6S3uRsh7HsLEUL+nZigf4kpss6dQVVVdHm5r4=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=XwzLYlb4CXyHHmyqdtV0svrpnUGumMDR7SnJI205yhyuc5PR7dwdXu0v67MAGK+1VEaGo6DPt7Bbqk+O5yZ0dE3ruU01+y2zt5M8jXWO1sOKCURbRUFi2/+WjLoCLOqqp8c4TppCH0YB8gN5ntW+j1+nhVQXQPPLJLFGTJwEXqk= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1D9383858C41 Received: by mail-pj1-x1032.google.com with SMTP id 98e67ed59e1d1-2f44353649aso18428107a91.0 for ; Tue, 07 Jan 2025 04:48:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1736254099; x=1736858899; darn=sourceware.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=cL4Hzhj3u8jXH7uI2xLcGyZ7ez0bsOf8Rv6fpBR5PS7wDfjE8/BN1gWKNDNPlTBefw OvjwqtmxZ0sJ6eXSu0jXdWI1i/7rmrnAmDaHSEW8OfByExmpkho08ZDgPM0m6m21aIHT BBuWAiqH0mmsaEmL3MVn+lSrBjvNIRuSs0xirnd6vYrKuwjE+XmLh7RQTZUhJY00TBWC pgLQoVEQxpxYzHhvTCyL5xgDTIRYkI6/Xg3c6Bj6RcGOGptGA0yqVqxVQWW1FsMV0dbv TdaRMK8saNvSXktYEpJvHtQ5XJw0zhS9XvBkCfIlZiF9GuvpfnL/l8ZB7pUaMunF91MC xPQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736254099; x=1736858899; 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=gjQPL2fLRIEA9OxmE8j30w4aTzIuxFyCJFgCW/PUwVW0tZ13D/dH6zRltGkFw176dM 7nO57ozMOCsEx0lTLdUlltWVRnlkNon7C3e2Hosu15YP2MFsYGte9L6P36/m3Mjefcmk Ynzu3F71EMtbwts0sWrI1wBq0IInIuK59Q0T7IBMYF+M4UATQLXqyVPtTBIbZB+hgXy4 YHeadQ4QmH9cMNX9bH241KgvV7CjBxotAFHMxl495I5ojCZbulZKCfAAISpgzRHsxZhx 4YvNWciB4fCVoSQ8F2hkBpQ9S+oc4ScQMTlN6U69FfZzPS9mSnGQdu02kRdVwPrx58Sj pqLw== X-Forwarded-Encrypted: i=1; AJvYcCVGUx/AmnjLF/PDmlSfqXu9r1u3w5+gnmndbiCU+IaQbNOXZ1W/pgvTpXgBrWXKjN5US5si/Dqu6Q==@sourceware.org X-Gm-Message-State: AOJu0Yx67G9Ol1Dnh6CjX9DZ8o+P0M0negnHJ1oF/YSX0jcDXT7YtJdJ n4UhkWjoBGqr6icJrm+Lli/Z99uM/ZfBMu9M3TW+O9wf8YYzbSVLxsH84R2y2EA= X-Gm-Gg: ASbGncu0BDQhWPOTGGue5jTHzcsqfn4j0ia4XUbr1BT2fjDbpiSWTBrH5Jtyxu4YqBr CGe5iCnlpohrH/cyHvUcqvkIY2HyQSl5jU70WxRjdFXUW8ZeY5jdv3i0Hb+bhbkHGof2sDKEa6D kUDyz9vK5vKmx6RpB4lC5kZuAbdWFWlKlBdlrdKdqQBcBCVAaqzRyJkHDdhjJ64dOR+iOMBN84I UETnEhH2MGE9LXMd3W9YTujg1KTzr6LppRxbP7VUMlIpKwaZ9HnzWRE8vw= X-Google-Smtp-Source: AGHT+IF4unLvSG3ozl/K+xZg50qJ9RhkOXYw+z5VR9QTjd55CxK7F8LQeDMLqnNt5CS4t8mxmL2QoA== X-Received: by 2002:a17:90b:534b:b0:2ee:a127:ba96 with SMTP id 98e67ed59e1d1-2f452ec6d35mr81063623a91.23.1736254098937; Tue, 07 Jan 2025 04:48:18 -0800 (PST) Received: from localhost ([157.82.203.37]) by smtp.gmail.com with UTF8SMTPSA id 98e67ed59e1d1-2f2ee06dd46sm41574100a91.36.2025.01.07.04.48.14 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 07 Jan 2025 04:48:18 -0800 (PST) From: Akihiko Odaki Date: Tue, 07 Jan 2025 21:45:55 +0900 Subject: [PATCH v3 4/6] crash: Use note name macros MIME-Version: 1.0 Message-Id: <20250107-elf-v3-4-99cb505b1ab2@daynix.com> References: <20250107-elf-v3-0-99cb505b1ab2@daynix.com> In-Reply-To: <20250107-elf-v3-0-99cb505b1ab2@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, binutils@sourceware.org, devel@daynix.com, Akihiko Odaki X-Mailer: b4 0.14-dev-fd6e3 X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, KAM_MANYTO, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces~patchwork=sourceware.org@sourceware.org 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" -#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, *phdrs_len = *nphdr * sizeof(struct elf_phdr); *notes_len = (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, struct iov_iter *iter) goto out; } - 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 @@ #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) /* 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 = current->pid; elf_core_copy_regs(&prstatus.pr_reg, regs); - buf = append_elf_note(buf, KEXEC_CORE_NOTE_NAME, NT_PRSTATUS, + buf = append_elf_note(buf, NN_PRSTATUS, NT_PRSTATUS, &prstatus, sizeof(prstatus)); final_note(buf); }