Commit 85fb6da4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'riscv-for-linus-7.0-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux 

Pull RISC-V fixes from Paul Walmsley:

 - Fix a CONFIG_SPARSEMEM crash on RV32 by avoiding early phys_to_page()

 - Prevent runtime const infrastructure from being used by modules,
   similar to what was done for x86

 - Avoid problems when shutting down ACPI systems with IOMMUs by adding
   a device dependency between IOMMU and devices that use it

 - Fix a bug where the CPU pointer masking state isn't properly reset
   when tagged addresses aren't enabled for a task

 - Fix some incorrect register assignments, and add some missing ones,
   in kgdb support code

 - Fix compilation of non-kernel code that uses the ptrace uapi header
   by replacing BIT() with _BITUL()

 - Fix compilation of the validate_v_ptrace kselftest by working around
   kselftest macro expansion issues

* tag 'riscv-for-linus-7.0-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
  ACPI: RIMT: Add dependency between iommu and devices
  selftests: riscv: Add braces around EXPECT_EQ()
  riscv: use _BITUL macro rather than BIT() in ptrace uapi and kselftests
  riscv: Reset pmm when PR_TAGGED_ADDR_ENABLE is not set
  riscv: make runtime const not usable by modules
  riscv: patch: Avoid early phys_to_page()
  riscv: kgdb: fix several debug register assignment bugs
parents 10b76a42 91565852

arch/riscv/include/asm/runtime-const.h

+4 −0
Original line number Diff line number Diff line
@@ -2,6 +2,10 @@ 
#ifndef _ASM_RISCV_RUNTIME_CONST_H

#define _ASM_RISCV_RUNTIME_CONST_H



#ifdef MODULE

  #error "Cannot use runtime-const infrastructure from modules"

#endif



#include <asm/asm.h>

#include <asm/alternative.h>

#include <asm/cacheflush.h>

arch/riscv/include/uapi/asm/ptrace.h

+7 −6
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#ifndef __ASSEMBLER__



#include <linux/types.h>

#include <linux/const.h>



#define PTRACE_GETFDPIC		33
@@ -138,12 +139,12 @@ struct __sc_riscv_cfi_state { 
#define PTRACE_CFI_SS_LOCK_BIT	4

#define PTRACE_CFI_SS_PTR_BIT	5



#define PTRACE_CFI_LP_EN_STATE		BIT(PTRACE_CFI_LP_EN_BIT)

#define PTRACE_CFI_LP_LOCK_STATE	BIT(PTRACE_CFI_LP_LOCK_BIT)

#define PTRACE_CFI_ELP_STATE		BIT(PTRACE_CFI_ELP_BIT)

#define PTRACE_CFI_SS_EN_STATE		BIT(PTRACE_CFI_SS_EN_BIT)

#define PTRACE_CFI_SS_LOCK_STATE	BIT(PTRACE_CFI_SS_LOCK_BIT)

#define PTRACE_CFI_SS_PTR_STATE		BIT(PTRACE_CFI_SS_PTR_BIT)

#define PTRACE_CFI_LP_EN_STATE		_BITUL(PTRACE_CFI_LP_EN_BIT)

#define PTRACE_CFI_LP_LOCK_STATE	_BITUL(PTRACE_CFI_LP_LOCK_BIT)

#define PTRACE_CFI_ELP_STATE		_BITUL(PTRACE_CFI_ELP_BIT)

#define PTRACE_CFI_SS_EN_STATE		_BITUL(PTRACE_CFI_SS_EN_BIT)

#define PTRACE_CFI_SS_LOCK_STATE	_BITUL(PTRACE_CFI_SS_LOCK_BIT)

#define PTRACE_CFI_SS_PTR_STATE		_BITUL(PTRACE_CFI_SS_PTR_BIT)



#define PRACE_CFI_STATE_INVALID_MASK	~(PTRACE_CFI_LP_EN_STATE | \

					  PTRACE_CFI_LP_LOCK_STATE | \

arch/riscv/kernel/kgdb.c

+4 −3
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ struct dbg_reg_def_t dbg_reg_def[DBG_MAX_REG_NUM] = { 
	{DBG_REG_T1, GDB_SIZEOF_REG, offsetof(struct pt_regs, t1)},

	{DBG_REG_T2, GDB_SIZEOF_REG, offsetof(struct pt_regs, t2)},

	{DBG_REG_FP, GDB_SIZEOF_REG, offsetof(struct pt_regs, s0)},

	{DBG_REG_S1, GDB_SIZEOF_REG, offsetof(struct pt_regs, a1)},

	{DBG_REG_S1, GDB_SIZEOF_REG, offsetof(struct pt_regs, s1)},

	{DBG_REG_A0, GDB_SIZEOF_REG, offsetof(struct pt_regs, a0)},

	{DBG_REG_A1, GDB_SIZEOF_REG, offsetof(struct pt_regs, a1)},

	{DBG_REG_A2, GDB_SIZEOF_REG, offsetof(struct pt_regs, a2)},
@@ -244,8 +244,9 @@ sleeping_thread_to_gdb_regs(unsigned long *gdb_regs, struct task_struct *task) 
	gdb_regs[DBG_REG_S6_OFF] = task->thread.s[6];

	gdb_regs[DBG_REG_S7_OFF] = task->thread.s[7];

	gdb_regs[DBG_REG_S8_OFF] = task->thread.s[8];

	gdb_regs[DBG_REG_S9_OFF] = task->thread.s[10];

	gdb_regs[DBG_REG_S10_OFF] = task->thread.s[11];

	gdb_regs[DBG_REG_S9_OFF] = task->thread.s[9];

	gdb_regs[DBG_REG_S10_OFF] = task->thread.s[10];

	gdb_regs[DBG_REG_S11_OFF] = task->thread.s[11];

	gdb_regs[DBG_REG_EPC_OFF] = task->thread.ra;

}

arch/riscv/kernel/patch.c

+11 −10
Original line number Diff line number Diff line
@@ -42,19 +42,20 @@ static inline bool is_kernel_exittext(uintptr_t addr) 
static __always_inline void *patch_map(void *addr, const unsigned int fixmap)

{

	uintptr_t uintaddr = (uintptr_t) addr;

	struct page *page;

	phys_addr_t phys;



	if (core_kernel_text(uintaddr) || is_kernel_exittext(uintaddr))

		page = phys_to_page(__pa_symbol(addr));

	else if (IS_ENABLED(CONFIG_STRICT_MODULE_RWX))

		page = vmalloc_to_page(addr);

	else

		return addr;

	if (core_kernel_text(uintaddr) || is_kernel_exittext(uintaddr)) {

		phys = __pa_symbol(addr);

	} else if (IS_ENABLED(CONFIG_STRICT_MODULE_RWX)) {

		struct page *page = vmalloc_to_page(addr);



		BUG_ON(!page);

		phys = page_to_phys(page) + offset_in_page(addr);

	} else {

		return addr;

	}



	return (void *)set_fixmap_offset(fixmap, page_to_phys(page) +

					 offset_in_page(addr));

	return (void *)set_fixmap_offset(fixmap, phys);

}



static void patch_unmap(int fixmap)

arch/riscv/kernel/process.c

+3 −1
Original line number Diff line number Diff line
@@ -347,8 +347,10 @@ long set_tagged_addr_ctrl(struct task_struct *task, unsigned long arg) 
	if (arg & PR_TAGGED_ADDR_ENABLE && (tagged_addr_disabled || !pmlen))

		return -EINVAL;



	if (!(arg & PR_TAGGED_ADDR_ENABLE))

	if (!(arg & PR_TAGGED_ADDR_ENABLE)) {

		pmlen = PMLEN_0;

		pmm = ENVCFG_PMM_PMLEN_0;

	}



	if (mmap_write_lock_killable(mm))

		return -EINTR;