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.5 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 9EBE8C433DB for ; Mon, 8 Mar 2021 18:43:55 +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 2263E6527A for ; Mon, 8 Mar 2021 18:43:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2263E6527A 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=FXikase4/H8zo6icD8QQSOFf1JjZdol7sbCGUubu6qI=; b=fq/nMPLNrO3AyONBgN/n8Brbc DC0c3qQRwHWf8npi6ggx8/TmbxxcD8KOnPrX9pGPA4ibzghbkeYQgRm7jufn7mNbDwhD1GNLPBG/c CRWZf80UqBP6q1PO2Uzxzh73Mp1nwrHuFZgpf/aV71wm0pd/ry7dB2qCvjXiNq0DvafSGe4Qv/ry7 aQvbZcsld1JEeWcLaswxuI+8ZL0i1WcJKAHUqYWrgAYo6CZG6SdJ6nFgva0KvCltgfcLJ/R2mQVSb AuCWwGMDMv7PT7eIhjh7XHiJdhRKrwkh0PnLvbc+Lz2BVznJJrxS87dcPpET+VVNHaeiJTojLEnev +4s9/kCBA==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lJKpw-001oM9-En; Mon, 08 Mar 2021 18:42:36 +0000 Received: from mail.kernel.org ([198.145.29.99]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lJKpq-001oKP-8i for linux-arm-kernel@lists.infradead.org; Mon, 08 Mar 2021 18:42:33 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 27C406521D; Mon, 8 Mar 2021 18:42:26 +0000 (UTC) Date: Mon, 8 Mar 2021 18:42:15 +0000 From: Catalin Marinas To: Andrey Konovalov Cc: Will Deacon , Andrew Morton , Vincenzo Frascino , Dmitry Vyukov , Andrey Ryabinin , Alexander Potapenko , Marco Elver , Peter Collingbourne , Evgenii Stepanov , Branislav Rankov , Kevin Brodsky , kasan-dev@googlegroups.com, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: Re: [PATCH] arm64: kasan: fix page_alloc tagging with DEBUG_VIRTUAL Message-ID: <20210308184214.GI15644@arm.com> References: <4b55b35202706223d3118230701c6a59749d9b72.1615219501.git.andreyknvl@google.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <4b55b35202706223d3118230701c6a59749d9b72.1615219501.git.andreyknvl@google.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-20210308_184231_864253_DCAF6EF1 X-CRM114-Status: GOOD ( 15.28 ) 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, Mar 08, 2021 at 05:10:23PM +0100, Andrey Konovalov wrote: > When CONFIG_DEBUG_VIRTUAL is enabled, the default page_to_virt() macro > implementation from include/linux/mm.h is used. That definition doesn't > account for KASAN tags, which leads to no tags on page_alloc allocations. > > Provide an arm64-specific definition for page_to_virt() when > CONFIG_DEBUG_VIRTUAL is enabled that takes care of KASAN tags. > > Fixes: 2813b9c02962 ("kasan, mm, arm64: tag non slab memory allocated via pagealloc") > Cc: > Signed-off-by: Andrey Konovalov > --- > arch/arm64/include/asm/memory.h | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h > index c759faf7a1ff..0aabc3be9a75 100644 > --- a/arch/arm64/include/asm/memory.h > +++ b/arch/arm64/include/asm/memory.h > @@ -328,6 +328,11 @@ static inline void *phys_to_virt(phys_addr_t x) > #define ARCH_PFN_OFFSET ((unsigned long)PHYS_PFN_OFFSET) > > #if !defined(CONFIG_SPARSEMEM_VMEMMAP) || defined(CONFIG_DEBUG_VIRTUAL) > +#define page_to_virt(x) ({ \ > + __typeof__(x) __page = x; \ > + void *__addr = __va(page_to_phys(__page)); \ > + (void *)__tag_set((const void *)__addr, page_kasan_tag(__page));\ > +}) > #define virt_to_page(x) pfn_to_page(virt_to_pfn(x)) Reviewed-by: Catalin Marinas _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel 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.2 required=3.0 tests=BAYES_00, 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 B05BBC433DB for ; Mon, 8 Mar 2021 18:42:31 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 58E2865218 for ; Mon, 8 Mar 2021 18:42:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 58E2865218 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id CF5148D005E; Mon, 8 Mar 2021 13:42:30 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id CA52F8D001D; Mon, 8 Mar 2021 13:42:30 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B46178D005E; Mon, 8 Mar 2021 13:42:30 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0193.hostedemail.com [216.40.44.193]) by kanga.kvack.org (Postfix) with ESMTP id 99BB78D001D for ; Mon, 8 Mar 2021 13:42:30 -0500 (EST) Received: from smtpin25.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 5C0684427 for ; Mon, 8 Mar 2021 18:42:30 +0000 (UTC) X-FDA: 77897577660.25.0B2127C Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf19.hostedemail.com (Postfix) with ESMTP id 81B8990009E8 for ; Mon, 8 Mar 2021 18:42:28 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id 27C406521D; Mon, 8 Mar 2021 18:42:26 +0000 (UTC) Date: Mon, 8 Mar 2021 18:42:15 +0000 From: Catalin Marinas To: Andrey Konovalov Cc: Will Deacon , Andrew Morton , Vincenzo Frascino , Dmitry Vyukov , Andrey Ryabinin , Alexander Potapenko , Marco Elver , Peter Collingbourne , Evgenii Stepanov , Branislav Rankov , Kevin Brodsky , kasan-dev@googlegroups.com, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: Re: [PATCH] arm64: kasan: fix page_alloc tagging with DEBUG_VIRTUAL Message-ID: <20210308184214.GI15644@arm.com> References: <4b55b35202706223d3118230701c6a59749d9b72.1615219501.git.andreyknvl@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4b55b35202706223d3118230701c6a59749d9b72.1615219501.git.andreyknvl@google.com> User-Agent: Mutt/1.10.1 (2018-07-13) X-Stat-Signature: mepqmz8aayu3x1z9gbhs4wd56o1au5xo X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 81B8990009E8 Received-SPF: none (kernel.org>: No applicable sender policy available) receiver=imf19; identity=mailfrom; envelope-from=""; helo=mail.kernel.org; client-ip=198.145.29.99 X-HE-DKIM-Result: none/none X-HE-Tag: 1615228948-92461 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Mon, Mar 08, 2021 at 05:10:23PM +0100, Andrey Konovalov wrote: > When CONFIG_DEBUG_VIRTUAL is enabled, the default page_to_virt() macro > implementation from include/linux/mm.h is used. That definition doesn't > account for KASAN tags, which leads to no tags on page_alloc allocations. > > Provide an arm64-specific definition for page_to_virt() when > CONFIG_DEBUG_VIRTUAL is enabled that takes care of KASAN tags. > > Fixes: 2813b9c02962 ("kasan, mm, arm64: tag non slab memory allocated via pagealloc") > Cc: > Signed-off-by: Andrey Konovalov > --- > arch/arm64/include/asm/memory.h | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h > index c759faf7a1ff..0aabc3be9a75 100644 > --- a/arch/arm64/include/asm/memory.h > +++ b/arch/arm64/include/asm/memory.h > @@ -328,6 +328,11 @@ static inline void *phys_to_virt(phys_addr_t x) > #define ARCH_PFN_OFFSET ((unsigned long)PHYS_PFN_OFFSET) > > #if !defined(CONFIG_SPARSEMEM_VMEMMAP) || defined(CONFIG_DEBUG_VIRTUAL) > +#define page_to_virt(x) ({ \ > + __typeof__(x) __page = x; \ > + void *__addr = __va(page_to_phys(__page)); \ > + (void *)__tag_set((const void *)__addr, page_kasan_tag(__page));\ > +}) > #define virt_to_page(x) pfn_to_page(virt_to_pfn(x)) Reviewed-by: Catalin Marinas