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 X-Spam-Level: X-Spam-Status: No, score=-15.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 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 31162C433EF for ; Thu, 23 Sep 2021 15:30:12 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id A399761029 for ; Thu, 23 Sep 2021 15:30:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org A399761029 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 2B682900003; Thu, 23 Sep 2021 11:30:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 26543900002; Thu, 23 Sep 2021 11:30:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 15572900003; Thu, 23 Sep 2021 11:30:11 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0221.hostedemail.com [216.40.44.221]) by kanga.kvack.org (Postfix) with ESMTP id 07EFD900002 for ; Thu, 23 Sep 2021 11:30:11 -0400 (EDT) Received: from smtpin36.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id B28811836B08B for ; Thu, 23 Sep 2021 15:30:10 +0000 (UTC) X-FDA: 78619224180.36.168698C Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by imf20.hostedemail.com (Postfix) with ESMTP id 60C91D0000B1 for ; Thu, 23 Sep 2021 15:30:07 +0000 (UTC) Received: by mail-pf1-f181.google.com with SMTP id 203so6020455pfy.13 for ; Thu, 23 Sep 2021 08:30:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20210112.gappssmtp.com; s=20210112; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=ZUy1p6PSvt5yN2wZ9JfbzOdoAH6IHdQaxa/WlcclC5A=; b=vBJT9bZ8UIrkJtobhhnlh/mB+9KIPZv0ORskTyPFxmF+FPTxARiT5mBkoOp4F9mJks oV6BXGQb/eIRLo7yw1UkrIb4oA8h6QSYDosiir5tiSGZwJ+1XGFfReDn0ZXK8DbWv0vG uXpJw66fJjk1G80xiF43wKowpDLn/Dnw+1zbv7nSJQaMK6KiO2dFFkW/lAJIkffK5qTN NNdqalKGAv57XsF3w27sPN4uY7kOE3bDk+4bdgW192dqqnKkvA3aTuh8rBj50AFs73i6 5V03TECnDljVWWcxfxdIQCL64+pM8IfCp114L/JzIkqAhlj+9SMt3/kadYYWaQOMqGef 6unQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=ZUy1p6PSvt5yN2wZ9JfbzOdoAH6IHdQaxa/WlcclC5A=; b=eWb33cir0y9nLvbwDTwU85PMnGfTjKIeAFwT3JQ5c8k94Dmtt0R4h8eeyU3g1t8sNi 5TY1fg+iGeYTxzbl3GFl80DljSEpKepnoTI1vcIKQVcKtKzbF3KZc9pD/znxu4AlsAUF DZ94k5eQgGsrX4UAaWX+79jCxZ13YKkazocKYe4vsws4bQLhZHecNA5/8UGbiKXf7o/u IM89p7jlmTXOO0lsqhpxTnKHAARWzLlE0BXmKSXD4o18gRJjTixzXdBmA8nRfiS1iKLp 4YnrHl1WdGbxnDi2zjKd830odOuY8sYU1ZGru+MBb7V/0l52yM5i53xxE/n9v3KsrY4t uDPw== X-Gm-Message-State: AOAM531UWV0u0dJvaUr8Jxpf/5qYtd/yTVy4YQRau4GZbHEt2VkCQtHK UUs4B+yEMI9gxe36KLjL9ZIG8Q== X-Google-Smtp-Source: ABdhPJzlRgeEr2IwjeVRqkMvNkcTvR86bvibTMPjWX++/ibNnSHZgn4GAdjqkrTH9WD3WFAmx9RjCg== X-Received: by 2002:a65:6107:: with SMTP id z7mr4762144pgu.43.1632411005784; Thu, 23 Sep 2021 08:30:05 -0700 (PDT) Received: from [10.255.74.217] ([139.177.225.249]) by smtp.gmail.com with ESMTPSA id h10sm9044360pjs.51.2021.09.23.08.30.03 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 23 Sep 2021 08:30:05 -0700 (PDT) Subject: Re: [PATCH] mm/memory_failure: Fix the missing pte_unmap() call To: David Hildenbrand , naoya.horiguchi@nec.com, akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, songmuchun@bytedance.com References: <20210923122642.4999-1-zhengqi.arch@bytedance.com> <7330e2e0-9dc4-e412-a821-ed62a469371d@redhat.com> From: Qi Zheng Message-ID: <7a93c298-fd78-1963-a9f6-b4a7191bf747@bytedance.com> Date: Thu, 23 Sep 2021 23:30:01 +0800 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:78.0) Gecko/20100101 Thunderbird/78.14.0 MIME-Version: 1.0 In-Reply-To: <7330e2e0-9dc4-e412-a821-ed62a469371d@redhat.com> Content-Type: text/plain; charset=utf-8; format=flowed Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=bytedance-com.20210112.gappssmtp.com header.s=20210112 header.b=vBJT9bZ8; spf=pass (imf20.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.210.181 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com; dmarc=pass (policy=none) header.from=bytedance.com X-Stat-Signature: wfwnkie8e3one64k35uryxn1ecm7u4sj X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 60C91D0000B1 X-HE-Tag: 1632411007-890565 Content-Transfer-Encoding: quoted-printable 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 9/23/21 11:19 PM, David Hildenbrand wrote: > On 23.09.21 14:26, Qi Zheng wrote: >> The paired pte_unmap() call is missing before the >> dev_pagemap_mapping_shift() returns. So fix it. >> >> Signed-off-by: Qi Zheng >> --- >> =C2=A0 mm/memory-failure.c | 9 ++++++--- >> =C2=A0 1 file changed, 6 insertions(+), 3 deletions(-) >> >> diff --git a/mm/memory-failure.c b/mm/memory-failure.c >> index e2984c123e7e..4e5419f16fd4 100644 >> --- a/mm/memory-failure.c >> +++ b/mm/memory-failure.c >> @@ -306,6 +306,7 @@ static unsigned long=20 >> dev_pagemap_mapping_shift(struct page *page, >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 struct vm_area_= struct *vma) >> =C2=A0 { >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 unsigned long address =3D vma_address(p= age, vma); >> +=C2=A0=C2=A0=C2=A0 unsigned long ret =3D 0; >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 pgd_t *pgd; >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 p4d_t *p4d; >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 pud_t *pud; >> @@ -330,10 +331,12 @@ static unsigned long=20 >> dev_pagemap_mapping_shift(struct page *page, >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 return PMD_SHIF= T; >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 pte =3D pte_offset_map(pmd, address); >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if (!pte_present(*pte)) >> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 return 0; >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 goto unmap; >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if (pte_devmap(*pte)) >> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 return PAGE_SHIFT; >> -=C2=A0=C2=A0=C2=A0 return 0; >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ret =3D PAGE_SHIFT; >> +unmap: >> +=C2=A0=C2=A0=C2=A0 pte_unmap(pte); >> +=C2=A0=C2=A0=C2=A0 return ret; >> =C2=A0 } >> =C2=A0 /* >> >=20 > I guess this code never runs on 32bit / highmem, that's why we didn't=20 > notice so far. I guess so too. >=20 > Reviewed-by: David Hildenbrand >=20 Thanks, Qi