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=-14.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 182B9C433B4 for ; Thu, 20 May 2021 16:36:35 +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 8BD116101E for ; Thu, 20 May 2021 16:36:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8BD116101E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=arm.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:In-Reply-To:MIME-Version:References:Message-ID: Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=z5vejjkoAq8BkhwelqMhBCZPxoY/gxdj25DSQARrYEU=; b=OVUsIO/U/NEaSgOpbuVma1AXCL 14pO+xEOa/toWl58KIU/mZLH3JJBJI3Q96f3l3h+2/e++7t9PxvnZRoN+DHI5pca37JzcD0gsGVPS L0qPSNaaDyUNDN782I9JbRj11GgsF9x52So6g5kMyhWm/7phBtsv8kz4bj2jGdt74tOAbW8VyYI+Q q4Lz1VDhWoXO9movBzSBBrqgzZYD3JdRzM0C8T8RTif+SsK9H0INetiV27iDUKbAJcutVz1UU/9Ec SytrEbf6rvkHtz1cIiLNVq1/XRHIwToCF7ZdRBJIVQYR0xdKxvtvcyqwHFavA5Sm8bMyoX4DbV9WV 0BydBQng==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ljld0-001xan-Jd; Thu, 20 May 2021 16:34:30 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ljlcy-001xac-EK for linux-arm-kernel@desiato.infradead.org; Thu, 20 May 2021 16:34:28 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=In-Reply-To:Content-Type:MIME-Version :References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=PfrcfuaBObOpLHyJd+NiA3hRbEjUmZEVLzJh/lbIDQo=; b=V4JY9eSnqGozd4Qwi1yJO0cDVw wCzrbddpJg7sWhwuX4TqNAUXwBjMDKXnDdQ3Qp3S4VQFz9uB8X4ks1NT4Z5/MGLXl9KXcsAdgvU+s THxLBzdHLVe6Tk429CWsER95IIubqlNd/7fA6/82mGcuaqpRZpClKUR5XkotaW3Gtl0Al1O9o6dJW BGHhPq7UCWVycHms0JPUaiUiEq+n86SMRsQaS3hcDwDol9dtJ+uIFelLFgkyJUKUtqe1Z0HwdWflG mO/kwbAthajZl5G4gxh1m0EtdICEu6ogH9eBE8hwt1BI0G1VvI5VonoJW2rKKiyojB0a9Y8GQo2m4 pIMhdJAA==; Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1ljlcv-00GVrF-KP for linux-arm-kernel@lists.infradead.org; Thu, 20 May 2021 16:34:27 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 38898ED1; Thu, 20 May 2021 09:34:22 -0700 (PDT) Received: from C02TD0UTHF1T.local (unknown [10.57.7.235]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 88ABF3F73B; Thu, 20 May 2021 09:34:20 -0700 (PDT) Date: Thu, 20 May 2021 17:34:18 +0100 From: Mark Rutland To: Fuad Tabba Cc: linux-arm-kernel@lists.infradead.org, will@kernel.org, catalin.marinas@arm.com, maz@kernel.org, ardb@kernel.org, james.morse@arm.com, alexandru.elisei@arm.com, suzuki.poulose@arm.com, robin.murphy@arm.com Subject: Re: [PATCH v3 16/18] arm64: sync_icache_aliases to take end parameter instead of size Message-ID: <20210520163418.GU17233@C02TD0UTHF1T.local> References: <20210520124406.2731873-1-tabba@google.com> <20210520124406.2731873-17-tabba@google.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210520124406.2731873-17-tabba@google.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210520_093425_785433_633A2672 X-CRM114-Status: GOOD ( 21.51 ) 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 On Thu, May 20, 2021 at 01:44:04PM +0100, Fuad Tabba wrote: > 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) Can we please drop the `uaddr` argument here? Generally, for functions which take both a `uaddr` and a `kaddr`, it's best to pass a length argument, since that can be applied to either base. Since we don't use the `uaddr` here it's simpler to remove that. With that gone: Acked-by: Mark Rutland Mark. > { > 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); > > -- > 2.31.1.751.gd2f1c929bd-goog > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel