From patchwork Wed Nov 10 08:40:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zheng X-Patchwork-Id: 12611591 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 322ABC433F5 for ; Wed, 10 Nov 2021 08:41:33 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id AFD9A61205 for ; Wed, 10 Nov 2021 08:41:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org AFD9A61205 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=bytedance.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 50D276B0071; Wed, 10 Nov 2021 03:41:32 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4BD1D6B0072; Wed, 10 Nov 2021 03:41:32 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3852D6B0073; Wed, 10 Nov 2021 03:41:32 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0202.hostedemail.com [216.40.44.202]) by kanga.kvack.org (Postfix) with ESMTP id 2A3E66B0071 for ; Wed, 10 Nov 2021 03:41:32 -0500 (EST) Received: from smtpin08.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id DF60C184E9AE7 for ; Wed, 10 Nov 2021 08:41:31 +0000 (UTC) X-FDA: 78792376782.08.BF0B31F Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) by imf03.hostedemail.com (Postfix) with ESMTP id 62C9930000AB for ; Wed, 10 Nov 2021 08:41:23 +0000 (UTC) Received: by mail-pf1-f180.google.com with SMTP id o4so1999536pfp.13 for ; Wed, 10 Nov 2021 00:41:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Qt7zreSDUacj2v2u5kH5eyo4ziYtzmNFB0lGNIs9uO4=; b=NOvrflc+LPqLg5YyJ0rxgNwEIVBSw1pADjLyV8ro/XVfNu+93Dhk9aWBGu5z1yKl11 pU2WHZsQcPuZ1TsBFF2jxdUPJRB0SxYRW25B8Z1RlmgCDqWbr+lumkv0THymyDNiBBdg aZX5cAhJt9ZV+lSjWzg0KqEjnm474BBKBIn+Cw5T9fWXZ/eYZYJdlcAfHq+pilrWPmib of6lU/cFOKihdZk83jXzwTz1kQFfIfllVaqWe/L05LL31mHl9BeSQvQCvHr58FyClY0g /6occjuka3lZoG/Zi5ObRJ0yf9G/7ruzf5qCNnehsWBS3udLIjYr8PT5bksrYIoqgAD+ fVFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Qt7zreSDUacj2v2u5kH5eyo4ziYtzmNFB0lGNIs9uO4=; b=TSEoUohAkU6aFoYsUZTIn3r5MERbDPdAM179SNcVE+jOki4+S2YdHR7Zi0EtFQgXAG za+viGqUz2dso4yBkuT4kojyFOvSMNlVR3WXZgFZxO85dhio6fxj5U1FYewq/y8GOBpN f9zos9bgDWWllWLx2jl9AMqbXRBRp9w/FT84lWOcl1z3N/Jfu4daZcQ9lgPzLztJInPk 2XSQPZNKOE8b8Mk0xUkQ66KaiVwJQp1jta9qxMRMUsC0tXe5W2v+UZyNoi/KyWsfVTlZ zQvAy3Jr+jiXxunauCo6Awr9Pw2xXDluRH349IuGC/vILJ4myDzKIH+oLWsqhW55EDYc ZuRA== X-Gm-Message-State: AOAM5323HJn2Esw3EYIvCoiTcj2/74aRDl5IDpEqYwyoVlVhwsuxlC/H d1/V4RittXQVBNjWthqnc+RtgjHK7U1wUQ== X-Google-Smtp-Source: ABdhPJwOUzG3sjGF9SIZl3T5LDP3eOmiS/U6BsPv+oNn3riL5hCu+fFDClnn2hk/JAQtx/Wcp9vD5w== X-Received: by 2002:a63:b603:: with SMTP id j3mr10572825pgf.427.1636533690702; Wed, 10 Nov 2021 00:41:30 -0800 (PST) Received: from C02DW0BEMD6R.bytedance.net ([139.177.225.251]) by smtp.gmail.com with ESMTPSA id v38sm5485368pgl.38.2021.11.10.00.41.24 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Nov 2021 00:41:30 -0800 (PST) From: Qi Zheng To: akpm@linux-foundation.org, tglx@linutronix.de, kirill.shutemov@linux.intel.com, mika.penttila@nextfour.com, david@redhat.com, jgg@nvidia.com Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, songmuchun@bytedance.com, zhouchengming@bytedance.com, Qi Zheng Subject: [PATCH v3 01/15] mm: do code cleanups to filemap_map_pmd() Date: Wed, 10 Nov 2021 16:40:43 +0800 Message-Id: <20211110084057.27676-2-zhengqi.arch@bytedance.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20211110084057.27676-1-zhengqi.arch@bytedance.com> References: <20211110084057.27676-1-zhengqi.arch@bytedance.com> MIME-Version: 1.0 X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 62C9930000AB X-Stat-Signature: e5iycn8sw5xtqnb81jf1fhs3wimtgsbb Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=bytedance-com.20210112.gappssmtp.com header.s=20210112 header.b=NOvrflc+; dmarc=pass (policy=none) header.from=bytedance.com; spf=pass (imf03.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.210.180 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com X-HE-Tag: 1636533683-720011 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: Currently we have two times the same few lines repeated in filemap_map_pmd(). Deduplicate them and fix some code style issues. Signed-off-by: Qi Zheng --- mm/filemap.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index daa0e23a6ee6..07c654202870 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -3203,11 +3203,8 @@ static bool filemap_map_pmd(struct vm_fault *vmf, struct page *page) struct mm_struct *mm = vmf->vma->vm_mm; /* Huge page is mapped? No need to proceed. */ - if (pmd_trans_huge(*vmf->pmd)) { - unlock_page(page); - put_page(page); - return true; - } + if (pmd_trans_huge(*vmf->pmd)) + goto out; if (pmd_none(*vmf->pmd) && PageTransHuge(page)) { vm_fault_t ret = do_set_pmd(vmf, page); @@ -3222,13 +3219,15 @@ static bool filemap_map_pmd(struct vm_fault *vmf, struct page *page) pmd_install(mm, vmf->pmd, &vmf->prealloc_pte); /* See comment in handle_pte_fault() */ - if (pmd_devmap_trans_unstable(vmf->pmd)) { - unlock_page(page); - put_page(page); - return true; - } + if (pmd_devmap_trans_unstable(vmf->pmd)) + goto out; return false; + +out: + unlock_page(page); + put_page(page); + return true; } static struct page *next_uptodate_page(struct page *page,