From patchwork Wed May 8 11:18:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Ghiti X-Patchwork-Id: 13658563 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 D9BBEC19F4F for ; Wed, 8 May 2024 11:18:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4F6946B0130; Wed, 8 May 2024 07:18:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4A82E6B0131; Wed, 8 May 2024 07:18:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 36E696B0132; Wed, 8 May 2024 07:18:41 -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 16FA36B0130 for ; Wed, 8 May 2024 07:18:41 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id BD90F40FE9 for ; Wed, 8 May 2024 11:18:40 +0000 (UTC) X-FDA: 82094980800.02.41EE223 Received: from mail-lj1-f172.google.com (mail-lj1-f172.google.com [209.85.208.172]) by imf21.hostedemail.com (Postfix) with ESMTP id CFD771C0004 for ; Wed, 8 May 2024 11:18:38 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=f0hnAIWA; spf=pass (imf21.hostedemail.com: domain of alexghiti@rivosinc.com designates 209.85.208.172 as permitted sender) smtp.mailfrom=alexghiti@rivosinc.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1715167119; 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:references:dkim-signature; bh=7s2Jc0w0RwoJia0FRkNkBXydPtaseE14QqCOpfNooII=; b=8lKH/9SjJykpkWKwUuT2HkUmOeo8X/ntjjwT9C/g8/nJH2dsZVtSvCQqTs9wkoxIOfUUOW F+bN0Y3lkfi8LNgOyubdjjM+XF5K6crGrbH8oYud1MIuqLvCkyd6R5nDy85WwEiX5l6o0v a9jDyj4P0m40ttX6g+wVawIlsvqrgBc= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=f0hnAIWA; spf=pass (imf21.hostedemail.com: domain of alexghiti@rivosinc.com designates 209.85.208.172 as permitted sender) smtp.mailfrom=alexghiti@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1715167119; a=rsa-sha256; cv=none; b=cT57hDEkixFcdBvV4S8dZOjbQOfbOSf7BAJd5ZWK5QDERrE4r65Jl4yoG8gA3RhQ3clIAY HHEZIsH5eS0wTtkejTnxB9k4VcosiAlVZRIVxos72P6Jdfi8HF/ivQDx8BXwkB2V3cvdlB nt21yJG0UnFVoJ3C7d34nM36jnj/9pU= Received: by mail-lj1-f172.google.com with SMTP id 38308e7fff4ca-2e242b1dfd6so46886201fa.0 for ; Wed, 08 May 2024 04:18:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1715167117; x=1715771917; darn=kvack.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=7s2Jc0w0RwoJia0FRkNkBXydPtaseE14QqCOpfNooII=; b=f0hnAIWAUrLPMTLhFq5sIe+AXrxYPgi5SaiJIjtKodd6Y+2lpgbmBUhFQMoqFn0oms iC+9tsd2rNbNhQRsnQ2PAYpNSh0t/WwGy647Hc/bubIHglFFEucOk+fflVPOOtuRdId2 6J29DnWBjqmcMqh9gkfG9b1hPqpq1Tl37mBUNkUbPo5fOEi/Zekf0JueFVpkTqqwySlH 5lmA4XrI89FAUj6/nRyND0mJcNyO/5mDSvsZn1eQQWWAebxL0+QV426LgT9jIKPfJmVR qN80mwEwTobj3zjfqIkRfmi/O6TdLBc6sR23viFcrvxW7phHGn4EQP5iMM6Wul3iFRBE 2eBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715167117; x=1715771917; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=7s2Jc0w0RwoJia0FRkNkBXydPtaseE14QqCOpfNooII=; b=Mw4oebPUYoZuWEaLX/zip4mZkmUDfFN40u5+pfKgOFblngq6QZ6Kg5PrvTJn5db5EO bqBPV+E4RHf/+WHTNwrJ7EcjjnHCTbybSvrr9RuQ4Am/7glBBCfX/O6P2PCV64XOqeXK MIp57JMTTPpTlxO282iRXGBlEZHFz7VYRlHSJ+28a/+C/FzddYpJknfF7AqXpCajTFOl FHWr0w+bdnNXZmi/l9mib8Xa2rAHYuWqr2hPqol/yhAFPEfK6QxMUZ0sjARiQltA/7/w /5Et3//mngdj6N6iff/heCFxL5Ca/iqDrwtUzcRXjMhXFwIK67StzbsXDuzhgR9sRfmO Y3Zw== X-Forwarded-Encrypted: i=1; AJvYcCUcv6ZpZtI9AcsPxKR6HMsvjC4fqJVuB+MErK5RNw9VzePsUKOuAvzw8HB6RAXYC+5BskG7c5oRa1+AU4puiXmrR9U= X-Gm-Message-State: AOJu0Yy4bJXrqr/rBJM+X2QkPJXngYK0iYH0bX47NRO7+I4d+54S0M0t yIFjGua4ZAfdW+Egkg+p5PrekCukhiaPMngQ5FPTpL4GQmE9YTNEMQQxEHIzG7A= X-Google-Smtp-Source: AGHT+IE4qIFoqxTdkb49q/bY17UwLRoTIUg63kSAW3jbHy8RJOOcZA258spjIObf7gc4cKs2O6G04w== X-Received: by 2002:a2e:4602:0:b0:2e0:3132:94d4 with SMTP id 38308e7fff4ca-2e446f7c72amr11638751fa.16.1715167116751; Wed, 08 May 2024 04:18:36 -0700 (PDT) Received: from localhost.localdomain (amontpellier-656-1-456-62.w92-145.abo.wanadoo.fr. [92.145.124.62]) by smtp.gmail.com with ESMTPSA id f21-20020a2ea0d5000000b002e123933dcbsm2422820ljm.120.2024.05.08.04.18.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 May 2024 04:18:36 -0700 (PDT) From: Alexandre Ghiti To: Catalin Marinas , Will Deacon , Ryan Roberts , Mark Rutland , Paul Walmsley , Palmer Dabbelt , Albert Ou , Andrew Morton , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, linux-mm@kvack.org Cc: Alexandre Ghiti Subject: [PATCH v2 0/9] Merge arm64/riscv hugetlbfs contpte support Date: Wed, 8 May 2024 13:18:20 +0200 Message-Id: <20240508111829.16891-1-alexghiti@rivosinc.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Stat-Signature: bie5xuzcb5bhjb5yjss3ueamnadbaw8t X-Rspamd-Queue-Id: CFD771C0004 X-Rspamd-Server: rspam10 X-Rspam-User: X-HE-Tag: 1715167118-869689 X-HE-Meta: U2FsdGVkX1/rrT42Oq8Uh0FwW7rsKTY0EjtAMbjgQc3qP4VCYIrGUvVinvOioEf4qWiazCWJcugkQ43mDhxm7AFmy//EpHvWWQloL4gVc7aQozLvR1bOe/26Cm67I2bRJB2dSiPNpip+68kBDx/esHW4rlyfyTSS+/rmM2xvXZ7gD5JpjqvLpDiwNshOWUMj5jgeizauTJJyZe/JVGWkECfIwaBb4rc54F719ucPcHrrWiDP+4kA4eT7VaTMJo9rXGqlYuGe5X7xGBQZ9mtjXRfhO+nzWsACee/97ojg0KSmEovo2svWa8dphsjsC9DtyLqh7keyoWnEdHoW2KUCzL4E2iEx3X1f8sX7mjLnuL8K9cWlvMLM1gb2JBoG/RL3ww5G+wiIadDJRv6HADDzvWoe7ZbATL2Z+8/kQO/22pPeE+pkFUancTiZK+T3aM895ClNAmWH97Umc4lNkU9hcwcCx9aDkcTev4W1IFSUaLAN5YHBrFBaEYIxeyXWeqModvUIuJ+XziRdIBhmoJOPd7KSsZ97RduAHfcc9kTClPZQN83/C9ujjAl0j3CdSfETKFydnOwnVXg/Sb28WXVHSpAs7rc+glPmOaadBbCxUdBEmL7+T35ucnOjICS2CB7PTmDgLP62VgZ7woDlMMmNg1H+UupkhnpEpO94JuUcsklSy3bz2GxwKjRG3qf6VyKVb5HZ1nMQUqAxeo1eRB4Uyybm6PhhY8Zlhu/2aC8exU3Rpgt8VcxcC3W9q4pWevmiveZany4QjspzZ+r9YZa3QJ3q+P/lFgEyL154b36aUTrjpaQetX4GWIKgUaq1WoBVV+yx3xoFN8MbgSb1ret1DQyY0Cb6d7vdlN/Roofhqz4HimOq5kS3W48eRqAMB5DREBEyAWmcXooeFx9pZye6wCZDvlyc1/qW8wz6TkccFO6qq56xvQCi+tlitnQdGfy3nf7eRwr/ZOPKf5wTXQw +FFCGwAW Jiucn9jpVKWfSaFPR09wXAHEyUnp0cOBR7IcfmfyvD+b26di8EcxaUeS5icrKI2AIukYf9r0alyVcyD3zx/yBYlF92gVx86THnGnrxuQ+jG2RQF+EkFl/bA2EqwtYd4PSL721krTL4EarZSRigE3YFUEGdJUS0G1lM8kN85GtuwcGYUWtML5WbQnRbrOtPMzC1Hd6dwTc2tNbS3ry0XrIG6Ycz0Y+7qyVPNcmxeEhrCRqZ+pWK1gAtACH7/N8qcv+XOBTwrRs32ZsQXcdi4gR3EA6ZK/qL8F0ae4IVDz+CpxpsG2q5djbOSYHJ3RJQBWHyi4t/bQ1ZI0dgEJrqctCfAqicBQb3cZRCwlWO/ZoD6zSMGi5XJ/zUKJ6G8zdp46MV0YFmnLkCw4ChojuN37IuY5BYpfBtf+1T9yFuCKtXD14rw90xByL7PFgliRi2u9LqdwAfHeGrR8wmTpdxKsdxpRuoub1mpYI+fGnqD93TJn1ZuT3I5nNII0toJHYcEkPFMXQ 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: This patchset intends to merge the contiguous ptes hugetlbfs implementation of arm64 and riscv. Both arm64 and riscv support the use of contiguous ptes to map pages that are larger than the default page table size, respectively called contpte and svnapot. The riscv implementation differs from the arm64's in that the LSBs of the pfn of a svnapot pte are used to store the size of the mapping, allowing for future sizes to be added (for now only 64KB is supported). That's an issue for the core mm code which expects to find the *real* pfn a pte points to. Patch 1 fixes that by always returning svnapot ptes with the real pfn and restores the size of the mapping when it is written to a page table. The following patches are just merges of the 2 different implementations that currently exist in arm64 and riscv which are very similar. It paves the way to the reuse of the recent contpte THP work by Ryan [1] to avoid reimplementing the same in riscv. This patchset was tested by running the libhugetlbfs testsuite with 64KB and 2MB pages on both architectures (on a 4KB base page size arm64 kernel). [1] https://lore.kernel.org/linux-arm-kernel/20240215103205.2607016-1-ryan.roberts@arm.com/ Changes in v2: - Rebase on top of 6.9-rc3 Alexandre Ghiti (9): riscv: Restore the pfn in a NAPOT pte when manipulated by core mm code riscv: Safely remove huge_pte_offset() when manipulating NAPOT ptes mm: Use common huge_ptep_get() function for riscv/arm64 mm: Use common set_huge_pte_at() function for riscv/arm64 mm: Use common huge_pte_clear() function for riscv/arm64 mm: Use common huge_ptep_get_and_clear() function for riscv/arm64 mm: Use common huge_ptep_set_access_flags() function for riscv/arm64 mm: Use common huge_ptep_set_wrprotect() function for riscv/arm64 mm: Use common huge_ptep_clear_flush() function for riscv/arm64 arch/arm64/Kconfig | 1 + arch/arm64/include/asm/pgtable.h | 56 +++++- arch/arm64/mm/hugetlbpage.c | 291 +--------------------------- arch/riscv/Kconfig | 1 + arch/riscv/include/asm/hugetlb.h | 2 +- arch/riscv/include/asm/pgtable-64.h | 11 ++ arch/riscv/include/asm/pgtable.h | 153 +++++++++++++-- arch/riscv/mm/hugetlbpage.c | 227 ---------------------- arch/riscv/mm/pgtable.c | 6 +- mm/Kconfig | 3 + mm/Makefile | 1 + mm/contpte.c | 272 ++++++++++++++++++++++++++ 12 files changed, 480 insertions(+), 544 deletions(-) create mode 100644 mm/contpte.c