From patchwork Tue Aug 8 02:09:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yin Fengwei X-Patchwork-Id: 132585 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp2279650vqr; Tue, 8 Aug 2023 10:30:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHXnh8QvzQHrgLzVZFT4itB/UyQtQqjxh6VwD7OYq2ne+O3W4JxeflZH6RfAP7TwO8TkbVJ X-Received: by 2002:a50:fa90:0:b0:522:1e24:afb6 with SMTP id w16-20020a50fa90000000b005221e24afb6mr417077edr.0.1691515811075; Tue, 08 Aug 2023 10:30:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691515811; cv=none; d=google.com; s=arc-20160816; b=TM5HO8ZstbVYwGi5upCSTBOjCAj6DX5QhTIFVzprjv48RjqVBiyXn0Rt9JHBS732Hh 0zx6VKWg9bhGt3CAXJVXGRhPi6ERojIR1mt2mgMO0SawnBu3vbIXnv6Cpf03QHbYIaNG yOAIzQFhgncQZIORH+1L7e2H5mJt6GFwmTwIf0Z9/ZL1DNqWyRcHVPjDcGP012Iqptxq CeKfL076jMz+rAW7tZo2rKsTxRZ8/5x1WbWj63JGNUnlYci3Es/g/Zul8R4F/78O94nx nEr0lrkyu73+9vwhTt/uKeqpcxtRZ5FVKxQNbYls489ziLXNACZS/82HUC7Xoxt7S5m8 2tpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Ljmm8K/QkDciIB4DKIAS5aVl8fxci5EsuS9jbdr0jIg=; fh=LgrQy7mqd4cTuAw7dlguzqzf4K4OZS27s5hhhI8E0EA=; b=wGxK+qR2S0x7GeCu82WAFmZ8TSy3VVcA83MpAFcSqVAR6bEYHvmj2Dj3LnWfN3Wxzj dJ4sISGrbsFwKq8Uh2pHf3ELwDZ+OgYUjjjKbByGTo+0/E0CZivZgHSvbDDMteWqkJkw bCqa/E0GkWAbpXDoHZAfm7UxWP/iHryNMorS0PNtoAXQCfCcYsyipjn+hed3nvYGg8N0 wi0KwOMB1RiPXIVHrIA17BiES1hUscMVtMvk6bOS8MueL8R/fUEAeq4EtvzWHAYMjour DBIdHPYARGGbvFGXjnoThSLMUynOaA95fZgh1tqmzJZD4vQcQQaJxforAIgZzc0MNYOH QB5A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=joHMlYxP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l23-20020a056402125700b0052247666986si7945528edw.434.2023.08.08.10.29.47; Tue, 08 Aug 2023 10:30:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=joHMlYxP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230216AbjHHCLA (ORCPT + 99 others); Mon, 7 Aug 2023 22:11:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43092 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229566AbjHHCK6 (ORCPT ); Mon, 7 Aug 2023 22:10:58 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C25A81711; Mon, 7 Aug 2023 19:10:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1691460653; x=1722996653; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=I0sX9zQ55/pnapaBgwBXw+8hFPy7SpHzYq+j/u0jVVw=; b=joHMlYxPWu5ShZUS3ILS82ZCwlpnmi4lVi9vegrtgdysZxfHyxdrnQ/D BgazzmrzTSeruioIdqjDbJ2m+SurGkS8iPoZpMBmyTePexgZhwskY8B11 Bxlp/KKRbOgkunLaSF338P+TrHTdOD7+AZZ24CkASRQF7dx/gxMbMbQaW lh/TR72cOLj2VtPBe6gKCDuhvLP+CUuDM9qfZQewLtP9+Dqu6XPwdZEFm waVmeP0UbDZ7ekGPUU4LU4CqPQuMvAhd6afKPDBwDH/gUgCPHoiu4Cq1i IzZCjUIH3facI05fgHwNFaPgUMSbD7KQ16NKzkoVtir5m45n8/rgufyY/ w==; X-IronPort-AV: E=McAfee;i="6600,9927,10795"; a="373453505" X-IronPort-AV: E=Sophos;i="6.01,263,1684825200"; d="scan'208";a="373453505" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Aug 2023 19:10:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10795"; a="977689341" X-IronPort-AV: E=Sophos;i="6.01,263,1684825200"; d="scan'208";a="977689341" Received: from fyin-dev.sh.intel.com ([10.239.159.32]) by fmsmga006.fm.intel.com with ESMTP; 07 Aug 2023 19:10:49 -0700 From: Yin Fengwei To: linux-mm@kvack.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, akpm@linux-foundation.org, willy@infradead.org, vishal.moola@gmail.com, wangkefeng.wang@huawei.com, minchan@kernel.org, yuzhao@google.com, david@redhat.com, ryan.roberts@arm.com, shy828301@gmail.com Cc: fengwei.yin@intel.com Subject: [PATCH v2 1/3] madvise:madvise_cold_or_pageout_pte_range(): don't use mapcount() against large folio for sharing check Date: Tue, 8 Aug 2023 10:09:15 +0800 Message-Id: <20230808020917.2230692-2-fengwei.yin@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230808020917.2230692-1-fengwei.yin@intel.com> References: <20230808020917.2230692-1-fengwei.yin@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773682883180210104 X-GMAIL-MSGID: 1773682883180210104 Commit 07e8c82b5eff ("madvise: convert madvise_cold_or_pageout_pte_range() to use folios") replaced the page_mapcount() with folio_mapcount() to check whether the folio is shared by other mapping. It's not correct for large folio. folio_mapcount() returns the total mapcount of large folio which is not suitable to detect whether the folio is shared. Use folio_estimated_sharers() which returns a estimated number of shares. That means it's not 100% correct. It should be OK for madvise case here. User-visible effects is that the THP is skipped when user call madvise. But the correct behavior is THP should be split and processed then. NOTE: this change is a temporary fix to reduce the user-visible effects before the long term fix from David is ready. Fixes: 07e8c82b5eff ("madvise: convert madvise_cold_or_pageout_pte_range() to use folios") Cc: stable@vger.kernel.org Signed-off-by: Yin Fengwei Reviewed-by: Yu Zhao Reviewed-by: Ryan Roberts --- mm/madvise.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/madvise.c b/mm/madvise.c index 1d7933933e31..49af35e2d99a 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -383,7 +383,7 @@ static int madvise_cold_or_pageout_pte_range(pmd_t *pmd, folio = pfn_folio(pmd_pfn(orig_pmd)); /* Do not interfere with other mappings of this folio */ - if (folio_mapcount(folio) != 1) + if (folio_estimated_sharers(folio) != 1) goto huge_unlock; if (pageout_anon_only_filter && !folio_test_anon(folio)) @@ -459,7 +459,7 @@ static int madvise_cold_or_pageout_pte_range(pmd_t *pmd, if (folio_test_large(folio)) { int err; - if (folio_mapcount(folio) != 1) + if (folio_estimated_sharers(folio) != 1) break; if (pageout_anon_only_filter && !folio_test_anon(folio)) break;