From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:52038 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751833AbdIVJhZ (ORCPT ); Fri, 22 Sep 2017 05:37:25 -0400 Subject: Patch "powerpc/pseries: Don't attempt to acquire drc during memory hot add for assigned lmbs" has been added to the 4.13-stable tree To: jallen@linux.vnet.ibm.com, gregkh@linuxfoundation.org, mpe@ellerman.id.au, nfont@linux.vnet.ibm.com Cc: , From: Date: Fri, 22 Sep 2017 11:37:02 +0200 Message-ID: <15060730226362@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled powerpc/pseries: Don't attempt to acquire drc during memory hot add for assigned lmbs to the 4.13-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: powerpc-pseries-don-t-attempt-to-acquire-drc-during-memory-hot-add-for-assigned-lmbs.patch and it can be found in the queue-4.13 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From afb5519fdb346201728040cab4e08ce53e7ff4fd Mon Sep 17 00:00:00 2001 From: John Allen Date: Wed, 23 Aug 2017 12:18:43 -0500 Subject: powerpc/pseries: Don't attempt to acquire drc during memory hot add for assigned lmbs From: John Allen commit afb5519fdb346201728040cab4e08ce53e7ff4fd upstream. Check if an LMB is assigned before attempting to call dlpar_acquire_drc in order to avoid any unnecessary rtas calls. This substantially reduces the running time of memory hot add on lpars with large amounts of memory. [mpe: We need to explicitly set rc to 0 in the success case, otherwise the compiler might think we use rc without initialising it.] Fixes: c21f515c7436 ("powerpc/pseries: Make the acquire/release of the drc for memory a seperate step") Signed-off-by: John Allen Reviewed-by: Nathan Fontenot Signed-off-by: Michael Ellerman Signed-off-by: Greg Kroah-Hartman --- arch/powerpc/platforms/pseries/hotplug-memory.c | 4 ++++ 1 file changed, 4 insertions(+) --- a/arch/powerpc/platforms/pseries/hotplug-memory.c +++ b/arch/powerpc/platforms/pseries/hotplug-memory.c @@ -817,6 +817,9 @@ static int dlpar_memory_add_by_count(u32 return -EINVAL; for (i = 0; i < num_lmbs && lmbs_to_add != lmbs_added; i++) { + if (lmbs[i].flags & DRCONF_MEM_ASSIGNED) + continue; + rc = dlpar_acquire_drc(lmbs[i].drc_index); if (rc) continue; @@ -859,6 +862,7 @@ static int dlpar_memory_add_by_count(u32 lmbs[i].base_addr, lmbs[i].drc_index); lmbs[i].reserved = 0; } + rc = 0; } return rc; Patches currently in stable-queue which might be from jallen@linux.vnet.ibm.com are queue-4.13/powerpc-pseries-don-t-attempt-to-acquire-drc-during-memory-hot-add-for-assigned-lmbs.patch