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 D8FA2C433E1 for ; Fri, 26 Jun 2020 22:36:36 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 98D8E208C7 for ; Fri, 26 Jun 2020 22:36:36 +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="czSXhDqf" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 98D8E208C7 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 5DA4F6B0024; Fri, 26 Jun 2020 18:36:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 58AEC6B0027; Fri, 26 Jun 2020 18:36:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4776F6B002A; Fri, 26 Jun 2020 18:36:35 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0178.hostedemail.com [216.40.44.178]) by kanga.kvack.org (Postfix) with ESMTP id 2DCAB6B0024 for ; Fri, 26 Jun 2020 18:36:35 -0400 (EDT) Received: from smtpin29.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id E4C6B180AD82F for ; Fri, 26 Jun 2020 22:36:34 +0000 (UTC) X-FDA: 76972823508.29.word59_4b129b026e59 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin29.hostedemail.com (Postfix) with ESMTP id BDD6A18086CB5 for ; Fri, 26 Jun 2020 22:36:34 +0000 (UTC) X-HE-Tag: word59_4b129b026e59 X-Filterd-Recvd-Size: 5586 Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by imf17.hostedemail.com (Postfix) with ESMTP for ; Fri, 26 Jun 2020 22:36:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593210993; 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=cHCFBr0H2Wj98J64LoxM3OjPsGeWNQz7WDWbAHsmGis=; b=czSXhDqfr/NmdS02mqiXrfBnxzDowD+2CQN1524mSldLQfJ2NTr9qFEQ24qs3Hnbl+zLKL R7dhYnNC84uQNfP7OZ/wnc13CYTAMFV6GLMhmD+hi53VZbiwC7acBrDje2C3pH5hpLxw48 py/2Cf9ZQiXCnJz3G6WJB+LzPaRs1CA= Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-308-vTewPTolOrGg9spNxAgowA-1; Fri, 26 Jun 2020 18:36:31 -0400 X-MC-Unique: vTewPTolOrGg9spNxAgowA-1 Received: by mail-qt1-f200.google.com with SMTP id e4so7542418qtd.13 for ; Fri, 26 Jun 2020 15:36:31 -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=cHCFBr0H2Wj98J64LoxM3OjPsGeWNQz7WDWbAHsmGis=; b=Z1CDxSIHyVwMn6xW7r9mMbtwZLv2lwAGSpoMTYt3lk2tl2O+tMelXmdoUKRXzJnUbK Fvtz74KN6D/ezjT1mkRAgr2QYEKIAlluIhZB2a4vTXvJnmCLsyu4rrccX/au8n5GPMA/ 9yvnQ+hc/3bOvSHdPmlhVTmKEhAKAqrk8o3P8n4KG90vWSgcPG2/zyVSrAaL98XI9Nmf YNZ1wQbBnFhWSpxHcUP9AHOnoMnLZuYjnoKhhrkpfiy8zEaNhwlf8RH8ZJYhxx/OQdg5 +L3OqPo5hiEsh/GaBKvuA+mQII+Ld2+f41bIXApz6CbuNdz8OXx4uVE0PujBSvWZci5y azLQ== X-Gm-Message-State: AOAM533Jez4eRTvK3k8ATGuwOwsMLtHB9D8yedmtiEWS50O7GvDNG8RI 4tx0JPUS7F1fu5lckOZfBgbP3l4+MU3/rPDe4KVpPsbUVbePp0xGBv0zgBZdAhwR8t0hF+kUGKI MCj2J4b2wSNU= X-Received: by 2002:a05:620a:7ea:: with SMTP id k10mr4985249qkk.418.1593210990397; Fri, 26 Jun 2020 15:36:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyLYGq3uXNWtPIgvnBvBRj+uEHvatOJbgH7Twl/utY0PoQ7HyXhGFahIL8nucdp7+auhoYPqQ== X-Received: by 2002:a05:620a:7ea:: with SMTP id k10mr4985234qkk.418.1593210990186; Fri, 26 Jun 2020 15:36:30 -0700 (PDT) Received: from xz-x1.redhat.com ([2607:9880:19c0:32::2]) by smtp.gmail.com with ESMTPSA id k45sm3109699qtc.62.2020.06.26.15.36.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2020 15:36:29 -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 , Heiko Carstens , Vasily Gorbik , Christian Borntraeger , linux-s390@vger.kernel.org Subject: [PATCH 18/26] mm/s390: Use general page fault accounting Date: Fri, 26 Jun 2020 18:36:27 -0400 Message-Id: <20200626223627.199861-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: BDD6A18086CB5 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: Heiko Carstens CC: Vasily Gorbik CC: Christian Borntraeger CC: linux-s390@vger.kernel.org Signed-off-by: Peter Xu --- arch/s390/mm/fault.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c index ab6d7eedcfab..4d62ca7d3e09 100644 --- a/arch/s390/mm/fault.c +++ b/arch/s390/mm/fault.c @@ -479,7 +479,7 @@ static inline vm_fault_t do_exception(struct pt_regs = *regs, int access) * 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); if (fault_signal_pending(fault, regs)) { fault =3D VM_FAULT_SIGNAL; if (flags & FAULT_FLAG_RETRY_NOWAIT) @@ -489,21 +489,7 @@ static inline vm_fault_t do_exception(struct pt_regs= *regs, int access) if (unlikely(fault & VM_FAULT_ERROR)) goto out_up; =20 - /* - * Major/minor page fault accounting is only done on the - * initial attempt. If we go through a retry, it is extremely - * likely that the page will be found in page cache at that point. - */ if (flags & FAULT_FLAG_ALLOW_RETRY) { - if (fault & VM_FAULT_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); - } if (fault & VM_FAULT_RETRY) { if (IS_ENABLED(CONFIG_PGSTE) && gmap && (flags & FAULT_FLAG_RETRY_NOWAIT)) { --=20 2.26.2