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,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 39BB5C433DF for ; Tue, 30 Jun 2020 20:45:32 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id E6CE520772 for ; Tue, 30 Jun 2020 20:45:31 +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="FptQo7l2" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E6CE520772 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 9A01C6B0025; Tue, 30 Jun 2020 16:45:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 976D36B0026; Tue, 30 Jun 2020 16:45:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 865EA6B0027; Tue, 30 Jun 2020 16:45:31 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0136.hostedemail.com [216.40.44.136]) by kanga.kvack.org (Postfix) with ESMTP id 71A8F6B0025 for ; Tue, 30 Jun 2020 16:45:31 -0400 (EDT) Received: from smtpin15.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 320731EE6 for ; Tue, 30 Jun 2020 20:45:31 +0000 (UTC) X-FDA: 76987058862.15.plane17_090bb3526e7a Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin15.hostedemail.com (Postfix) with ESMTP id 0B05C1814B0C9 for ; Tue, 30 Jun 2020 20:45:31 +0000 (UTC) X-HE-Tag: plane17_090bb3526e7a X-Filterd-Recvd-Size: 5520 Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by imf01.hostedemail.com (Postfix) with ESMTP for ; Tue, 30 Jun 2020 20:45:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593549930; 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; bh=0oSiaS0i/TrG3B4WZW/K39VImBtqNKePW8X1XXaS114=; b=FptQo7l2kzYDakTff8Osv2NjUO46PDbRzcapN7t7jhqZK5HW/9H2TtVPmw8xgwvmPBUUHL OMBekXqsUd9Tcq3uQUqGyWNqlFodxvBP1QMjiSs5i+xsndHakFkkTDZCY8S3cu/fVGnMoB IjbPkGhGeJDT5tSwgF+YmXbiHi5qSMU= 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-460-FYd3JygAOTqOxKcS0a9VAQ-1; Tue, 30 Jun 2020 16:45:25 -0400 X-MC-Unique: FYd3JygAOTqOxKcS0a9VAQ-1 Received: by mail-qt1-f200.google.com with SMTP id i5so15341655qtw.3 for ; Tue, 30 Jun 2020 13:45:25 -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:mime-version :content-transfer-encoding; bh=0oSiaS0i/TrG3B4WZW/K39VImBtqNKePW8X1XXaS114=; b=uiPT+qdCiWPCCvzZrLN1Pc+IszOW26/G3CyRgzSq532crPfvtMXSupyPR1rz/nuME5 oGQ0sa5YElrDK0k2/GP+Dtc4uiw3//Zbdolcn/Bg4xZbZaamEd7ItdoSEc4HVFAjgNPH 4Ugx8JZ5sloHSCh+z7Gl7VyRevO/Pyz0rBZTRNfTdQbNw9EyHU/gRErWQKARZwJto2X4 GqWz183tZqRCBbDCWUjd1bD8/yGyPp/g21Ms9aJGupdRFtP7gkewT5t7aP90TseGGonC iJpJ0DNe0d/eh4CB4BQFDyz+REhiy7JYs5JYmW3ZZ87HkbEzl96N96S5aQ3PUknk0xN2 LtUg== X-Gm-Message-State: AOAM531hSKtaMmlFrHCBCTXU9vSfJ1YvpjR3daH6tZBE8EHV+tNCW2Iw 5wQw0NetlBefjjCOo0LaOdZhMvAk7ws3qUcflvwxsa9eYgDqXLNCG/MeLLuQe6ZMh9N1gaHyudb Ha11aHeqnYO0= X-Received: by 2002:ae9:ef4f:: with SMTP id d76mr21557577qkg.423.1593549924292; Tue, 30 Jun 2020 13:45:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwiCIZOd0SFhyDP1RMP34PE1DDliFCmZMFzYzAiXHV+Itj+3kk75rVqggZCe39IF1oIv79/dg== X-Received: by 2002:ae9:ef4f:: with SMTP id d76mr21557403qkg.423.1593549922268; Tue, 30 Jun 2020 13:45:22 -0700 (PDT) Received: from xz-x1.redhat.com ([2607:9880:19c0:32::2]) by smtp.gmail.com with ESMTPSA id s71sm4176169qke.0.2020.06.30.13.45.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2020 13:45:21 -0700 (PDT) From: Peter Xu To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Andrew Morton , peterx@redhat.com, John Hubbard , Michael Ellerman , Gerald Schaefer , Andrea Arcangeli , Linus Torvalds , Will Deacon , Brian Cain , linux-hexagon@vger.kernel.org Subject: [PATCH v4 07/26] mm/hexagon: Use general page fault accounting Date: Tue, 30 Jun 2020 16:45:19 -0400 Message-Id: <20200630204519.38809-1-peterx@redhat.com> X-Mailer: git-send-email 2.26.2 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: 0B05C1814B0C9 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam05 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 f12f330e7946..ef32c5a84ff3 100644 --- a/arch/hexagon/mm/vm_fault.c +++ b/arch/hexagon/mm/vm_fault.c @@ -18,6 +18,7 @@ #include #include #include +#include =20 /* * Decode of hardware exception sends us to one of several @@ -53,6 +54,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: mmap_read_lock(mm); vma =3D find_vma(mm, address); @@ -88,7 +91,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; @@ -96,10 +99,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