From patchwork Wed Apr 21 07:00:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Muchun Song X-Patchwork-Id: 12215559 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=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 C08E4C433B4 for ; Wed, 21 Apr 2021 07:01:54 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 6E6DB61427 for ; Wed, 21 Apr 2021 07:01:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6E6DB61427 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=bytedance.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 0B5616B0075; Wed, 21 Apr 2021 03:01:54 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 08CC96B0078; Wed, 21 Apr 2021 03:01:54 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EBCCD6B007B; Wed, 21 Apr 2021 03:01:53 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0027.hostedemail.com [216.40.44.27]) by kanga.kvack.org (Postfix) with ESMTP id D21976B0075 for ; Wed, 21 Apr 2021 03:01:53 -0400 (EDT) Received: from smtpin19.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 7F97A1E10 for ; Wed, 21 Apr 2021 07:01:53 +0000 (UTC) X-FDA: 78055479306.19.A9D4E2C Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by imf07.hostedemail.com (Postfix) with ESMTP id 01932A0000FD for ; Wed, 21 Apr 2021 07:01:52 +0000 (UTC) Received: by mail-pl1-f172.google.com with SMTP id h20so21104777plr.4 for ; Wed, 21 Apr 2021 00:01:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=A5fl1hFUuv3DCtKbM5f1nutVnvGFt8a4G+iL+Kk5mXk=; b=cp0+p5CgXQjn3nK6FkTIdj6ffZFLcfA64UNFiG4+B9XxSa/L46Z8Ty47tZ5El5/VVX h4Q4furWaCjgJYFpAxrVKO1xvk/7ViBeOTY9IRV8MSSjGCKsaAsQFOjDH5IQD5jYc/BN JTUdIWgYPi71758YMJPrPD/Ugc6R5XXLxmnhkdzS/GFQ9Pr4cTFEzptduklI7LnHplis 6a4DwShMYQG/eEjE/uXqIrRM+KZIEQYZusvh6uwjLQNNu8KyubIIuR48Ead76z9Y8yFO nlGB0gaDQ99jOUajP3RwBXRRLZSqrePWGL6vU8IlN1ORjh9d0qXsJrB5pUNkurvCi9OP ZB4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=A5fl1hFUuv3DCtKbM5f1nutVnvGFt8a4G+iL+Kk5mXk=; b=m412Zby3VzQydNqzATuSLLiR/hqLJJzM6fS33mS8iad0B8w5s7Tk8+b6fRrZIcXATw nHTvH8SOr7LXLa6I0U3dxZKKdF4lO/azlFAmnKtqsPT5lr8EPNYQLBklxtb4WummM3Y9 fW1EGcZo1XIrWWWjjsBXM9dLP88+oeMuAZo5OaXQlP6aYM6XTssk/q/6+zN8ixrQzVzI 2s5m6A8m+zvY9f67IT94R2SB0z5zd4sKZpXUhGqrf83YDI3Qh6lIoLLMySS5mLM2r7mU XIYsPFnVoAZaP4lNGn1xs1dauVtOywcHsq0PiEUC8EUcCLgwQ5E7t1bYkBa6OY79YJT+ 3Kig== X-Gm-Message-State: AOAM531WtuMmItyCHHK/Fs40y2OTNgmelRSrI+8jcJiUhPcTAbyjoy7f xa28Mdz8XRp8fX4xJvsZJrheqA== X-Google-Smtp-Source: ABdhPJwjpIMC9vb5Pt4w8iw3nZk9uRy6IoD/4vdQEcqphO5TogxAIorC7KgeVY48PxyjM8VMRe3ZTg== X-Received: by 2002:a17:902:9a0a:b029:e6:bf00:8a36 with SMTP id v10-20020a1709029a0ab02900e6bf008a36mr32868861plp.51.1618988512434; Wed, 21 Apr 2021 00:01:52 -0700 (PDT) Received: from localhost.localdomain ([139.177.225.255]) by smtp.gmail.com with ESMTPSA id c4sm929842pfb.94.2021.04.21.00.01.46 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Apr 2021 00:01:52 -0700 (PDT) From: Muchun Song To: guro@fb.com, hannes@cmpxchg.org, mhocko@kernel.org, akpm@linux-foundation.org, shakeelb@google.com, vdavydov.dev@gmail.com Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, duanxiongchun@bytedance.com, fam.zheng@bytedance.com, bsingharora@gmail.com, shy828301@gmail.com, alex.shi@linux.alibaba.com, Muchun Song Subject: [RFC PATCH v3 06/12] mm: thp: make deferred split queue lock safe when the LRU pages reparented Date: Wed, 21 Apr 2021 15:00:53 +0800 Message-Id: <20210421070059.69361-7-songmuchun@bytedance.com> X-Mailer: git-send-email 2.21.0 (Apple Git-122) In-Reply-To: <20210421070059.69361-1-songmuchun@bytedance.com> References: <20210421070059.69361-1-songmuchun@bytedance.com> MIME-Version: 1.0 X-Stat-Signature: odfqq51z4kcwag6mtmm6jzjwkcn6bk6z X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 01932A0000FD Received-SPF: none (bytedance.com>: No applicable sender policy available) receiver=imf07; identity=mailfrom; envelope-from=""; helo=mail-pl1-f172.google.com; client-ip=209.85.214.172 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1618988512-764603 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: Similar to lruvec lock, we use the same approach to make the lock safe when the LRU pages reparented. Signed-off-by: Muchun Song --- mm/huge_memory.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 05ef9e8f9af5..25025bf988f8 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -497,6 +497,8 @@ static struct deferred_split *lock_split_queue(struct page *page) struct deferred_split *queue; struct mem_cgroup *memcg; + rcu_read_lock(); +retry: memcg = page_memcg(compound_head(page)); if (memcg) queue = &memcg->deferred_split_queue; @@ -504,6 +506,17 @@ static struct deferred_split *lock_split_queue(struct page *page) queue = &NODE_DATA(page_to_nid(page))->deferred_split_queue; spin_lock(&queue->split_queue_lock); + if (unlikely(memcg != page_memcg(page))) { + spin_unlock(&queue->split_queue_lock); + goto retry; + } + + /* + * Preemption is disabled in the internal of spin_lock, which can serve + * as RCU read-side critical sections. + */ + rcu_read_unlock(); + return queue; } @@ -513,6 +526,8 @@ static struct deferred_split *lock_split_queue_irqsave(struct page *page, struct deferred_split *queue; struct mem_cgroup *memcg; + rcu_read_lock(); +retry: memcg = page_memcg(compound_head(page)); if (memcg) queue = &memcg->deferred_split_queue; @@ -520,6 +535,14 @@ static struct deferred_split *lock_split_queue_irqsave(struct page *page, queue = &NODE_DATA(page_to_nid(page))->deferred_split_queue; spin_lock_irqsave(&queue->split_queue_lock, *flags); + if (unlikely(memcg != page_memcg(page))) { + spin_unlock_irqrestore(&queue->split_queue_lock, *flags); + goto retry; + } + + /* See the comments in lock_split_queue(). */ + rcu_read_unlock(); + return queue; } #else