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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4A04AC6FA8B for ; Thu, 15 Sep 2022 15:06:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230357AbiIOPGb (ORCPT ); Thu, 15 Sep 2022 11:06:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48450 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230406AbiIOPFs (ORCPT ); Thu, 15 Sep 2022 11:05:48 -0400 Received: from mail-ej1-x64a.google.com (mail-ej1-x64a.google.com [IPv6:2a00:1450:4864:20::64a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6FB6F7E80F for ; Thu, 15 Sep 2022 08:05:07 -0700 (PDT) Received: by mail-ej1-x64a.google.com with SMTP id qw34-20020a1709066a2200b0077e0e8a55b4so5582362ejc.21 for ; Thu, 15 Sep 2022 08:05:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date; bh=vmKBMF2McNFVJqtG6TmpI3MAJxV0RMGeKyj0ZsE0Fyg=; b=gEgjEUXtMXLGLmInSdiTVr8SJtUM9dAvRmm9gTPwlvDJlkqKGsf6gLgatpF9No6GIj f1Ed6OLsNQPbRAYwMDuikJo5an+hRugAPcYR3d2idcVQVyC6hhx41fffnwLsLvYNGn+7 fnso7t/d8ggMNfh1yjqm245oFqmKs97l5uauhCjKI2lKnuKK561skile8xyfuBwUMIR2 k4457FVVXUyo6LArzKfC16VrG33HBknRIw4PTmX8bNDYzxGBz51W2hpuA84deuKw+CD+ gndPzro+ppcGwFoGvdA4uYw55JH56lxjWCZGwiQPKeGZVtfCO924G4QvZ4U1I6ciker2 cP7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date; bh=vmKBMF2McNFVJqtG6TmpI3MAJxV0RMGeKyj0ZsE0Fyg=; b=NuXCWlTbfB8FoPH+le+5cmNxvvImIKk+1pbp/cTg0/M89kZQdL5OHL8+JhimKgWhbr bEXWWpvH5z5F6Mvm8O8alyC63V/7kwZrba/Zl92YtbOwvNFb3S2PaF2qvDTastOo0GGN D8wV7BoSoOSTYkP/dSZtYpyJgNdbM8rwIBIAkpBHULT82qYitQOeNQuq000WIaQhhLIQ qfM79+4rlbXYaGQNceBQgpphDEcJlkOl/3F/Uy4tH0MUW7/GZAeyvNWTJZvuQBCMRNTy gGBwl6hqLy7MAM5LGBRUalSzadk8+4Fp6l2Yrzo9ly3j4vUll9+nU7dNb0MOkVhQGGrE gcmg== X-Gm-Message-State: ACrzQf1zqga0TYgkAidVLQW33rvwEsmWL89+XJEr5hZKLUoqgssIiGwT qmgxedgej6aoaf5hL/MrFB53c080rME= X-Google-Smtp-Source: AMsMyM4KMV/DJpiNOvzRLXTErTnexkmGTLdYCR5aeQSVv8s3wGGoLlfOMidq99otIc+vGxZhLpSlcwNoSfA= X-Received: from glider.muc.corp.google.com ([2a00:79e0:9c:201:686d:27b5:495:85b7]) (user=glider job=sendgmr) by 2002:a05:6402:5112:b0:451:cb1d:c46f with SMTP id m18-20020a056402511200b00451cb1dc46fmr254990edd.35.1663254305960; Thu, 15 Sep 2022 08:05:05 -0700 (PDT) Date: Thu, 15 Sep 2022 17:03:44 +0200 In-Reply-To: <20220915150417.722975-1-glider@google.com> Mime-Version: 1.0 References: <20220915150417.722975-1-glider@google.com> X-Mailer: git-send-email 2.37.2.789.g6183377224-goog Message-ID: <20220915150417.722975-11-glider@google.com> Subject: [PATCH v7 10/43] libnvdimm/pfn_dev: increase MAX_STRUCT_PAGE_SIZE From: Alexander Potapenko To: glider@google.com Cc: Alexander Viro , Alexei Starovoitov , Andrew Morton , Andrey Konovalov , Andy Lutomirski , Arnd Bergmann , Borislav Petkov , Christoph Hellwig , Christoph Lameter , David Rientjes , Dmitry Vyukov , Eric Biggers , Eric Dumazet , Greg Kroah-Hartman , Herbert Xu , Ilya Leoshkevich , Ingo Molnar , Jens Axboe , Joonsoo Kim , Kees Cook , Marco Elver , Mark Rutland , Matthew Wilcox , "Michael S. Tsirkin" , Pekka Enberg , Peter Zijlstra , Petr Mladek , Stephen Rothwell , Steven Rostedt , Thomas Gleixner , Vasily Gorbik , Vegard Nossum , Vlastimil Babka , kasan-dev@googlegroups.com, linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-arch@vger.kernel.org KMSAN adds extra metadata fields to struct page, so it does not fit into 64 bytes anymore. This change leads to increased memory consumption of the nvdimm driver, regardless of whether the kernel is built with KMSAN or not. Signed-off-by: Alexander Potapenko Reviewed-by: Marco Elver --- Link: https://linux-review.googlesource.com/id/I353796acc6a850bfd7bb342aa1b63e616fc614f1 --- drivers/nvdimm/nd.h | 2 +- drivers/nvdimm/pfn_devs.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/nvdimm/nd.h b/drivers/nvdimm/nd.h index ec5219680092d..85ca5b4da3cf3 100644 --- a/drivers/nvdimm/nd.h +++ b/drivers/nvdimm/nd.h @@ -652,7 +652,7 @@ void devm_namespace_disable(struct device *dev, struct nd_namespace_common *ndns); #if IS_ENABLED(CONFIG_ND_CLAIM) /* max struct page size independent of kernel config */ -#define MAX_STRUCT_PAGE_SIZE 64 +#define MAX_STRUCT_PAGE_SIZE 128 int nvdimm_setup_pfn(struct nd_pfn *nd_pfn, struct dev_pagemap *pgmap); #else static inline int nvdimm_setup_pfn(struct nd_pfn *nd_pfn, diff --git a/drivers/nvdimm/pfn_devs.c b/drivers/nvdimm/pfn_devs.c index 0e92ab4b32833..61af072ac98f9 100644 --- a/drivers/nvdimm/pfn_devs.c +++ b/drivers/nvdimm/pfn_devs.c @@ -787,7 +787,7 @@ static int nd_pfn_init(struct nd_pfn *nd_pfn) * when populating the vmemmap. This *should* be equal to * PMD_SIZE for most architectures. * - * Also make sure size of struct page is less than 64. We + * Also make sure size of struct page is less than 128. We * want to make sure we use large enough size here so that * we don't have a dynamic reserve space depending on * struct page size. But we also want to make sure we notice -- 2.37.2.789.g6183377224-goog