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.8 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,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 9980CC433E0 for ; Fri, 26 Jun 2020 22:31:54 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 5DBDC20B1F for ; Fri, 26 Jun 2020 22:31:54 +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="h9fPtcN3" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5DBDC20B1F 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 910FB6B0022; Fri, 26 Jun 2020 18:31:47 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8C2A46B0023; Fri, 26 Jun 2020 18:31:47 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 713A46B0024; Fri, 26 Jun 2020 18:31:47 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0189.hostedemail.com [216.40.44.189]) by kanga.kvack.org (Postfix) with ESMTP id 50F4C6B0022 for ; Fri, 26 Jun 2020 18:31:47 -0400 (EDT) Received: from smtpin11.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 0EB9D824556B for ; Fri, 26 Jun 2020 22:31:47 +0000 (UTC) X-FDA: 76972811454.11.spark23_2309b1126e59 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin11.hostedemail.com (Postfix) with ESMTP id DB3CF180F8B81 for ; Fri, 26 Jun 2020 22:31:46 +0000 (UTC) X-HE-Tag: spark23_2309b1126e59 X-Filterd-Recvd-Size: 5674 Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by imf47.hostedemail.com (Postfix) with ESMTP for ; Fri, 26 Jun 2020 22:31:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593210705; 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=SagB2x6xDXMHuNfH0nszNoiVH7/+fXWLgMfhv8WOo7E=; b=h9fPtcN3pwrXFhtSJ/b8BgtNyqOT8KI4Vq2zdmaC0ZHnRehGt2JN8wsdY0ZQK6LaEFcy5R QvllEInaWiq2kpamQRcwaXnd7cRPWKQ5y3cgGYTe0j8Qsh6kusRkUImIP4NsnJG3GfdV8L l5PH/HhaS8/nTSHXdeIsiLyEOCnAP40= 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-50-RVPLrFVCM7WBQswoyDZKHQ-1; Fri, 26 Jun 2020 18:31:44 -0400 X-MC-Unique: RVPLrFVCM7WBQswoyDZKHQ-1 Received: by mail-qt1-f197.google.com with SMTP id u93so7521558qtd.8 for ; Fri, 26 Jun 2020 15:31:44 -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=SagB2x6xDXMHuNfH0nszNoiVH7/+fXWLgMfhv8WOo7E=; b=aVgDjmGpzjGiAvMrUfmtuj+fZ/mKTNZNRfrDATjKeFtkqBcY9PMyRRzmk4whnLALqY GaywuK2ycyAcVdEhyS2eI11QRT03bSAfcoxExBB5fTQRVaxk5Y8Y2PVzD3KhVm5T1yaq YEpLcjMDm9kWbF3NjFDhFB+i86jV4hOF5AOHrvay9TywPQsuOiLESFGbDzwH6a4UVrQj HR1119qNUa8Q5QJXj2FA1SmVwEyXX/NqgszkXyi9Wf0hwHyXq/BQpJLcw9zst3GShIf3 wanTCpTWBZ6SDRDyv7K6Eb4FhDmyNWnkzyuuoF2a334ko6S8Z6HH341X4k8XVy/9TV8U qAew== X-Gm-Message-State: AOAM532yyU5VCdTv5j+vU6jBipCYOISFWHYGyJEOTK+eZhho+OlANDUp vU6jUD1XVo1pS57xV4mXZoKcolPZVNGzrRY3MFbUA0VyVn1Aoohty2pCW64LAYu2cKPp4M3P/VI wgug4bupUPAs= X-Received: by 2002:ac8:382b:: with SMTP id q40mr5158477qtb.11.1593210703555; Fri, 26 Jun 2020 15:31:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz+3FP1V/Ad++bjiADIsOLnYLtWDzv+gtA2qG8ikbYulDNDze8olEwJ20DxbWqD1R+2IL+N9g== X-Received: by 2002:ac8:382b:: with SMTP id q40mr5158456qtb.11.1593210703343; Fri, 26 Jun 2020 15:31:43 -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.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2020 15:31:42 -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 , Brian Cain , linux-hexagon@vger.kernel.org Subject: [PATCH 07/26] mm/hexagon: Use general page fault accounting Date: Fri, 26 Jun 2020 18:31:11 -0400 Message-Id: <20200626223130.199227-8-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 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 Content-Type: text/plain; charset=US-ASCII X-Rspamd-Queue-Id: DB3CF180F8B81 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam04 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. Add the missing PERF_COUNT_SW_PAGE_FAULTS perf events too. Note, the oth= er two perf events (PERF_COUNT_SW_PAGE_FAULTS_[MAJ|MIN]) were done in handle_mm_= fault(). CC: Brian Cain CC: linux-hexagon@vger.kernel.org Signed-off-by: Peter Xu --- arch/hexagon/mm/vm_fault.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/arch/hexagon/mm/vm_fault.c b/arch/hexagon/mm/vm_fault.c index f04cd0a6d905..1b1802f30862 100644 --- a/arch/hexagon/mm/vm_fault.c +++ b/arch/hexagon/mm/vm_fault.c @@ -19,6 +19,7 @@ #include #include #include +#include =20 /* * Decode of hardware exception sends us to one of several @@ -54,6 +55,8 @@ void do_page_fault(unsigned long address, long cause, s= truct pt_regs *regs) =20 if (user_mode(regs)) flags |=3D FAULT_FLAG_USER; + + perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, address); retry: down_read(&mm->mmap_sem); vma =3D find_vma(mm, address); @@ -89,7 +92,7 @@ void do_page_fault(unsigned long address, long cause, s= truct pt_regs *regs) break; } =20 - fault =3D handle_mm_fault(vma, address, flags, NULL); + fault =3D handle_mm_fault(vma, address, flags, regs); =20 if (fault_signal_pending(fault, regs)) return; @@ -97,10 +100,6 @@ void do_page_fault(unsigned long address, long cause,= struct pt_regs *regs) /* The most common case -- we are done. */ if (likely(!(fault & VM_FAULT_ERROR))) { if (flags & FAULT_FLAG_ALLOW_RETRY) { - if (fault & VM_FAULT_MAJOR) - current->maj_flt++; - else - current->min_flt++; if (fault & VM_FAULT_RETRY) { flags |=3D FAULT_FLAG_TRIED; goto retry; --=20 2.26.2