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,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 16D13C433E3 for ; Fri, 26 Jun 2020 22:36:44 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id C117C20FC3 for ; Fri, 26 Jun 2020 22:36:43 +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="Zp2qBqBW" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C117C20FC3 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 762446B002D; Fri, 26 Jun 2020 18:36:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6C3EF6B002E; Fri, 26 Jun 2020 18:36:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5D6C96B002F; Fri, 26 Jun 2020 18:36:41 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0066.hostedemail.com [216.40.44.66]) by kanga.kvack.org (Postfix) with ESMTP id 3E0776B002D for ; Fri, 26 Jun 2020 18:36:41 -0400 (EDT) Received: from smtpin16.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id EBAA21EE6 for ; Fri, 26 Jun 2020 22:36:40 +0000 (UTC) X-FDA: 76972823760.16.cook20_2207ab826e59 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin16.hostedemail.com (Postfix) with ESMTP id C04F0100E690C for ; Fri, 26 Jun 2020 22:36:40 +0000 (UTC) X-HE-Tag: cook20_2207ab826e59 X-Filterd-Recvd-Size: 5088 Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by imf46.hostedemail.com (Postfix) with ESMTP for ; Fri, 26 Jun 2020 22:36:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593210999; 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=hHOoOMvKCdAD0ZPNXEYJ7zwb9/Vhd5GoKeFrCVrHadg=; b=Zp2qBqBWGZ6ucJ1dbQbPOscJGvjQEdTBpH1GJE7tQ1zbybbeIUNGYnwSxYIhFWRioDZauf gtDCRNBHbHDX2m7vg9Y5dgNhz72mzKdEKKTaNJwvsS5ihbVGATz8Yxho1hc8GuyhqmYVCF JUjKcApB4Pt5//aH1PIu/GhorS7yuqA= 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-5-XrGh1CVNOl2zN506IBzp9Q-1; Fri, 26 Jun 2020 18:36:38 -0400 X-MC-Unique: XrGh1CVNOl2zN506IBzp9Q-1 Received: by mail-qv1-f69.google.com with SMTP id r19so7232881qvz.7 for ; Fri, 26 Jun 2020 15:36:38 -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=hHOoOMvKCdAD0ZPNXEYJ7zwb9/Vhd5GoKeFrCVrHadg=; b=nDeJrT8ZBdxHKwpHzYgCLGSx/0dkQIE+Xi5aaK9jZtPckzjLN+y7hjCvXsXD9t48x3 2oi111aglFi8GnIty4yNPlhiTXRhQTZnymEqUMXaoPx/akbeQdqwOgu3wpI7oHNdAZjV PEdDI5NzG2XpqNXxufE4NU866nUUuYPVvX6mPoR5DQ2zts+ZQ2DgoJBvg5mXyehsgSE5 0MmLlp8QVvKaM4njCuTZgd+w+TP2vzmDboZ4318v3oHF4r3ql+xDMYReBndH1dzex1kY oTmt8tPV5Zvyh5g2NYhodRDW9J94NqjNUEwn6xyYB2pFk/Qwok4Xo0WsXwOhddcHm2Bt XT5g== X-Gm-Message-State: AOAM533jVXFeFXbUgVSpkg/PjiKXYIBgcXIZ8RDnFNYys/Hv1zUtucQq wTZf9wFY7VOLqbV4Ch4BN7O656S6YKF8RBLrjTLUEZKLXET62CubmnH7+IXIMPXkVGAFEIPHTsZ /IgcLfFbDVqE= X-Received: by 2002:ad4:57c4:: with SMTP id y4mr5199979qvx.230.1593210997678; Fri, 26 Jun 2020 15:36:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx/5lWOLerE4xAFoxX4WH4c6jdmotNqRUcy+IApq6fCmSyWwwC40kou+k60M+HXuwatmhRgOA== X-Received: by 2002:ad4:57c4:: with SMTP id y4mr5199965qvx.230.1593210997481; Fri, 26 Jun 2020 15:36:37 -0700 (PDT) Received: from xz-x1.redhat.com ([2607:9880:19c0:32::2]) by smtp.gmail.com with ESMTPSA id c27sm9546702qka.23.2020.06.26.15.36.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2020 15:36:36 -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 , "David S . Miller" , sparclinux@vger.kernel.org Subject: [PATCH 21/26] mm/sparc64: Use general page fault accounting Date: Fri, 26 Jun 2020 18:36:35 -0400 Message-Id: <20200626223635.200006-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 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: C04F0100E690C X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam05 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. CC: David S. Miller CC: sparclinux@vger.kernel.org Signed-off-by: Peter Xu --- arch/sparc/mm/fault_64.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c index 6b702a0a8155..fe8854d447ed 100644 --- a/arch/sparc/mm/fault_64.c +++ b/arch/sparc/mm/fault_64.c @@ -423,7 +423,7 @@ asmlinkage void __kprobes do_sparc64_fault(struct pt_= regs *regs) goto bad_area; } =20 - 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)) goto exit_exception; @@ -439,15 +439,6 @@ asmlinkage void __kprobes do_sparc64_fault(struct pt= _regs *regs) } =20 if (flags & FAULT_FLAG_ALLOW_RETRY) { - if (fault & VM_FAULT_MAJOR) { - current->maj_flt++; - perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MAJ, - 1, regs, address); - } else { - current->min_flt++; - perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MIN, - 1, regs, address); - } if (fault & VM_FAULT_RETRY) { flags |=3D FAULT_FLAG_TRIED; =20 --=20 2.26.2