Commit 7fdfbe08 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull RISC-V fixes from Palmer Dabbelt:

 - a workaround for a compiler surprise related to the "r" inline
   assembly that allows LLVM to boot.

 - a fix to avoid WX-only mappings, which the ISA does not allow. While
   this probably manifests in many ways, the bug was found in stress-ng.

 - a missing lock in set_direct_map_*(), which due to a recent lockdep
   change started asserting.

* tag 'riscv-for-linus-5.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
  RISC-V: Acquire mmap lock before invoking walk_page_range
  RISC-V: Don't allow write+exec only page mapping request in mmap
  riscv/atomic: Fix sign extension for RV64I
parents 27c27605 0e2c0901

arch/riscv/include/asm/cmpxchg.h

+4 −4
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ 
			"	bnez %1, 0b\n"				\

			"1:\n"						\

			: "=&r" (__ret), "=&r" (__rc), "+A" (*__ptr)	\

			: "rJ" (__old), "rJ" (__new)			\

			: "rJ" ((long)__old), "rJ" (__new)		\

			: "memory");					\

		break;							\

	case 8:								\
@@ -224,7 +224,7 @@ 
			RISCV_ACQUIRE_BARRIER				\

			"1:\n"						\

			: "=&r" (__ret), "=&r" (__rc), "+A" (*__ptr)	\

			: "rJ" (__old), "rJ" (__new)			\

			: "rJ" ((long)__old), "rJ" (__new)		\

			: "memory");					\

		break;							\

	case 8:								\
@@ -270,7 +270,7 @@ 
			"	bnez %1, 0b\n"				\

			"1:\n"						\

			: "=&r" (__ret), "=&r" (__rc), "+A" (*__ptr)	\

			: "rJ" (__old), "rJ" (__new)			\

			: "rJ" ((long)__old), "rJ" (__new)		\

			: "memory");					\

		break;							\

	case 8:								\
@@ -316,7 +316,7 @@ 
			"	fence rw, rw\n"				\

			"1:\n"						\

			: "=&r" (__ret), "=&r" (__rc), "+A" (*__ptr)	\

			: "rJ" (__old), "rJ" (__new)			\

			: "rJ" ((long)__old), "rJ" (__new)		\

			: "memory");					\

		break;							\

	case 8:								\

arch/riscv/kernel/sys_riscv.c

+6 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#include <linux/syscalls.h>

#include <asm/unistd.h>

#include <asm/cacheflush.h>

#include <asm-generic/mman-common.h>



static long riscv_sys_mmap(unsigned long addr, unsigned long len,

			   unsigned long prot, unsigned long flags,
@@ -16,6 +17,11 @@ static long riscv_sys_mmap(unsigned long addr, unsigned long len, 
{

	if (unlikely(offset & (~PAGE_MASK >> page_shift_offset)))

		return -EINVAL;



	if ((prot & PROT_WRITE) && (prot & PROT_EXEC))

		if (unlikely(!(prot & PROT_READ)))

			return -EINVAL;



	return ksys_mmap_pgoff(addr, len, prot, flags, fd,

			       offset >> (PAGE_SHIFT - page_shift_offset));

}

arch/riscv/mm/pageattr.c

+12 −2
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ int set_memory_nx(unsigned long addr, int numpages) 


int set_direct_map_invalid_noflush(struct page *page)

{

	int ret;

	unsigned long start = (unsigned long)page_address(page);

	unsigned long end = start + PAGE_SIZE;

	struct pageattr_masks masks = {
@@ -158,11 +159,16 @@ int set_direct_map_invalid_noflush(struct page *page) 
		.clear_mask = __pgprot(_PAGE_PRESENT)

	};



	return walk_page_range(&init_mm, start, end, &pageattr_ops, &masks);

	mmap_read_lock(&init_mm);

	ret = walk_page_range(&init_mm, start, end, &pageattr_ops, &masks);

	mmap_read_unlock(&init_mm);



	return ret;

}



int set_direct_map_default_noflush(struct page *page)

{

	int ret;

	unsigned long start = (unsigned long)page_address(page);

	unsigned long end = start + PAGE_SIZE;

	struct pageattr_masks masks = {
@@ -170,7 +176,11 @@ int set_direct_map_default_noflush(struct page *page) 
		.clear_mask = __pgprot(0)

	};



	return walk_page_range(&init_mm, start, end, &pageattr_ops, &masks);

	mmap_read_lock(&init_mm);

	ret = walk_page_range(&init_mm, start, end, &pageattr_ops, &masks);

	mmap_read_unlock(&init_mm);



	return ret;

}



void __kernel_map_pages(struct page *page, int numpages, int enable)