From patchwork Tue Mar 29 12:39:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Potapenko X-Patchwork-Id: 12794761 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id E564CC433EF for ; Tue, 29 Mar 2022 12:41:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7B4088D0003; Tue, 29 Mar 2022 08:41:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7639F8D0001; Tue, 29 Mar 2022 08:41:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 62C188D0003; Tue, 29 Mar 2022 08:41:03 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (relay.hostedemail.com [64.99.140.25]) by kanga.kvack.org (Postfix) with ESMTP id 539128D0001 for ; Tue, 29 Mar 2022 08:41:03 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 24358236F8 for ; Tue, 29 Mar 2022 12:41:03 +0000 (UTC) X-FDA: 79297383606.02.A279C5E Received: from mail-ej1-f73.google.com (mail-ej1-f73.google.com [209.85.218.73]) by imf14.hostedemail.com (Postfix) with ESMTP id ABD8C10000C for ; Tue, 29 Mar 2022 12:41:02 +0000 (UTC) Received: by mail-ej1-f73.google.com with SMTP id ml20-20020a170906cc1400b006df8c9357efso8110522ejb.21 for ; Tue, 29 Mar 2022 05:41:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=km5owwejhlOXuN0CdtXT+rH3PwGCxkXBDIlOmz8F8mM=; b=BPBN+Gp/HybRIj+tr7lmAPtZ/gaSTg17YfV70uHe6dI4D03YCmDJ28J1xxu73jh2dk lunM+tJfRxIWWCTitc1zqeGcNO6ui2olt/ToR74zTeetb2t645zaZRfbXnEBWBeufQcz UZFI/a7dadkwv9KhIIRq4n83fNxSMacV6CuDKWLbiQmxkp72N4gUGhDLhrX/ZY/tzqb+ wwmGDuW3C5VDusIt/9kLL08QT9f400t0JOILiCvI+CWdGaKJ8/8ZTha18LD969Vanzph EmE7KmmpEFFeSjxO/yybRJOhoovSm59NPOFmQeJCjBwZk6WuGl9hl0wb88xwAHT3OeLk 9zLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=km5owwejhlOXuN0CdtXT+rH3PwGCxkXBDIlOmz8F8mM=; b=cRZDDqDLI27TUkULe6luY0JoXIi3IuHq5bowUxrt9nunBi5eCj3Opvs6RcAdwrc15h 1tgInjtvuqCqGYjH3wJlBHhLzL29tFZHejBKS0RLCKD/sk6JWjFNDlhkkmgD8wsAYVub u4OLy/vJ47FpZz3yNh4sHdIk1a19wuBnUV5hwNcdZ09YZDf8jYSXGSGMXzp/Y7sN6129 TaJ59btkig101kmN5vgXlVCClgHLD+uX07klYvaURIIwUTX3ZSZR4cPNKR8G6ZgLPu4O bLPYKCvPgZTy/i3ngw8SEyDxSE4dgIcSKx2CDrSmdftTfcMSpUMyL1UtIE7KA5J/WYVL yAAw== X-Gm-Message-State: AOAM5306oZRWJtRqj4oxzu4TNhXTp9Wr5UckpC7QOoS1BW5n2Q0t62CB XCeN4hN56WDHeKYPV9IEWM47YKFP5+k= X-Google-Smtp-Source: ABdhPJxTFdKgNMHXnOGxM/ndXx2ll4nIIoJnFlW5u5FSX6vDALAQ8Bv8xnOw9ZMBkOj50HuqwBsroT31ous= X-Received: from glider.muc.corp.google.com ([2a00:79e0:15:13:36eb:759:798f:98c3]) (user=glider job=sendgmr) by 2002:a05:6402:27c7:b0:41b:51ca:f542 with SMTP id c7-20020a05640227c700b0041b51caf542mr3174378ede.149.1648557657545; Tue, 29 Mar 2022 05:40:57 -0700 (PDT) Date: Tue, 29 Mar 2022 14:39:40 +0200 In-Reply-To: <20220329124017.737571-1-glider@google.com> Message-Id: <20220329124017.737571-12-glider@google.com> Mime-Version: 1.0 References: <20220329124017.737571-1-glider@google.com> X-Mailer: git-send-email 2.35.1.1021.g381101b075-goog Subject: [PATCH v2 11/48] libnvdimm/pfn_dev: increase MAX_STRUCT_PAGE_SIZE From: Alexander Potapenko To: glider@google.com Cc: Alexander Viro , Andrew Morton , Andrey Konovalov , Andy Lutomirski , Arnd Bergmann , Borislav Petkov , Christoph Hellwig , Christoph Lameter , David Rientjes , Dmitry Vyukov , 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 , Steven Rostedt , Thomas Gleixner , Vasily Gorbik , Vegard Nossum , Vlastimil Babka , linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org X-Stat-Signature: 8h6zzpe7u4k67ykhu5sgftsb91r5q44p X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: ABD8C10000C Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b="BPBN+Gp/"; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf14.hostedemail.com: domain of 3Wf5CYgYKCHoejgbcpemmejc.amkjglsv-kkitYai.mpe@flex--glider.bounces.google.com designates 209.85.218.73 as permitted sender) smtp.mailfrom=3Wf5CYgYKCHoejgbcpemmejc.amkjglsv-kkitYai.mpe@flex--glider.bounces.google.com X-Rspam-User: X-HE-Tag: 1648557662-535802 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: KMSAN adds extra metadata fields to struct page, so it does not fit into 64 bytes anymore. Signed-off-by: Alexander Potapenko --- 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 6f8ce114032d0..b50aecd1dd423 100644 --- a/drivers/nvdimm/nd.h +++ b/drivers/nvdimm/nd.h @@ -663,7 +663,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 58eda16f5c534..07a539195cc8b 100644 --- a/drivers/nvdimm/pfn_devs.c +++ b/drivers/nvdimm/pfn_devs.c @@ -785,7 +785,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