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 CF665C433DF for ; Fri, 26 Jun 2020 22:36:48 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 83F2A20C09 for ; Fri, 26 Jun 2020 22:36:48 +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="f+iQtQhK" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 83F2A20C09 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 11C6C6B0032; Fri, 26 Jun 2020 18:36:47 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0F8616B0033; Fri, 26 Jun 2020 18:36:47 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 00D316B0036; Fri, 26 Jun 2020 18:36:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0042.hostedemail.com [216.40.44.42]) by kanga.kvack.org (Postfix) with ESMTP id D072E6B0032 for ; Fri, 26 Jun 2020 18:36:46 -0400 (EDT) Received: from smtpin13.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 8E1EB181ABE85 for ; Fri, 26 Jun 2020 22:36:46 +0000 (UTC) X-FDA: 76972824012.13.grass24_0317ff326e59 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin13.hostedemail.com (Postfix) with ESMTP id 60C0A18140B67 for ; Fri, 26 Jun 2020 22:36:46 +0000 (UTC) X-HE-Tag: grass24_0317ff326e59 X-Filterd-Recvd-Size: 5771 Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by imf37.hostedemail.com (Postfix) with ESMTP for ; Fri, 26 Jun 2020 22:36:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593211005; 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=f+iQtQhKRfR51waMV3clcFqxU50t5U5areYEEx2cyIZZZpJj609DfSbD77RHxFUmt5kJRH 1WKkzsEuT870b6V97p39uUox2u1GWwzfAlDjTahuKx9fWKmAt4/1j/E3IAUgrC8MrWWXIY lqQarx7SIuWuOBE3KjVCdOaNqCwI8f0= Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-496-zWZacFhJPEKckfYT4DeQew-1; Fri, 26 Jun 2020 18:36:43 -0400 X-MC-Unique: zWZacFhJPEKckfYT4DeQew-1 Received: by mail-qv1-f72.google.com with SMTP id y36so7341048qvf.21 for ; Fri, 26 Jun 2020 15:36:43 -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=mRlUdOJPyTtvuAalMV4A5P+XCGbimVW4ig/W1hkhcmbiROGprcJFTg90SdV/OPJ4or ys0LsbbD6SqhGvcf1VfnU5QL6sn/UjoIx89VorEKpkPpqWw1bl+vPZePm4MCgiEE8+Vm Kq8wJoeHFZpS84xjJTzgcMtXdIl6hzaXzHVGilIrrEr74EOx3i0A/gremTYWVYg4od99 tnIIa4EsTW4l01e5hVR9NN565XbCNnN4grsJVuavNgS+rvpt88dcVFhRQ7dNFWLYNnLk QPbYlgeVxmaI6GEvRNsQ2YJrO2NR5ev8KJC4girzVDR1pnEsaGGdHV1JtsraDMzkrg2U IUOQ== X-Gm-Message-State: AOAM532rwiR9sh6oEJncceoOJge17wk3Np56Ku33EB0Z4lhVlt5twg3N LAXB1gycfjsXoPmG3YGFz5xtlHHgrAmCYx+nv/mbamqXAQTJ722q6FKTJQ4JBpXTcmr/A+3kCnH LmUaokYhI4nI= X-Received: by 2002:a37:dcc3:: with SMTP id v186mr4840587qki.393.1593211003023; Fri, 26 Jun 2020 15:36:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyzPttymKb4wHJ717OK3QOtEVouZFuStnCrFtZdjLOL+RyVuNvJm1WtcwNW6WKTIt4lHH+smg== X-Received: by 2002:a37:dcc3:: with SMTP id v186mr4840562qki.393.1593211002808; Fri, 26 Jun 2020 15:36:42 -0700 (PDT) Received: from xz-x1.redhat.com ([2607:9880:19c0:32::2]) by smtp.gmail.com with ESMTPSA id k2sm9143410qkf.127.2020.06.26.15.36.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2020 15:36:42 -0700 (PDT) From: Peter Xu To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Peter Xu , Andrew Morton , Linus Torvalds , Gerald Schaefer , Andrea Arcangeli , Will Deacon , Michael Ellerman , 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, 26 Jun 2020 18:36:40 -0400 Message-Id: <20200626223640.200102-1-peterx@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200626223130.199227-1-peterx@redhat.com> References: <20200626223130.199227-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: 60C0A18140B67 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(). 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