From patchwork Mon Apr 24 06:54:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Huang, Ying" X-Patchwork-Id: 86880 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2554855vqo; Mon, 24 Apr 2023 00:12:43 -0700 (PDT) X-Google-Smtp-Source: AKy350brelF7KbtGrx8uo5rNtDwKsOE7jBznLgAi7HgIFjebgTtFXhLSreDEm0PvxtjbKBPEcv40 X-Received: by 2002:a05:6a00:22d5:b0:63b:7bc7:8049 with SMTP id f21-20020a056a0022d500b0063b7bc78049mr20654109pfj.2.1682320362920; Mon, 24 Apr 2023 00:12:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682320362; cv=none; d=google.com; s=arc-20160816; b=zHPG+ZqJzPtAo+zJDzZ/uD1LSuxg13LlyVmA7cEislgIBJx3y1KhAPhY6pqO6WEHaE ate67P1xhEUIVn4BjRwtpZeHUhQyIXAgbwC0Ea67X/ZGovEF0oBrVG8FbMBmk2lqvhHs iz+km6mmw1AKZqJxcQa4iTBY+1Tula5iCgtg7GJZCDS2ogKt00XiXwMcxHF7Y5x9ocmO 1/PHQ1I0agx5qwJpUAWfXOYtlPRf3907GDWkCZieRkYR/ywgnQm+NfUJOyqYolhLsdIP VaefAFBHZc2ACWXBnBhcxISBSPcPKUy98AFBGj5Tdm9r/mMNr5LidybEC0OkGZtj5hGV qMtA== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=D7b2FL06vaF5VtbxPUbh0QqalQ6ZgLeNFvHx9vl+Kbs=; b=VJdF9VvAM/AhecPq6mRpnYI+Pwl3bxI8VhDClpQhdi4m0MfOVOUVBtY+QsboKHDWKG dcduRgdl6kThk26KF+b20loTf7vC+LwL5UqwfpjfuSujnz3UrrA2Z4hYtQRfNDAoICmA yeE2PzxyT812ezrpk5m/GhQTyq49bGD18NnFX1Fhr/syh/z/PyoQ61JsCHVLoiQUy5l/ zOBesYJnVdv+KbE6rW43W8uTsBHYZBhuuJF9EQjN1SUP31JGRugq+SyeM/jG0kCRzpVM NXrbOFy7R5+TwwIQSjvGu82QP8XyQq4bTFG2tVd931Sg6eA69hcvOiUIvsRE2tcz9+0g Em9w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=PZ4TEOol; 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 c6-20020a056a00008600b0063b82c0941fsi10468410pfj.36.2023.04.24.00.12.28; Mon, 24 Apr 2023 00:12:42 -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=PZ4TEOol; 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 S229547AbjDXGyf (ORCPT + 99 others); Mon, 24 Apr 2023 02:54:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58036 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229709AbjDXGyc (ORCPT ); Mon, 24 Apr 2023 02:54:32 -0400 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B3397186 for ; Sun, 23 Apr 2023 23:54:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1682319264; x=1713855264; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=lFIM3SiRtcb8O9YKp++Jg0PUJfBH52f31PGcowvaHDw=; b=PZ4TEOolTCYZhG1jEFX1qAgyGQ3SIJY3eMU6LFxYCtZ0WJUhj651macz PZjyR1CpoDC7Rl+ZRe8MNBmPE6toJPWRGtpzTEjBiHcHHBQYqZmg4Wyvr X+wV1dp98qBIC7u/1EScT1Tps4fL+GOi5WkOqqHJhWVs1+9XAqHzQ3KKT Hu03xgL794ro6cqTUveB71D0XVAe6pJ14MmMM94aHgySEsl/irYYud/Bn s5XNkglXyw2zBonhxjmUREqt9JXk7ZHVFQadvyxmvvs8r9PlSgVMh0jSN GLcfla7nvz/GCHnLR0g6wmmfQ2UjnfmGrsaTCqTxm/RgnKBlZfyQrjgAF w==; X-IronPort-AV: E=McAfee;i="6600,9927,10689"; a="326696563" X-IronPort-AV: E=Sophos;i="5.99,222,1677571200"; d="scan'208";a="326696563" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Apr 2023 23:54:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10689"; a="867376670" X-IronPort-AV: E=Sophos;i="5.99,222,1677571200"; d="scan'208";a="867376670" Received: from yhuang6-mobl2.sh.intel.com ([10.238.7.50]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Apr 2023 23:54:19 -0700 From: Huang Ying To: Andrew Morton , Nadav Amit Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Huang Ying , kernel test robot , haoxin , Mel Gorman , Hugh Dickins , Matthew Wilcox , David Hildenbrand Subject: [PATCH -V2] mm,unmap: avoid flushing TLB in batch if PTE is inaccessible Date: Mon, 24 Apr 2023 14:54:08 +0800 Message-Id: <20230424065408.188498-1-ying.huang@intel.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1764040756576133527?= X-GMAIL-MSGID: =?utf-8?q?1764040756576133527?= Hi, Andrew, The version 1 of this patch was merged in mm-unstable branch. If you want to move that patch into mm-stable recently, it may be better to update that patch with this new version firstly. If you want to do that after v6.4-rc1, I will rebase this patch and resend it after v6.4-rc1 is released. Hi, Amit, The patch has been changed based on comments from Xin. I keep your "reviewed-by" because I think the change is trivial. But if you think it's inappropriate, I will change that. Best Regards, Huang, Ying ------------------------------->8------------------------------------------ 0Day/LKP reported a performance regression for commit 7e12beb8ca2a ("migrate_pages: batch flushing TLB"). In the commit, the TLB flushing during page migration is batched. So, in try_to_migrate_one(), ptep_clear_flush() is replaced with set_tlb_ubc_flush_pending(). In further investigation, it is found that the TLB flushing can be avoided in ptep_clear_flush() if the PTE is inaccessible. In fact, we can optimize in similar way for the batched TLB flushing too to improve the performance. So in this patch, we check pte_accessible() before set_tlb_ubc_flush_pending() in try_to_unmap/migrate_one(). Tests show that the benchmark score of the anon-cow-rand-mt test case of vm-scalability test suite can improve up to 2.1% with the patch on a Intel server machine. The TLB flushing IPI can reduce up to 44.3%. Link: https://lore.kernel.org/oe-lkp/202303192325.ecbaf968-yujie.liu@intel.com Link: https://lore.kernel.org/oe-lkp/ab92aaddf1b52ede15e2c608696c36765a2602c1.camel@intel.com/ Fixes: 7e12beb8ca2a ("migrate_pages: batch flushing TLB") Reported-by: kernel test robot Signed-off-by: "Huang, Ying" Reviewed-by: Nadav Amit Cc: haoxin Cc: Mel Gorman Cc: Hugh Dickins Cc: Matthew Wilcox (Oracle) Cc: David Hildenbrand Reviewed-by: Xin Hao --- mm/rmap.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/mm/rmap.c b/mm/rmap.c index 8632e02661ac..be19232e94f4 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -641,10 +641,14 @@ void try_to_unmap_flush_dirty(void) #define TLB_FLUSH_BATCH_PENDING_LARGE \ (TLB_FLUSH_BATCH_PENDING_MASK / 2) -static void set_tlb_ubc_flush_pending(struct mm_struct *mm, bool writable) +static void set_tlb_ubc_flush_pending(struct mm_struct *mm, pte_t pteval) { struct tlbflush_unmap_batch *tlb_ubc = ¤t->tlb_ubc; int batch, nbatch; + bool writable = pte_dirty(pteval); + + if (!pte_accessible(mm, pteval)) + return; arch_tlbbatch_add_mm(&tlb_ubc->arch, mm); tlb_ubc->flush_required = true; @@ -731,7 +735,7 @@ void flush_tlb_batched_pending(struct mm_struct *mm) } } #else -static void set_tlb_ubc_flush_pending(struct mm_struct *mm, bool writable) +static void set_tlb_ubc_flush_pending(struct mm_struct *mm, pte_t pteval) { } @@ -1582,7 +1586,7 @@ static bool try_to_unmap_one(struct folio *folio, struct vm_area_struct *vma, */ pteval = ptep_get_and_clear(mm, address, pvmw.pte); - set_tlb_ubc_flush_pending(mm, pte_dirty(pteval)); + set_tlb_ubc_flush_pending(mm, pteval); } else { pteval = ptep_clear_flush(vma, address, pvmw.pte); } @@ -1963,7 +1967,7 @@ static bool try_to_migrate_one(struct folio *folio, struct vm_area_struct *vma, */ pteval = ptep_get_and_clear(mm, address, pvmw.pte); - set_tlb_ubc_flush_pending(mm, pte_dirty(pteval)); + set_tlb_ubc_flush_pending(mm, pteval); } else { pteval = ptep_clear_flush(vma, address, pvmw.pte); }