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=-17.3 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 3CD75C433B4 for ; Tue, 20 Apr 2021 15:18:07 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 8F3AB613C9 for ; Tue, 20 Apr 2021 15:18:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8F3AB613C9 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 E9DF96B006C; Tue, 20 Apr 2021 11:18:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E74526B006E; Tue, 20 Apr 2021 11:18:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CED816B0070; Tue, 20 Apr 2021 11:18:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0106.hostedemail.com [216.40.44.106]) by kanga.kvack.org (Postfix) with ESMTP id B4C9E6B006C for ; Tue, 20 Apr 2021 11:18:05 -0400 (EDT) Received: from smtpin38.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 646D74DB8 for ; Tue, 20 Apr 2021 15:18:05 +0000 (UTC) X-FDA: 78053100930.38.B83340F Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by imf10.hostedemail.com (Postfix) with ESMTP id A4CB340002DD for ; Tue, 20 Apr 2021 15:17:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618931884; 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=I5ndW6k8mLw6k1PzLhNPYJ9rDrEc5/TU+m57YMg1P3Q=; b=QFO9Tz1K14ojRc0Ur8YaRpu7HffNsZzrA93cd5y7I1UfBEO775ZhgTgnsGIFvCx76KMn3d u3vfMqPdlkh+SlHn+Yiac2yTojPywjqv1QZ4kknEqod/xwcxzXLyFJ7TfKVbhMDXM+PuX3 U/3zkkvp7QSBQml6j9K0Icd2ndEQNTI= Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-259-hTFL6LSFMFCgCJ7CK0ALOA-1; Tue, 20 Apr 2021 11:18:02 -0400 X-MC-Unique: hTFL6LSFMFCgCJ7CK0ALOA-1 Received: by mail-ej1-f69.google.com with SMTP id d11-20020a170906370bb029037c87968c04so4922845ejc.17 for ; Tue, 20 Apr 2021 08:18:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; 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=I5ndW6k8mLw6k1PzLhNPYJ9rDrEc5/TU+m57YMg1P3Q=; b=ShvNZ3Clrb1l4dnUOb8xnPhl3xsfPAEU/vK7Y//xH8+Xm5BAolZ0MFP3MSwxehVvaj RUX4vh3oPma0vGMHGF/ptBKR/tcwCs1B06I4NXa+dHpbqrUaxvpEf1wDR99Hw4vb9pLY UzDjfmfL/vd0xOP0Zb1JUDsLTPI1kT22LhDhXRuLXlSXoP0/x5e0kgQvsrT7G2cyC2iT FbFNCsgOGWLrOpsW9xrJuPCNlKAitDvRc8yhZBJ/gglV88VGsF9bJIDYTxNFo2acq2NA LNo4t6O+tu8dw01V2eN1qha4vRTUnENEl9KkFKXvqoYSXDg/5KZNj63yJW4DpCVltG1C qr0Q== X-Gm-Message-State: AOAM5315ekJfujd1ghEoUIYNuH+EGV1hPJf8jwwIyRXmjOjKR331WLen UIhs7JaJkSIIgT61HzwM1LNYPz+33JhUF5Pac7vH8I5CI4AOwiwxXyNvGEPxtn1M4q0Rgb+Zm5S yayApQ5p4V4I= X-Received: by 2002:aa7:c683:: with SMTP id n3mr32232747edq.214.1618931880952; Tue, 20 Apr 2021 08:18:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxKrP/Z3igfJPaQi8yJZtC2FjNZPIjMXhA64NexGRfIVc/CrlZnXvE6wVD3xtThrpBxYqmr/Q== X-Received: by 2002:aa7:c683:: with SMTP id n3mr32232708edq.214.1618931880725; Tue, 20 Apr 2021 08:18:00 -0700 (PDT) Received: from [192.168.3.132] (p4ff2390a.dip0.t-ipconnect.de. [79.242.57.10]) by smtp.gmail.com with ESMTPSA id a17sm13193206ejx.13.2021.04.20.08.17.58 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 20 Apr 2021 08:18:00 -0700 (PDT) Subject: Re: [PATCH v3 1/2] secretmem/gup: don't check if page is secretmem without reference To: Mike Rapoport , Andrew Morton Cc: Alexander Viro , Andy Lutomirski , Arnd Bergmann , Borislav Petkov , Catalin Marinas , Christopher Lameter , Dan Williams , Dave Hansen , Elena Reshetova , "H. Peter Anvin" , Ingo Molnar , James Bottomley , "Kirill A. Shutemov" , Matthew Wilcox , Matthew Garrett , Mark Rutland , Michal Hocko , Mike Rapoport , Michael Kerrisk , Palmer Dabbelt , Paul Walmsley , Peter Zijlstra , "Rafael J. Wysocki" , Rick Edgecombe , Roman Gushchin , Shakeel Butt , Shuah Khan , Thomas Gleixner , Tycho Andersen , Will Deacon , Yury Norov , linux-api@vger.kernel.org, linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-nvdimm@lists.01.org, linux-riscv@lists.infradead.org, x86@kernel.org References: <20210420150049.14031-1-rppt@kernel.org> <20210420150049.14031-2-rppt@kernel.org> From: David Hildenbrand Organization: Red Hat Message-ID: Date: Tue, 20 Apr 2021 17:17:58 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 MIME-Version: 1.0 In-Reply-To: <20210420150049.14031-2-rppt@kernel.org> Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=david@redhat.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: rspam03 X-Rspamd-Queue-Id: A4CB340002DD X-Stat-Signature: c7mtudr836qs8u31hikjfd3kct9z7omt Received-SPF: none (redhat.com>: No applicable sender policy available) receiver=imf10; 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: 1618931877-187685 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 20.04.21 17:00, Mike Rapoport wrote: > From: Mike Rapoport > > The check in gup_pte_range() whether a page belongs to a secretmem mapping > is performed before grabbing the page reference. > > To avoid potential race move the check after try_grab_compound_head(). > > Signed-off-by: Mike Rapoport > --- > mm/gup.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/mm/gup.c b/mm/gup.c > index c3a17b189064..6515f82b0f32 100644 > --- a/mm/gup.c > +++ b/mm/gup.c > @@ -2080,13 +2080,15 @@ static int gup_pte_range(pmd_t pmd, unsigned long addr, unsigned long end, > VM_BUG_ON(!pfn_valid(pte_pfn(pte))); > page = pte_page(pte); > > - if (page_is_secretmem(page)) > - goto pte_unmap; > - > head = try_grab_compound_head(page, 1, flags); > if (!head) > goto pte_unmap; > > + if (unlikely(page_is_secretmem(page))) { > + put_compound_head(head, 1, flags); > + goto pte_unmap; > + } > + > if (unlikely(pte_val(pte) != pte_val(*ptep))) { > put_compound_head(head, 1, flags); > goto pte_unmap; > Reviewed-by: David Hildenbrand -- Thanks, David / dhildenb