All of lore.kernel.org
 help / color / mirror / Atom feed
From: Kairui Song <ryncsn@gmail.com>
To: linux-mm@kvack.org
Cc: Andrew Morton <akpm@linux-foundation.org>,
	Chris Li <chrisl@kernel.org>, Hugh Dickins <hughd@google.com>,
	"Huang, Ying" <ying.huang@intel.com>,
	Yosry Ahmed <yosryahmed@google.com>,
	Roman Gushchin <roman.gushchin@linux.dev>,
	Shakeel Butt <shakeel.butt@linux.dev>,
	Johannes Weiner <hannes@cmpxchg.org>,
	Barry Song <baohua@kernel.org>, Michal Hocko <mhocko@kernel.org>,
	linux-kernel@vger.kernel.org, Kairui Song <kasong@tencent.com>
Subject: [PATCH 1/4] mm, memcontrol: avoid duplicated memcg enable check
Date: Tue,  3 Dec 2024 02:41:51 +0800	[thread overview]
Message-ID: <20241202184154.19321-2-ryncsn@gmail.com> (raw)
In-Reply-To: <20241202184154.19321-1-ryncsn@gmail.com>

From: Kairui Song <kasong@tencent.com>

mem_cgroup_uncharge_swap() implies a mem_cgroup_disabled() check,
which is already checked by the caller here. Skip it by calling
__mem_cgroup_uncharge_swap() directly.

Signed-off-by: Kairui Song <kasong@tencent.com>
---
 mm/memcontrol.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 7b3503d12aaf..d3d1eb506eee 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -4615,7 +4615,7 @@ void mem_cgroup_swapin_uncharge_swap(swp_entry_t entry, unsigned int nr_pages)
 		 * let's not wait for it.  The page already received a
 		 * memory+swap charge, drop the swap entry duplicate.
 		 */
-		mem_cgroup_uncharge_swap(entry, nr_pages);
+		__mem_cgroup_uncharge_swap(entry, nr_pages);
 	}
 }
 
-- 
2.47.0



  reply	other threads:[~2024-12-02 18:42 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-12-02 18:41 [PATCH 0/4] mm/swap_cgroup: remove global swap cgroup lock Kairui Song
2024-12-02 18:41 ` Kairui Song [this message]
2024-12-02 19:10   ` [PATCH 1/4] mm, memcontrol: avoid duplicated memcg enable check Yosry Ahmed
2024-12-03  8:25     ` Kairui Song
2024-12-03 18:28       ` Chris Li
2024-12-04 17:05       ` Shakeel Butt
2024-12-02 21:37   ` Shakeel Butt
2024-12-02 22:27   ` Roman Gushchin
2024-12-03  0:24   ` Barry Song
2024-12-03  2:03   ` kernel test robot
2024-12-03  5:42   ` kernel test robot
2024-12-02 18:41 ` [PATCH 2/4] mm/swap_cgroup: remove swap_cgroup_cmpxchg Kairui Song
2024-12-02 19:11   ` Yosry Ahmed
2024-12-02 21:38   ` Shakeel Butt
2024-12-02 22:28   ` Roman Gushchin
2024-12-03 18:29   ` Chris Li
2024-12-02 18:41 ` [PATCH 3/4] mm/swap_cgroup: simplify swap cgroup definitions Kairui Song
2024-12-02 19:25   ` Yosry Ahmed
2024-12-04 21:14     ` Chris Li
2024-12-10  8:15     ` Kairui Song
2024-12-02 22:34   ` Roman Gushchin
2024-12-02 18:41 ` [PATCH 4/4] mm, swap_cgroup: remove global swap cgroup lock Kairui Song
2024-12-02 19:28   ` Yosry Ahmed
2024-12-02 20:35     ` Yosry Ahmed
2024-12-03 18:20       ` Kairui Song
2024-12-03 19:17         ` Yosry Ahmed
2024-12-04 17:58           ` Kairui Song
2024-12-04 18:57             ` Yosry Ahmed
2024-12-02 19:37   ` Yosry Ahmed
2024-12-04 19:34   ` Chris Li
2024-12-10  7:05     ` Kairui Song

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=20241202184154.19321-2-ryncsn@gmail.com \
    --to=ryncsn@gmail.com \
    --cc=akpm@linux-foundation.org \
    --cc=baohua@kernel.org \
    --cc=chrisl@kernel.org \
    --cc=hannes@cmpxchg.org \
    --cc=hughd@google.com \
    --cc=kasong@tencent.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=mhocko@kernel.org \
    --cc=roman.gushchin@linux.dev \
    --cc=shakeel.butt@linux.dev \
    --cc=ying.huang@intel.com \
    --cc=yosryahmed@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.