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 A2F69C433E1 for ; Fri, 19 Jun 2020 16:07:15 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 6830221532 for ; Fri, 19 Jun 2020 16:07:15 +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="JCwtbhpb" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6830221532 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 12F408D00B3; Fri, 19 Jun 2020 12:07:15 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0E01C8D00AD; Fri, 19 Jun 2020 12:07:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F361A8D00B3; Fri, 19 Jun 2020 12:07:14 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0219.hostedemail.com [216.40.44.219]) by kanga.kvack.org (Postfix) with ESMTP id D8EB88D00AD for ; Fri, 19 Jun 2020 12:07:14 -0400 (EDT) Received: from smtpin04.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 96A0A180AE5B3 for ; Fri, 19 Jun 2020 16:07:14 +0000 (UTC) X-FDA: 76946440788.04.coat20_1417ea726e1a Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin04.hostedemail.com (Postfix) with ESMTP id 9DB878136B5B for ; Fri, 19 Jun 2020 16:05:48 +0000 (UTC) X-HE-Tag: coat20_1417ea726e1a X-Filterd-Recvd-Size: 5703 Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by imf50.hostedemail.com (Postfix) with ESMTP for ; Fri, 19 Jun 2020 16:05:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592582747; 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=QX5XNFqam9mdd/6wKfca40oUCGNepMLO5UWfniIypyY=; b=JCwtbhpbTL3hXCLCo5tnZXDPeaLxRi1ePeKKXUGk5Sr/r17V2tXbNeL8urAWT/6P/dcJV4 imZHLaSidqjdoP9+GJvCrXxGwRGyBxpYCGdFAJML6Oy8Af8fijwWUZaxuNqmnxB1PZlapc ahw0pPPc8gmOy99p7bst7oKz/lSLIbk= 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-43-jFnu6bNKNMKZMA2yy23c9g-1; Fri, 19 Jun 2020 12:05:46 -0400 X-MC-Unique: jFnu6bNKNMKZMA2yy23c9g-1 Received: by mail-qk1-f198.google.com with SMTP id x22so7442702qkj.6 for ; Fri, 19 Jun 2020 09:05:46 -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=QX5XNFqam9mdd/6wKfca40oUCGNepMLO5UWfniIypyY=; b=Q2HiN/v+udCAcjQX5D8RsMW5GmwDZFitpGCwY6SdxoyTGVECYZQywmcOU7AxvY6aI9 QV9GdRcCD28sbLeM/eut0KaECSrzX1kwP3cjmC1/Sb+I/FjMMmxuP+h8V+pzBsMGULjz 0CnpYU4riTWgM40wBm/VG1+nMYUlPcEVamf1YGEU7i+jyyaztyveVLgegE89LlBdj90B VmsFvfqnn9T/S2DLygpeUcI3OMyL8UNgWiAPUyQXuO/7gXh7mai21zMX/zhGYHBnb4ww hnX/EQg98DFrYRnNyNyrrubfiRATYG18NVm+Dg5M/Ylck+dSCEUQzenz15ZuNlgS1TFL P2CQ== X-Gm-Message-State: AOAM5334kJGYywCViw2Ecn9gzKxKOWLdQQuF7RfkamYy+/+k53/fnErV qOZRK0nCE/FY0GPJ62QYZXzBzJ1yHuciiissU0UoT/8gu2NraJUhopUzg+4Sfk/411/9I8AOFYT 9He4ZUSRW1Ao= X-Received: by 2002:ae9:df84:: with SMTP id t126mr4010338qkf.420.1592582743582; Fri, 19 Jun 2020 09:05:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxXJk79qIDPkgg9Bu+gM9Xo3p9+ll31vLKTGG+uA4L1k/Aqbh37gU+sPivXDad1xaGVNQjOFg== X-Received: by 2002:ae9:df84:: with SMTP id t126mr4010307qkf.420.1592582743346; Fri, 19 Jun 2020 09:05:43 -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.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jun 2020 09:05:42 -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 , Richard Henderson , Ivan Kokshaysky , Matt Turner , linux-alpha@vger.kernel.org Subject: [PATCH 02/26] mm/alpha: Use general page fault accounting Date: Fri, 19 Jun 2020 12:05:14 -0400 Message-Id: <20200619160538.8641-3-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: 9DB878136B5B 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(). 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: Richard Henderson CC: Ivan Kokshaysky CC: Matt Turner CC: linux-alpha@vger.kernel.org Signed-off-by: Peter Xu --- arch/alpha/mm/fault.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c index 82e72f24486e..2e325af081bc 100644 --- a/arch/alpha/mm/fault.c +++ b/arch/alpha/mm/fault.c @@ -25,6 +25,7 @@ #include #include #include +#include =20 extern void die_if_kernel(char *,struct pt_regs *,long, unsigned long *)= ; =20 @@ -116,6 +117,7 @@ do_page_fault(unsigned long address, unsigned long mm= csr, #endif 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); @@ -148,7 +150,7 @@ do_page_fault(unsigned long address, unsigned long mm= csr, /* If for any reason at all we couldn't handle the fault, make sure we exit gracefully rather than endlessly redo the fault. */ - 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; @@ -164,10 +166,6 @@ do_page_fault(unsigned long address, unsigned long m= mcsr, } =20 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; =20 --=20 2.26.2