From patchwork Mon Jun 24 14:45:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Leroy X-Patchwork-Id: 13709626 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 1EBF3C2BD09 for ; Mon, 24 Jun 2024 14:47:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A871C6B03EA; Mon, 24 Jun 2024 10:46:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A35806B03EB; Mon, 24 Jun 2024 10:46:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8AE746B03EC; Mon, 24 Jun 2024 10:46:59 -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 67BBD6B03EA for ; Mon, 24 Jun 2024 10:46:59 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 257F34100D for ; Mon, 24 Jun 2024 14:46:59 +0000 (UTC) X-FDA: 82266059358.15.F44CFE9 Received: from pegase1.c-s.fr (pegase1.c-s.fr [93.17.236.30]) by imf14.hostedemail.com (Postfix) with ESMTP id 1492C100005 for ; Mon, 24 Jun 2024 14:46:56 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=none; spf=pass (imf14.hostedemail.com: domain of christophe.leroy@csgroup.eu designates 93.17.236.30 as permitted sender) smtp.mailfrom=christophe.leroy@csgroup.eu; dmarc=pass (policy=quarantine) header.from=csgroup.eu ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1719240403; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FK7xq7vg1hFjlKdNBvhx1wOeVtV+MZPtFyG/AWrqhmI=; b=fMUr3STbx5ws1xyUI+Ikc+X20+KTkSCxgJPqlH71ZpzzIkgMn14xM955Q/iUHBcgOHRytq eFdLyJCZKV2AYCdU25qKkUHN/u2Y6zD5RFLTR4ASgi/Ue6FkAydyVsvZ85JDunZRxc/NL9 hwD8beTvNzbYhKk82ha2oPHFlllkVgI= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1719240403; a=rsa-sha256; cv=none; b=bT4xCvWqGJ6a2QXJ3MbCoAr1nbCNtv8gtIqDUEJXmqbx6D8Q/iy/QkQKB+ITiu03n88aa/ V5hhvHIP3hsvKlDPJFZEeyX1rk/mj0jWc3UsRoivkeTK9iiFxg0c+qBIVyQseQTYLuotQA iRUCOy5uXMhfxNAjtLzy251E0EgU0Ww= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=none; spf=pass (imf14.hostedemail.com: domain of christophe.leroy@csgroup.eu designates 93.17.236.30 as permitted sender) smtp.mailfrom=christophe.leroy@csgroup.eu; dmarc=pass (policy=quarantine) header.from=csgroup.eu Received: from localhost (mailhub3.si.c-s.fr [192.168.12.233]) by localhost (Postfix) with ESMTP id 4W79ks0cxPz9vGX; Mon, 24 Jun 2024 16:46:13 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Vy_i1uD3kuvg; Mon, 24 Jun 2024 16:46:13 +0200 (CEST) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 4W79kj34r6z9vFq; Mon, 24 Jun 2024 16:46:05 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 657858B766; Mon, 24 Jun 2024 16:46:05 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id KEm12Tw1bygh; Mon, 24 Jun 2024 16:46:05 +0200 (CEST) Received: from PO20335.idsi0.si.c-s.fr (unknown [192.168.233.33]) by messagerie.si.c-s.fr (Postfix) with ESMTP id D49938B763; Mon, 24 Jun 2024 16:46:04 +0200 (CEST) From: Christophe Leroy To: Andrew Morton , Jason Gunthorpe , Peter Xu , Oscar Salvador , Michael Ellerman , Nicholas Piggin Cc: Christophe Leroy , linux-kernel@vger.kernel.org, linux-mm@kvack.org, linuxppc-dev@lists.ozlabs.org Subject: [PATCH v6 12/23] powerpc/8xx: Fix size given to set_huge_pte_at() Date: Mon, 24 Jun 2024 16:45:38 +0200 Message-ID: X-Mailer: git-send-email 2.44.0 In-Reply-To: References: MIME-Version: 1.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1719240334; l=967; i=christophe.leroy@csgroup.eu; s=20211009; h=from:subject:message-id; bh=D5c7rc2WApQ3tCbzTNEVQ0Gk3Td9OpyCeDWt3oeDJWA=; b=P4q7hzkbMR/CMFhgCKkoS2Cn8l/SdUwN/ZdP7kGK9vTlDIiEFNyPo8RCY8Ot8aqP7fD/QrVfJ gTAASjWa+B/DAiW/Q7Q3cHSsBWNS2ABf0PRmiKH6MPqokxUKdLxSrY6 X-Developer-Key: i=christophe.leroy@csgroup.eu; a=ed25519; pk=HIzTzUj91asvincQGOFx6+ZF5AoUuP9GdOtQChs7Mm0= X-Stat-Signature: ef1apb4igza9rgnof377tdfi3nqkesp1 X-Rspamd-Queue-Id: 1492C100005 X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1719240416-819778 X-HE-Meta: U2FsdGVkX18ysOaVPxaDK7BnN9vTGaF4hPcfmqtKU2E7UhMLzSM3VKcK+v4gDGDmm3AtdM/43pV/+oY7rVgjZ3QkFh7CpS5k0EUjxLEtcn30TVbmKBLaIJerdt8zB4/660UixH2m4+bOJQNXp2EIFOaCzgQT9mpmbQew7zrtGd5UpM+e1LVTG7OJhRa66rXwOOslWgDUjXBQxDlb5UadZ4r0Nb4PIadNp2nBg0xksi4TPA3LrqOeN7zQquLLloLP4A3eoMbkdaQ+AXztbqJhTUKK7RaFlf/frMPPciL6U1YX1DAotZpGC1nZntB1rq6Wr/Nq1jrrKEtyeCqKbkrm83Gg7edK2R1HN+E1A7XNBP+WjtdLOODY2epxA7qlhzRx+LmUzmfhUQs+HGjc/WVC3b0JXZOITmk6SV2Fn+PBLHWKEg56DIlyApP1noeXwIgwo3QpmYyibZ30l7aOS3JmHiFK4TedM/H8AzSeoWC1nzVQzv0CMDZ6gqlwbEznFSFUF2FElqGrX0rX494Pn/yegQ0qw9ZdX2qh/nJ7jOjUdezqasJE+q1gTKEK2zRS7DRWs4NvTFv69LBpQseYTSoauUYO49cfCJ9CdrEwqHv9rIV5BwYmTLtti7ken9rppdpVXf0EsmASs2W7a4LFiKc9z7mxoOV9fFF/2iswrNk5hhWpw3XbvkKrnPIc2K8xbWgOpWXczYIZs+/7L9knO8OxturB+1AOTalZvLRNLuOmpfDEylbO3X7Yq9/1lyv9qSzwKCeozFvKxaNBMdwApOsTFT0CWT5zdz8I4gNgZGdFKO88WYcjpilTWUfDbgcws25eg0tk9i71Jpvl0qs+XppD49EtrntW1t4GyGZQ+TsSSOldxVMfcEBcao1+GXFzZo+UgA2wa8PxbTCgOIfKl3j/Ob92GCNbA3lFkXewCwA0Zp3xvuwHm6BJETjtQkwp2eP9Pq+xSp65gHXUYhMgbE6 ohlWW8PI n6usXX2vZx1CZSljhkRxgEfM9Cd3hUfqONAArKbJhXczVx4n3+DDUodbsU/KqkncY6Qtno6cnz1pQ/S/rt/OiOwaMmhYJsLS8MoYCV5oLqSriB7AFfYzjLMg+wV6Zy3XAPL4STD2ISd6eSqZA6PrvBxfNzePdsYhGC0+ILUOIBwEFyNg= 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: List-Subscribe: List-Unsubscribe: set_huge_pte_at() expects the size of the hugepage as an int, not the psize which is the index of the page definition in table mmu_psize_defs[] Fixes: 935d4f0c6dc8 ("mm: hugetlb: add huge page size param to set_huge_pte_at()") Signed-off-by: Christophe Leroy Reviewed-by: Oscar Salvador --- arch/powerpc/mm/nohash/8xx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/powerpc/mm/nohash/8xx.c b/arch/powerpc/mm/nohash/8xx.c index 43d4842bb1c7..d93433e26ded 100644 --- a/arch/powerpc/mm/nohash/8xx.c +++ b/arch/powerpc/mm/nohash/8xx.c @@ -94,7 +94,8 @@ static int __ref __early_map_kernel_hugepage(unsigned long va, phys_addr_t pa, return -EINVAL; set_huge_pte_at(&init_mm, va, ptep, - pte_mkhuge(pfn_pte(pa >> PAGE_SHIFT, prot)), psize); + pte_mkhuge(pfn_pte(pa >> PAGE_SHIFT, prot)), + 1UL << mmu_psize_to_shift(psize)); return 0; }