From patchwork Sun Feb 5 23:17:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 52942 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1962162wrn; Sun, 5 Feb 2023 15:23:53 -0800 (PST) X-Google-Smtp-Source: AK7set8F7TpTsy2qN1AhiEQ7dZlYGrzsDPDhhH2hrLzKQxIi1hsW7ZchmJNg/d9ns+cXbmaFmYMk X-Received: by 2002:a17:906:5a4c:b0:87d:ed60:cb7e with SMTP id my12-20020a1709065a4c00b0087ded60cb7emr14918642ejc.68.1675639433181; Sun, 05 Feb 2023 15:23:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675639433; cv=none; d=google.com; s=arc-20160816; b=E+l38Btsp9UDjYzV0H3oOdnK3qPEtDBcnLXg55+0kJf7cC6rdEzaQOqRAuPm3dlgqG hoRwbHCLLMbHA9iw5tkQP+4JBw83UvgEcoOilDZ5Z7wv0BeW4aWv39cwoeL50RfbtqVn UGwILZX0IXjk8EIWqgDqty1dCBZKtlbJxZz6clMe0wEFKkG1zWFGfxDn9FBWglYBU6qY DyahH8kGLgaeXM1DiOEYbav+1kzLzMnvPSx58Nq23deWjwcRavzE+RgMmt//CQS29Yj0 QIWhAmbblISCW/ESKHFDe3Cs0CNXgCyzlu3iQ6jCxq8XT1Jc4hMIk6hU7YdjcpMaDJJ3 VY0g== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=O+iHbljQE4cWri51QLXa4Xz+3mOqMYYEFGlGW+CbZSY=; b=C67BHu2ISdZsk+BQKhmbcfKRpsN8lv3wttnOOdnni1tB3/eN09/+eum8jSzFsEt7bC 0jHNBy1mK2EhSV3BZPTxrfJ3iEGHvkkuTlYcx/5CNKbjRalfD1Ut4Fnjg5tVZEpV17K5 SIaUV0dQ14w12l85qolCn+EvggPM1CmylxTK/CXNs9lsn4OM28JzPxHhr/MxYImLDLAJ SLFH1smojbBmWmFbzYzBNdclpGAD5jiraUswajPDlaZJr7t4vKk+tAIGPNS557QGCAV6 q/ZhCpY5T9paTxuECZXGWntMtKqWLX+ANlAlaYKw3F8Cmu0CjrAZTGIcxVRnNZ3bCZzg ANoA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="d0u/kci3"; 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=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id wc6-20020a170907124600b008327270a7e0si9744281ejb.65.2023.02.05.15.23.30; Sun, 05 Feb 2023 15:23:53 -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=@redhat.com header.s=mimecast20190719 header.b="d0u/kci3"; 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=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229634AbjBEXSx (ORCPT + 99 others); Sun, 5 Feb 2023 18:18:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58460 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229551AbjBEXSk (ORCPT ); Sun, 5 Feb 2023 18:18:40 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2EB9F19694 for ; Sun, 5 Feb 2023 15:17:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675639035; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=O+iHbljQE4cWri51QLXa4Xz+3mOqMYYEFGlGW+CbZSY=; b=d0u/kci3SmpyKeK+1bUK6fjGm+okJNWkRBZ9wjAgT6+IxX9HtyawhmwzebeMMVRWZbBbAA ro7HQB+/wu6P0WGc1DBtxrmNq4l31jDk2BcuO/V2wmGHo4O0N/rb3NWfooaTaUuGg96lyf XKY/nObhEdjEGMVQu5JE9gYM/lWSHGU= Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-488-yOKTGlCyPCGhDhMcTnprHA-1; Sun, 05 Feb 2023 18:17:13 -0500 X-MC-Unique: yOKTGlCyPCGhDhMcTnprHA-1 Received: by mail-qk1-f200.google.com with SMTP id s7-20020a05620a0bc700b006e08208eb31so6824285qki.3 for ; Sun, 05 Feb 2023 15:17:13 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=O+iHbljQE4cWri51QLXa4Xz+3mOqMYYEFGlGW+CbZSY=; b=0izwM4dUjiIJW5BaB57NngPuugDw4ZAUf0miLTORP3uHM22CgZPVY2p1bmhcpSaKNt Ms/4+VHYhiWL5rECjooinsF987QOPoB3B/AgowQW7gt/2nk+Y+4RWC6D3874VTj15Vfq 1MYjCX3ZlzoQkO07vyH6xRSk3FDE7LVEWprKf7aJTPBXrDRRc17SmHZ9y+ETSqHmD4E1 wKAXeMGrWwhdGIGjUn6ZLhoNSSfnGMn78K11OtG9WFQWV3bvh2o5nr2QBmh202ffDxLU kCrh62bEzoHhmZkBxIeOK+R7nKIzhftiIHafTg4RPb4sgqCyxPQYrAv5ChfyF1gvgXiP /CYQ== X-Gm-Message-State: AO0yUKWeKHI7a3fir+fipQkZ73SwTn+UYBGpNL2ZaHWZjkHYiIpBt2hT xpScmEp7TcVRuNxMGdS+NofAPRD199fHbSsWUfdhntYedL8YntWSVoIkQeP8xXovQz12v/tcAnf 7+TdCSMvnkko0NZJEQnhq0Seu X-Received: by 2002:ac8:5a0c:0:b0:3b5:87db:f979 with SMTP id n12-20020ac85a0c000000b003b587dbf979mr36968152qta.5.1675639032210; Sun, 05 Feb 2023 15:17:12 -0800 (PST) X-Received: by 2002:ac8:5a0c:0:b0:3b5:87db:f979 with SMTP id n12-20020ac85a0c000000b003b587dbf979mr36968130qta.5.1675639031977; Sun, 05 Feb 2023 15:17:11 -0800 (PST) Received: from x1n.redhat.com (bras-base-aurron9127w-grc-56-70-30-145-63.dsl.bell.ca. [70.30.145.63]) by smtp.gmail.com with ESMTPSA id h26-20020ac8515a000000b003b82cb8748dsm5986545qtn.96.2023.02.05.15.17.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 15:17:10 -0800 (PST) From: Peter Xu To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: peterx@redhat.com, Andrew Morton , linux-arm-kernel@lists.infradead.org, linux-s390@vger.kernel.org Subject: [PATCH 3/3] mm/s390: Define private VM_FAULT_* reasons from top bits Date: Sun, 5 Feb 2023 18:17:04 -0500 Message-Id: <20230205231704.909536-4-peterx@redhat.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20230205231704.909536-1-peterx@redhat.com> References: <20230205231704.909536-1-peterx@redhat.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE 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?1757035293956001203?= X-GMAIL-MSGID: =?utf-8?q?1757035293956001203?= The current definition already collapse with the generic definition of vm_fault_reason. Move the private definitions to allocate bits from the top of uint so they won't collapse anymore. Signed-off-by: Peter Xu --- arch/s390/mm/fault.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c index 9649d9382e0a..cebfbd6dcbaf 100644 --- a/arch/s390/mm/fault.c +++ b/arch/s390/mm/fault.c @@ -46,11 +46,15 @@ #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) +/* + * 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) enum fault_type { KERNEL_FAULT,