From patchwork Tue Jun 30 20:45:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 11634801 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 16FB7739 for ; Tue, 30 Jun 2020 20:46:56 +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 E435420775 for ; Tue, 30 Jun 2020 20:46:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="i+6UI+kT"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="HEA/N8rP" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E435420775 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: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:In-Reply-To:References:List-Owner; bh=Sz+HgBbMAUsa6wheWWDEGnkf3kObXORQcK+W4b2hpj4=; b=i+6UI+kTF9ZqvNdvAAZ5cRDUHW 1FOKBNa9HxHRbzig4YtLvfUgTw988+CSsqkGjXIpyslHZh/4ZJZUim+K9bciZXPIuQ0lFn8sufZFs JR9m47XE2UpMPvABxYUp2Qs3Jftgi90oiRV/Cc2O51JD/xP4Ad301J45yC++n61Cnc1dCy5ZeqAf5 SWVu8i8X67IGBjwsdBmxmKxnLVt3W4KD595f1b7BTHS7Xx2VwrQw4EEGx9E/+NCJmiapbSkWs1ykv sgHmfk5mpqqR/96IsDNljmO3v23yvCjpyeLUB+8Fhts2q2t2MUme+7gIsBiQs2XeN7W3QkHsd/b5T 13VBxCvA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jqN88-00045o-O4; Tue, 30 Jun 2020 20:45:24 +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 1jqN83-00043A-8w for linux-arm-kernel@lists.infradead.org; Tue, 30 Jun 2020 20:45:21 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593549917; 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; bh=D8OdeaID5or5gsgcWoj3vmPJjBIrXv0E7kOuYlamE1o=; b=HEA/N8rP3piAllknbgSf9iwXiNM0vHi09DvsYVZeAZfOGpMM1IC6kYLE62dZC7zTttfk4z Eru7gpyrQ31PYciUd8mB/UNff7jzzmuG5lbWF021nAUu1TkvWLW1CZvP3ztHLbCncCFjOR 69w6EONRYYRlusBts2wg0u9bhyD18Iw= Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-281-XereAjrsNQei6TnEgxno5A-1; Tue, 30 Jun 2020 16:45:16 -0400 X-MC-Unique: XereAjrsNQei6TnEgxno5A-1 Received: by mail-qv1-f72.google.com with SMTP id r4so14610052qvh.10 for ; Tue, 30 Jun 2020 13:45:16 -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:mime-version :content-transfer-encoding; bh=D8OdeaID5or5gsgcWoj3vmPJjBIrXv0E7kOuYlamE1o=; b=Yw5G+toJTeh2z/hQh9F3oDgSmdKutC+SUZ+ANttmWY8/Q6z8sdmOCAY1gOmt/m2AiM ghS8M1g/UHa1Hjp7zNdRryvh2e2dWqo70UCFW/pAO3oTMSK2F+CRHIQhxfjjshPQ0l3o wAItqMK/M+ksmZJMHlgC6fM8Vv6RPMBSB2aoJm0ZmBdngP4ij4/C3Hf7jyGBPZ5iKmCR 04e58/hCRyMRqibeiHHg/QsKEvqrEaF2m4QwBqmbiWpqqqY1j/p7Syh4KRTugjIN9DxI qFXsvG0BsGKtRhxUfuJ1h3xEFxKrKZZwg2clwIu91iFMhp3KpWXNKrZxH+yiEMPpwdlZ 4emA== X-Gm-Message-State: AOAM530lk0iZ3xD+hqYaqKiSCz1zOyiGjNvhDRfQwZOqOS2a6Sk1GJT1 KvVc67UoWzOGf4joOeUVpslEsISPhnSsHahtZG6WmXnlr6jLeh3+FWv1cPMAq3eJEAOqndzHZPK QF2GpnN6iG3hJPe88mGqz7WNU+Ndv9makDmY= X-Received: by 2002:a0c:aa41:: with SMTP id e1mr7773823qvb.117.1593549914666; Tue, 30 Jun 2020 13:45:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwyi+ZiCgpgJNPiRGb/lHwsXU/ArQZuHKcbcZdE9UMPtaTClSVeehVA8eVoAkqIf1DOQolAKg== X-Received: by 2002:a0c:aa41:: with SMTP id e1mr7773775qvb.117.1593549914158; Tue, 30 Jun 2020 13:45:14 -0700 (PDT) Received: from xz-x1.redhat.com ([2607:9880:19c0:32::2]) by smtp.gmail.com with ESMTPSA id p80sm3991738qke.19.2020.06.30.13.45.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2020 13:45:13 -0700 (PDT) From: Peter Xu To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 04/26] mm/arm: Use general page fault accounting Date: Tue, 30 Jun 2020 16:45:11 -0400 Message-Id: <20200630204511.38663-1-peterx@redhat.com> X-Mailer: git-send-email 2.26.2 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-20200630_164519_386515_C9232FD1 X-CRM114-Status: GOOD ( 14.42 ) 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 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [207.211.31.120 listed in wl.mailspike.net] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -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_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 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 , Will Deacon , John Hubbard , Russell King , peterx@redhat.com, linux-arm-kernel@lists.infradead.org, Michael Ellerman , Andrew Morton , Linus Torvalds , Gerald Schaefer 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 Jun 30 20:45:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 11634803 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 1CCD5138C for ; Tue, 30 Jun 2020 20:46:57 +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 EA4D020775 for ; Tue, 30 Jun 2020 20:46:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="jv/XgYb/"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="jDDCz5Fd" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EA4D020775 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: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:In-Reply-To:References:List-Owner; bh=CKoGm12kpIepCTQTXLryVDythIfjzp9U7FDmdtc296g=; b=jv/XgYb/u925L1co9fI/wTQsf4 bOZk7CIjzRrli4Pj663uhfBGrsxWarIk1sfjBDKEVag2YMatQ2qssTVSBIcvi6+7aEVWS3975sUCG XUzquO459BUuB7AjIqCAPg7kfFBdQ1HBJW1uhJX7WfKU2vJJd2KYKQv+Ahgruu5egcD2EAfV/O3Rd OtmFMMicKqQs2Kstls5r5JZogT8zABEcsYXx0tdVZKS9R39a7xqb9Ip2FU9BxIHAVXz1dm0kAJQQY +0XrCGnKTWDB7hleEa0/40ZU7UhgPrchPwLAEYQCGJYckpbsZF668uVIF9bQoHHpfgRqcb4IlPDL+ FNm1r3UA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jqN8C-00047R-Ri; Tue, 30 Jun 2020 20:45:28 +0000 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120] helo=us-smtp-1.mimecast.com) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jqN88-00045T-58 for linux-arm-kernel@lists.infradead.org; Tue, 30 Jun 2020 20:45:25 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593549923; 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; bh=fUO3NS9psrO0Jdd2xoJCjexzJ/aoni+i2MbifOTNg00=; b=jDDCz5Fdev/dHgu7nAjn0bj2Pgf7X3GsOYLLpYCzJxq6j3yAIz+rOPBOwrQ/agAQgMvymu +4cZ0dCKKER/CJ6lNIp50IyicVdH2olQsjSA6U6mIh7M4EFqkuXa02f+SB1A2avtEaKfvU +uSVpNlxymI7Rsu6sf5dgvQ7SdPTIl0= Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-434-3pjhr4bzOBOkbixDk_bAzw-1; Tue, 30 Jun 2020 16:45:18 -0400 X-MC-Unique: 3pjhr4bzOBOkbixDk_bAzw-1 Received: by mail-qv1-f70.google.com with SMTP id bk16so14633628qvb.11 for ; Tue, 30 Jun 2020 13:45:18 -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:mime-version :content-transfer-encoding; bh=fUO3NS9psrO0Jdd2xoJCjexzJ/aoni+i2MbifOTNg00=; b=naZ5Ba7UG9xujrXo4ubxujyZCsFpH2stMKWkjsdDJh6z8d038ZMNewAkoyaZklqOdd /CY7YGgR8mXNP0/kuqmNOtG37gyknDY119NO5dUfr0n1FE7D9F6k8Sfhzjv+5J9OeBBV HBBujRwsdKkyCRmjs4eFgChTrfDhuaXbsS13bwymMAPPxGeJ8KcZYJ3msPTNnZdK8KC0 HyUKzVPnDKsVK6wllWZW0sUhnb5ffqlnejjABFcLxzk7xHHPZSxvZWEMfVqRNiLgicaL nAXBQ3ovmISVqVfKF+TNhVkAM1JYvC2RWZqjwuYVhH8hzCCHmafGwnGmjEaq5dC8Q8yi BOcA== X-Gm-Message-State: AOAM533OxUDf/LwxLfG/acdqHj0tk5Ayfcqvnsbinyyln7QmziHMg2An ElqXfRHwqmAdIv0eOgpOMwFMKhaw25Ixk9f2150LJYww/7vhqedZVMgT0JggghIeJN8NjGF/AiG VjfDeQKbL1pFK5ICHK3zOHD3ENuU3tYPLtJk= X-Received: by 2002:ac8:27c9:: with SMTP id x9mr2655047qtx.172.1593549917116; Tue, 30 Jun 2020 13:45:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxM45GnPoMoskFnro4SYt1oRyRPA5o85g+uNQHWZT+8Z2bvlk/KPFB1VULzepW16SEXqoxiIw== X-Received: by 2002:ac8:27c9:: with SMTP id x9mr2655012qtx.172.1593549916828; Tue, 30 Jun 2020 13:45:16 -0700 (PDT) Received: from xz-x1.redhat.com ([2607:9880:19c0:32::2]) by smtp.gmail.com with ESMTPSA id m7sm3926577qti.6.2020.06.30.13.45.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2020 13:45:16 -0700 (PDT) From: Peter Xu To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 05/26] mm/arm64: Use general page fault accounting Date: Tue, 30 Jun 2020 16:45:14 -0400 Message-Id: <20200630204514.38711-1-peterx@redhat.com> X-Mailer: git-send-email 2.26.2 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-20200630_164524_308978_E59E455E X-CRM114-Status: GOOD ( 17.07 ) 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 [205.139.110.120 listed in list.dnswl.org] 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [205.139.110.120 listed in wl.mailspike.net] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -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_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 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 , Catalin Marinas , Will Deacon , John Hubbard , peterx@redhat.com, linux-arm-kernel@lists.infradead.org, Michael Ellerman , Andrew Morton , Linus Torvalds , Gerald Schaefer 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 Signed-off-by: Peter Xu Acked-by: Will Deacon --- 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 be29f4076fe3..f07333e86c2f 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