From patchwork Fri Jun 19 16:13:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 11614535 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 3C28314B7 for ; Fri, 19 Jun 2020 16:13:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 208B9217A0 for ; Fri, 19 Jun 2020 16:13:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="E2Bt/kk3" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404361AbgFSQN0 (ORCPT ); Fri, 19 Jun 2020 12:13:26 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:40978 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2394381AbgFSQNY (ORCPT ); Fri, 19 Jun 2020 12:13:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592583203; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eYfbH2Z9PmFD3YC1EEjF5e5lSljD0oX0ZInZG0GJcWM=; b=E2Bt/kk3UazV2elMUPc0lQ9Nx8Tu31D6wZGh7wo06a0tRQu5SA4Co1Jc8BdE3VnzsLXwKN eh9XMP6JPrdLVM0f4OyNALtbWJVnr3bP+oAkN+7desZwj1HPR2KggtRd5u6dKE/bSfjEdi koTC2WC28juHGa3RMzrD2LDBAjyv7eA= Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-90-zoIEix9uOYeRwqUlwxlMlg-1; Fri, 19 Jun 2020 12:13:21 -0400 X-MC-Unique: zoIEix9uOYeRwqUlwxlMlg-1 Received: by mail-qt1-f198.google.com with SMTP id s30so4442471qts.18 for ; Fri, 19 Jun 2020 09:13:21 -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=eYfbH2Z9PmFD3YC1EEjF5e5lSljD0oX0ZInZG0GJcWM=; b=H4qYLBvgW11REbjL85aF4QupmKd8w/lGIbj3Fdz+8NKv8c5Vx7zxqk48dfzMDiJ5Kf oz79941q/uVaQEYGX2fuG6/o2MqQNL8X0IsM3n+O5Bh5NerLNMpBivxaY92NoBSYvOE1 DkHlG0iCR0wPnkGvlNNhtub4KxEuwP8lhLsmdODvbVP2YsidV4Ah4HKU2g9EAb0iLPIZ yqSJZkQgqOSV6/xcOBv7IkH2QJ4eMUEY6fyqwnggrqYme4Jtei34pxnpHynb8eVSyLKS jRfFRVoIZekbPp/jtgljqPKG1w3bngxts+vnpbjllJLN7uH/HQCD6ihpkn0aJX3uxjM2 5GNQ== X-Gm-Message-State: AOAM533EYdnlA8Bc5cJC7UxKQIGCWXu2KxK++ifbcWydm4QfXdJer9GZ /Ggh0t1tB+40DLURLxSrZw5rh4LUEoTLsWrSbObJxN2Bcz8k0rzl+Qo9FZrQg4jynhk7yVG1Bnp Dg2aXTW/0ZQQaCe4r6g0hEqOp X-Received: by 2002:a37:5d6:: with SMTP id 205mr4101507qkf.46.1592583200973; Fri, 19 Jun 2020 09:13:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx+/kXn6XM9J3AHchJ11d9906jc9OEfvlqbxTG9lTxQJaaFL7aW/z0ASmv5F6WdZBp/RES2MA== X-Received: by 2002:a37:5d6:: with SMTP id 205mr4101475qkf.46.1592583200713; Fri, 19 Jun 2020 09:13:20 -0700 (PDT) Received: from xz-x1.redhat.com ([2607:9880:19c0:32::2]) by smtp.gmail.com with ESMTPSA id c83sm7040588qkb.75.2020.06.19.09.13.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jun 2020 09:13:20 -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 , "James E . J . Bottomley" , Helge Deller , linux-parisc@vger.kernel.org Subject: [PATCH 15/26] mm/parisc: Use general page fault accounting Date: Fri, 19 Jun 2020 12:13:18 -0400 Message-Id: <20200619161318.9492-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 Sender: linux-parisc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-parisc@vger.kernel.org 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. Add the missing PERF_COUNT_SW_PAGE_FAULTS perf events too. Note, the other two perf events (PERF_COUNT_SW_PAGE_FAULTS_[MAJ|MIN]) were done in handle_mm_fault(). CC: James E.J. Bottomley CC: Helge Deller CC: linux-parisc@vger.kernel.org Signed-off-by: Peter Xu --- arch/parisc/mm/fault.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c index c10908ea8803..65661e22678e 100644 --- a/arch/parisc/mm/fault.c +++ b/arch/parisc/mm/fault.c @@ -18,6 +18,7 @@ #include #include #include +#include #include @@ -281,6 +282,7 @@ void do_page_fault(struct pt_regs *regs, unsigned long code, acc_type = parisc_acctyp(code, regs->iir); if (acc_type & VM_WRITE) flags |= FAULT_FLAG_WRITE; + perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, address); retry: down_read(&mm->mmap_sem); vma = find_vma_prev(mm, address, &prev_vma); @@ -302,7 +304,7 @@ void do_page_fault(struct pt_regs *regs, unsigned long code, * fault. */ - fault = handle_mm_fault(vma, address, flags, NULL); + fault = handle_mm_fault(vma, address, flags, regs); if (fault_signal_pending(fault, regs)) return; @@ -323,10 +325,6 @@ void do_page_fault(struct pt_regs *regs, unsigned long code, BUG(); } if (flags & FAULT_FLAG_ALLOW_RETRY) { - if (fault & VM_FAULT_MAJOR) - current->maj_flt++; - else - current->min_flt++; if (fault & VM_FAULT_RETRY) { /* * No need to up_read(&mm->mmap_sem) as we would