From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755514AbbICMiA (ORCPT ); Thu, 3 Sep 2015 08:38:00 -0400 Received: from mga09.intel.com ([134.134.136.24]:43163 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753986AbbICMgJ (ORCPT ); Thu, 3 Sep 2015 08:36:09 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,461,1437462000"; d="scan'208";a="797010565" From: "Kirill A. Shutemov" To: Andrew Morton , Hugh Dickins Cc: Andrea Arcangeli , Dave Hansen , Vlastimil Babka , Johannes Weiner , Michal Hocko , David Rientjes , "Aneesh Kumar K.V" , linux-kernel@vger.kernel.org, linux-mm@kvack.org, "Kirill A. Shutemov" , Joonsoo Kim , Andi Kleen Subject: [PATCHv5 1/7] mm: drop page->slab_page Date: Thu, 3 Sep 2015 15:35:52 +0300 Message-Id: <1441283758-92774-2-git-send-email-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1441283758-92774-1-git-send-email-kirill.shutemov@linux.intel.com> References: <1441283758-92774-1-git-send-email-kirill.shutemov@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since 8456a648cf44 ("slab: use struct page for slab management") nobody uses slab_page field in struct page. Let's drop it. Signed-off-by: Kirill A. Shutemov Acked-by: Christoph Lameter Acked-by: David Rientjes Acked-by: Vlastimil Babka Cc: Joonsoo Kim Cc: Andi Kleen --- include/linux/mm_types.h | 1 - mm/slab.c | 17 +++-------------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index 0038ac7466fd..58620ac7f15c 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -140,7 +140,6 @@ struct page { #endif }; - struct slab *slab_page; /* slab fields */ struct rcu_head rcu_head; /* Used by SLAB * when destroying via RCU */ diff --git a/mm/slab.c b/mm/slab.c index 200e22412a16..649044f26e5d 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -1888,21 +1888,10 @@ static void slab_destroy(struct kmem_cache *cachep, struct page *page) freelist = page->freelist; slab_destroy_debugcheck(cachep, page); - if (unlikely(cachep->flags & SLAB_DESTROY_BY_RCU)) { - struct rcu_head *head; - - /* - * RCU free overloads the RCU head over the LRU. - * slab_page has been overloeaded over the LRU, - * however it is not used from now on so that - * we can use it safely. - */ - head = (void *)&page->rcu_head; - call_rcu(head, kmem_rcu_free); - - } else { + if (unlikely(cachep->flags & SLAB_DESTROY_BY_RCU)) + call_rcu(&page->rcu_head, kmem_rcu_free); + else kmem_freepages(cachep, page); - } /* * From now on, we don't use freelist -- 2.5.0 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ig0-f182.google.com (mail-ig0-f182.google.com [209.85.213.182]) by kanga.kvack.org (Postfix) with ESMTP id 47D6D6B0258 for ; Thu, 3 Sep 2015 08:36:15 -0400 (EDT) Received: by igbkq10 with SMTP id kq10so13090594igb.0 for ; Thu, 03 Sep 2015 05:36:15 -0700 (PDT) Received: from mga01.intel.com (mga01.intel.com. [192.55.52.88]) by mx.google.com with ESMTP id a5si41277833pdj.194.2015.09.03.05.36.09 for ; Thu, 03 Sep 2015 05:36:09 -0700 (PDT) From: "Kirill A. Shutemov" Subject: [PATCHv5 1/7] mm: drop page->slab_page Date: Thu, 3 Sep 2015 15:35:52 +0300 Message-Id: <1441283758-92774-2-git-send-email-kirill.shutemov@linux.intel.com> In-Reply-To: <1441283758-92774-1-git-send-email-kirill.shutemov@linux.intel.com> References: <1441283758-92774-1-git-send-email-kirill.shutemov@linux.intel.com> Sender: owner-linux-mm@kvack.org List-ID: To: Andrew Morton , Hugh Dickins Cc: Andrea Arcangeli , Dave Hansen , Vlastimil Babka , Johannes Weiner , Michal Hocko , David Rientjes , "Aneesh Kumar K.V" , linux-kernel@vger.kernel.org, linux-mm@kvack.org, "Kirill A. Shutemov" , Joonsoo Kim , Andi Kleen Since 8456a648cf44 ("slab: use struct page for slab management") nobody uses slab_page field in struct page. Let's drop it. Signed-off-by: Kirill A. Shutemov Acked-by: Christoph Lameter Acked-by: David Rientjes Acked-by: Vlastimil Babka Cc: Joonsoo Kim Cc: Andi Kleen --- include/linux/mm_types.h | 1 - mm/slab.c | 17 +++-------------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index 0038ac7466fd..58620ac7f15c 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -140,7 +140,6 @@ struct page { #endif }; - struct slab *slab_page; /* slab fields */ struct rcu_head rcu_head; /* Used by SLAB * when destroying via RCU */ diff --git a/mm/slab.c b/mm/slab.c index 200e22412a16..649044f26e5d 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -1888,21 +1888,10 @@ static void slab_destroy(struct kmem_cache *cachep, struct page *page) freelist = page->freelist; slab_destroy_debugcheck(cachep, page); - if (unlikely(cachep->flags & SLAB_DESTROY_BY_RCU)) { - struct rcu_head *head; - - /* - * RCU free overloads the RCU head over the LRU. - * slab_page has been overloeaded over the LRU, - * however it is not used from now on so that - * we can use it safely. - */ - head = (void *)&page->rcu_head; - call_rcu(head, kmem_rcu_free); - - } else { + if (unlikely(cachep->flags & SLAB_DESTROY_BY_RCU)) + call_rcu(&page->rcu_head, kmem_rcu_free); + else kmem_freepages(cachep, page); - } /* * From now on, we don't use freelist -- 2.5.0 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org