Skip to contentSkip to conversation

mm/slub.c: replace kmem_cache->cpu_partial with wrapped APIs

PATCH Applied [email protected] 4 participants 4 messages Feb 19, 2020 – Feb 27, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 mm/slub.c: replace kmem_cache->cpu_partial with wrapped APIs

From: chenqiwu <[email protected]>

There are slub_cpu_partial() and slub_set_cpu_partial() APIs to wrap kmem_cache->cpu_partial. This patch will use the two APIs to replace kmem_cache->cpu_partial in slub code.

---
changes in v2:
- rewrite the commit title.

---
 mm/slub.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
mm/slub.c +7 -7
index 17dc00e..1eb888c 100644
@@ -2284,7 +2284,7 @@ static void put_cpu_partial(struct kmem_cache *s, struct page *page, int drain)
 		if (oldpage) {
 			pobjects = oldpage->pobjects;
 			pages = oldpage->pages;
-			if (drain && pobjects > s->cpu_partial) {
+			if (drain && pobjects > slub_cpu_partial(s)) {
 				unsigned long flags;
 				/*
 				 * partial array is full. Move the existing
@@ -2309,7 +2309,7 @@ static void put_cpu_partial(struct kmem_cache *s, struct page *page, int drain)
 
 	} while (this_cpu_cmpxchg(s->cpu_slab->partial, oldpage, page)
 								!= oldpage);
-	if (unlikely(!s->cpu_partial)) {
+	if (unlikely(!slub_cpu_partial(s))) {
 		unsigned long flags;
 
 		local_irq_save(flags);
@@ -3493,15 +3493,15 @@ static void set_cpu_partial(struct kmem_cache *s)
 	 *    50% to keep some capacity around for frees.
 	 */
 	if (!kmem_cache_has_cpu_partial(s))
-		s->cpu_partial = 0;
+		slub_set_cpu_partial(s, 0);
 	else if (s->size >= PAGE_SIZE)
-		s->cpu_partial = 2;
+		slub_set_cpu_partial(s, 2);
 	else if (s->size >= 1024)
-		s->cpu_partial = 6;
+		slub_set_cpu_partial(s, 6);
 	else if (s->size >= 256)
-		s->cpu_partial = 13;
+		slub_set_cpu_partial(s, 13);
 	else
-		s->cpu_partial = 30;
+		slub_set_cpu_partial(s, 30);
 #endif
 }
 
Signature · 1 line
1.9.1
#1 lore raw

mm/slub.c static void put_cpu_partial(struct kmem_cache *s, struct page *page, int drain) · line 2290

Quoted 13 lines · On Wed, 19 Feb 2020, [email protected] wrote:
mm/slub.c +1 -1
index 17dc00e..1eb888c 100644
@@ -2284,7 +2284,7 @@ static void put_cpu_partial(struct kmem_cache *s, struct page *page, int drain)
 		if (oldpage) {
 			pobjects = oldpage->pobjects;
 			pages = oldpage->pages;
-			if (drain && pobjects > s->cpu_partial) {
+			if (drain && pobjects > slub_cpu_partial(s)) {
 				unsigned long flags;
 				/*
 				 * partial array is full. Move the existing

Maybe its better to not generate code for put_cpu_partial() instead of using macros there if per cpu partials are disabled?

#2 lore raw
Quoted 18 lines · Christopher Lameter

mm/slub.c static void put_cpu_partial(struct kmem_cache *s, struct page *page, int drain) · line 2290

Quoted 13 lines · On Wed, 19 Feb 2020, [email protected] wrote:
mm/slub.c +1 -1
index 17dc00e..1eb888c 100644
@@ -2284,7 +2284,7 @@ static void put_cpu_partial(struct kmem_cache *s, struct page *page, int drain)
 		if (oldpage) {
 			pobjects = oldpage->pobjects;
 			pages = oldpage->pages;
-			if (drain && pobjects > s->cpu_partial) {
+			if (drain && pobjects > slub_cpu_partial(s)) {
 				unsigned long flags;
 				/*
 				 * partial array is full. Move the existing

Maybe its better to not generate code for put_cpu_partial() instead of using macros there if per cpu partials are disabled?

The whole code of put_cpu_partial() is already under #ifdef CONFIG_SLUB_CPU_PARTIAL.

I agree that the wrapper shouldn't be used in a function that deals only with the case that the partials do exist. It just obscures the code unnecessarily.

maintainer
#3 lore raw
Quoted 20 lines · On Wed, 26 Feb 2020 19:13:31 +0100 Vlastimil Babka <[email protected]> wrote:
Quoted 18 lines · Christopher Lameter

mm/slub.c static void put_cpu_partial(struct kmem_cache *s, struct page *page, int drain) · line 2290

Quoted 13 lines · On Wed, 19 Feb 2020, [email protected] wrote:
mm/slub.c +1 -1
index 17dc00e..1eb888c 100644
@@ -2284,7 +2284,7 @@ static void put_cpu_partial(struct kmem_cache *s, struct page *page, int drain)
 		if (oldpage) {
 			pobjects = oldpage->pobjects;
 			pages = oldpage->pages;
-			if (drain && pobjects > s->cpu_partial) {
+			if (drain && pobjects > slub_cpu_partial(s)) {
 				unsigned long flags;
 				/*
 				 * partial array is full. Move the existing

Maybe its better to not generate code for put_cpu_partial() instead of using macros there if per cpu partials are disabled?

Quoted 5 lines

The whole code of put_cpu_partial() is already under #ifdef CONFIG_SLUB_CPU_PARTIAL.

I agree that the wrapper shouldn't be used in a function that deals only with the case that the partials do exist. It just obscures the code unnecessarily.

Yes, I scratched my head over this and decided to go ahead with the patches. Given that we have an accessor for ->cpu_partial, it's best that it be used consistently. The fact that the wrapper is there to avoid ifdefs is an implementation detail which is private to the header files and Kconfig system.

IOW, the way we open-code it in some places and use the accessor in other places also obscures the code. Which is preferable? I don't see a clear answer, but lean towards consistency.