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=-18.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,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 90C2EC433EF for ; Thu, 23 Sep 2021 15:19:29 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 0C08C60F12 for ; Thu, 23 Sep 2021 15:19:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 0C08C60F12 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 707A7900002; Thu, 23 Sep 2021 11:19:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6C1F66B0071; Thu, 23 Sep 2021 11:19:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 55778900002; Thu, 23 Sep 2021 11:19:28 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0065.hostedemail.com [216.40.44.65]) by kanga.kvack.org (Postfix) with ESMTP id 42E1C6B006C for ; Thu, 23 Sep 2021 11:19:28 -0400 (EDT) Received: from smtpin35.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id DF41A180F68B8 for ; Thu, 23 Sep 2021 15:19:27 +0000 (UTC) X-FDA: 78619197174.35.32FD82C Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf05.hostedemail.com (Postfix) with ESMTP id 7FCAF505F6EA for ; Thu, 23 Sep 2021 15:19:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1632410366; 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=XGCu5vIJXzqgCg8xHHPR2KnAZqh2TqcPDCJS3P0Px/M=; b=OOScl6DmnfFbMOFAVD8EJbi2llvkK9t9+4MR4QTWl2Q3aLUHJCGOD/QCzbfUgBOY+cpNim 4pMjG0dePgv84fA/4N2uDFYkXOYr4Ww6/YWVnwFwUdF5iiBGs0Bq1dvv2/O4FucnyaqT5s dJdqfOakDRUMLenLoUPacHDne/Mskfc= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-318-NR9nKCZyNaa3m16r04ydwA-1; Thu, 23 Sep 2021 11:19:25 -0400 X-MC-Unique: NR9nKCZyNaa3m16r04ydwA-1 Received: by mail-wr1-f72.google.com with SMTP id m18-20020adfe952000000b0015b0aa32fd6so5426181wrn.12 for ; Thu, 23 Sep 2021 08:19:25 -0700 (PDT) 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:organization :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=XGCu5vIJXzqgCg8xHHPR2KnAZqh2TqcPDCJS3P0Px/M=; b=B8VvcayQixmcfkiAR9SkSKoTzUZAFybXZZkFd5JRF3BU77mJAww+xOnk9me0hATtFX oMZGh0p0I3LBxEVpYv+7Gr4r6PP4qZSISR5/nLw0XCz9K+50hpxsB/zI1yjVq3bX+PZK Yn9jZHzwciGb4iJszm0LnowcXVr8Oc/9RLBzjOK2SF1vplusULt9hvWwS4f4rUTgwJoX WpAnSXkswcU/yJEJt828Q8nXFdDXB0c5E0Tdmo1BatBvHQzhu+12qGa/KY3uK/kVC5eK 2fzs2upHEsbUm7GE1XSJFkxar86eWzcfmMJM2si2Bv2I/0kd0YWRyWEHuxv7b2UbZt98 4VRw== X-Gm-Message-State: AOAM532DD/6NMY8CCzOI4FJSF9j1WfymAiuUCuXbFprPPLCIPuhhUXxV FLZ8PFwwBcyVlr4AFfbyOgKloExqr6rIVb+6IfewEszP73QAi3TZu/CE0slKhQDKtxpxa97PaVk jsrqpVuxi/9I= X-Received: by 2002:a05:600c:4642:: with SMTP id n2mr16390948wmo.39.1632410364499; Thu, 23 Sep 2021 08:19:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwSN9YInxHJH0+b/VUtAFg6XTyNqR/4Wp+Pvtm/ukXlGQBhABku40FhX82R08bdZ8ySOn/iiQ== X-Received: by 2002:a05:600c:4642:: with SMTP id n2mr16390921wmo.39.1632410364252; Thu, 23 Sep 2021 08:19:24 -0700 (PDT) Received: from [192.168.3.132] (p4ff23e5d.dip0.t-ipconnect.de. [79.242.62.93]) by smtp.gmail.com with ESMTPSA id j4sm5899868wrt.67.2021.09.23.08.19.23 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 23 Sep 2021 08:19:23 -0700 (PDT) Subject: Re: [PATCH] mm/memory_failure: Fix the missing pte_unmap() call To: Qi Zheng , 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> From: David Hildenbrand Organization: Red Hat Message-ID: <7330e2e0-9dc4-e412-a821-ed62a469371d@redhat.com> Date: Thu, 23 Sep 2021 17:19:22 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <20210923122642.4999-1-zhengqi.arch@bytedance.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 7FCAF505F6EA X-Stat-Signature: zdxkh74dnrtru7yq81rrnmei9x53opzj Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=OOScl6Dm; spf=none (imf05.hostedemail.com: domain of david@redhat.com has no SPF policy when checking 170.10.133.124) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com X-HE-Tag: 1632410367-582869 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 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 > --- > mm/memory-failure.c | 9 ++++++--- > 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 dev_pagemap_mapping_shift(struct page *page, > struct vm_area_struct *vma) > { > unsigned long address = vma_address(page, vma); > + unsigned long ret = 0; > pgd_t *pgd; > p4d_t *p4d; > pud_t *pud; > @@ -330,10 +331,12 @@ static unsigned long dev_pagemap_mapping_shift(struct page *page, > return PMD_SHIFT; > pte = pte_offset_map(pmd, address); > if (!pte_present(*pte)) > - return 0; > + goto unmap; > if (pte_devmap(*pte)) > - return PAGE_SHIFT; > - return 0; > + ret = PAGE_SHIFT; > +unmap: > + pte_unmap(pte); > + return ret; > } > > /* > I guess this code never runs on 32bit / highmem, that's why we didn't notice so far. Reviewed-by: David Hildenbrand -- Thanks, David / dhildenb