From patchwork Wed May 8 19:19:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Ghiti X-Patchwork-Id: 13659091 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 1491CC04FFE for ; Wed, 8 May 2024 19:25:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A0F896B009E; Wed, 8 May 2024 15:25:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9C00A6B009F; Wed, 8 May 2024 15:25:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 887DB6B00A0; Wed, 8 May 2024 15:25:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 6C4BF6B009E for ; Wed, 8 May 2024 15:25:46 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 2A46516119E for ; Wed, 8 May 2024 19:25:46 +0000 (UTC) X-FDA: 82096208292.08.53DFF4E Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by imf24.hostedemail.com (Postfix) with ESMTP id 39F9418000E for ; Wed, 8 May 2024 19:25:43 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=KkmpE5rY; spf=pass (imf24.hostedemail.com: domain of alexghiti@rivosinc.com designates 209.85.221.49 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=1715196344; 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:dkim-signature; bh=Nb289X82Pwy2psbtYSkuOYlUdcLMn+kmFJiTkQU5Z+c=; b=l9DMSJ/8Ofz4icx6FA96osGA+lO202WnZ+edwtGKvK5Okgya81ir8t4EIM7D99QG+TY851 uWP6ViO4714kSB1nnabHNqHPUWmIo8Ph1yjq1oV4K16tmXt1gs7LFNJ/WdeJlfU+TMphPL RY6tWkrJR44kDWqYOgqR5wGNzEJGLMY= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=KkmpE5rY; spf=pass (imf24.hostedemail.com: domain of alexghiti@rivosinc.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=alexghiti@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1715196344; a=rsa-sha256; cv=none; b=xTyjofe9U1h7YrJTlMayXivWdzv9xuNaHhax88ts412iy27uKZg/NRUpQRXeekUlLh/t6g OhWq30prU9iw0lyYxcldPnuSk8Dtix0VhyuyJlYPh+MFj3HwZtpe+JzJtrFQ/TNhL4WuzV bqeB1+8XMWxeqnK4RAdLY1rv3N49tls= Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-34d96054375so36209f8f.2 for ; Wed, 08 May 2024 12:25:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1715196343; x=1715801143; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Nb289X82Pwy2psbtYSkuOYlUdcLMn+kmFJiTkQU5Z+c=; b=KkmpE5rYHKhMjXD1Ywce+2xnh37X4KvVzZQSbJaI0MN9YoahrnNZSiuOvR9hdCR6YI 6pXvQz6X682lG7QAKddAsbv91wRD0y6X6bcdZZfNlZQNVA6MYUAHXVcQeWLU/UYEDKHg grzCHn4BeQbafL1Zb/q8BZD1Fo7+vXk5nqaXuY3dC14G9vpNyqvCR75PW5OUzjnpx/el 8v9tLG/lF4jn1SQgz3yF42ZisrnB2yWH8PjahkNwAYQObp995BYC4267qBGyk6mKXxYS risUidNRACNGaOyOqmHnHz1+7EihfJQONS3UCJtz+0GP2r7hWak0t5fS/CTQN7k67Z1Z FSaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715196343; x=1715801143; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Nb289X82Pwy2psbtYSkuOYlUdcLMn+kmFJiTkQU5Z+c=; b=Hg0Q/DB1N7Fh2n4IhSVYDGfP/rUU9Wzs/8jHqX/Ta55b5Ag2DYhTfAKyhQlQJKXZCs XtqxHBceXJUsJwoOaPbNa1ETLgyUpAl495aP2ZTx0NL54TS8e8qXs25TjyBp6F3RReC4 RPXlHshvuUrrRbcRQdp8tAFwPMz2pA6j9J7DL6uIMEQ8sqzGGHQKqwb/ASncYoXsm5al dYeiYU3W38UDCgTBLKSbIPvR2RWaqF6CsGBRfET2MWen+gBYH4c2YIuGpPEJwZKKGWxu cmKWDoCmSJaDAcKiOYa623arHP39JTYUqFfnWHdOrXO7OgsARDj79/+nHGWVt7ccslea 32bQ== X-Forwarded-Encrypted: i=1; AJvYcCWuSHHiefWPq8bZ8px6+ahDWuPchG2kUooGscKGYCvVDvcn8KCtHyIQAWQbazMCAlk87uadW+dEWu7MLwr1pH7Z2hU= X-Gm-Message-State: AOJu0Yw8r56wfSDnO2vDpv4EGTky+QA2CHTGKNrgw7LMbbab5Q9RI0j1 X0hcdTpJdW1tvG8Au/yhXXVZ4IpltR3aehigw8P/78Y6FGCy96qUis27pTRwjUg= X-Google-Smtp-Source: AGHT+IFUGL9dDH2gwgI9tPWACeaOFPW71lxlPF9m81I7+sLroC1dBTrL+wbzR1KIUMB3+0Tz7vFgZA== X-Received: by 2002:adf:a492:0:b0:343:a368:f792 with SMTP id ffacd0b85a97d-34fca621315mr2849241f8f.52.1715196342717; Wed, 08 May 2024 12:25:42 -0700 (PDT) Received: from alex-rivos.ba.rivosinc.com (amontpellier-656-1-456-62.w92-145.abo.wanadoo.fr. [92.145.124.62]) by smtp.gmail.com with ESMTPSA id b12-20020a5d4d8c000000b0034e65b8b43fsm14038517wru.8.2024.05.08.12.25.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 May 2024 12:25:42 -0700 (PDT) From: Alexandre Ghiti To: Ryan Roberts , Catalin Marinas , Will Deacon , Alexander Potapenko , Marco Elver , Dmitry Vyukov , Paul Walmsley , Palmer Dabbelt , Albert Ou , Ard Biesheuvel , Anup Patel , Atish Patra , Andrey Ryabinin , Andrey Konovalov , Vincenzo Frascino , Andrew Morton , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, linux-riscv@lists.infradead.org, linux-efi@vger.kernel.org, kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, linux-mm@kvack.org Cc: Alexandre Ghiti Subject: [PATCH 06/12] mm, riscv, arm64: Use common pte_clear() function Date: Wed, 8 May 2024 21:19:25 +0200 Message-Id: <20240508191931.46060-7-alexghiti@rivosinc.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240508191931.46060-1-alexghiti@rivosinc.com> References: <20240508191931.46060-1-alexghiti@rivosinc.com> MIME-Version: 1.0 X-Stat-Signature: bhkg3c3unjt8zg99u34uujb4zesy7wfx X-Rspam-User: X-Rspamd-Queue-Id: 39F9418000E X-Rspamd-Server: rspam05 X-HE-Tag: 1715196343-594390 X-HE-Meta: U2FsdGVkX1+rXTWzyEYqha5oZZGI5sbFifqIPvpAwLbcU1dbnhfLjnkLBrtxkd0jgwG4VQmRsnuvnJ+Bm7r0rt+9L/2NBO8sq19/emwUCR8235XzEnNX7qfRkNMx0esJJgrdbKtb9EWzJCpzz/v46mz91bStM0uBApllb/7hxCVOdH4VNStMMwpHa3Yi8dTd1syrqbfz/f+jRbV3xtTO6rr79PTU5GyzCl1nlDgKa3reCKfGUUUNNapWQIGNWx4n3BKU91O1H+unl23rQHMfNZgXfxdT8U6RpX8wk+MCEO30YuOGBtnqD6i4dvrNwrA4yniHZjAWV/CP2CYCdy/ctzd/qnxbd+7kJ6ld6RdW9H7PAtwvt1F5470rksYonWwTPeHJyN2Hm+uqUsEshsgAN4g13iM2C8cUo0Kfkaw30NL7Zp4f8Qulni7wnblQxyGyI4IY0lWBiGsNJm3E8SB+sc1hRDq/8uXgAttpTGwaB9sCtAdA1JHjYPOGA2FQrLxvBFDRmvqRx2pP9QsYxbokzizMzrlLAkHWQ9NcAyNOu5qm009ISGgeesieWMOyDCu0k0V3mXRewO1UWG3M21lrDIGaUrk0Wg0ZKT+HsWsfBFSqP2KJbTM0dfgVBPaN08bV3R8LC0NAuQ4w44JTWNySCwhbWbuZiTXOIaOx/0A7ci69W2iuLIXAWwUXgURG4oOGDFdXJUpAR2yDFctJ5OK6LlWSGBc2BnguSGEU/TsPRQyDSQdQFwiUYQsgHm73d75V/hc4pAEiN9gHAhg5KB9+ucLbSuVC72rBTCQI7mqmsw2SXEuAr0KVYZhLz92pkxYzeyF9OeM4oOx8N6UCL+fkIV1L7GjPFrIeEHdlzovpSeHnnySgIGL8Gr69a5bSn2Om56H4L1fOsLU9aIkKK0gPlDcjMGqeCbEyD5j1MasGQ8wtOaMXJIGlVyOlwe5kMcv0q3nvVaLEtsVVEB6uPGa RG2JB3fO HzQI8WR3f4GOei6bGZazNHg10LQ6f/yfQ4SYkwagmhVuRaAqY/FJZRjEKjmY8VhF/GfGYPMekZ83Zo7/a8Ic7tlsGZtG2ywM+MqdDmc5GlkVq0b6cA1XTiutiUbnYShXNNu9o/GPe1vEr+v5Nq86nCMak4vX5NPtwJem2n4ADHmheF3KFap4q9Xm0j6qEQN04qLPkzhuS+/1iIEppwlJGP4JS/a+KmF0dyBp1UUyowCp47avy86aULv+/HI/a+p5Jojf7qYNVzbveSP81PIwUbbZUWGQd3VMCOfeiCFmhr4Y7ricC1Lm2wlVO5+WxXzW+7RlLREDCdP7jPJZ45kZ7basl+cUe2ceZG0o54LbfLg9zerI+LStsEEiEJ31QxJtIgEYT7d4b0mbr0HrVB4xNQOGss4YItbcxkATVAWwcaGV8bfuU1RdGGujwTywkTWT/8/5Pun4xMuP2jF381SAZ6sLMF23nvwNokrZqxbGFYxDTgfQgZ4tGW43d12mAt00fNcGHpWlK3I1a2CXogWjpnY/jnLszwkDqF8zYxjUkz30XdB1pMtq/VxvLmw== 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: Make riscv use the contpte aware pte_clear() function from arm64. Signed-off-by: Alexandre Ghiti --- arch/arm64/include/asm/pgtable.h | 9 +++------ arch/riscv/include/asm/pgtable.h | 4 +++- arch/riscv/mm/init.c | 2 +- mm/contpte.c | 6 ++++++ 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index bb6210fb72c8..74e582f2884f 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -1439,12 +1439,9 @@ extern void set_ptes(struct mm_struct *mm, unsigned long addr, pte_t *ptep, pte_t pte, unsigned int nr); #define set_ptes set_ptes -static inline void pte_clear(struct mm_struct *mm, - unsigned long addr, pte_t *ptep) -{ - contpte_try_unfold(mm, addr, ptep, __ptep_get(ptep)); - __pte_clear(mm, addr, ptep); -} +extern void pte_clear(struct mm_struct *mm, + unsigned long addr, pte_t *ptep); +#define pte_clear pte_clear #define clear_full_ptes clear_full_ptes static inline void clear_full_ptes(struct mm_struct *mm, unsigned long addr, diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h index 4f8f673787e7..41534f4b8a6d 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -792,18 +792,20 @@ extern void set_ptes(struct mm_struct *mm, unsigned long addr, #define set_ptes set_ptes extern void set_pte(pte_t *ptep, pte_t pte); #define set_pte set_pte +extern void pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep); +#define pte_clear pte_clear #else /* CONFIG_THP_CONTPTE */ #define ptep_get __ptep_get #define set_ptes __set_ptes #define set_pte __set_pte +#define pte_clear __pte_clear #endif /* CONFIG_THP_CONTPTE */ #define __HAVE_ARCH_PTEP_GET_AND_CLEAR #define ptep_get_and_clear __ptep_get_and_clear -#define pte_clear __pte_clear #define __HAVE_ARCH_PTEP_SET_ACCESS_FLAGS #define ptep_set_access_flags __ptep_set_access_flags #define __HAVE_ARCH_PTEP_SET_WRPROTECT diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c index bb5c6578204c..c82f17b3060b 100644 --- a/arch/riscv/mm/init.c +++ b/arch/riscv/mm/init.c @@ -327,7 +327,7 @@ void __set_fixmap(enum fixed_addresses idx, phys_addr_t phys, pgprot_t prot) if (pgprot_val(prot)) __set_pte(ptep, pfn_pte(phys >> PAGE_SHIFT, prot)); else - pte_clear(&init_mm, addr, ptep); + __pte_clear(&init_mm, addr, ptep); local_flush_tlb_page(addr); } diff --git a/mm/contpte.c b/mm/contpte.c index 543ae5b5a863..c9eff6426ca0 100644 --- a/mm/contpte.c +++ b/mm/contpte.c @@ -45,6 +45,7 @@ * - set_ptes() * - ptep_get_lockless() * - set_pte() + * - pte_clear() */ pte_t huge_ptep_get(pte_t *ptep) @@ -676,4 +677,9 @@ void set_pte(pte_t *ptep, pte_t pte) __set_pte(ptep, pte_mknoncont(pte)); } +void pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep) +{ + contpte_try_unfold(mm, addr, ptep, __ptep_get(ptep)); + __pte_clear(mm, addr, ptep); +} #endif /* CONFIG_THP_CONTPTE */