Message ID | 8552705d-e0c1-a3a6-c26b-b887d4f61288@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 E2945C7EE22 for <linux-mm@archiver.kernel.org>; Wed, 10 May 2023 04:55:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 82AB96B0071; Wed, 10 May 2023 00:55:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7DA5F6B0072; Wed, 10 May 2023 00:55:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6A2286B0074; Wed, 10 May 2023 00:55:27 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 5F08F6B0071 for <linux-mm@kvack.org>; Wed, 10 May 2023 00:55:27 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 36EF31A0492 for <linux-mm@kvack.org>; Wed, 10 May 2023 04:55:27 +0000 (UTC) X-FDA: 80773131894.12.D8CA69F Received: from mail-yw1-f178.google.com (mail-yw1-f178.google.com [209.85.128.178]) by imf24.hostedemail.com (Postfix) with ESMTP id 5DFDD180009 for <linux-mm@kvack.org>; Wed, 10 May 2023 04:55:25 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=x62YCY0V; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf24.hostedemail.com: domain of hughd@google.com designates 209.85.128.178 as permitted sender) smtp.mailfrom=hughd@google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1683694525; 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=alKFmwAdxdkIViw1WjkjX/OCKeQtR2IpGs2zcY6rd0M=; b=wZO6aq/9W5gFekwTyC/DZPk3uyJH4prf9rBdbQbxWH8f+CZ8cjm4QoxMqRT554m/5F0et2 aJYwDz4+SUNV/aNitq3Cndcwo156o0+NdHHmuZ8sEL+7MIxYC1AxeDkxJvPorh3h38UUnx 1LKQ9CVfrmS3JZjSU/OXI6wkeZtxp48= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=x62YCY0V; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf24.hostedemail.com: domain of hughd@google.com designates 209.85.128.178 as permitted sender) smtp.mailfrom=hughd@google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1683694525; a=rsa-sha256; cv=none; b=G989TPD5zXwmKXkzIYIXen/dyCjH9GO8HujuSyinweEENIBMQbO05C9XadEVU0q0OviSXv XYNtf6pSUTOUrAGWVCmPdPh/IF+PQlLtT0qUuM7kggeu25Ks15rhJNQ1XWfbECfCrzErTB GufRGU5wXVPdVEpjoP10wa9ETgXAg/4= Received: by mail-yw1-f178.google.com with SMTP id 00721157ae682-55a14807e4cso121007387b3.1 for <linux-mm@kvack.org>; Tue, 09 May 2023 21:55:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1683694524; x=1686286524; h=mime-version:references:message-id:in-reply-to:subject:cc:to:from :date:from:to:cc:subject:date:message-id:reply-to; bh=alKFmwAdxdkIViw1WjkjX/OCKeQtR2IpGs2zcY6rd0M=; b=x62YCY0VbtXBlAlTlrXst8L8I4Klp5jHuIkAXWeopDmvUXAbp7vfKzA00bYNToXaoh jicsfIaPz1O7U+TdGvn8r6E/DcCNuMjdSP+L+rcocZxL69l/kttcZnaGKZv3QHFP73NA pwziDs2dpT8TywS3eBGCmWf5OZTvKDvRn5iqAcCmFi7ZDxOpEnJaXZsg4chuls0Conw6 1BHyDKqM9ymKdiyVbkRMd5EkORJUOPu5k/Dt9X7/wDI/4JSqAZEDqusgNEXsSQSkAunQ L5ABejKB++Tm9XQd6rM3WeiGICDJg3QSoGYLUowekQIKv98a1U+1e3RQQ2gzWsEHyeuU f9fA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683694524; x=1686286524; 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=alKFmwAdxdkIViw1WjkjX/OCKeQtR2IpGs2zcY6rd0M=; b=TY7kj9DYini3Y0o4CZkZCRHPVuekKXsCMtoPKDBYQo7EannmLKrzHDwMGDrgB6oD5Z PlMujtS2mhMA3JDE+hfWYtUhtlSx7Z184Zdd3oyi6leXkixS5lmAIWCOjtPrOyaxarUb fMNBy5T1DT148rV0u5nwP7wv/KEJ9/fSCPlQCu9X9YFrjSURfqisfcjXzbSAdjIc193e /TzuyraJRYp+SSa2qOOVqwPvhsqfvOqkEph6kUesNalG5n7g0Zh7CXfTAbqfDDUAJ6AI 7GNxNVOU1xtaU0TMeJaSDqbaEmPvJx7TDa2oDiB3Mn6BH/Q6oLz8EBk4pC2qSyl3/rqk BV5w== X-Gm-Message-State: AC+VfDyPPHvua00Sn3TKhhd9Sz8OCh90xdJhsZDWz+y4pIQLSnmNeiDf GZ7QAeFU176/suxjEslMyjGm8g== X-Google-Smtp-Source: ACHHUZ64xP5yCWBSXd1pkCU9S6oVULY9BGDq0OyW51W97Dv6Ixjw6iQVWcUZjR+Rvr+uTi8eh8kq2A== X-Received: by 2002:a0d:f545:0:b0:55a:ab98:a2ef with SMTP id e66-20020a0df545000000b0055aab98a2efmr17944134ywf.40.1683694524456; Tue, 09 May 2023 21:55:24 -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 c1-20020a81df01000000b0055a29ec6504sm3793706ywn.81.2023.05.09.21.55.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 May 2023 21:55:24 -0700 (PDT) Date: Tue, 9 May 2023 21:55:20 -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 10/23] parisc/hugetlb: pte_alloc_huge() pte_offset_huge() In-Reply-To: <77a5d8c-406b-7068-4f17-23b7ac53bc83@google.com> Message-ID: <8552705d-e0c1-a3a6-c26b-b887d4f61288@google.com> References: <77a5d8c-406b-7068-4f17-23b7ac53bc83@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Stat-Signature: ng6o89ehp4tas18xu8gdpm3hogcjstpb X-Rspam-User: X-Rspamd-Queue-Id: 5DFDD180009 X-Rspamd-Server: rspam07 X-HE-Tag: 1683694525-766534 X-HE-Meta: U2FsdGVkX19KpPVvDNqAWlnESQNOc24AQl7mASwJrR+/u20Y3VGELaISR4adeJwcr5EWMD5krXkQL9HtsuyXCeJxn/RfnKR9FGvUAd2VuZ3+I18ucLN8oFY4aRXrSXoycx273+9jvETWUAERZ3Ht/KpIDMJvBDA1C9VOAtFlGsz4pMrK/cXbRQse2NVTQONEo4syynP7bqjvLKx1ii+4MLcAVWvvowpql8NhSUAuvZldfYaQbs4LNHQrbTSQrk7jYIAWRbRQq4yhn2pmv040tfkx8WqvyUWHvaiman8UdDeg822uGBeJoOuP4b+J0vwxex8hMPCSlfzmp3T6VcgfPjXBOAWZlvp7tVKQcvwLNojPUBOUfUpoFsg7drlOJjkT/kHPBZP0/U3n0CTjo8/hHh5i/+Zalqb/ttLZZOoeQq5yodfsBECtv+IQnGjyVT6ghMmcfYh6yqe55xpbn2xSAQ6rkQSbdO2bD/xP62ozNgfjAdoXg9akwYW/wmSckjF9PL+ZOlQKaYzzxsCBWpzhA9gUGqYZ48wzriAX9tAdqVA/RcV+DWIsXRfbJn9lgV70t73mTReI5ybY9QueUEjPLAV4kiAoeTbsOMqqQmrqCtRu3KKXsYXkWuFZ2b66pfISyUE2Cl7yGzsFeqCfKc3nadASgdmkb6SaTnef+2PAK5AQHTtOL2VbV2/2bNuJmg0TMStsGIcLaE4fCwPOGi3HCVgi7215fZbdoS07RlqezKCGyxz6N+QrVEf0/NYUoX4kbkwvkAEz8Xd6CAk18yHzGDTVSQcIY6//4/yuYaT7U3nfGDfH0b6PZhPOlwoUuDAFgdL9xkDah71oJM9/WVQl7n6X9+TRtuPY/SPnogADuMc8D9gbQvLYJ4Od5lXBn3X5/wVczMWPL2rd31/m7Qo57SzgeAFTIz+AW3O/OT/ExfCmEbu4Gp/7rA5M+XAlibRQYqONLXF8jzQhiF8oq9e sZDNi1I0 2CNNFIKkykFTJ0Jn/Nk/qUEYPsFPPngEvSrRUsROgDU2H4zb8Y0OhseJWx/7C2q7VERy7eWzW7pETuVVACkLndw3bTNJzwk1Xl8vfSGLw0GbgfnFmUxcnww18tKSTlkyfeXHixVzvMcSwghNJQLDjTifRJA7IIZ24AsIjs/DK7XGKYXu0DsnEfH9r1MA5XN/61Z2vc5xotDTauzt62zin1t4kczxZHZPK7IKzL+e19L+YGXwXm3czFGq0t+bhgVX5l+SsgBUSNXP1IHP3YtpO1s7/Rb8tVdXGc7107aZoUmwai7w71IHsYTnmQavsvyjiW5VL4gJAVLNimveQFjDMhn39JD2+SNy2clent8PgmNNNFeda0iS9qpTLHxe8ZRpV866tRSdFjE2+DGCjhwLyMCxuYj/6IkovULSUNvArmoW1uRJ/YS3Pzy0VrA== 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/parisc/mm/hugetlbpage.c b/arch/parisc/mm/hugetlbpage.c index d1d3990b83f6..a8a1a7c1e16e 100644 --- a/arch/parisc/mm/hugetlbpage.c +++ b/arch/parisc/mm/hugetlbpage.c @@ -66,7 +66,7 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, struct vm_area_struct *vma, if (pud) { pmd = pmd_alloc(mm, pud, addr); if (pmd) - pte = pte_alloc_map(mm, pmd, addr); + pte = pte_alloc_huge(mm, pmd, addr); } return pte; } @@ -90,7 +90,7 @@ pte_t *huge_pte_offset(struct mm_struct *mm, if (!pud_none(*pud)) { pmd = pmd_offset(pud, addr); if (!pmd_none(*pmd)) - pte = pte_offset_map(pmd, addr); + pte = pte_offset_huge(pmd, addr); } } }
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/parisc/mm/hugetlbpage.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)