From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.9 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9B136C33CB1 for ; Fri, 17 Jan 2020 09:31:55 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 4824C20748 for ; Fri, 17 Jan 2020 09:31:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="vs5R2hhw" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4824C20748 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id D69736B033D; Fri, 17 Jan 2020 04:31:54 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D1B536B033E; Fri, 17 Jan 2020 04:31:54 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C30CE6B033F; Fri, 17 Jan 2020 04:31:54 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0149.hostedemail.com [216.40.44.149]) by kanga.kvack.org (Postfix) with ESMTP id A7BEF6B033D for ; Fri, 17 Jan 2020 04:31:54 -0500 (EST) Received: from smtpin07.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with SMTP id 5C875180AD817 for ; Fri, 17 Jan 2020 09:31:54 +0000 (UTC) X-FDA: 76386609348.07.shoe64_4abeb55d7c13a X-HE-Tag: shoe64_4abeb55d7c13a X-Filterd-Recvd-Size: 8653 Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by imf46.hostedemail.com (Postfix) with ESMTP for ; Fri, 17 Jan 2020 09:31:53 +0000 (UTC) Received: by mail-pg1-f195.google.com with SMTP id x8so11385578pgk.8 for ; Fri, 17 Jan 2020 01:31:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:in-reply-to:message-id:references :user-agent:mime-version; bh=QA3liVZQ//A8v0S8gslClqjh5Qy88hxNQ2Z93K52ofg=; b=vs5R2hhwKO56EZKTxJZ5z0B18rX5CF/+KxhBFMGO4SJt8OdMwZ5ykw+ezhdfR4nDfq DxvVcHVIhvEWOmWtzZkS/Hqfl+9Wthba8RgOKCDsjtdaBCySD4N0tMtho22a+3YIXTB6 B1vV29o/GYIBpXxdayIK/bot6FhJFJ1quM3w/sA2sWfktLsoUXDeQX/sFRA4OOLm/TlK /vRbVTiTUnsUUzFjvxrmgXuvqAOjCHonzvjxWAFMiF0Dzf2fmARMOlhTyXXVNAGJQVn+ 5Q/BOy+nvcDlWxXwIpqI8pZBjlGv0BvJgdw+/OAT09SraxZ0Ogn28wnB97xXgVXkgKfa 5VGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:in-reply-to:message-id :references:user-agent:mime-version; bh=QA3liVZQ//A8v0S8gslClqjh5Qy88hxNQ2Z93K52ofg=; b=d4YwcPrOG6Pi/4l4jvSfQgT/KXKzaf13TRMeFCbckTNzpp41vGYeGveZjg6U4F4th/ qvtdIK89dSGCHI+vRUavQovNiN7Xu0v87T8a38D9DJlXHpKEabLHTt0MTQbivGqjYFDp HnR7/T0UB30txVdLi41krls9Uk6rEPUDKi4CqUlh/W6uBiDIVa8hP7GC7NkVM4Wlb8Yp eAxqrs91exxyk43gZ3BoPs+HLYllPBkZIpHDZA7UGL94sOxE0jiKAx8LEE1/ZOWgnrqw piRuo3b/zg0owCDkUNtR2LJ5H/UgThXEBpBB7baLgCrHjtRUd+X7n1pF+cQqv3v00qi6 zPgQ== X-Gm-Message-State: APjAAAVt2NnPT8VgHYxLbWN72g9+z5ZCvRHzEgSGEcmRrMstgAl/5eFU e4aEqzuGTemr/PD/yJcSoiXwPg== X-Google-Smtp-Source: APXvYqwz3HekrbkmdtcEbR1VmpXsc0SwALfwaNRL0wyMGU2wkWobLlXrFQo7CpzHaSoY4qb9QPl5gQ== X-Received: by 2002:a63:1106:: with SMTP id g6mr43863751pgl.13.1579253512065; Fri, 17 Jan 2020 01:31:52 -0800 (PST) Received: from [2620:15c:17:3:3a5:23a7:5e32:4598] ([2620:15c:17:3:3a5:23a7:5e32:4598]) by smtp.gmail.com with ESMTPSA id w187sm29499070pfw.62.2020.01.17.01.31.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jan 2020 01:31:51 -0800 (PST) Date: Fri, 17 Jan 2020 01:31:50 -0800 (PST) From: David Rientjes X-X-Sender: rientjes@chino.kir.corp.google.com To: Michal Hocko cc: Kirill Tkhai , Wei Yang , hannes@cmpxchg.org, vdavydov.dev@gmail.com, akpm@linux-foundation.org, kirill.shutemov@linux.intel.com, yang.shi@linux.alibaba.com, cgroups@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, alexander.duyck@gmail.com, stable@vger.kernel.org Subject: Re: [Patch v3] mm: thp: grab the lock before manipulation defer list In-Reply-To: <20200117091002.GM19428@dhcp22.suse.cz> Message-ID: References: <20200116013100.7679-1-richardw.yang@linux.intel.com> <0bb34c4a-97c7-0b3c-cf43-8af6cf9c4396@virtuozzo.com> <20200117091002.GM19428@dhcp22.suse.cz> User-Agent: Alpine 2.21 (DEB 202 2017-01-01) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Fri, 17 Jan 2020, Michal Hocko wrote: > On Thu 16-01-20 14:01:59, David Rientjes wrote: > > On Thu, 16 Jan 2020, Kirill Tkhai wrote: > > > > > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > > > > index c5b5f74cfd4d..6450bbe394e2 100644 > > > > --- a/mm/memcontrol.c > > > > +++ b/mm/memcontrol.c > > > > @@ -5360,10 +5360,12 @@ static int mem_cgroup_move_account(struct page *page, > > > > } > > > > > > > > #ifdef CONFIG_TRANSPARENT_HUGEPAGE > > > > - if (compound && !list_empty(page_deferred_list(page))) { > > > > + if (compound) { > > > > spin_lock(&from->deferred_split_queue.split_queue_lock); > > > > - list_del_init(page_deferred_list(page)); > > > > - from->deferred_split_queue.split_queue_len--; > > > > + if (!list_empty(page_deferred_list(page))) { > > > > + list_del_init(page_deferred_list(page)); > > > > + from->deferred_split_queue.split_queue_len--; > > > > + } > > > > spin_unlock(&from->deferred_split_queue.split_queue_lock); > > > > } > > > > #endif > > > > @@ -5377,11 +5379,13 @@ static int mem_cgroup_move_account(struct page *page, > > > > page->mem_cgroup = to; > > > > > > > > #ifdef CONFIG_TRANSPARENT_HUGEPAGE > > > > - if (compound && list_empty(page_deferred_list(page))) { > > > > + if (compound) { > > > > spin_lock(&to->deferred_split_queue.split_queue_lock); > > > > - list_add_tail(page_deferred_list(page), > > > > - &to->deferred_split_queue.split_queue); > > > > - to->deferred_split_queue.split_queue_len++; > > > > + if (list_empty(page_deferred_list(page))) { > > > > + list_add_tail(page_deferred_list(page), > > > > + &to->deferred_split_queue.split_queue); > > > > + to->deferred_split_queue.split_queue_len++; > > > > + } > > > > spin_unlock(&to->deferred_split_queue.split_queue_lock); > > > > } > > > > #endif > > > > > > The patch looks OK for me. But there is another question. I forget, why we unconditionally > > > add a page with empty deferred list to deferred_split_queue. Shouldn't we also check that > > > it was initially in the list? Something like: > > > > > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > > > index d4394ae4e5be..0be0136adaa6 100644 > > > --- a/mm/memcontrol.c > > > +++ b/mm/memcontrol.c > > > @@ -5289,6 +5289,7 @@ static int mem_cgroup_move_account(struct page *page, > > > struct pglist_data *pgdat; > > > unsigned long flags; > > > unsigned int nr_pages = compound ? hpage_nr_pages(page) : 1; > > > + bool split = false; > > > int ret; > > > bool anon; > > > > > > @@ -5346,6 +5347,7 @@ static int mem_cgroup_move_account(struct page *page, > > > if (!list_empty(page_deferred_list(page))) { > > > list_del_init(page_deferred_list(page)); > > > from->deferred_split_queue.split_queue_len--; > > > + split = true; > > > } > > > spin_unlock(&from->deferred_split_queue.split_queue_lock); > > > } > > > @@ -5360,7 +5362,7 @@ static int mem_cgroup_move_account(struct page *page, > > > page->mem_cgroup = to; > > > > > > #ifdef CONFIG_TRANSPARENT_HUGEPAGE > > > - if (compound) { > > > + if (compound && split) { > > > spin_lock(&to->deferred_split_queue.split_queue_lock); > > > if (list_empty(page_deferred_list(page))) { > > > list_add_tail(page_deferred_list(page), > > > > > > > I think that's a good point, especially considering that the current code > > appears to unconditionally place any compound page on the deferred split > > queue of the destination memcg. The correct list that it should appear > > on, I believe, depends on whether the pmd has been split for the process > > being moved: note the MC_TARGET_PAGE caveat in > > mem_cgroup_move_charge_pte_range() that does not move the charge for > > compound pages with split pmds. So when mem_cgroup_move_account() is > > called with compound == true, we're moving the charge of the entire > > compound page: why would it appear on that memcg's deferred split queue? > > I believe Kirill asked how do we know that the page should be actually > added to the deferred list just from the list_empty check. In other > words what if the page hasn't been split at all? > Right, and I don't think that it necessarily is and the second conditional in Wei's patch will always succeed unless we have raced. That patch is for a lock concern but I think Kirill's question has uncovered something more interesting. Kirill S would definitely be best to answer Kirill T's question, but from my understanding when mem_cgroup_move_account() is called with compound == true that we always have an intact pmd (we never migrate partial page charges for pages on the deferred split queue with the current charge migration implementation) and thus the underlying page is not eligible to be split and shouldn't be on the deferred split queue. In other words, a page being on the deferred split queue for a memcg should only happen when it is charged to that memcg. (This wasn't the case when we only had per-node split queues.) I think that's currently broken in mem_cgroup_move_account() before Wei's patch.