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=-17.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,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 304D5C433ED for ; Tue, 11 May 2021 14:44:54 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (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 9558561288 for ; Tue, 11 May 2021 14:44:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9558561288 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Cc:To:From:Subject:References:Mime-Version: Message-Id:In-Reply-To:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ZhSQlSIOM9VcjdGxgK+lrjhgxfdZnUph0yjXjxGN8mQ=; b=NJ2YKcTGbJxstz 5hVrdEglEUXAe3zGtFpM1j3rWw1dy9W3Rfpre/ts6b3ewTUDOL4tLDfbADY3fNcMHADdOoUJOOUNq EbHmv3EuTLhZknPu52Z2O/2+L+Z994Rlltf6z4Crh4DxFAvxUpxnxQ2OoiTZ6kSW5Vsn47XuWJalO VdEO8nIKQCfCXbxj2s7XZdRITAUr1jah2nic+Vk3FrMMTISZvNsqsSYPhxKcKdPSrn1A89TKPiU3H 5uP5lsSwZgbu0pGboyAd/caHH/y08w9Izk9E2MHT+/W56jCrNqac0It0xXNAKotA+6V/EFkiGk1K0 aaG/Ka2YTwrWEcCjyqyA==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lgTba-000TIB-5h; Tue, 11 May 2021 14:43:26 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lgTbE-000TEi-1E for linux-arm-kernel@desiato.infradead.org; Tue, 11 May 2021 14:43:04 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Type:Cc:To:From:Subject: References:Mime-Version:Message-Id:In-Reply-To:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=0ZoRB0Udm2EWMuty7SBfrM43lsjufH1WUmYkNXcjwEU=; b=FQ7gxZyyh7DvR9ui8COsx5n/Qo vCrpKP74xFR7wboptbbRRvQuroT6TbScNJB+sTtF1cQR0fJGWgizb4ZUK2oY2djkPP1CxCgmEEhSN izzt51EEYmgIDmcdaZDiuSac3vijPjb8TdJNebThA5r8G+PcX6PyvV/LOm0QDwYXxjy059ndAo3de xjalfkeSnIq3yAWWAERuW5j5Ur+BzZXPLVS7vtXuK/AERWxeEL3ynOVCk1HmMYYgRQ684qs3uk32g WD44w/lVoWtbBUi4bn9euVnelJ+0Aof6ipzoX1VJFmEcs07Sc0TPYaWK/L3eToFAjm0UrAKxwaZe1 0oWUZVGw==; Received: from mail-qv1-xf4a.google.com ([2607:f8b0:4864:20::f4a]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lgTbB-009gUl-EA for linux-arm-kernel@lists.infradead.org; Tue, 11 May 2021 14:43:02 +0000 Received: by mail-qv1-xf4a.google.com with SMTP id b24-20020a0cb3d80000b02901e78b82d74aso5566978qvf.20 for ; Tue, 11 May 2021 07:42:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=0ZoRB0Udm2EWMuty7SBfrM43lsjufH1WUmYkNXcjwEU=; b=niJm6rde0gZpJ5M4Ffe3BIGD5Mv5uruqnAAIkRc6Ly/WE3kVMIQuPXYBhXk+4cvIY/ 0/6chg3cRK3riX+c5ZBUXwiqu0YML3w1tCcUuFb5R+OWEqKocF0GuD7gG2KOLSlCRQwf dE6Wnuga7gdWfr4eX4vD8pjeMDfRwsQRQLuxFh2Lhd2tGBg4s9qLwRIW93rTdkZOo73a p4BfnuckbEnIoJbT9/X7mp+pE0eE+8zh76Ad/vYFH4I/1G+c52RXVGHPQYBkSuyJ2VAU QOivRxtdoxTTocyCaEV9CkJQuUi8wd4FsfyaF1WtRIneQQQLNJNe37NKJUXLRGMAJxyS sjng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=0ZoRB0Udm2EWMuty7SBfrM43lsjufH1WUmYkNXcjwEU=; b=gA9z1PgWR68sI4a+BHeuUic1PF/vhThc1VtSPQzNpi6RONpSVKM66OYuGapSq6GwuV jxk2zLWHWuNfnyD4D800X23fyScxofL1Nm9tMfxr2aLzMkDvXwXVghhVEoFqt2DP9Ae1 5KMYVKyWcJU6hmFaB+g8euBAPQOVrdy6o1WaZcgxqeJiA0ILXrq+omT6ZgcSPz9bqHg+ 2Z7IxupH2hcA1X+XDJqUKBaNA0RMhGNcrvA0Ga/ZGunbsmiGS+KaV9iWCCjEcLvD9n2v 2+wN9bUjZQ+0HKLwIwepury+Tn8GRQbLbhfyXO94+nfQAoZkdkYfsyoY8FTfNzPAXxX5 C18Q== X-Gm-Message-State: AOAM532nXTI+LyCsXT94veOx5gd3IdxNXeYZ1TzW9VKIzeYsmQRuse2P XRw3jKgAM3UnnILPTn2jBWcv6tXpspzLEoT3bIFr8g6TDaQTJl1iBcvBoS4bGbeCgC17KM3CgnF w2UJuQ/rug9b7LX5vnBzC3GPqOMz8V7lo5NbHoiG+Fgo+8VtOfDGSDMyEfA64nx7p2JBFDeV+v3 GFkQ== X-Google-Smtp-Source: ABdhPJyeLXD/afiyFzs9BtYJrL6HZBtwURrFcwE+DYdfkWBCAT/YT7DzyBPMnHsedHYldkBuukUFRt5dXA== X-Received: from tabba.c.googlers.com ([fda3:e722:ac3:10:28:9cb1:c0a8:482]) (user=tabba job=sendgmr) by 2002:a0c:f0c9:: with SMTP id d9mr30066890qvl.3.1620744178762; Tue, 11 May 2021 07:42:58 -0700 (PDT) Date: Tue, 11 May 2021 15:42:41 +0100 In-Reply-To: <20210511144252.3779113-1-tabba@google.com> Message-Id: <20210511144252.3779113-3-tabba@google.com> Mime-Version: 1.0 References: <20210511144252.3779113-1-tabba@google.com> X-Mailer: git-send-email 2.31.1.607.g51e8a6a459-goog Subject: [PATCH v1 02/13] arm64: Do not enable uaccess for invalidate_icache_range From: Fuad Tabba To: linux-arm-kernel@lists.infradead.org Cc: will@kernel.org, catalin.marinas@arm.com, mark.rutland@arm.com, maz@kernel.org, ardb@kernel.org, james.morse@arm.com, alexandru.elisei@arm.com, suzuki.poulose@arm.com, tabba@google.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210511_074301_495312_911BBDA3 X-CRM114-Status: GOOD ( 11.21 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org invalidate_icache_range() works on the kernel linear map, and doesn't need uaccess. Remove the code that toggles uaccess_ttbr0_enable, as well as the code that emits an entry into the exception table (via the macro invalidate_icache_by_line). No functional change intended. Reported-by: Catalin Marinas Reported-by: Will Deacon Link: https://lore.kernel.org/linux-arch/20200511110014.lb9PEahJ4hVOYrbwIb_qUHXyNy9KQzNFdb_I3YlzY6A@z/ Signed-off-by: Fuad Tabba --- arch/arm64/include/asm/cacheflush.h | 2 +- arch/arm64/mm/cache.S | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/arch/arm64/include/asm/cacheflush.h b/arch/arm64/include/asm/cacheflush.h index 52e5c1623224..a586afa84172 100644 --- a/arch/arm64/include/asm/cacheflush.h +++ b/arch/arm64/include/asm/cacheflush.h @@ -57,7 +57,7 @@ * - size - region size */ extern void __flush_icache_range(unsigned long start, unsigned long end); -extern int invalidate_icache_range(unsigned long start, unsigned long end); +extern void invalidate_icache_range(unsigned long start, unsigned long end); extern void __flush_dcache_area(void *addr, size_t len); extern void __inval_dcache_area(void *addr, size_t len); extern void __clean_dcache_area_poc(void *addr, size_t len); diff --git a/arch/arm64/mm/cache.S b/arch/arm64/mm/cache.S index 092f73acdf9a..6babaaf34f17 100644 --- a/arch/arm64/mm/cache.S +++ b/arch/arm64/mm/cache.S @@ -105,21 +105,12 @@ SYM_FUNC_END(__flush_cache_user_range) */ SYM_FUNC_START(invalidate_icache_range) alternative_if ARM64_HAS_CACHE_DIC - mov x0, xzr isb ret alternative_else_nop_endif - uaccess_ttbr0_enable x2, x3, x4 - - invalidate_icache_by_line x0, x1, x2, x3, 1, 2f - mov x0, xzr -1: - uaccess_ttbr0_disable x1, x2 + invalidate_icache_by_line x0, x1, x2, x3, 0, 0f ret -2: - mov x0, #-EFAULT - b 1b SYM_FUNC_END(invalidate_icache_range) /* -- 2.31.1.607.g51e8a6a459-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel