From patchwork Fri Jun 26 22:31:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 11629003 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 23C421731 for ; Fri, 26 Jun 2020 22:35:50 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F0C182089D for ; Fri, 26 Jun 2020 22:35:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="wOMtwmjM"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Fad/VivN" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F0C182089D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=d4B+V/YfzljDEDRqxCY6NmXMloN+yJGJPh8GfGWXh5c=; b=wOMtwmjMWbOC1B9Vall7ldNOc fCXXHHAfj/TNTnuQkSM+iic/zotIWEXRvyXmY6s3RWEKBqLjh516RZVgpsWMk5SfB2J5hsPzflGc7 wV9DrvOvAfIM73rbtnDQtNe50wqJGgjvBJDoWfpbf5MOEfb6zkIreyMwcaPe2lWkIQ+fgHWFYoG/8 lSK6FxOVJwEOvMMvlpdobSRdJC4l4rqY8M7d8g7lFQJn4dhfyb/JSx5mIEuuArKw4vegCKib4WOxW +TFLGdkSsjAG3DlEWZkO2Gg4iWxihD6PkweG7ilkzElEcb8YSqZDUAbCzuScbSdWakJDXX0bjuTjw Hy+56Q6dQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jowuZ-0002S1-VW; Fri, 26 Jun 2020 22:33:32 +0000 Received: from us-smtp-2.mimecast.com ([205.139.110.61] helo=us-smtp-delivery-1.mimecast.com) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jowuT-0002RS-RW for linux-arm-kernel@lists.infradead.org; Fri, 26 Jun 2020 22:33:29 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593210805; 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=u3Vh1HVYE5zmkqw2sOdn8zxGKpBRt5nL/FWkJRhYB9o=; b=Fad/VivNCCq3p/jqfw2R6qSGfmII1EUB+o/vskEegP8Z+wrYvmaz93WMVMdpxvGXm0bLIf hqPBxvce1QXlVlyHA4+ZVj6UFTVARMlo7Wjo08xQaxOLi4S9Gg3sO+Q1vmYIKusHbz7d+m pdpf84eNhTdLIrhd0REvR7qrOAIqIEw= Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-389-Cat_F96cN5-Nf_sbN0HsAQ-1; Fri, 26 Jun 2020 18:31:40 -0400 X-MC-Unique: Cat_F96cN5-Nf_sbN0HsAQ-1 Received: by mail-qk1-f198.google.com with SMTP id x22so7661665qkj.6 for ; Fri, 26 Jun 2020 15:31:40 -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=u3Vh1HVYE5zmkqw2sOdn8zxGKpBRt5nL/FWkJRhYB9o=; b=lG8rtuSDXG/R70COHsb5UQai379jAcRID7+obaJYrgMmKhcx+5aLBkjSfys1phEqhI cluB/V0CtsQeeqKSVOcMJHmgI+b9+pTaro2fRHbW0PHnSSNM7bYKf7lLWfbBRRqwd492 6olhTNB1lx8g03uUwga0Q2tIpbuyozghBVsYpI6alEpxhdIV0PRu4PMDcfwVNj4IEw1t 6KUawItZL8XqnIokio5vnxXD2OlhW/EPYHVVaNKUCRuQC9Yg4aXd5h6BqpwtHBdRCt8K RkBHIsKwoxXy5eQkfzYh6TuDxyAAQ1aFXDpAOQqP/553o6wyb0YtL7i8CSkfapK2vTa5 6FFQ== X-Gm-Message-State: AOAM531EImrBMwA6O5k2MykYt4/pGfOIisI0rkYea7rlGNP9s9vGNEAh fAw18mLHlPDfxw99lRdUNW4B37909gmdEtRjC1WNhSa9FoqklZEPZOy4rUJDaou918Vezh1AXrR RtAdVRj4CmEP+XfLJKAVCuarwHavMC9gjVmo= X-Received: by 2002:ac8:2fa9:: with SMTP id l38mr5242184qta.40.1593210700166; Fri, 26 Jun 2020 15:31:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzm0orUUqKrKyKvfnfW8pcdQLEQcj6s00CrnrDVCK/RKvjz45DEVq9UJHC9oLbgbG9R8tJqLw== X-Received: by 2002:ac8:2fa9:: with SMTP id l38mr5242166qta.40.1593210699937; Fri, 26 Jun 2020 15:31:39 -0700 (PDT) Received: from xz-x1.redhat.com ([2607:9880:19c0:32::2]) by smtp.gmail.com with ESMTPSA id f203sm9903311qke.135.2020.06.26.15.31.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2020 15:31:39 -0700 (PDT) From: Peter Xu To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 05/26] mm/arm64: Use general page fault accounting Date: Fri, 26 Jun 2020 18:31:09 -0400 Message-Id: <20200626223130.199227-6-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 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [205.139.110.61 listed in list.dnswl.org] 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [205.139.110.61 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders -0.0 DKIMWL_WL_HIGH DKIMwl.org - Whitelisted High sender X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrea Arcangeli , Catalin Marinas , Linus Torvalds , peterx@redhat.com, linux-arm-kernel@lists.infradead.org, Michael Ellerman , Andrew Morton , Will Deacon , Gerald Schaefer Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Use the general page fault accounting by passing regs into handle_mm_fault(). It naturally solve the issue of multiple page fault accounting when page fault retry happened. To do this, we pass pt_regs pointer into __do_page_fault(). CC: Catalin Marinas CC: Will Deacon CC: linux-arm-kernel@lists.infradead.org Signed-off-by: Peter Xu --- arch/arm64/mm/fault.c | 29 ++++++----------------------- 1 file changed, 6 insertions(+), 23 deletions(-) diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index 5f6607b951b8..09b206521559 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -398,7 +398,8 @@ static void do_bad_area(unsigned long addr, unsigned int esr, struct pt_regs *re #define VM_FAULT_BADACCESS 0x020000 static vm_fault_t __do_page_fault(struct mm_struct *mm, unsigned long addr, - unsigned int mm_flags, unsigned long vm_flags) + unsigned int mm_flags, unsigned long vm_flags, + struct pt_regs *regs) { struct vm_area_struct *vma = find_vma(mm, addr); @@ -422,7 +423,7 @@ static vm_fault_t __do_page_fault(struct mm_struct *mm, unsigned long addr, */ if (!(vma->vm_flags & vm_flags)) return VM_FAULT_BADACCESS; - return handle_mm_fault(vma, addr & PAGE_MASK, mm_flags, NULL); + return handle_mm_fault(vma, addr & PAGE_MASK, mm_flags, regs); } static bool is_el0_instruction_abort(unsigned int esr) @@ -444,7 +445,7 @@ static int __kprobes do_page_fault(unsigned long addr, unsigned int esr, { const struct fault_info *inf; struct mm_struct *mm = current->mm; - vm_fault_t fault, major = 0; + vm_fault_t fault; unsigned long vm_flags = VM_ACCESS_FLAGS; unsigned int mm_flags = FAULT_FLAG_DEFAULT; @@ -510,8 +511,7 @@ static int __kprobes do_page_fault(unsigned long addr, unsigned int esr, #endif } - fault = __do_page_fault(mm, addr, mm_flags, vm_flags); - major |= fault & VM_FAULT_MAJOR; + fault = __do_page_fault(mm, addr, mm_flags, vm_flags, regs); /* Quick path to respond to signals */ if (fault_signal_pending(fault, regs)) { @@ -532,25 +532,8 @@ static int __kprobes do_page_fault(unsigned long addr, unsigned int esr, * Handle the "normal" (no error) case first. */ if (likely(!(fault & (VM_FAULT_ERROR | VM_FAULT_BADMAP | - VM_FAULT_BADACCESS)))) { - /* - * Major/minor page fault accounting is only done - * once. If we go through a retry, it is extremely - * likely that the page will be found in page cache at - * that point. - */ - if (major) { - current->maj_flt++; - perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MAJ, 1, regs, - addr); - } else { - current->min_flt++; - perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MIN, 1, regs, - addr); - } - + VM_FAULT_BADACCESS)))) return 0; - } /* * If we are in kernel mode at this point, we have no context to