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=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,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 1BD68C388F9 for ; Fri, 23 Oct 2020 18:32:51 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 68E99208E4 for ; Fri, 23 Oct 2020 18:32:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=nvidia.com header.i=@nvidia.com header.b="cqi0Zd3G" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 68E99208E4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=nvidia.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 776986B005D; Fri, 23 Oct 2020 14:32:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 726566B0062; Fri, 23 Oct 2020 14:32:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5CA426B0068; Fri, 23 Oct 2020 14:32:49 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0152.hostedemail.com [216.40.44.152]) by kanga.kvack.org (Postfix) with ESMTP id 2B78E6B005D for ; Fri, 23 Oct 2020 14:32:49 -0400 (EDT) Received: from smtpin03.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id C6C5E362A for ; Fri, 23 Oct 2020 18:32:48 +0000 (UTC) X-FDA: 77404036416.03.snow98_4311f512725b Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin03.hostedemail.com (Postfix) with ESMTP id 9DBA028A4E8 for ; Fri, 23 Oct 2020 18:32:48 +0000 (UTC) X-HE-Tag: snow98_4311f512725b X-Filterd-Recvd-Size: 8195 Received: from hqnvemgate25.nvidia.com (hqnvemgate25.nvidia.com [216.228.121.64]) by imf21.hostedemail.com (Postfix) with ESMTP for ; Fri, 23 Oct 2020 18:32:47 +0000 (UTC) Received: from hqmail.nvidia.com (Not Verified[216.228.121.13]) by hqnvemgate25.nvidia.com (using TLS: TLSv1.2, AES256-SHA) id ; Fri, 23 Oct 2020 11:32:52 -0700 Received: from HQMAIL105.nvidia.com (172.20.187.12) by HQMAIL105.nvidia.com (172.20.187.12) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Fri, 23 Oct 2020 18:32:33 +0000 Received: from rcampbell-dev.nvidia.com (10.124.1.5) by mail.nvidia.com (172.20.187.12) with Microsoft SMTP Server id 15.0.1473.3 via Frontend Transport; Fri, 23 Oct 2020 18:32:33 +0000 From: Ralph Campbell To: CC: Andrew Morton , Ralph Campbell , Christoph Hellwig , Dan Williams , , Jason Gunthorpe , "Aneesh Kumar K . V" , "Ira Weiny" , Sachin Sant Subject: [PATCH] mm/mremap_pages: Fix static key devmap_managed_key updates Date: Fri, 23 Oct 2020 11:32:22 -0700 Message-ID: <20201023183222.13186-1-rcampbell@nvidia.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-NVConfidentiality: public Content-Transfer-Encoding: quoted-printable Content-Type: text/plain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1; t=1603477972; bh=wfPq/F9MyxjxaZltYi5wAmzMf7rHnKOQuMnr71aWD+Q=; h=From:To:CC:Subject:Date:Message-ID:X-Mailer:MIME-Version: X-NVConfidentiality:Content-Transfer-Encoding:Content-Type; b=cqi0Zd3G/UgqJ5O5kRaUeOVgjAykdUOmHivbC2TQAt6ysg3cvs/DDE9YPc0tFYaTG CvKGUk0MwlwAkDF2rdemGqCn750fkJFBJo0Q+1uxZasWx6CD84Y6Eg1N/y3uu4H1+U 8qWcRcX/ja1pcnXPh0PsOn5BFixa4J11x6Vio+7e9DOzExR8LaxLFqi7UJTqRYsjAL 7Jh/i4nlTf+uAUr7mqyF74W2b/tdxNEZCXbH5uQ9YQ661j0GqwkoRW5VMtYylcxkO7 yJB93NBqZtt0ormWPA0Tc9AAgwAOsqSh9aXd7cCsISofP4BgBgnOM40QXABMyutN3e fHLLqOeQ6mAfg== 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: commit 6f42193fd86e ("memremap: don't use a separate devm action for devmap_managed_enable_get") changed the static key updates such that we now call devmap_managed_enable_put() without doing the equivalent devmap_managed_enable_get(). devmap_managed_enable_get() is only called for MEMORY_DEVICE_PRIVATE and MEMORY_DEVICE_FS_DAX, But memunmap_pages() get called for other pgmap types too. This results in the below warning when switching between system-ram and devdax mode for devdax namespace. jump label: negative count! WARNING: CPU: 52 PID: 1335 at kernel/jump_label.c:235 static_key_slow_try_= dec+0x88/0xa0 Modules linked in: .... NIP [c000000000433318] static_key_slow_try_dec+0x88/0xa0 LR [c000000000433314] static_key_slow_try_dec+0x84/0xa0 Call Trace: [c000000025c1f660] [c000000000433314] static_key_slow_try_dec+0x84/0xa0 [c000000025c1f6d0] [c000000000433664] __static_key_slow_dec_cpuslocked+0x3= 4/0xd0 [c000000025c1f700] [c0000000004337a4] static_key_slow_dec+0x54/0xf0 [c000000025c1f770] [c00000000059c49c] memunmap_pages+0x36c/0x500 [c000000025c1f820] [c000000000d91d10] devm_action_release+0x30/0x50 [c000000025c1f840] [c000000000d92e34] release_nodes+0x2f4/0x3e0 [c000000025c1f8f0] [c000000000d8b15c] device_release_driver_internal+0x17c= /0x280 [c000000025c1f930] [c000000000d883a4] bus_remove_device+0x124/0x210 [c000000025c1f9b0] [c000000000d80ef4] device_del+0x1d4/0x530 [c000000025c1fa70] [c000000000e341e8] unregister_dev_dax+0x48/0xe0 [c000000025c1fae0] [c000000000d91d10] devm_action_release+0x30/0x50 [c000000025c1fb00] [c000000000d92e34] release_nodes+0x2f4/0x3e0 [c000000025c1fbb0] [c000000000d8b15c] device_release_driver_internal+0x17c= /0x280 [c000000025c1fbf0] [c000000000d87000] unbind_store+0x130/0x170 [c000000025c1fc30] [c000000000d862a0] drv_attr_store+0x40/0x60 [c000000025c1fc50] [c0000000006d316c] sysfs_kf_write+0x6c/0xb0 [c000000025c1fc90] [c0000000006d2328] kernfs_fop_write+0x118/0x280 [c000000025c1fce0] [c0000000005a79f8] vfs_write+0xe8/0x2a0 [c000000025c1fd30] [c0000000005a7d94] ksys_write+0x84/0x140 [c000000025c1fd80] [c00000000003a430] system_call_exception+0x120/0x270 [c000000025c1fe20] [c00000000000c540] system_call_common+0xf0/0x27c Cc: Christoph Hellwig Cc: Dan Williams Cc: linux-nvdimm@lists.01.org Cc: Jason Gunthorpe Signed-off-by: Ralph Campbell Reported-by: Aneesh Kumar K.V Reviewed-by: Aneesh Kumar K.V Reviewed-by: Ira Weiny Tested-by: Sachin Sant --- Andrew, I guess this is for the merge window since it fixes a top-of-tree problem. mm/memremap.c | 39 ++++++++++++++++----------------------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/mm/memremap.c b/mm/memremap.c index 73a206d0f645..16b2fb482da1 100644 --- a/mm/memremap.c +++ b/mm/memremap.c @@ -41,28 +41,24 @@ EXPORT_SYMBOL_GPL(memremap_compat_align); DEFINE_STATIC_KEY_FALSE(devmap_managed_key); EXPORT_SYMBOL(devmap_managed_key); =20 -static void devmap_managed_enable_put(void) +static void devmap_managed_enable_put(struct dev_pagemap *pgmap) { - static_branch_dec(&devmap_managed_key); + if (pgmap->type =3D=3D MEMORY_DEVICE_PRIVATE || + pgmap->type =3D=3D MEMORY_DEVICE_FS_DAX) + static_branch_dec(&devmap_managed_key); } =20 -static int devmap_managed_enable_get(struct dev_pagemap *pgmap) +static void devmap_managed_enable_get(struct dev_pagemap *pgmap) { - if (pgmap->type =3D=3D MEMORY_DEVICE_PRIVATE && - (!pgmap->ops || !pgmap->ops->page_free)) { - WARN(1, "Missing page_free method\n"); - return -EINVAL; - } - - static_branch_inc(&devmap_managed_key); - return 0; + if (pgmap->type =3D=3D MEMORY_DEVICE_PRIVATE || + pgmap->type =3D=3D MEMORY_DEVICE_FS_DAX) + static_branch_inc(&devmap_managed_key); } #else -static int devmap_managed_enable_get(struct dev_pagemap *pgmap) +static void devmap_managed_enable_get(struct dev_pagemap *pgmap) { - return -EINVAL; } -static void devmap_managed_enable_put(void) +static void devmap_managed_enable_put(struct dev_pagemap *pgmap) { } #endif /* CONFIG_DEV_PAGEMAP_OPS */ @@ -169,7 +165,7 @@ void memunmap_pages(struct dev_pagemap *pgmap) pageunmap_range(pgmap, i); =20 WARN_ONCE(pgmap->altmap.alloc, "failed to free all reserved pages\n"); - devmap_managed_enable_put(); + devmap_managed_enable_put(pgmap); } EXPORT_SYMBOL_GPL(memunmap_pages); =20 @@ -307,7 +303,6 @@ void *memremap_pages(struct dev_pagemap *pgmap, int nid= ) .pgprot =3D PAGE_KERNEL, }; const int nr_range =3D pgmap->nr_range; - bool need_devmap_managed =3D true; int error, i; =20 if (WARN_ONCE(!nr_range, "nr_range must be specified\n")) @@ -323,6 +318,10 @@ void *memremap_pages(struct dev_pagemap *pgmap, int ni= d) WARN(1, "Missing migrate_to_ram method\n"); return ERR_PTR(-EINVAL); } + if (!pgmap->ops->page_free) { + WARN(1, "Missing page_free method\n"); + return ERR_PTR(-EINVAL); + } if (!pgmap->owner) { WARN(1, "Missing owner\n"); return ERR_PTR(-EINVAL); @@ -336,11 +335,9 @@ void *memremap_pages(struct dev_pagemap *pgmap, int ni= d) } break; case MEMORY_DEVICE_GENERIC: - need_devmap_managed =3D false; break; case MEMORY_DEVICE_PCI_P2PDMA: params.pgprot =3D pgprot_noncached(params.pgprot); - need_devmap_managed =3D false; break; default: WARN(1, "Invalid pgmap type %d\n", pgmap->type); @@ -364,11 +361,7 @@ void *memremap_pages(struct dev_pagemap *pgmap, int ni= d) } } =20 - if (need_devmap_managed) { - error =3D devmap_managed_enable_get(pgmap); - if (error) - return ERR_PTR(error); - } + devmap_managed_enable_get(pgmap); =20 /* * Clear the pgmap nr_range as it will be incremented for each --=20 2.20.1