Skip to contentSkip to conversation

lib-rbtree-use-instead-of-for-setting-color.patch removed from -mm tree

merged mm-nonmm-stable Andrew Morton 1 participant 1 message Apr 18, 2023

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: lib/rbtree: use '+' instead of '|' for setting color.
has been removed from the -mm tree. Its filename was
lib-rbtree-use-instead-of-for-setting-color.patch

This patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Noah Goldstein <[email protected]>
Subject: lib/rbtree: use '+' instead of '|' for setting color.
Date: Tue, 4 Apr 2023 17:13:51 -0500

This has a slight benefit for x86 and has no effect on other targets.

The benefit to x86 is it change the codegen for setting a node to block from mov %r0, %r1; or $RB_BLACK, %r1 to lea RB_BLACK(%r0), %r1 which saves an instructions.

In all other cases it just replace ALU with ALU (or -> and) which perform the same on all machines I am aware of.

Total instructions in rbtree.o:

    Before  - 802
    After   - 782

so it saves about 20 mov instructions.

---

 include/linux/rbtree_augmented.h |    4 ++--
 lib/rbtree.c                     |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
include/linux/rbtree_augmented.h renamed from include/linux/rbtree_augmented.h~lib-rbtree-use-instead-of-for-setting-color +2 -2
@@ -156,13 +156,13 @@ RB_DECLARE_CALLBACKS(RBSTATIC, RBNAME,
 
 static inline void rb_set_parent(struct rb_node *rb, struct rb_node *p)
 {
-	rb->__rb_parent_color = rb_color(rb) | (unsigned long)p;
+	rb->__rb_parent_color = rb_color(rb) + (unsigned long)p;
 }
 
 static inline void rb_set_parent_color(struct rb_node *rb,
 				       struct rb_node *p, int color)
 {
-	rb->__rb_parent_color = (unsigned long)p | color;
+	rb->__rb_parent_color = (unsigned long)p + color;
 }
 
 static inline void
lib/rbtree.c renamed from lib/rbtree.c~lib-rbtree-use-instead-of-for-setting-color +1 -1
@@ -58,7 +58,7 @@
 
 static inline void rb_set_black(struct rb_node *rb)
 {
-	rb->__rb_parent_color |= RB_BLACK;
+	rb->__rb_parent_color += RB_BLACK;
 }
 
 static inline struct rb_node *rb_red_parent(struct rb_node *red)

_

Patches currently in -mm which might be from [email protected] are