From mboxrd@z Thu Jan 1 00:00:00 1970 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 602D5C433EF for ; Sat, 18 Jun 2022 18:59:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 732096B0071; Sat, 18 Jun 2022 14:59:12 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6E24A6B0073; Sat, 18 Jun 2022 14:59:12 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5D1BE6B0074; Sat, 18 Jun 2022 14:59:12 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 4E0476B0071 for ; Sat, 18 Jun 2022 14:59:12 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay12.hostedemail.com (Postfix) with ESMTP id 12DD012043F for ; Sat, 18 Jun 2022 18:59:12 +0000 (UTC) X-FDA: 79592269344.13.073DFAD Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf31.hostedemail.com (Postfix) with ESMTP id A24E920003 for ; Sat, 18 Jun 2022 18:59:11 +0000 (UTC) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id A823E60F2D; Sat, 18 Jun 2022 18:59:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 02BF8C3411A; Sat, 18 Jun 2022 18:59:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1655578750; bh=ws53h1NXmmX0cetrK3lrrXLOfLYkEXhOk2mt+zenb5A=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=Kt9FDGEs/IUr4/Kscyl9J5QUMEe4BtJVLy+eoV8NRuM0wDG9PdNps5+0RWAvEQeCG +awOToJuV/HCJo46hbINa8oIjo7h4RpXzUm7+4vPlscD5CePGO/OMW2lCuF+seZMsO u/WyUaPSUFnaAmungcQNUxqsJRSapX6gNy0OeQU0= Date: Sat, 18 Jun 2022 11:59:09 -0700 From: Andrew Morton To: Miaohe Lin Cc: , Subject: Re: [PATCH] mm/madvise: minor cleanup for swapin_walk_pmd_entry() Message-Id: <20220618115909.5f2d1a4da68cc4115e73d14a@linux-foundation.org> In-Reply-To: <20220618090527.37843-1-linmiaohe@huawei.com> References: <20220618090527.37843-1-linmiaohe@huawei.com> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.33; x86_64-redhat-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1655578751; h=from:from:sender: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:dkim-signature; bh=Bq77mBqohYDlUq/DPQg1RdEYLtr9iA8+XLTVtuWsNO8=; b=zfv0yWywzxtIeqF4QzBHmSjBeTxTQUjpF5gvvp4b8sMxjV1/9FBcW0RauS8FhlGJuQEcy6 qdqF2ou/7hU4u2YGFNKTwkd8vLOIkk740tHsOww/bVkaCYcfS2YHD15jcSfnEEQkw0HaSu sA2/bkDcvlF0500AMbD3JvyPtudncik= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1655578751; a=rsa-sha256; cv=none; b=eUQ/7DE+cNAcQ/pe0LAQ6P2OvYmt99nbXTbQJgeFdrbpHTwmjsdkGeAIextJAtkX8if0Iu v5qpYAHcZh9sMSW7oF2fHVTS6C/v77RPKqQORNOWS4DQydm+ilnRYM/Rxolesjactay3Y7 WXychnfnrBccO0Rnpxf7EmCetoz5Tgg= ARC-Authentication-Results: i=1; imf31.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=Kt9FDGEs; spf=pass (imf31.hostedemail.com: domain of akpm@linux-foundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org; dmarc=none X-Stat-Signature: jtzz3xzaw8rry98xcbxjqgd1hqq9stkc Authentication-Results: imf31.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=Kt9FDGEs; spf=pass (imf31.hostedemail.com: domain of akpm@linux-foundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org; dmarc=none X-Rspamd-Queue-Id: A24E920003 X-Rspamd-Server: rspam02 X-Rspam-User: X-HE-Tag: 1655578751-867840 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: On Sat, 18 Jun 2022 17:05:27 +0800 Miaohe Lin wrote: > Passing index to pte_offset_map_lock() directly so the below calculation > can be avoided. Rename orig_pte to ptep as it's not changed. Also use > helper is_swap_pte() to improve the readability. No functional change > intended. > > ... > > --- a/mm/madvise.c > +++ b/mm/madvise.c > @@ -195,7 +195,7 @@ static int madvise_update_vma(struct vm_area_struct *vma, > static int swapin_walk_pmd_entry(pmd_t *pmd, unsigned long start, > unsigned long end, struct mm_walk *walk) > { > - pte_t *orig_pte; > + pte_t *ptep; > struct vm_area_struct *vma = walk->private; > unsigned long index; > struct swap_iocb *splug = NULL; > @@ -209,11 +209,11 @@ static int swapin_walk_pmd_entry(pmd_t *pmd, unsigned long start, > struct page *page; > spinlock_t *ptl; > > - orig_pte = pte_offset_map_lock(vma->vm_mm, pmd, start, &ptl); > - pte = *(orig_pte + ((index - start) / PAGE_SIZE)); > - pte_unmap_unlock(orig_pte, ptl); > + ptep = pte_offset_map_lock(vma->vm_mm, pmd, index, &ptl); > + pte = *ptep; > + pte_unmap_unlock(ptep, ptl); > > - if (pte_present(pte) || pte_none(pte)) > + if (!is_swap_pte(pte)) > continue; > entry = pte_to_swp_entry(pte); > if (unlikely(non_swap_entry(entry))) Also... From: Andrew Morton Subject: mm-madvise-minor-cleanup-for-swapin_walk_pmd_entry-fix Date: Sat Jun 18 11:58:03 AM PDT 2022 reduce scope of `ptep' Cc: Miaohe Lin Signed-off-by: Andrew Morton --- mm/madvise.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/mm/madvise.c~mm-madvise-minor-cleanup-for-swapin_walk_pmd_entry-fix +++ a/mm/madvise.c @@ -195,7 +195,6 @@ success: static int swapin_walk_pmd_entry(pmd_t *pmd, unsigned long start, unsigned long end, struct mm_walk *walk) { - pte_t *ptep; struct vm_area_struct *vma = walk->private; unsigned long index; struct swap_iocb *splug = NULL; @@ -208,6 +207,7 @@ static int swapin_walk_pmd_entry(pmd_t * swp_entry_t entry; struct page *page; spinlock_t *ptl; + pte_t *ptep; ptep = pte_offset_map_lock(vma->vm_mm, pmd, index, &ptl); pte = *ptep; _