From patchwork Wed Mar 15 03:03:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Palmer Dabbelt X-Patchwork-Id: 13175245 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 8FC0EC7618A for ; Wed, 15 Mar 2023 03:05:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E16E68E0008; Tue, 14 Mar 2023 23:05:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D79808E0001; Tue, 14 Mar 2023 23:05:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C45408E0008; Tue, 14 Mar 2023 23:05:35 -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 97CDC8E0001 for ; Tue, 14 Mar 2023 23:05:35 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 7671A1C6955 for ; Wed, 15 Mar 2023 03:05:35 +0000 (UTC) X-FDA: 80569642230.04.6DF7B93 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by imf24.hostedemail.com (Postfix) with ESMTP id 9492D180011 for ; Wed, 15 Mar 2023 03:05:33 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=rivosinc-com.20210112.gappssmtp.com header.s=20210112 header.b=K9waOzhT; spf=pass (imf24.hostedemail.com: domain of palmer@rivosinc.com designates 209.85.214.178 as permitted sender) smtp.mailfrom=palmer@rivosinc.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1678849533; 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=aOZC9xlq5oK9zfHrbfD1I5w67GRN7lAgeCV10VaVF3k=; b=Wzw149eCWW9sBtrWe/eS+T8ouu7nlNQyG7OvjM6xRXqOsjJTQ6p1DZ0WUPleOwQLElD6Ud 38w+AmGIWL75NMFkQVPrT5lpjRMV4Gnlp2c6Z2CnDTBIh5WPR9G+BlaH5zhfypyd3tzeq4 IEpmwYHO2XDzGR8n2gOrgIvqS2eZXFE= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=rivosinc-com.20210112.gappssmtp.com header.s=20210112 header.b=K9waOzhT; spf=pass (imf24.hostedemail.com: domain of palmer@rivosinc.com designates 209.85.214.178 as permitted sender) smtp.mailfrom=palmer@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1678849533; a=rsa-sha256; cv=none; b=2LO+e/7ihfWplyXzuJZPzeeq8+wRYmVnrccWZQh/Gs3uo0h4o/MT2JogsexuzUaQLQhcYz kv2rjw05wsyQgWmel8j/ohtWiHHsDbmpPZKs7RXHJEHxumlEEPfPWFbZpEzbkFyNEyupow GdNp9ihDhwFIGDurNpHjyYzPWnpVrrA= Received: by mail-pl1-f178.google.com with SMTP id u5so18631481plq.7 for ; Tue, 14 Mar 2023 20:05:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20210112.gappssmtp.com; s=20210112; t=1678849532; 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=aOZC9xlq5oK9zfHrbfD1I5w67GRN7lAgeCV10VaVF3k=; b=K9waOzhTSocf5S/wDOQBDgV8dv2EBbrWlB6icT3n3eOn3aBwCzE1quBWWS5eLBl43v 2GIX8VAElVK01zF7Q159vC0+esGvSNVEgVo1krYdOpl58TPEA72YrMA4t5AldEkXWuvT d8RLRXgJUdL5i/Q9N7TPgh6s0Dd6c0p3dhRvCjQbX4bcG+gYii0edSeZeYzcTH5W4OFX 5zBs70RjyU2IUiz+9csHcPQxfGOe01e4ihaZj84AhEovkIliRoH0+xNZddmNKkpvvRYq NnRXeKLrhnhS7VS97vZc9U4pYx0wGeJV79JPP30ZFOtR587Idcxeo3jvJJsC3P0+Jxsn Ztcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678849532; 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=aOZC9xlq5oK9zfHrbfD1I5w67GRN7lAgeCV10VaVF3k=; b=W7UMGMk4c9DOYROdm1MS/ZcueIL17dfZSHQA2L/3hycQsUwAxwVNcC49h7iSeJWZGG mkEom6+DZmBWMYZyLlkrwXjahBKHLua3NSAJ4j+6ZgEwnAkf6Qkh+G5uDkkKq0P9vWrh +xVnEWNbkrrLmCBDYrzFHEzuyTGtgF1RchLOItt7S+jyDDFut/nPHipxsXssGRVksCp/ Ml7iMzwyLJfhOVZI+nptceEdcA0MAxtzNXNT3ygdo/yycGBRd2VDrF1cOYrH/5IotcnQ C0NVW5ZUx434bcAmLO0v+oBbrPtDXMxLx2LfO3c1a8jXNIkzsWT2nhDwTgKQaSpTRBEM PeSQ== X-Gm-Message-State: AO0yUKVP6w4bgG+6/MuA6ESPsE8xKNte3I40Pvy3ZjTkP6RDVTXFP9m7 KYXgCzIRMCOgwqZpo9fWaLQcew8+czyBVsOeD2I= X-Google-Smtp-Source: AK7set9kCiiyWzQ3igLEvZCSypTckIX+ebt5Tmlk9BmpkJZJwcIqMSFzq7VaBKi++BxTMFzZG1Gyrw== X-Received: by 2002:a17:903:138b:b0:19f:3e7a:4290 with SMTP id jx11-20020a170903138b00b0019f3e7a4290mr890658plb.17.1678849532243; Tue, 14 Mar 2023 20:05:32 -0700 (PDT) Received: from localhost ([50.221.140.188]) by smtp.gmail.com with ESMTPSA id u7-20020a17090341c700b0019460ac7c6asm2406194ple.283.2023.03.14.20.05.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Mar 2023 20:05:31 -0700 (PDT) Subject: [PATCH v2 6/6] s390: fault: Convert to VM_FAULT_ARCH_* codes Date: Tue, 14 Mar 2023 20:03:59 -0700 Message-Id: <20230315030359.14162-7-palmer@rivosinc.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230315030359.14162-1-palmer@rivosinc.com> References: <20230315030359.14162-1-palmer@rivosinc.com> MIME-Version: 1.0 Cc: linux-mm@kvack.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Palmer Dabbelt From: Palmer Dabbelt To: akpm@linux-foundation.org X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 9492D180011 X-Rspam-User: X-Stat-Signature: jkproukdawomcz46mgma6tizuc66ri1u X-HE-Tag: 1678849533-396858 X-HE-Meta: U2FsdGVkX1+CHV+/k/la0YXTAjd/QN4A5UTgYh0FkuRKR8KuhDXoQPOc89tf38dvnY21ekv0DXk+fH1jPqQib7JJYiTC+rXVkICmPNHlcZRW8XhktBsDCitqyeanOhUIjY58XfjuspSVCxYtkjVj7H5Ms45If5QW9zVIpSojUkEFheB7aDvy0J4wguD/fycJ2cUkt8pDd9wdbVdQy60xELYgpikQ8OQ4L+PxNnGwIiX1TSdkiVQZFttyPJS+DP4hsvwaNiz0PQFm4XfqckNa1b3/+px4NaoNskwsFWd5hiMNHkypnTUq05oiVLlpTbZGbBkC6/9LRlpc0o19Rv/kSNroqoCcQSuEWXQQbIU9kJO/ebR3ExqINtMM1AFn4ytjg29ne8A0kFGObWIQKhM80eDI1FPeS5IGHOTT4bQhKj7A4n5bRoMiZ3DYlkWRWn96nKLfeif6cNxs1AVLPCnBviBLIP4iTqUieYxN786F9/x6/kZ9Dzv+JLbmHmkVNHy1AjuLY3rXCxMsssgG1M6ouLUF2obggZNw4SPsnY6ecOAZdEwXv4s/hPD2Vcj00omhgx6TQcfiPC0ZRy/exsxZIT1pYP/ffbWK0Nb9uXrN3/Ve5vDIg/rycwPz5PR6SSQm1NvGv704yzd+C5TcptkbBcnj2V5ri5zdEJ0Ytvo4xZWhJ2ThWHioq3iJQX2ZmeIkjHykQWBPltJpf+8w6N7/mupkjTb3yDcpm/M8QH+fmgElHgXKT9rN2b5JnecsTlDrAKwjb1G2Pa/plLuOzR8zcNGwQnMT+b+594fQ6N1RtKANfOXenHIEBnsEqLWnbvaYDN8HdWBifxzKSKo5W+NMjtbN80D52kKgTo8wiiphlD23Til4vzoP4iciBOL+dFQeN9JjvwPZeglGJhNzIpIMUmYAKitNXie3CyliTxIyFtvr6cX8p4S8TqnXwRK0Xu0sBjmEy961qUlBKZkXU4E eTLJ9aUj qi4exulfwki5WrogExzeemGGAdr6UTvScKh3PsN4bH13MafV2Xhh+OWqW+3DOI90WE9bQ5IfCXJ8446YET6MdeCyIe/6CowOuhge+/Zw/ox0UaL/dz5uPJVadBtV/bRPhlXiEOOT+CN9Qlb/imUPqGv2Gb/sD+ntiWLtAZsKjSCmKZsGHGT2Y+hk7lrtG9QJJTpJgPS+osAnE5Ud7SfCp9v/KqHbYAr55PNkDlBh5RSL/SEPCCX9ZsnhPlceKwp+/WOWLyYkMci13k6R67Jf1FDcmaitiuPXZ2yQsjLZthr+ViQIdzi4URhbiUs8WyTC3M//qDF86u8rAjEvIv2HNa8t1ZsgDylSYGX3+SsFBtf859ksltu9/aWO/OtJIbLXWNrPRmdyWccYUrqk4QlbdHff9rTHE1/b+PB3NLNvYjZsr3Gz4ohx4skPuzys3dER0jTMBdnVjalzURkS5RKhKJrLEymEkfW19OHw3QyW3XmdD3pOLMlM4duPhhRFwLEgk6x+y 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: 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 a2632fd97d00..f1a186a4c465 100644 --- a/arch/s390/mm/fault.c +++ b/arch/s390/mm/fault.c @@ -50,11 +50,11 @@ * Allocate private vm_fault_reason from top. Please make sure it won't * collide with vm_fault_reason. */ -#define VM_FAULT_BADCONTEXT ((__force vm_fault_t)0x80000000) -#define VM_FAULT_BADMAP ((__force vm_fault_t)0x40000000) -#define VM_FAULT_BADACCESS ((__force vm_fault_t)0x20000000) -#define VM_FAULT_SIGNAL ((__force vm_fault_t)0x10000000) -#define VM_FAULT_PFAULT ((__force vm_fault_t)0x8000000) +#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 enum fault_type { KERNEL_FAULT,