From patchwork Fri Jun 26 22:31:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 11628987 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 A568D1392 for ; Fri, 26 Jun 2020 22:31:53 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 72F1D20B1F for ; Fri, 26 Jun 2020 22:31:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="XTj9BevQ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 72F1D20B1F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id E19306B0010; Fri, 26 Jun 2020 18:31:45 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id D7A176B0022; Fri, 26 Jun 2020 18:31:45 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BF5386B0023; Fri, 26 Jun 2020 18:31:45 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0155.hostedemail.com [216.40.44.155]) by kanga.kvack.org (Postfix) with ESMTP id 9C7F56B0010 for ; Fri, 26 Jun 2020 18:31:45 -0400 (EDT) Received: from smtpin08.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 5A566181ABE85 for ; Fri, 26 Jun 2020 22:31:45 +0000 (UTC) X-FDA: 76972811370.08.women97_210a14726e59 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin08.hostedemail.com (Postfix) with ESMTP id 33A401819E769 for ; Fri, 26 Jun 2020 22:31:45 +0000 (UTC) X-Spam-Summary: 1,0,0,,d41d8cd98f00b204,peterx@redhat.com,,RULES_HIT:30003:30054,0,RBL:205.139.110.61:@redhat.com:.lbl8.mailshell.net-62.18.0.100 66.10.201.10;04yrdaksmwwib67oxqnabfz6ni993yp63yt96c1ihubu8j1xn7yze3swug53irs.h8b46kgqbmfr13qq1pbk6y6b8zt43ca8trnsurjja9dhoo5zbnagyjopecomhyi.n-lbl8.mailshell.net-223.238.255.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:ft,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:23,LUA_SUMMARY:none X-HE-Tag: women97_210a14726e59 X-Filterd-Recvd-Size: 4900 Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by imf07.hostedemail.com (Postfix) with ESMTP for ; Fri, 26 Jun 2020 22:31:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593210704; 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=nYKuiXa6JqSlFakb02F9N/z/khfKW7nv0ZKU3o10xCg=; b=XTj9BevQLPVezwyK+6X/o9pcd++NCLmdDnbhkVT1s/h1URnXxwYasW/Vd2uWXtmSIBEQzt Md6iIvmrWeVDzyGQ9CC1Apj7ZMPORLoBrTe39w0gWqWX47p0xY6XF9AlWn7n0yvKvbydfD lCii8icXMTyqnFUDSqE/oeO39qkt4oo= 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-472-u1EIvZUTMIyAHj8xjjyDiQ-1; Fri, 26 Jun 2020 18:31:42 -0400 X-MC-Unique: u1EIvZUTMIyAHj8xjjyDiQ-1 Received: by mail-qv1-f72.google.com with SMTP id a12so1698881qvt.22 for ; Fri, 26 Jun 2020 15:31:42 -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=nYKuiXa6JqSlFakb02F9N/z/khfKW7nv0ZKU3o10xCg=; b=VosyhWxDr8MJ3bcS/rUxRKcgalqcpJO6++V9lS1FCF6YDWSy+ul2Q2q2gXt5y9vfXG NI0UscooGQmLEdsbroE5YwbNjXPI0dCBVoAkA8EVmkAIcrj7CCZo2aCcehAe3Pkx6BQN mxk0MC9AwGbqm4c3lgkXTSwLadIyY7Al8R8QSpanalas0LZuA8E5tpqkhyZNsQowexHu 0pWjg7tN33n/ElGJt+elm7WudAbCaurTPpNs5GQhGUVWs0I525ccLF1tkcsVYjpCBkCr kVKk+48v9RFX7Nv0MsOUauXtsW2iflBarQZBhn+Jx1WTxWCmfJEbtD4P0tJCkpCjIk7g jKzA== X-Gm-Message-State: AOAM531t2mnlMvw4iQy/pITJSQuZG5fzjDns4HBCYolI3oZUtbSzjFGe kgtwMsZTRlXHvcFiVy30a26JY3rs5YUtpaTktvqoPtxLrwqPcZb8M3PEjgf73NDc95DcKu6fs6v Gt9kdVXZSxlg= X-Received: by 2002:ac8:27bd:: with SMTP id w58mr5311367qtw.348.1593210701800; Fri, 26 Jun 2020 15:31:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxSMdcnN8S0Vm53+A1zYZUxGb86xhlZEgD0Ug2gSVVAidxyTpcuF0guaWkh6epy+fd5/SNVlw== X-Received: by 2002:ac8:27bd:: with SMTP id w58mr5311342qtw.348.1593210701587; Fri, 26 Jun 2020 15:31:41 -0700 (PDT) Received: from xz-x1.redhat.com ([2607:9880:19c0:32::2]) by smtp.gmail.com with ESMTPSA id f203sm9903311qke.135.2020.06.26.15.31.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2020 15:31:40 -0700 (PDT) From: Peter Xu To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Andrew Morton , Linus Torvalds , Gerald Schaefer , Andrea Arcangeli , Will Deacon , peterx@redhat.com, Michael Ellerman , Guo Ren , linux-csky@vger.kernel.org Subject: [PATCH 06/26] mm/csky: Use general page fault accounting Date: Fri, 26 Jun 2020 18:31:10 -0400 Message-Id: <20200626223130.199227-7-peterx@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200626223130.199227-1-peterx@redhat.com> References: <20200626223130.199227-1-peterx@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Rspamd-Queue-Id: 33A401819E769 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam05 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: 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. CC: Guo Ren CC: linux-csky@vger.kernel.org Signed-off-by: Peter Xu --- arch/csky/mm/fault.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/arch/csky/mm/fault.c b/arch/csky/mm/fault.c index b14f97d3cb15..a3e0aa3ebb79 100644 --- a/arch/csky/mm/fault.c +++ b/arch/csky/mm/fault.c @@ -151,7 +151,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long write, * the fault. */ fault = handle_mm_fault(vma, address, write ? FAULT_FLAG_WRITE : 0, - NULL); + regs); if (unlikely(fault & VM_FAULT_ERROR)) { if (fault & VM_FAULT_OOM) goto out_of_memory; @@ -161,16 +161,6 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long write, goto bad_area; BUG(); } - if (fault & VM_FAULT_MAJOR) { - tsk->maj_flt++; - perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MAJ, 1, regs, - address); - } else { - tsk->min_flt++; - perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MIN, 1, regs, - address); - } - up_read(&mm->mmap_sem); return;