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 BAC9DC07E95 for ; Tue, 20 Jul 2021 21:50:22 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 345416113A for ; Tue, 20 Jul 2021 21:50:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 345416113A 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 99A646B0011; Tue, 20 Jul 2021 17:50:22 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 972146B0036; Tue, 20 Jul 2021 17:50:22 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 813BF6B006C; Tue, 20 Jul 2021 17:50:22 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0210.hostedemail.com [216.40.44.210]) by kanga.kvack.org (Postfix) with ESMTP id 5E6136B0011 for ; Tue, 20 Jul 2021 17:50:22 -0400 (EDT) Received: from smtpin37.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id C25071845F480 for ; Tue, 20 Jul 2021 21:50:20 +0000 (UTC) X-FDA: 78384310200.37.5C06E2E Received: from mail-io1-f48.google.com (mail-io1-f48.google.com [209.85.166.48]) by imf13.hostedemail.com (Postfix) with ESMTP id 84A6B100FBDF for ; Tue, 20 Jul 2021 21:50:20 +0000 (UTC) Received: by mail-io1-f48.google.com with SMTP id u7so161070ion.3 for ; Tue, 20 Jul 2021 14:50:20 -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=Lonf35HEQtzdwS1vVAGOjU19/cVFx6og3CRt+wfciSE=; b=G44vkWpmc+BkoRZ1w/UfuDI9K6MQV90PEFYbyoWOoAtjAy30QqLPShTGoyX+EPyBOV PVLcPkAogJgJhUCIv5IllHPKQ7V7krzcCA9plyTO/uNUUvRzKdNFIaEUe5OlJZg5RNGi 9j/EgcyjSjd9uCkXmj1XBPHvEyFP+y/wTlf9eW3lNcp24oquZANtnV/OAYo0pjFSvEMt n1Nm01HUNbA7bJ88+HRwMWsebBmmtWOOtwn5qQxZEQcJ1SSzAV906vcAb0jjc2Waodqk eERR+LAdvPfNlQhs4b8pcE8xfvDQhsotwXhx8LktrM4fRMUjLXpxz1Ja24550YC9U3Un Jeig== 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=Lonf35HEQtzdwS1vVAGOjU19/cVFx6og3CRt+wfciSE=; b=ZdvLiUvFz1GOT637g8nBTs+AhWYcoXArZaYwfvPfwinWe1NwD0dD0b1Ug09VEFnq0R 7gbp2kK/VpYrDD29mg+iS3hC90DrO75kqmI7MciZwSTu2b7e03gBzxidb41SiLfksuK/ X8h0XsHfevXFEmK7lM8a8AnxygRKRYLv5IoRXw8KWTTrmofkGGrisMmuf+qE1eo2vgtB h+QxOeCmA7bdlzDVOkwVGyHEjBAEPPyKXKW/mIj5/4O7Jhz5LDKUoHrR21Cl0LioYWbL 0tzmg8YjtGsMBIS004A4WddezpVoWM+tqZdUjqAFx2CL4H8722sHLC+u0iolrdbvx0L1 gs8A== X-Gm-Message-State: AOAM533LnU1dJHC3dL2VZyl9BLYHHso5JKdB8r2WyO4ilsHBJe0nalQs 5hkHJRfcCMMLQLjJS+9Ao0DiN7NUr7D4Xqns4Xg= X-Google-Smtp-Source: ABdhPJwH3IKrussB0xcgu/Ki697Ft7w2up+2svX4KnJyA+rWIH1v07knNVhZx/U7xh4buipS310hgtIO2pbqvoc7nwo= X-Received: by 2002:a5d:91d8:: with SMTP id k24mr24558310ior.84.1626817819905; Tue, 20 Jul 2021 14:50:19 -0700 (PDT) MIME-Version: 1.0 References: <20210720074228.76342-1-songmuchun@bytedance.com> In-Reply-To: <20210720074228.76342-1-songmuchun@bytedance.com> From: Pankaj Gupta Date: Tue, 20 Jul 2021 23:50:08 +0200 Message-ID: Subject: Re: [PATCH] mm: mmap_lock: fix disabling preemption directly To: Muchun Song Cc: Andrew Morton , Mel Gorman , shy828301@gmail.com, cuibixuan@huawei.com, Vlastimil Babka , Linux MM , LKML Content-Type: text/plain; charset="UTF-8" Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=gmail.com header.s=20161025 header.b=G44vkWpm; spf=pass (imf13.hostedemail.com: domain of pankajguptalinux@gmail.com designates 209.85.166.48 as permitted sender) smtp.mailfrom=pankajguptalinux@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 84A6B100FBDF X-Stat-Signature: htp9mm5tha5wtorz8m44xfkpiwtdiydf X-HE-Tag: 1626817820-981815 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: > 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 > --- > 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 */ Reviewed-by: Pankaj Gupta