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=-10.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 7937CC07E95 for ; Tue, 20 Jul 2021 09:39:44 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 131DF611F2 for ; Tue, 20 Jul 2021 09:39:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 131DF611F2 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=techsingularity.net Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 5BD336B00AA; Tue, 20 Jul 2021 05:39:44 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 546DB6B00AB; Tue, 20 Jul 2021 05:39:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3E7BF6B00AC; Tue, 20 Jul 2021 05:39:44 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0186.hostedemail.com [216.40.44.186]) by kanga.kvack.org (Postfix) with ESMTP id 11AC36B00AA for ; Tue, 20 Jul 2021 05:39:44 -0400 (EDT) Received: from smtpin01.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 9C5031849A3B5 for ; Tue, 20 Jul 2021 09:39:42 +0000 (UTC) X-FDA: 78382469004.01.32AFB31 Received: from outbound-smtp53.blacknight.com (outbound-smtp53.blacknight.com [46.22.136.237]) by imf10.hostedemail.com (Postfix) with ESMTP id B09C3600A38D for ; Tue, 20 Jul 2021 09:39:40 +0000 (UTC) Received: from mail.blacknight.com (pemlinmail01.blacknight.ie [81.17.254.10]) by outbound-smtp53.blacknight.com (Postfix) with ESMTPS id 0B08EFB58D for ; Tue, 20 Jul 2021 10:39:39 +0100 (IST) Received: (qmail 29527 invoked from network); 20 Jul 2021 09:39:38 -0000 Received: from unknown (HELO techsingularity.net) (mgorman@techsingularity.net@[84.203.17.255]) by 81.17.254.9 with ESMTPSA (AES256-SHA encrypted, authenticated); 20 Jul 2021 09:39:38 -0000 Date: Tue, 20 Jul 2021 10:39:37 +0100 From: Mel Gorman To: Muchun Song Cc: akpm@linux-foundation.org, shy828301@gmail.com, cuibixuan@huawei.com, vbabka@suse.cz, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] mm: mmap_lock: fix disabling preemption directly Message-ID: <20210720093937.GV3809@techsingularity.net> References: <20210720074228.76342-1-songmuchun@bytedance.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: inline In-Reply-To: <20210720074228.76342-1-songmuchun@bytedance.com> User-Agent: Mutt/1.10.1 (2018-07-13) Authentication-Results: imf10.hostedemail.com; dkim=none; spf=pass (imf10.hostedemail.com: domain of mgorman@techsingularity.net designates 46.22.136.237 as permitted sender) smtp.mailfrom=mgorman@techsingularity.net; dmarc=none X-Rspamd-Server: rspam05 X-Stat-Signature: r1o7jb7e8hayod554zp6moym3uwjbpjb X-Rspamd-Queue-Id: B09C3600A38D X-HE-Tag: 1626773980-593018 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 03:42:28PM +0800, 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 Acked-by: Mel Gorman -- Mel Gorman SUSE Labs