From patchwork Fri Aug 9 16:08:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 13758967 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 34761C3DA4A for ; Fri, 9 Aug 2024 16:13:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type: Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date :Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=bfMsI243pXvbDIYk3LIHdKnZKRp0h0WHhTX8nwPWLTI=; b=QKieir05PtdoGH/mQZG1V4b1Ti 3jFgG5wWgqbqhLIZSCbHGtSMUjlGPF6ES2Hqnv7+J/L2cXpyJ3O51TWTm3b62jSkiBRkHl4qyd3Bo QRgc4Te1m+nlgJ+BwQzwH/MXpRUZpOf11S08eql7AvGn7Q2L2ESShSGjDjZqbbQqH3XjGgo/fPhIy 2bkubnqj3F63ZPn5pkL2qpXYeDeeEuRItun9KEQxebxCUgGlTFqR1iZ7U/R+T0r02R8XdFEF0QsyA ywpINfHnYZMeD05Y4FmENMvkQdmJKRANafspwF5ed6bdIINi3V8PL99OJi2MweU3cw8MIT0q4gQ6e 9PwN/BSA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1scSEU-0000000Bqba-3uyb; Fri, 09 Aug 2024 16:12:50 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1scSBF-0000000BpP3-3pBu for linux-arm-kernel@lists.infradead.org; Fri, 09 Aug 2024 16:09:31 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1723219769; 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=bfMsI243pXvbDIYk3LIHdKnZKRp0h0WHhTX8nwPWLTI=; b=gBd4TJUhLvNQDYh1PUDUgel3bAtJU85/efPnUWHoaHH9sH1Agh0YmjeA2xolzfHxVEWxaj jXi8Qent0c1uqpyE4/KJasL8B1HC+HLtctnOFbrSP5O8JGu3QD6iC6fDKjolgG0ZX4XpW9 5PbJfmW8O0jT8Ttx8EEUJCWm3MeZzOs= Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-661-Qlvm6XNnOGGU2XnCd5syeA-1; Fri, 09 Aug 2024 12:09:27 -0400 X-MC-Unique: Qlvm6XNnOGGU2XnCd5syeA-1 Received: by mail-qt1-f199.google.com with SMTP id d75a77b69052e-44fe325cd56so2983921cf.1 for ; Fri, 09 Aug 2024 09:09:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723219767; x=1723824567; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bfMsI243pXvbDIYk3LIHdKnZKRp0h0WHhTX8nwPWLTI=; b=sZz/U4Xal3znuwFWlOZes5GwCFR2AtHrHqnFcJzupgYAywnaGKeMAt5RaG7kOfU92l 94YHIbs7wOcJYLhBjiE/JImsrBuxagOoCs5PrtTUPSyJwWgaIvD5hbSMpMjyhFQHbRS2 nJEoeuKG2DdYaanF6Vg3qvWGwxMIbMzyvJmsswM/im5GfvejQzCBS9b2ZDL78aTn7GDX 5yxQQVyxSphaViQyXziRasQuZv/l/Ac/QPvGa8vxwB/zCjNV1Y14hinFgWLt4eWRQYJA YMOuHUSgSPm5cSDuDH8QARXnoShuhdbu68cK+Au/9h7liBRtKi7CoSWCG+f6VPJr2nsF Nukg== X-Forwarded-Encrypted: i=1; AJvYcCVjWecKWIX8nWxDV/pCj2887t2G1qWHciifdVY2QcxYLH5yo9n/bxUquWRk4JP16QCRpWk7R7Ee9tc4ipDPJnzg@lists.infradead.org X-Gm-Message-State: AOJu0YyOaNaE30hriPnr7IszWygkbSFEP+aMefyd00DBOwjgxQvhmnsd zzfa5soQYRED5H2hJSQk7yFTiFfB9qAYSbbdWbBpJ6qS8apzuzppjYIjfeUMTIO5xF297lmiPeT 4XrrvzKexzQMNGIaQHujDYSSjIDk84cs8ePwgUZmsGz/ZQTheQQyA6Vjyz+2VfG2AYt47rxxW X-Received: by 2002:ac8:59cc:0:b0:44f:c953:290d with SMTP id d75a77b69052e-4531251d17bmr12886111cf.2.1723219766851; Fri, 09 Aug 2024 09:09:26 -0700 (PDT) X-Google-Smtp-Source: AGHT+IElkbLJ8q6bD88BtBGZOYKdaksYNPrmA3JWwjtOEQ9+GQ5ZX+OpUCG/V8WuVaLDdrJFvk6CQQ== X-Received: by 2002:ac8:59cc:0:b0:44f:c953:290d with SMTP id d75a77b69052e-4531251d17bmr12885751cf.2.1723219766412; Fri, 09 Aug 2024 09:09:26 -0700 (PDT) Received: from x1n.redhat.com (pool-99-254-121-117.cpe.net.cable.rogers.com. [99.254.121.117]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-451c870016csm22526741cf.19.2024.08.09.09.09.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Aug 2024 09:09:25 -0700 (PDT) From: Peter Xu To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Sean Christopherson , Oscar Salvador , Jason Gunthorpe , Axel Rasmussen , linux-arm-kernel@lists.infradead.org, x86@kernel.org, peterx@redhat.com, Will Deacon , Gavin Shan , Paolo Bonzini , Zi Yan , Andrew Morton , Catalin Marinas , Ingo Molnar , Alistair Popple , Borislav Petkov , David Hildenbrand , Thomas Gleixner , kvm@vger.kernel.org, Dave Hansen , Alex Williamson , Yan Zhao Subject: [PATCH 05/19] mm/gup: Detect huge pfnmap entries in gup-fast Date: Fri, 9 Aug 2024 12:08:55 -0400 Message-ID: <20240809160909.1023470-6-peterx@redhat.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240809160909.1023470-1-peterx@redhat.com> References: <20240809160909.1023470-1-peterx@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240809_090930_094216_1DBBB0B3 X-CRM114-Status: GOOD ( 12.08 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Since gup-fast doesn't have the vma reference, teach it to detect such huge pfnmaps by checking the special bit for pmd/pud too, just like ptes. Signed-off-by: Peter Xu Acked-by: David Hildenbrand Reviewed-by: Jason Gunthorpe --- mm/gup.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mm/gup.c b/mm/gup.c index d19884e097fd..a49f67a512ee 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -3038,6 +3038,9 @@ static int gup_fast_pmd_leaf(pmd_t orig, pmd_t *pmdp, unsigned long addr, if (!pmd_access_permitted(orig, flags & FOLL_WRITE)) return 0; + if (pmd_special(orig)) + return 0; + if (pmd_devmap(orig)) { if (unlikely(flags & FOLL_LONGTERM)) return 0; @@ -3082,6 +3085,9 @@ static int gup_fast_pud_leaf(pud_t orig, pud_t *pudp, unsigned long addr, if (!pud_access_permitted(orig, flags & FOLL_WRITE)) return 0; + if (pud_special(orig)) + return 0; + if (pud_devmap(orig)) { if (unlikely(flags & FOLL_LONGTERM)) return 0;