From patchwork Sun Jul 16 15:20:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guo Ren X-Patchwork-Id: 120905 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp670680vqt; Sun, 16 Jul 2023 08:40:53 -0700 (PDT) X-Google-Smtp-Source: APBJJlEgXYDMl5NLzMOTmawXbB4Tn2WueprlSKWepZrBpXtzyGP2h5cik9BWoalYJze++eLkAmE7 X-Received: by 2002:a05:6a20:7345:b0:133:5f6a:fb6 with SMTP id v5-20020a056a20734500b001335f6a0fb6mr12427887pzc.1.1689522053134; Sun, 16 Jul 2023 08:40:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689522053; cv=none; d=google.com; s=arc-20160816; b=pUSEJvdL6U56qgz+c27rhge1e//ie8YSenxIgUE+dfKunoTzfp9HLehv92D3UgsIjz OdaNil4cqZPJTELfarB1DLJX1JQupAOpZ7lVAsxKH6cTKHguq7tlGxsdaPTj7ct7KSh8 fI/9/GTJEIB8ddgUhCNMJxYZxjWI1IUPaB17Q3hJ5M2K8oiho/VV/Y6pKYF05sTiYLRB kGoPtKjBoAQPYf2uUFOuC/CJV8qipSVRCkl+/rbhJ787MROxyPnE+EzhKVQtPADfc5k8 slDIy2v6/FiuWNtHVZ+N9NXrwo6pjTmEc/C2VqHONKyKxox4YrXcJRKqjsupu9YqIZiF FIKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=4LT7hlcqBmDsPogd7mDERwpHLqrEEJk03sw8STu2mYI=; fh=ESPtB9+70PwCbzG1XIwIbtPAG0bqXQfU0K/AWvRvHpE=; b=MS1WWjfvD0al/d8gQxw3a9XcKsg+tSsw1pLQk8F0PzQHef3Jk+CtwXrzkmNveZjgNq Jn8+XxvJLzxJ4rmj/FKNbItFPogN2xJi/UHahARWCU+sQHhs6knrEGNggUrKQU1sIY6h idrVo6vHkZg+FcpRis4XJ43o76ybmdZ7XEkUzmnD9qhUT9c1hWx9OoqPb5xKL3nYUbTP 4TqiZdc+htStS/SatcZ6/yhqSla8126kjgVppQzjNQ3gdEYdzWoS6vllSO7ofggtoTb6 KrhbxzN/lIlvubLUJaLHzg002M6kDaETjUQlqEbhh87mMxgqW2MXr9Y9wjjdhaoKUswz IPMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ri48yWAp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k9-20020a056a00134900b0066882062113si10405861pfu.9.2023.07.16.08.40.39; Sun, 16 Jul 2023 08:40:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ri48yWAp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230165AbjGPPUt (ORCPT + 99 others); Sun, 16 Jul 2023 11:20:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45352 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229515AbjGPPUs (ORCPT ); Sun, 16 Jul 2023 11:20:48 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8090FE4E; Sun, 16 Jul 2023 08:20:47 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 0857B60C61; Sun, 16 Jul 2023 15:20:47 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5B2D2C433C7; Sun, 16 Jul 2023 15:20:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689520846; bh=KuRdyUnvdhMI0IlJX5eClH8cwmGftUxt0A36mvY9HIo=; h=From:To:Cc:Subject:Date:From; b=ri48yWAptbDvfqa8raYqK0Qc1xMA0ks3kWOM4NUuo0b8ozl/Pc8U/qglksWNKcIuP +vto7asvYvtXHZCUksExNLZDPgkHtp6nxvIKycIguLGReF1B+4k3mVAoRSIKScJJx1 SO5VL7v4wpz4YJ95lWZ2yoq3fY5zNsDLQcev9IpOAl/adKTR4w+4ApshXUixydSXvU g98GVv+4C2M8m+pir8crYc9qrybXkNIVOHEatJuiGPfuhljXbckSn7Efxu6qWfD8mk SH08O9qI5I5Mp87oicN/rNG1LHZxaCDjMcVDtyOV5g1DZ7EurVQX/anGucr7XxhCTI Mypmwvjdhle0Q== From: guoren@kernel.org To: guoren@kernel.org, palmer@rivosinc.com, paul.walmsley@sifive.com, falcon@tinylab.org, bjorn@kernel.org, conor.dooley@microchip.com, alex@ghiti.fr Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, Guo Ren Subject: [PATCH] riscv: Add HAVE_IOREMAP_PROT support Date: Sun, 16 Jul 2023 11:20:33 -0400 Message-Id: <20230716152033.3713581-1-guoren@kernel.org> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771592276185930175 X-GMAIL-MSGID: 1771592276185930175 From: Guo Ren Add pte_pgprot macro, then riscv could have HAVE_IOREMAP_PROT, which will enable generic_access_phys() code, it is useful for debug, eg, gdb. Because generic_access_phys() would call ioremap_prot()-> pgprot_nx() to disable excutable attribute, add definition of pgprot_nx() for riscv. Signed-off-by: Guo Ren Signed-off-by: Guo Ren --- .../features/vm/ioremap_prot/arch-support.txt | 2 +- arch/riscv/Kconfig | 1 + arch/riscv/include/asm/pgtable.h | 15 +++++++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/Documentation/features/vm/ioremap_prot/arch-support.txt b/Documentation/features/vm/ioremap_prot/arch-support.txt index a24149e59d73..ea8c8a361455 100644 --- a/Documentation/features/vm/ioremap_prot/arch-support.txt +++ b/Documentation/features/vm/ioremap_prot/arch-support.txt @@ -21,7 +21,7 @@ | openrisc: | TODO | | parisc: | TODO | | powerpc: | ok | - | riscv: | TODO | + | riscv: | ok | | s390: | ok | | sh: | ok | | sparc: | TODO | diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index 4c07b9189c86..15900fa20797 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -117,6 +117,7 @@ config RISCV select HAVE_FUNCTION_ERROR_INJECTION select HAVE_GCC_PLUGINS select HAVE_GENERIC_VDSO if MMU && 64BIT + select HAVE_IOREMAP_PROT select HAVE_IRQ_TIME_ACCOUNTING select HAVE_KPROBES if !XIP_KERNEL select HAVE_KPROBES_ON_FTRACE if !XIP_KERNEL diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h index 75970ee2bda2..c9552a161f90 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -415,6 +415,11 @@ static inline pte_t pte_mkhuge(pte_t pte) return pte; } +static inline pgprot_t pte_pgprot(pte_t pte) +{ + return __pgprot(pte_val(pte) & ~_PAGE_PFN_MASK); +} + #ifdef CONFIG_NUMA_BALANCING /* * See the comment in include/asm-generic/pgtable.h @@ -573,6 +578,16 @@ static inline int ptep_clear_flush_young(struct vm_area_struct *vma, return ptep_test_and_clear_young(vma, address, ptep); } +#define pgprot_nx pgprot_nx +static inline pgprot_t pgprot_nx(pgprot_t _prot) +{ + unsigned long prot = pgprot_val(_prot); + + prot &= ~_PAGE_EXEC; + + return __pgprot(prot); +} + #define pgprot_noncached pgprot_noncached static inline pgprot_t pgprot_noncached(pgprot_t _prot) {