From nobody Thu Sep 18 18:52:42 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EA9D1C47088 for ; Sat, 3 Dec 2022 03:05:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232026AbiLCDFr (ORCPT ); Fri, 2 Dec 2022 22:05:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56872 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230321AbiLCDFo (ORCPT ); Fri, 2 Dec 2022 22:05:44 -0500 Received: from mail-pj1-x1032.google.com (mail-pj1-x1032.google.com [IPv6:2607:f8b0:4864:20::1032]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 52FBEF7A0F for ; Fri, 2 Dec 2022 19:05:43 -0800 (PST) Received: by mail-pj1-x1032.google.com with SMTP id e7-20020a17090a77c700b00216928a3917so9974138pjs.4 for ; Fri, 02 Dec 2022 19:05:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20210112.gappssmtp.com; s=20210112; h=to:from:cc:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:from:to:cc:subject:date :message-id:reply-to; bh=0od2UA8BjfVP9H3ox8w77ADIivJIw8By1NOK2zw+FrE=; b=KE60HFRJtajGozkhN1G07j7c4EziYG6716Pa6R9qKsnbLrhO3hCPHcTangQUHJQ3GY X2rbnjn7S4+RLLyhk83PlpuLOfyJhKoBVtlxnkZuvLLT1Dy0XXbzHJO+Zb1syJAyiJwK 1HzKJ8H9/hEF3GYwFmyWk0Q0HJt299gtgQDCfvuWmd4WQ04k7q85X+2UiGbQp6C3N8eC JB+LwQRi4zg/FQlDJbAjSfuyM8ImcVmPJAoCvFAWZxvGbIfyu5saspnbFUHqAR9GovKz bu7+YMpT1y/VmhmBNOg6RXvDyiXtw3R2OK3M9Gt60B1+AIpI/MivGoMygnXM/C8pBqnw RD8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:from:cc:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0od2UA8BjfVP9H3ox8w77ADIivJIw8By1NOK2zw+FrE=; b=SRkvaeDkWIqmxEBGDcrcxclXkRQIoipcOqDP2pguIwIm8tv2/BHxZ4VuiuPqtolrnu 3pFzlRMg3ugj0LORK/zNrBkBTG4ATEZ/5912Y8dRz5DdBCd8RVBs+rq6+54iWXNqHgiV ZiOtlYJ6PJCJ3t5tX1Gz72oCf0cu7jwVtKegN/8kFpEZRzHXINXg7IJpa/oKN7thLT3L IXghDrd/hZIm70VDaaLu7mzCd91YeRrmkLpkEoQh4d6LTpe4oXwng1b2YADYtHVFKekF nvYkEya3mP5oi0yP2+AxEDpv7P9GRWBnHkNvb05J+55K9mLcRpPhk3kLsm3MkjFzcIJI Z+sQ== X-Gm-Message-State: ANoB5pmy35SsGKAzTFr8GBwolSolQ7BpPbLRmwx1er61fFuLN9gKEXIL iHdoheZnvhIsjiAJyNeumm/Mfw== X-Google-Smtp-Source: AA0mqf7I3UiJ8c0sc3B4EdMW1XbN/zXhNbb6fQTziUJ0tB9x01rO25QtP9NFuONupmrWTY1OWyBuOA== X-Received: by 2002:a17:90a:be02:b0:219:8199:ef57 with SMTP id a2-20020a17090abe0200b002198199ef57mr9335059pjs.129.1670036742753; Fri, 02 Dec 2022 19:05:42 -0800 (PST) Received: from localhost ([50.221.140.188]) by smtp.gmail.com with ESMTPSA id y2-20020a17090264c200b001873aa85e1fsm6182904pli.305.2022.12.02.19.05.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Dec 2022 19:05:42 -0800 (PST) Subject: [PATCH 1/5] mm: Add a leading 0 to the VM_FAULT_* types Date: Fri, 2 Dec 2022 19:03:52 -0800 Message-Id: <20221203030356.3917-2-palmer@rivosinc.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221203030356.3917-1-palmer@rivosinc.com> References: <20221203030356.3917-1-palmer@rivosinc.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Cc: Palmer Dabbelt From: Palmer Dabbelt To: linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-arm-kernel@lists.infradead.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The next patch will add enough codes to need another character, this adds the 0 to all the existing codes to keep alignment. Signed-off-by: Palmer Dabbelt --- include/linux/mm_types.h | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index 500e536796ca..758eb70829cb 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -862,24 +862,24 @@ typedef __bitwise unsigned int vm_fault_t; * in DAX) * @VM_FAULT_COMPLETED: ->fault completed, meanwhile mmap lock released * @VM_FAULT_HINDEX_MASK: mask HINDEX value - * + * @VM_FAULT_ARCH_*: Architecture-specific VM fault codes. */ enum vm_fault_reason { - VM_FAULT_OOM =3D (__force vm_fault_t)0x000001, - VM_FAULT_SIGBUS =3D (__force vm_fault_t)0x000002, - VM_FAULT_MAJOR =3D (__force vm_fault_t)0x000004, - VM_FAULT_WRITE =3D (__force vm_fault_t)0x000008, - VM_FAULT_HWPOISON =3D (__force vm_fault_t)0x000010, - VM_FAULT_HWPOISON_LARGE =3D (__force vm_fault_t)0x000020, - VM_FAULT_SIGSEGV =3D (__force vm_fault_t)0x000040, - VM_FAULT_NOPAGE =3D (__force vm_fault_t)0x000100, - VM_FAULT_LOCKED =3D (__force vm_fault_t)0x000200, - VM_FAULT_RETRY =3D (__force vm_fault_t)0x000400, - VM_FAULT_FALLBACK =3D (__force vm_fault_t)0x000800, - VM_FAULT_DONE_COW =3D (__force vm_fault_t)0x001000, - VM_FAULT_NEEDDSYNC =3D (__force vm_fault_t)0x002000, - VM_FAULT_COMPLETED =3D (__force vm_fault_t)0x004000, - VM_FAULT_HINDEX_MASK =3D (__force vm_fault_t)0x0f0000, + VM_FAULT_OOM =3D (__force vm_fault_t)0x0000001, + VM_FAULT_SIGBUS =3D (__force vm_fault_t)0x0000002, + VM_FAULT_MAJOR =3D (__force vm_fault_t)0x0000004, + VM_FAULT_WRITE =3D (__force vm_fault_t)0x0000008, + VM_FAULT_HWPOISON =3D (__force vm_fault_t)0x0000010, + VM_FAULT_HWPOISON_LARGE =3D (__force vm_fault_t)0x0000020, + VM_FAULT_SIGSEGV =3D (__force vm_fault_t)0x0000040, + VM_FAULT_NOPAGE =3D (__force vm_fault_t)0x0000100, + VM_FAULT_LOCKED =3D (__force vm_fault_t)0x0000200, + VM_FAULT_RETRY =3D (__force vm_fault_t)0x0000400, + VM_FAULT_FALLBACK =3D (__force vm_fault_t)0x0000800, + VM_FAULT_DONE_COW =3D (__force vm_fault_t)0x0001000, + VM_FAULT_NEEDDSYNC =3D (__force vm_fault_t)0x0002000, + VM_FAULT_COMPLETED =3D (__force vm_fault_t)0x0004000, + VM_FAULT_HINDEX_MASK =3D (__force vm_fault_t)0x00f0000, }; =20 /* Encode hstate index for a hwpoisoned large page */ --=20 2.38.1 From nobody Thu Sep 18 18:52:42 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id ADE1FC47088 for ; Sat, 3 Dec 2022 03:05:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234490AbiLCDFx (ORCPT ); Fri, 2 Dec 2022 22:05:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56882 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230483AbiLCDFp (ORCPT ); Fri, 2 Dec 2022 22:05:45 -0500 Received: from mail-pj1-x102f.google.com (mail-pj1-x102f.google.com [IPv6:2607:f8b0:4864:20::102f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 75EE4F4EA3 for ; Fri, 2 Dec 2022 19:05:44 -0800 (PST) Received: by mail-pj1-x102f.google.com with SMTP id b11so6586248pjp.2 for ; Fri, 02 Dec 2022 19:05:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20210112.gappssmtp.com; s=20210112; h=to:from:cc:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:from:to:cc:subject:date :message-id:reply-to; bh=oUHGCrN2/GzmAYwHPUyKBA8Ge6xsvUhA3e+Vb+bqY68=; b=GTPXNM4I8XSeRWKFJbfehEVG870eOYMF/pKY9yMWeVjzuXAmyGPMV5Nuhgkd2Rpezc s+BSs8uV7IDAeaosxWjvuIEHbnwRyildLgIAk88UrLwNCF86OOw+gvsvp87gvdO7j5yY khg7Alr0W4R4/KHofpJ9D+lLwLem7Qb0wpi6ArvXA+llBKDEm0aE2tH//UDUW/zvNNNy gfVSZqmFmW+aoOXgq4s35qIFSAZ9WmYlvLQAEJEUCLULeQimBikv4W8YGE42LNgyHFBS veDXzJC3LeHh7Nnv4F5UhC6Q9SyzW2T+bBN93Ioth3DJNcJNlGBAnbsRy+dlZx3PTjOZ 6m8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:from:cc:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oUHGCrN2/GzmAYwHPUyKBA8Ge6xsvUhA3e+Vb+bqY68=; b=bQPq/X5HZ4g1ishzuC9sXBOYLAwhZPSxDmZohAorpM3yYuDLijRJKlOLqzITzyL/ye 960cC+sptE08o63cWt9SiGs3PQlH2m/AeS1OZeGSAWU9PFUJQ6IAFDmV8GyLdT5l1mhX h8K74eW6FB9hLGldw+YqNkiIG4hOuv+clTZgEblLxr/HG3xCJmNOovsPHqZO/8E2Z5n2 A8m1RJBV6bijz9peBlt6LJNEBtevITpge7y9gcGkVi7V23797QfM2+AlwdzNFuxp9hEI 7eEXvd4tGsGsvP8cLg8+5fK8BhL5D9NtS5HxT87bybWaIz3Uw6dFYUf1nuidVwheIThc WvKg== X-Gm-Message-State: ANoB5pmTn2rNZ682OSV/NZi6XZNWY+uzZLVmc+jE7pbbzJDt0+PWz3an jKVYVBLGTI0vq/9COoRN/LrJwA== X-Google-Smtp-Source: AA0mqf6uIzMwjns2LD/gQeHWIsS+ZDiU1QORTWoif/bzBJr4V+crCrb3KCajLaMXkOYnYMNn1jPFyA== X-Received: by 2002:a17:90b:609:b0:219:3ad9:64f5 with SMTP id gb9-20020a17090b060900b002193ad964f5mr29166277pjb.138.1670036743958; Fri, 02 Dec 2022 19:05:43 -0800 (PST) Received: from localhost ([50.221.140.188]) by smtp.gmail.com with ESMTPSA id b2-20020a62a102000000b005745635c5b5sm5713256pff.183.2022.12.02.19.05.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Dec 2022 19:05:43 -0800 (PST) Subject: [PATCH 2/5] mm: Add VM_FAULT_ARCH_* codes Date: Fri, 2 Dec 2022 19:03:53 -0800 Message-Id: <20221203030356.3917-3-palmer@rivosinc.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221203030356.3917-1-palmer@rivosinc.com> References: <20221203030356.3917-1-palmer@rivosinc.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Cc: Palmer Dabbelt From: Palmer Dabbelt To: linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-arm-kernel@lists.infradead.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" A handful of architectures (arm, s390, and soon RISC-V) define their own internal fault codes, so instead dedicate a few standard codes as being architecture-specific to avoid conflicts. Signed-off-by: Palmer Dabbelt --- include/linux/mm_types.h | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index 758eb70829cb..df1aa8d58444 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -880,6 +880,11 @@ enum vm_fault_reason { VM_FAULT_NEEDDSYNC =3D (__force vm_fault_t)0x0002000, VM_FAULT_COMPLETED =3D (__force vm_fault_t)0x0004000, VM_FAULT_HINDEX_MASK =3D (__force vm_fault_t)0x00f0000, + VM_FAULT_ARCH_0 =3D (__force vm_fault_t)0x0100000, + VM_FAULT_ARCH_1 =3D (__force vm_fault_t)0x0200000, + VM_FAULT_ARCH_2 =3D (__force vm_fault_t)0x0400000, + VM_FAULT_ARCH_3 =3D (__force vm_fault_t)0x0800000, + VM_FAULT_ARCH_4 =3D (__force vm_fault_t)0x1000000, }; =20 /* Encode hstate index for a hwpoisoned large page */ @@ -903,7 +908,12 @@ enum vm_fault_reason { { VM_FAULT_RETRY, "RETRY" }, \ { VM_FAULT_FALLBACK, "FALLBACK" }, \ { VM_FAULT_DONE_COW, "DONE_COW" }, \ - { VM_FAULT_NEEDDSYNC, "NEEDDSYNC" } + { VM_FAULT_NEEDDSYNC, "NEEDDSYNC" }, \ + { VM_FAULT_ARCH_0, "ARCH_0" }, \ + { VM_FAULT_ARCH_1, "ARCH_1" }, \ + { VM_FAULT_ARCH_2, "ARCH_2" }, \ + { VM_FAULT_ARCH_3, "ARCH_3" }, \ + { VM_FAULT_ARCH_4, "ARCH_4" }, \ =20 struct vm_special_mapping { const char *name; /* The name, e.g. "[vdso]". */ --=20 2.38.1 From nobody Thu Sep 18 18:52:42 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F31B4C4321E for ; Sat, 3 Dec 2022 03:05:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235000AbiLCDF4 (ORCPT ); Fri, 2 Dec 2022 22:05:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56900 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231741AbiLCDFq (ORCPT ); Fri, 2 Dec 2022 22:05:46 -0500 Received: from mail-pj1-x102d.google.com (mail-pj1-x102d.google.com [IPv6:2607:f8b0:4864:20::102d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7DAE2F7A09 for ; Fri, 2 Dec 2022 19:05:45 -0800 (PST) Received: by mail-pj1-x102d.google.com with SMTP id t17so6566275pjo.3 for ; Fri, 02 Dec 2022 19:05:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20210112.gappssmtp.com; s=20210112; h=to:from:cc:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:from:to:cc:subject:date :message-id:reply-to; bh=OhR/DvZbp+3vR9eB4A5wFYKGQTjA+LqOJxd/xHKwNw4=; b=KpJKmzUqKuY7RNz1zoEByIJW90y1Livh3n8yRVCtF7Wr2SNUWd5EFqo0EjjNi6loJv TlFuL2eEbd8DZ8FBCGv2ReWj958YzPC2Tt8AZagpgWofFTbPz3N9Aoss5wquaRZv35pt zf534yNV0g0gfKF8Bxz3qsNDzOBS2wJGcO2gP6yGN2p/yU3fATEm0f/qdKSMHwBwAsqk jnSfc+OaPsVevmGerR1dP9afYP2sPSSOlwlnAwWpFHuq0XqOLftSexffps5iSRlfBRFT fJHeyOjJR8qw7F5Bxhqn6UBDRAZfg680T48PHv4bOtksy7UlERFx7XNKzkB4IIToom71 zAjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:from:cc:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OhR/DvZbp+3vR9eB4A5wFYKGQTjA+LqOJxd/xHKwNw4=; b=6hGSSc3B9W/YmCf5gzPEt1BodrV9mmHMMi44eTptWOm6CP29zqcErMdxnft5TufPg0 8Dl8f11to1O66c6Rvhy8/9sDmoktsjgHc/ogw2ylV1N7IdX+df6uBvDRkVsh1lQEtLOa hol61lnyrCi9FXeJ+HS2kIxA3fcLopOK6K/Q5Thc6TfVhmagobIpV8kFGz7eESfoSp+n O6Gkr5XhCjk2KFyNSqaypFzaaWdXBlfNZDq1O3ceRtEFe6woZ3NefVlfGmroiPVW5zzX BFI3gHB2cI+HFuFMBmkCj7lHOrzJnYQqKtQO8wnUpwMqGHil0nvD9eq4sHSSc+SwLkX5 iWHg== X-Gm-Message-State: ANoB5pmP7KA45H/q1MMVl6dyifvr3v6wc7G31RvMYG98Cbc9EQhy/Bek wlkflafdOodNlLTOaQEh5amnfA== X-Google-Smtp-Source: AA0mqf7bOAyepA04ituLKXHZJH3uQ4cqneDkfqNEF7GDlldsPNuzsJMKn7BDVi7Zx/YGZ+BpcYq8AA== X-Received: by 2002:a17:902:bf06:b0:188:d3b1:dbfc with SMTP id bi6-20020a170902bf0600b00188d3b1dbfcmr57933988plb.127.1670036744950; Fri, 02 Dec 2022 19:05:44 -0800 (PST) Received: from localhost ([50.221.140.188]) by smtp.gmail.com with ESMTPSA id c11-20020a170903234b00b00186c3afb49esm6182561plh.209.2022.12.02.19.05.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Dec 2022 19:05:44 -0800 (PST) Subject: [PATCH 3/5] arm: fault: Convert to VM_FAULT_ARCH_* codes Date: Fri, 2 Dec 2022 19:03:54 -0800 Message-Id: <20221203030356.3917-4-palmer@rivosinc.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221203030356.3917-1-palmer@rivosinc.com> References: <20221203030356.3917-1-palmer@rivosinc.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Cc: Palmer Dabbelt From: Palmer Dabbelt To: linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-arm-kernel@lists.infradead.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" These conflict with VM_FAULT_HINDEX_MASK, so move to some designated arch-specific values. Signed-off-by: Palmer Dabbelt --- arch/arm/mm/fault.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c index 46cccd6bf705..7063b875b05f 100644 --- a/arch/arm/mm/fault.c +++ b/arch/arm/mm/fault.c @@ -201,8 +201,8 @@ void do_bad_area(unsigned long addr, unsigned int fsr, = struct pt_regs *regs) } =20 #ifdef CONFIG_MMU -#define VM_FAULT_BADMAP ((__force vm_fault_t)0x010000) -#define VM_FAULT_BADACCESS ((__force vm_fault_t)0x020000) +#define VM_FAULT_BADMAP VM_FAULT_ARCH_0 +#define VM_FAULT_BADACCESS VM_FAULT_ARCH_1 =20 static inline bool is_permission_fault(unsigned int fsr) { --=20 2.38.1 From nobody Thu Sep 18 18:52:42 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B8E98C47088 for ; Sat, 3 Dec 2022 03:06:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235220AbiLCDGC (ORCPT ); Fri, 2 Dec 2022 22:06:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56944 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232120AbiLCDFr (ORCPT ); Fri, 2 Dec 2022 22:05:47 -0500 Received: from mail-pl1-x635.google.com (mail-pl1-x635.google.com [IPv6:2607:f8b0:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A4D26F818F for ; Fri, 2 Dec 2022 19:05:46 -0800 (PST) Received: by mail-pl1-x635.google.com with SMTP id b21so6278773plc.9 for ; Fri, 02 Dec 2022 19:05:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20210112.gappssmtp.com; s=20210112; h=to:from:cc:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:from:to:cc:subject:date :message-id:reply-to; bh=nXyyhDtl8c7AV1KDvPOaTLsEEraDYLnRgQTRKevMxLE=; b=J9nA5zFzEgIt8zsxxMPn+sGlIH86WVlgcK5M4y+MnARF9MADgB6h9QisIFpQgAX5Xc gT+JZZbSYIwNPr5lPusi+V73ZxiVkLhM81QZ6t8o4/bUs0p7dwivbSNGIto+U0W3vJje odd1RyOpgxE8uPgVe+OvIiemZQ8s/XdQJhhr+yDr90iN2d2hOZAsbJWqu8yYBosqrxer 9lITxlUrsZAUjRZJKcN0IbJ2m0ZjxM8c9gapj57wHECA6g4hNRl0vKRmp3L5kzuNEkTN fw8pU5isxRHsgpJlmPJcoUscGfiLE65hETmvjd9z7oAjQb+boL6+grwCz+iNw1swFZvZ utXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:from:cc:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nXyyhDtl8c7AV1KDvPOaTLsEEraDYLnRgQTRKevMxLE=; b=aX2yIjfH0BQ5S9aoy9quAdlRisfkERl1WQdVaHt7ITyC/Ry2AEh06PpiTj22x7ENgA j6q/cinqp7xya/Sv4oAmQ+osC19z28mrhh1IB7kLEef08p6pDJlPEyQlUOUUFyPWN9TY 6ct9Rcb3xQj5V1uZQPq2CPJnZ1JYgvJ+k57zj+xdLNMmjyPHIK1yzdp1BW+zJ74WWAVu FJQX4tKYoSZWSygeKFEHStbapty7pgfKBBFvCHi0OseeNstFsnvbnqNtoKj65Jcr4+bQ McUtiUv928w3BiTrFGUVDA3KIE1xkSPHTSSewgJnAgEgcNd4uAmhA1hWv1SfXbbpkHFg u+FQ== X-Gm-Message-State: ANoB5pmsaTuhs19pGqtl89fzqVvhZG4Ay1J4ZmcIzuQX1CzN31MJklTe lMvpin7/jy6l+72u48D5foe+og== X-Google-Smtp-Source: AA0mqf7g0g8qmEYMQvaaJVG+LEYazPjzCbvT60LuJ6AU8Q984Tt5DyiX5U2wTDFpAbMwx/ydl7UUTA== X-Received: by 2002:a17:902:ce8e:b0:174:b537:266d with SMTP id f14-20020a170902ce8e00b00174b537266dmr54845874plg.144.1670036746128; Fri, 02 Dec 2022 19:05:46 -0800 (PST) Received: from localhost ([50.221.140.188]) by smtp.gmail.com with ESMTPSA id b12-20020a1709027e0c00b001886ff822ffsm6147005plm.186.2022.12.02.19.05.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Dec 2022 19:05:45 -0800 (PST) Subject: [PATCH 4/5] s390: fault: Convert to VM_FAULT_ARCH_* codes Date: Fri, 2 Dec 2022 19:03:55 -0800 Message-Id: <20221203030356.3917-5-palmer@rivosinc.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221203030356.3917-1-palmer@rivosinc.com> References: <20221203030356.3917-1-palmer@rivosinc.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Cc: Palmer Dabbelt From: Palmer Dabbelt To: linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-arm-kernel@lists.infradead.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" These conflict with VM_FAULT_HINDEX_MASK, so move to some designated arch-specific values. Signed-off-by: Palmer Dabbelt --- arch/s390/mm/fault.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c index 9649d9382e0a..464a74e52465 100644 --- a/arch/s390/mm/fault.c +++ b/arch/s390/mm/fault.c @@ -46,11 +46,11 @@ #define __SUBCODE_MASK 0x0600 #define __PF_RES_FIELD 0x8000000000000000ULL =20 -#define VM_FAULT_BADCONTEXT ((__force vm_fault_t) 0x010000) -#define VM_FAULT_BADMAP ((__force vm_fault_t) 0x020000) -#define VM_FAULT_BADACCESS ((__force vm_fault_t) 0x040000) -#define VM_FAULT_SIGNAL ((__force vm_fault_t) 0x080000) -#define VM_FAULT_PFAULT ((__force vm_fault_t) 0x100000) +#define VM_FAULT_BADCONTEXT VM_FAULT_ARCH_0 +#define VM_FAULT_BADMAP VM_FAULT_ARCH_1 +#define VM_FAULT_BADACCESS VM_FAULT_ARCH_2 +#define VM_FAULT_SIGNAL VM_FAULT_ARCH_3 +#define VM_FAULT_PFAULT VM_FAULT_ARCH_4 =20 enum fault_type { KERNEL_FAULT, --=20 2.38.1 From nobody Thu Sep 18 18:52:42 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 80933C4708E for ; Sat, 3 Dec 2022 03:06:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231955AbiLCDGF (ORCPT ); Fri, 2 Dec 2022 22:06:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56968 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232163AbiLCDFt (ORCPT ); Fri, 2 Dec 2022 22:05:49 -0500 Received: from mail-pj1-x102d.google.com (mail-pj1-x102d.google.com [IPv6:2607:f8b0:4864:20::102d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A1CECF8192 for ; Fri, 2 Dec 2022 19:05:47 -0800 (PST) Received: by mail-pj1-x102d.google.com with SMTP id 3-20020a17090a098300b00219041dcbe9so6715037pjo.3 for ; Fri, 02 Dec 2022 19:05:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20210112.gappssmtp.com; s=20210112; h=to:from:cc:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:from:to:cc:subject:date :message-id:reply-to; bh=tSVgH09qEnpbMDCTLASqX2OMVKXLGyPI/rjfeHRIKu4=; b=wrC9Di4g/FkQry/CsUbIzu4ShoQtDm632rHMb1y98183Vkm7GE+1KgGiQeiqPRu746 EpOqc9dOuSYQ+KgbsAL0f0eaO3YxXVARb1Qy/aZlLGx5xT8FJkymkARbubJV3UJhsZIH X0s2m87BWl0Nk7Bcfhw39dO5P0B7WZR3xG8jCR7ylvOfUZJOlQHN0djD0b5b36wlrQxo jgkGiA62CEcQWD//xV7j8pXqM1WcnxGbE2honL5gHULuNRyMkT1dxPj0xOx1vMDLAewW AXdhismtJx65svzL/lahWs98kLQcqmbFwviKntKjqxOCAmGqWokX22ZxG9BANL1F6/V3 RqCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:from:cc:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tSVgH09qEnpbMDCTLASqX2OMVKXLGyPI/rjfeHRIKu4=; b=c3tjCeuEzVNyCheg032JLVMJcqzYyzrg8C4zc9ddS05sBEtvkeWgzXYKCMzEhuRZV6 gsw2ZA+CaeB4pVRMcjGg6KMxsx2H1nNNqNJeiOJKFt9At6o5/I5+2dUEcD66kZmPBIPZ 5XN4VFP/5PbEo/4RqbJ5JnyHcFFn+pRPdEzCd5C51HwUsbY9p3urvLqu9kIxH4+O/mKE OcEGPR7opch1FEF6DrxfFEzkvjVcdauEAJ80eX/g1hHcu4oNdr6bMXtESQdKRfTz6Tmw K8Cw0IMQ97doKPohNE2vyqUyJ5VbQ8xCbv3+ikVhNMNTZ6jKvz1QvCwphGmTA31I6Q0g K1ZA== X-Gm-Message-State: ANoB5pkQeIcwbIYd58mtwztygO+8lvCIvJoYQzoBQ7NdL9Li3Uo5spAq 2Nsoj6GOrlaP+ZEo7tgViJAbRA2zpUZQS5jd X-Google-Smtp-Source: AA0mqf4XSUxHT34o8cfUz81MqLg2uR3iZhKmjmdLNRSRwmN3btpX4jv5Kh1mNew10ARt+0Rl1idwLg== X-Received: by 2002:a17:90a:2b88:b0:219:a1e4:20e2 with SMTP id u8-20020a17090a2b8800b00219a1e420e2mr2146067pjd.182.1670036747139; Fri, 02 Dec 2022 19:05:47 -0800 (PST) Received: from localhost ([50.221.140.188]) by smtp.gmail.com with ESMTPSA id z27-20020aa7949b000000b00575fbe1cf31sm4894634pfk.67.2022.12.02.19.05.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Dec 2022 19:05:46 -0800 (PST) Subject: [PATCH 5/5] RISC-V: fault: Convert to VM_FAULT_ARCH_* codes Date: Fri, 2 Dec 2022 19:03:56 -0800 Message-Id: <20221203030356.3917-6-palmer@rivosinc.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221203030356.3917-1-palmer@rivosinc.com> References: <20221203030356.3917-1-palmer@rivosinc.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Cc: Palmer Dabbelt From: Palmer Dabbelt To: linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-arm-kernel@lists.infradead.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" These conflict with VM_FAULT_HINDEX_MASK, so move to some designated arch-specific values. Signed-off-by: Palmer Dabbelt --- arch/riscv/mm/fault.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/riscv/mm/fault.c b/arch/riscv/mm/fault.c index 3fdc2eebdd36..bd990735aa90 100644 --- a/arch/riscv/mm/fault.c +++ b/arch/riscv/mm/fault.c @@ -202,8 +202,8 @@ static inline bool access_error(unsigned long cause, st= ruct vm_area_struct *vma) return false; } =20 -#define VM_FAULT_BADMAP ((__force vm_fault_t)0x010000) -#define VM_FAULT_BADACCESS ((__force vm_fault_t)0x020000) +#define VM_FAULT_BADMAP VM_FAULT_ARCH_0 +#define VM_FAULT_BADACCESS VM_FAULT_ARCH_1 =20 static vm_fault_t __do_page_fault(struct mm_struct *mm, unsigned long addr, unsigned int mm_flags, struct pt_regs *regs) --=20 2.38.1