* + maple-tree-add-new-data-structure-fix-3.patch added to mm-unstable branch
@ 2022-07-19 19:38 Andrew Morton
0 siblings, 0 replies; 7+ messages in thread
From: Andrew Morton @ 2022-07-19 19:38 UTC (permalink / raw)
To: mm-commits, svens, Liam.Howlett, liam.howlett, akpm
The patch titled
Subject: maple_tree: fix mas_empty_area() wrapping
has been added to the -mm mm-unstable branch. Its filename is
maple-tree-add-new-data-structure-fix-3.patch
This patch will shortly appear at
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/maple-tree-add-new-data-structure-fix-3.patch
This patch will later appear in the mm-unstable branch at
git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next via the mm-everything
branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
and is updated there every 2-3 working days
------------------------------------------------------
From: Liam Howlett <liam.howlett@oracle.com>
Subject: maple_tree: fix mas_empty_area() wrapping
Date: Tue, 19 Jul 2022 17:01:30 +0000
Set the error code correctly when at the left most node and search has
been exhausted. This was an overflow bug.
Link: https://lkml.kernel.org/r/20220719170118.3296447-1-Liam.Howlett@oracle.com
Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
Reported-by: Sven Schnelle <svens@linux.ibm.com>
Tested-by: Sven Schnelle <svens@linux.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
lib/maple_tree.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/lib/maple_tree.c~maple-tree-add-new-data-structure-fix-3
+++ a/lib/maple_tree.c
@@ -4994,7 +4994,7 @@ static inline bool mas_anode_descend(str
}
next_slot:
min = pivot + 1;
- if (mas->last < min) {
+ if (mas->last <= pivot) {
mas_set_err(mas, -EBUSY);
return true;
}
_
Patches currently in -mm which might be from liam.howlett@oracle.com are
android-binder-fix-lockdep-check-on-clearing-vma.patch
maple-tree-add-new-data-structure-fix.patch
maple-tree-add-new-data-structure-fix-2.patch
mm-start-tracking-vmas-with-maple-tree-fix.patch
mm-mmap-use-advanced-maple-tree-api-for-mmap_region-fix.patch
maple-tree-add-new-data-structure-fix-3.patch
mm-mlock-drop-dead-code-in-count_mm_mlocked_page_nr.patch
^ permalink raw reply [flat|nested] 7+ messages in thread
* + maple-tree-add-new-data-structure-fix-3.patch added to mm-unstable branch
@ 2022-08-02 23:55 Andrew Morton
0 siblings, 0 replies; 7+ messages in thread
From: Andrew Morton @ 2022-08-02 23:55 UTC (permalink / raw)
To: mm-commits, Liam.Howlett, liam.howlett, akpm
The patch titled
Subject: maple_tree: fix mas_alloc_nodes()
has been added to the -mm mm-unstable branch. Its filename is
maple-tree-add-new-data-structure-fix-3.patch
This patch will shortly appear at
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/maple-tree-add-new-data-structure-fix-3.patch
This patch will later appear in the mm-unstable branch at
git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next via the mm-everything
branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
and is updated there every 2-3 working days
------------------------------------------------------
From: Liam Howlett <liam.howlett@oracle.com>
Subject: maple_tree: fix mas_alloc_nodes()
Date: Tue, 2 Aug 2022 19:36:24 +0000
Use MAPLE_ALLOC_SLOTS, which differs on 32bit. This was causing an
out of bounds issue on 32bit bulk allocations
Link: https://lkml.kernel.org/r/20220802193612.2886170-1-Liam.Howlett@oracle.com
Fixes: 06b152b7980a (Maple Tree: add new data structure)
Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
lib/maple_tree.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/lib/maple_tree.c~maple-tree-add-new-data-structure-fix-3
+++ a/lib/maple_tree.c
@@ -1242,7 +1242,7 @@ static inline void mas_alloc_nodes(struc
node = mas->alloc;
while (requested) {
- max_req = MAPLE_NODE_SLOTS - 1;
+ max_req = MAPLE_ALLOC_SLOTS;
if (node->slot[0]) {
unsigned int offset = node->node_count + 1;
_
Patches currently in -mm which might be from liam.howlett@oracle.com are
maple-tree-add-new-data-structure-fix-2.patch
maple-tree-add-new-data-structure-fix.patch
maple-tree-add-new-data-structure-fix-3.patch
kernel-fork-use-maple-tree-for-dup_mmap-during-forking-fix.patch
maple_tree-do-not-inline-write-slow-path.patch
^ permalink raw reply [flat|nested] 7+ messages in thread
* + maple-tree-add-new-data-structure-fix-3.patch added to mm-unstable branch
@ 2022-07-06 2:54 Andrew Morton
0 siblings, 0 replies; 7+ messages in thread
From: Andrew Morton @ 2022-07-06 2:54 UTC (permalink / raw)
To: mm-commits, Liam.Howlett, liam.howlett, akpm
The patch titled
Subject: maple_tree: Fix use of node for global range in mas_wr_spanning_store()
has been added to the -mm mm-unstable branch. Its filename is
maple-tree-add-new-data-structure-fix-3.patch
This patch will shortly appear at
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/maple-tree-add-new-data-structure-fix-3.patch
This patch will later appear in the mm-unstable branch at
git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next via the mm-everything
branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
and is updated there every 2-3 working days
------------------------------------------------------
From: Liam Howlett <liam.howlett@oracle.com>
Subject: maple_tree: Fix use of node for global range in mas_wr_spanning_store()
Date: Wed, 6 Jul 2022 02:05:37 +0000
When writing a range with a NULL which expands to 0 - ULONG_MAX, don't use
a node to store this value. Instead, call mas_new_root() which will set
the tree pointer to NULL and free all the nodes.
Fix a comment for the allocations in mas_wr_spanning_store().
Add mas_node_count_gfp() and use it to clean up mas_preallocate().
Clean up mas_preallocate() and ensure the ma_state is safe on return.
Update maple_tree.h to set alloc = NULL.
Link: https://lkml.kernel.org/r/20220706020526.1869453-1-Liam.Howlett@oracle.com
Fixes: d0aac5e48048 (Maple Tree: add new data structure)
Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
include/linux/maple_tree.h | 1 +
lib/maple_tree.c | 34 +++++++++++++++++++++++++++-------
2 files changed, 28 insertions(+), 7 deletions(-)
--- a/include/linux/maple_tree.h~maple-tree-add-new-data-structure-fix-3
+++ a/include/linux/maple_tree.h
@@ -434,6 +434,7 @@ struct ma_wr_state {
.node = MAS_START, \
.min = 0, \
.max = ULONG_MAX, \
+ .alloc = NULL, \
}
#define MA_WR_STATE(name, ma_state, wr_entry) \
--- a/lib/maple_tree.c~maple-tree-add-new-data-structure-fix-3
+++ a/lib/maple_tree.c
@@ -1293,18 +1293,32 @@ static inline void mas_free(struct ma_st
* there is not enough nodes.
* @mas: The maple state
* @count: The number of nodes needed
+ * @gfp: the gfp flags
*/
-static void mas_node_count(struct ma_state *mas, int count)
+static void mas_node_count_gfp(struct ma_state *mas, int count, gfp_t gfp)
{
unsigned long allocated = mas_allocated(mas);
if (allocated < count) {
mas_set_alloc_req(mas, count - allocated);
- mas_alloc_nodes(mas, GFP_NOWAIT | __GFP_NOWARN);
+ mas_alloc_nodes(mas, gfp);
}
}
/*
+ * mas_node_count() - Check if enough nodes are allocated and request more if
+ * there is not enough nodes.
+ * @mas: The maple state
+ * @count: The number of nodes needed
+ *
+ * Note: Uses GFP_NOWAIT | __GFP_NOWARN for gfp flags.
+ */
+static void mas_node_count(struct ma_state *mas, int count)
+{
+ return mas_node_count_gfp(mas, count, GFP_NOWAIT | __GFP_NOWARN);
+}
+
+/*
* mas_start() - Sets up maple state for operations.
* @mas: The maple state.
*
@@ -3962,7 +3976,7 @@ static inline int mas_wr_spanning_store(
if (unlikely(!mas->index && mas->last == ULONG_MAX))
return mas_new_root(mas, wr_mas->entry);
/*
- * Node rebalancing may occur due to this store, so there may be two new
+ * Node rebalancing may occur due to this store, so there may be three new
* entries per level plus a new root.
*/
height = mas_mt_height(mas);
@@ -3995,6 +4009,12 @@ static inline int mas_wr_spanning_store(
mas->last = l_mas.last = r_mas.last;
}
+ /* expanding NULLs may make this cover the entire range */
+ if (!l_mas.index && r_mas.last == ULONG_MAX) {
+ mas_set_range(mas, 0, ULONG_MAX);
+ return mas_new_root(mas, wr_mas->entry);
+ }
+
memset(&b_node, 0, sizeof(struct maple_big_node));
/* Copy l_mas and store the value in b_node. */
mas_store_b_node(&l_wr_mas, &b_node, l_wr_mas.node_end);
@@ -5657,15 +5677,15 @@ int mas_preallocate(struct ma_state *mas
{
int ret;
- mas_set_alloc_req(mas, 1 + mas_mt_height(mas) * 3);
- mas_alloc_nodes(mas, gfp);
+ mas_node_count_gfp(mas, 1 + mas_mt_height(mas) * 3, gfp);
if (likely(!mas_is_err(mas)))
return 0;
mas_set_alloc_req(mas, 0);
- mas_destroy(mas);
ret = xa_err(mas->node);
- mas->node = MAS_START;
+ mas_reset(mas);
+ mas_destroy(mas);
+ mas_reset(mas);
return ret;
}
_
Patches currently in -mm which might be from liam.howlett@oracle.com are
android-binder-fix-lockdep-check-on-clearing-vma.patch
maple-tree-add-new-data-structure-fix.patch
maple-tree-add-new-data-structure-fix-2.patch
maple-tree-add-new-data-structure-fix-3.patch
lib-test_maple_tree-add-testing-for-maple-tree-fix.patch
lib-test_maple_tree-add-testing-for-maple-tree-fix-2.patch
mm-mlock-drop-dead-code-in-count_mm_mlocked_page_nr.patch
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: + maple-tree-add-new-data-structure-fix-3.patch added to mm-unstable branch
2022-05-17 17:39 Andrew Morton
2022-05-18 10:02 ` Naresh Kamboju
@ 2022-05-18 10:23 ` Naresh Kamboju
1 sibling, 0 replies; 7+ messages in thread
From: Naresh Kamboju @ 2022-05-18 10:23 UTC (permalink / raw)
To: Andrew Morton; +Cc: mm-commits, sfr, lkft, Liam.Howlett
Hi Andrew,
Please ignore my previous email.
It was another bug context.
This patch has been applied and tested
LTP sched test cases on x86 and the reported bug fixed.
> From: Liam Howlett <liam.howlett@oracle.com>
> Subject: maple_tree: fix 32b parent pointers
> Date: Tue, 17 May 2022 15:22:20 +0000
>
> 32 bit parent pointers need an extra bit to account for increased slot
> count. Update the constants and documentation to use the remaining high
> bit.
>
> Link: https://lkml.kernel.org/r/20220517152209.3486724-1-Liam.Howlett@oracle.com
> Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
> Reported-by: Linux Kernel Functional Testing <lkft@linaro.org>
> Cc: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Tested-by: Linux Kernel Functional Testing <lkft@linaro.org>
> ---
>
> include/linux/maple_tree.h | 2 +-
> lib/maple_tree.c | 14 +++++++-------
> 2 files changed, 8 insertions(+), 8 deletions(-)
>
> --- a/include/linux/maple_tree.h~maple-tree-add-new-data-structure-fix-3
> +++ a/include/linux/maple_tree.h
> @@ -37,7 +37,7 @@
> #define MAPLE_NODE_SLOTS 63 /* 256 bytes including ->parent */
> #define MAPLE_RANGE64_SLOTS 32 /* 256 bytes */
> #define MAPLE_ARANGE64_SLOTS 21 /* 240 bytes */
> -#define MAPLE_ARANGE64_META_MAX 22 /* Out of range for metadata */
> +#define MAPLE_ARANGE64_META_MAX 31 /* Out of range for metadata */
> #define MAPLE_ALLOC_SLOTS (MAPLE_NODE_SLOTS - 2)
> #endif /* defined(CONFIG_64BIT) || defined(BUILD_VDSO32_64) */
>
> --- a/lib/maple_tree.c~maple-tree-add-new-data-structure-fix-3
> +++ a/lib/maple_tree.c
> @@ -354,7 +354,7 @@ static inline bool mt_is_alloc(struct ma
> /*
> * The Parent Pointer
> * Excluding root, the parent pointer is 256B aligned like all other tree nodes.
> - * When storing a 32 or 64 bit values, the offset can fit into 4 bits. The 16
> + * When storing a 32 or 64 bit values, the offset can fit into 5 bits. The 16
> * bit values need an extra bit to store the offset. This extra bit comes from
> * a reuse of the last bit in the node type. This is possible by using bit 1 to
> * indicate if bit 2 is part of the type or the slot.
> @@ -366,19 +366,19 @@ static inline bool mt_is_alloc(struct ma
> * 0x110 = 64 bit nodes
> *
> * Slot size and alignment
> - * 0x??1 : Root
> - * 0x?00 : 16 bit values, type in 0-1, slot in 2-6
> - * 0x010 : 32 bit values, type in 0-2, slot in 3-6
> - * 0x110 : 64 bit values, type in 0-2, slot in 3-6
> + * 0b??1 : Root
> + * 0b?00 : 16 bit values, type in 0-1, slot in 2-7
> + * 0b010 : 32 bit values, type in 0-2, slot in 3-7
> + * 0b110 : 64 bit values, type in 0-2, slot in 3-7
> */
>
> #define MAPLE_PARENT_ROOT 0x01
>
> #define MAPLE_PARENT_SLOT_SHIFT 0x03
> -#define MAPLE_PARENT_SLOT_MASK 0x78
> +#define MAPLE_PARENT_SLOT_MASK 0xF8
>
> #define MAPLE_PARENT_16B_SLOT_SHIFT 0x02
> -#define MAPLE_PARENT_16B_SLOT_MASK 0x7C
> +#define MAPLE_PARENT_16B_SLOT_MASK 0xFC
>
> #define MAPLE_PARENT_RANGE64 0x06
> #define MAPLE_PARENT_RANGE32 0x04
> _
>
> Patches currently in -mm which might be from liam.howlett@oracle.com are
>
> maple-tree-add-new-data-structure-fix.patch
> maple-tree-add-new-data-structure-fix-2.patch
> maple-tree-add-new-data-structure-fix-3.patch
> lib-test_maple_tree-add-testing-for-maple-tree-fix.patch
> mm-start-tracking-vmas-with-maple-tree-fix-2.patch
> mm-remove-the-vma-linked-list-fix.patch
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: + maple-tree-add-new-data-structure-fix-3.patch added to mm-unstable branch
2022-05-17 17:39 Andrew Morton
@ 2022-05-18 10:02 ` Naresh Kamboju
2022-05-18 10:23 ` Naresh Kamboju
1 sibling, 0 replies; 7+ messages in thread
From: Naresh Kamboju @ 2022-05-18 10:02 UTC (permalink / raw)
To: Andrew Morton, liam.howlett; +Cc: mm-commits, sfr, lkft
Hi Andrew and Liam R. Howlett,
> From: Liam Howlett <liam.howlett@oracle.com>
> Subject: maple_tree: fix 32b parent pointers
> Date: Tue, 17 May 2022 15:22:20 +0000
>
> 32 bit parent pointers need an extra bit to account for increased slot
> count. Update the constants and documentation to use the remaining high
> bit.
>
> Link: https://lkml.kernel.org/r/20220517152209.3486724-1-Liam.Howlett@oracle.com
> Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
> Reported-by: Linux Kernel Functional Testing <lkft@linaro.org>
> Cc: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
My two cents,
I have tested this patch on top of Linux next-20220517
Still I see the following bug.
# [RUN] Test an alternate signal stack of sufficient size.
# Raise SIGALRM. It is[ 57.525042] BUG: kernel NULL pointer
dereference, address: 0000000000000000
[ 57.532197] #PF: supervisor read access in kernel mode
[ 57.537334] #PF: error_code(0x0000) - not-present page
[ 57.542464] PGD 800000010f5a4067 P4D 800000010f5a4067 PUD 10b67e067 PMD 0
[ 57.549338] Oops: 0000 [#1] PREEMPT SMP PTI
[ 57.553523] CPU: 2 PID: 819 Comm: sysret_rip_64 Not tainted
5.18.0-rc7-next-20220517 #1
[ 57.561515] Hardware name: Supermicro SYS-5019S-ML/X11SSH-F, BIOS
2.5 11/26/2020
[ 57.568917] RIP: 0010:copy_vma+0x61/0x220
[ 57.572952] Code: 48 89 45 d0 31 c0 49 8b 07 49 83 7f 60 00 48 89
45 b8 0f 84 47 01 00 00 48 8d 55 c8 4c 89 ee 4c 89 f7 4c 01 eb e8 7f
e8 ff ff <48> 39 18 72 7e 4d 8b 47 20 4d 8b 4f 58 6a 00 48 89 d9 41 ff
b7 90
[ 57.591691] RSP: 0018:ffffa70381353cb0 EFLAGS: 00010296
[ 57.596917] RAX: 0000000000000000 RBX: 00007fffffffe000 RCX: 0000000000000001
[ 57.604042] RDX: ffffffffffffffff RSI: ffff8a8d4aeaeb00 RDI: ffffa70381353c48
[ 57.611172] RBP: ffffa70381353d00 R08: 000000000000000b R09: 000000000000000b
[ 57.618297] R10: ffff8a8d4b4651f8 R11: 0000000000000058 R12: ffffa70381353d58
[ 57.625420] R13: 00007fffffffd000 R14: ffff8a8d4b2748c0 R15: ffff8a8d4b4651f8
[ 57.632545] FS: 00007feba4c8fb80(0000) GS:ffff8a90a7b00000(0000)
knlGS:0000000000000000
[ 57.640624] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[ 57.646368] CR2: 0000000000000000 CR3: 000000010f444003 CR4: 00000000003706e0
[ 57.653491] Call Trace:
[ 57.655936] <TASK>
[ 57.658035] move_vma+0x131/0x4a0
[ 57.661381] __do_sys_mremap+0x35c/0x890
[ 57.665333] ? syscall_trace_enter.constprop.0+0x176/0x230
[ 57.670855] __x64_sys_mremap+0x25/0x30
[ 57.674701] do_syscall_64+0x5c/0x80
[ 57.678279] ? lockdep_hardirqs_on+0x7e/0x100
[ 57.682639] ? syscall_exit_to_user_mode+0x3a/0x50
[ 57.687432] ? do_syscall_64+0x69/0x80
[ 57.691185] entry_SYSCALL_64_after_hwframe+0x46/0xb0
[ 57.696235] RIP: 0033:0x7feba4189bda
[ 57.699807] Code: 73 01 c3 48 8b 0d be a2 2b 00 f7 d8 64 89 01 48
83 c8 ff c3 66 2e 0f 1f 84 00 00 00 00 00 66 90 49 89 ca b8 19 00 00
00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 8e a2 2b 00 f7 d8 64 89
01 48
[ 57.718545] RSP: 002b:00007ffd41372198 EFLAGS: 00000202 ORIG_RAX:
0000000000000019
[ 57.726111] RAX: ffffffffffffffda RBX: 00007fffffffd000 RCX: 00007feba4189bda
[ 57.733233] RDX: 0000000000001000 RSI: 0000000000001000 RDI: 0000000000402000
[ 57.740359] RBP: 0000000000000001 R08: 00007fffffffd000 R09: 00007ffd4137206c
[ 57.747482] R10: 0000000000000003 R11: 0000000000000202 R12: 0000000000000001
[ 57.754606] R13: 00007ffd41372350 R14: 0000000000000000 R15: 0000000000000000
[ 57.761731] </TASK>
[ 57.763914] Modules linked in: x86_pkg_temp_thermal fuse
[ 57.769226] CR2: 0000000000000000
expected to be [ 57.772536] ---[ end trace 0000000000000000 ]---
Full test log link,
https://lkft.validation.linaro.org/scheduler/job/5057712
>
> include/linux/maple_tree.h | 2 +-
> lib/maple_tree.c | 14 +++++++-------
> 2 files changed, 8 insertions(+), 8 deletions(-)
>
> --- a/include/linux/maple_tree.h~maple-tree-add-new-data-structure-fix-3
> +++ a/include/linux/maple_tree.h
> @@ -37,7 +37,7 @@
> #define MAPLE_NODE_SLOTS 63 /* 256 bytes including ->parent */
> #define MAPLE_RANGE64_SLOTS 32 /* 256 bytes */
> #define MAPLE_ARANGE64_SLOTS 21 /* 240 bytes */
> -#define MAPLE_ARANGE64_META_MAX 22 /* Out of range for metadata */
> +#define MAPLE_ARANGE64_META_MAX 31 /* Out of range for metadata */
> #define MAPLE_ALLOC_SLOTS (MAPLE_NODE_SLOTS - 2)
> #endif /* defined(CONFIG_64BIT) || defined(BUILD_VDSO32_64) */
>
> --- a/lib/maple_tree.c~maple-tree-add-new-data-structure-fix-3
> +++ a/lib/maple_tree.c
> @@ -354,7 +354,7 @@ static inline bool mt_is_alloc(struct ma
> /*
> * The Parent Pointer
> * Excluding root, the parent pointer is 256B aligned like all other tree nodes.
> - * When storing a 32 or 64 bit values, the offset can fit into 4 bits. The 16
> + * When storing a 32 or 64 bit values, the offset can fit into 5 bits. The 16
> * bit values need an extra bit to store the offset. This extra bit comes from
> * a reuse of the last bit in the node type. This is possible by using bit 1 to
> * indicate if bit 2 is part of the type or the slot.
> @@ -366,19 +366,19 @@ static inline bool mt_is_alloc(struct ma
> * 0x110 = 64 bit nodes
> *
> * Slot size and alignment
> - * 0x??1 : Root
> - * 0x?00 : 16 bit values, type in 0-1, slot in 2-6
> - * 0x010 : 32 bit values, type in 0-2, slot in 3-6
> - * 0x110 : 64 bit values, type in 0-2, slot in 3-6
> + * 0b??1 : Root
> + * 0b?00 : 16 bit values, type in 0-1, slot in 2-7
> + * 0b010 : 32 bit values, type in 0-2, slot in 3-7
> + * 0b110 : 64 bit values, type in 0-2, slot in 3-7
> */
>
> #define MAPLE_PARENT_ROOT 0x01
>
> #define MAPLE_PARENT_SLOT_SHIFT 0x03
> -#define MAPLE_PARENT_SLOT_MASK 0x78
> +#define MAPLE_PARENT_SLOT_MASK 0xF8
>
> #define MAPLE_PARENT_16B_SLOT_SHIFT 0x02
> -#define MAPLE_PARENT_16B_SLOT_MASK 0x7C
> +#define MAPLE_PARENT_16B_SLOT_MASK 0xFC
>
> #define MAPLE_PARENT_RANGE64 0x06
> #define MAPLE_PARENT_RANGE32 0x04
> _
>
> Patches currently in -mm which might be from liam.howlett@oracle.com are
>
> maple-tree-add-new-data-structure-fix.patch
> maple-tree-add-new-data-structure-fix-2.patch
> maple-tree-add-new-data-structure-fix-3.patch
> lib-test_maple_tree-add-testing-for-maple-tree-fix.patch
> mm-start-tracking-vmas-with-maple-tree-fix-2.patch
> mm-remove-the-vma-linked-list-fix.patch
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* + maple-tree-add-new-data-structure-fix-3.patch added to mm-unstable branch
@ 2022-05-17 17:39 Andrew Morton
2022-05-18 10:02 ` Naresh Kamboju
2022-05-18 10:23 ` Naresh Kamboju
0 siblings, 2 replies; 7+ messages in thread
From: Andrew Morton @ 2022-05-17 17:39 UTC (permalink / raw)
To: mm-commits, sfr, lkft, Liam.Howlett, liam.howlett, akpm
The patch titled
Subject: maple_tree: fix 32b parent pointers
has been added to the -mm mm-unstable branch. Its filename is
maple-tree-add-new-data-structure-fix-3.patch
This patch will shortly appear at
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/maple-tree-add-new-data-structure-fix-3.patch
This patch will later appear in the mm-unstable branch at
git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next via the mm-everything
branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
and is updated there every 2-3 working days
------------------------------------------------------
From: Liam Howlett <liam.howlett@oracle.com>
Subject: maple_tree: fix 32b parent pointers
Date: Tue, 17 May 2022 15:22:20 +0000
32 bit parent pointers need an extra bit to account for increased slot
count. Update the constants and documentation to use the remaining high
bit.
Link: https://lkml.kernel.org/r/20220517152209.3486724-1-Liam.Howlett@oracle.com
Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
Reported-by: Linux Kernel Functional Testing <lkft@linaro.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
include/linux/maple_tree.h | 2 +-
lib/maple_tree.c | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
--- a/include/linux/maple_tree.h~maple-tree-add-new-data-structure-fix-3
+++ a/include/linux/maple_tree.h
@@ -37,7 +37,7 @@
#define MAPLE_NODE_SLOTS 63 /* 256 bytes including ->parent */
#define MAPLE_RANGE64_SLOTS 32 /* 256 bytes */
#define MAPLE_ARANGE64_SLOTS 21 /* 240 bytes */
-#define MAPLE_ARANGE64_META_MAX 22 /* Out of range for metadata */
+#define MAPLE_ARANGE64_META_MAX 31 /* Out of range for metadata */
#define MAPLE_ALLOC_SLOTS (MAPLE_NODE_SLOTS - 2)
#endif /* defined(CONFIG_64BIT) || defined(BUILD_VDSO32_64) */
--- a/lib/maple_tree.c~maple-tree-add-new-data-structure-fix-3
+++ a/lib/maple_tree.c
@@ -354,7 +354,7 @@ static inline bool mt_is_alloc(struct ma
/*
* The Parent Pointer
* Excluding root, the parent pointer is 256B aligned like all other tree nodes.
- * When storing a 32 or 64 bit values, the offset can fit into 4 bits. The 16
+ * When storing a 32 or 64 bit values, the offset can fit into 5 bits. The 16
* bit values need an extra bit to store the offset. This extra bit comes from
* a reuse of the last bit in the node type. This is possible by using bit 1 to
* indicate if bit 2 is part of the type or the slot.
@@ -366,19 +366,19 @@ static inline bool mt_is_alloc(struct ma
* 0x110 = 64 bit nodes
*
* Slot size and alignment
- * 0x??1 : Root
- * 0x?00 : 16 bit values, type in 0-1, slot in 2-6
- * 0x010 : 32 bit values, type in 0-2, slot in 3-6
- * 0x110 : 64 bit values, type in 0-2, slot in 3-6
+ * 0b??1 : Root
+ * 0b?00 : 16 bit values, type in 0-1, slot in 2-7
+ * 0b010 : 32 bit values, type in 0-2, slot in 3-7
+ * 0b110 : 64 bit values, type in 0-2, slot in 3-7
*/
#define MAPLE_PARENT_ROOT 0x01
#define MAPLE_PARENT_SLOT_SHIFT 0x03
-#define MAPLE_PARENT_SLOT_MASK 0x78
+#define MAPLE_PARENT_SLOT_MASK 0xF8
#define MAPLE_PARENT_16B_SLOT_SHIFT 0x02
-#define MAPLE_PARENT_16B_SLOT_MASK 0x7C
+#define MAPLE_PARENT_16B_SLOT_MASK 0xFC
#define MAPLE_PARENT_RANGE64 0x06
#define MAPLE_PARENT_RANGE32 0x04
_
Patches currently in -mm which might be from liam.howlett@oracle.com are
maple-tree-add-new-data-structure-fix.patch
maple-tree-add-new-data-structure-fix-2.patch
maple-tree-add-new-data-structure-fix-3.patch
lib-test_maple_tree-add-testing-for-maple-tree-fix.patch
mm-start-tracking-vmas-with-maple-tree-fix-2.patch
mm-remove-the-vma-linked-list-fix.patch
^ permalink raw reply [flat|nested] 7+ messages in thread
* + maple-tree-add-new-data-structure-fix-3.patch added to mm-unstable branch
@ 2022-05-17 17:38 Andrew Morton
0 siblings, 0 replies; 7+ messages in thread
From: Andrew Morton @ 2022-05-17 17:38 UTC (permalink / raw)
To: mm-commits, Liam.Howlett, liam.howlett, akpm
The patch titled
Subject: maple_tree: fix 32b parent pointers
has been added to the -mm mm-unstable branch. Its filename is
maple-tree-add-new-data-structure-fix-3.patch
This patch will shortly appear at
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/maple-tree-add-new-data-structure-fix-3.patch
This patch will later appear in the mm-unstable branch at
git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next via the mm-everything
branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
and is updated there every 2-3 working days
------------------------------------------------------
From: Liam Howlett <liam.howlett@oracle.com>
Subject: maple_tree: fix 32b parent pointers
Date: Tue, 17 May 2022 15:22:20 +0000
32 bit parent pointers need an extra bit to account for increased slot
count. Update the constants and documentation to use the remaining high
bit.
Link: https://lkml.kernel.org/r/20220517152209.3486724-1-Liam.Howlett@oracle.com
Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
include/linux/maple_tree.h | 2 +-
lib/maple_tree.c | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
--- a/include/linux/maple_tree.h~maple-tree-add-new-data-structure-fix-3
+++ a/include/linux/maple_tree.h
@@ -37,7 +37,7 @@
#define MAPLE_NODE_SLOTS 63 /* 256 bytes including ->parent */
#define MAPLE_RANGE64_SLOTS 32 /* 256 bytes */
#define MAPLE_ARANGE64_SLOTS 21 /* 240 bytes */
-#define MAPLE_ARANGE64_META_MAX 22 /* Out of range for metadata */
+#define MAPLE_ARANGE64_META_MAX 31 /* Out of range for metadata */
#define MAPLE_ALLOC_SLOTS (MAPLE_NODE_SLOTS - 2)
#endif /* defined(CONFIG_64BIT) || defined(BUILD_VDSO32_64) */
--- a/lib/maple_tree.c~maple-tree-add-new-data-structure-fix-3
+++ a/lib/maple_tree.c
@@ -354,7 +354,7 @@ static inline bool mt_is_alloc(struct ma
/*
* The Parent Pointer
* Excluding root, the parent pointer is 256B aligned like all other tree nodes.
- * When storing a 32 or 64 bit values, the offset can fit into 4 bits. The 16
+ * When storing a 32 or 64 bit values, the offset can fit into 5 bits. The 16
* bit values need an extra bit to store the offset. This extra bit comes from
* a reuse of the last bit in the node type. This is possible by using bit 1 to
* indicate if bit 2 is part of the type or the slot.
@@ -366,19 +366,19 @@ static inline bool mt_is_alloc(struct ma
* 0x110 = 64 bit nodes
*
* Slot size and alignment
- * 0x??1 : Root
- * 0x?00 : 16 bit values, type in 0-1, slot in 2-6
- * 0x010 : 32 bit values, type in 0-2, slot in 3-6
- * 0x110 : 64 bit values, type in 0-2, slot in 3-6
+ * 0b??1 : Root
+ * 0b?00 : 16 bit values, type in 0-1, slot in 2-7
+ * 0b010 : 32 bit values, type in 0-2, slot in 3-7
+ * 0b110 : 64 bit values, type in 0-2, slot in 3-7
*/
#define MAPLE_PARENT_ROOT 0x01
#define MAPLE_PARENT_SLOT_SHIFT 0x03
-#define MAPLE_PARENT_SLOT_MASK 0x78
+#define MAPLE_PARENT_SLOT_MASK 0xF8
#define MAPLE_PARENT_16B_SLOT_SHIFT 0x02
-#define MAPLE_PARENT_16B_SLOT_MASK 0x7C
+#define MAPLE_PARENT_16B_SLOT_MASK 0xFC
#define MAPLE_PARENT_RANGE64 0x06
#define MAPLE_PARENT_RANGE32 0x04
_
Patches currently in -mm which might be from liam.howlett@oracle.com are
maple-tree-add-new-data-structure-fix.patch
maple-tree-add-new-data-structure-fix-2.patch
maple-tree-add-new-data-structure-fix-3.patch
lib-test_maple_tree-add-testing-for-maple-tree-fix.patch
mm-start-tracking-vmas-with-maple-tree-fix-2.patch
mm-remove-the-vma-linked-list-fix.patch
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2022-08-02 23:56 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-19 19:38 + maple-tree-add-new-data-structure-fix-3.patch added to mm-unstable branch Andrew Morton
-- strict thread matches above, loose matches on Subject: below --
2022-08-02 23:55 Andrew Morton
2022-07-06 2:54 Andrew Morton
2022-05-17 17:39 Andrew Morton
2022-05-18 10:02 ` Naresh Kamboju
2022-05-18 10:23 ` Naresh Kamboju
2022-05-17 17:38 Andrew Morton
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.