Message ID | ff6b25c6-f537-6b5c-8743-c9fc2bd81f91@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 084C7C77B7D for <linux-mm@archiver.kernel.org>; Wed, 10 May 2023 05:11:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 95CDB6B0071; Wed, 10 May 2023 01:11:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 90D716B0072; Wed, 10 May 2023 01:11:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7AEF96B0074; Wed, 10 May 2023 01:11:10 -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 6DC8D6B0071 for <linux-mm@kvack.org>; Wed, 10 May 2023 01:11:10 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 4104180173 for <linux-mm@kvack.org>; Wed, 10 May 2023 05:11:10 +0000 (UTC) X-FDA: 80773171500.09.37D664D Received: from mail-yw1-f170.google.com (mail-yw1-f170.google.com [209.85.128.170]) by imf29.hostedemail.com (Postfix) with ESMTP id 7192A120003 for <linux-mm@kvack.org>; Wed, 10 May 2023 05:11:08 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=2vB4gHPv; spf=pass (imf29.hostedemail.com: domain of hughd@google.com designates 209.85.128.170 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=1683695468; a=rsa-sha256; cv=none; b=Cvf8GO3VspCZkKYEPwZkdJFh3UH8q5uwRRM51S835IVIHAn7IPyah4c/eQFDlnNxjjaRkM Ff5kJT0fJsgXxS/q/PAzkMFZRxIJXcl+YOip3vc+ATaMiJatlT0K6DI4i2N0dOHgZn2upP Hrufx7i+WeG200uj7PDD0tfMZdf1Gx4= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=2vB4gHPv; spf=pass (imf29.hostedemail.com: domain of hughd@google.com designates 209.85.128.170 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=1683695468; 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=5t5YV0zKgmgEyAUPKTSjojlBVWu7n9Z5EbrT7MCf/bI=; b=XOPqS32qcPwhYYcVyE8I/zC7539ePj/Mvv0QxHb9EKI/tHjAasKryKp3WGtYq5X8jNa1Bl Yqmn1IaRXkoS/q8I4f1Bm/+jW+2V11StaPf4o0rWd/ElFOeP1Cw6Wjq+datb5KzSu3CyhG mAkQvAX5wW3fU0dWHNmspB5bvwwgUlM= Received: by mail-yw1-f170.google.com with SMTP id 00721157ae682-55a5a830238so62499247b3.3 for <linux-mm@kvack.org>; Tue, 09 May 2023 22:11:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1683695467; x=1686287467; h=mime-version:references:message-id:in-reply-to:subject:cc:to:from :date:from:to:cc:subject:date:message-id:reply-to; bh=5t5YV0zKgmgEyAUPKTSjojlBVWu7n9Z5EbrT7MCf/bI=; b=2vB4gHPvdrYwpepEfO1nF7s17T93hgvovaDeIEtq/j7tZEKBAX6MfSFdULN3s1RrSv XbcEaHE4RfnjNOR2bGTDUPbkUVKLAEh7Z60FKXcJrN5AB5F5sDrBlIYfucGi5YFq3CRE x2J76JMa1KrQtFzkek9dhFVhgpBZ4hkaFn0t/tEhn6Lp6XTc2qq6OFMsvbIv1u0qf83/ DuPOrKKE39rYYW8ERQAhpQjY3kAUjmEo/2XpafFM5jSnKHS+15Ix6XCgfH0XnW/sjbs8 PlPBuW0lMaTsO4yfeYWj+it6wzwQ+thFBn+MFXcJGic5E+ghFwv9VEoF4ainQyun9oWL kbxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683695467; x=1686287467; 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=5t5YV0zKgmgEyAUPKTSjojlBVWu7n9Z5EbrT7MCf/bI=; b=YZ0cbtVYXn9ghScLruhrwZhfj8LrxZWiolwH0jMso85D3soVopHAFC/wTMRXaoOwuQ 11nTm1dIW/f69zit7YUV96Ux2KxRXYHXMb6CWsQvbbJzbLtm7YbgimCSaD3x4Bzm1njZ JfDFwX4Van7j6Kz9PyX4w8Xb44/ivGDJleWFFF4ceChiqJiS/eaBeU5AaL99tXv7YGFZ pNUpZ+tMKhyvSJBF6XcjKrdy5iEfCuP3A76udksXSvdEp2maOdEYrsCSuWEhvmbXKbzY lUiwkgnDeC1jBrEBstPwhAh6rclaDTeUzlB4qjcuIO8Ks8ZQPiehZTEFFnlT3UT+q2Cz VfzQ== X-Gm-Message-State: AC+VfDy5WJ1a6w37DCwW6bnOnauSVdHCqVVV8MA+tq3qD3fplBOkQpSO 0HRZ9ayvqzh8rNixMp8oeQr4CQ== X-Google-Smtp-Source: ACHHUZ5S12uJTV3RgA8xdSJdxWq0jDZ0XleloV6/dK1s9NkYAdupH7Dq2nQz0anegdxAtAS1U2ZfRQ== X-Received: by 2002:a0d:d4c3:0:b0:55a:9d84:2e4e with SMTP id w186-20020a0dd4c3000000b0055a9d842e4emr17689769ywd.18.1683695467357; Tue, 09 May 2023 22:11:07 -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 l65-20020a0dfb44000000b005461671a79csm978797ywf.138.2023.05.09.22.11.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 May 2023 22:11:07 -0700 (PDT) Date: Tue, 9 May 2023 22:11:03 -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 23/23] xtensa: add pte_unmap() to balance pte_offset_map() In-Reply-To: <77a5d8c-406b-7068-4f17-23b7ac53bc83@google.com> Message-ID: <ff6b25c6-f537-6b5c-8743-c9fc2bd81f91@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-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 7192A120003 X-Stat-Signature: br9fgw45wz44rzeb3btjhf34onsfmq8s X-HE-Tag: 1683695468-348842 X-HE-Meta: U2FsdGVkX1/auX84r9m4qI8vuOcoZSoNoSeAkueL3iLOJeJPjRyXFjOGOnL3TvrqUQYgPDjHpygAkYdjL/VIseta9LzhgrXVs9CWJak2H/ABwgiecDOy3jTwFUoqs9Tzw92dvdCCejLrY9PmSlNYt2anR9N+GZTePkDmQJjikAnhft3YNH6G6l58AJt2N45Fe4o4D/qym4rNZZ/QFo/4Eu3BkVpzAUVNTr5tC/aQjl6GO99OHVpg98VO4ka49qHMekZvLaD9cPgnrLfsyZ2Zszu+Ld3jfnGF4HewDc2ZFo8/K+pvsamnJSX1IRfq/cKhGwvy65DW7ZKy6ilchaC01JCWcFPvvkag36MO4//0Om+xY+CrSqcFDzE8qkYT24jfLnlztzN6zHyM3OYgQrGlYla/eaWWSqF3kNzTpDHQ5kfE6tNpAxBzPZoQPK/9943G1kfC3z1dJr8F3+ZjbgfCGtXd48fWienvhWjBV12YhghUb91EiKNgGgj3IvyKjwd5yZxfLrM+pIijXbXRP7/odE0bwBHGGjSj3r8mEUiY7B+o3RnrUJMyp+uziCBTzStjom0fShl7vpPU7xjsxtuCEnWlXICZobVM7bXDulxvdc0B6OqAG2MW/3b2+ipZQiLpZLjmY+drCua/1lkAl9wr9gNbIteSZhHtlu1/mZmZxJj2OKEYVAMB61zsO5vlYYL2VC7yYGqVuecEJBUErsS5qadeibTvXTn7RuOU3G7ZFrAx9+siQ7niBJ/NQ9yttJb8o4zamwvZbtBASn23kfKsabCqWrWzLmrAEamtaDZRWlWNncAPGBgoXapc6SF1uqh6tLvR1z55kSHbpE6mmH32n7djUR+PyqGB0Ib+CFJ6GxQIXYEbNURWmirnDddutzwNM2CdZvsmuw3bsE1YUqxnkfVc0qhNec29BMI96e6ubdyDXFfaCb/GJvDE6sOi77EL78iUOT7BzCpTCEddmUj L9hloDUK WQd7IKoN0c79hjgyLY8W+UUGTQw+uX5kP8So55GaRrLvcqDz0aCM5RAbwotxeQ4wDRA6mExwUXtylNJ6yPRkliVR6kWertF7P0+Z0yq3+V5zIl+sRJGw8gUNg9NwzlXoLZuyi1KUKD7A/8E+IU85kjnOsl8dC5w+GJMN5efvQxAmL8V8JjLxdsyHDgXnzGwdr+wZBKsxwdGdy1Huwk5lHg+hu+zw8cE9tjqulgViVUUFbKk3pYVTHSyGvmQWm0AaxuqMY22d+S/Z+4GdDBzFRLBA3XqB9XHl7ZRh+qpiBtfgqOqeG8svnFQ6h8m0TuaVBuZuFjBvOizXk2jF+Fdarq6wXs3QlfTDfzNjk3w9shnHlcTdgsc/HfN6Cm1VWzT2rVUVziB0lpkqTxysYy4Wyx6VCtELFzkfVHYQ6Sb0Vtxw7Po9ECMD9Uo/C1A== 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/xtensa/mm/tlb.c b/arch/xtensa/mm/tlb.c index 27a477dae232..0a11fc5f185b 100644 --- a/arch/xtensa/mm/tlb.c +++ b/arch/xtensa/mm/tlb.c @@ -179,6 +179,7 @@ static unsigned get_pte_for_vaddr(unsigned vaddr) pud_t *pud; pmd_t *pmd; pte_t *pte; + unsigned int pteval; if (!mm) mm = task->active_mm; @@ -197,7 +198,9 @@ static unsigned get_pte_for_vaddr(unsigned vaddr) pte = pte_offset_map(pmd, vaddr); if (!pte) return 0; - return pte_val(*pte); + pteval = pte_val(*pte); + pte_unmap(pte); + return pteval; } enum {
To keep balance in future, remember to pte_unmap() after a successful pte_offset_map(). And (might as well) pretend that get_pte_for_vaddr() really needed a map there, to read the pteval before "unmapping". Signed-off-by: Hugh Dickins <hughd@google.com> --- arch/xtensa/mm/tlb.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)