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=-26.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT,USER_IN_DEF_DKIM_WL 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 A0D13C433DB for ; Tue, 30 Mar 2021 16:38:13 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 305566195D for ; Tue, 30 Mar 2021 16:38:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 305566195D 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 C45786B0081; Tue, 30 Mar 2021 12:38:12 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C1C6E6B0082; Tue, 30 Mar 2021 12:38:12 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AE4466B0083; Tue, 30 Mar 2021 12:38:12 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0086.hostedemail.com [216.40.44.86]) by kanga.kvack.org (Postfix) with ESMTP id 96F9F6B0081 for ; Tue, 30 Mar 2021 12:38:12 -0400 (EDT) Received: from smtpin38.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 4DE74181AEF1D for ; Tue, 30 Mar 2021 16:38:12 +0000 (UTC) X-FDA: 77977098024.38.FB4D87D Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) by imf19.hostedemail.com (Postfix) with ESMTP id 5D6A69001142 for ; Tue, 30 Mar 2021 16:37:59 +0000 (UTC) Received: by mail-wm1-f73.google.com with SMTP id j8so700718wmq.6 for ; Tue, 30 Mar 2021 09:38:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=SNuqqyD1tP1LYYPE4x3JSrsZ8EwStb88MAUaMmFkoIk=; b=THEbeG6qdl3QydVONL/rXH5xUys8SIgs+UvdH2PXVDfddWMvAEBD2x5vBMOWd6Bqnm RjfJ+oYMixbdPBEqra1jLDaZp2YPaJ0eOh3eUmXnAN568jGyzsrT55L0/Z9do/Ec3z8J PnXHcNm6ejCaqXAckgEcwv0iQgYRGpZiscydfXvEic7YmUcbQfybYjKK0pGsw9f4pSQP Dg8I/jHDePk0Im2VBiJ0wodJPyOaJi5Z7TmbEClgoCB+y4zSWJ8HuiCkc4C84TYe26pk ndCD4suL+LYX/sh8dmZC5nkIY5eu9vunB91LSMdOCD+gNcvuDVTznP8vmz7vo9lxgF5D Nt2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=SNuqqyD1tP1LYYPE4x3JSrsZ8EwStb88MAUaMmFkoIk=; b=ibs2WOKWfGW62w/XGBEy7wtnjCzRL4Jd8QvxOMqK/jJUMgXFRWq+384Dm2drMiCtOC T2MQKW9vRYEtpnpvrkxdWJ7amWO64NKZexIHDCi9KaDBLzCdrSbwkrnFobKyshTo177+ vmFYOcQxnBqbSHryWZFZHCTNNnaBmz+0S6FzgcUnFAEnrBDMOS9WTaiJsE8B1UAn84xD eYgE3iVa5d6OqowVXgZwdVX2eazzXJe6n/xPGv38e1reqgr3Hi3PbwulvbgjbofjWA7a 1nkdOda4YgVwrQ8fQrrXV5qu3ik4yyqKUvFDpGmzx8Hxtloog1x4v4IF4EU+f24Agtqv 23zg== X-Gm-Message-State: AOAM531WRd0cpmE/y0XsEdJEIGcuU2MmjQ1Cqdfd1Dwmu6pDupcwIx5d qNEuZ1K5/H2DHXd0YuNk3FxW2mFZRuxuPUxA X-Google-Smtp-Source: ABdhPJzSw0mO64h44KApJp+BDWP571t6gBuceBI8pSQDIyJx1vO3lgBzlHb5UwsYOy9HH2XMf0nxyNoQtiAw05H6 X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:f567:b52b:fb1e:b54e]) (user=andreyknvl job=sendgmr) by 2002:a1c:1f4a:: with SMTP id f71mr4905469wmf.101.1617122280880; Tue, 30 Mar 2021 09:38:00 -0700 (PDT) Date: Tue, 30 Mar 2021 18:37:36 +0200 Message-Id: <65b6028dea2e9a6e8e2cb779b5115c09457363fc.1617122211.git.andreyknvl@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.31.0.291.g576ba9dcdaf-goog Subject: [PATCH mm v2] mm, kasan: fix for "integrate page_alloc init with HW_TAGS" From: Andrey Konovalov To: Andrew Morton Cc: Vlastimil Babka , Sergei Trofimovich , Alexander Potapenko , Marco Elver , Dmitry Vyukov , Andrey Ryabinin , Andrey Konovalov , kasan-dev@googlegroups.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov Content-Type: text/plain; charset="UTF-8" X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 5D6A69001142 X-Stat-Signature: 4uz4yeyhrqfdsb858yfkhd19ag6ijzym Received-SPF: none (flex--andreyknvl.bounces.google.com>: No applicable sender policy available) receiver=imf19; identity=mailfrom; envelope-from="<36FNjYAoKCCcDQGUHbNQYOJRRJOH.FRPOLQXa-PPNYDFN.RUJ@flex--andreyknvl.bounces.google.com>"; helo=mail-wm1-f73.google.com; client-ip=209.85.128.73 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1617122279-750544 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: My commit "integrate page_alloc init with HW_TAGS" changed the order of kernel_unpoison_pages() and kernel_init_free_pages() calls. This leads to complaints from the page unpoisoning code, as the poison pattern gets overwritten for __GFP_ZERO allocations. Fix by restoring the initial order. Also add a warning comment. Reported-by: Vlastimil Babka Reported-by: Sergei Trofimovich Signed-off-by: Andrey Konovalov --- mm/page_alloc.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 033bd92e8398..d2c020563c0b 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -2328,6 +2328,13 @@ inline void post_alloc_hook(struct page *page, unsigned int order, arch_alloc_page(page, order); debug_pagealloc_map_pages(page, 1 << order); + /* + * Page unpoisoning must happen before memory initialization. + * Otherwise, the poison pattern will be overwritten for __GFP_ZERO + * allocations and the page unpoisoning code will complain. + */ + kernel_unpoison_pages(page, 1 << order); + /* * As memory initialization might be integrated into KASAN, * kasan_alloc_pages and kernel_init_free_pages must be @@ -2338,7 +2345,6 @@ inline void post_alloc_hook(struct page *page, unsigned int order, if (init && !kasan_has_integrated_init()) kernel_init_free_pages(page, 1 << order); - kernel_unpoison_pages(page, 1 << order); set_page_owner(page, order, gfp_flags); } -- 2.31.0.291.g576ba9dcdaf-goog