All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jia He <justin.he@arm.com>
To: Catalin Marinas <catalin.marinas@arm.com>,
	Will Deacon <will@kernel.org>,
	Dan Williams <dan.j.williams@intel.com>,
	Vishal Verma <vishal.l.verma@intel.com>,
	Dave Jiang <dave.jiang@intel.com>
Cc: Michal Hocko <mhocko@suse.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	Mike Rapoport <rppt@linux.ibm.com>, Baoquan He <bhe@redhat.com>,
	Chuhong Yuan <hslester96@gmail.com>,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, linux-mm@kvack.org,
	linux-nvdimm@lists.01.org, Kaly Xin <Kaly.Xin@arm.com>,
	Jia He <justin.he@arm.com>,
	stable@vger.kernel.org
Subject: [PATCH v2 3/3] mm/memory_hotplug: fix unpaired mem_hotplug_begin/done
Date: Tue,  7 Jul 2020 13:59:17 +0800	[thread overview]
Message-ID: <20200707055917.143653-4-justin.he@arm.com> (raw)
In-Reply-To: <20200707055917.143653-1-justin.he@arm.com>

When check_memblock_offlined_cb() returns failed rc(e.g. the memblock is
online at that time), mem_hotplug_begin/done is unpaired in such case.

Therefore a warning:
 Call Trace:
  percpu_up_write+0x33/0x40
  try_remove_memory+0x66/0x120
  ? _cond_resched+0x19/0x30
  remove_memory+0x2b/0x40
  dev_dax_kmem_remove+0x36/0x72 [kmem]
  device_release_driver_internal+0xf0/0x1c0
  device_release_driver+0x12/0x20
  bus_remove_device+0xe1/0x150
  device_del+0x17b/0x3e0
  unregister_dev_dax+0x29/0x60
  devm_action_release+0x15/0x20
  release_nodes+0x19a/0x1e0
  devres_release_all+0x3f/0x50
  device_release_driver_internal+0x100/0x1c0
  driver_detach+0x4c/0x8f
  bus_remove_driver+0x5c/0xd0
  driver_unregister+0x31/0x50
  dax_pmem_exit+0x10/0xfe0 [dax_pmem]

Fixes: f1037ec0cc8a ("mm/memory_hotplug: fix remove_memory() lockdep splat")
Cc: stable@vger.kernel.org # v5.6+
Signed-off-by: Jia He <justin.he@arm.com>
---
 mm/memory_hotplug.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index da374cd3d45b..76c75a599da3 100644
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -1742,7 +1742,7 @@ static int __ref try_remove_memory(int nid, u64 start, u64 size)
 	 */
 	rc = walk_memory_blocks(start, size, NULL, check_memblock_offlined_cb);
 	if (rc)
-		goto done;
+		return rc;
 
 	/* remove memmap entry */
 	firmware_map_remove(start, start + size, "System RAM");
@@ -1766,9 +1766,8 @@ static int __ref try_remove_memory(int nid, u64 start, u64 size)
 
 	try_offline_node(nid);
 
-done:
 	mem_hotplug_done();
-	return rc;
+	return 0;
 }
 
 /**
-- 
2.17.1
_______________________________________________
Linux-nvdimm mailing list -- linux-nvdimm@lists.01.org
To unsubscribe send an email to linux-nvdimm-leave@lists.01.org

WARNING: multiple messages have this Message-ID (diff)
From: Jia He <justin.he@arm.com>
To: Catalin Marinas <catalin.marinas@arm.com>,
	Will Deacon <will@kernel.org>,
	Dan Williams <dan.j.williams@intel.com>,
	Vishal Verma <vishal.l.verma@intel.com>,
	Dave Jiang <dave.jiang@intel.com>
Cc: Michal Hocko <mhocko@suse.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	Mike Rapoport <rppt@linux.ibm.com>, Baoquan He <bhe@redhat.com>,
	Chuhong Yuan <hslester96@gmail.com>,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, linux-mm@kvack.org,
	linux-nvdimm@lists.01.org, Kaly Xin <Kaly.Xin@arm.com>,
	Jia He <justin.he@arm.com>,
	stable@vger.kernel.org
Subject: [PATCH v2 3/3] mm/memory_hotplug: fix unpaired mem_hotplug_begin/done
Date: Tue,  7 Jul 2020 13:59:17 +0800	[thread overview]
Message-ID: <20200707055917.143653-4-justin.he@arm.com> (raw)
In-Reply-To: <20200707055917.143653-1-justin.he@arm.com>

When check_memblock_offlined_cb() returns failed rc(e.g. the memblock is
online at that time), mem_hotplug_begin/done is unpaired in such case.

Therefore a warning:
 Call Trace:
  percpu_up_write+0x33/0x40
  try_remove_memory+0x66/0x120
  ? _cond_resched+0x19/0x30
  remove_memory+0x2b/0x40
  dev_dax_kmem_remove+0x36/0x72 [kmem]
  device_release_driver_internal+0xf0/0x1c0
  device_release_driver+0x12/0x20
  bus_remove_device+0xe1/0x150
  device_del+0x17b/0x3e0
  unregister_dev_dax+0x29/0x60
  devm_action_release+0x15/0x20
  release_nodes+0x19a/0x1e0
  devres_release_all+0x3f/0x50
  device_release_driver_internal+0x100/0x1c0
  driver_detach+0x4c/0x8f
  bus_remove_driver+0x5c/0xd0
  driver_unregister+0x31/0x50
  dax_pmem_exit+0x10/0xfe0 [dax_pmem]

Fixes: f1037ec0cc8a ("mm/memory_hotplug: fix remove_memory() lockdep splat")
Cc: stable@vger.kernel.org # v5.6+
Signed-off-by: Jia He <justin.he@arm.com>
---
 mm/memory_hotplug.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index da374cd3d45b..76c75a599da3 100644
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -1742,7 +1742,7 @@ static int __ref try_remove_memory(int nid, u64 start, u64 size)
 	 */
 	rc = walk_memory_blocks(start, size, NULL, check_memblock_offlined_cb);
 	if (rc)
-		goto done;
+		return rc;
 
 	/* remove memmap entry */
 	firmware_map_remove(start, start + size, "System RAM");
@@ -1766,9 +1766,8 @@ static int __ref try_remove_memory(int nid, u64 start, u64 size)
 
 	try_offline_node(nid);
 
-done:
 	mem_hotplug_done();
-	return rc;
+	return 0;
 }
 
 /**
-- 
2.17.1


WARNING: multiple messages have this Message-ID (diff)
From: Jia He <justin.he@arm.com>
To: Catalin Marinas <catalin.marinas@arm.com>,
	Will Deacon <will@kernel.org>,
	Dan Williams <dan.j.williams@intel.com>,
	Vishal Verma <vishal.l.verma@intel.com>,
	Dave Jiang <dave.jiang@intel.com>
Cc: Kaly Xin <Kaly.Xin@arm.com>, Michal Hocko <mhocko@suse.com>,
	Jia He <justin.he@arm.com>, Baoquan He <bhe@redhat.com>,
	linux-nvdimm@lists.01.org, Chuhong Yuan <hslester96@gmail.com>,
	linux-kernel@vger.kernel.org, stable@vger.kernel.org,
	Mike Rapoport <rppt@linux.ibm.com>,
	linux-mm@kvack.org, Andrew Morton <akpm@linux-foundation.org>,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 3/3] mm/memory_hotplug: fix unpaired mem_hotplug_begin/done
Date: Tue,  7 Jul 2020 13:59:17 +0800	[thread overview]
Message-ID: <20200707055917.143653-4-justin.he@arm.com> (raw)
In-Reply-To: <20200707055917.143653-1-justin.he@arm.com>

When check_memblock_offlined_cb() returns failed rc(e.g. the memblock is
online at that time), mem_hotplug_begin/done is unpaired in such case.

Therefore a warning:
 Call Trace:
  percpu_up_write+0x33/0x40
  try_remove_memory+0x66/0x120
  ? _cond_resched+0x19/0x30
  remove_memory+0x2b/0x40
  dev_dax_kmem_remove+0x36/0x72 [kmem]
  device_release_driver_internal+0xf0/0x1c0
  device_release_driver+0x12/0x20
  bus_remove_device+0xe1/0x150
  device_del+0x17b/0x3e0
  unregister_dev_dax+0x29/0x60
  devm_action_release+0x15/0x20
  release_nodes+0x19a/0x1e0
  devres_release_all+0x3f/0x50
  device_release_driver_internal+0x100/0x1c0
  driver_detach+0x4c/0x8f
  bus_remove_driver+0x5c/0xd0
  driver_unregister+0x31/0x50
  dax_pmem_exit+0x10/0xfe0 [dax_pmem]

Fixes: f1037ec0cc8a ("mm/memory_hotplug: fix remove_memory() lockdep splat")
Cc: stable@vger.kernel.org # v5.6+
Signed-off-by: Jia He <justin.he@arm.com>
---
 mm/memory_hotplug.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index da374cd3d45b..76c75a599da3 100644
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -1742,7 +1742,7 @@ static int __ref try_remove_memory(int nid, u64 start, u64 size)
 	 */
 	rc = walk_memory_blocks(start, size, NULL, check_memblock_offlined_cb);
 	if (rc)
-		goto done;
+		return rc;
 
 	/* remove memmap entry */
 	firmware_map_remove(start, start + size, "System RAM");
@@ -1766,9 +1766,8 @@ static int __ref try_remove_memory(int nid, u64 start, u64 size)
 
 	try_offline_node(nid);
 
-done:
 	mem_hotplug_done();
-	return rc;
+	return 0;
 }
 
 /**
-- 
2.17.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2020-07-07  5:59 UTC|newest]

Thread overview: 162+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-07  5:59 [PATCH v2 0/3] Fix and enable pmem as RAM device on arm64 Jia He
2020-07-07  5:59 ` Jia He
2020-07-07  5:59 ` Jia He
2020-07-07  5:59 ` [PATCH v2 1/3] arm64/numa: export memory_add_physaddr_to_nid as EXPORT_SYMBOL_GPL Jia He
2020-07-07  5:59   ` Jia He
2020-07-07  5:59   ` Jia He
2020-07-07 11:35   ` David Hildenbrand
2020-07-07 11:35     ` David Hildenbrand
2020-07-07 11:35     ` David Hildenbrand
2020-07-07 11:54   ` Michal Hocko
2020-07-07 11:54     ` Michal Hocko
2020-07-07 11:54     ` Michal Hocko
2020-07-07 12:13     ` Mike Rapoport
2020-07-07 12:13       ` Mike Rapoport
2020-07-07 12:13       ` Mike Rapoport
2020-07-07 12:26       ` David Hildenbrand
2020-07-07 12:26         ` David Hildenbrand
2020-07-07 12:26         ` David Hildenbrand
2020-07-07 18:00         ` Mike Rapoport
2020-07-07 18:00           ` Mike Rapoport
2020-07-07 18:00           ` Mike Rapoport
2020-07-07 22:05           ` Dan Williams
2020-07-07 22:05             ` Dan Williams
2020-07-07 22:05             ` Dan Williams
2020-07-07 22:05             ` Dan Williams
2020-07-08  5:27             ` Mike Rapoport
2020-07-08  5:27               ` Mike Rapoport
2020-07-08  5:27               ` Mike Rapoport
2020-07-08  7:21               ` David Hildenbrand
2020-07-08  7:21                 ` David Hildenbrand
2020-07-08  7:21                 ` David Hildenbrand
2020-07-08  7:38                 ` Mike Rapoport
2020-07-08  7:38                   ` Mike Rapoport
2020-07-08  7:38                   ` Mike Rapoport
2020-07-08  7:40                   ` David Hildenbrand
2020-07-08  7:40                     ` David Hildenbrand
2020-07-08  7:40                     ` David Hildenbrand
2020-07-08  7:50                 ` Dan Williams
2020-07-08  7:50                   ` Dan Williams
2020-07-08  7:50                   ` Dan Williams
2020-07-08  7:50                   ` Dan Williams
2020-07-08  8:26                   ` David Hildenbrand
2020-07-08  8:26                     ` David Hildenbrand
2020-07-08  8:26                     ` David Hildenbrand
2020-07-08  8:39                     ` Mike Rapoport
2020-07-08  8:39                       ` Mike Rapoport
2020-07-08  8:39                       ` Mike Rapoport
2020-07-08  8:45                       ` David Hildenbrand
2020-07-08  8:45                         ` David Hildenbrand
2020-07-08  8:45                         ` David Hildenbrand
2020-07-08  9:15                         ` Mike Rapoport
2020-07-08  9:15                           ` Mike Rapoport
2020-07-08  9:15                           ` Mike Rapoport
2020-07-08  9:25                           ` David Hildenbrand
2020-07-08  9:25                             ` David Hildenbrand
2020-07-08  9:25                             ` David Hildenbrand
2020-07-08  9:45                             ` Mike Rapoport
2020-07-08  9:45                               ` Mike Rapoport
2020-07-08  9:45                               ` Mike Rapoport
2020-07-08 10:04                               ` David Hildenbrand
2020-07-08 10:04                                 ` David Hildenbrand
2020-07-08 10:04                                 ` David Hildenbrand
2020-07-08 15:50                                 ` Dan Williams
2020-07-08 15:50                                   ` Dan Williams
2020-07-08 15:50                                   ` Dan Williams
2020-07-08 15:50                                   ` Dan Williams
2020-07-08 16:10                                   ` David Hildenbrand
2020-07-08 16:10                                     ` David Hildenbrand
2020-07-08 16:10                                     ` David Hildenbrand
2020-07-08 16:47                                     ` Mike Rapoport
2020-07-08 16:47                                       ` Mike Rapoport
2020-07-08 16:47                                       ` Mike Rapoport
2020-07-08  2:20     ` Justin He
2020-07-08  2:20       ` Justin He
2020-07-08  2:20       ` Justin He
2020-07-08  2:20       ` Justin He
2020-07-08  3:56       ` Dan Williams
2020-07-08  3:56         ` Dan Williams
2020-07-08  3:56         ` Dan Williams
2020-07-08  3:56         ` Dan Williams
2020-07-08  4:08         ` Justin He
2020-07-08  4:08           ` Justin He
2020-07-08  4:08           ` Justin He
2020-07-08  4:08           ` Justin He
2020-07-08  4:27           ` Dan Williams
2020-07-08  4:27             ` Dan Williams
2020-07-08  4:27             ` Dan Williams
2020-07-08  4:27             ` Dan Williams
2020-07-08  6:22             ` Mike Rapoport
2020-07-08  6:22               ` Mike Rapoport
2020-07-08  6:22               ` Mike Rapoport
2020-07-08  6:22               ` Mike Rapoport
2020-07-08  6:53               ` Dan Williams
2020-07-08  6:53                 ` Dan Williams
2020-07-08  6:53                 ` Dan Williams
2020-07-08  6:53                 ` Dan Williams
2020-07-08  6:59               ` David Hildenbrand
2020-07-08  6:59                 ` David Hildenbrand
2020-07-08  6:59                 ` David Hildenbrand
2020-07-08  6:59                 ` David Hildenbrand
2020-07-08  7:04                 ` Dan Williams
2020-07-08  7:04                   ` Dan Williams
2020-07-08  7:04                   ` Dan Williams
2020-07-08  7:04                   ` Dan Williams
2020-07-08  7:16                   ` David Hildenbrand
2020-07-08  7:16                     ` David Hildenbrand
2020-07-08  7:16                     ` David Hildenbrand
2020-07-08  7:16                     ` David Hildenbrand
2020-07-08  7:43                     ` Mike Rapoport
2020-07-08  7:43                       ` Mike Rapoport
2020-07-08  7:43                       ` Mike Rapoport
2020-07-08  7:43                       ` Mike Rapoport
2020-07-08  5:32         ` Mike Rapoport
2020-07-08  5:32           ` Mike Rapoport
2020-07-08  5:32           ` Mike Rapoport
2020-07-08  5:32           ` Mike Rapoport
2020-07-08  5:48           ` Dan Williams
2020-07-08  5:48             ` Dan Williams
2020-07-08  5:48             ` Dan Williams
2020-07-08  5:48             ` Dan Williams
2020-07-08  6:19             ` Mike Rapoport
2020-07-08  6:19               ` Mike Rapoport
2020-07-08  6:19               ` Mike Rapoport
2020-07-08  6:19               ` Mike Rapoport
2020-07-08  6:44               ` Dan Williams
2020-07-08  6:44                 ` Dan Williams
2020-07-08  6:44                 ` Dan Williams
2020-07-08  6:44                 ` Dan Williams
2020-07-08  6:56             ` Justin He
2020-07-08  6:56               ` Justin He
2020-07-08  6:56               ` Justin He
2020-07-08  6:56               ` Justin He
2020-07-08  7:00               ` David Hildenbrand
2020-07-08  7:00                 ` David Hildenbrand
2020-07-08  7:00                 ` David Hildenbrand
2020-07-08  7:00                 ` David Hildenbrand
2020-07-07  5:59 ` [RFC PATCH v2 2/3] device-dax: use fallback nid when numa_node is invalid Jia He
2020-07-07  5:59   ` Jia He
2020-07-07  5:59   ` Jia He
2020-07-07  6:08   ` Justin He
2020-07-07  6:08     ` Justin He
2020-07-07  6:08     ` Justin He
2020-07-07  6:08     ` Justin He
2020-07-07 11:34   ` David Hildenbrand
2020-07-07 11:34     ` David Hildenbrand
2020-07-07 11:34     ` David Hildenbrand
2020-07-08  1:41     ` Justin He
2020-07-08  1:41       ` Justin He
2020-07-08  1:41       ` Justin He
2020-07-08  1:41       ` Justin He
2020-07-07 13:53   ` kernel test robot
2020-07-08  7:07   ` kernel test robot
2020-07-07  5:59 ` Jia He [this message]
2020-07-07  5:59   ` [PATCH v2 3/3] mm/memory_hotplug: fix unpaired mem_hotplug_begin/done Jia He
2020-07-07  5:59   ` Jia He
2020-07-07 10:06   ` Michal Hocko
2020-07-07 10:06     ` Michal Hocko
2020-07-07 10:06     ` Michal Hocko
2020-07-07 11:31   ` David Hildenbrand
2020-07-07 11:31     ` David Hildenbrand
2020-07-07 11:31     ` David Hildenbrand
2020-07-10 14:02   ` Sasha Levin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200707055917.143653-4-justin.he@arm.com \
    --to=justin.he@arm.com \
    --cc=Kaly.Xin@arm.com \
    --cc=akpm@linux-foundation.org \
    --cc=bhe@redhat.com \
    --cc=catalin.marinas@arm.com \
    --cc=dan.j.williams@intel.com \
    --cc=dave.jiang@intel.com \
    --cc=hslester96@gmail.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=linux-nvdimm@lists.01.org \
    --cc=mhocko@suse.com \
    --cc=rppt@linux.ibm.com \
    --cc=stable@vger.kernel.org \
    --cc=vishal.l.verma@intel.com \
    --cc=will@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.