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 61D61C433E2 for ; Tue, 30 Jun 2020 20:45:18 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 2211720663 for ; Tue, 30 Jun 2020 20:45:18 +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="ISsN1LUt" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2211720663 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 4C47C6B000D; Tue, 30 Jun 2020 16:45:17 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 35ED36B000E; Tue, 30 Jun 2020 16:45:17 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1D7196B0010; Tue, 30 Jun 2020 16:45:17 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0202.hostedemail.com [216.40.44.202]) by kanga.kvack.org (Postfix) with ESMTP id 090E46B000D for ; Tue, 30 Jun 2020 16:45:17 -0400 (EDT) Received: from smtpin09.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id B1836181AC9CC for ; Tue, 30 Jun 2020 20:45:16 +0000 (UTC) X-FDA: 76987058232.09.judge21_3e0f0d726e7a Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin09.hostedemail.com (Postfix) with ESMTP id 8B254180AD806 for ; Tue, 30 Jun 2020 20:45:16 +0000 (UTC) X-HE-Tag: judge21_3e0f0d726e7a X-Filterd-Recvd-Size: 5542 Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by imf35.hostedemail.com (Postfix) with ESMTP for ; Tue, 30 Jun 2020 20:45:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593549915; 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=6LDTI5CbN1iafPepx0N8aCOkAEGCgmTd74bKKgxee6w=; b=ISsN1LUtv6O+PsgwMA0Emssc9IBClGX74bPDCw14woNBg8/hU6eRon1z+613Xknc/JfDrK 85bhq23eFrSUqhaekA+IN4ltS/lWIoeMvvkHN3GcIuyevFzjXm/KdEdMwCbb+zFxu/9HkP jf2io1EZHChOlyRcHvvi2J7552+c5aA= 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-438-pugBLAVcMk-1EgQUT2H18Q-1; Tue, 30 Jun 2020 16:45:13 -0400 X-MC-Unique: pugBLAVcMk-1EgQUT2H18Q-1 Received: by mail-qt1-f197.google.com with SMTP id c22so15313675qtp.9 for ; Tue, 30 Jun 2020 13:45:13 -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=6LDTI5CbN1iafPepx0N8aCOkAEGCgmTd74bKKgxee6w=; b=KtdUU/QRerNFBQNZF/zjAef6gvpYK1wAeY9FMB7EHNntsAS6M/dRZrJuXwep/Sj/XX vxrnQpjP6VD2U79PjdZ9gvspL3A6y8iF6sLbRx6uFJYDFaEeKNC4j9Sb1E6s+C0CVOZM 1Ryp6L0jSEJNFf5PCRKC1bqSo/2Ch8hGR+/1IvLY0YOOivZIzt+XO12UFH3bcCUBZ841 9CAIOOy84kMF2mDHfVIRoAqDQnHWzo+wfNZZj+lADgSzq9Ne2BS1/7hNGKcoLmOYhTma qK52IaTQOPIZBrhpRY3ZjMxbbmOQ0A5C/l3frLl68vvEahvEUi+OOWVXPevwtAOKr5Sk y4Vg== X-Gm-Message-State: AOAM530bOzWBCwV3+Y/RzQtKkSga3eud54FNOHLM2CnzFyXEKlBZMKfs SB+9ayS2S7Ct6H8q87c6DRokioICkdCh8YvzOxHFbO+Wztj9T/nR+f/UUMH1J0wlXf4dL5sbTxU g7eNBn8JuEkI= X-Received: by 2002:a05:620a:1035:: with SMTP id a21mr20501597qkk.321.1593549913127; Tue, 30 Jun 2020 13:45:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx+kaBc9/kmTr6BNHfQkL+ErMO1IOKMu40pdoPLe9ogbLzCBmnzOfYZlcKb4wfLKTS9uQhctA== X-Received: by 2002:a05:620a:1035:: with SMTP id a21mr20501496qkk.321.1593549911595; Tue, 30 Jun 2020 13:45:11 -0700 (PDT) Received: from xz-x1.redhat.com ([2607:9880:19c0:32::2]) by smtp.gmail.com with ESMTPSA id x26sm3658652qtr.4.2020.06.30.13.45.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2020 13:45:11 -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 , Vineet Gupta , linux-snps-arc@lists.infradead.org Subject: [PATCH v4 03/26] mm/arc: Use general page fault accounting Date: Tue, 30 Jun 2020 16:45:09 -0400 Message-Id: <20200630204509.38615-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: 8B254180AD806 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam01 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. Fix PERF_COUNT_SW_PAGE_FAULTS perf event manually for page fault retries,= by moving it before taking mmap_sem. CC: Vineet Gupta CC: linux-snps-arc@lists.infradead.org Signed-off-by: Peter Xu --- arch/arc/mm/fault.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/arch/arc/mm/fault.c b/arch/arc/mm/fault.c index 1b178dc147fd..5601dec319b5 100644 --- a/arch/arc/mm/fault.c +++ b/arch/arc/mm/fault.c @@ -106,6 +106,7 @@ void do_page_fault(unsigned long address, struct pt_r= egs *regs) if (write) flags |=3D FAULT_FLAG_WRITE; =20 + perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, address); retry: mmap_read_lock(mm); =20 @@ -131,7 +132,7 @@ void do_page_fault(unsigned long address, struct pt_r= egs *regs) goto bad_area; } =20 - fault =3D handle_mm_fault(vma, address, flags, NULL); + fault =3D handle_mm_fault(vma, address, flags, regs); =20 /* Quick path to respond to signals */ if (fault_signal_pending(fault, regs)) { @@ -156,22 +157,9 @@ void do_page_fault(unsigned long address, struct pt_= regs *regs) * Major/minor page fault accounting * (in case of retry we only land here once) */ - perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, address); - - if (likely(!(fault & VM_FAULT_ERROR))) { - 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 (likely(!(fault & VM_FAULT_ERROR))) /* Normal return path: fault Handled Gracefully */ return; - } =20 if (!user_mode(regs)) goto no_context; --=20 2.26.2