From patchwork Sat Jan 11 05:48:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akihiko Odaki X-Patchwork-Id: 104564 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 E1C6E385781A for ; Sat, 11 Jan 2025 05:51:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E1C6E385781A 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=nRgWmpfN X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-pl1-x630.google.com (mail-pl1-x630.google.com [IPv6:2607:f8b0:4864:20::630]) by sourceware.org (Postfix) with ESMTPS id 7076B385843B for ; Sat, 11 Jan 2025 05:49:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7076B385843B 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 7076B385843B Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::630 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1736574564; cv=none; b=Pf8RNc1BKCCyo54TGfgM8o57tqNyk9irN/q1Jq5ukXpayEjM9HDfCamF1SHjRXSyXsXgsFZYTppF4wbdClVa/8aVuwYTTV+RethNpA4jkw2fXpfz2aE81K0mpSizWSYrTOSPDImzINgMMYhlhNhMr3+rGyceg6G9cyVo2vK4q04= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1736574564; c=relaxed/simple; bh=N4IhUv6S3uRsh7HsLEUL+nZigf4kpss6dQVVVdHm5r4=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=ZkzYgA96BXhVcoGKnt6Bwp9hX3uPQCin8gQ7GsWq1HeDVZwfkjuN6bt6r6u8uCRNZ8RsYHyieyEwJLDnvh/6Kay59xHZFgOWlZpqyUkDla1pq6osJR5zVMImOz++dXvgqxxGdanxD0A5uh+RI6CCmgzj2YJwGt2XBFb+PSNmkGg= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7076B385843B Received: by mail-pl1-x630.google.com with SMTP id d9443c01a7336-2164b1f05caso47690125ad.3 for ; Fri, 10 Jan 2025 21:49:24 -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=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=nRgWmpfN1nk9QqdQl77aXjWYTgHfQ368BRkTjWmpaC2JnKUbj6pGLBoRSywq6AX6QL C7kqDLZFNuFtH3AwJj7kPHHp8LlF53cD9iGU/jGNAUPEgK9Vr0ChozWrWQQAnYtUHpN5 BjA6/+wwtwXFAfkzxhQ8KhlnArVc4Cp9ne2aV4VQoRw2hI4BgWPn+bqwwMcAuRohdpi4 g0hVW4iCG4A8VJE/kfiOIX7qgk+d6N5Paa1ux8uEOOuwg33gW+iVQrM9rr6i6PDRbVcN 6qeKZlBcL1zh5HSZ1pkcCInWyjJjESll35bJKlMTKAx4uJvfHo0lMOA0UiqVzOC1fpyl 0m7w== 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=D+fpenYJ3l4FKNwI6NM1yZg2c+LXua0a/ziTqyX7GKvfyFrogTiEyo2eU+1GLF4QiS lPr8ZcdSxU+jYfsXR/GQkjFf+COD5/rqvly9/jPsuNI5dVeH6Fg45AI4DJlmuMVD1S2W 4FBn280Y442TaSrwbA7RSi1GhUh0yvJqU6EoZYYRwbRmcMKah+PnietTLaa+4fcOZeRD /mB4ic0RtY2BJBJEfj9cerIizts7/snv83kEIeHfQuR6p+g74NWY9ENLM17GECYEupHb cwMPcnnvC4ira0+NqRQiq85RaeAWP8skxIod/qTfensYyvs3p0jY+fuHr5CRXIh9h4QN 6ftg== X-Forwarded-Encrypted: i=1; AJvYcCXbdq1Ck5rCAOy4iWAqixmXF6Rq2fK3Iyli9ENrXurP6Q/rL1FBnzqR1NTsfMO4jdYJY1joUqhElQ==@sourceware.org X-Gm-Message-State: AOJu0YzBbxWY2JSGTqtAmXVy6FA7AHFxHflraHX27hMquZ8uNOxDn7cz 9bYX5i22zaU9xgUpuD/fr4R+lHgngVIPzfRbFw32KoZfKqsdY5dU3NbB+VPqWow= X-Gm-Gg: ASbGncvVawp4/5tBil/ZM/H596kJ59H1nh4rAI78s4byMMKwDCuCokVuVL72xQhM377 XXZJRBlsVWNcc3kz6MMMBCXDnNrUpb6rMb6GtrvV0dIUj6o02g9pOjrQDIPfGBOu0lKWhHXfUYS v2relJYK9rQXs88AeBX3UK3EYwMLeCZ06N6V+Hr3OpLYm9qjZUr47PqI+mIJiG2IMX0AhgZNaPx nf0f8mlJlSqn5lo5NfQpGA9H3Mr6dwWz/8AZRpQllejbrsIsM284pvl1E8= 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 MIME-Version: 1.0 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 X-Spam-Status: No, score=-12.9 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 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" -#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); }