Message ID | baef2acf-7368-79a-a27-a87c2f2dfcb@google.com (mailing list archive) |
---|---|
State | New |
Headers | show
Return-Path: <owner-linux-mm@kvack.org> 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 E19A8C77B7C for <linux-mm@archiver.kernel.org>; Wed, 10 May 2023 04:47:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5BE576B0074; Wed, 10 May 2023 00:47:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 545B86B0075; Wed, 10 May 2023 00:47:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3E6D66B0078; Wed, 10 May 2023 00:47:19 -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 2B6E26B0074 for <linux-mm@kvack.org>; Wed, 10 May 2023 00:47:19 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id EAC9714020D for <linux-mm@kvack.org>; Wed, 10 May 2023 04:47:18 +0000 (UTC) X-FDA: 80773111356.28.EA5385D Received: from mail-yb1-f179.google.com (mail-yb1-f179.google.com [209.85.219.179]) by imf08.hostedemail.com (Postfix) with ESMTP id F15F5160016 for <linux-mm@kvack.org>; Wed, 10 May 2023 04:47:16 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b="o+pw/Fxe"; spf=pass (imf08.hostedemail.com: domain of hughd@google.com designates 209.85.219.179 as permitted sender) smtp.mailfrom=hughd@google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1683694037; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=hqbvyW6crf6toTfKG311uSxHzLZVjYgM3m9zpPIhyDA=; b=CCVYX0NHrX1W5STXQLS9/0ogsEmTil70z4PNZBFNkWYDDXtA0uL/JKKpOh5MVQBQtvtfRF ZIpQD7j7PCFAaSXrIjtMOaCu0w+EUXOJ9pLn6SVs/b2gs8abliyTTrHNgej1mp/TeprxW9 kARCTtRPdKUOFMwh3siIQLyIJrM8jLk= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1683694037; a=rsa-sha256; cv=none; b=UsBBOCg3B/pSUdazjkdZp7/jvrXqSaQ2LTzsxhdBC3A/t0VVZqVZQD0+V+TPAlkhQngMc/ 0spRZH+kFamoz0INh4r/7IK6m1YwbCeOFMDI/iA+EzUdAS8uNRmy7L32OnBxfiIpATtPe3 7UXFIIkei2kx0W3EgDZnxXchZynIdfk= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b="o+pw/Fxe"; spf=pass (imf08.hostedemail.com: domain of hughd@google.com designates 209.85.219.179 as permitted sender) smtp.mailfrom=hughd@google.com; dmarc=pass (policy=reject) header.from=google.com Received: by mail-yb1-f179.google.com with SMTP id 3f1490d57ef6-b9246a5f3feso10156291276.1 for <linux-mm@kvack.org>; Tue, 09 May 2023 21:47:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1683694036; x=1686286036; h=mime-version:references:message-id:in-reply-to:subject:cc:to:from :date:from:to:cc:subject:date:message-id:reply-to; bh=hqbvyW6crf6toTfKG311uSxHzLZVjYgM3m9zpPIhyDA=; b=o+pw/FxefUIAOoasXSGcewgZKtzCiK6gey4asLS52yE6RcSKCLcg/5+Oke4t4tL5mt WY+uEeh7LusBVdVQVoeJLXBzhVEJAgg/+wrnr5YnLWD3Y+xgGcCb1JLs6JvP8/f0rR6I tOIJAEnPqeFziCHRIMxBgLXFbcRpC1yoUKiEwz+VxRsKMOaCzI+eqG6JH5jyJ802ZkSp N+BiAknrKD5ka0lvzxWcjKQzAZAWQASg3Zoa2F4mVxsPlzCTR7qCguvvguU/AtX+AHcL WDe1lJ7cP45MCFknO9sG2YoZVBoQ/kny4LfOudEYqHVSkK2nfJ78GhDEjEHbvmzj6Rt9 PQHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683694036; x=1686286036; h=mime-version:references:message-id:in-reply-to:subject:cc:to:from :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=hqbvyW6crf6toTfKG311uSxHzLZVjYgM3m9zpPIhyDA=; b=NPsxTVEMo3PPv40fPV+mkYPEUO5fhaxuzZDIsPvlD+oKT7sPnerQXnmg3oNO0ppf5a x454jHaUiwVvBW6xBRxS9BOmUc6AQ5+yYxkms2f9hvAi4cdnz918Bg8fZJxxnhpChdh+ g9XI5PecCXhDZP9EQ6m2FiTUGZ/hRunggdbneN3S+bFlu8M7fqrYE7GvBoIOaVV6VTP8 T6nNIB+dKgzm5QKiFe+sTqZk6+ZYVUn+YetU5GPKZSyEXznm3H50LZVnGOKyhsHXeKKJ F2i9OfJWbKc3BGIMYFuzYBRNCHG5C6gZ1hcbBAO7VqSqivJmMWa0qAqN5Br4RQ4D4kVz xM2A== X-Gm-Message-State: AC+VfDw9go0fXexJYvkp+VTniz4wABGKXnGTbvDS/fQY3uVyrEAenB0n H+hYfRthcD+GJ2BNIsDiUAYXrw== X-Google-Smtp-Source: ACHHUZ7chwpqHYv2bkU0Ao/t6DWECrNjxiYg/IB0spMttiifVb5o/XZ8DrM/lCVX0msD4U/PtCIM9g== X-Received: by 2002:a05:6902:1883:b0:b9d:58d9:8c with SMTP id cj3-20020a056902188300b00b9d58d9008cmr22251628ybb.11.1683694035986; Tue, 09 May 2023 21:47:15 -0700 (PDT) Received: from ripple.attlocal.net (172-10-233-147.lightspeed.sntcca.sbcglobal.net. [172.10.233.147]) by smtp.gmail.com with ESMTPSA id 185-20020a2506c2000000b00b9dc4620f95sm3505720ybg.6.2023.05.09.21.47.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 May 2023 21:47:15 -0700 (PDT) Date: Tue, 9 May 2023 21:47:11 -0700 (PDT) From: Hugh Dickins <hughd@google.com> X-X-Sender: hugh@ripple.attlocal.net To: Andrew Morton <akpm@linux-foundation.org> cc: Mike Kravetz <mike.kravetz@oracle.com>, Mike Rapoport <rppt@kernel.org>, "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>, Matthew Wilcox <willy@infradead.org>, David Hildenbrand <david@redhat.com>, Suren Baghdasaryan <surenb@google.com>, Qi Zheng <zhengqi.arch@bytedance.com>, Russell King <linux@armlinux.org.uk>, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will@kernel.org>, Geert Uytterhoeven <geert@linux-m68k.org>, Greg Ungerer <gerg@linux-m68k.org>, Michal Simek <monstr@monstr.eu>, Thomas Bogendoerfer <tsbogend@alpha.franken.de>, Helge Deller <deller@gmx.de>, John David Anglin <dave.anglin@bell.net>, "Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com>, Michael Ellerman <mpe@ellerman.id.au>, Alexandre Ghiti <alexghiti@rivosinc.com>, Palmer Dabbelt <palmer@dabbelt.com>, Heiko Carstens <hca@linux.ibm.com>, Christian Borntraeger <borntraeger@linux.ibm.com>, Claudio Imbrenda <imbrenda@linux.ibm.com>, John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>, "David S. Miller" <davem@davemloft.net>, Chris Zankel <chris@zankel.net>, Max Filippov <jcmvbkbc@gmail.com>, x86@kernel.org, linux-arm-kernel@lists.infradead.org, linux-ia64@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 04/23] ia64/hugetlb: pte_alloc_huge() pte_offset_huge() In-Reply-To: <77a5d8c-406b-7068-4f17-23b7ac53bc83@google.com> Message-ID: <baef2acf-7368-79a-a27-a87c2f2dfcb@google.com> References: <77a5d8c-406b-7068-4f17-23b7ac53bc83@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Rspamd-Queue-Id: F15F5160016 X-Stat-Signature: 3onqspbcyyw3t4cpp46ko4uqtmyrtjpi X-Rspam-User: X-Rspamd-Server: rspam09 X-HE-Tag: 1683694036-523436 X-HE-Meta: U2FsdGVkX1/xKBrPnlStdxWQd0sTHXK67CqUwZ8kUzSt1cmjciWAl/wtqELutHhhTZL5/SM8OybTqjjW5W64xcS02/hHPjMzgAWaaYBsgWiYSjuutpXUYMtSC9pF8xtPj0WFzf4uTjPkwJ7Imz3UEuN9frzxszLJatz0r5s9yXMWAXpAuQ+LWmYv7fL+HEUABA6dsX5tWj3yaFYVuRkXso5vJ+zoK3YfCxDbVddcksg/um8cRLWAk8YRcO/GvGUHepDViPrpLE4BjFWToZdy5xV/I/xSXWdfAqcGM+0F0kANEostK0roFn8YEDNhKB1NgY9XNF2wQF0UnETDzN2gTZhV2ae3l4YnX0WnrBhPIXk/Af7c8L5eeJWb46RZG9wKN0TEwBoXmRe6e9qUzSqvt8R5IEetxBOkeDQCy0YjprCnh9/UxK+b6yi7y6zPac9PzzSttDshb2wAn8HVRCYyp2q9CPcVic72hegzHTt7rEsG+HLByX9Tvj5EB9cQjonCZnD0KeUo65d8xke7cLenMC+SXcjb2dvPq9/383JNiulSPXtma37IPp3VTDGXIfZ2Vz13CK2Lwp4gOuOyC/Av1v957yHqN7pARQk6+FrIpjFppdIAlUjXluaQSEOeJuDB8wGJKgqLl+ftWwnSuhM8w6sS8IW+ZMandjdhyesozKW8bD3oSovI0Z3j5jlFx3v9xmzzgA/3T0hIln/q04+/7uNg7z6Z2JFWf5uBsc21IHcCUjYkqoD8M/+YSCNh2newDCm3IZqlqacTZK0+hi4g+6mWvxV8CtZAIXxKq/9OreHbJx4P4FZOXjgflXr2H59UsyW4/YLjJpu5CjYZ6GksZLt9hNDe99g84rv5nQbL3esohJMstR37c/j/27IyJMjX3u5g9CQmuPsBC+URWwAq6X4OpxpaS2g5lG3xdda4L+35OEus2DGTFqGOpiJONrfW8IDo19CaRFMAyIdfL59 RZEW+YGi +z1Y2ROMdZCCsxqzyFDizTiTMb2//wWXhcTJzff0sInTdswS4CSe5cAuU9Q/3ACQrnlTi65a980wJKsLQOyfm/Pbvq70XUnuZwvdc2sdb7MLyHLrXJYisiwL46SVizGt9Lm9TeE05aqMLgCz5nqgLz4tzNHIbdTs8QYViv2GCNQGdp4/T3g+c3Scfh3+Ct2O+harNmuz6V3dK6IRfVAhC62CCZOgWUf0BsvN1p+nn3G24m4ubeHJ06ss0Ff+heNM0higjpfqUzUEwiG1wXn3ViplnSkNSsqn+n64tRzeS2vbtvrZJlKxXwdNVKRQj10hHcdkbr4k6m7suukRktkXX0zADye+7zbRWm1mdtO5a+NnAhMIS6BR5tc87PlXRlvMt+GdiVuy4jTHw/2f05k1hRD24TUxXclX+1x0wH1OLvCkC8kMR+m0u9q65qw== 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: <linux-mm.kvack.org> |
Series |
arch: allow pte_offset_map[_lock]() to fail
|
expand
|
diff --git a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c index 78a02e026164..adc49f2d22e8 100644 --- a/arch/ia64/mm/hugetlbpage.c +++ b/arch/ia64/mm/hugetlbpage.c @@ -41,7 +41,7 @@ huge_pte_alloc(struct mm_struct *mm, struct vm_area_struct *vma, if (pud) { pmd = pmd_alloc(mm, pud, taddr); if (pmd) - pte = pte_alloc_map(mm, pmd, taddr); + pte = pte_alloc_huge(mm, pmd, taddr); } return pte; } @@ -64,7 +64,7 @@ huge_pte_offset (struct mm_struct *mm, unsigned long addr, unsigned long sz) if (pud_present(*pud)) { pmd = pmd_offset(pud, taddr); if (pmd_present(*pmd)) - pte = pte_offset_map(pmd, taddr); + pte = pte_offset_huge(pmd, taddr); } } }
pte_alloc_map() expects to be followed by pte_unmap(), but hugetlb omits that: to keep balance in future, use the recently added pte_alloc_huge() instead; with pte_offset_huge() a better name for pte_offset_kernel(). Signed-off-by: Hugh Dickins <hughd@google.com> --- arch/ia64/mm/hugetlbpage.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)