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=unavailable 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 14633C433DB for ; Tue, 30 Mar 2021 15:32:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D7C1D619BA for ; Tue, 30 Mar 2021 15:32:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232283AbhC3PcR (ORCPT ); Tue, 30 Mar 2021 11:32:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59108 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232432AbhC3Pb6 (ORCPT ); Tue, 30 Mar 2021 11:31:58 -0400 Received: from mail-wm1-x34a.google.com (mail-wm1-x34a.google.com [IPv6:2a00:1450:4864:20::34a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5D512C061574 for ; Tue, 30 Mar 2021 08:31:58 -0700 (PDT) Received: by mail-wm1-x34a.google.com with SMTP id c9so630393wme.5 for ; Tue, 30 Mar 2021 08:31:58 -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=3cy7QAZwcM0qFIMC//13hJw8FRpw0MBxMbErk7zBrt4=; b=hTB5eRLtCe5NqZk2lmE+RtfJKTufqW8xwNBuVspthnS2F1BfGX4jeWY2GkXPEnMBSw 80L6q4iQDtV36/tBpGpoCepa+EjvAWAWapt1w53TW9phkLZtiN4eum+tYuVjvYPQCclf zQLNuDknXSsBTO4dVduFRu8ugjcSjJiciIOqcagk7Rwh54lrN3wlUz9b1PBadZmyUHZ9 hUF8tIkLxgvgGxPpannVnFuCuAx0H3fLDs9jb2/GEQDv+sbKzyIFstT0gIvIxjaz37G8 Wq5FVgkWFQZW5w8F/Ahmde0ZHveN9hpTvN1n1UtGFbkNkP/A+wfycovKPvYNmgA6qSrL QwJw== 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=3cy7QAZwcM0qFIMC//13hJw8FRpw0MBxMbErk7zBrt4=; b=Ll4HcdI85t11tPl+tpwIvC73db62d4q43ZEhWl2IavJjS9GLd/daO0h5XdhAn3nFe6 /WVIPh6lA20vZUGxflcjNcUODmG3UE4mOgY42/tQdMjMS5bptEqnylDeXLef/oEys8oG AhEp6jmsReev9XgqFqsMv583j9kMAkzwfE9p0vLlI/Q+SIE/ZB4fNeWGMJdutt/UScxm IkW4J+wLlA3MZc6PGA3Pwtd8Ur/o1u7JthQGNAjZFp0a1FprlNLs3bFmtHd0e8t4BByJ 1imi48eF0jxiD8c2uIgjP4EEmJjUQ7W6baWXK1SKEY3zb5gdCjNNLXKYZbU40/aC2kUe qBVA== X-Gm-Message-State: AOAM532l80HpuYiY/Xz20blEfvxZT6XlGtkt1Y/Y0nn3yexHR8C3bX85 SomKDaUrPGB1ylEhFvCSj6BE9mb6EdIMhHFl X-Google-Smtp-Source: ABdhPJw0vSXe4Xw64WO8uJrYsy7s7rzJcu18Vn5SMJYlS+KZ3mLl65FDIFCfjsv0oByaw6aiJVEWtthfNGpvlg45 X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:f567:b52b:fb1e:b54e]) (user=andreyknvl job=sendgmr) by 2002:a7b:ce06:: with SMTP id m6mr4526147wmc.38.1617118316958; Tue, 30 Mar 2021 08:31:56 -0700 (PDT) Date: Tue, 30 Mar 2021 17:31:54 +0200 Message-Id: <2e5e80481533e73876d5d187d1f278f9656df73a.1617118134.git.andreyknvl@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.31.0.291.g576ba9dcdaf-goog Subject: [PATCH mm] 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" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 __GFP_ZERO allocations being incorrectly poisoned when page poisoning is enabled. 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 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 033bd92e8398..1fc5061f8ca1 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -2328,6 +2328,12 @@ 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, a __GFP_ZERO allocation will not be initialized. + */ + 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 +2344,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 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 0CF94C433DB for ; Tue, 30 Mar 2021 15:32:06 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 8206C619AB for ; Tue, 30 Mar 2021 15:32:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8206C619AB 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 D53F26B0080; Tue, 30 Mar 2021 11:32:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D04776B0082; Tue, 30 Mar 2021 11:32:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BA5496B0085; Tue, 30 Mar 2021 11:32:04 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0085.hostedemail.com [216.40.44.85]) by kanga.kvack.org (Postfix) with ESMTP id 9DD2A6B0080 for ; Tue, 30 Mar 2021 11:32:04 -0400 (EDT) Received: from smtpin29.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 5EADD82499A8 for ; Tue, 30 Mar 2021 15:32:04 +0000 (UTC) X-FDA: 77976931368.29.D2824B4 Received: from mail-wr1-f73.google.com (mail-wr1-f73.google.com [209.85.221.73]) by imf07.hostedemail.com (Postfix) with ESMTP id BE194A0049FF for ; Tue, 30 Mar 2021 15:31:59 +0000 (UTC) Received: by mail-wr1-f73.google.com with SMTP id r12so10572102wro.15 for ; Tue, 30 Mar 2021 08:31:58 -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=3cy7QAZwcM0qFIMC//13hJw8FRpw0MBxMbErk7zBrt4=; b=hTB5eRLtCe5NqZk2lmE+RtfJKTufqW8xwNBuVspthnS2F1BfGX4jeWY2GkXPEnMBSw 80L6q4iQDtV36/tBpGpoCepa+EjvAWAWapt1w53TW9phkLZtiN4eum+tYuVjvYPQCclf zQLNuDknXSsBTO4dVduFRu8ugjcSjJiciIOqcagk7Rwh54lrN3wlUz9b1PBadZmyUHZ9 hUF8tIkLxgvgGxPpannVnFuCuAx0H3fLDs9jb2/GEQDv+sbKzyIFstT0gIvIxjaz37G8 Wq5FVgkWFQZW5w8F/Ahmde0ZHveN9hpTvN1n1UtGFbkNkP/A+wfycovKPvYNmgA6qSrL QwJw== 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=3cy7QAZwcM0qFIMC//13hJw8FRpw0MBxMbErk7zBrt4=; b=Gkc5unGKJzzL+gTZoMXQd8Y4V2cL/8wZUm+ytiqYnzl4KZreaHspEaBu/gym0f1RT6 +pLDoP2X1hqOmJCCmANQia2M5PBlgf/jN1IwisDIi3GGo92cfcdrVELLjhfLc19qkQQc hc3kVdLO5aM9TL5kTA75w8yOw3TmN5GdJkiT2AWKrkV/N//8yTj9BfmJ02PFGsBiHVk6 wo/XxBGSRa6TGBs9mU0uloSu6upE5nYacvToUQaWz/bcxncy6UlAN09YjGbikHcUSAlW 6ClYgyRFMFcrcG0Yi2OQ3qhjC/Cjlwr32f4XzHXL42Wlls8gjwkw8bJFQsPwo/BsBp2D wucw== X-Gm-Message-State: AOAM533hEkMVde1KmoAQq0xH7uFduMbf7pFGDuzGlc5hXn+pm1gAqUTi cQbj+r1OIR/CLuSfWJKJvoOKO+Lzd14jeuaF X-Google-Smtp-Source: ABdhPJw0vSXe4Xw64WO8uJrYsy7s7rzJcu18Vn5SMJYlS+KZ3mLl65FDIFCfjsv0oByaw6aiJVEWtthfNGpvlg45 X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:f567:b52b:fb1e:b54e]) (user=andreyknvl job=sendgmr) by 2002:a7b:ce06:: with SMTP id m6mr4526147wmc.38.1617118316958; Tue, 30 Mar 2021 08:31:56 -0700 (PDT) Date: Tue, 30 Mar 2021 17:31:54 +0200 Message-Id: <2e5e80481533e73876d5d187d1f278f9656df73a.1617118134.git.andreyknvl@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.31.0.291.g576ba9dcdaf-goog Subject: [PATCH mm] 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-Queue-Id: BE194A0049FF X-Stat-Signature: doz38j33rgaygs5mpfzmesykuerzk3dm X-Rspamd-Server: rspam02 Received-SPF: none (flex--andreyknvl.bounces.google.com>: No applicable sender policy available) receiver=imf07; identity=mailfrom; envelope-from="<3bERjYAoKCIsp2s6tDz2A0v33v0t.r310x29C-11zAprz.36v@flex--andreyknvl.bounces.google.com>"; helo=mail-wr1-f73.google.com; client-ip=209.85.221.73 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1617118319-39423 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 __GFP_ZERO allocations being incorrectly poisoned when page poisoning is enabled. 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 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 033bd92e8398..1fc5061f8ca1 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -2328,6 +2328,12 @@ 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, a __GFP_ZERO allocation will not be initialized. + */ + 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 +2344,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