Patch "powerpc/xive: Use hw CPU ids when configuring the CPU queues" has been added to the 4.14-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
powerpc/xive: Use hw CPU ids when configuring the CPU queues
to the 4.14-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-xive-use-hw-cpu-ids-when-configuring-the-cpu-queues.patch
and it can be found in the queue-4.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
8e036c8d30a2cd9d8fc7442fbf6824e0a3e986e7Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <[email protected]>
Date: Tue, 13 Feb 2018 09:47:12 +0100
Subject: powerpc/xive: Use hw CPU ids when configuring the CPU queues
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Cédric Le Goater <[email protected]>
commit 8e036c8d30a2cd9d8fc7442fbf6824e0a3e986e7 upstream.
The CPU event notification queues on sPAPR should be configured using a hardware CPU identifier.
The problem did not show up on the Power Hypervisor because pHyp supports 8 threads per core which keeps CPU number contiguous. This is not the case on all sPAPR virtual machines, some use SMT=1.
Also improve error logging by adding the CPU number.
--- arch/powerpc/sysdev/xive/spapr.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
arch/powerpc/sysdev/xive/spapr.c +10 -6
@@ -356,7 +356,8 @@ static int xive_spapr_configure_queue(u3 rc =plpar_int_get_queue_info (0 , target, prio, &esn_page, &esn_size);if (rc) { -pr_err ("Error %lld getting queue info prio %d\n" , rc, prio); +pr_err ("Error %lld getting queue info CPU %d prio %d\n" , rc, + target, prio); rc = -EIO ; goto fail; }
@@ -370,7 +371,8 @@ static int xive_spapr_configure_queue(u3/* Configure and enable the queue in HW */ rc =plpar_int_set_queue_config (flags, target, prio, qpage_phys, order);if (rc) { -pr_err ("Error %lld setting queue for prio %d\n" , rc, prio); +pr_err ("Error %lld setting queue for CPU %d prio %d\n" , rc, + target, prio); rc = -EIO ; }else { q->qpage = qpage;
@@ -389,8 +391,8 @@ static int xive_spapr_setup_queue(unsignif (IS_ERR (qpage))return PTR_ERR (qpage); -return xive_spapr_configure_queue (cpu, q, prio, qpage, - xive_queue_shift); +return xive_spapr_configure_queue (get_hard_smp_processor_id (cpu), + q, prio, qpage, xive_queue_shift); } static void xive_spapr_cleanup_queue(unsigned int cpu, struct xive_cpu *xc,
@@ -399,10 +401,12 @@ static void xive_spapr_cleanup_queue(unsstruct xive_q *q = &xc->queue[prio];unsigned int alloc_order;long rc; +int hw_cpu =get_hard_smp_processor_id (cpu); - rc =plpar_int_set_queue_config (0 , cpu, prio,0 ,0 ); + rc =plpar_int_set_queue_config (0 , hw_cpu, prio,0 ,0 );if (rc) -pr_err ("Error %ld setting queue for prio %d\n" , rc, prio); +pr_err ("Error %ld setting queue for CPU %d prio %d\n" , rc, + hw_cpu, prio); alloc_order =xive_alloc_order (xive_queue_shift);free_pages ((unsigned long )q->qpage, alloc_order);
Patches currently in stable-queue which might be from [email protected] are
queue-4.14/powerpc-xive-use-hw-cpu-ids-when-configuring-the-cpu-queues.patch