From patchwork Tue Apr 27 16:13:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 12226879 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=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 7313BC433B4 for ; Tue, 27 Apr 2021 16:13:42 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 07E4A600CC for ; Tue, 27 Apr 2021 16:13:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 07E4A600CC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 308476B0075; Tue, 27 Apr 2021 12:13:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2E0286B0078; Tue, 27 Apr 2021 12:13:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 097D86B007B; Tue, 27 Apr 2021 12:13:41 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0251.hostedemail.com [216.40.44.251]) by kanga.kvack.org (Postfix) with ESMTP id DDE1A6B0075 for ; Tue, 27 Apr 2021 12:13:40 -0400 (EDT) Received: from smtpin27.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id A1BFF45BC for ; Tue, 27 Apr 2021 16:13:40 +0000 (UTC) X-FDA: 78078642600.27.383DC95 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by imf30.hostedemail.com (Postfix) with ESMTP id D0A87E000123 for ; Tue, 27 Apr 2021 16:13:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619540019; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=y3TQVnHKUnw/sN50yOfbaMGsu/Nf7cRcOPipeW/bhgE=; b=EDafR28tHtITRvZHqrorq7MZmXphZQe4uxNvLYoztZv5H51dPsxBLilVhoWLFS3kOkYmmM r7gFv0UB8UAWxBQeaof4JVzJz6YdYQnZc4MExSA0lDbN8PqdZc1YB3COQoec3gZb09nJqK xpHPexoO6vFlF1io6DaKGfAG/LNgxi0= Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-545-YSCBbruTPdugJMX_EQNcGA-1; Tue, 27 Apr 2021 12:13:37 -0400 X-MC-Unique: YSCBbruTPdugJMX_EQNcGA-1 Received: by mail-qv1-f69.google.com with SMTP id r18-20020a0ccc120000b02901a21aadacfcso24128783qvk.5 for ; Tue, 27 Apr 2021 09:13:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=y3TQVnHKUnw/sN50yOfbaMGsu/Nf7cRcOPipeW/bhgE=; b=VmLSF0NkMI1rc1LeHfg20LeDsiIhZLaATbADRN4CSx/q9BmMbGZq/vKWj6CyD62K2u nGG91l6TgRs/u1PULqep9VKHlgWb9x8vku8lB4kKNmie15gKWJQmQVJkZqWlMS/oBMev LonfhtYS46YdrsQBTd2IRI1KEKmlMXQeGpZkmBbfdC+pmSEnFbEaxRLtYssRiMuKXQo/ K+fJjV920PUtX8G3GrnFniv9N40N+8CNKNyTI6OMXgOyK7qnSYITrUhHwwe6VYqfHcJo awo7po1vYpsSiitbjLeTh6FplKS/ZoTRLvubaoXNxX5ixpamScbQX3fs60+mZtsvALsO xoJA== X-Gm-Message-State: AOAM532MHQAQB7dsMDbe8lBCF42/szx0J7AXe3v5/yABGX4Pd0jLfR0F 9C+PXzGmpGTBDtV9eStC5wzN0c7bj1WyhFWikyXaROUZSbiefZOho1BWw7q06uBF+TZ/CrRze+M XiiJS/wsgQYAQegjkwkT87ane7dyQIk0g3ZLnCP6rLkkhQz4Gb4YcrOdqDoS7 X-Received: by 2002:a0c:eacb:: with SMTP id y11mr24286787qvp.57.1619540014981; Tue, 27 Apr 2021 09:13:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzx90n+kQM1TV9Fi7Mcce4rO7UufmQT9+0nyJR2Yx3bhbVF1lrR4VAs6KWnUEZ+shz+GRUjDg== X-Received: by 2002:a0c:eacb:: with SMTP id y11mr24286748qvp.57.1619540014668; Tue, 27 Apr 2021 09:13:34 -0700 (PDT) Received: from xz-x1.redhat.com (bras-base-toroon474qw-grc-77-184-145-104-227.dsl.bell.ca. [184.145.104.227]) by smtp.gmail.com with ESMTPSA id v66sm3103621qkd.113.2021.04.27.09.13.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Apr 2021 09:13:34 -0700 (PDT) From: Peter Xu To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Nadav Amit , Miaohe Lin , Mike Rapoport , Andrea Arcangeli , Hugh Dickins , peterx@redhat.com, Jerome Glisse , Mike Kravetz , Jason Gunthorpe , Matthew Wilcox , Andrew Morton , Axel Rasmussen , "Kirill A . Shutemov" Subject: [PATCH v2 08/24] mm: Introduce ZAP_FLAG_SKIP_SWAP Date: Tue, 27 Apr 2021 12:13:01 -0400 Message-Id: <20210427161317.50682-9-peterx@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210427161317.50682-1-peterx@redhat.com> References: <20210427161317.50682-1-peterx@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=peterx@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Rspamd-Queue-Id: D0A87E000123 X-Stat-Signature: eez68ny19j4up5qd6fhbnrxbdx75bq6i X-Rspamd-Server: rspam02 Received-SPF: none (redhat.com>: No applicable sender policy available) receiver=imf30; identity=mailfrom; envelope-from=""; helo=us-smtp-delivery-124.mimecast.com; client-ip=216.205.24.124 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1619540000-545328 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: Firstly, the comment in zap_pte_range() is misleading because it checks against details rather than check_mappings, so it's against what the code did. Meanwhile, it's confusing too on not explaining why passing in the details pointer would mean to skip all swap entries. New user of zap_details could very possibly miss this fact if they don't read deep until zap_pte_range() because there's no comment at zap_details talking about it at all, so swap entries could be errornously skipped without being noticed. This partly reverts 3e8715fdc03e ("mm: drop zap_details::check_swap_entries"), but introduce ZAP_FLAG_SKIP_SWAP flag, which means the opposite of previous "details" parameter: the caller should explicitly set this to skip swap entries, otherwise swap entries will always be considered (which is still the major case here). Cc: Kirill A. Shutemov Signed-off-by: Peter Xu --- include/linux/mm.h | 12 ++++++++++++ mm/memory.c | 8 +++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 39c944bf7ed3a..2227e9107e53e 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1704,6 +1704,8 @@ extern void user_shm_unlock(size_t, struct user_struct *); /* Whether to check page->mapping when zapping */ #define ZAP_FLAG_CHECK_MAPPING BIT(0) +/* Whether to skip zapping swap entries */ +#define ZAP_FLAG_SKIP_SWAP BIT(1) /* * Parameter block passed down to zap_pte_range in exceptional cases. @@ -1726,6 +1728,16 @@ zap_check_mapping_skip(struct zap_details *details, struct page *page) return details->zap_mapping != page_rmapping(page); } +/* Return true if skip swap entries, false otherwise */ +static inline bool +zap_skip_swap(struct zap_details *details) +{ + if (!details) + return false; + + return details->zap_flags & ZAP_FLAG_SKIP_SWAP; +} + struct page *vm_normal_page(struct vm_area_struct *vma, unsigned long addr, pte_t pte); struct page *vm_normal_page_pmd(struct vm_area_struct *vma, unsigned long addr, diff --git a/mm/memory.c b/mm/memory.c index 94954436544f7..5325c1c2cbd78 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -1284,8 +1284,7 @@ static unsigned long zap_pte_range(struct mmu_gather *tlb, continue; } - /* If details->check_mapping, we leave swap entries. */ - if (unlikely(details)) + if (unlikely(zap_skip_swap(details))) continue; if (!non_swap_entry(entry)) @@ -3236,7 +3235,10 @@ void unmap_mapping_pages(struct address_space *mapping, pgoff_t start, pgoff_t nr, bool even_cows) { pgoff_t first_index = start, last_index = start + nr - 1; - struct zap_details details = { .zap_mapping = mapping }; + struct zap_details details = { + .zap_mapping = mapping, + .zap_flags = ZAP_FLAG_SKIP_SWAP, + }; if (!even_cows) details.zap_flags |= ZAP_FLAG_CHECK_MAPPING;