From patchwork Fri Feb 26 01:25:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 12105583 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 D463CC433E0 for ; Fri, 26 Feb 2021 01:25:52 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 6D5DC64EF5 for ; Fri, 26 Feb 2021 01:25:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6D5DC64EF5 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 DD69E8D000B; Thu, 25 Feb 2021 20:25:49 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D5F8A6B011C; Thu, 25 Feb 2021 20:25:49 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C568A6B011A; Thu, 25 Feb 2021 20:25:49 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0246.hostedemail.com [216.40.44.246]) by kanga.kvack.org (Postfix) with ESMTP id AAB446B011A for ; Thu, 25 Feb 2021 20:25:49 -0500 (EST) Received: from smtpin27.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 7C3BAF04B for ; Fri, 26 Feb 2021 01:25:49 +0000 (UTC) X-FDA: 77858677218.27.957E94F Received: from mail-qv1-f73.google.com (mail-qv1-f73.google.com [209.85.219.73]) by imf26.hostedemail.com (Postfix) with ESMTP id 6E45B407F8EB for ; Fri, 26 Feb 2021 01:25:44 +0000 (UTC) Received: by mail-qv1-f73.google.com with SMTP id z25so1918305qva.10 for ; Thu, 25 Feb 2021 17:25:48 -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=fGyKOr2NOKevbTthD2lHJMlPg4rW22LG13Q09TJ/Cwo=; b=uJ3kYZFMxLlqqaX2Rpd/bNsgXGp/tuRktWkUVuBsiZevS3FWcgeedNlg1NIP9RR05Q OiW5+84gPyysjLwJ8tA1/8rRWRei2XESjivD4O/4daEgXJgiPjvKT0VL1nqeB84Hh7yX BuK3Q8feeTPXniLZYAVwdHCAOIL8JVWc6NDK1SyFQXQrCXxf43qF+Xe4QRoOL7wA7Q88 wELUKvoBH4Sf9kgavRQ6xhikOYJpXlqip6C7sZqhsFreA5lTLNBUP56ebjqNH3XccEGg emX6/RAwlaw2MJ+mmOvc8i8Cz7fAnP4iZeIWP2aj+YEj+aWYEjoh9hR1FziZwUDwoIPw a6/g== 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=fGyKOr2NOKevbTthD2lHJMlPg4rW22LG13Q09TJ/Cwo=; b=YP6dg6yn6Dx02ssRba8OunTOje6L4HqarbcN7x8PsXrK+HsJAO2g4k6a3JBTNx3A6R hw3kUVqSRX4QO+sImb7fgMK+q8hPp/AyDvJjaXKqDFd6RCjC9I4S1leamjDlA8TLltt4 yntEkgqEabTyHJ8EvIU7Hd5JFZgAKT5UjfHLCQoX3XQtIn+wVRDscKziAE3UwPXop2Cm RUzPEtfAIb9udE60rXStQWDuUZ6S9vJutDDfsOOb/mLHpdz5FRuOeQCrrTBLBTAFXPSO ZjQ6BdEQSDD/D/r0gQyru/4LAHVOhZtjz+ZR8D1iA3xgoCCwNqu1pGuO29/ZdUndW3Jc IIqg== X-Gm-Message-State: AOAM532fHrccaCcFs3wrbN3usneZdxDjpZfk3u1ia0FdrcDalCZlRAWn 31UXCU1HV3URrGS3lAtBnS+luqo/GgSTJ4tl X-Google-Smtp-Source: ABdhPJwII1GzAbYJNaOMVsGMPtlc/00QWGiqENeLlq67efnXAPi4UcPrIte++d+RVfnvXx9+70ONFd2zGgWbbbPp X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:5c80:fb1e:3d1d:d709]) (user=andreyknvl job=sendgmr) by 2002:a0c:ec4e:: with SMTP id n14mr518858qvq.34.1614302748187; Thu, 25 Feb 2021 17:25:48 -0800 (PST) Date: Fri, 26 Feb 2021 02:25:37 +0100 Message-Id: <1aa83e48627978de8068d5e3314185f3a0d7a849.1614302398.git.andreyknvl@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.30.1.766.gb4fecdf3b7-goog Subject: [PATCH] kasan, mm: fix crash with HW_TAGS and DEBUG_PAGEALLOC From: Andrey Konovalov To: Andrew Morton Cc: Catalin Marinas , Will Deacon , Vincenzo Frascino , Dmitry Vyukov , Andrey Ryabinin , Alexander Potapenko , Marco Elver , Peter Collingbourne , Evgenii Stepanov , Branislav Rankov , Kevin Brodsky , Christoph Hellwig , kasan-dev@googlegroups.com, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 6E45B407F8EB X-Stat-Signature: zr8rqdzbbngakdsrpucxhwx87tor389k Received-SPF: none (flex--andreyknvl.bounces.google.com>: No applicable sender policy available) receiver=imf26; identity=mailfrom; envelope-from="<3HE44YAoKCKEBOESFZLOWMHPPHMF.DPNMJOVY-NNLWBDL.PSH@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: 1614302744-441082 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: Currently, kasan_free_nondeferred_pages()->kasan_free_pages() is called after debug_pagealloc_unmap_pages(). This causes a crash when debug_pagealloc is enabled, as HW_TAGS KASAN can't set tags on an unmapped page. This patch puts kasan_free_nondeferred_pages() before debug_pagealloc_unmap_pages(). Besides fixing the crash, this also makes the annotation order consistent with debug_pagealloc_map_pages() preceding kasan_alloc_pages(). Signed-off-by: Andrey Konovalov --- mm/page_alloc.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index c89e7b107514..54bc237fd319 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1311,10 +1311,14 @@ static __always_inline bool free_pages_prepare(struct page *page, */ arch_free_page(page, order); - debug_pagealloc_unmap_pages(page, 1 << order); - + /* + * With hardware tag-based KASAN, memory tags must be set + * before unmapping the page with debug_pagealloc. + */ kasan_free_nondeferred_pages(page, order, fpi_flags); + debug_pagealloc_unmap_pages(page, 1 << order); + return true; }