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 F4059C433E0 for ; Fri, 19 Jun 2020 16:07:35 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id B5F2B21532 for ; Fri, 19 Jun 2020 16:07:35 +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="KE1/gEqh" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B5F2B21532 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 610BB8D00B7; Fri, 19 Jun 2020 12:07:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5C0AD8D00AD; Fri, 19 Jun 2020 12:07:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4D6888D00B7; Fri, 19 Jun 2020 12:07:35 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0129.hostedemail.com [216.40.44.129]) by kanga.kvack.org (Postfix) with ESMTP id 33B7F8D00AD for ; Fri, 19 Jun 2020 12:07:35 -0400 (EDT) Received: from smtpin28.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id E0093181ACC80 for ; Fri, 19 Jun 2020 16:07:34 +0000 (UTC) X-FDA: 76946441628.28.sock31_3c0599926e1a Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin28.hostedemail.com (Postfix) with ESMTP id 9F1CEC2884 for ; Fri, 19 Jun 2020 16:05:56 +0000 (UTC) X-HE-Tag: sock31_3c0599926e1a X-Filterd-Recvd-Size: 5662 Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by imf22.hostedemail.com (Postfix) with ESMTP for ; Fri, 19 Jun 2020 16:05:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592582755; 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=KE1/gEqhi5/bGhEVFbKxBtiTxp0hpX0wbNGpz54kYSGPP/+R2mN9/a7bJClyUew5FMuWBn MziDNxhERo2HIusFGmAPpnIijJJwxAPzZ80oREHdm9tJ5srhrx8k+l0NjrD4HSt5AUatIO RdnmcSaKx7DuzhEYqBevXn+T7JdJzDQ= Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-9-cd9vu8R2NsqKP8lCVKPZIA-1; Fri, 19 Jun 2020 12:05:54 -0400 X-MC-Unique: cd9vu8R2NsqKP8lCVKPZIA-1 Received: by mail-qv1-f69.google.com with SMTP id z7so7065439qve.0 for ; Fri, 19 Jun 2020 09:05:53 -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=stlQuOy+3N0WZG+4vzwkRj5ebA7TIwaOdqeqG9XiCXzkCICq+Os/UxRVDjlfBEI6gB QpEcCPdubld86YoZIIvk1NPMBd/dvxMh9ze/Eer2hAKB6ESHmJFy5JjQcrjMFpYEIigP 1TydYT9z3ABKJSgalDKEijIxpWg42wb2aMsLhu7+JmsMpLaTS2DnN3+EVemStjZ/rXHr dZiaP0qXqxA69AFbfd42OUOyhXxp6oAm/Cnv9/9saxRkOohLsvlyFQyYFrIDY4PJP9o4 xiLke8uZyM02n7sq3unRn+VOfliQwiPYNpNook5lv/YUgP8NPoX/Cq0UKi5zUrFcAWQu OIrQ== X-Gm-Message-State: AOAM533RUoyXhppGI/EKxJ7O6HGBQ0LgwOAiwlzxw9kmAYDNGWqdflf2 sqlPIHgdixvWaBZZ+r9KKWkCFaj9vg5Dk46PkGe13JjvXqVQRJSNBH1S+DS0/VSNX1AgHu2eMlw CibUDlssmzpg= X-Received: by 2002:a37:9e52:: with SMTP id h79mr3975300qke.467.1592582753535; Fri, 19 Jun 2020 09:05:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzd2Ml6f1U4IsoXVUG+sGmbZtZswjvwyuO+DQ4aozpetfpM522QVCnolfKkgB3x792Y2yKCcA== X-Received: by 2002:a37:9e52:: with SMTP id h79mr3975266qke.467.1592582753231; Fri, 19 Jun 2020 09:05:53 -0700 (PDT) Received: from xz-x1.redhat.com ([2607:9880:19c0:32::2]) by smtp.gmail.com with ESMTPSA id g11sm6412604qkk.123.2020.06.19.09.05.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jun 2020 09:05:52 -0700 (PDT) From: Peter Xu To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: Gerald Schaefer , peterx@redhat.com, Andrew Morton , Andrea Arcangeli , Will Deacon , Michael Ellerman , Linus Torvalds , Brian Cain , linux-hexagon@vger.kernel.org Subject: [PATCH 07/26] mm/hexagon: Use general page fault accounting Date: Fri, 19 Jun 2020 12:05:19 -0400 Message-Id: <20200619160538.8641-8-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 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: 9F1CEC2884 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam03 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