From patchwork Fri Jun 26 22:36:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 11629021 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 6371A90 for ; Fri, 26 Jun 2020 22:36:40 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 312B5208C7 for ; Fri, 26 Jun 2020 22:36:40 +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="cb6AqNEp" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 312B5208C7 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 4CC216B0027; Fri, 26 Jun 2020 18:36:36 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 478EF6B002A; Fri, 26 Jun 2020 18:36:36 -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 318606B002B; Fri, 26 Jun 2020 18:36:36 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0046.hostedemail.com [216.40.44.46]) by kanga.kvack.org (Postfix) with ESMTP id 1C1CA6B0027 for ; Fri, 26 Jun 2020 18:36:36 -0400 (EDT) Received: from smtpin27.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id D91DA180AD82F for ; Fri, 26 Jun 2020 22:36:35 +0000 (UTC) X-FDA: 76972823550.27.spy41_1c1834b26e59 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin27.hostedemail.com (Postfix) with ESMTP id B63E23D668 for ; Fri, 26 Jun 2020 22:36:35 +0000 (UTC) X-Spam-Summary: 1,0,0,,d41d8cd98f00b204,peterx@redhat.com,,RULES_HIT:30003:30054,0,RBL:207.211.31.120:@redhat.com:.lbl8.mailshell.net-62.18.0.100 66.10.201.10;04yfmrae9t4wuu4natudrdcath3xgycek6b1jh48nik7db3sn3s4m5zfi5qyqhn.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:23,LUA_SUMMARY:none X-HE-Tag: spy41_1c1834b26e59 X-Filterd-Recvd-Size: 5047 Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by imf46.hostedemail.com (Postfix) with ESMTP for ; Fri, 26 Jun 2020 22:36:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593210994; 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=sy544NXeYcNhbxOT1ou9Gq9AWlj9fShUn5juJrQIV8c=; b=cb6AqNEpsnxVqvtxgDy74le7v9W/m0Jz/nvFom8LmsZ2GgCH9xqXQLzfJWRu6iylK1073M Ggs/x2HuTgVqVS7R2Ly3Aoffcs8EzuC/Oj0nexchEKyKAPp7K5FSDULHoHVGo8TJDO0wI1 cr4MHuGoxNc9GUL5UrWnKm0zUU4Ps1s= 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-193-iEtHRdDzPiuKN38UQ87wkA-1; Fri, 26 Jun 2020 18:36:33 -0400 X-MC-Unique: iEtHRdDzPiuKN38UQ87wkA-1 Received: by mail-qt1-f197.google.com with SMTP id s30so7510198qts.18 for ; Fri, 26 Jun 2020 15:36: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=sy544NXeYcNhbxOT1ou9Gq9AWlj9fShUn5juJrQIV8c=; b=kWzUrN34ie5i4HuF3M8SkQNaH3BQvtljv+H3V7pH1XT649DnxzOBzC6wM0eHQZrmBa 6b+bWDaufJsiuDMN6EHGqDnz9bpM4Er91Fna3kTRgNIW0hQQEGi0vkdVaAW0xFO/eIGb dXHLWyjff8Na8d6UMkb8CrQEtS8+Dn0gk5pvVY93399OUVy2+gCTZVY20XXhxG782i65 pqPcL+ivEVWnyEfzf/wHbUafAxi2aaYaPO/JkbZT9TbkMS/q/kAFqIUng3g/fvMP9MXZ lSbTCmg42mkOLqNjY2vfugkAZuEy6odaNvHlwBnIWC50UGtfzR/E80NGhjEiWdcQrvjT hf0A== X-Gm-Message-State: AOAM530EUiIXM9CijGjun3z24DbnVXeAslbmSQzBxXzlfvWtDGSKdYTq WWdKStFARv0Pd3+iJr4qV11aAJKPXKzfr9Nl1vKH6jMi6hOEBnXAOmeRgLEJEu2Ldeyk6qZW0g5 zBfNo0nOIzXc= X-Received: by 2002:a37:85c2:: with SMTP id h185mr4770364qkd.131.1593210992724; Fri, 26 Jun 2020 15:36:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwcoi8cepaE8ANXOFi2PVyO15Jfd50jgJOhFJOBCe30ERvg9/Lt2pXNeV+XAP5+YiAoyA3fUQ== X-Received: by 2002:a37:85c2:: with SMTP id h185mr4770348qkd.131.1593210992522; Fri, 26 Jun 2020 15:36:32 -0700 (PDT) Received: from xz-x1.redhat.com ([2607:9880:19c0:32::2]) by smtp.gmail.com with ESMTPSA id b4sm8623557qka.133.2020.06.26.15.36.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2020 15:36:31 -0700 (PDT) From: Peter Xu To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Peter Xu , Andrew Morton , Linus Torvalds , Gerald Schaefer , Andrea Arcangeli , Will Deacon , Michael Ellerman , Yoshinori Sato , Rich Felker , linux-sh@vger.kernel.org Subject: [PATCH 19/26] mm/sh: Use general page fault accounting Date: Fri, 26 Jun 2020 18:36:30 -0400 Message-Id: <20200626223630.199909-1-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: B63E23D668 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam04 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 a4e670a9c9b3..ba6f7ed570e5 100644 --- a/arch/sh/mm/fault.c +++ b/arch/sh/mm/fault.c @@ -464,22 +464,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;