From patchwork Sat Dec 3 03:03:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Palmer Dabbelt X-Patchwork-Id: 29210 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp1184687wrr; Fri, 2 Dec 2022 19:07:40 -0800 (PST) X-Google-Smtp-Source: AA0mqf5OV71UTDnZahgAPPTkP0pN0VRgAg/GxweUtApclUzcUS57D0HBJQzPR+kSfPwVWfU0lZU/ X-Received: by 2002:a62:3347:0:b0:574:d1f9:9b16 with SMTP id z68-20020a623347000000b00574d1f99b16mr37461939pfz.65.1670036860379; Fri, 02 Dec 2022 19:07:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670036860; cv=none; d=google.com; s=arc-20160816; b=TrB0UFSUGNet0tH9TYdUo+ZWUyoYx/4zbDlHBiHPrr9DKDtO7qzxrYIZG4IFVDuHQv XtkFVC1crHmwve3D7PXF+syFJzLnA0E3b0D1mpGyIhy0fpzuBOgGE1s5Nbx/whT/Rsyq 4ipUt8cJUaYUAOihrbO7Oemm0nHgjRRYsgAqRNMipC859dTP/KBlxz2b2Wa08oO6/W37 UpatKAeHxJ/lMyRLagS2obK7/T7iAH+1uyWoU6Gr24C/wlo3dXZe9EoWPW2AFb06tE4m c4yPTp4PjR7ktXpZXw8HRDGD/MpPnyQ8l/xSMJb47zGPJ3Z/ACN0n5uxz1zAwMs9Bv7w lGkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:to:from:cc:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject :dkim-signature; bh=nXyyhDtl8c7AV1KDvPOaTLsEEraDYLnRgQTRKevMxLE=; b=Nm+wmTbnTQT4GX5zh8NL7ZnAPBVPmCp7+ZJfEfVpgUiARhfSA2R0s3igiKzYau/9wZ bEu5adKbdzZ3ovOfMHWwj4ktcwi2plZPLppWoTnocAnrurUucXKDwoPDxb8HlU+vwuxH 21gpGBAn9Ekcpo6MqCjFfpjuEuFcGxhK78FX1Rw0sr7bkz7QonFTfELX49OxYsI/GcK9 l0Qhjukh22spb1tXwv6rwYDdj7XVTHjOKLT/VkU/ZxykMhpaLquGHQbcDZMUZfbVqkep aq3GQKxsvvhy1maT5bWKw7V0IugQt/4vJkG95QZcbAMDBuFsSJ3I+jtV0f+R5CB5Snny xQLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@rivosinc-com.20210112.gappssmtp.com header.s=20210112 header.b=J9nA5zFz; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z5-20020a1709028f8500b001868a25da0dsi8394305plo.40.2022.12.02.19.07.27; Fri, 02 Dec 2022 19:07:40 -0800 (PST) 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=@rivosinc-com.20210112.gappssmtp.com header.s=20210112 header.b=J9nA5zFz; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235192AbiLCDGA (ORCPT + 99 others); Fri, 2 Dec 2022 22:06:00 -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-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 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 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1751160570452530984?= X-GMAIL-MSGID: =?utf-8?q?1751160570452530984?= 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 -#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 enum fault_type { KERNEL_FAULT,