Message ID | 43c7b4b1-3719-93de-dc3e-33625fa2ad@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 41B9BC7EE22 for <linux-mm@archiver.kernel.org>; Wed, 10 May 2023 05:07:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B33616B0071; Wed, 10 May 2023 01:07:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id ABC806B0075; Wed, 10 May 2023 01:07:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 95D126B0078; Wed, 10 May 2023 01:07:18 -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 84DEB6B0071 for <linux-mm@kvack.org>; Wed, 10 May 2023 01:07:18 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 4E91DA0115 for <linux-mm@kvack.org>; Wed, 10 May 2023 05:07:18 +0000 (UTC) X-FDA: 80773161756.20.E308F76 Received: from mail-yb1-f181.google.com (mail-yb1-f181.google.com [209.85.219.181]) by imf03.hostedemail.com (Postfix) with ESMTP id 7DE1320002 for <linux-mm@kvack.org>; Wed, 10 May 2023 05:07:16 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=S6w9KIHh; spf=pass (imf03.hostedemail.com: domain of hughd@google.com designates 209.85.219.181 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=1683695236; a=rsa-sha256; cv=none; b=Uz07TjLaLu3XmdS0jghV2GyvX9b+FPKuFYqtkyNtQCv/fvod4MJmuHSyrLH9lzqv623a+M lQaEBep0+fXJEz8BHbaeb7NZuWExMMwo9nWYVeTaexozC/h9+gBN8MKgAs2WPk8a6/43Gz uiJLkc28PRus8MLq52UZl56y3hiDt8o= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=S6w9KIHh; spf=pass (imf03.hostedemail.com: domain of hughd@google.com designates 209.85.219.181 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=1683695236; 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=Tza8VZpBdDATlz3Dj70XvbHnC1ZhEpBq1MlG3gUrqGw=; b=ePNQzxrltBAnExdHyv7ntusnz6ELfhNjSHNH/VjwovOO6muDneWO301egm8SFVtILlJYmj IasLeqWmtXbPpfohihsH8kCxE1YWhVHY5v1aXTaYwvkrLx1aUzk3HpupAxF/IfBsZ5tU4L c0zvuLhvpHfnJpskylq3fZIuhiiMjLY= Received: by mail-yb1-f181.google.com with SMTP id 3f1490d57ef6-b980e16b27bso5839399276.2 for <linux-mm@kvack.org>; Tue, 09 May 2023 22:07:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1683695235; x=1686287235; h=mime-version:references:message-id:in-reply-to:subject:cc:to:from :date:from:to:cc:subject:date:message-id:reply-to; bh=Tza8VZpBdDATlz3Dj70XvbHnC1ZhEpBq1MlG3gUrqGw=; b=S6w9KIHhVJNT1kfpH+CUQlKS0lqLbNW2sjOBWirezocHkXz48EoJrIXM28PJV5vm9/ 2IKW7KEx40R4sNFdhRCA79Q4DhbKDdFLB3FgyR3tFeJ93PW/6Nj70i7kVvMQyXQV/Eg6 g+52YfmHhke7+sazfpIRwUSNXlxrgB0TXY5awNjnSJrSmQkBkwlsZpKuYTtxmU5X5rbM qMqKwQoK0rcCOG5LK7I/q4x4RfW+gqW8hxUEuUs6WrZ6huYWyzA0eBrWurtLVkyq8+rs BH6Tq3wNedbL7gmT0QCOruJR/a85R9e5ddGQi0eR0moWYsK+a+xYsl7ixIrgRtJQdod3 eejw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683695235; x=1686287235; 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=Tza8VZpBdDATlz3Dj70XvbHnC1ZhEpBq1MlG3gUrqGw=; b=PN7lBnMu2NIXNuIAO4csZKurn7hI1RdxOG2acP7lmts3lEcYhmtHpkfPR/mIoHCK8z ElgFJDhjeNGLbIUVHXrOdKZ9OrX5gD/XVQJFZGebpGo98hmkzYc1OTMCJTahFug5gZ8k Zw1ooFu/6a3kXvoYcAK/u4pEWGBTC43Kjofe55iHhlMbjbIcS5jcOjZCKj0IqxWyiey2 e5bw4Z77IhQxV1NH2Gve6JfchA8PI09e/kh8zSW9wLvvkDtSDf2+FVBIxVz3nJr1jQA/ I1cxDM/ag2F4skP8V8BqqWkX3Wr8oDdhNtqg+8uu0q0nDYy57lIS/CMTfcIqiRGYQAEZ 6G/w== X-Gm-Message-State: AC+VfDzEctRMr5ykBk/gevTc8vNtWVt9YriKmTnRyNGaFvjW1c8AC0Tm 49bJKsVP8mKABzRTFZQWh8lGeQ== X-Google-Smtp-Source: ACHHUZ7O+RQwO6EUyGZuwP0aiZ///c7pXxA4KLKL9a6yKbaYGakuuwEnBLT515Jc9UpNtzb0LrlfGg== X-Received: by 2002:a25:6c4:0:b0:ba2:6aea:2ba with SMTP id 187-20020a2506c4000000b00ba26aea02bamr10201500ybg.23.1683695235431; Tue, 09 May 2023 22:07: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 k142-20020a252494000000b00b8bcaf1e660sm3553476ybk.4.2023.05.09.22.07.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 May 2023 22:07:15 -0700 (PDT) Date: Tue, 9 May 2023 22:07: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 20/23] sparc: iounit and iommu use pte_offset_kernel() In-Reply-To: <77a5d8c-406b-7068-4f17-23b7ac53bc83@google.com> Message-ID: <43c7b4b1-3719-93de-dc3e-33625fa2ad@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: ytoctsh87rsh7yczseu9ohea1hgqh3z3 X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 7DE1320002 X-HE-Tag: 1683695236-217300 X-HE-Meta: U2FsdGVkX1+y7pT5D+H03VPaLPQOqwPs6mY+JnHY1V36uoLfPeRYNI+Jgv0qS30BuhCECvR0VE0kd/SEdc60w+8YpI+JihCaSc/pKNhHLU7WyCKTgNMstL6IjdHFsvX36YzImn507a/rEn9gaNjocx+5Y8gpLKFMShmgKiNpRSg16WWfZUKBDpcjBYbwi/fDQfMYEk+NfbbjPx13A+lBWwrbpLw2Yrw+W+rh2mz9aXdgd+1Qmc0ftsQ3NWtS6dwicPCYEXM+A58htsMJ2lyIAmTtmL4gmLMePA5PqafBy9zblQXUq34ujivZp0B7LFGqvZ9NY3ZKBd9yDcWS2x3z+hFgWjdWQzkG8iWrT1PWTtXg2+g4cypuBmeT34LUYF363I5mXf2EevN01ZcfR69jwvXpS5meCvwHkEvWh7b70ikk78hf2bs6W7bzE16HUw09Jys/EWkg1bUwNCiramG/UhWGKdmGF5OBdy/TsVDBki4IwqmOJ6o1Lb7el1eo3U0LmcTfcGRZFQJgKzyoELyMarznqegRsQLwDfNoYmEqUS5Jzz+CjdGR4+x17ZywgKEJW8Y+7JHsCoWFt0R4xuf3nSvrnQ2IiOeCfItZXoU/F4F47ajWyFN0XYAWIz6Nu06vha6ycvC0iGaRfDmJ0lthe/bDjlK4IiGNjdu6zOTS0KwxFI+wef/7l4I5cndGz2u7XGdjJ6tasWCSYo9KRFdeapzKxaEhwnreNTcM3tICGWLpLNJ0z532BpKZ7vwMzTQTnhQ+SUfnJ3Aq74NfSBoqUz7dmuCf+owZmcoO/hHI72VHa3pvH+NJiWYPL3R4EUc+4XiH6GIC8UjRCnAQAYaNc1YfAT/8vuM1+Zfuq4EsBInqvtkTvmbIwDcja0gJRaX3APRxcb7jAOMY275O+f6SkqCFhfjVq0hI71j2Tck/KFNJtF07aZHqczpEBjDLMFODatC/EHOYd48bQSCg94x t/V4vaA0 wy+T095QCry0OXrRmJ3LoV4Su0mEvOjmWaaYAGHYmaElMGta1nL/5Nyx49ZnB7h+Moniz4Vk+wRsnkvdA0HZpgBpbJQ1sCPpfcdccBarfF+6U8GX2YQH41dEEcFQZ9TGqnoWdinXFz+ma4osP/D4+ZPZiO2DxjLpaTjJ47DasJuK0XIqLE8inwJnSUYAmqSYiOV9QR+X7cXcOjePWXeJ6gm1oYc9m1yqRlG5tx8E05/+qGsuDtEgSWOwZP7N4l/RyB55i4UIZ5QAFnmZHGPkbH5oWMfW818dl2QCzVOiSVTp9x+IprHwqkb6WNVqz519SQQ+xVrArU93V/8TAJ3LEkineyc/h6QcAHCvvkorAkN2ea47g1XA+fz06Z1W9RqQrYCO6WraTunU1FmSfGcGwoTcytKj47ET/EARfpfbKkspwHmXDaGJz+fP4Iw== 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/io-unit.c b/arch/sparc/mm/io-unit.c index bf3e6d2fe5d9..133dd42570d6 100644 --- a/arch/sparc/mm/io-unit.c +++ b/arch/sparc/mm/io-unit.c @@ -244,7 +244,7 @@ static void *iounit_alloc(struct device *dev, size_t len, long i; pmdp = pmd_off_k(addr); - ptep = pte_offset_map(pmdp, addr); + ptep = pte_offset_kernel(pmdp, addr); set_pte(ptep, mk_pte(virt_to_page(page), dvma_prot)); diff --git a/arch/sparc/mm/iommu.c b/arch/sparc/mm/iommu.c index 9e3f6933ca13..3a6caef68348 100644 --- a/arch/sparc/mm/iommu.c +++ b/arch/sparc/mm/iommu.c @@ -358,7 +358,7 @@ static void *sbus_iommu_alloc(struct device *dev, size_t len, __flush_page_to_ram(page); pmdp = pmd_off_k(addr); - ptep = pte_offset_map(pmdp, addr); + ptep = pte_offset_kernel(pmdp, addr); set_pte(ptep, mk_pte(virt_to_page(page), dvma_prot)); }
iounit_alloc() and sbus_iommu_alloc() are working from pmd_off_k(), so should use pte_offset_kernel() instead of pte_offset_map(), to avoid the question of whether a pte_unmap() will be needed to balance. Signed-off-by: Hugh Dickins <hughd@google.com> --- arch/sparc/mm/io-unit.c | 2 +- arch/sparc/mm/iommu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)