linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: guoren@kernel.org
To: guoren@kernel.org, palmer@dabbelt.com, arnd@arndb.de,
	anup@brainfault.org, gregkh@linuxfoundation.org,
	liush@allwinnertech.com, wefu@redhat.com, drew@beagleboard.org,
	wangjunqiang@iscas.ac.cn, hch@lst.de
Cc: linux-arch@vger.kernel.org, linux-s390@vger.kernel.org,
	Guo Ren <guoren@linux.alibaba.com>,
	linux-parisc@vger.kernel.org, x86@kernel.org,
	linux-kernel@vger.kernel.org, linux-csky@vger.kernel.org,
	linux-mips@vger.kernel.org, sparclinux@vger.kernel.org,
	linux-riscv@lists.infradead.org, linuxppc-dev@lists.ozlabs.org,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH V6 15/20] riscv: compat: Add hw capability check for elf
Date: Thu, 24 Feb 2022 16:54:05 +0800	[thread overview]
Message-ID: <20220224085410.399351-16-guoren@kernel.org> (raw)
In-Reply-To: <20220224085410.399351-1-guoren@kernel.org>

From: Guo Ren <guoren@linux.alibaba.com>

Detect hardware COMPAT (32bit U-mode) capability in rv64. If not
support COMPAT mode in hw, compat_elf_check_arch would return
false by compat_binfmt_elf.c

Signed-off-by: Guo Ren <guoren@linux.alibaba.com>
Signed-off-by: Guo Ren <guoren@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Christoph Hellwig <hch@lst.de>
---
 arch/riscv/include/asm/elf.h |  3 ++-
 arch/riscv/kernel/process.c  | 26 ++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/arch/riscv/include/asm/elf.h b/arch/riscv/include/asm/elf.h
index aee40040917b..3a4293dc7229 100644
--- a/arch/riscv/include/asm/elf.h
+++ b/arch/riscv/include/asm/elf.h
@@ -40,7 +40,8 @@
  * elf64_hdr e_machine's offset are different. The checker is
  * a little bit simple compare to other architectures.
  */
-#define compat_elf_check_arch(x) ((x)->e_machine == EM_RISCV)
+extern bool compat_elf_check_arch(Elf32_Ehdr *hdr);
+#define compat_elf_check_arch	compat_elf_check_arch
 
 #define CORE_DUMP_USE_REGSET
 #define ELF_EXEC_PAGESIZE	(PAGE_SIZE)
diff --git a/arch/riscv/kernel/process.c b/arch/riscv/kernel/process.c
index 54787ca9806a..7bbe4dd95e85 100644
--- a/arch/riscv/kernel/process.c
+++ b/arch/riscv/kernel/process.c
@@ -83,6 +83,32 @@ void show_regs(struct pt_regs *regs)
 		dump_backtrace(regs, NULL, KERN_DEFAULT);
 }
 
+#ifdef CONFIG_COMPAT
+static bool compat_mode_supported __read_mostly;
+
+bool compat_elf_check_arch(Elf32_Ehdr *hdr)
+{
+	return compat_mode_supported && hdr->e_machine == EM_RISCV;
+}
+
+static int __init compat_mode_detect(void)
+{
+	unsigned long tmp = csr_read(CSR_STATUS);
+
+	csr_write(CSR_STATUS, (tmp & ~SR_UXL) | SR_UXL_32);
+	compat_mode_supported =
+			(csr_read(CSR_STATUS) & SR_UXL) == SR_UXL_32;
+
+	csr_write(CSR_STATUS, tmp);
+
+	pr_info("riscv: ELF compat mode %s",
+			compat_mode_supported ? "supported" : "failed");
+
+	return 0;
+}
+early_initcall(compat_mode_detect);
+#endif
+
 void start_thread(struct pt_regs *regs, unsigned long pc,
 	unsigned long sp)
 {
-- 
2.25.1


  parent reply	other threads:[~2022-02-24  9:06 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-24  8:53 [PATCH V6 00/20] riscv: compat: Add COMPAT mode support for rv64 guoren
2022-02-24  8:53 ` [PATCH V6 01/20] uapi: simplify __ARCH_FLOCK{,64}_PAD a little guoren
2022-02-24  8:53 ` [PATCH V6 02/20] uapi: always define F_GETLK64/F_SETLK64/F_SETLKW64 in fcntl.h guoren
2022-02-24  8:53 ` [PATCH V6 03/20] compat: consolidate the compat_flock{, 64} definition guoren
2022-02-24  8:53 ` [PATCH V6 04/20] kconfig: Add SYSVIPC_COMPAT for all architectures guoren
2022-02-24  8:53 ` [PATCH V6 05/20] fs: stat: compat: Add __ARCH_WANT_COMPAT_STAT guoren
2022-02-24  8:53 ` [PATCH V6 06/20] asm-generic: compat: Cleanup duplicate definitions guoren
2022-02-24  8:53 ` [PATCH V6 07/20] syscalls: compat: Fix the missing part for __SYSCALL_COMPAT guoren
2022-02-24  8:53 ` [PATCH V6 08/20] riscv: Fixup difference with defconfig guoren
2022-02-24  8:53 ` [PATCH V6 09/20] riscv: compat: Add basic compat data type implementation guoren
2022-02-24  8:54 ` [PATCH V6 10/20] riscv: compat: Re-implement TASK_SIZE for COMPAT_32BIT guoren
2022-02-24  8:54 ` [PATCH V6 11/20] riscv: compat: syscall: Add compat_sys_call_table implementation guoren
2022-02-24  9:31   ` Arnd Bergmann
2022-02-24 10:30     ` Guo Ren
2022-02-24  8:54 ` [PATCH V6 12/20] riscv: compat: syscall: Add entry.S implementation guoren
2022-02-24  8:54 ` [PATCH V6 13/20] riscv: compat: process: Add UXL_32 support in start_thread guoren
2022-02-24  8:54 ` [PATCH V6 14/20] riscv: compat: Add elf.h implementation guoren
2022-02-24  8:54 ` guoren [this message]
2022-02-24  8:54 ` [PATCH V6 16/20] riscv: compat: vdso: Add rv32 VDSO base code implementation guoren
2022-02-24  9:13   ` Arnd Bergmann
2022-02-25 15:42     ` Guo Ren
2022-02-25 15:49       ` Arnd Bergmann
2022-02-25 16:07         ` Guo Ren
2022-02-24  8:54 ` [PATCH V6 17/20] riscv: compat: vdso: Add setup additional pages implementation guoren
2022-02-24 17:57   ` Palmer Dabbelt
2022-02-25  3:15     ` Guo Ren
2022-02-24  8:54 ` [PATCH V6 18/20] riscv: compat: signal: Add rt_frame implementation guoren
2022-02-24  8:54 ` [PATCH V6 19/20] riscv: compat: ptrace: Add compat_arch_ptrace implement guoren
2022-02-24  9:04   ` Arnd Bergmann
2022-02-24  8:54 ` [PATCH V6 20/20] riscv: compat: Add COMPAT Kbuild skeletal support guoren

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=20220224085410.399351-16-guoren@kernel.org \
    --to=guoren@kernel.org \
    --cc=anup@brainfault.org \
    --cc=arnd@arndb.de \
    --cc=drew@beagleboard.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=guoren@linux.alibaba.com \
    --cc=hch@lst.de \
    --cc=linux-arch@vger.kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-csky@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mips@vger.kernel.org \
    --cc=linux-parisc@vger.kernel.org \
    --cc=linux-riscv@lists.infradead.org \
    --cc=linux-s390@vger.kernel.org \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=liush@allwinnertech.com \
    --cc=palmer@dabbelt.com \
    --cc=sparclinux@vger.kernel.org \
    --cc=wangjunqiang@iscas.ac.cn \
    --cc=wefu@redhat.com \
    --cc=x86@kernel.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 NNTP newsgroup(s).