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=-15.9 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,URIBL_BLOCKED, USER_AGENT_SANE_1 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 A7C68C07E99 for ; Mon, 12 Jul 2021 11:40:26 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 622FA610FA for ; Mon, 12 Jul 2021 11:40:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 622FA610FA 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=bombadil.20210309; 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=PQrx/tr/4P3GKiAgmlHCDrG9NLgp4M3vYkHSrHhDOgY=; b=TW3fwLE5JuHpDD pQlK9aV+1q6ySG7Bd5qvinvfwGNNNjIG1dP52RN2lxnTPqW74Kn3cmSz2zv3XvKAze6n4u/IsuOlp +gJX1GUF5ic18Sft9EVZU11SeqZDf7j8emjz16CQRA2vGcoCcGjz3OmaSAQFfhwKtoj6xopo6EwKt Npf39ORgGnslZph1jWBhd1eBs/F6qV5KK66C/7jRCjLbE7u1TG2XHQ9JGknK1pcwi+I1NHJfAL0Ak iwrQDTq9v7OjKbm+AeI3PxOpU7UEZ3qSd7ugy9R51+c2FSLJEu4RaJbUUMvDRm/ZPRQ3krIC+c4yO sMMmcHOpQwK9Uepj/Mfw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1m2uGk-0079kf-J5; Mon, 12 Jul 2021 11:38:38 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1m2uGh-0079jy-TR for linux-arm-kernel@lists.infradead.org; Mon, 12 Jul 2021 11:38:37 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1A7EF610E6; Mon, 12 Jul 2021 11:38:33 +0000 (UTC) Date: Mon, 12 Jul 2021 12:38:31 +0100 From: Catalin Marinas To: Mark Rutland Cc: will@kernel.org, linux-arm-kernel@lists.infradead.org, Alexander Potapenko , Andrey Konovalov , Andrey Ryabinin , Dmitry Vyukov , Marco Elver , Robin Murphy Subject: Re: [PATCH] arm64: fix strlen() with CONFIG_KASAN_HW_TAGS Message-ID: <20210712113830.GB1992@arm.com> References: <20210712090043.20847-1-mark.rutland@arm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210712090043.20847-1-mark.rutland@arm.com> User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210712_043836_010024_5C40B2ED X-CRM114-Status: GOOD ( 12.49 ) 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 Mon, Jul 12, 2021 at 10:00:43AM +0100, Mark Rutland wrote: > diff --git a/arch/arm64/lib/strlen.S b/arch/arm64/lib/strlen.S > index 35fbdb7d6e1a..1648790e91b3 100644 > --- a/arch/arm64/lib/strlen.S > +++ b/arch/arm64/lib/strlen.S > @@ -8,6 +8,7 @@ > > #include > #include > +#include > > /* Assumptions: > * > @@ -42,7 +43,16 @@ > #define REP8_7f 0x7f7f7f7f7f7f7f7f > #define REP8_80 0x8080808080808080 > > +/* > + * When KASAN_HW_TAGS is in use, memory is checked at MTE_GRANULE_SIZE > + * (16-byte) granularity, and we must ensure that no access straddles this > + * alignment boundary. > + */ > +#ifdef CONFIG_KASAN_HW_TAGS > +#define MIN_PAGE_SIZE MTE_GRANULE_SIZE > +#else > #define MIN_PAGE_SIZE 4096 > +#endif Reviewed-by: Catalin Marinas _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel