From patchwork Tue Jul 7 22:50:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 11650443 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B260913B6 for ; Tue, 7 Jul 2020 22:52:39 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8B17520738 for ; Tue, 7 Jul 2020 22:52:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="0AP4k9Rr"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="aJiMWj2e" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8B17520738 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Sz+HgBbMAUsa6wheWWDEGnkf3kObXORQcK+W4b2hpj4=; b=0AP4k9Rr4fPWPEB50rajcsJLZ qJfH/u57b3fuOqLTpH3zUniO9huIoeAvtA2a0GVcMehE9rQW0OSRNkekyrU9MoUrMCC7HBJFFGv0c VjqbsK+TqNh8H7aGoEl/ss6HihJcCmG1wDUsyRWMpD5vAGQ8hyXpdADJG7+nX9uiIu/MY9bAnlOWh jBHMtGeCH5HnV+KFbSoi6+/dEreW6fSzNdi6t2uS3R4TKXpQWt55MD8YEHXMLYCz48OqUY2q1Dsqj K6DLdLwF6L86xoAIPwP61ZmU9IS47+ejSskE98w9akPRPbDOKDjuGtYxRFGpogO109B7L0GP53SXW xmI+jPy+Q==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jswQB-00066K-7q; Tue, 07 Jul 2020 22:50:39 +0000 Received: from us-smtp-2.mimecast.com ([207.211.31.81] helo=us-smtp-delivery-1.mimecast.com) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jswQ5-00063l-Pf for linux-arm-kernel@lists.infradead.org; Tue, 07 Jul 2020 22:50:35 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594162233; 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=D8OdeaID5or5gsgcWoj3vmPJjBIrXv0E7kOuYlamE1o=; b=aJiMWj2e/ZxutAUup/zmBMHYMBAsvoefx+555pOH0O5Qos6G6JlRxXzRz9jfFjk/waqmdr ZCOW1w2OV42tUuvxGtcg59XwQwAQFVrDK+S3hX3OMPsCN5yOYj3J7pyglj77E5UOx4m1Db gmVh5LkZ2KqXyO+qHDln+yhnfbtvJ5s= Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-307-Pjd_PywIOleM-s8FiWsuHQ-1; Tue, 07 Jul 2020 18:50:31 -0400 X-MC-Unique: Pjd_PywIOleM-s8FiWsuHQ-1 Received: by mail-qt1-f197.google.com with SMTP id h30so31774210qtb.7 for ; Tue, 07 Jul 2020 15:50:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=D8OdeaID5or5gsgcWoj3vmPJjBIrXv0E7kOuYlamE1o=; b=m8aStrg3I0E11qcU/t5YbhOC9dVIFPbM4C4t8fy+ZY7obp5+/LT5T2cOpWQh/LNktR Dt8lzdL3dk2EfRfImEBpzSck/O8/BopRN0eCZal7kxkERPtD4L24Gvh/YWyHa1tAbFTl DU6/Oo2HwMFgymlCmGgJnexF7HpSxTSyQbe93icN1peVGZhGIY2dxQcNihAEN4jrhN8o zGOb/lr2sgggwpZbJ1EjyCepcolitlsFs7r+cHtwH7bLac46LHE9R/4MBbbKojL57Ucz 2U3J0inf1T/bn6uwUJ3mMfVRarnZAA/Ax7TOaCOGooiNErIjcL37e/DX9Z7ik34B1/po 4INg== X-Gm-Message-State: AOAM530mn9tIJ859xcpQWimSYVR94FzzvZpFog/UtqZmKCHBk4xXOnId 7h+xwjpvPETBNNPwi0dNL60TUBT7Vfhyyr6tDuDdVQRHKu2JkmH7FsnjMhTL6zhJSAY5f6p9Onk 4YmK4bTrluWtOctHBaedZGosGTPnb1+1X0xo= X-Received: by 2002:ac8:4419:: with SMTP id j25mr59295049qtn.0.1594162231220; Tue, 07 Jul 2020 15:50:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwz8DXKkHPxoOFEcQD6pHkWkgMOJfaMYF0tKBmTSmaZQNpqDRHsJem4bnZngb+YYMsixKQJtw== X-Received: by 2002:ac8:4419:: with SMTP id j25mr59295024qtn.0.1594162230982; Tue, 07 Jul 2020 15:50:30 -0700 (PDT) Received: from xz-x1.redhat.com ([2607:9880:19c0:32::2]) by smtp.gmail.com with ESMTPSA id j16sm26267642qtp.92.2020.07.07.15.50.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jul 2020 15:50:30 -0700 (PDT) From: Peter Xu To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH v5 04/25] mm/arm: Use general page fault accounting Date: Tue, 7 Jul 2020 18:50:00 -0400 Message-Id: <20200707225021.200906-5-peterx@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200707225021.200906-1-peterx@redhat.com> References: <20200707225021.200906-1-peterx@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=peterx@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200707_185033_905876_0A296B2B X-CRM114-Status: GOOD ( 14.68 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [207.211.31.81 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [207.211.31.81 listed in wl.mailspike.net] -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders -0.0 DKIMWL_WL_HIGH DKIMwl.org - Whitelisted High sender X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrea Arcangeli , John Hubbard , Linus Torvalds , Russell King , peterx@redhat.com, Michael Ellerman , David Rientjes , Andrew Morton , Will Deacon , Gerald Schaefer , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Use the general page fault accounting by passing regs into handle_mm_fault(). It naturally solve the issue of multiple page fault accounting when page fault retry happened. To do this, we need to pass the pt_regs pointer into __do_page_fault(). Fix PERF_COUNT_SW_PAGE_FAULTS perf event manually for page fault retries, by moving it before taking mmap_sem. CC: Russell King CC: Will Deacon CC: linux-arm-kernel@lists.infradead.org Signed-off-by: Peter Xu --- arch/arm/mm/fault.c | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c index 01a8e0f8fef7..efa402025031 100644 --- a/arch/arm/mm/fault.c +++ b/arch/arm/mm/fault.c @@ -202,7 +202,8 @@ static inline bool access_error(unsigned int fsr, struct vm_area_struct *vma) static vm_fault_t __kprobes __do_page_fault(struct mm_struct *mm, unsigned long addr, unsigned int fsr, - unsigned int flags, struct task_struct *tsk) + unsigned int flags, struct task_struct *tsk, + struct pt_regs *regs) { struct vm_area_struct *vma; vm_fault_t fault; @@ -224,7 +225,7 @@ __do_page_fault(struct mm_struct *mm, unsigned long addr, unsigned int fsr, goto out; } - return handle_mm_fault(vma, addr & PAGE_MASK, flags, NULL); + return handle_mm_fault(vma, addr & PAGE_MASK, flags, regs); check_stack: /* Don't allow expansion below FIRST_USER_ADDRESS */ @@ -266,6 +267,8 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs) if ((fsr & FSR_WRITE) && !(fsr & FSR_CM)) flags |= FAULT_FLAG_WRITE; + perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, addr); + /* * As per x86, we may deadlock here. However, since the kernel only * validly references user space from well defined areas of the code, @@ -290,7 +293,7 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs) #endif } - fault = __do_page_fault(mm, addr, fsr, flags, tsk); + fault = __do_page_fault(mm, addr, fsr, flags, tsk, regs); /* If we need to retry but a fatal signal is pending, handle the * signal first. We do not need to release the mmap_lock because @@ -302,23 +305,7 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs) return 0; } - /* - * Major/minor page fault accounting is only done on the - * initial attempt. If we go through a retry, it is extremely - * likely that the page will be found in page cache at that point. - */ - - perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, addr); if (!(fault & VM_FAULT_ERROR) && flags & FAULT_FLAG_ALLOW_RETRY) { - if (fault & VM_FAULT_MAJOR) { - tsk->maj_flt++; - perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MAJ, 1, - regs, addr); - } else { - tsk->min_flt++; - perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MIN, 1, - regs, addr); - } if (fault & VM_FAULT_RETRY) { flags |= FAULT_FLAG_TRIED; goto retry; From patchwork Tue Jul 7 22:50:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 11650439 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5374B739 for ; Tue, 7 Jul 2020 22:52:38 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2BF0D20771 for ; Tue, 7 Jul 2020 22:52:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="VqwdAIFu"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Afiyf8n2" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2BF0D20771 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=MGIDr/rsc6Ov5+LlYdP806RPLFXelJ9v2L/TnFxaVPE=; b=VqwdAIFuaSYOQ8KUm+R1kmJFp 9IRe+UNtF7u5LVxFubZ+1HAnHylzSDOKOZmPUdRcj2Sorx7/N1IeZwd4EhdpqS3hltXnV9DNfVvFK erZXF4AWuHOMeq4msgJWjrSPhLxohd334pCAG+VPvbBvVdXY8JJi0zBaixBalIiQwp5Zy0dbdtQFK pn2xBth+eyw+njBAaup5BctKyuEwO7FqME5K0SnUOQXbqI7DsXVL90uzhQ4FhfXBxHoLq8KeOO8Zj wYADXuu3YNOPnopGYNsdzNOfcTZEnD7dS78jN8VvtBBgvWFkX0jMLL7Jq4TwC533hnaT65Mwt1wgY PVEC1oQNg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jswQD-00067D-Qq; Tue, 07 Jul 2020 22:50:41 +0000 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120] helo=us-smtp-1.mimecast.com) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jswQ9-00065b-FD for linux-arm-kernel@lists.infradead.org; Tue, 07 Jul 2020 22:50:38 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594162236; 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=EjHuThpSN4MTMc6/ZiQrvbTE5N9rIyqvyo4j3Ae/jMQ=; b=Afiyf8n2W1KdETytOWtB+fVkPKOuQQUQGz/EwbMCi4WkBmjEJ7WGjp11hY+TrpXRnM8Apb E0nJRIBynduOkUM7gEAFG0V/iFGA9/eDdQr75KlGTz3aq5w+EWXMCDk3h1zq3gthT2EIa5 eLd2Niey702zvpaaMBUen/Pv6P+UucE= Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-275-_SG_aOtEN9esCOMIXMm9Qg-1; Tue, 07 Jul 2020 18:50:33 -0400 X-MC-Unique: _SG_aOtEN9esCOMIXMm9Qg-1 Received: by mail-qk1-f197.google.com with SMTP id k16so16379494qkh.12 for ; Tue, 07 Jul 2020 15:50:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EjHuThpSN4MTMc6/ZiQrvbTE5N9rIyqvyo4j3Ae/jMQ=; b=uhPWyluo3NUqlgGP96DgIutsvB+7HhkSMDjrB9g68X9kPqIE7x3Eee/qwhk3UYi+Iy hGxJg+kjeHcBKmeyG0l8StcS63aqLN6VLEirDuo68L9rH2d1SSJjwNqvr8RN+wtXalUb RXKK6zrEu5ooy0MvWX2yHJeTBpyDQKcFu+nKdbOzoOt7kzfsQ+YeGpqpbQCiDro27Flx s7E/xjFd2ox90/IVtaLMGNyJKYCNrFg79kxB1iydDYYlQTBh2b6ySuiLGOwzLkC0CJy/ B3h+qaCWC+I9m8GpzeeMn7A1ApyV0b5qa5xGSk2bgBoEJoSgXYwWBq6Cfet8o/rKBO/m g9/A== X-Gm-Message-State: AOAM530h3MyMU3oVKNS6UkCWEHRDMtMkOAnlgqT/fSha4MEpmBddPmKT PY5J+NpH20/kjs1iWg8xNOR3fKfVe/bRO57/wMPBhKlnXslOrJKfpoYLdarxNyhoKlHixneQ+DT ZHM3oYiHrPp4xlHnqTucS6X0zZcPmB2vVoRU= X-Received: by 2002:ac8:4d5d:: with SMTP id x29mr57898330qtv.358.1594162232806; Tue, 07 Jul 2020 15:50:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyKs84wiAnpkRkYMFU65uBv9KDGiwUMHAvWd757+lDwcSvLqmU3BsGAsJ394Lj65TO/7Bc44g== X-Received: by 2002:ac8:4d5d:: with SMTP id x29mr57898318qtv.358.1594162232589; Tue, 07 Jul 2020 15:50:32 -0700 (PDT) Received: from xz-x1.redhat.com ([2607:9880:19c0:32::2]) by smtp.gmail.com with ESMTPSA id j16sm26267642qtp.92.2020.07.07.15.50.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jul 2020 15:50:31 -0700 (PDT) From: Peter Xu To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH v5 05/25] mm/arm64: Use general page fault accounting Date: Tue, 7 Jul 2020 18:50:01 -0400 Message-Id: <20200707225021.200906-6-peterx@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200707225021.200906-1-peterx@redhat.com> References: <20200707225021.200906-1-peterx@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=peterx@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200707_185037_671085_39CA7468 X-CRM114-Status: GOOD ( 17.33 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [207.211.31.120 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [207.211.31.120 listed in wl.mailspike.net] -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.0 DKIMWL_WL_HIGH DKIMwl.org - Whitelisted High sender X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrea Arcangeli , Catalin Marinas , John Hubbard , Linus Torvalds , peterx@redhat.com, Michael Ellerman , David Rientjes , Andrew Morton , Will Deacon , Gerald Schaefer , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Use the general page fault accounting by passing regs into handle_mm_fault(). It naturally solve the issue of multiple page fault accounting when page fault retry happened. To do this, we pass pt_regs pointer into __do_page_fault(). CC: Catalin Marinas CC: Will Deacon CC: linux-arm-kernel@lists.infradead.org Acked-by: Will Deacon Signed-off-by: Peter Xu --- arch/arm64/mm/fault.c | 29 ++++++----------------------- 1 file changed, 6 insertions(+), 23 deletions(-) diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index f885940035ce..a3bd189602df 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -404,7 +404,8 @@ static void do_bad_area(unsigned long addr, unsigned int esr, struct pt_regs *re #define VM_FAULT_BADACCESS 0x020000 static vm_fault_t __do_page_fault(struct mm_struct *mm, unsigned long addr, - unsigned int mm_flags, unsigned long vm_flags) + unsigned int mm_flags, unsigned long vm_flags, + struct pt_regs *regs) { struct vm_area_struct *vma = find_vma(mm, addr); @@ -428,7 +429,7 @@ static vm_fault_t __do_page_fault(struct mm_struct *mm, unsigned long addr, */ if (!(vma->vm_flags & vm_flags)) return VM_FAULT_BADACCESS; - return handle_mm_fault(vma, addr & PAGE_MASK, mm_flags, NULL); + return handle_mm_fault(vma, addr & PAGE_MASK, mm_flags, regs); } static bool is_el0_instruction_abort(unsigned int esr) @@ -450,7 +451,7 @@ static int __kprobes do_page_fault(unsigned long addr, unsigned int esr, { const struct fault_info *inf; struct mm_struct *mm = current->mm; - vm_fault_t fault, major = 0; + vm_fault_t fault; unsigned long vm_flags = VM_ACCESS_FLAGS; unsigned int mm_flags = FAULT_FLAG_DEFAULT; @@ -516,8 +517,7 @@ static int __kprobes do_page_fault(unsigned long addr, unsigned int esr, #endif } - fault = __do_page_fault(mm, addr, mm_flags, vm_flags); - major |= fault & VM_FAULT_MAJOR; + fault = __do_page_fault(mm, addr, mm_flags, vm_flags, regs); /* Quick path to respond to signals */ if (fault_signal_pending(fault, regs)) { @@ -538,25 +538,8 @@ static int __kprobes do_page_fault(unsigned long addr, unsigned int esr, * Handle the "normal" (no error) case first. */ if (likely(!(fault & (VM_FAULT_ERROR | VM_FAULT_BADMAP | - VM_FAULT_BADACCESS)))) { - /* - * Major/minor page fault accounting is only done - * once. If we go through a retry, it is extremely - * likely that the page will be found in page cache at - * that point. - */ - if (major) { - current->maj_flt++; - perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MAJ, 1, regs, - addr); - } else { - current->min_flt++; - perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MIN, 1, regs, - addr); - } - + VM_FAULT_BADACCESS)))) return 0; - } /* * If we are in kernel mode at this point, we have no context to