All of lore.kernel.org
 help / color / mirror / Atom feed
From: Johannes Weiner <hannes@cmpxchg.org>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>,
	Michal Hocko <mhocko@suse.cz>, Hugh Dickins <hughd@google.com>,
	David Rientjes <rientjes@google.com>,
	Wanpeng Li <liwp.linux@gmail.com>,
	linux-mm@kvack.org, cgroups@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: [patch 02/10] mm: swapfile: clean up unuse_pte race handling
Date: Wed, 11 Jul 2012 19:02:14 +0200	[thread overview]
Message-ID: <1342026142-7284-3-git-send-email-hannes@cmpxchg.org> (raw)
In-Reply-To: <1342026142-7284-1-git-send-email-hannes@cmpxchg.org>

The conditional mem_cgroup_cancel_charge_swapin() is a leftover from
when the function would continue to reestablish the page even after
mem_cgroup_try_charge_swapin() failed.  After 85d9fc8 "memcg: fix
refcnt handling at swapoff", the condition is always true when this
code is reached.

Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Acked-by: Michal Hocko <mhocko@suse.cz>
---
 mm/swapfile.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/mm/swapfile.c b/mm/swapfile.c
index 64408be..75881ca 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -845,8 +845,7 @@ static int unuse_pte(struct vm_area_struct *vma, pmd_t *pmd,
 
 	pte = pte_offset_map_lock(vma->vm_mm, pmd, addr, &ptl);
 	if (unlikely(!pte_same(*pte, swp_entry_to_pte(entry)))) {
-		if (ret > 0)
-			mem_cgroup_cancel_charge_swapin(memcg);
+		mem_cgroup_cancel_charge_swapin(memcg);
 		ret = 0;
 		goto out;
 	}
-- 
1.7.7.6


WARNING: multiple messages have this Message-ID (diff)
From: Johannes Weiner <hannes@cmpxchg.org>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>,
	Michal Hocko <mhocko@suse.cz>, Hugh Dickins <hughd@google.com>,
	David Rientjes <rientjes@google.com>,
	Wanpeng Li <liwp.linux@gmail.com>,
	linux-mm@kvack.org, cgroups@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: [patch 02/10] mm: swapfile: clean up unuse_pte race handling
Date: Wed, 11 Jul 2012 19:02:14 +0200	[thread overview]
Message-ID: <1342026142-7284-3-git-send-email-hannes@cmpxchg.org> (raw)
In-Reply-To: <1342026142-7284-1-git-send-email-hannes@cmpxchg.org>

The conditional mem_cgroup_cancel_charge_swapin() is a leftover from
when the function would continue to reestablish the page even after
mem_cgroup_try_charge_swapin() failed.  After 85d9fc8 "memcg: fix
refcnt handling at swapoff", the condition is always true when this
code is reached.

Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Acked-by: Michal Hocko <mhocko@suse.cz>
---
 mm/swapfile.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/mm/swapfile.c b/mm/swapfile.c
index 64408be..75881ca 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -845,8 +845,7 @@ static int unuse_pte(struct vm_area_struct *vma, pmd_t *pmd,
 
 	pte = pte_offset_map_lock(vma->vm_mm, pmd, addr, &ptl);
 	if (unlikely(!pte_same(*pte, swp_entry_to_pte(entry)))) {
-		if (ret > 0)
-			mem_cgroup_cancel_charge_swapin(memcg);
+		mem_cgroup_cancel_charge_swapin(memcg);
 		ret = 0;
 		goto out;
 	}
-- 
1.7.7.6

--
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: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

  parent reply	other threads:[~2012-07-11 17:03 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-07-11 17:02 [patch 00/10] mm: memcg: charge/uncharge improvements v2 Johannes Weiner
2012-07-11 17:02 ` Johannes Weiner
2012-07-11 17:02 ` Johannes Weiner
2012-07-11 17:02 ` [patch 01/10] mm: memcg: fix compaction/migration failing due to memcg limits Johannes Weiner
2012-07-11 17:02   ` Johannes Weiner
2012-07-12  8:54   ` Wanpeng Li
2012-07-12  8:54     ` Wanpeng Li
2012-07-12  9:10     ` Wanpeng Li
2012-07-12  9:10       ` Wanpeng Li
2012-07-12  9:42       ` Johannes Weiner
2012-07-12  9:42         ` Johannes Weiner
2012-07-12  9:12     ` Johannes Weiner
2012-07-12  9:12       ` Johannes Weiner
2012-07-11 17:02 ` Johannes Weiner [this message]
2012-07-11 17:02   ` [patch 02/10] mm: swapfile: clean up unuse_pte race handling Johannes Weiner
2012-07-11 17:02 ` [patch 03/10] mm: memcg: push down PageSwapCache check into uncharge entry functions Johannes Weiner
2012-07-11 17:02   ` Johannes Weiner
2012-07-19  9:57   ` Kamezawa Hiroyuki
2012-07-19  9:57     ` Kamezawa Hiroyuki
2012-07-19  9:57     ` Kamezawa Hiroyuki
2012-07-11 17:02 ` [patch 04/10] mm: memcg: only check for PageSwapCache when uncharging anon Johannes Weiner
2012-07-11 17:02   ` Johannes Weiner
2012-07-11 17:02 ` [patch 05/10] mm: memcg: move swapin charge functions above callsites Johannes Weiner
2012-07-11 17:02   ` Johannes Weiner
2012-07-11 17:02 ` [patch 06/10] mm: memcg: remove unneeded shmem charge type Johannes Weiner
2012-07-11 17:02   ` Johannes Weiner
2012-07-11 17:02 ` [patch 07/10] mm: memcg: remove needless !mm fixup to init_mm when charging Johannes Weiner
2012-07-11 17:02   ` Johannes Weiner
2012-07-11 17:02 ` [patch 08/10] mm: memcg: split swapin charge function into private and public part Johannes Weiner
2012-07-11 17:02   ` Johannes Weiner
2012-07-11 17:02 ` [patch 09/10] mm: memcg: only check swap cache pages for repeated charging Johannes Weiner
2012-07-11 17:02   ` Johannes Weiner
2012-07-11 17:02 ` [patch 10/10] mm: memcg: only check anon swapin page charges for swap cache Johannes Weiner
2012-07-11 17:02   ` Johannes Weiner

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=1342026142-7284-3-git-send-email-hannes@cmpxchg.org \
    --to=hannes@cmpxchg.org \
    --cc=akpm@linux-foundation.org \
    --cc=cgroups@vger.kernel.org \
    --cc=hughd@google.com \
    --cc=kamezawa.hiroyu@jp.fujitsu.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=liwp.linux@gmail.com \
    --cc=mhocko@suse.cz \
    --cc=rientjes@google.com \
    /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.