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.6 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 88960C433E1 for ; Fri, 19 Jun 2020 16:15:03 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 43B1E21707 for ; Fri, 19 Jun 2020 16:15:03 +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="XS6byVXH" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 43B1E21707 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 E4CF88D00C9; Fri, 19 Jun 2020 12:15:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DFB808D00AD; Fri, 19 Jun 2020 12:15:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D11C98D00C9; Fri, 19 Jun 2020 12:15:02 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0070.hostedemail.com [216.40.44.70]) by kanga.kvack.org (Postfix) with ESMTP id A36DE8D00AD for ; Fri, 19 Jun 2020 12:15:02 -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 46751181AC9C6 for ; Fri, 19 Jun 2020 16:15:01 +0000 (UTC) X-FDA: 76946460402.13.salt90_4506e0126e1a Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin13.hostedemail.com (Postfix) with ESMTP id 1C72318141983 for ; Fri, 19 Jun 2020 16:13:41 +0000 (UTC) X-HE-Tag: salt90_4506e0126e1a X-Filterd-Recvd-Size: 5570 Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by imf24.hostedemail.com (Postfix) with ESMTP for ; Fri, 19 Jun 2020 16:13:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592583219; 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=XS6byVXHPPw1TmcoMOExa7pSmWSqvzTc2jeEEN58wwv+rGMls2txLOgALaxg+0ppJwwACp 6zEqOjuBbTujv3RKQgQ+ltwSCUZ/APWX/WbInfj51e5+PPYo7V9IVztLueqbB8iptqXqRf I187/cbaTP2r9q4YCV5OBSlafZpZi5s= Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-250-Je01dAmKPd-olfFJhOmHFQ-1; Fri, 19 Jun 2020 12:13:38 -0400 X-MC-Unique: Je01dAmKPd-olfFJhOmHFQ-1 Received: by mail-qk1-f197.google.com with SMTP id j16so7510107qka.11 for ; Fri, 19 Jun 2020 09:13: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=cHCFBr0H2Wj98J64LoxM3OjPsGeWNQz7WDWbAHsmGis=; b=JbKFi8vQWI9UQfuzghlKSDgsZDaARtYo5THB4TcTQTWCAoBJoJgV0yOi8bsbHNGFd0 /ZxN5rFEaGqIb8i0rQpufPwwQHt/Zi1npSsOjDwLhdX7lZnl7YE/WanLIvU7fhvHpawV /cakZKCtFHMY0a38rAKg4ENA82/RIbA/lpNenbO+xH4trRhtd1Vg1GZYsXAK0jEsbDiz 1gAYC6VsGUlwPurgv9+9E1AMwahSawTcY8DT5d/IPDgCBfbqr7kLxXpucbuy03Ll14/w Mf5KdIBx0Y9ODJU48WvuGFjk6Ql6AqlR6Z4IxveckfYgmaXG1K5W/bAS530ZkMryor43 UCew== X-Gm-Message-State: AOAM530APCDpgElULoEJekXoufskTyvFMmmSSqUGgmoIO1UHX51aeiFS WvT+BoGSwkfA4Z9ZZvrdtyE7gKsrnt4zPqSU7k6g4gFWjIx6tQmh/IXbDt5FXUQ8wq9MyL27tSC DtZVEBcTnTFo= X-Received: by 2002:ac8:4746:: with SMTP id k6mr4197649qtp.234.1592583217599; Fri, 19 Jun 2020 09:13:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw8FxSE1nBWsTRVRNtg8kxaR64T2HjUjPlWnGOgZGa7/UjveZ5zpprBuiIcJe4cj3bpOnvD0g== X-Received: by 2002:ac8:4746:: with SMTP id k6mr4197618qtp.234.1592583217335; Fri, 19 Jun 2020 09:13:37 -0700 (PDT) Received: from xz-x1.redhat.com ([2607:9880:19c0:32::2]) by smtp.gmail.com with ESMTPSA id r76sm6090318qka.30.2020.06.19.09.13.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jun 2020 09:13:36 -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 , Heiko Carstens , Vasily Gorbik , Christian Borntraeger , linux-s390@vger.kernel.org Subject: [PATCH 18/26] mm/s390: Use general page fault accounting Date: Fri, 19 Jun 2020 12:13:35 -0400 Message-Id: <20200619161335.9664-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: 1C72318141983 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(). 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