From: benjamin@sipsolutions.net
To: linux-um@lists.infradead.org
Cc: Benjamin Berg <benjamin@sipsolutions.net>
Subject: [PATCH 01/12] um: Remove stub-data.h include from common-offsets.h
Date: Thu, 18 Apr 2024 11:23:16 +0200 [thread overview]
Message-ID: <20240418092327.860135-2-benjamin@sipsolutions.net> (raw)
In-Reply-To: <20240418092327.860135-1-benjamin@sipsolutions.net>
From: Benjamin Berg <benjamin@sipsolutions.net>
Further commits will require values from common-offsets.h inside
stub-data.h. Resolve the possible circular dependency and simply use
offsetof() inside stub_32.h and stub_64.h.
Signed-off-by: Benjamin Berg <benjamin@sipsolutions.net>
---
arch/um/include/shared/common-offsets.h | 5 -----
arch/x86/um/shared/sysdep/stub_32.h | 7 ++++---
arch/x86/um/shared/sysdep/stub_64.h | 7 ++++---
3 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/arch/um/include/shared/common-offsets.h b/arch/um/include/shared/common-offsets.h
index 96195483fbd0..579ed946a3a9 100644
--- a/arch/um/include/shared/common-offsets.h
+++ b/arch/um/include/shared/common-offsets.h
@@ -1,6 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */
/* for use by sys-$SUBARCH/kernel-offsets.c */
-#include <stub-data.h>
DEFINE(KERNEL_MADV_REMOVE, MADV_REMOVE);
@@ -30,7 +29,3 @@ DEFINE(UML_CONFIG_64BIT, CONFIG_64BIT);
DEFINE(UML_CONFIG_UML_TIME_TRAVEL_SUPPORT, CONFIG_UML_TIME_TRAVEL_SUPPORT);
#endif
-/* for stub */
-DEFINE(UML_STUB_FIELD_OFFSET, offsetof(struct stub_data, offset));
-DEFINE(UML_STUB_FIELD_CHILD_ERR, offsetof(struct stub_data, child_err));
-DEFINE(UML_STUB_FIELD_FD, offsetof(struct stub_data, fd));
diff --git a/arch/x86/um/shared/sysdep/stub_32.h b/arch/x86/um/shared/sysdep/stub_32.h
index ea8b5a2d67af..2748b7ee031a 100644
--- a/arch/x86/um/shared/sysdep/stub_32.h
+++ b/arch/x86/um/shared/sysdep/stub_32.h
@@ -6,6 +6,7 @@
#ifndef __SYSDEP_STUB_H
#define __SYSDEP_STUB_H
+#include <stddef.h>
#include <asm/ptrace.h>
#include <generated/asm-offsets.h>
@@ -98,9 +99,9 @@ static __always_inline void remap_stack_and_trap(void)
: :
"g" (~(STUB_DATA_PAGES * UM_KERN_PAGE_SIZE - 1)),
"g" (STUB_MMAP_NR),
- "g" (UML_STUB_FIELD_FD),
- "g" (UML_STUB_FIELD_OFFSET),
- "g" (UML_STUB_FIELD_CHILD_ERR),
+ "g" (offsetof(struct stub_data, fd)),
+ "g" (offsetof(struct stub_data, offset)),
+ "g" (offsetof(struct stub_data, child_err)),
"c" (STUB_DATA_PAGES * UM_KERN_PAGE_SIZE),
"d" (PROT_READ | PROT_WRITE),
"S" (MAP_FIXED | MAP_SHARED)
diff --git a/arch/x86/um/shared/sysdep/stub_64.h b/arch/x86/um/shared/sysdep/stub_64.h
index b24168ef0ac4..50c5e0529dfb 100644
--- a/arch/x86/um/shared/sysdep/stub_64.h
+++ b/arch/x86/um/shared/sysdep/stub_64.h
@@ -6,6 +6,7 @@
#ifndef __SYSDEP_STUB_H
#define __SYSDEP_STUB_H
+#include <stddef.h>
#include <sysdep/ptrace_user.h>
#include <generated/asm-offsets.h>
#include <linux/stddef.h>
@@ -101,9 +102,9 @@ static __always_inline void remap_stack_and_trap(void)
"g" (STUB_MMAP_NR),
"g" (~(STUB_DATA_PAGES * UM_KERN_PAGE_SIZE - 1)),
"g" (MAP_FIXED | MAP_SHARED),
- "g" (UML_STUB_FIELD_FD),
- "g" (UML_STUB_FIELD_OFFSET),
- "g" (UML_STUB_FIELD_CHILD_ERR),
+ "g" (offsetof(struct stub_data, fd)),
+ "g" (offsetof(struct stub_data, offset)),
+ "g" (offsetof(struct stub_data, child_err)),
"S" (STUB_DATA_PAGES * UM_KERN_PAGE_SIZE),
"d" (PROT_READ | PROT_WRITE)
:
--
2.44.0
next prev parent reply other threads:[~2024-04-18 9:24 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-18 9:23 [PATCH 00/12] Rework stub syscall and page table handling benjamin
2024-04-18 9:23 ` benjamin [this message]
2024-04-18 9:23 ` [PATCH 02/12] um: Create signal stack memory assignment in stub_data benjamin
2024-04-18 9:23 ` [PATCH 03/12] um: Add generic stub_syscall6 function benjamin
2024-04-18 9:23 ` [PATCH 04/12] um: Rework syscall handling benjamin
2024-04-18 9:23 ` [PATCH 05/12] um: compress memory related stub syscalls while adding them benjamin
2024-04-18 9:23 ` [PATCH 06/12] um: remove LDT support benjamin
2024-04-18 9:23 ` [PATCH 07/12] um: remove copy_context_skas0 benjamin
2024-04-18 9:23 ` [PATCH 08/12] um: Delay flushing syscalls until the thread is restarted benjamin
2024-04-18 9:23 ` [PATCH 09/12] um: Do not flush MM in flush_thread benjamin
2024-04-18 9:23 ` [PATCH 10/12] um: remove force_flush_all from fork_handler benjamin
2024-04-18 9:23 ` [PATCH 11/12] um: simplify and consolidate TLB updates benjamin
2024-04-18 9:23 ` [PATCH 12/12] um: refactor TLB update handling benjamin
2024-04-22 2:51 ` Tiwei Bie
2024-04-22 7:22 ` Benjamin Berg
2024-04-22 7:51 ` Anton Ivanov
2024-04-22 2:35 ` [PATCH 00/12] Rework stub syscall and page table handling Tiwei Bie
2024-04-22 7:41 ` Benjamin Berg
2024-04-22 12:08 ` Tiwei Bie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240418092327.860135-2-benjamin@sipsolutions.net \
--to=benjamin@sipsolutions.net \
--cc=linux-um@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).