From patchwork Tue Jul 7 22:50:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 11650419 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 D05D1739 for ; Tue, 7 Jul 2020 22:51:11 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 9D2442077D for ; Tue, 7 Jul 2020 22:51:11 +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="YSkWTZLC" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9D2442077D 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 77F326B00C5; Tue, 7 Jul 2020 18:50:59 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 708EB6B00C7; Tue, 7 Jul 2020 18:50:59 -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 5AC196B00C8; Tue, 7 Jul 2020 18:50:59 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0178.hostedemail.com [216.40.44.178]) by kanga.kvack.org (Postfix) with ESMTP id 3FEB06B00C5 for ; Tue, 7 Jul 2020 18:50:59 -0400 (EDT) Received: from smtpin17.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 0828D8248D52 for ; Tue, 7 Jul 2020 22:50:59 +0000 (UTC) X-FDA: 77012776638.17.pull31_57170a826eb8 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin17.hostedemail.com (Postfix) with ESMTP id D8AE2180D0185 for ; Tue, 7 Jul 2020 22:50:58 +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-66.10.201.10 62.18.0.100;04yfzepo8t94b7473gxtiypo4769bocek6b1jh48nik7db3sn3s4m5zfi5qyqhn.1zuzg7qzqi7cuasjqeaeynhcg6csxt1zi3617gdou3cksyqbrptzz8towask3mm.w-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:none,Custom_rules:0:0:0,LFtime:25,LUA_SUMMARY:none X-HE-Tag: pull31_57170a826eb8 X-Filterd-Recvd-Size: 5228 Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by imf48.hostedemail.com (Postfix) with ESMTP for ; Tue, 7 Jul 2020 22:50:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594162257; 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=sstMP5NBLNFJ42p1Ptb1NInEyGUfT5YQOxqtWfaqyuo=; b=YSkWTZLCR9/wH8KFRFK5MT4W7jB0bcBmUX5DhDBVNVnU+3wEdcxCeq+ePr5VBEdfs+SFF+ +GhGjI9hREaq1+kkDrtsZoz3N/q5EZeVbrGJywK+jyPXJpDtw9/7veiJyFGdGPQ7SxossY QasFudEy/NKu1LZIjpa+Vcbb725PMHs= 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-146-VgjPmL23NCSD6FXIpF_DVA-1; Tue, 07 Jul 2020 18:50:56 -0400 X-MC-Unique: VgjPmL23NCSD6FXIpF_DVA-1 Received: by mail-qv1-f70.google.com with SMTP id em19so22359434qvb.14 for ; Tue, 07 Jul 2020 15:50:56 -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=sstMP5NBLNFJ42p1Ptb1NInEyGUfT5YQOxqtWfaqyuo=; b=f9N9PPVr+ncWYvtowU1qJwX14t5Zkll5oO/fz2eVq6t4LfZfXO7JiWXeI+JWcKY+76 B4FThsxUbFaNtZ6QzrEg8Mc4yBtJOozDIWvgpHs7KV7DZvdk7pzRZDoy05WGMClEqcGW YUUQpZfLh+Y7oDIgPfQAGDEKMHTLsu4h25Bwmy3ancwZri5pukeRKugxkF6NGZvuFmZA iFhOEc79jswrMj/Tfo+OItV07G5Uk9d05LCmLyKIx/ygnt1LnGBSMURja5Vqk/zNZz5P 6vxE63cT2FQEjYXrivvlMQd+kFQH8eVmc4SxjfSXmUeFEWKWye6OJIm4imcftAfeHMBw WuDA== X-Gm-Message-State: AOAM531BX7xSpPUdbcnBc03ixOMiYIUxriIMGekygdDgFy3Z2CCM3T7m 5f2n/xqT6J+O34LTdAjFlw64UPb2SdZ2S++xNrcLWpSY1M79TWpDXTyc5plBkk1Z7CoWBt6pqV5 +NEB8NVPjbqE= X-Received: by 2002:ae9:ea13:: with SMTP id f19mr48305837qkg.331.1594162255792; Tue, 07 Jul 2020 15:50:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx+fZbbr5VZat1rrRmd+D1Dar1PUsYOv9odYsqMkgw6s9ZuUOa/fKMkRQzzNbqSPEglj8MNYA== X-Received: by 2002:ae9:ea13:: with SMTP id f19mr48305824qkg.331.1594162255589; Tue, 07 Jul 2020 15:50:55 -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.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jul 2020 15:50:54 -0700 (PDT) From: Peter Xu To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: Gerald Schaefer , Linus Torvalds , peterx@redhat.com, Andrew Morton , Will Deacon , Andrea Arcangeli , David Rientjes , John Hubbard , Michael Ellerman , Yoshinori Sato , Rich Felker , linux-sh@vger.kernel.org Subject: [PATCH v5 19/25] mm/sh: Use general page fault accounting Date: Tue, 7 Jul 2020 18:50:15 -0400 Message-Id: <20200707225021.200906-20-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-Rspamd-Queue-Id: D8AE2180D0185 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam01 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: Yoshinori Sato CC: Rich Felker CC: linux-sh@vger.kernel.org Signed-off-by: Peter Xu --- arch/sh/mm/fault.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/arch/sh/mm/fault.c b/arch/sh/mm/fault.c index 3c0a11827f7e..482668a2f6d3 100644 --- a/arch/sh/mm/fault.c +++ b/arch/sh/mm/fault.c @@ -482,22 +482,13 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs, * make sure we exit gracefully rather than endlessly redo * the fault. */ - fault = handle_mm_fault(vma, address, flags, NULL); + fault = handle_mm_fault(vma, address, flags, regs); if (unlikely(fault & (VM_FAULT_RETRY | VM_FAULT_ERROR))) if (mm_fault_error(regs, error_code, address, fault)) return; if (flags & FAULT_FLAG_ALLOW_RETRY) { - 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); - } if (fault & VM_FAULT_RETRY) { flags |= FAULT_FLAG_TRIED;