From: "Huang, Ying" <ying.huang@intel.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org,
Michal Hocko <mhocko@suse.com>,
Johannes Weiner <hannes@cmpxchg.org>,
Shaohua Li <shli@kernel.org>, Hugh Dickins <hughd@google.com>,
Minchan Kim <minchan@kernel.org>, Rik van Riel <riel@redhat.com>,
Daniel Jordan <daniel.m.jordan@oracle.com>,
Dan Williams <dan.j.williams@intel.com>,
Dave Hansen <dave.hansen@linux.intel.com>
Subject: [PATCH v2 4/7] swap: Unify normal/huge code path in swap_page_trans_huge_swapped()
Date: Tue, 17 Jul 2018 08:55:53 +0800 [thread overview]
Message-ID: <20180717005556.29758-5-ying.huang@intel.com> (raw)
In-Reply-To: <20180717005556.29758-1-ying.huang@intel.com>
As suggested by Dave, we should unify the code path for normal and
huge swap support if possible to avoid duplicated code, bugs, etc. and
make it easier to review code.
In this patch, the normal/huge code path in swap_page_trans_huge_swapped()
is unified, the added and removed lines are same. And the binary size
is kept almost same when CONFIG_TRANSPARENT_HUGEPAGE=n.
text data bss dec hex filename
base: 24179 2028 340 26547 67b3 mm/swapfile.o
unified: 24215 2028 340 26583 67d7 mm/swapfile.o
Signed-off-by: "Huang, Ying" <ying.huang@intel.com>
Suggested-by: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Shaohua Li <shli@kernel.org>
Cc: Hugh Dickins <hughd@google.com>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Daniel Jordan <daniel.m.jordan@oracle.com>
Cc: Dan Williams <dan.j.williams@intel.com>
---
mm/swapfile.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/mm/swapfile.c b/mm/swapfile.c
index 92c24402706c..a6d8b8117bc5 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -270,7 +270,10 @@ static inline void cluster_set_null(struct swap_cluster_info *info)
static inline bool cluster_is_huge(struct swap_cluster_info *info)
{
- return info->flags & CLUSTER_FLAG_HUGE;
+ if (IS_ENABLED(CONFIG_THP_SWAP))
+ return info->flags & CLUSTER_FLAG_HUGE;
+ else
+ return false;
}
static inline void cluster_clear_huge(struct swap_cluster_info *info)
@@ -1489,9 +1492,6 @@ static bool swap_page_trans_huge_swapped(struct swap_info_struct *si,
int i;
bool ret = false;
- if (!IS_ENABLED(CONFIG_THP_SWAP))
- return swap_swapcount(si, entry) != 0;
-
ci = lock_cluster_or_swap_info(si, offset);
if (!ci || !cluster_is_huge(ci)) {
if (swap_count(map[roffset]))
--
2.16.4
next prev parent reply other threads:[~2018-07-17 0:55 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-17 0:55 [PATCH v2 0/7] swap: THP optimizing refactoring Huang, Ying
2018-07-17 0:55 ` [PATCH v2 1/7] swap: Add comments to lock_cluster_or_swap_info() Huang, Ying
2018-07-17 18:27 ` Dave Hansen
2018-07-18 3:09 ` Huang, Ying
2018-07-18 3:09 ` Huang, Ying
2018-07-17 0:55 ` [PATCH v2 2/7] mm/swapfile.c: Replace some #ifdef with IS_ENABLED() Huang, Ying
2018-07-17 18:32 ` Dave Hansen
2018-07-18 3:25 ` Huang, Ying
2018-07-18 3:25 ` Huang, Ying
2018-07-18 15:15 ` Dave Hansen
2018-07-19 4:42 ` Huang, Ying
2018-07-19 4:42 ` Huang, Ying
2018-07-17 0:55 ` [PATCH v2 3/7] swap: Use swap_count() in swap_page_trans_huge_swapped() Huang, Ying
2018-07-17 0:55 ` Huang, Ying [this message]
2018-07-17 0:55 ` [PATCH v2 5/7] swap: Unify normal/huge code path in put_swap_page() Huang, Ying
2018-07-17 0:55 ` [PATCH v2 6/7] swap: Add __swap_entry_free_locked() Huang, Ying
2018-07-17 0:55 ` [PATCH v2 7/7] swap, put_swap_page: Share more between huge/normal code path Huang, Ying
2018-07-17 18:36 ` Dave Hansen
2018-07-18 2:56 ` Huang, Ying
2018-07-18 2:56 ` Huang, Ying
2018-07-18 15:13 ` Dave Hansen
2018-07-17 15:17 ` [PATCH v2 0/7] swap: THP optimizing refactoring Daniel Jordan
2018-07-18 2:56 ` Huang, Ying
2018-07-18 2:56 ` Huang, Ying
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180717005556.29758-5-ying.huang@intel.com \
--to=ying.huang@intel.com \
--cc=akpm@linux-foundation.org \
--cc=dan.j.williams@intel.com \
--cc=daniel.m.jordan@oracle.com \
--cc=dave.hansen@linux.intel.com \
--cc=hannes@cmpxchg.org \
--cc=hughd@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mhocko@suse.com \
--cc=minchan@kernel.org \
--cc=riel@redhat.com \
--cc=shli@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.