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 23F54C433E2 for ; Tue, 7 Jul 2020 22:50:56 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id D7CB92085B for ; Tue, 7 Jul 2020 22:50:55 +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="TAs3d0lf" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D7CB92085B 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 9076F6B00B7; Tue, 7 Jul 2020 18:50:47 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8932B6B00B9; Tue, 7 Jul 2020 18:50:47 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 692C86B00BA; Tue, 7 Jul 2020 18:50:47 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0101.hostedemail.com [216.40.44.101]) by kanga.kvack.org (Postfix) with ESMTP id 506B46B00B7 for ; Tue, 7 Jul 2020 18:50:47 -0400 (EDT) Received: from smtpin25.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 1BD68180AD806 for ; Tue, 7 Jul 2020 22:50:47 +0000 (UTC) X-FDA: 77012776134.25.hall56_1f0e7a826eb8 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin25.hostedemail.com (Postfix) with ESMTP id D906B1804E3A8 for ; Tue, 7 Jul 2020 22:50:46 +0000 (UTC) X-HE-Tag: hall56_1f0e7a826eb8 X-Filterd-Recvd-Size: 6029 Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by imf31.hostedemail.com (Postfix) with ESMTP for ; Tue, 7 Jul 2020 22:50:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594162245; 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=/WN5suCL4vjaI1eJdzhaIBmykla0j2zqu4dhyFqEqPg=; b=TAs3d0lfBg/rKkGBPN42dd2Z+0ejwl5/iIhJiKajdPfUjK4DwGfKhEIjto0vACglOyUU+o lNStu/uUYl7ejFcoiEFpJqhWC4CA06mDTCl6hnSg5DDRKCVJxqsFkddExhhHVIq4U+n2Fn GzVHrhjLFUUCfjSn9y6b7wthPd4VZJQ= Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-143-4ikJUOmXMjSwEdoixrkUVg-1; Tue, 07 Jul 2020 18:50:44 -0400 X-MC-Unique: 4ikJUOmXMjSwEdoixrkUVg-1 Received: by mail-qk1-f198.google.com with SMTP id 204so29653255qki.20 for ; Tue, 07 Jul 2020 15:50: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=/WN5suCL4vjaI1eJdzhaIBmykla0j2zqu4dhyFqEqPg=; b=Xu+SQNCKkn4zIL1M09Xpsq8CDmbkf/QhfFFubZn+CCbrQl5+nvsYIqOBsypnqqmDC5 Vtpn7RJw4Dc/jr6SYdzAIdVmxQlWVO2a9DOEokkx5gH4FzEy9cY/ti/MnJ+pmuiaXTgy gGUZ/tR65nZQnvjGhj+KT7ZiENxgYh5e1MzyIhbf75oh8ygqWVLvdGVZpTGLj3WXVbs1 ai77Kl+dAVHVTHpA27DSPmJdV2p8Dz9kF6/qmc/wFhX4IzG1JOMX9WuFCsUkrxnwmsYU pSZk0ZCgO6CzOmVt5fwjI7hrTcwYO73LYV+xySxlfV+aMBT9yTxvS6Owp5EuZE4yJaIl oUDw== X-Gm-Message-State: AOAM533ubUBoB8OcllznlDMfrfzRGZBFuVdILY/LX0ZoNcqQVVpI4ae6 uov0P4WEq68PQAfmp5gEmLKeABN+jaU2xaa1kyGZb9PxVpj2EcdlWUPXF2r9GLsRqORo0pQq8HJ DzyhVq91E2WI= X-Received: by 2002:ad4:5912:: with SMTP id ez18mr44655480qvb.24.1594162243936; Tue, 07 Jul 2020 15:50:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyCsUVFm5+NKahCqT/VXt5L+qHNyxIcGiPL88zMsimW5b6qIOMZxSStxnN8FyeLMPOOGmbLRQ== X-Received: by 2002:ad4:5912:: with SMTP id ez18mr44655458qvb.24.1594162243712; Tue, 07 Jul 2020 15:50:43 -0700 (PDT) Received: from xz-x1.redhat.com ([2607:9880:19c0:32::2]) by smtp.gmail.com with ESMTPSA id j16sm26267642qtp.92.2020.07.07.15.50.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jul 2020 15:50:43 -0700 (PDT) From: Peter Xu To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: Gerald Schaefer , Linus Torvalds , peterx@redhat.com, Andrew Morton , Will Deacon , Andrea Arcangeli , David Rientjes , John Hubbard , Michael Ellerman , Nick Hu , Greentime Hu , Vincent Chen Subject: [PATCH v5 12/25] mm/nds32: Use general page fault accounting Date: Tue, 7 Jul 2020 18:50:08 -0400 Message-Id: <20200707225021.200906-13-peterx@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200707225021.200906-1-peterx@redhat.com> References: <20200707225021.200906-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: D906B1804E3A8 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. Fix PERF_COUNT_SW_PAGE_FAULTS perf event manually for page fault retries,= by moving it before taking mmap_sem. CC: Nick Hu CC: Greentime Hu CC: Vincent Chen Acked-by: Greentime Hu Signed-off-by: Peter Xu --- arch/nds32/mm/fault.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/arch/nds32/mm/fault.c b/arch/nds32/mm/fault.c index d0ecc8fb5b23..f02524eb6d56 100644 --- a/arch/nds32/mm/fault.c +++ b/arch/nds32/mm/fault.c @@ -121,6 +121,8 @@ void do_page_fault(unsigned long entry, unsigned long= addr, if (unlikely(faulthandler_disabled() || !mm)) goto no_context; =20 + perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, addr); + /* * As per x86, we may deadlock here. However, since the kernel only * validly references user space from well defined areas of the code, @@ -206,7 +208,7 @@ void do_page_fault(unsigned long entry, unsigned long= addr, * the fault. */ =20 - fault =3D handle_mm_fault(vma, addr, flags, NULL); + fault =3D handle_mm_fault(vma, addr, flags, regs); =20 /* * If we need to retry but a fatal signal is pending, handle the @@ -228,22 +230,7 @@ void do_page_fault(unsigned long entry, unsigned lon= g addr, goto bad_area; } =20 - /* - * Major/minor page fault accounting is only done on the initial - * attempt. If we go through a retry, it is extremely likely that the - * page will be found in page cache at that point. - */ - perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, addr); if (flags & FAULT_FLAG_ALLOW_RETRY) { - if (fault & VM_FAULT_MAJOR) { - tsk->maj_flt++; - perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MAJ, - 1, regs, addr); - } else { - tsk->min_flt++; - perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MIN, - 1, regs, addr); - } if (fault & VM_FAULT_RETRY) { flags |=3D FAULT_FLAG_TRIED; =20 --=20 2.26.2