From patchwork Sun Feb 5 23:17:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 13129152 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 831EFC636D4 for ; Sun, 5 Feb 2023 23:17:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 179F66B0074; Sun, 5 Feb 2023 18:17:17 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0DC606B0075; Sun, 5 Feb 2023 18:17:17 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E97876B0078; Sun, 5 Feb 2023 18:17:16 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id D7B266B0074 for ; Sun, 5 Feb 2023 18:17:16 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 9E7F7804AE for ; Sun, 5 Feb 2023 23:17:16 +0000 (UTC) X-FDA: 80434801272.07.218064B Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf26.hostedemail.com (Postfix) with ESMTP id 91964140006 for ; Sun, 5 Feb 2023 23:17:12 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=PlWOmyK0; spf=pass (imf26.hostedemail.com: domain of peterx@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1675639032; a=rsa-sha256; cv=none; b=zWO8+a2p9k+Fpuoag0fze6MBGO1LOvrd0gdtYRyqRFiedJh5+BhD4N5gBJe31fNFXDL99X Hcx+twlf852/dBihEsGsHdI5uMEZwLxCxxRdJ/m8X6xCCaFP96HqCgVTQIOSERzZxv3gUT LDTVRkT32mD01j2UcQDRN6iEQ9CE30s= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=PlWOmyK0; spf=pass (imf26.hostedemail.com: domain of peterx@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1675639032; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=qONcW0u0rSlhga0NbKyxqeLooMqDqXOYmnEPrTgV3J4=; b=3xrztXOv6YQohp0SL10m7/586f7GpWODWPyw+T1U4CAWWFX/NVLzuUDLR0hiagV5Rx0+fj 8KcHRg+o2WUeMcq/2DwqOQHArJfs2Modxn4o2Rr7Y54NcQWKAxoWrnMdtalJPfKPRhTLdN mKOB4I9xJW7Sjp8gPin7JNckHI7ehk4= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675639032; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qONcW0u0rSlhga0NbKyxqeLooMqDqXOYmnEPrTgV3J4=; b=PlWOmyK0IHVDGeFyts3EgHqNZJk12ceVSmqxIXPsoCuLQ7Xtauo6Tsrgi6rAPJtbiY7qWO T3y56QXXPHBnPTdMMJu97N/wBHskpslxdGSzvcTZrr1PBzTT42IYBt++GNTsRMrcX9fTqA dp0Ka0NR//8+gaNcLNCTLDvAujNjjdI= Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-271-EJkMh3fhP2223NBGZpXjAw-1; Sun, 05 Feb 2023 18:17:09 -0500 X-MC-Unique: EJkMh3fhP2223NBGZpXjAw-1 Received: by mail-qv1-f71.google.com with SMTP id gw11-20020a0562140f0b00b0053b81ec39dfso5114282qvb.14 for ; Sun, 05 Feb 2023 15:17:09 -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=qONcW0u0rSlhga0NbKyxqeLooMqDqXOYmnEPrTgV3J4=; b=ncEHkAqMgK88Ran00yp3YY966ne8sWsXiUkWib679j3QT+JZ7Zj2+TaDcVH+wLwWa1 jTZY19pRIvAn8uHNsUi5entyRkHypeCxCRi6B06CaSFslfD92Cv/AnEYcEsC9S6Ub3L2 X+0CwZAHDTBKJfX807z/KVln32ePv570NXLETPk12Fsg9ErpFmmK6nkHvLq5W+LcjLUJ tTv8zGS7sIHiipY6JvkQVWUobUPiymvpPyEc5SEqiet78/KbFp2xqiVUlIEBcuPsdmUp 10ObdN6aediOp8Vcvv4hEkYUVvLKn8WRh93LtTb3D7WntGnmclbfpyD9tZodbvbT/UVz 6QTA== X-Gm-Message-State: AO0yUKUG/7mNKs6JU/tJOOqWj+T0waaBw03mrJyCvuco+ONXcjQmSqSd /CV8oCKRMR+PySEeaqPpx2W2GDA4ywNgoCqU35VK69cn6dUg7S6uys+f9UncbwayK4i19alVpmI FAyYKD5PCQmZKgDVFKu0cUswBw5Hw5ePRE2BckzQYfOOIk+vlW7jfb3zqVofU X-Received: by 2002:ac8:5a0c:0:b0:3b5:87db:f979 with SMTP id n12-20020ac85a0c000000b003b587dbf979mr36967900qta.5.1675639028704; Sun, 05 Feb 2023 15:17:08 -0800 (PST) X-Google-Smtp-Source: AK7set9kqgEL6o3t7eGoOILoA6rSeOClso5mcvRwdEtgXNoCUXmYbAoESbFf+GAMsxjDlz50rZUFyQ== X-Received: by 2002:ac8:5a0c:0:b0:3b5:87db:f979 with SMTP id n12-20020ac85a0c000000b003b587dbf979mr36967876qta.5.1675639028460; Sun, 05 Feb 2023 15:17:08 -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.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 15:17:07 -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 1/3] mm/arm: Define private VM_FAULT_* reasons from top bits Date: Sun, 5 Feb 2023 18:17:02 -0500 Message-Id: <20230205231704.909536-2-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-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Rspam-User: X-Rspamd-Queue-Id: 91964140006 X-Rspamd-Server: rspam01 X-Stat-Signature: js9d34ipdstpwwpzkja5uxctddear6kk X-HE-Tag: 1675639032-799772 X-HE-Meta: U2FsdGVkX1/y5uA6PljS/eBNK6YIcrS5TwyWbIcKUh+bR2IzkoZBaU86vl0bGzNKip4WEqcMFIAOhS8O1SmSl4JWBqfokOYkk4o1o2TDlPKvSlztO0Oqz9AtnjtbS7fwyhMUOjkrO1Pkbm02Iz/Kq2t5bE226HtVLTDpgyPGVASYBe21r+U8D0neDxeBmacAHUdWqByg5JYF8uD9OVjLcT4rgLLRpJ718ArH1763ceRZ5sgK+JAYMqUyvL3cBcVqEFWPPczp79YiErAaLUd1GXccpD0HPsek9Bccu861tdaH/fGT2fbAKxRYq6zdeSGDsN3K/0528E8leVs0kArWvWuYxv9BWvOxqj1PPz/GPD7ackxziSDr6SNtwFOZztoUW7CnLQNMNRyIRdMu+W2FD/HV4RVZ6EYo4tCAqpJ4SbWWYq3A/l091V1BBmoLhMtOeAzBiIZtxiJu9KdUP1oG8cs1wPcFGLe8r5sQfdbcKsUbSAt2t/gTeQBtAu9WQdCPzBrvdNyNUSBAgLeuFnrN2XncYfNNHWfuIV7GUHjDiyjzfotYaci+RjjPkfOCHkaMRX11lPdyq+rX2yrpznx64xUSspwTafbCs6I/qt35tXk+h1AYmSxk9zMihoFMpAf96JjtkNXnSC1m/dxWxWkFAgLUvaCMcthevUGIi354xcBb6PsGXyPsDOkL/6hA/yxoJNOYZnrY6Y6h/nBHofDy/jvSlsoQBM18gioLRSeEZpRxhYhW9H7StXXtzTIpHiAeXAgR4Gw3W8WgiSzBpgFlR+dd8Z8FQM8DM+G2v2tdFVe0Rgsk4vLReBFi0S9ViEK4I/bzdkZtw/iyxZ+BNXa8RvEGUrRlP6enSJmdjNynSNsHo4WjfDxA0nR8nJvE9+6oTcNDqp43M/LcFVEfZ/6eycIB0NYPMM4xGMgWmuIy2HGpoQ/gKwEjITRCYD60QKx9jlbhJdnzF22Sj+g3FPe SDWjAU88 UkbyMlAlc/mKh+uZZyokhThzqQ90OMd1b4hiwFfvWsLbuFuo2uGpw77M25rGhjDUCh6bxa6PZpRd/bXuQ24oM26QpLUg0hg9XX4//1RlfibPvmRebsqI4xOI6MZNF9j35GvTxTGTWaZMjaNXtY8mcMGQh4c5mTPRjLAsEB4da6hxaflhGVt14EBksdkxnU2a0DaWahMvf8fWukuJxDZrlNfqa1AsvYqFBWNI2TRWc6CboLM/ASotmzmV0xmXCjtlgfZiOwm/8k5jgE3qI9zJxpbULjrcw3PhNyGYnm8stF3Kdp2+JZXHy9Fy844P0POfdp/wc2gEzVvjrY5VlUyr3tvUo/jwva6IhippqKZzDWa78Br36+gMV7m35iOV3/RgsvleAKd17TnHPTcwiSEX1ufNIjPG78t0QUU+neYH0r82vafvzD/jBZpnw960uVIHiM4ub 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: 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/arm/mm/fault.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c index 2418f1efabd8..67879d995835 100644 --- a/arch/arm/mm/fault.c +++ b/arch/arm/mm/fault.c @@ -216,8 +216,12 @@ void do_bad_area(unsigned long addr, unsigned int fsr, struct pt_regs *regs) } #ifdef CONFIG_MMU -#define VM_FAULT_BADMAP ((__force vm_fault_t)0x010000) -#define VM_FAULT_BADACCESS ((__force vm_fault_t)0x020000) +/* + * Allocate private vm_fault_reason from top. Please make sure it won't + * collide with vm_fault_reason. + */ +#define VM_FAULT_BADMAP ((__force vm_fault_t)0x80000000) +#define VM_FAULT_BADACCESS ((__force vm_fault_t)0x40000000) static inline bool is_permission_fault(unsigned int fsr) { From patchwork Sun Feb 5 23:17:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 13129151 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 61FD0C636CC for ; Sun, 5 Feb 2023 23:17:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E71036B0073; Sun, 5 Feb 2023 18:17:15 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DF9696B0074; Sun, 5 Feb 2023 18:17:15 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CA4266B0075; Sun, 5 Feb 2023 18:17:15 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id BC9586B0073 for ; Sun, 5 Feb 2023 18:17:15 -0500 (EST) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 94340160815 for ; Sun, 5 Feb 2023 23:17:15 +0000 (UTC) X-FDA: 80434801230.08.409FD24 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf01.hostedemail.com (Postfix) with ESMTP id 860C740008 for ; Sun, 5 Feb 2023 23:17:13 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=WWeIPSRE; spf=pass (imf01.hostedemail.com: domain of peterx@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1675639033; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=P5/Ww/5/bhqPqutkGRybIHLtU9jqdfakTNy4g0j2iQk=; b=8RrEd1YrNGdYnV0slYZtPIkqJCvjjuPM3Rotk0t/TB1Hrfc0olK6sW5qaTXf/WGeLNZhPL rYlCjVWiyoX3LIvrj7eHmtOVr/PMbSfWiwZqp9Ndz3/GoP5re+hvizW9DbUs3YjDlBbEeN 3bHJO3ZBDkyu9oNJsdT/a7s9x6aupzs= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=WWeIPSRE; spf=pass (imf01.hostedemail.com: domain of peterx@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1675639033; a=rsa-sha256; cv=none; b=cqRm4WtV2LyVhMIs34+9GUmfubFPSf5cipWy5XYMrl/h3ORoTPO66etwtn/0Kdm7WrQgit Ij05D3FFABYHA1MJunLbvqjU9Yi7PfM8cXKdWiHJmuH0nxuYIgPwYPzYMCrV/Fj6vMieNA iEmCV6ekBMsc1IKvyFCs8wjt15PuUeo= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675639032; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=P5/Ww/5/bhqPqutkGRybIHLtU9jqdfakTNy4g0j2iQk=; b=WWeIPSREVQm/CT1nP1WJ6QCFhcW4UYbfB+d/BVU+Uozmyt03ZngwdXKyCt11wLjagHWrvU adfPg+yojRgBl9RdZUIcosSG7YWApO9l/J73LuRZql2XqbbML1z0FGZg/8qgmdXXKcsJwK NExNpIPn1/0es0BSsrbQgIZ7XpYk/o0= Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-322-mixK13z_Nb-WTCp8_bYAmw-1; Sun, 05 Feb 2023 18:17:11 -0500 X-MC-Unique: mixK13z_Nb-WTCp8_bYAmw-1 Received: by mail-qv1-f71.google.com with SMTP id w2-20020a0cc702000000b0055c8ef137ddso5089687qvi.0 for ; Sun, 05 Feb 2023 15:17:11 -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=P5/Ww/5/bhqPqutkGRybIHLtU9jqdfakTNy4g0j2iQk=; b=rcH4xMYtjQQ3xlkcsBknoDfcPLPdiaIGiBbZ+S4Z9sHWQzFZkiZVbCNA26WARIli2b +zW8Vl+1tttXN564UR1Z2lq/Rqn7xWJugTU4yUFp8yvJ08GWfVx9tArM8RpO9r8TT/kq wgJHeNDhkFblMY8IPeevS97/lZ6JQcYUIGgeoNkGh0sPizwIjzfiSD5KrPsMJ85aMykD a0HiU+bOA0tpBn5bv5cRXo+UgHbl1H3nfdv3Ar0MecDLg72hPgTVgCoCzcSLjdcLivS7 nZ+Az3k77tUpnEycI9plOESASxNuE3KTOntKx5wRTovosolH6XtJu49+uROIeqQlyueO IPEA== X-Gm-Message-State: AO0yUKUV0K6GdAR85l5XVroTKq+PwgcYBvWDnP7QUvSZ/xWUhuXyQOKN 3b0Mue4xvfop2oEcvcMdSZaTPmFjCXN3GwCPVH2VR4RTVULz7CXoW6/N18UCAp9AvQzoZsOZDkL HkDtjnf3R+gGlmsm5hP4sT2jo0Xy9Xfpfljc4hbZf8w/UYWLqKaZHagmqc4Y9 X-Received: by 2002:ac8:5813:0:b0:3b9:a4d4:7f37 with SMTP id g19-20020ac85813000000b003b9a4d47f37mr37363498qtg.3.1675639030635; Sun, 05 Feb 2023 15:17:10 -0800 (PST) X-Google-Smtp-Source: AK7set8mrnK+ikirixTmDtvR78/fRtminiJLSrpX/G80o7vhvBjyiJhn1+xWU/af4TGpWMpz/q/ScQ== X-Received: by 2002:ac8:5813:0:b0:3b9:a4d4:7f37 with SMTP id g19-20020ac85813000000b003b9a4d47f37mr37363454qtg.3.1675639030152; Sun, 05 Feb 2023 15:17:10 -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.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 15:17:09 -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 2/3] mm/arm64: Define private VM_FAULT_* reasons from top bits Date: Sun, 5 Feb 2023 18:17:03 -0500 Message-Id: <20230205231704.909536-3-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-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Stat-Signature: aozzepxttorxap63jne9n8kp6sok8azp X-Rspam-User: X-Rspamd-Queue-Id: 860C740008 X-Rspamd-Server: rspam06 X-HE-Tag: 1675639033-349363 X-HE-Meta: U2FsdGVkX19b4v6NagTW+3EDKvkJWyEf3uXyvqaSWy3T1HMusLO4HRcFiu3/8HoePE2kVf5b7SK/9EO9DL1O1F50+tCHUgIk21WR42edz36Vd53Fyjqnv5LxQq2dR9nNrmKHMW0QWgY+anu0dM/DkjEXXAoUpudG+MqoUIntLAMoxFQbf1i3/plBp0sjdaC0O+VHJBEwDw484MePPz1oIWbLPjL33xZP0UDgVa64TnfEhxYuxoS7+NVnB0SmjoH/byIurq/Lzl6hHLBXCu7dirPAZ2G13bDRuwQ7GaGnKTKyztOFXhanMjtISagXdwASIOzf9xjQxHqjQJy1kJPjuwv00VkVXc6yst6pA92b5+pQAQiXatR2LXVl0vXF2pgfA4+PPAR+vir7N3jJQ3cbhEUZFeN/QJTbZ6CfjC+x0kTth/nAslg4FNxWvF6mjnzgAp1A5RuZVbIb1bq0qUPSerVJ5CBeFvmOGOVAdfW7iGzA5sFPRRRmFbx57hlyepa0aCKEi870rBAcOGTUzAa4wTr0i/zS5MdpziZ6HkzyonN99+yxjekWY5pjGxwS2Gy+gir44sAhvsx3k1pZlZls/1YeNvmAWFUrgCP6mML/f5c9BUR0Nloa4liZCT8HRXlcsvYxiWr6nIsBfTGJI8fmsfgaKopyMNnoHFn8W1n+WsMfBDmhDvFf8M7YOy/x1ScUWxOXOd63TcMXNU5mry1wUz6AvxfKhMNK0/plhneCI1e7zPeo20vbUxgjEdw99g0T3HV/z4lk5G3Ps6y+F2w/Ruqqny/LLPPjqbS9/xNxlmjNl/1ByannVgJlnlwpTRGnLXB9lw7GJQsQ7i65F3bz9yMjyl6DU7Ts1pS6NB4ukXiYM1/g9kcTUcUvvR3A+T+Ocp6fKvUQ0fI7jxTWpKOf6sRcsmuBc59yB05conIA4xyz13HxhuWNoTnCmoQRgr5SNYg27hnE2J0kIxEAana QgsNjnI9 nvpjqdypwE42+6tnGyYf6ql4oydTWTX1E5nkjwFKTXHz3FP4MglbzEeI1ELk7qfrfPQ4Cma5+aXyTs6zUAL46b/KswTTtVCe2cUl4xzlZdZoAgQNNYPF6OWgVXoZW680B/wwr6HowSJwZGqfz270ooartgwGVXRgPHnhnC7OUGa4stx8+c+fRRTV57Kc0UMQyXTAGQLw1JDcedG+FJi4wTmlaea2O6DqBokx1CAcBXgl3TSEqKswWIZ4Woyn6bG4efl5ChcRubMO3xRD59o7ffjLqmWM2hqcp9d/70CGghM3ioSsn+4k6lSN80FZCGPHQhE91tyYW1VYNesybzx32zcMy6RYNXy3xUpPh/woxYwqYea/Qo4WT58mOziKLjhrJdCMbpqn0tMOnIMny3dEOXyh7FG3jeZ0lDjsVXgAh0dUdRGzdJViXuiR64/kDgjp3LDe7 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: 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/arm64/mm/fault.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index 596f46dabe4e..44fd16f58f94 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -480,8 +480,12 @@ static void do_bad_area(unsigned long far, unsigned long esr, } } -#define VM_FAULT_BADMAP 0x010000 -#define VM_FAULT_BADACCESS 0x020000 +/* + * Allocate private vm_fault_reason from top. Please make sure it won't + * collide with vm_fault_reason. + */ +#define VM_FAULT_BADMAP ((__force vm_fault_t)0x80000000) +#define VM_FAULT_BADACCESS ((__force vm_fault_t)0x40000000) static vm_fault_t __do_page_fault(struct mm_struct *mm, unsigned long addr, unsigned int mm_flags, unsigned long vm_flags, 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: 13129153 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 4DECBC636CD for ; Sun, 5 Feb 2023 23:17:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CEC556B0075; Sun, 5 Feb 2023 18:17:18 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BD75C6B0078; Sun, 5 Feb 2023 18:17:18 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A02CD6B007B; Sun, 5 Feb 2023 18:17:18 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 90DD96B0075 for ; Sun, 5 Feb 2023 18:17:18 -0500 (EST) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 5A3031A06B7 for ; Sun, 5 Feb 2023 23:17:18 +0000 (UTC) X-FDA: 80434801356.26.D5C321E Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf04.hostedemail.com (Postfix) with ESMTP id 53D9F4000C for ; Sun, 5 Feb 2023 23:17:15 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=BnZ5x526; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf04.hostedemail.com: domain of peterx@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=peterx@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1675639035; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=O+iHbljQE4cWri51QLXa4Xz+3mOqMYYEFGlGW+CbZSY=; b=gnhvfYlRf1y8twZb6SfipXi6NKrRWo27D/GNActdYdseOyG6P/a9UJaAf8meDN4gEvbjAI xDjLdbQn1JDEOcayI0kUetRZCR7vK9rmG18jZygukBQw1yHSiL2/cytCAT36hECT5/9oG0 ibr56h9ufMxVSbVkFdDXtHEWYMjN2ec= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=BnZ5x526; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf04.hostedemail.com: domain of peterx@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=peterx@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1675639035; a=rsa-sha256; cv=none; b=RcMNWXRYMsig57j7kzBu4RW5TbPIdYNodfWO9bKuW45qa5LLHJI/Aa9jSCGjslWUtaLH5m mQxJ8n9bhtGAO8RJP/5EwFJSbpTN4/Q6/d5JrKPTGrpmm7rEUAGtiZyuvT3HiwkhufXuMl 3vS4NaIj8+Jm0S8hIsOmYjnxfQkD2t8= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675639034; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=O+iHbljQE4cWri51QLXa4Xz+3mOqMYYEFGlGW+CbZSY=; b=BnZ5x526thPMdD+/OkBDbyNUxwpiiXO+sLKB3yBXbDKjZQMkWOIRDisrfmklfbsldtOSy7 qqVFTyVNtNOlqc95C4cgeKpUo00QAkUK5GtRAVM4d0TmZPJEqDd1xD5WjH7nMWsugFDh18 s0l8Oi5yDXnWz6kB52bwvC3hjdAyGJA= Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-586-XYExpcAMNjuiVE_-l_1aUQ-1; Sun, 05 Feb 2023 18:17:13 -0500 X-MC-Unique: XYExpcAMNjuiVE_-l_1aUQ-1 Received: by mail-qv1-f69.google.com with SMTP id f3-20020a05621400c300b0056bf4f80209so538778qvs.15 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=SeMD0xWqrsWHVu7fWTBwMYT5KLinPdFAR5qwcehvmVGPTzIP/OYetQnFGrDxX26hX8 bV1sL70wHI2PhgTvGWisbuCwpx8mHEZcdtwkHAYUguFSeGJrSDZ/mZmPTSF77NjGc+Rk qVoNi2dxkxPcS2qtz+NJoKKNez/BjDS35m1G2O1f493clKB3VrCbZciwQarUpkBdrZy1 760Nf3X7ic5tahW6TRvpwmAsH0amnqjQuKS3BW6KrF2PAcO4m+3h1IS4F/u1V9qQuo5+ O/hjVOrvcIiBn7Uhq+aJdy5iUya1BpbtxfeG5rgZ45N+l1erAGexG0cG2Mi8MI0hxLe6 usSA== X-Gm-Message-State: AO0yUKWi0h1ASYzbaIYoowW9sI9t3I/0RUk5jSnC7xJh46zeZ12u59ox l6QS6E1HcWEXm/07zHfl9foITX7eaPdyxogQ6J+bx8zQxPXxQXqGBpuPvkAbenwWpnkAT270MVj ZOlLYYHwEE3O0u65s8hLIiNktQEBH87N3GYfYhB+VxV1dHbAAxKWN0teIA6as X-Received: by 2002:ac8:5a0c:0:b0:3b5:87db:f979 with SMTP id n12-20020ac85a0c000000b003b587dbf979mr36968158qta.5.1675639032259; Sun, 05 Feb 2023 15:17:12 -0800 (PST) X-Google-Smtp-Source: AK7set8/HJ9ylfEnCGuGjHiBabf9O5KRa6hhSOUhT6sDqtmC260VVR8y98Nl2i/0VhE4BCc93ILrBA== 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-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 53D9F4000C X-Stat-Signature: nktygk79ppbirixfqyocy1waids3qgk3 X-HE-Tag: 1675639035-568716 X-HE-Meta: U2FsdGVkX1863x00+SYb+2k7jbizjZELjhLsCkIArDND9dubE751hWfw1SWEvP+5H7Dc3DdlDuvPQgPiLKhQ6CH65/t2ByfSsKjDZTftvJk392c09mb64MkbvfkXdWvR071Vf239Nr3gKLI0g3K+FPN/drlCbIqQ4TW6gCYCY6VIzAvG/NWApIk8WN1poo7H7uHKrEjMoKFihZrgGIbG8M5NAEm6/Ak7uPQv4FwzJJcEmDfbfActbV6A774FabpNqDVsNC0RA/IEYPiZp1wP4oRDizkhGqvVE0i5lYIFX6vikbWetidX9cShqC6qgSJIc2Oxdu+LKN+yDlJtrgyBaIT/L3GM0aaBP9Zm190pceO8YJ+By178rjY6+VbAjf5zNY732QNFw3pIS/MvX/QIzROHTuuEMsHtNKOTRywUQ5oe1468dRqsodIAt1mO6QBkk+0sRglYnircq+uR9M+fJZk//78bFSb660ziefIFaSqpWO63Oxm9xDib9m0gb1/FQpfLJk8rRqZb0uapW8VUZLoofd+Plc4+gPN3MdpURGT/4UjUlwg0xwMyWkoJqqLrykxXHvtcHERiy9lN0Y6suVsrzhCJyMH7Q4KsZCf05MVFIYesMW4HtcjnkR4YOhvsWyyBFrE1S0c2UCCiMZX8Hbjr+rLh3/tTfr/uglp14orxr98qeHQhQkX29sZHhV2YCEhZP3BQ0bSF/u6foXyOnSvBuSyRprXp+94QcmJppzu7izwjTT1pY04+iZU/VQj6MQisEZuR3SmCT+9revGKNgt+RMPDEjorPqvs9nvViirjCZvZ1/HJ/gd++38jLK/NRxBrdDca3oIGO0Sw9U4jF30VUCIlUF4KrSeFv8zWjYCf+qsip0LLDacvtyzy/+gvlbh+0NJHFXFpyBkzhb7X+ywZyysSINnMt+fCO4hqNnmBY1r7HPZ7E+9JsbB0AmmkBF4OojZF16yUf18vQ8y ZqQMyhng Yt91g8CWhck8DM95wq04DSeSMXNnCTesGv/AxKkjBnuu3vtvzh1bTRTylOeRvHn4DaQwD20+4jklO0miSxkjx8VfzRJblJQyyQaeBhmVwNFxjaH8ry88PuYTZfmTMtaLvADBCtrp4J7pSKkTNNfozRpcJSELmWAoRoUMoCUfZnjefkXWhBpwuGhiq8Xf1tEcWMnLzsS3X18OFMs2aeNuhS4Brf0+CNnvcRZHEWrccnsGEF4SeLE2NwrK9FQDdyK7QPBnahuHDvBonV91F2PN8JiGARjCzdfuvklst8PIcyKSmLlFWGrwMwjEHcvouR2eUlcjJMBDf9PMb0Y/od9lzxIJs5gZLf1R44SB6YbmbZTbqvurfS9syhNW2P/CtIMq4L21NEsem+nuLP4hyzdpTZCOtdTV+IfwbQuhZc+5CjBcov+7V94zjUXcFzK/RSSLQqKuC 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: 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,