riscv: mm: Use hint address in mmap if available

[bjoto]

Pull request for series with
subject: riscv: mm: Use hint address in mmap if available
version: 1
url: https://patchwork.kernel.org/project/linux-riscv/list/?series=821100

[bjoto]

Upstream branch: 6613476
series: https://patchwork.kernel.org/project/linux-riscv/list/?series=821100
version: 1

Pull request is NOT updated. Failed to apply https://patchwork.kernel.org/project/linux-riscv/list/?series=821100
error message:

Cmd('git') failed due to: exit code(128)
  cmdline: git am -s --3way
  stdout: 'Applying: riscv: mm: Use hint address in mmap if available
Applying: selftests: riscv: Generalize mm selftests
Using index info to reconstruct a base tree...
M	tools/testing/selftests/riscv/mm/mmap_test.h
Falling back to patching base and 3-way merge...
Auto-merging tools/testing/selftests/riscv/mm/mmap_test.h
CONFLICT (content): Merge conflict in tools/testing/selftests/riscv/mm/mmap_test.h
Patch failed at 0002 selftests: riscv: Generalize mm selftests
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".'
  stderr: 'error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch'

conflict:

diff --cc tools/testing/selftests/riscv/mm/mmap_test.h
index 2e0db9c5be6c,93face2b3118..000000000000
--- a/tools/testing/selftests/riscv/mm/mmap_test.h
+++ b/tools/testing/selftests/riscv/mm/mmap_test.h
@@@ -8,59 -10,63 +10,82 @@@
  #define TOP_DOWN 0
  #define BOTTOM_UP 1
  
- struct addresses {
- 	int *no_hint;
- 	int *on_37_addr;
- 	int *on_38_addr;
- 	int *on_46_addr;
- 	int *on_47_addr;
- 	int *on_55_addr;
- 	int *on_56_addr;
+ uint64_t random_addresses[] = {
+ 	0x19764f0d73b3a9f0, 0x016049584cecef59, 0x3580bdd3562f4acd,
+ 	0x1164219f20b17da0, 0x07d97fcb40ff2373, 0x76ec528921272ee7,
+ 	0x4dd48c38a3de3f70, 0x2e11415055f6997d, 0x14b43334ac476c02,
+ 	0x375a60795aff19f6, 0x47f3051725b8ee1a, 0x4e697cf240494a9f,
+ 	0x456b59b5c2f9e9d1, 0x101724379d63cb96, 0x7fe9ad31619528c1,
+ 	0x2f417247c495c2ea, 0x329a5a5b82943a5e, 0x06d7a9d6adcd3827,
+ 	0x327b0b9ee37f62d5, 0x17c7b1851dfd9b76, 0x006ebb6456ec2cd9,
+ 	0x00836cd14146a134, 0x00e5c4dcde7126db, 0x004c29feadf75753,
+ 	0x00d8b20149ed930c, 0x00d71574c269387a, 0x0006ebe4a82acb7a,
+ 	0x0016135df51f471b, 0x00758bdb55455160, 0x00d0bdd949b13b32,
+ 	0x00ecea01e7c5f54b, 0x00e37b071b9948b1, 0x0011fdd00ff57ab3,
+ 	0x00e407294b52f5ea, 0x00567748c200ed20, 0x000d073084651046,
+ 	0x00ac896f4365463c, 0x00eb0d49a0b26216, 0x0066a2564a982a31,
+ 	0x002e0d20237784ae, 0x0000554ff8a77a76, 0x00006ce07a54c012,
+ 	0x000009570516d799, 0x00000954ca15b84d, 0x0000684f0d453379,
+ 	0x00002ae5816302b5, 0x0000042403fb54bf, 0x00004bad7392bf30,
+ 	0x00003e73bfa4b5e3, 0x00005442c29978e0, 0x00002803f11286b6,
+ 	0x000073875d745fc6, 0x00007cede9cb8240, 0x000027df84cc6a4f,
+ 	0x00006d7e0e74242a, 0x00004afd0b836e02, 0x000047d0e837cd82,
+ 	0x00003b42405efeda, 0x00001531bafa4c95, 0x00007172cae34ac4,
+ 	0x0000002732f06b2b, 0x00000012cbf8fd0b, 0x0000001fcc6af0e8,
  };
  
++<<<<<<< HEAD
 +// Only works on 64 bit
 +#if __riscv_xlen == 64
 +static inline void do_mmaps(struct addresses *mmap_addresses)
 +{
 +	/*
 +	 * Place all of the hint addresses on the boundaries of mmap
 +	 * sv39, sv48, sv57
 +	 * User addresses end at 1<<38, 1<<47, 1<<56 respectively
 +	 */
 +	void *on_37_bits = (void *)(1UL << 37);
 +	void *on_38_bits = (void *)(1UL << 38);
 +	void *on_46_bits = (void *)(1UL << 46);
 +	void *on_47_bits = (void *)(1UL << 47);
 +	void *on_55_bits = (void *)(1UL << 55);
 +	void *on_56_bits = (void *)(1UL << 56);
++=======
++>>>>>>> selftests: riscv: Generalize mm selftests
  
- 	int prot = PROT_READ | PROT_WRITE;
- 	int flags = MAP_PRIVATE | MAP_ANONYMOUS;
+ #define PROT (PROT_READ | PROT_WRITE)
+ #define FLAGS (MAP_PRIVATE | MAP_ANONYMOUS)
  
- 	mmap_addresses->no_hint =
- 		mmap(NULL, 5 * sizeof(int), prot, flags, 0, 0);
- 	mmap_addresses->on_37_addr =
- 		mmap(on_37_bits, 5 * sizeof(int), prot, flags, 0, 0);
- 	mmap_addresses->on_38_addr =
- 		mmap(on_38_bits, 5 * sizeof(int), prot, flags, 0, 0);
- 	mmap_addresses->on_46_addr =
- 		mmap(on_46_bits, 5 * sizeof(int), prot, flags, 0, 0);
- 	mmap_addresses->on_47_addr =
- 		mmap(on_47_bits, 5 * sizeof(int), prot, flags, 0, 0);
- 	mmap_addresses->on_55_addr =
- 		mmap(on_55_bits, 5 * sizeof(int), prot, flags, 0, 0);
- 	mmap_addresses->on_56_addr =
- 		mmap(on_56_bits, 5 * sizeof(int), prot, flags, 0, 0);
+ /* mmap must return a value that doesn't use more bits than the hint address. */
+ static inline unsigned long get_max_value(unsigned long input)
+ {
+ 	unsigned long max_bit = (1UL << (ffsl(input) - 1));
+ 
+ 	return max_bit + (max_bit - 1);
  }
 +#endif /* __riscv_xlen == 64 */
  
+ #define TEST_MMAPS                                                            \
+ 	({                                                                    \
+ 		void *mmap_addr;                                              \
+ 		for (int i = 0; i < ARRAY_SIZE(random_addresses); i++) {      \
+ 			mmap_addr = mmap((void *)random_addresses[i],         \
+ 					 5 * sizeof(int), PROT, FLAGS, 0, 0); \
+ 			EXPECT_NE(MAP_FAILED, mmap_addr);                     \
+ 			EXPECT_GE((void *)get_max_value(random_addresses[i]), \
+ 				  mmap_addr);                                 \
+ 			mmap_addr = mmap((void *)random_addresses[i],         \
+ 					 5 * sizeof(int), PROT, FLAGS, 0, 0); \
+ 			EXPECT_NE(MAP_FAILED, mmap_addr);                     \
+ 			EXPECT_GE((void *)get_max_value(random_addresses[i]), \
+ 				  mmap_addr);                                 \
+ 		}                                                             \
+ 	})
+ 
  static inline int memory_layout(void)
  {
- 	int prot = PROT_READ | PROT_WRITE;
- 	int flags = MAP_PRIVATE | MAP_ANONYMOUS;
- 
- 	void *value1 = mmap(NULL, sizeof(int), prot, flags, 0, 0);
- 	void *value2 = mmap(NULL, sizeof(int), prot, flags, 0, 0);
+ 	void *value1 = mmap(NULL, sizeof(int), PROT, FLAGS, 0, 0);
+ 	void *value2 = mmap(NULL, sizeof(int), PROT, FLAGS, 0, 0);
  
  	return value2 > value1;
  }