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 DCD7DC433F1 for ; Tue, 30 Jun 2020 20:46:09 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 9CFFD20772 for ; Tue, 30 Jun 2020 20:46:09 +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="hhmpEFw7" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9CFFD20772 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 1B13E6B0071; Tue, 30 Jun 2020 16:46:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 161636B0073; Tue, 30 Jun 2020 16:46:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 050906B0074; Tue, 30 Jun 2020 16:46:09 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0098.hostedemail.com [216.40.44.98]) by kanga.kvack.org (Postfix) with ESMTP id E488B6B0071 for ; Tue, 30 Jun 2020 16:46:08 -0400 (EDT) Received: from smtpin11.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id A4CF61EE6 for ; Tue, 30 Jun 2020 20:46:08 +0000 (UTC) X-FDA: 76987060416.11.trick99_510eab426e7a Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin11.hostedemail.com (Postfix) with ESMTP id 81C5E180F8B86 for ; Tue, 30 Jun 2020 20:46:08 +0000 (UTC) X-HE-Tag: trick99_510eab426e7a X-Filterd-Recvd-Size: 5721 Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by imf14.hostedemail.com (Postfix) with ESMTP for ; Tue, 30 Jun 2020 20:46:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593549967; 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=xKTka6Ypb97PfFs9wakfoxiGbE9LtmEFf0rRmXaAIMo=; b=hhmpEFw71eAdiIjkf8T7wYQNdYWeYnDHncwqYwXQS+fHoZlqITSAXrrKUPvVFKX+JR98nC ELjIUciKhB/RZwBm8ia3sTXSxeIuybm2+YP6/gC5/aFQ0MkM1sC4pFj0kbvmkbkQu+TgtU e/rK7pIhBlOg2MP8hO6If/6h+maxGEw= Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-505-OshcrN7JOzKBlk6S8HWUKA-1; Tue, 30 Jun 2020 16:46:05 -0400 X-MC-Unique: OshcrN7JOzKBlk6S8HWUKA-1 Received: by mail-qv1-f69.google.com with SMTP id g17so12886336qvw.0 for ; Tue, 30 Jun 2020 13:46:05 -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=xKTka6Ypb97PfFs9wakfoxiGbE9LtmEFf0rRmXaAIMo=; b=FYWTS0/C5IBdxaBwdOv/zRIb6NffTPfqV6BX45Zm2TlLCHz7G5qWaWirpxdn7yZDFm zH/ZYn6yAv35/oUMqNMyCHWWDRPi0xV56vj8TTQbOqxd6JN4v2C8Msx37np84WlxhFc+ rzWap6VI4ScAf05UmaXKSTHsn2wRJtXFJ/IGYIVwZBsIqcc6vTIYiqgQQSmmDNKc+m1u R9hSyItd7TAd/C3WNOK6iTUhXw3BMSejDwl1k6ja1vSFejIlklEEhuUGWiEt7kNG4VSH J49zh6gHUc6faLvkQp3eTUsB0eoQTSrxxUPGOY1nQsTGvR9cuTzCU8zlyAmfbTahaWiy V/nQ== X-Gm-Message-State: AOAM530ZnUiTZ/SKEJX2W+VCeWrFrtWXLw5tTG1ggqkFc7K4FauxcPpB 4iM0XB5gJ/tDMPqcORrK3R4Q4VvlDFwHyO0ruqm08Xa9UbLRewaE1axZCyU7XKQGPm75Z8jmZxG NbcqrHEdZ6cM= X-Received: by 2002:aed:2b04:: with SMTP id p4mr22839474qtd.158.1593549964730; Tue, 30 Jun 2020 13:46:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxZVq5ZLv/tiefIstP8J/VIwICsvgCu20sWu/3kRcEuyQrKCd+/O7fDLZCFxom05nNc25pjGA== X-Received: by 2002:aed:2b04:: with SMTP id p4mr22839427qtd.158.1593549964186; Tue, 30 Jun 2020 13:46:04 -0700 (PDT) Received: from xz-x1.redhat.com ([2607:9880:19c0:32::2]) by smtp.gmail.com with ESMTPSA id u58sm4071887qth.77.2020.06.30.13.46.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2020 13:46:03 -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 , Dave Hansen , Andy Lutomirski , Peter Zijlstra , Thomas Gleixner , Ingo Molnar , Borislav Petkov , x86@kernel.org, "H . Peter Anvin" Subject: [PATCH v4 23/26] mm/x86: Use general page fault accounting Date: Tue, 30 Jun 2020 16:46:01 -0400 Message-Id: <20200630204601.39591-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: 81C5E180F8B86 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(). 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 fe3ca00eb121..9ac80bb87781 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c @@ -1140,7 +1140,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; @@ -1292,8 +1292,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)) { @@ -1320,18 +1319,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