From patchwork Thu Apr 24 16:57:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Capper X-Patchwork-Id: 29000 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f200.google.com (mail-ve0-f200.google.com [209.85.128.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 766402036A for ; Thu, 24 Apr 2014 16:59:34 +0000 (UTC) Received: by mail-ve0-f200.google.com with SMTP id oy12sf10308425veb.11 for ; Thu, 24 Apr 2014 09:59:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id:cc :precedence:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:mime-version:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list :content-type:content-transfer-encoding; bh=QQnkNX8QH/iVf0oCbZMvom6qnqgoMj8EY629is5PDFc=; b=KJKEeBcYjht/YFcd0OIGvvUb+T5ATjjGXOvk0q5L9UvX2YcPMctBLApz7aMHfZRksM R7r8UOseESXSwSzy4Xg5YIEtPKPYugudtkJc+LhawIkdy4YTP59SPYaMwJYg607se5Sv TTkaRWmi6WGZgJHvzF20LqoIHl6qh33DnUM7gT6v4DkskzNzXRMEyJit5fhiSgWehfuQ 5AggIFPwLlTgGs2CRtjOrjeh1xX8lownu4yT+xLSADhxsm0xIIkK3ZywzWW1zkrwKG59 j5wWXPtqG0JIMrXLd0CsdKcSOHL+WpT1fB/C9cL5rDjxseSPlmO8hVtgRM8u+QJdbzUB 4tdg== X-Gm-Message-State: ALoCoQlTxFbPMx0udTcztRvjQkVSyi9WrS36Y9yGRTgjoQSuy5/+9daauuuCmMTzrJB+8PaW8PUq X-Received: by 10.224.95.9 with SMTP id b9mr1744462qan.2.1398358774140; Thu, 24 Apr 2014 09:59:34 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.40.74 with SMTP id w68ls1163944qgw.53.gmail; Thu, 24 Apr 2014 09:59:34 -0700 (PDT) X-Received: by 10.220.95.204 with SMTP id e12mr1100786vcn.37.1398358774030; Thu, 24 Apr 2014 09:59:34 -0700 (PDT) Received: from mail-ve0-f170.google.com (mail-ve0-f170.google.com [209.85.128.170]) by mx.google.com with ESMTPS id bw7si1067448vcb.51.2014.04.24.09.59.34 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 24 Apr 2014 09:59:34 -0700 (PDT) Received-SPF: none (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) client-ip=209.85.128.170; Received: by mail-ve0-f170.google.com with SMTP id pa12so3322199veb.1 for ; Thu, 24 Apr 2014 09:59:34 -0700 (PDT) X-Received: by 10.220.167.2 with SMTP id o2mr1987807vcy.8.1398358773948; Thu, 24 Apr 2014 09:59:33 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp31557vcb; Thu, 24 Apr 2014 09:59:33 -0700 (PDT) X-Received: by 10.140.98.233 with SMTP id o96mr4247780qge.86.1398358773548; Thu, 24 Apr 2014 09:59:33 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id j6si2502827qan.9.2014.04.24.09.59.33 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Apr 2014 09:59:33 -0700 (PDT) Received-SPF: none (google.com: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org does not designate permitted sender hosts) client-ip=2001:1868:205::9; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WdMyn-0002kb-OJ; Thu, 24 Apr 2014 16:58:33 +0000 Received: from mail-wg0-f43.google.com ([74.125.82.43]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WdMyl-0002e0-RA for linux-arm-kernel@lists.infradead.org; Thu, 24 Apr 2014 16:58:32 +0000 Received: by mail-wg0-f43.google.com with SMTP id x13so2482267wgg.2 for ; Thu, 24 Apr 2014 09:58:07 -0700 (PDT) X-Received: by 10.181.8.204 with SMTP id dm12mr3746144wid.1.1398358686982; Thu, 24 Apr 2014 09:58:06 -0700 (PDT) Received: from marmot.wormnet.eu (marmot.wormnet.eu. [188.246.204.87]) by mx.google.com with ESMTPSA id ej7sm203897wib.9.2014.04.24.09.58.05 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Apr 2014 09:58:06 -0700 (PDT) From: Steve Capper To: linux-arm-kernel@lists.infradead.org Subject: [PATCH V2] arm64: mm: Add THP TLB entries to general mmu_gather Date: Thu, 24 Apr 2014 17:57:53 +0100 Message-Id: <1398358673-8429-1-git-send-email-steve.capper@linaro.org> X-Mailer: git-send-email 1.7.10.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140424_095832_021908_61D86851 X-CRM114-Status: UNSURE ( 9.72 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.3.2 on bombadil.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [74.125.82.43 listed in list.dnswl.org] Cc: catalin.marinas@arm.com, Steve Capper X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: steve.capper@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 When arm64 moved over to the core mmu_gather, it lost the logic to flush THP TLB entries (tlb_remove_pmd_tlb_entry was removed and the core implementation only signals that the mmu_gather needs a flush). This patch ensures that tlb_add_flush is called for THP TLB entries. Signed-off-by: Steve Capper Acked-by: Will Deacon --- Change in V2: moved __tlb_remove_pmd_tlb_entry to tlb.h to tidy it up. --- arch/arm64/include/asm/tlb.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm64/include/asm/tlb.h b/arch/arm64/include/asm/tlb.h index 72cadf5..80e2c08 100644 --- a/arch/arm64/include/asm/tlb.h +++ b/arch/arm64/include/asm/tlb.h @@ -19,6 +19,7 @@ #ifndef __ASM_TLB_H #define __ASM_TLB_H +#define __tlb_remove_pmd_tlb_entry __tlb_remove_pmd_tlb_entry #include @@ -99,5 +100,10 @@ static inline void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmdp, } #endif +static inline void __tlb_remove_pmd_tlb_entry(struct mmu_gather *tlb, pmd_t *pmdp, + unsigned long address) +{ + tlb_add_flush(tlb, address); +} #endif