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 A4561C433E0 for ; Fri, 19 Jun 2020 16:14:21 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 699A221707 for ; Fri, 19 Jun 2020 16:14:21 +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="DwWexxyE" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 699A221707 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 17BFD8D00C6; Fri, 19 Jun 2020 12:14:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0DDD98D00AD; Fri, 19 Jun 2020 12:14:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EC0778D00C6; Fri, 19 Jun 2020 12:14:20 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0023.hostedemail.com [216.40.44.23]) by kanga.kvack.org (Postfix) with ESMTP id CEE6D8D00AD for ; Fri, 19 Jun 2020 12:14:20 -0400 (EDT) Received: from smtpin23.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 80D6D181AC9CC for ; Fri, 19 Jun 2020 16:14:20 +0000 (UTC) X-FDA: 76946458680.23.trail34_030585626e1a Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin23.hostedemail.com (Postfix) with ESMTP id D00E937612 for ; Fri, 19 Jun 2020 16:14:00 +0000 (UTC) X-HE-Tag: trail34_030585626e1a X-Filterd-Recvd-Size: 5777 Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by imf25.hostedemail.com (Postfix) with ESMTP for ; Fri, 19 Jun 2020 16:14:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592583239; 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=hAWzjcK11ehl6Ry1XWEz8DeKxbF5tzxJ+GAj1+W4u20=; b=DwWexxyE6eqggTsL7gUgDOtnqzTgDrpNYzgZ1n6IeR8T7dUKyho3Sj69uT9zH8oACibyx+ QYBwyfgPClXqf96EPOF0zTMX1SnrI9Ef+JPvV5C/S7oRVsNHckBcQe+KHOAKck+QRB0Yji z5SumLMufTcupuMhBkxhDL+xsGTbXAY= Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-395-RAtQU-J_Ms2ATfA9DEvsfw-1; Fri, 19 Jun 2020 12:13:58 -0400 X-MC-Unique: RAtQU-J_Ms2ATfA9DEvsfw-1 Received: by mail-qt1-f199.google.com with SMTP id q21so7446822qtn.20 for ; Fri, 19 Jun 2020 09:13:58 -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=hAWzjcK11ehl6Ry1XWEz8DeKxbF5tzxJ+GAj1+W4u20=; b=sl1mQcqBrcclWB9onDY+CnCchZRj0Kq1kK4dQuyq3Nnm7qGqSBkoEnEZhJ0ka3Pk6d FT8ufpWb2rpJCQJo/5jGiZLr+Nqj91ckdtTgRMoeNts2oVppFjw2ooOTRPpWbx9r1EX2 PpRl3rAjaQA5X+LK0li5KrCqRURx3xP/2hQkRB+h1TeKg0bl6dct8LnPiiyjLfAbXz4W XZJrJwBn8umiAApawdKzNpu4g6eOVU0prWz3RODRkj5FXIDV7nm8GP9hFpAC4bovlXsb eOxXGhrMAmVTd+/wcVJgsnaI4OSc7DpODxUkoEPXzVVYP2pK+oN5cwZmlNIlbdzNAe91 pUQw== X-Gm-Message-State: AOAM533lbGShxI3oOvZ7E/YfFnB/6haYCnaz3oaT9S2cGMbvl+4C/JrC o9g6RIxZbnvu0oJmBCfD3tTQNjh+DEjV9dSucLVGScoCSFdaqSTprZIOWZYFo6MWPodTYvRIouL L6pWvjUPEtw8= X-Received: by 2002:a05:620a:16b7:: with SMTP id s23mr4396634qkj.142.1592583237971; Fri, 19 Jun 2020 09:13:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzvBwhl7EOG8ylIuxoeyJJKEMjZ8bo+nIfzIN7OFxYP9urzZkDH6dVu5uteKX7SDFgvKlBOUw== X-Received: by 2002:a05:620a:16b7:: with SMTP id s23mr4396588qkj.142.1592583237551; Fri, 19 Jun 2020 09:13:57 -0700 (PDT) Received: from xz-x1.redhat.com ([2607:9880:19c0:32::2]) by smtp.gmail.com with ESMTPSA id i40sm7809041qte.67.2020.06.19.09.13.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jun 2020 09:13:56 -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 , Dave Hansen , Andy Lutomirski , Peter Zijlstra , Thomas Gleixner , Ingo Molnar , Borislav Petkov , x86@kernel.org, "H . Peter Anvin" Subject: [PATCH 23/26] mm/x86: Use general page fault accounting Date: Fri, 19 Jun 2020 12:13:54 -0400 Message-Id: <20200619161354.9907-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 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII X-Rspamd-Queue-Id: D00E937612 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam04 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(). CC: Dave Hansen CC: Andy Lutomirski CC: Peter Zijlstra CC: Thomas Gleixner CC: Ingo Molnar CC: Borislav Petkov CC: x86@kernel.org CC: H. Peter Anvin Signed-off-by: Peter Xu --- arch/x86/mm/fault.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index 3e27ed85af06..4604755a303d 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c @@ -1309,7 +1309,7 @@ void do_user_addr_fault(struct pt_regs *regs, struct vm_area_struct *vma; struct task_struct *tsk; struct mm_struct *mm; - vm_fault_t fault, major =3D 0; + vm_fault_t fault; unsigned int flags =3D FAULT_FLAG_DEFAULT; =20 tsk =3D current; @@ -1461,8 +1461,7 @@ void do_user_addr_fault(struct pt_regs *regs, * userland). The return to userland is identified whenever * FAULT_FLAG_USER|FAULT_FLAG_KILLABLE are both set in flags. */ - fault =3D handle_mm_fault(vma, address, flags, NULL); - major |=3D fault & VM_FAULT_MAJOR; + fault =3D handle_mm_fault(vma, address, flags, regs); =20 /* Quick path to respond to signals */ if (fault_signal_pending(fault, regs)) { @@ -1489,18 +1488,6 @@ void do_user_addr_fault(struct pt_regs *regs, return; } =20 - /* - * Major/minor page fault accounting. If any of the events - * returned VM_FAULT_MAJOR, we account it as a major fault. - */ - if (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); - } - check_v8086_mode(regs, address, tsk); } NOKPROBE_SYMBOL(do_user_addr_fault); --=20 2.26.2