From patchwork Mon Apr 17 05:17:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hugh Dickins X-Patchwork-Id: 13213254 Return-Path: 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 00180C77B70 for ; Mon, 17 Apr 2023 05:17:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 66D1B8E0002; Mon, 17 Apr 2023 01:17:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 61E398E0001; Mon, 17 Apr 2023 01:17:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4E71D8E0002; Mon, 17 Apr 2023 01:17:18 -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 3C5AB8E0001 for ; Mon, 17 Apr 2023 01:17:18 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id DE5EC140397 for ; Mon, 17 Apr 2023 05:17:17 +0000 (UTC) X-FDA: 80689724514.06.8F6C1E6 Received: from mail-yw1-f169.google.com (mail-yw1-f169.google.com [209.85.128.169]) by imf19.hostedemail.com (Postfix) with ESMTP id 1A22A1A000B for ; Mon, 17 Apr 2023 05:17:15 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=cBdJf91K; spf=pass (imf19.hostedemail.com: domain of hughd@google.com designates 209.85.128.169 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=1681708636; 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: references:dkim-signature; bh=tyO4JOXCZAIo7dbf5amDDtc9eY22dYzR4kpkvjmtxpU=; b=epdv8Oeqey9CnEGa1xhyVBTNTLC+C25V5QpteG7aRy57L1vcpTOxHwrVNBrjnr+Ln1IWPI 4EWUUa3W0wpaPoxKTbQJiq4Zvqo7k2xoWp+uZmRFbzLlb9xIx6U4TKfaWZ+zViirBnkYE4 x8QWZoVFihD6mu00pgdj0SkpDbVG60g= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=cBdJf91K; spf=pass (imf19.hostedemail.com: domain of hughd@google.com designates 209.85.128.169 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=1681708636; a=rsa-sha256; cv=none; b=47bsuyzUlxP21vxDh4vmqBp99s7iM14HnGNeLx47hg5eq52yCA/1otoQtmxmk8d3fHHu2u KLUdBf1YlQlm6WT36riKQbEmpyNASqYcjIuivHulj+vtepOe4JRmA881PuebQ7+cGRsQDC MaYb2u3WWTzp7vQILw8+X7PjTZLAiYI= Received: by mail-yw1-f169.google.com with SMTP id 00721157ae682-54f6a796bd0so291193607b3.12 for ; Sun, 16 Apr 2023 22:17:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1681708635; x=1684300635; h=mime-version:message-id:subject:cc:to:from:date:from:to:cc:subject :date:message-id:reply-to; bh=tyO4JOXCZAIo7dbf5amDDtc9eY22dYzR4kpkvjmtxpU=; b=cBdJf91Kj7km2xQewFBDykrtct/xRt0C1c8vs+eTiF3gMY38DdS5XtnLtSdvOweyj4 8LaCibROSqQkBy9PiRn45Y3ByQwdsoMfjiagFV2LtJ+vRYfNTN7VQH64Z5/rw7dPSfuF 7pnFuyV6h2Ww6SBCDyhPPIRai7o4yWL8GBQDfqNenqO8wvDrsBMOekeJTyXif/3MD8cN Sp3BaWQWzkv3unkG5oUqWLkrk8QO4/4HDU6fTLgXTEwmXJhOmyFy0TvKtEvfYB/I4NJM dUOWKmEF02ksKIs4uY/viKF8ZehTMYlle5qxwjKv2XdreOmiNT18XbVkxAs0VAJkO2Z2 Yolg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681708635; x=1684300635; h=mime-version:message-id:subject:cc:to:from:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=tyO4JOXCZAIo7dbf5amDDtc9eY22dYzR4kpkvjmtxpU=; b=beH9lDSpgPqSQDpUWh+f/4h9TzatLI/yMZ3mxivbZAGBMHxmYB2bumLKN8fbdTkPgr 0uxFjmqY4dNQKxFj3Dfa/OP8LrEykim29u0ptGSAj1rvhgiA86t8eLjYt665T6T6a2K9 BFogjBiWydGGhEeKlNX3KKxy7lq7SoVxpGUW3YUve/YUefAeaKuKroSaYz8ghHoVeyek 6AEmX8EkXjolsIM3ZKXh0Tp094bpFixsOpJSjJKhGzZiqR3WPkyHqzBLfN6oPEuNbQc4 e6Jy5XsRcrWl5tmezUt317cmZloYHoVpIkkzAR+uX2KUQUmSfBA9ej4CYaWRmtaVVQSG U7yA== X-Gm-Message-State: AAQBX9eK9+l8L26xladaTrSEfn9DktJDldiOKzHWooFC/hpqPZDmasHM L/n2oNibBBtCMwcUdOvFq50u3A== X-Google-Smtp-Source: AKy350bAqFfEpx4vSQd0hJSOssnZMZ/63Z6tfy1T2FtPIkJYl75Hb+Q54/ZXv49uP6YYuNgiAKbJTQ== X-Received: by 2002:a0d:dd8c:0:b0:54f:4fd:7e5e with SMTP id g134-20020a0ddd8c000000b0054f04fd7e5emr15252594ywe.5.1681708635237; Sun, 16 Apr 2023 22:17: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 bw8-20020a05690c078800b0054f69033623sm2887791ywb.61.2023.04.16.22.17.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Apr 2023 22:17:14 -0700 (PDT) Date: Sun, 16 Apr 2023 22:17:05 -0700 (PDT) From: Hugh Dickins X-X-Sender: hugh@ripple.attlocal.net To: Andrew Morton cc: Mike Rapoport , Mike Kravetz , Ard Biesheuvel , linux-ia64@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH] ia64: fix an addr to taddr in huge_pte_offset() Message-ID: <732eae88-3beb-246-2c72-281de786740@google.com> MIME-Version: 1.0 X-Stat-Signature: uhx9bqm6zf4pmjnhsk8nd7te4bpepa6f X-Rspam-User: X-Rspamd-Queue-Id: 1A22A1A000B X-Rspamd-Server: rspam06 X-HE-Tag: 1681708635-350945 X-HE-Meta: U2FsdGVkX19tVazxWvUJT52Q5nqPzPg3anCxSHQ1vV+TQftXCFExmInTpzBJm9wKGcT+P1ywSZ5ljOmE8oEj3eclKAoGcxYQqromj1PIDthqOfGvqj/i2p/Gu50IqHGU8vg5Ai3m5apQrhGJOWVrB/B6StwujxwObSe6+lmjKhqcHqo56qfx7jgkixQVe92ACT2JhO0hx1Wf4ydeBmvt4kuZ3f/r32lBYb+pq/5/IMODjw0sLmNMurpYivW/ZeHfC6VO0mPnXpXcxWw56QDBuQbezAhIpQIll6yIUYY0PyDzk7B2m4eiPkiSpJYk7kRdPS/xwi7UTsri1+v3CyAaT5RbmL5e1zx+j2eoXsvTwYBi2h0FSSjQGney9XQUr7rF0sRfls/jUB6S+NBzLovm/q3OgYa7JVGkPkH+654XLgL9JEhjVBbbrGQvCuRAsdtu4sFmIJr01nBhqjzLUbpCgjuYD/Eh5arMv+v6BiJMO41ax5vG+JuTIGPXwR4BtmI8iD9ucgily8nuTUMN6K1K40yAkvOftnPm5b58Z+Zb2TYKEi6cLXC4eZqa/h6KnmqlwPIHb5EV0LBuj8QE4vqNOScW84zgMsuCjef8kMoIJAONQ6ARUe2bsxWisxdZMo7ZMs3FTbYzVCMatoLfAgoHeLmHDPdRgjoybwkmQVRtx+bDtg0TFTw9kLtWSCi1V5pOUINSYJOOyeA7dpcluVz+pP7XX3lo3Es4MrPK5Gm3lzFdrW/Y+Ka7WRH0FLC1zxBCsQykY+TQ/tKkmUFum3tXAjZQ4tvwTRe+agAPp8vXCD6o+eGPbz36uFpRgyqMhIu1nAShnkJFQ0pDYQRKqGEwQXPbisjwaJsBjwOXGO3YDbjixQDxUKKZbE/VcyIl7I7vww3GCBx4+IjVk9pgssTWywIabVsS2T1HqWvedjgCDzE9VAfNEi3BnY5zdqQmmh1a6OlufEe+iJpsg9i14LJ Mlpv4rTY rsxI6wynb16jpn7/c28x+DCb3Hi4PJLd4kvwLlBkvk71lohF7gK6E4OiAaJyDL2tBTd4EjjIGdzBBnKRexBewrTm0tgIlqOczjtYypQAFuLQcAMkgfMplaJUjUcELV8NEMgUjoIIOnvAWzWy+exgr0Nea11Ct2TyOvKML5MpdX4U69MkJZIGnxX2gJ0Q2c9p4F6o72im3/NGjZ7xoXAzHqrZ+YA87/dwBF6sTFO2p+HSotzHthAJd7Yi26y+APrLhurEDFtKetVV8mdedNmDGU7nYgPB6W2oCCqK5hAhzDhNVZKrUYfl0upk6eue/yOqxgsJu7M0aJV2F9rlqoiwvFIJdU4MAfBppN7AZWq32dvLKjC/sjomw2x89dYn4EMGfYW3wMY5b49jxY1lj3+NkOwCoK36Ulh1u6lVTAtHtZ+beaTCJ+pSgjCo5Q8RiaAQBCvGC 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: I know nothing of ia64 htlbpage_to_page(), but guess that the p4d line should be using taddr rather than addr, like everywhere else. Fixes: c03ab9e32a2c ("ia64: add support for folded p4d page tables") Signed-off-by: Hugh Dickins Acked-by: Mike Rapoport (IBM) --- Just something noticed when visiting recently in the source: thought we might fix it before ia64 is consigned to history; I'm unable to say anything about the user-visible effects! arch/ia64/mm/hugetlbpage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- 6.3-rc7/arch/ia64/mm/hugetlbpage.c +++ linux/arch/ia64/mm/hugetlbpage.c @@ -58,7 +58,7 @@ huge_pte_offset (struct mm_struct *mm, unsigned long addr, unsigned long sz) pgd = pgd_offset(mm, taddr); if (pgd_present(*pgd)) { - p4d = p4d_offset(pgd, addr); + p4d = p4d_offset(pgd, taddr); if (p4d_present(*p4d)) { pud = pud_offset(p4d, taddr); if (pud_present(*pud)) {