From: Sasha Levin <sashal@kernel.org> To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Geoff Levand <geoff@infradead.org>, Michael Ellerman <mpe@ellerman.id.au>, Sasha Levin <sashal@kernel.org>, linuxppc-dev@lists.ozlabs.org Subject: [PATCH AUTOSEL 4.4 39/60] powerpc/ps3: Fix kexec shutdown hang Date: Wed, 17 Jun 2020 21:29:43 -0400 [thread overview] Message-ID: <20200618013004.610532-39-sashal@kernel.org> (raw) In-Reply-To: <20200618013004.610532-1-sashal@kernel.org> From: Geoff Levand <geoff@infradead.org> [ Upstream commit 126554465d93b10662742128918a5fc338cda4aa ] The ps3_mm_region_destroy() and ps3_mm_vas_destroy() routines are called very late in the shutdown via kexec's mmu_cleanup_all routine. By the time mmu_cleanup_all runs it is too late to use udbg_printf, and calling it will cause PS3 systems to hang. Remove all debugging statements from ps3_mm_region_destroy() and ps3_mm_vas_destroy() and replace any error reporting with calls to lv1_panic. With this change builds with 'DEBUG' defined will not cause kexec reboots to hang, and builds with 'DEBUG' defined or not will end in lv1_panic if an error is encountered. Signed-off-by: Geoff Levand <geoff@infradead.org> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/7325c4af2b4c989c19d6a26b90b1fec9c0615ddf.1589049250.git.geoff@infradead.org Signed-off-by: Sasha Levin <sashal@kernel.org> --- arch/powerpc/platforms/ps3/mm.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/arch/powerpc/platforms/ps3/mm.c b/arch/powerpc/platforms/ps3/mm.c index b0f34663b1ae..19bae78b1f25 100644 --- a/arch/powerpc/platforms/ps3/mm.c +++ b/arch/powerpc/platforms/ps3/mm.c @@ -212,13 +212,14 @@ void ps3_mm_vas_destroy(void) { int result; - DBG("%s:%d: map.vas_id = %llu\n", __func__, __LINE__, map.vas_id); - if (map.vas_id) { result = lv1_select_virtual_address_space(0); - BUG_ON(result); - result = lv1_destruct_virtual_address_space(map.vas_id); - BUG_ON(result); + result += lv1_destruct_virtual_address_space(map.vas_id); + + if (result) { + lv1_panic(0); + } + map.vas_id = 0; } } @@ -316,19 +317,20 @@ static void ps3_mm_region_destroy(struct mem_region *r) int result; if (!r->destroy) { - pr_info("%s:%d: Not destroying high region: %llxh %llxh\n", - __func__, __LINE__, r->base, r->size); return; } - DBG("%s:%d: r->base = %llxh\n", __func__, __LINE__, r->base); - if (r->base) { result = lv1_release_memory(r->base); - BUG_ON(result); + + if (result) { + lv1_panic(0); + } + r->size = r->base = r->offset = 0; map.total = map.rm.size; } + ps3_mm_set_repository_highmem(NULL); } -- 2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: Sasha Levin <sashal@kernel.org> To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Geoff Levand <geoff@infradead.org>, linuxppc-dev@lists.ozlabs.org, Sasha Levin <sashal@kernel.org> Subject: [PATCH AUTOSEL 4.4 39/60] powerpc/ps3: Fix kexec shutdown hang Date: Wed, 17 Jun 2020 21:29:43 -0400 [thread overview] Message-ID: <20200618013004.610532-39-sashal@kernel.org> (raw) In-Reply-To: <20200618013004.610532-1-sashal@kernel.org> From: Geoff Levand <geoff@infradead.org> [ Upstream commit 126554465d93b10662742128918a5fc338cda4aa ] The ps3_mm_region_destroy() and ps3_mm_vas_destroy() routines are called very late in the shutdown via kexec's mmu_cleanup_all routine. By the time mmu_cleanup_all runs it is too late to use udbg_printf, and calling it will cause PS3 systems to hang. Remove all debugging statements from ps3_mm_region_destroy() and ps3_mm_vas_destroy() and replace any error reporting with calls to lv1_panic. With this change builds with 'DEBUG' defined will not cause kexec reboots to hang, and builds with 'DEBUG' defined or not will end in lv1_panic if an error is encountered. Signed-off-by: Geoff Levand <geoff@infradead.org> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/7325c4af2b4c989c19d6a26b90b1fec9c0615ddf.1589049250.git.geoff@infradead.org Signed-off-by: Sasha Levin <sashal@kernel.org> --- arch/powerpc/platforms/ps3/mm.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/arch/powerpc/platforms/ps3/mm.c b/arch/powerpc/platforms/ps3/mm.c index b0f34663b1ae..19bae78b1f25 100644 --- a/arch/powerpc/platforms/ps3/mm.c +++ b/arch/powerpc/platforms/ps3/mm.c @@ -212,13 +212,14 @@ void ps3_mm_vas_destroy(void) { int result; - DBG("%s:%d: map.vas_id = %llu\n", __func__, __LINE__, map.vas_id); - if (map.vas_id) { result = lv1_select_virtual_address_space(0); - BUG_ON(result); - result = lv1_destruct_virtual_address_space(map.vas_id); - BUG_ON(result); + result += lv1_destruct_virtual_address_space(map.vas_id); + + if (result) { + lv1_panic(0); + } + map.vas_id = 0; } } @@ -316,19 +317,20 @@ static void ps3_mm_region_destroy(struct mem_region *r) int result; if (!r->destroy) { - pr_info("%s:%d: Not destroying high region: %llxh %llxh\n", - __func__, __LINE__, r->base, r->size); return; } - DBG("%s:%d: r->base = %llxh\n", __func__, __LINE__, r->base); - if (r->base) { result = lv1_release_memory(r->base); - BUG_ON(result); + + if (result) { + lv1_panic(0); + } + r->size = r->base = r->offset = 0; map.total = map.rm.size; } + ps3_mm_set_repository_highmem(NULL); } -- 2.25.1
next prev parent reply other threads:[~2020-06-18 1:33 UTC|newest] Thread overview: 86+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-06-18 1:29 [PATCH AUTOSEL 4.4 01/60] clk: sunxi: Fix incorrect usage of round_down() Sasha Levin 2020-06-18 1:29 ` Sasha Levin 2020-06-18 1:29 ` [PATCH AUTOSEL 4.4 02/60] i2c: piix4: Detect secondary SMBus controller on AMD AM4 chipsets Sasha Levin 2020-06-18 1:29 ` [PATCH AUTOSEL 4.4 03/60] iio: light: isl29125: fix iio_triggered_buffer_{predisable,postenable} positions Sasha Levin 2020-06-19 16:31 ` Jonathan Cameron 2020-06-22 0:07 ` Sasha Levin 2020-06-18 1:29 ` [PATCH AUTOSEL 4.4 04/60] clk: qcom: msm8916: Fix the address location of pll->config_reg Sasha Levin 2020-06-18 1:29 ` [PATCH AUTOSEL 4.4 05/60] ALSA: isa/wavefront: prevent out of bounds write in ioctl Sasha Levin 2020-06-18 1:29 ` Sasha Levin 2020-06-18 1:29 ` [PATCH AUTOSEL 4.4 06/60] Smack: slab-out-of-bounds in vsscanf Sasha Levin 2020-06-18 1:29 ` [PATCH AUTOSEL 4.4 07/60] scsi: qla2xxx: Fix issue with adapter's stopping state Sasha Levin 2020-06-18 1:29 ` [PATCH AUTOSEL 4.4 08/60] i2c: pxa: clear all master action bits in i2c_pxa_stop_message() Sasha Levin 2020-06-18 1:29 ` [PATCH AUTOSEL 4.4 09/60] usblp: poison URBs upon disconnect Sasha Levin 2020-06-18 1:29 ` [PATCH AUTOSEL 4.4 10/60] ps3disk: use the default segment boundary Sasha Levin 2020-06-18 1:29 ` Sasha Levin 2020-06-18 1:29 ` [PATCH AUTOSEL 4.4 11/60] vfio/pci: fix memory leaks in alloc_perm_bits() Sasha Levin 2020-06-18 1:29 ` [PATCH AUTOSEL 4.4 12/60] mfd: wm8994: Fix driver operation if loaded as modules Sasha Levin 2020-06-18 1:29 ` [PATCH AUTOSEL 4.4 13/60] scsi: lpfc: Fix lpfc_nodelist leak when processing unsolicited event Sasha Levin 2020-06-18 1:29 ` [PATCH AUTOSEL 4.4 14/60] powerpc/pseries: Update hv-24x7 information after migration Sasha Levin 2020-06-18 1:29 ` Sasha Levin 2020-06-18 1:29 ` [PATCH AUTOSEL 4.4 15/60] nfsd: Fix svc_xprt refcnt leak when setup callback client failed Sasha Levin 2020-06-18 1:29 ` [PATCH AUTOSEL 4.4 16/60] powerpc/crashkernel: Take "mem=" option into account Sasha Levin 2020-06-18 1:29 ` Sasha Levin 2020-06-18 1:29 ` [PATCH AUTOSEL 4.4 17/60] yam: fix possible memory leak in yam_init_driver Sasha Levin 2020-06-18 1:29 ` [PATCH AUTOSEL 4.4 18/60] fat: don't allow to mount if the FAT length == 0 Sasha Levin 2020-06-18 1:29 ` [PATCH AUTOSEL 4.4 19/60] mksysmap: Fix the mismatch of '.L' symbols in System.map Sasha Levin 2020-06-18 1:29 ` [PATCH AUTOSEL 4.4 20/60] scsi: sr: Fix sr_probe() missing deallocate of device minor Sasha Levin 2020-06-18 1:29 ` [PATCH AUTOSEL 4.4 21/60] scsi: ibmvscsi: Don't send host info in adapter info MAD after LPM Sasha Levin 2020-06-18 1:29 ` Sasha Levin 2020-06-18 1:29 ` [PATCH AUTOSEL 4.4 22/60] staging: rtl8712: fix multiline derefernce warnings Sasha Levin 2020-06-18 1:29 ` Sasha Levin 2020-06-18 1:29 ` [PATCH AUTOSEL 4.4 23/60] iio: buffer: Don't allow buffers without any channels enabled to be activated Sasha Levin 2020-06-19 16:27 ` Jonathan Cameron 2020-06-22 0:07 ` Sasha Levin 2020-06-18 1:29 ` [PATCH AUTOSEL 4.4 24/60] ALSA: usb-audio: Improve frames size computation Sasha Levin 2020-06-18 1:29 ` Sasha Levin 2020-06-18 1:29 ` [PATCH AUTOSEL 4.4 25/60] s390/qdio: put thinint indicator after early error Sasha Levin 2020-06-18 1:29 ` [PATCH AUTOSEL 4.4 26/60] tty: hvc: Fix data abort due to race in hvc_open Sasha Levin 2020-06-18 1:29 ` Sasha Levin 2020-06-18 1:29 ` [PATCH AUTOSEL 4.4 27/60] staging: sm750fb: add missing case while setting FB_VISUAL Sasha Levin 2020-06-18 1:29 ` Sasha Levin 2020-06-18 1:29 ` Sasha Levin 2020-06-18 1:29 ` [PATCH AUTOSEL 4.4 28/60] i2c: pxa: fix i2c_pxa_scream_blue_murder() debug output Sasha Levin 2020-06-18 1:29 ` [PATCH AUTOSEL 4.4 29/60] serial: amba-pl011: Make sure we initialize the port.lock spinlock Sasha Levin 2020-06-18 1:29 ` [PATCH AUTOSEL 4.4 30/60] drivers: base: Fix NULL pointer exception in __platform_driver_probe() if a driver developer is foolish Sasha Levin 2020-06-18 1:29 ` [PATCH AUTOSEL 4.4 31/60] PCI/ASPM: Allow ASPM on links to PCIe-to-PCI/PCI-X Bridges Sasha Levin 2020-06-18 1:29 ` [PATCH AUTOSEL 4.4 32/60] power: supply: smb347-charger: IRQSTAT_D is volatile Sasha Levin 2020-06-18 1:29 ` [PATCH AUTOSEL 4.4 33/60] scsi: mpt3sas: Fix double free warnings Sasha Levin 2020-06-18 1:29 ` [PATCH AUTOSEL 4.4 34/60] dlm: remove BUG() before panic() Sasha Levin 2020-06-18 1:29 ` [Cluster-devel] " Sasha Levin 2020-06-18 1:29 ` [PATCH AUTOSEL 4.4 35/60] clk: ti: composite: fix memory leak Sasha Levin 2020-06-18 1:29 ` [PATCH AUTOSEL 4.4 36/60] tty: n_gsm: Fix SOF skipping Sasha Levin 2020-06-18 1:29 ` [PATCH AUTOSEL 4.4 37/60] tty: n_gsm: Fix waking up upper tty layer when room available Sasha Levin 2020-06-18 1:29 ` [PATCH AUTOSEL 4.4 38/60] powerpc/pseries/ras: Fix FWNMI_VALID off by one Sasha Levin 2020-06-18 1:29 ` Sasha Levin 2020-06-18 1:29 ` Sasha Levin [this message] 2020-06-18 1:29 ` [PATCH AUTOSEL 4.4 39/60] powerpc/ps3: Fix kexec shutdown hang Sasha Levin 2020-06-18 1:29 ` [PATCH AUTOSEL 4.4 40/60] vfio-pci: Mask cap zero Sasha Levin 2020-06-18 1:29 ` [PATCH AUTOSEL 4.4 41/60] usb/ohci-platform: Fix a warning when hibernating Sasha Levin 2020-06-18 1:29 ` Sasha Levin 2020-06-18 1:29 ` [PATCH AUTOSEL 4.4 42/60] USB: host: ehci-mxc: Add error handling in ehci_mxc_drv_probe() Sasha Levin 2020-06-18 1:29 ` [PATCH AUTOSEL 4.4 43/60] tty: n_gsm: Fix bogus i++ in gsm_data_kick Sasha Levin 2020-06-18 1:29 ` [PATCH AUTOSEL 4.4 44/60] clk: samsung: exynos5433: Add IGNORE_UNUSED flag to sclk_i2s1 Sasha Levin 2020-06-18 1:29 ` Sasha Levin 2020-06-18 1:29 ` [PATCH AUTOSEL 4.4 45/60] watchdog: da9062: No need to ping manually before setting timeout Sasha Levin 2020-06-18 1:29 ` [PATCH AUTOSEL 4.4 46/60] usb: dwc2: gadget: move gadget resume after the core is in L0 state Sasha Levin 2020-06-18 1:29 ` [PATCH AUTOSEL 4.4 47/60] USB: gadget: udc: s3c2410_udc: Remove pointless NULL check in s3c2410_udc_nuke Sasha Levin 2020-06-18 1:29 ` [PATCH AUTOSEL 4.4 48/60] usb: gadget: lpc32xx_udc: don't dereference ep pointer before null check Sasha Levin 2020-06-18 1:29 ` Sasha Levin 2020-06-18 1:29 ` [PATCH AUTOSEL 4.4 49/60] usb: gadget: fix potential double-free in m66592_probe Sasha Levin 2020-06-18 1:29 ` [PATCH AUTOSEL 4.4 50/60] vfio/pci: fix memory leaks of eventfd ctx Sasha Levin 2020-06-18 1:37 ` Alex Williamson 2020-06-18 1:29 ` [PATCH AUTOSEL 4.4 51/60] net: sunrpc: Fix off-by-one issues in 'rpc_ntop6' Sasha Levin 2020-06-18 1:29 ` [PATCH AUTOSEL 4.4 52/60] ASoC: fsl_asrc_dma: Fix dma_chan leak when config DMA channel failed Sasha Levin 2020-06-18 1:29 ` Sasha Levin 2020-06-18 1:29 ` [PATCH AUTOSEL 4.4 53/60] openrisc: Fix issue with argument clobbering for clone/fork Sasha Levin 2020-06-18 1:29 ` [OpenRISC] " Sasha Levin 2020-06-18 1:29 ` [PATCH AUTOSEL 4.4 54/60] gfs2: Allow lock_nolock mount to specify jid=X Sasha Levin 2020-06-18 1:29 ` [Cluster-devel] " Sasha Levin 2020-06-18 1:29 ` [PATCH AUTOSEL 4.4 55/60] scsi: iscsi: Fix reference count leak in iscsi_boot_create_kobj Sasha Levin 2020-06-18 1:30 ` [PATCH AUTOSEL 4.4 56/60] lib/zlib: remove outdated and incorrect pre-increment optimization Sasha Levin 2020-06-18 1:30 ` [PATCH AUTOSEL 4.4 57/60] include/linux/bitops.h: avoid clang shift-count-overflow warnings Sasha Levin 2020-06-18 1:30 ` [PATCH AUTOSEL 4.4 58/60] elfnote: mark all .note sections SHF_ALLOC Sasha Levin 2020-06-18 1:30 ` [PATCH AUTOSEL 4.4 59/60] selftests/net: in timestamping, strncpy needs to preserve null byte Sasha Levin 2020-06-18 1:30 ` [PATCH AUTOSEL 4.4 60/60] scsi: acornscsi: Fix an error handling path in acornscsi_probe() Sasha Levin 2020-06-18 1:30 ` 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=20200618013004.610532-39-sashal@kernel.org \ --to=sashal@kernel.org \ --cc=geoff@infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=mpe@ellerman.id.au \ --cc=stable@vger.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: linkBe 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.