From patchwork Mon Mar 8 16:10:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 12122879 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=-16.6 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, 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 044D9C433E0 for ; Mon, 8 Mar 2021 16:10:33 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 7E0026522D for ; Mon, 8 Mar 2021 16:10:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7E0026522D Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 1290B8D0049; Mon, 8 Mar 2021 11:10:32 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0B0D08D001D; Mon, 8 Mar 2021 11:10:32 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E1D4D8D0049; Mon, 8 Mar 2021 11:10:31 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0241.hostedemail.com [216.40.44.241]) by kanga.kvack.org (Postfix) with ESMTP id BFD4B8D001D for ; Mon, 8 Mar 2021 11:10:31 -0500 (EST) Received: from smtpin19.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 72B66364D for ; Mon, 8 Mar 2021 16:10:31 +0000 (UTC) X-FDA: 77897194662.19.85CB29A Received: from mail-qv1-f73.google.com (mail-qv1-f73.google.com [209.85.219.73]) by imf16.hostedemail.com (Postfix) with ESMTP id 6C8D180192E6 for ; Mon, 8 Mar 2021 16:10:30 +0000 (UTC) Received: by mail-qv1-f73.google.com with SMTP id jx11so7986493qvb.10 for ; Mon, 08 Mar 2021 08:10:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:message-id:mime-version:subject:from:to:cc; bh=oHoXOsuCgC7xf9AhbyLfG6oKwbjtqz3UKDIdpKdyom4=; b=f9G5VYb61NRmKnzQ+kJ/qIpehGxvh6Tl91nXblnBclVVfILnCqa4K859ACPoRgJlB8 BoM3WccpS5s0XNN/J9e7i1yxAqR54D7Q8KhM6bWU3bfToS0R9THLQiJSiN2y/7s0jDhG IQx8aMiHoG9fuvf6Jb5LTJ40gTRJ52IIZR37dYZPfL4l2oaPXd+1MIEd3LWw9fihHBKV IwJ7AwEc1xgXPB8PeOlXUPLcQT8OBnuAt4C0L/Xl5l2sDfLhXTDapGBbAgZL+eaOOTif 0v7C7icnv33OwwWvsffPMTXY8frYoUw0gygqncQxcPFTxHvyLA3bQ/l9yoACAqebGhzx Omhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:message-id:mime-version:subject:from :to:cc; bh=oHoXOsuCgC7xf9AhbyLfG6oKwbjtqz3UKDIdpKdyom4=; b=Vqv7OnuSySWvz+xgEBJF2Hj1oKQ+Is9J8As+kjWoORtcI7/AM99UkXGJNI5opvNI2v MTWwKE+XxgZxxKQivIYk8PXx55W4sHnapijPk+3vmLPU6oh/8UYP//9bKFw9veUcD0F5 gGxq7536JEA6U2EADrJuvAydBNM7YlTX2JHgv6xyrHnaFRgcrknl0QD4hGHfiT6MT7iN LlHoGtxiNRZBH1JW0IsV57sYo7WIyqUFJYRZkUXYN5gGyStZOo1fuwQ5Dlx68Kr9EsXG aR04xVRUqAeCYfwhdHoYoMCXIiuBsCRuVZyg57uyEBCZoAj6+B6DdJSrvZoZyAz58AAP 0tkg== X-Gm-Message-State: AOAM533U8YrW3Qy1l6/XmX48dlYlnid+EHEoQ4ie7x9h9xcm9wv5gBFp FdwZKSgbRsIPl74H/qOlZ2H47DkYF8QNqn0f X-Google-Smtp-Source: ABdhPJzK8pae1qjyFps8+oVppA/0pZjgQL3oiraxl7iLzIThic5NbHNq9hzZeXogGGytNeUHqmd0t1gVKDVN4Mck X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:85fb:aac9:69ed:e574]) (user=andreyknvl job=sendgmr) by 2002:a0c:f890:: with SMTP id u16mr21837557qvn.21.1615219829599; Mon, 08 Mar 2021 08:10:29 -0800 (PST) Date: Mon, 8 Mar 2021 17:10:23 +0100 Message-Id: <4b55b35202706223d3118230701c6a59749d9b72.1615219501.git.andreyknvl@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.30.1.766.gb4fecdf3b7-goog Subject: [PATCH] arm64: kasan: fix page_alloc tagging with DEBUG_VIRTUAL From: Andrey Konovalov To: Catalin Marinas , Will Deacon Cc: 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, Andrey Konovalov , stable@vger.kernel.org X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 6C8D180192E6 X-Stat-Signature: x9byx68f3txzbr7dxg5roizq5a3gutqc Received-SPF: none (flex--andreyknvl.bounces.google.com>: No applicable sender policy available) receiver=imf16; identity=mailfrom; envelope-from="<3dUxGYAoKCDAMZPdQkWZhXSaaSXQ.OaYXUZgj-YYWhMOW.adS@flex--andreyknvl.bounces.google.com>"; helo=mail-qv1-f73.google.com; client-ip=209.85.219.73 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1615219830-752260 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: 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 Reviewed-by: Catalin Marinas --- 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)) #else #define page_to_virt(x) ({ \