From patchwork Tue May 11 14:42:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fuad Tabba X-Patchwork-Id: 12251279 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 28960C433B4 for ; Tue, 11 May 2021 14:48:01 +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 795D161263 for ; Tue, 11 May 2021 14:48:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 795D161263 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=KPmWnRecfDsymIEy6H7JhA3CqLbWvBndNhuH7ROs65o=; b=Dy7RxHB9PcNvAj 82+Z9KaQ/4L+Pwr68LkHxq+L7cwpmDHG1SD74GO/gxSzVEoXJ2ruGWJi0oUiMi0SybOo9qwr2VCkn JhEV6tbM/zhkU4T6ZsgB1AEoWqL1lG7R9RQ8ujVK2Y+NaGJfV8vzM8psHZmin0exL27NhUnuiia45 MUSf0TgM9revL0X4Msc8CSQUqmL+184czQcSH27lzjXqNn7MoMa00qvYZ1Oi3A1ZbfLudueRrgwq4 LeYkOPXzhR+3xF6eFEYyYMEJtZjHWTvpEto5wx0m8I5JZX37VAH9qlL17J/J3tHigmNRJ3/XOOPBx xLn/oH4bNGzVG3QStEBw==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lgTeH-000UHt-VY; Tue, 11 May 2021 14:46:14 +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 1lgTbX-000THD-En for linux-arm-kernel@desiato.infradead.org; Tue, 11 May 2021 14:43:23 +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=LllD6PPnuTvw+BG/LkclHvotID4IniI01gePp2bphoI=; b=jSprVUlAip+ESUgJutyrB10P6F CQc9NtakFpztJ13KGqex9yL7x7267z+awlxbFkMGyEx/QUrS0a9wW/TqaWvC/MTZLnZa2GJHTgE+/ PPnuV5BwebpnRWRbg6h+FpSnbADTNu3bg2cYrhNZGczDQL6Iw5KhMwJoiKmMPOS5iTlDSACjmnOsK HR3FgaDsk5jRSmlvKCVZcvP1wMGcTuOFGHIULexBLKnVRqoMhpN7Y827NzoGfOeAisQMxJbCCkynM 1wP2NXIDQbUzn8nqCF0EOgPHc/3Fd73HxNxeMvVaZjPnWZPfs59bLI3OjEEGzJLlmWx43NRuAGCoR c5dkhYZA==; Received: from mail-wm1-x349.google.com ([2a00:1450:4864:20::349]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lgTbU-009gX9-Rm for linux-arm-kernel@lists.infradead.org; Tue, 11 May 2021 14:43:22 +0000 Received: by mail-wm1-x349.google.com with SMTP id r10-20020a05600c2c4ab029014b601975e1so819301wmg.0 for ; Tue, 11 May 2021 07:43:19 -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=LllD6PPnuTvw+BG/LkclHvotID4IniI01gePp2bphoI=; b=elO1CfYJwh3QlosQDKtHgJxe2Ue0w0P7+IX3Q/23iF7gg+EHiJGfnJsAhJ3z9c+qh/ emigzzkVM1cIPpg+nOIIsINycjuSxLnI2jRxQCyW/jQKBGcGdP7ZFlXuHS2cg9SNLBiW amPLmWG4VQ8duyJV+eQD0miJizDHbBgxW68cRfrxYjD7FJPxqazJVPtEwRvpcgu9jWQK 0Ea9OgBC60MjdbM2trprF1Cc9iTgMY9+FjyVFDCPnJnq7kdxg9TrO+GN64Crpa3Pxmgc OeA8XjXbK+LiBmIa54vE12ul5SFWys499QHwlD7crUeRLlqP26vt91m6m0/fzJySypOO 1h2g== 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=LllD6PPnuTvw+BG/LkclHvotID4IniI01gePp2bphoI=; b=EKP8udFmaKdUn8AznSdr8ujzuoT9p99CO5hlOqZ+zyDEX73zBkgSu0tnWU8CNVNlQN vhLO1xUuYmkQe10dqz4YfemUQAf2E/yZjdInznfkuq99yVraV8sUfYu+DccWLzv/cYLb ZbLOy4ASNKYwwJBbRKgG3Tykh9lwn7qgbcqgEzvYUKp9z16UkQ6sIdKBx9wn82A0xIYc 8mvOKqBlMr+l/QWISasyTaXxqRH1nq8SC0fkUr/fki1bLfYEVQFFoBmMIQa3suJEkWJF /Nfzkb3qkj4wSKBnVFjYaPDT6uwfNgZAMkrwbMm9gzqR/6ictXpF/aZROG2yAcxFpN91 P+RQ== X-Gm-Message-State: AOAM532hLUDxgp8UnqENUAC6D/69LT7esGd/TmAHJsUVF/gITs+vl2nu 1MFKIQ5Gy9SJ2oL7zmSoDhNJNMFI7pQvuRQPYxTOkZl7vPbFz2WBmfUwfZLDBKkjWiNX4Kk+qAS B6G6z8/lRBzo+z0g01VOgKkyh82w7OkVRN0oKYJmIidhuUNH3OiXL3IPJdK/3GWxf2bHceqqdFk Zi1A== X-Google-Smtp-Source: ABdhPJxc0p1nltaziJtRTL/azbiUpYPS/vyGE57KbcEsKqhmzRyaqT/+SQKhbZfy5LDLcIxz5J9/yEg5Hg== X-Received: from tabba.c.googlers.com ([fda3:e722:ac3:10:28:9cb1:c0a8:482]) (user=tabba job=sendgmr) by 2002:a7b:c0cb:: with SMTP id s11mr33161403wmh.146.1620744198820; Tue, 11 May 2021 07:43:18 -0700 (PDT) Date: Tue, 11 May 2021 15:42:50 +0100 In-Reply-To: <20210511144252.3779113-1-tabba@google.com> Message-Id: <20210511144252.3779113-12-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 11/13] arm64: sync_icache_aliases to take end parameter instead of size 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_074320_919784_6ACC02A2 X-CRM114-Status: GOOD ( 14.08 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org To be consistent with other functions with similar names and functionality in cacheflush.h, cache.S, and cachetlb.rst, change to specify the range in terms of start and end, as opposed to start and size. No functional change intended. Reported-by: Will Deacon Signed-off-by: Fuad Tabba --- arch/arm64/include/asm/cacheflush.h | 2 +- arch/arm64/kernel/probes/uprobes.c | 2 +- arch/arm64/mm/flush.c | 21 +++++++++++---------- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/arch/arm64/include/asm/cacheflush.h b/arch/arm64/include/asm/cacheflush.h index f86723047315..70b389a8dea5 100644 --- a/arch/arm64/include/asm/cacheflush.h +++ b/arch/arm64/include/asm/cacheflush.h @@ -64,7 +64,7 @@ extern void __clean_dcache_area_poc(unsigned long start, unsigned long end); extern void __clean_dcache_area_pop(unsigned long start, unsigned long end); extern void __clean_dcache_area_pou(unsigned long start, unsigned long end); extern long __flush_cache_user_range(unsigned long start, unsigned long end); -extern void sync_icache_aliases(void *kaddr, unsigned long len); +extern void sync_icache_aliases(unsigned long start, unsigned long end); static inline void flush_icache_range(unsigned long start, unsigned long end) { diff --git a/arch/arm64/kernel/probes/uprobes.c b/arch/arm64/kernel/probes/uprobes.c index 2c247634552b..9be668f3f034 100644 --- a/arch/arm64/kernel/probes/uprobes.c +++ b/arch/arm64/kernel/probes/uprobes.c @@ -21,7 +21,7 @@ void arch_uprobe_copy_ixol(struct page *page, unsigned long vaddr, memcpy(dst, src, len); /* flush caches (dcache/icache) */ - sync_icache_aliases(dst, len); + sync_icache_aliases((unsigned long)dst, (unsigned long)dst + len); kunmap_atomic(xol_page_kaddr); } diff --git a/arch/arm64/mm/flush.c b/arch/arm64/mm/flush.c index a69d745fb1dc..143f625e7727 100644 --- a/arch/arm64/mm/flush.c +++ b/arch/arm64/mm/flush.c @@ -14,28 +14,26 @@ #include #include -void sync_icache_aliases(void *kaddr, unsigned long len) +void sync_icache_aliases(unsigned long start, unsigned long end) { - unsigned long addr = (unsigned long)kaddr; - if (icache_is_aliasing()) { - __clean_dcache_area_pou(kaddr, kaddr + len); + __clean_dcache_area_pou(start, end); __flush_icache_all(); } else { /* * Don't issue kick_all_cpus_sync() after I-cache invalidation * for user mappings. */ - __flush_icache_range(addr, addr + len); + __flush_icache_range(start, end); } } static void flush_ptrace_access(struct vm_area_struct *vma, struct page *page, - unsigned long uaddr, void *kaddr, - unsigned long len) + unsigned long uaddr, unsigned long start, + unsigned long end) { if (vma->vm_flags & VM_EXEC) - sync_icache_aliases(kaddr, len); + sync_icache_aliases(start, end); } /* @@ -48,7 +46,8 @@ void copy_to_user_page(struct vm_area_struct *vma, struct page *page, unsigned long len) { memcpy(dst, src, len); - flush_ptrace_access(vma, page, uaddr, dst, len); + flush_ptrace_access(vma, page, uaddr, (unsigned long)dst, + (unsigned long)dst + len); } void __sync_icache_dcache(pte_t pte) @@ -56,7 +55,9 @@ void __sync_icache_dcache(pte_t pte) struct page *page = pte_page(pte); if (!test_and_set_bit(PG_dcache_clean, &page->flags)) - sync_icache_aliases(page_address(page), page_size(page)); + sync_icache_aliases((unsigned long)page_address(page), + (unsigned long)page_address(page) + + page_size(page)); } EXPORT_SYMBOL_GPL(__sync_icache_dcache);