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=-5.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable 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 59D83C43215 for ; Thu, 14 Nov 2019 00:54:27 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 5C536206EC for ; Thu, 14 Nov 2019 00:54:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5C536206EC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.alibaba.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 9F7486B0003; Wed, 13 Nov 2019 19:54:26 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9CCD16B0005; Wed, 13 Nov 2019 19:54:26 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 90A686B0006; Wed, 13 Nov 2019 19:54:26 -0500 (EST) 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 7BC656B0003 for ; Wed, 13 Nov 2019 19:54:26 -0500 (EST) Received: from smtpin24.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with SMTP id 1D0B98249980 for ; Thu, 14 Nov 2019 00:54:26 +0000 (UTC) X-FDA: 76153062132.24.sort59_7dec4a9d9a142 X-HE-Tag: sort59_7dec4a9d9a142 X-Filterd-Recvd-Size: 4949 Received: from out30-44.freemail.mail.aliyun.com (out30-44.freemail.mail.aliyun.com [115.124.30.44]) by imf24.hostedemail.com (Postfix) with ESMTP for ; Thu, 14 Nov 2019 00:54:25 +0000 (UTC) X-Alimail-AntiSpam:AC=PASS;BC=-1|-1;BR=01201311R191e4;CH=green;DM=||false|;DS=|;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e04394;MF=shile.zhang@linux.alibaba.com;NM=1;PH=DS;RN=7;SR=0;TI=SMTPD_---0Ti0NhcR_1573692861; Received: from ali-6c96cfdd1403.local(mailfrom:shile.zhang@linux.alibaba.com fp:SMTPD_---0Ti0NhcR_1573692861) by smtp.aliyun-inc.com(127.0.0.1); Thu, 14 Nov 2019 08:54:22 +0800 Subject: Re: [PATCH] mm/vmalloc: Fix regression caused by needless vmalloc_sync_all() To: Andrew Morton Cc: Joerg Roedel , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Thomas Gleixner , Dave Hansen , Qian Cai References: <20191113095530.228959-1-shile.zhang@linux.alibaba.com> <20191113131237.1757241fb0c458484c2b19aa@linux-foundation.org> From: Shile Zhang Message-ID: <84cb4721-bb8c-f45b-37d5-95a06ceea2aa@linux.alibaba.com> Date: Thu, 14 Nov 2019 08:54:21 +0800 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 MIME-Version: 1.0 In-Reply-To: <20191113131237.1757241fb0c458484c2b19aa@linux-foundation.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US 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: Fix wrong cc list. On 2019/11/14 05:12, Andrew Morton wrote: > On Wed, 13 Nov 2019 17:55:30 +0800 Shile Zhang wrote: > >> vmalloc_sync_all() was put in the common path in >> __purge_vmap_area_lazy(), for one sync issue only happened on X86_32 >> with PTI enabled. It is needless for X86_64, which caused a big regression >> in UnixBench Shell8 testing on X86_64. >> Similar regression also reported by 0-day kernel test robot in reaim >> benchmarking: >> https://lists.01.org/hyperkitty/list/lkp@lists.01.org/thread/4D3JPPHBNOSPFK2KEPC6KGKS6J25AIDB/ > That is indeed a large performance regression. > >> Fix it by adding more conditions. >> >> Fixes: 3f8fd02b1bf1 ("mm/vmalloc: Sync unmappings in __purge_vmap_area_lazy()") >> >> ... >> >> --- a/mm/vmalloc.c >> +++ b/mm/vmalloc.c >> @@ -1255,11 +1255,17 @@ static bool __purge_vmap_area_lazy(unsigned long start, unsigned long end) >> if (unlikely(valist == NULL)) >> return false; >> >> +#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE) > Are we sure that x86_32 is the only architecture whcih is (or ever will > be) affected? > >> /* >> * First make sure the mappings are removed from all page-tables >> * before they are freed. >> + * >> + * This is only needed on x86-32 with !SHARED_KERNEL_PMD, which is >> + * the case on a PAE kernel with PTI enabled. >> */ >> - vmalloc_sync_all(); >> + if (!SHARED_KERNEL_PMD && boot_cpu_has(X86_FEATURE_PTI)) >> + vmalloc_sync_all(); >> +#endif >> >> /* >> * TODO: to calculate a flush range without looping. > CONFIG_X86_PAE depends on CONFIG_X86_32 so no need to check > CONFIG_X86_32? Yes, Thanks for your review and kindly refactoring! > From: Andrew Morton > Subject: mm-vmalloc-fix-regression-caused-by-needless-vmalloc_sync_all-fix > > simplify config expression, use IS_ENABLED() > > Cc: Dave Hansen > Cc: Joerg Roedel > Cc: Qian Cai > Cc: Shile Zhang > Cc: Thomas Gleixner > Signed-off-by: Andrew Morton > --- > > mm/vmalloc.c | 21 +++++++++++---------- > 1 file changed, 11 insertions(+), 10 deletions(-) > > --- a/mm/vmalloc.c~mm-vmalloc-fix-regression-caused-by-needless-vmalloc_sync_all-fix > +++ a/mm/vmalloc.c > @@ -1255,16 +1255,17 @@ static bool __purge_vmap_area_lazy(unsig > if (unlikely(valist == NULL)) > return false; > > -#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE) > - /* > - * First make sure the mappings are removed from all page-tables > - * before they are freed. > - * > - * This is only needed on x86-32 with !SHARED_KERNEL_PMD, which is > - * the case on a PAE kernel with PTI enabled. > - */ > - if (!SHARED_KERNEL_PMD && boot_cpu_has(X86_FEATURE_PTI)) > - vmalloc_sync_all(); > + if (IS_ENABLED(CONFIG_X86_PAE)) { > + /* > + * First make sure the mappings are removed from all page-tables > + * before they are freed. > + * > + * This is only needed on x86-32 with !SHARED_KERNEL_PMD, which > + * is the case on a PAE kernel with PTI enabled. > + */ > + if (!SHARED_KERNEL_PMD && boot_cpu_has(X86_FEATURE_PTI)) > + vmalloc_sync_all(); > + } > #endif > > /* > _