Message ID | da29d71e-111-65d5-eb7f-5ad97e406e70@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 BBE70C7EE22 for <linux-mm@archiver.kernel.org>; Wed, 10 May 2023 05:04:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 62B326B0075; Wed, 10 May 2023 01:04:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5DB186B0078; Wed, 10 May 2023 01:04:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 47C216B007B; Wed, 10 May 2023 01:04:53 -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 3BC986B0075 for <linux-mm@kvack.org>; Wed, 10 May 2023 01:04:53 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 1F662C0428 for <linux-mm@kvack.org>; Wed, 10 May 2023 05:04:53 +0000 (UTC) X-FDA: 80773155666.23.901CD03 Received: from mail-yw1-f175.google.com (mail-yw1-f175.google.com [209.85.128.175]) by imf20.hostedemail.com (Postfix) with ESMTP id 5062E1C000B for <linux-mm@kvack.org>; Wed, 10 May 2023 05:04:51 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=QuBkLiQN; spf=pass (imf20.hostedemail.com: domain of hughd@google.com designates 209.85.128.175 as permitted sender) smtp.mailfrom=hughd@google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1683695091; a=rsa-sha256; cv=none; b=307Obo7AxodbkGSHETaj0FUK/PYea/3Y/BdOuHxvRIhVyPUScH0KYktpycw052BxhuLeaN N4epQu2Krtq0JlsW6QHOmkaUJAkC1qqlZc40P3P1F+Lma9xgGAuV0ZK3xW117HRxNyjbqR MF440FQHpC9vmwy8VnzkO5Y2jaJSecA= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=QuBkLiQN; spf=pass (imf20.hostedemail.com: domain of hughd@google.com designates 209.85.128.175 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=1683695091; 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=LRrENG7fj4nSEA3qiqmp7KZ6RwcG7U0j5SldGyBNlNI=; b=FIXBUB4pCUQ9R162n/0ydK4slNShFzbL51qfZeqMdnt0o016wTMPw7LKyhPIczjHAnqXDf crMPxYD5CJWdBXftIA8zM5rX1U7HTQauTrh9+Wl1tD3G+7JwDItQaabOg2lojIMJkIR89s 9+g6/HjKXyCQMIAcIpTTto/T8nKyndE= Received: by mail-yw1-f175.google.com with SMTP id 00721157ae682-55a010774a5so104213407b3.3 for <linux-mm@kvack.org>; Tue, 09 May 2023 22:04:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1683695090; x=1686287090; h=mime-version:references:message-id:in-reply-to:subject:cc:to:from :date:from:to:cc:subject:date:message-id:reply-to; bh=LRrENG7fj4nSEA3qiqmp7KZ6RwcG7U0j5SldGyBNlNI=; b=QuBkLiQNgKJXlZ/XtUu/Zcc1TO/yNvtmxeCEZWPuo0Ut+/Dr2uj7N/fYaVeLSLWaoT dm0LsrTZl+fdsuIU70XZlX8Jdat219pOrdD5tmXxlOJq6I9xvJ8OBX2I3sC2/GzC7pIG XUtWl6K8CddosokWCD5JWnq8C0Qt/Y0GNquPBcUW8sOkTJGqV76KRSYlIi1jOPSqgjjT xhQu7yGeLyA8b6NgZMivw3GAn6e1+z3lgr3LgyDkQncSxt5H12sTmgDyT6BBdhQ0rxwG mDoCtTBYmNMU6XzQs1MJn/66oGLzS3WRb3BIObV6fJVnQHGlEpGSXCP7I8vkrI+sg4mt TgtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683695090; x=1686287090; 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=LRrENG7fj4nSEA3qiqmp7KZ6RwcG7U0j5SldGyBNlNI=; b=SNdPVs4/Wa+K+Xa7OLg1rPgdCDJ58ATj+z5jNcs+DBMIzG5ujSDSkT9oog2ZMotNeT 9yE/MNyOv1+oaoEL/ds6WZh61CfiCwDja7dEKqPR6RnW+8QWR/6qyjVcbW2TnL7gg2xi JHTfwW4NdoXdPr8MZJyyZ78ff4DCIS/nN75/COthKKEojtPN6nm//vqEEwvh0Qg4q+YM 218kuq4waHY6Ur56nvszsgsY6Vc+VkvKgXfhtcoxmN6uwLzbH7jlscKfU5JMmZGzGFg+ 0/7nBOXvBF+pdwZgn+6UhATi0N4x3nFojVkpjaeCEDtRmCnY4sdodE6kwASOwTMEtjNa T4bg== X-Gm-Message-State: AC+VfDxZ+b9GVbnZmjqk2o8xDZ7EFDq3gEQdjXFsVAIWEgXuvu+JdfMn br7rQDDxlf/H3x2D9rc55SlM0g== X-Google-Smtp-Source: ACHHUZ53GGioj5bo+FVmOpbhwfbbVyWZfbgJBuIz6ozNT3hKZWLtYauVGFRQKbnj4naBNbfMS7YmUw== X-Received: by 2002:a81:488c:0:b0:55a:6769:1197 with SMTP id v134-20020a81488c000000b0055a67691197mr18307004ywa.41.1683695090358; Tue, 09 May 2023 22:04:50 -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 z184-20020a8189c1000000b00560beb1c97bsm948270ywf.97.2023.05.09.22.04.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 May 2023 22:04:50 -0700 (PDT) Date: Tue, 9 May 2023 22:04:46 -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 18/23] sparc/hugetlb: pte_alloc_huge() pte_offset_huge() In-Reply-To: <77a5d8c-406b-7068-4f17-23b7ac53bc83@google.com> Message-ID: <da29d71e-111-65d5-eb7f-5ad97e406e70@google.com> References: <77a5d8c-406b-7068-4f17-23b7ac53bc83@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Rspam-User: X-Stat-Signature: coomagbrg15s7r86gpdjk89jqhrcti9y X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 5062E1C000B X-HE-Tag: 1683695091-162485 X-HE-Meta: U2FsdGVkX1+ga9IqMtR0jmbPcruqtMhyyTn8LUQff2Vh2mndO85ZGf3T2UB65X8YMVsfGmlmqyxWjC8n5/FWt3mH033O8mzu+/RkI415td7jMJhsbWzmZAVBh9j493RW/pAefBwo7JW0ayRJNRlWiSeHgS0fER6TnERDkE+XHmqW/5/YI2LHep5QSwmLPtg7SSzzDHx21q9IrTFcr5DqJsjWpexhze/PfiBm2skx/4u2PEMxefPboju+3PfPCVfKhjMsorf0aMlXn3mm/8YWiTVUpzS6dH6ptQTjIino9BqR9COzUgXEfeB27ts/zC9qMRTaewGEbB++SgyiFSGGdVABTTofc88Fo6x9kUgdPlcWsVXTQe4Xy0hy4vHweYeUKO2dMWmwozQI3RW+IQyxlYTGYCZ1CperdQv+j9dbvyQMwoS/Kz1VyjrrmFMFeYbB/O2IxCYwPPxQu+g2JsFDui/8WUJ7KR3RL8gGuJfmQ0uWpILNRI84F/EV/bcFziciedBJrdbfgQtQRj2bRHnotn837nazuYelW5RrMDrfh+hn8qM8phg1rTI8qJpZYPmjVq1t/xtTpqiArM/sWGIcxY0UIEcYgnxX0nVIllPY7wB1v48OO00VkARHrrSTtEitrtD4oPvlpgAGAiPcGu+eMwAqWHefYD3jj7oEpJb5hNMJk7mrnDAxm2rfj+Ju6aRU0HFb+GFv9km12nPYnuusBKdageEn44Q9BzQxd/6AhatC2yVhEKLlOlYrfmMTWqQwNyL/HLpWR5cDbvYklO25ExIxtEm+Z3OiATejMv0siZjx/ZfZfkAmly+kQqBJJm/6BzDbru63sO2vZHAG9+8tuLP2yxHQcG+riMuE5e81B8q78eW664EAihr9Qa0/3KWYjYyIC04f7lNt/xRhlqL7+yBZOMQZ0DEplvw7w4abZ6qJtGE1/WhKj0xA3j8gFiTa8wVrxEELl1lJ6p9oIwo Xc8LklI5 w+nqaZ+fDPXJImXFevd7mmu134Vca7Yaieu46WmCebExKfLO9eIaZa8y35NiyQk4iHjX00kpbEFqlXID2I97nhb2rFVLOxhzify5lDu2qCebz6/XmyS9t/8KoI/HgJNUxJLmi3r3TlKeHpESGgaSIaJjd0+Fk9PQpx/9hcYyAELHiAZK4ZmzkvjqKqQ6xcHgLC4sqNIL5GjKretH+v/7YLdZlziFbo49a88jD9j6KO2ImjiFHli61B8FuX0i0dkvb95o/bQkPr0eCYCLcyeWmA/Xa5A9sutPLuYuC+X0X+LUmKPdNDCuXQWNUlG8uk/c5rHL7DCRwKBWMMHF65vhPVPHyNZQo68Qfpoo5uPtS8Nm6ovzqfD/wfSZ61RyWYQRvXbPOcvzhSsEmVMgvRaaAmZlmA92KGsozX/WhZvkbhVV/p+bIBgdp7fr8wQ== 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/sparc/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c index d8e0e3c7038d..d7018823206c 100644 --- a/arch/sparc/mm/hugetlbpage.c +++ b/arch/sparc/mm/hugetlbpage.c @@ -298,7 +298,7 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, struct vm_area_struct *vma, return NULL; if (sz >= PMD_SIZE) return (pte_t *)pmd; - return pte_alloc_map(mm, pmd, addr); + return pte_alloc_huge(mm, pmd, addr); } pte_t *huge_pte_offset(struct mm_struct *mm, @@ -325,7 +325,7 @@ pte_t *huge_pte_offset(struct mm_struct *mm, return NULL; if (is_hugetlb_pmd(*pmd)) return (pte_t *)pmd; - return pte_offset_map(pmd, addr); + return pte_offset_huge(pmd, addr); } void set_huge_pte_at(struct mm_struct *mm, unsigned long 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/sparc/mm/hugetlbpage.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)