From patchwork Fri Apr 14 14:23:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chih-En Lin X-Patchwork-Id: 13211634 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E6C4AC77B72 for ; Fri, 14 Apr 2023 14:26:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230432AbjDNO0a (ORCPT ); Fri, 14 Apr 2023 10:26:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49078 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230040AbjDNO0E (ORCPT ); Fri, 14 Apr 2023 10:26:04 -0400 Received: from mail-pj1-x1036.google.com (mail-pj1-x1036.google.com [IPv6:2607:f8b0:4864:20::1036]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CF04EC160; Fri, 14 Apr 2023 07:25:35 -0700 (PDT) Received: by mail-pj1-x1036.google.com with SMTP id hg12so3951157pjb.2; Fri, 14 Apr 2023 07:25:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681482335; x=1684074335; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=oPtVqejd8xN45YdR2Q6v6XG0kYjXUF7jvXEtA29Ek40=; b=DO2Q+d81fMe4kXw95FsyYMfTz/qUSAi6t2W34rh9XXJe8g3xYfBr+ymjaQ+uYh9eTI gHotO5OUPv5kWIbSchNOMjer5oobGqrHJG+prcCHTVFXEpI6y9M0+rge1hgjyuYxoB0u wX1SvUVvU2sIJxeGvrr7rS1EZIQVvYq2oa4eABUzfPnn7z8r+qL+fynWlo9OAhrZaHzR 3jOzOMCHKM1OzWW9i5YbxNsYH1Uk4ufsEhHfEwnQp8mwyPkSVTACUM3lCwWK6IlQbd5Q G7EY5aNAMKUNsQAQl+8b7ZKPp2am6ArpZNUTK0p0bV3mimWd5Tg5a3ckqpM3MRvKpkwh wEcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681482335; x=1684074335; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oPtVqejd8xN45YdR2Q6v6XG0kYjXUF7jvXEtA29Ek40=; b=IVrzADRA6p9Bd2wxW9UcrFJcS6/Q9j2mUhI6BW+SvNXO5bxNeNHYdG9f9nE0hAAD88 RFoBLXh5mxi9hWAnAMYX5kb1zPcI5FXUSjYvZXai5PsYrXXjmYy6T5kPgvFpyPWQ+a0e 45Zego2K4S2CBiY6pQmNFDBRbYxS524xHZ/bWhaX5Iw6gXgvR2IvZMoH4T7dyGs5bCS5 NgXFGSKxH6avnCc9zlHLzYRqDd9Dyg9YtUkvmrP1kxieSDk2rXXfpXTYE15AiO+9C6e3 e16nUb7m1bqIySqvr9P9pFTKYTmp4Gtym1dw9zhNDpM9ilK+5rMo2eGbIhoBydt42Jvl QNJA== X-Gm-Message-State: AAQBX9d22eiNuAL7i6F8EVXg6ZBH/sKzRnY3a6OsSdZoK7RUOl72UkWL QNtNSKlWxmEnT83J/z+pLXw= X-Google-Smtp-Source: AKy350adAdAtgay4aFNJF81hhKV3XEsvf6Y3Gn4taIN+xVDvh1O3itAQNBSXC0EdDJB6K6v4iC1zqg== X-Received: by 2002:a17:902:d4cc:b0:19f:2dff:2199 with SMTP id o12-20020a170902d4cc00b0019f2dff2199mr3045076plg.68.1681482335057; Fri, 14 Apr 2023 07:25:35 -0700 (PDT) Received: from strix-laptop.. (2001-b011-20e0-1499-8303-7502-d3d7-e13b.dynamic-ip6.hinet.net. [2001:b011:20e0:1499:8303:7502:d3d7:e13b]) by smtp.googlemail.com with ESMTPSA id h7-20020a17090ac38700b0022335f1dae2sm2952386pjt.22.2023.04.14.07.25.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Apr 2023 07:25:34 -0700 (PDT) From: Chih-En Lin To: Andrew Morton , Qi Zheng , David Hildenbrand , "Matthew Wilcox (Oracle)" , Christophe Leroy , John Hubbard , Nadav Amit , Barry Song , Pasha Tatashin Cc: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" , Steven Rostedt , Masami Hiramatsu , Peter Zijlstra , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , Yu Zhao , Steven Barrett , Juergen Gross , Peter Xu , Kefeng Wang , Tong Tiangen , Christoph Hellwig , "Liam R. Howlett" , Yang Shi , Vlastimil Babka , Alex Sierra , Vincent Whitchurch , Anshuman Khandual , Li kunyu , Liu Shixin , Hugh Dickins , Minchan Kim , Joey Gouly , Chih-En Lin , Michal Hocko , Suren Baghdasaryan , "Zach O'Keefe" , Gautam Menghani , Catalin Marinas , Mark Brown , "Eric W. Biederman" , Andrei Vagin , Shakeel Butt , Daniel Bristot de Oliveira , "Jason A. Donenfeld" , Greg Kroah-Hartman , Alexey Gladkov , x86@kernel.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-trace-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Dinglan Peng , Pedro Fonseca , Jim Huang , Huichun Feng Subject: [PATCH v5 08/17] mm/ksm: Break COW PTE before modify shared PTE Date: Fri, 14 Apr 2023 22:23:32 +0800 Message-Id: <20230414142341.354556-9-shiyn.lin@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230414142341.354556-1-shiyn.lin@gmail.com> References: <20230414142341.354556-1-shiyn.lin@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-trace-kernel@vger.kernel.org Break COW PTE before merge the page that reside in COW-ed PTE. Signed-off-by: Chih-En Lin --- mm/ksm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mm/ksm.c b/mm/ksm.c index 2b8d30068cbb..963ef4d0085d 100644 --- a/mm/ksm.c +++ b/mm/ksm.c @@ -1052,7 +1052,7 @@ static int write_protect_page(struct vm_area_struct *vma, struct page *page, pte_t *orig_pte) { struct mm_struct *mm = vma->vm_mm; - DEFINE_PAGE_VMA_WALK(pvmw, page, vma, 0, 0); + DEFINE_PAGE_VMA_WALK(pvmw, page, vma, 0, PVMW_BREAK_COW_PTE); int swapped; int err = -EFAULT; struct mmu_notifier_range range; @@ -1169,6 +1169,8 @@ static int replace_page(struct vm_area_struct *vma, struct page *page, barrier(); if (!pmd_present(pmde) || pmd_trans_huge(pmde)) goto out; + if (break_cow_pte(vma, pmd, addr)) + goto out; mmu_notifier_range_init(&range, MMU_NOTIFY_CLEAR, 0, mm, addr, addr + PAGE_SIZE);