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.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 7F416C07E95 for ; Tue, 20 Jul 2021 20:50:39 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 29A9560FF3 for ; Tue, 20 Jul 2021 20:50:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 29A9560FF3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id C65416B0011; Tue, 20 Jul 2021 16:50:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C3B4E6B0036; Tue, 20 Jul 2021 16:50:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id ADCB56B006C; Tue, 20 Jul 2021 16:50:39 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0157.hostedemail.com [216.40.44.157]) by kanga.kvack.org (Postfix) with ESMTP id 823E36B0011 for ; Tue, 20 Jul 2021 16:50:39 -0400 (EDT) Received: from smtpin29.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 080AA824556B for ; Tue, 20 Jul 2021 20:50:38 +0000 (UTC) X-FDA: 78384159756.29.622CE4F Received: from mail-ed1-f53.google.com (mail-ed1-f53.google.com [209.85.208.53]) by imf29.hostedemail.com (Postfix) with ESMTP id AB5A2900258F for ; Tue, 20 Jul 2021 20:50:37 +0000 (UTC) Received: by mail-ed1-f53.google.com with SMTP id k27so30107387edk.9 for ; Tue, 20 Jul 2021 13:50:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=PXmPAgOyL+BBz09jacg1aZLHANboewgCvjK3IRp37+M=; b=CexM0fobFkGeZKt/XDFgzC2uVpyPQQkeYkBPEn4PuXSAEw2GL+zOXHNg3/fcNAlcBD b1R4ZHzVfR8tIlrik/Pt4MmPSNPJGGD1dAidUcNFNsxZgegUvgPvqYoEc2VcBCwkw257 JFDZCRBAFhLIoC7NA8qfKohAtRn5E7MIFHrOIWZ+35RYBZPFjYk0TzBCAfIZ6Yfir0o0 z8r9epJyBC+9MJ0jB0rAgZk3fsZkdAn8BHLj0GDjQz6leQ7CspjbQdNgbV65L8OXr4+n 6naoI/EIGRyCH4CzNMG3M812r/3d59iT4tRWd+L5HjhwWjt0elyAI9hqR28y/ODj9X31 fYyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=PXmPAgOyL+BBz09jacg1aZLHANboewgCvjK3IRp37+M=; b=SzAk1I3p8hMZSbiDWSz0ctb3cT6cXjklIKhIgPFFLEFc9ql2dpZ6QjprxQR59xFc/M v15LKiVcaprKupMe6pOv7FHXeL74/2AF/wB8obFRnmZZzhWCitPpyYEcAZ2HgsMj9fPW 6E9poe1neNGPMZDNGNDQ/LAA+yjyVuXZ6OWjrj2uq81eSPFJeTv30478tWkfuFZ19O0k YRjbB8RF4dL99H4Lf8B1bC0OuPuSABP6TQ2/VO0HpmxfV7aFClZrgnjFk1BvxonCq3o7 P1gC+QlhOW8gvYrM0LpUdCoiVnJci3gcsPYe9DnpdlPzqH+BRvhyOSNLjzURgvwEc84O 46+g== X-Gm-Message-State: AOAM531SopNAehhGYcRFSzyeX3/0RZ1uepfw/qkWSVlF2woWxb9eYk1u dr/4Y0P9WfQzd/+Oik6cn0lM5pzsoHHHvIefUgw= X-Google-Smtp-Source: ABdhPJx4b2v04XUMMAS3ZJEBCkn8DGU8Gu+gQabTwKgzsJIPBP+7A/UUswQQjcBHFLndqKM/h6j88El19hqEI1QxVbo= X-Received: by 2002:a50:954c:: with SMTP id v12mr39330637eda.313.1626814236512; Tue, 20 Jul 2021 13:50:36 -0700 (PDT) MIME-Version: 1.0 References: <20210720074228.76342-1-songmuchun@bytedance.com> In-Reply-To: <20210720074228.76342-1-songmuchun@bytedance.com> From: Yang Shi Date: Tue, 20 Jul 2021 13:50:24 -0700 Message-ID: Subject: Re: [PATCH] mm: mmap_lock: fix disabling preemption directly To: Muchun Song Cc: Andrew Morton , Mel Gorman , cuibixuan@huawei.com, Vlastimil Babka , Linux MM , Linux Kernel Mailing List Content-Type: text/plain; charset="UTF-8" Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=gmail.com header.s=20161025 header.b=CexM0fob; spf=pass (imf29.hostedemail.com: domain of shy828301@gmail.com designates 209.85.208.53 as permitted sender) smtp.mailfrom=shy828301@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-Rspamd-Server: rspam05 X-Stat-Signature: nt6t3iacs6rg66dfc7r6aq5s8ijkcri6 X-Rspamd-Queue-Id: AB5A2900258F X-HE-Tag: 1626814237-634188 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 Tue, Jul 20, 2021 at 12:43 AM Muchun Song wrote: > > The commit 832b50725373 ("mm: mmap_lock: use local locks instead of > disabling preemption") fix a bug by using local locks. But commit > d01079f3d0c0 ("mm/mmap_lock: remove dead code for !CONFIG_TRACING > configurations") changes those lines to original version. I guess > it is introduced by the conflicts fixing on merging. > > Fixes: d01079f3d0c0 ("mm/mmap_lock: remove dead code for !CONFIG_TRACING configurations") > Signed-off-by: Muchun Song Reviewed-by: Yang Shi > --- > mm/mmap_lock.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/mm/mmap_lock.c b/mm/mmap_lock.c > index f5852a058ce0..1854850b4b89 100644 > --- a/mm/mmap_lock.c > +++ b/mm/mmap_lock.c > @@ -156,14 +156,14 @@ static inline void put_memcg_path_buf(void) > #define TRACE_MMAP_LOCK_EVENT(type, mm, ...) \ > do { \ > const char *memcg_path; \ > - preempt_disable(); \ > + local_lock(&memcg_paths.lock); \ > memcg_path = get_mm_memcg_path(mm); \ > trace_mmap_lock_##type(mm, \ > memcg_path != NULL ? memcg_path : "", \ > ##__VA_ARGS__); \ > if (likely(memcg_path != NULL)) \ > put_memcg_path_buf(); \ > - preempt_enable(); \ > + local_unlock(&memcg_paths.lock); \ > } while (0) > > #else /* !CONFIG_MEMCG */ > -- > 2.11.0 >