From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C146AC433DF for ; Fri, 19 Jun 2020 16:13:46 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 78F90217A0 for ; Fri, 19 Jun 2020 16:13:46 +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="L3NonW8u" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 78F90217A0 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 23DCC8D00C0; Fri, 19 Jun 2020 12:13:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1C7938D00AD; Fri, 19 Jun 2020 12:13:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0B6508D00C0; Fri, 19 Jun 2020 12:13:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0184.hostedemail.com [216.40.44.184]) by kanga.kvack.org (Postfix) with ESMTP id E4A7E8D00AD for ; Fri, 19 Jun 2020 12:13:45 -0400 (EDT) Received: from smtpin28.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id A5521AFBF6 for ; Fri, 19 Jun 2020 16:13:45 +0000 (UTC) X-FDA: 76946457210.28.sleep59_310d3f626e1a Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin28.hostedemail.com (Postfix) with ESMTP id 7E2EB7284E for ; Fri, 19 Jun 2020 16:13:45 +0000 (UTC) X-HE-Tag: sleep59_310d3f626e1a X-Filterd-Recvd-Size: 5049 Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by imf25.hostedemail.com (Postfix) with ESMTP for ; Fri, 19 Jun 2020 16:13:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592583222; 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=L3NonW8ugoQF2B3bq92FL9Jz2umLwmfANcm40etLfFUnLmp+r7c3CMhuqTVsfJdDvb8Nuw 90DsH8Og3PvXtSPtJg/4Vclm+S/T/6NKxWcRI5Yt0PqOyNp/FhCmmMi0+aGY862OuCsCk4 PywZOCDFyKKu4x1lKBPUQwM7z5t42QE= Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-311-_5ZBLxP7P7mOJfXK7zu2UA-1; Fri, 19 Jun 2020 12:13:41 -0400 X-MC-Unique: _5ZBLxP7P7mOJfXK7zu2UA-1 Received: by mail-qt1-f200.google.com with SMTP id o11so7431102qti.23 for ; Fri, 19 Jun 2020 09:13:41 -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=jBN/Cfo5+l+0mvRCO58PAXEunPVuF8R5otZbPTtCv2p0SgErgpjotCCuYAyTsKDorj BoEqHY41uzlqrbqZWcJpdtaDyTZA4feN4gTtHZwiDocQnM5YzlYtT1juk6e3evPgI4BN 1CubAgmV/tTenGosV5thLx3eqKNC7xoSGQkDg/NJPpPFyeobIwO2RJqtJ+7gbfc1SlvK t8hgw+engSHd0RfCWy/SCCXJFX+xpJmEbuVWq/LKb+2rzrHBgpoxG6pXEtlS2d0md4/5 omGcwSE3osFGHSi4lPbu1TMmVgATpz50WQCsJmwWfM9hCeJKChACbY9GM8QOf/+gBjTV wT1w== X-Gm-Message-State: AOAM531GpPQ7v7kplVaPsBgHphiuQV8reA2x09iksMLdFC1M09fnVsL+ M5gqwcjWOJMIGnvRCj4pOUVdWe3RHORSSe5pu9/SZkHpGaQs6Oo3xoIs7gOY+DDtoaqUtGgeVqw hP53zmfXFGVU= X-Received: by 2002:a05:6214:134f:: with SMTP id b15mr9246752qvw.208.1592583220598; Fri, 19 Jun 2020 09:13:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxYciDEcz+6ytfRwjREBcuIkBV9R3diCFzYltXp0h47AZIc6TyB3mcZDytKnQbnKaSsy8vd+w== X-Received: by 2002:a05:6214:134f:: with SMTP id b15mr9246728qvw.208.1592583220420; Fri, 19 Jun 2020 09:13:40 -0700 (PDT) Received: from xz-x1.redhat.com ([2607:9880:19c0:32::2]) by smtp.gmail.com with ESMTPSA id f203sm502143qke.135.2020.06.19.09.13.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jun 2020 09:13:39 -0700 (PDT) From: Peter Xu To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: Peter Xu , Gerald Schaefer , Andrew Morton , Andrea Arcangeli , Will Deacon , Michael Ellerman , Linus Torvalds , Yoshinori Sato , Rich Felker , linux-sh@vger.kernel.org Subject: [PATCH 19/26] mm/sh: Use general page fault accounting Date: Fri, 19 Jun 2020 12:13:38 -0400 Message-Id: <20200619161338.9714-1-peterx@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200619160538.8641-1-peterx@redhat.com> References: <20200619160538.8641-1-peterx@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII X-Rspamd-Queue-Id: 7E2EB7284E X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam02 Content-Transfer-Encoding: quoted-printable 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_faul= t(). 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_r= egs *regs, * make sure we exit gracefully rather than endlessly redo * the fault. */ - fault =3D handle_mm_fault(vma, address, flags, NULL); + fault =3D handle_mm_fault(vma, address, flags, regs); =20 if (unlikely(fault & (VM_FAULT_RETRY | VM_FAULT_ERROR))) if (mm_fault_error(regs, error_code, address, fault)) return; =20 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 |=3D FAULT_FLAG_TRIED; =20 --=20 2.26.2