* Kernel Bug/oops during boot (PowerVM LPAR w/vTPM)
From: Sachin Sant @ 2019-07-03 10:24 UTC (permalink / raw)
To: linuxppc-dev; +Cc: nayna, gcwilson
Booting mainline kernel on PowerVM LPAR with vTPM enabled results
into a kernel crash.
[ 0.365989] BUG: Kernel NULL pointer dereference at 0x00000012
[ 0.365995] Faulting instruction address: 0xc00000000073dd80
[ 0.366000] Oops: Kernel access of bad area, sig: 11 [#1]
[ 0.366005] LE PAGE_SIZE=64K MMU=Hash SMP NR_CPUS=2048 NUMA pSeries
[ 0.366010] Modules linked in:
[ 0.366015] CPU: 1 PID: 1 Comm: swapper/0 Not tainted 5.2.0-rc7-autotest-autotest #1
[ 0.366020] NIP: c00000000073dd80 LR: c00000000073dcd0 CTR: 0000000000000000
[ 0.366026] REGS: c0000018ed8e7550 TRAP: 0380 Not tainted (5.2.0-rc7-autotest-autotest)
[ 0.366031] MSR: 8000000000009033 <SF,EE,ME,IR,DR,RI,LE> CR: 28002448 XER: 20040001
[ 0.366038] CFAR: c000000000b6d1c4 IRQMASK: 0
[ 0.366038] GPR00: c00000000073dcd0 c0000018ed8e77e0 c000000001524a00 0000000000000000
[ 0.366038] GPR04: 0000000000000003 0000000000000000 0000000000010000 000000000000000e
[ 0.366038] GPR08: 0000000000000022 0000000000010000 c0000018e5510000 00000000883bfecd
[ 0.366038] GPR12: 0000000048002448 c00000001ec6ee00 c0000000000107a8 0000000000000000
[ 0.366038] GPR16: 0000000000000000 0000000000000000 0000000000000000 0000000000000000
[ 0.366038] GPR20: 0000000000000000 0000000000000000 0000000000000000 0000000000000000
[ 0.366038] GPR24: c0000018eb9eaaa0 0000000000000000 c000000000bce810 c000000000e2ed28
[ 0.366038] GPR28: c0000018e70a4000 000000000000000a 0000000000000012 c0000018e5510000
[ 0.366085] NIP [c00000000073dd80] tpm1_pcr_extend+0x130/0x230
[ 0.366090] LR [c00000000073dcd0] tpm1_pcr_extend+0x80/0x230
[ 0.366094] Call Trace:
[ 0.366098] [c0000018ed8e77e0] [c00000000073dcd0] tpm1_pcr_extend+0x80/0x230 (unreliable)
[ 0.366105] [c0000018ed8e7890] [c00000000073c8c4] tpm_pcr_extend+0xd4/0x180
[ 0.366111] [c0000018ed8e78d0] [c0000000005745f8] ima_add_template_entry+0x198/0x320
[ 0.366117] [c0000018ed8e79b0] [c000000000577058] ima_store_template+0xc8/0x160
[ 0.366124] [c0000018ed8e7a30] [c000000000f6081c] ima_add_boot_aggregate+0xf8/0x184
[ 0.366130] [c0000018ed8e7b30] [c000000000f6093c] ima_init+0x94/0xbc
[ 0.366135] [c0000018ed8e7b90] [c000000000f60aac] init_ima+0x44/0xe8
[ 0.366140] [c0000018ed8e7c10] [c000000000010448] do_one_initcall+0x68/0x2c0
[ 0.366146] [c0000018ed8e7ce0] [c000000000f14738] kernel_init_freeable+0x318/0x47c
[ 0.366152] [c0000018ed8e7db0] [c0000000000107c4] kernel_init+0x24/0x150
[ 0.366158] [c0000018ed8e7e20] [c00000000000ba54] ret_from_kernel_thread+0x5c/0x68
[ 0.366163] Instruction dump:
[ 0.366167] 7d404d2c 81210068 792a07e1 e9410070 392a0002 7d004c2c 79070020 40c20048
[ 0.366174] 39080014 3d200001 7f884840 419d00a4 <807e0000> 809e0004 80be0008 80de000c
[ 0.366182] ---[ end trace ec40127c4fe87b2c ]—
Thanks
-Sachin
^ permalink raw reply
* Re: Kernel Bug/oops during boot (PowerVM LPAR w/vTPM)
From: Michal Suchánek @ 2019-07-03 11:17 UTC (permalink / raw)
To: Sachin Sant; +Cc: nayna, linuxppc-dev, gcwilson
In-Reply-To: <49B804EE-726B-4EB4-9BED-116F8FB5B374@linux.vnet.ibm.com>
On Wed, 3 Jul 2019 15:54:59 +0530
Sachin Sant <sachinp@linux.vnet.ibm.com> wrote:
> Booting mainline kernel on PowerVM LPAR with vTPM enabled results
> into a kernel crash.
>
> [ 0.365989] BUG: Kernel NULL pointer dereference at 0x00000012
> [ 0.365995] Faulting instruction address: 0xc00000000073dd80
> [ 0.366000] Oops: Kernel access of bad area, sig: 11 [#1]
> [ 0.366005] LE PAGE_SIZE=64K MMU=Hash SMP NR_CPUS=2048 NUMA pSeries
> [ 0.366010] Modules linked in:
> [ 0.366015] CPU: 1 PID: 1 Comm: swapper/0 Not tainted 5.2.0-rc7-autotest-autotest #1
> [ 0.366020] NIP: c00000000073dd80 LR: c00000000073dcd0 CTR: 0000000000000000
> [ 0.366026] REGS: c0000018ed8e7550 TRAP: 0380 Not tainted (5.2.0-rc7-autotest-autotest)
> [ 0.366031] MSR: 8000000000009033 <SF,EE,ME,IR,DR,RI,LE> CR: 28002448 XER: 20040001
> [ 0.366038] CFAR: c000000000b6d1c4 IRQMASK: 0
> [ 0.366038] GPR00: c00000000073dcd0 c0000018ed8e77e0 c000000001524a00 0000000000000000
> [ 0.366038] GPR04: 0000000000000003 0000000000000000 0000000000010000 000000000000000e
> [ 0.366038] GPR08: 0000000000000022 0000000000010000 c0000018e5510000 00000000883bfecd
> [ 0.366038] GPR12: 0000000048002448 c00000001ec6ee00 c0000000000107a8 0000000000000000
> [ 0.366038] GPR16: 0000000000000000 0000000000000000 0000000000000000 0000000000000000
> [ 0.366038] GPR20: 0000000000000000 0000000000000000 0000000000000000 0000000000000000
> [ 0.366038] GPR24: c0000018eb9eaaa0 0000000000000000 c000000000bce810 c000000000e2ed28
> [ 0.366038] GPR28: c0000018e70a4000 000000000000000a 0000000000000012 c0000018e5510000
> [ 0.366085] NIP [c00000000073dd80] tpm1_pcr_extend+0x130/0x230
> [ 0.366090] LR [c00000000073dcd0] tpm1_pcr_extend+0x80/0x230
> [ 0.366094] Call Trace:
> [ 0.366098] [c0000018ed8e77e0] [c00000000073dcd0] tpm1_pcr_extend+0x80/0x230 (unreliable)
> [ 0.366105] [c0000018ed8e7890] [c00000000073c8c4] tpm_pcr_extend+0xd4/0x180
> [ 0.366111] [c0000018ed8e78d0] [c0000000005745f8] ima_add_template_entry+0x198/0x320
> [ 0.366117] [c0000018ed8e79b0] [c000000000577058] ima_store_template+0xc8/0x160
> [ 0.366124] [c0000018ed8e7a30] [c000000000f6081c] ima_add_boot_aggregate+0xf8/0x184
> [ 0.366130] [c0000018ed8e7b30] [c000000000f6093c] ima_init+0x94/0xbc
> [ 0.366135] [c0000018ed8e7b90] [c000000000f60aac] init_ima+0x44/0xe8
> [ 0.366140] [c0000018ed8e7c10] [c000000000010448] do_one_initcall+0x68/0x2c0
> [ 0.366146] [c0000018ed8e7ce0] [c000000000f14738] kernel_init_freeable+0x318/0x47c
> [ 0.366152] [c0000018ed8e7db0] [c0000000000107c4] kernel_init+0x24/0x150
> [ 0.366158] [c0000018ed8e7e20] [c00000000000ba54] ret_from_kernel_thread+0x5c/0x68
> [ 0.366163] Instruction dump:
> [ 0.366167] 7d404d2c 81210068 792a07e1 e9410070 392a0002 7d004c2c 79070020 40c20048
> [ 0.366174] 39080014 3d200001 7f884840 419d00a4 <807e0000> 809e0004 80be0008 80de000c
> [ 0.366182] ---[ end trace ec40127c4fe87b2c ]—
>
> Thanks
> -Sachin
You need to revert (or fix up) commit 0b6cf6b97b7e ("tpm: pass an array
of tpm_extend_digest structures to tpm_pcr_extend()". At least
reverting it fixes the issue for me.
Thanks
Michal
^ permalink raw reply
* [PATCH 02/30] powerpc: Use kmemdup rather than duplicating its implementation
From: Fuqian Huang @ 2019-07-03 13:13 UTC (permalink / raw)
Cc: linux-kernel, Paul Mackerras, Fuqian Huang, linuxppc-dev
kmemdup is introduced to duplicate a region of memory in a neat way.
Rather than kmalloc/kzalloc + memset, which the programmer needs to
write the size twice (sometimes lead to mistakes), kmemdup improves
readability, leads to smaller code and also reduce the chances of mistakes.
Suggestion to use kmemdup rather than using kmalloc/kzalloc + memset.
Add an allocation failure check.
Signed-off-by: Fuqian Huang <huangfq.daxian@gmail.com>
---
arch/powerpc/platforms/pseries/dlpar.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/platforms/pseries/dlpar.c b/arch/powerpc/platforms/pseries/dlpar.c
index 437a74173db2..20fe7b79e09e 100644
--- a/arch/powerpc/platforms/pseries/dlpar.c
+++ b/arch/powerpc/platforms/pseries/dlpar.c
@@ -383,9 +383,10 @@ void queue_hotplug_event(struct pseries_hp_errorlog *hp_errlog)
struct pseries_hp_work *work;
struct pseries_hp_errorlog *hp_errlog_copy;
- hp_errlog_copy = kmalloc(sizeof(struct pseries_hp_errorlog),
+ hp_errlog_copy = kmemdup(hp_errlog, sizeof(struct pseries_hp_errorlog),
GFP_KERNEL);
- memcpy(hp_errlog_copy, hp_errlog, sizeof(struct pseries_hp_errorlog));
+ if (!hp_errlog_copy)
+ return;
work = kmalloc(sizeof(struct pseries_hp_work), GFP_KERNEL);
if (work) {
--
2.11.0
^ permalink raw reply related
* [PATCH 09/30] macintosh: Use kmemdup rather than duplicating its implementation
From: Fuqian Huang @ 2019-07-03 13:14 UTC (permalink / raw)
Cc: Fuqian Huang, linuxppc-dev, linux-kernel
kmemdup is introduced to duplicate a region of memory in a neat way.
Rather than kmalloc/kzalloc + memset, which the programmer needs to
write the size twice (sometimes lead to mistakes), kmemdup improves
readability, leads to smaller code and also reduce the chances of mistakes.
Suggestion to use kmemdup rather than using kmalloc/kzalloc + memset.
Signed-off-by: Fuqian Huang <huangfq.daxian@gmail.com>
---
drivers/macintosh/adbhid.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/macintosh/adbhid.c b/drivers/macintosh/adbhid.c
index 75482eeab2c4..5d14bebfb58f 100644
--- a/drivers/macintosh/adbhid.c
+++ b/drivers/macintosh/adbhid.c
@@ -789,7 +789,8 @@ adbhid_input_register(int id, int default_id, int original_handler_id,
switch (default_id) {
case ADB_KEYBOARD:
- hid->keycode = kmalloc(sizeof(adb_to_linux_keycodes), GFP_KERNEL);
+ hid->keycode = kmemdup(adb_to_linux_keycodes,
+ sizeof(adb_to_linux_keycodes), GFP_KERNEL);
if (!hid->keycode) {
err = -ENOMEM;
goto fail;
@@ -797,8 +798,6 @@ adbhid_input_register(int id, int default_id, int original_handler_id,
sprintf(hid->name, "ADB keyboard");
- memcpy(hid->keycode, adb_to_linux_keycodes, sizeof(adb_to_linux_keycodes));
-
switch (original_handler_id) {
default:
keyboard_type = "<unknown>";
--
2.11.0
^ permalink raw reply related
* Re: [PATCH 02/30] powerpc: Use kmemdup rather than duplicating its implementation
From: Christophe Leroy @ 2019-07-03 13:19 UTC (permalink / raw)
To: Fuqian Huang; +Cc: linuxppc-dev, Paul Mackerras, linux-kernel
In-Reply-To: <20190703131327.24762-1-huangfq.daxian@gmail.com>
Le 03/07/2019 à 15:13, Fuqian Huang a écrit :
> kmemdup is introduced to duplicate a region of memory in a neat way.
> Rather than kmalloc/kzalloc + memset, which the programmer needs to
> write the size twice (sometimes lead to mistakes), kmemdup improves
> readability, leads to smaller code and also reduce the chances of mistakes.
> Suggestion to use kmemdup rather than using kmalloc/kzalloc + memset.
s/memset/memcpy/
>
> Add an allocation failure check.
Shouldn't this be in another patch ?
Christophe
>
> Signed-off-by: Fuqian Huang <huangfq.daxian@gmail.com>
> ---
> arch/powerpc/platforms/pseries/dlpar.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/arch/powerpc/platforms/pseries/dlpar.c b/arch/powerpc/platforms/pseries/dlpar.c
> index 437a74173db2..20fe7b79e09e 100644
> --- a/arch/powerpc/platforms/pseries/dlpar.c
> +++ b/arch/powerpc/platforms/pseries/dlpar.c
> @@ -383,9 +383,10 @@ void queue_hotplug_event(struct pseries_hp_errorlog *hp_errlog)
> struct pseries_hp_work *work;
> struct pseries_hp_errorlog *hp_errlog_copy;
>
> - hp_errlog_copy = kmalloc(sizeof(struct pseries_hp_errorlog),
> + hp_errlog_copy = kmemdup(hp_errlog, sizeof(struct pseries_hp_errorlog),
> GFP_KERNEL);
> - memcpy(hp_errlog_copy, hp_errlog, sizeof(struct pseries_hp_errorlog));
> + if (!hp_errlog_copy)
> + return;
>
> work = kmalloc(sizeof(struct pseries_hp_work), GFP_KERNEL);
> if (work) {
>
^ permalink raw reply
* Re: [PATCH 09/30] macintosh: Use kmemdup rather than duplicating its implementation
From: Christophe Leroy @ 2019-07-03 13:19 UTC (permalink / raw)
To: Fuqian Huang; +Cc: linuxppc-dev, linux-kernel
In-Reply-To: <20190703131452.25085-1-huangfq.daxian@gmail.com>
Le 03/07/2019 à 15:14, Fuqian Huang a écrit :
> kmemdup is introduced to duplicate a region of memory in a neat way.
> Rather than kmalloc/kzalloc + memset, which the programmer needs to
> write the size twice (sometimes lead to mistakes), kmemdup improves
> readability, leads to smaller code and also reduce the chances of mistakes.
> Suggestion to use kmemdup rather than using kmalloc/kzalloc + memset.
s/memset/memcpy/
>
> Signed-off-by: Fuqian Huang <huangfq.daxian@gmail.com>
> ---
> drivers/macintosh/adbhid.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/macintosh/adbhid.c b/drivers/macintosh/adbhid.c
> index 75482eeab2c4..5d14bebfb58f 100644
> --- a/drivers/macintosh/adbhid.c
> +++ b/drivers/macintosh/adbhid.c
> @@ -789,7 +789,8 @@ adbhid_input_register(int id, int default_id, int original_handler_id,
>
> switch (default_id) {
> case ADB_KEYBOARD:
> - hid->keycode = kmalloc(sizeof(adb_to_linux_keycodes), GFP_KERNEL);
> + hid->keycode = kmemdup(adb_to_linux_keycodes,
> + sizeof(adb_to_linux_keycodes), GFP_KERNEL);
> if (!hid->keycode) {
> err = -ENOMEM;
> goto fail;
> @@ -797,8 +798,6 @@ adbhid_input_register(int id, int default_id, int original_handler_id,
>
> sprintf(hid->name, "ADB keyboard");
>
> - memcpy(hid->keycode, adb_to_linux_keycodes, sizeof(adb_to_linux_keycodes));
> -
> switch (original_handler_id) {
> default:
> keyboard_type = "<unknown>";
>
^ permalink raw reply
* Re: [PATCH] powerpc/ftrace: Enable C Version of recordmcount
From: Michael Ellerman @ 2019-07-03 14:27 UTC (permalink / raw)
To: Christophe Leroy, Benjamin Herrenschmidt, Paul Mackerras
Cc: linuxppc-dev, linux-kernel
In-Reply-To: <4464516c0b6835b42acc65e088b6d7f88fe886f2.1557235811.git.christophe.leroy@c-s.fr>
On Tue, 2019-05-07 at 13:31:38 UTC, Christophe Leroy wrote:
> Selects HAVE_C_RECORDMCOUNT to use the C version of the recordmcount
> intead of the old Perl Version of recordmcount.
>
> This should improve build time. It also seems like the old Perl Version
> misses some calls to _mcount that the C version finds.
>
> Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Applied to powerpc next, thanks.
https://git.kernel.org/powerpc/c/f079bb3c5f2978b2c1a13098ab2a8c32e5d1ee3d
cheers
^ permalink raw reply
* Re: [PATCH] powerpc: Document xive=off option
From: Michael Ellerman @ 2019-07-03 14:27 UTC (permalink / raw)
To: Michael Neuling; +Cc: mikey, linuxppc-dev, Cédric Le Goater
In-Reply-To: <20190513053910.19227-1-mikey@neuling.org>
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 557 bytes --]
On Mon, 2019-05-13 at 05:39:10 UTC, Michael Neuling wrote:
> commit 243e25112d06 ("powerpc/xive: Native exploitation of the XIVE
> interrupt controller") added an option to turn off Linux native XIVE
> usage via the xive=off kernel command line option.
>
> This documents this option.
>
> Signed-off-by: Michael Neuling <mikey@neuling.org>
> Reviewed-by: Cédric Le Goater <clg@kaod.org>
> Acked-by: Stewart Smith <stewart@linux.ibm.com>
Applied to powerpc next, thanks.
https://git.kernel.org/powerpc/c/ba45cff610a4223ce3ad98a700a820e3d60e3f7c
cheers
^ permalink raw reply
* Re: [PATCH] powerpc/eeh_cache: fix a W=1 kernel-doc warning
From: Michael Ellerman @ 2019-07-03 14:27 UTC (permalink / raw)
To: Qian Cai; +Cc: sbobroff, linux-kernel, oohall, Qian Cai, linuxppc-dev, paulus
In-Reply-To: <1559767579-7151-1-git-send-email-cai@lca.pw>
On Wed, 2019-06-05 at 20:46:19 UTC, Qian Cai wrote:
> The opening comment mark "/**" is reserved for kernel-doc comments, so
> it will generate a warning with "make W=1".
>
> arch/powerpc/kernel/eeh_cache.c:37: warning: cannot understand function
> prototype: 'struct pci_io_addr_range
>
> Since this is not a kernel-doc for the struct below, but rather an
> overview of this source eeh_cache.c, just use the free-form comments
> kernel-doc syntax instead.
>
> Signed-off-by: Qian Cai <cai@lca.pw>
> Acked-by: Russell Currey <ruscur@russell.cc>
Applied to powerpc next, thanks.
https://git.kernel.org/powerpc/c/3becd11dffe5d4a7467ebd841172f3e091fbcbd0
cheers
^ permalink raw reply
* Re: [PATCH] powerpc/cacheflush: fix variable set but not used
From: Michael Ellerman @ 2019-07-03 14:27 UTC (permalink / raw)
To: Qian Cai; +Cc: paulus, akpm, linuxppc-dev, Qian Cai, linux-kernel
In-Reply-To: <1559829493-28457-1-git-send-email-cai@lca.pw>
On Thu, 2019-06-06 at 13:58:13 UTC, Qian Cai wrote:
> The powerpc's flush_cache_vmap() is defined as a macro and never use
> both of its arguments, so it will generate a compilation warning,
>
> lib/ioremap.c: In function 'ioremap_page_range':
> lib/ioremap.c:203:16: warning: variable 'start' set but not used
> [-Wunused-but-set-variable]
>
> Fix it by making it an inline function.
>
> Signed-off-by: Qian Cai <cai@lca.pw>
Applied to powerpc next, thanks.
https://git.kernel.org/powerpc/c/04db3ede40ae4fc23a5c4237254c4a53bbe4c1f2
cheers
^ permalink raw reply
* Re: [PATCH] powerpc/rtas: retry when cpu offline races with suspend/migration
From: Michael Ellerman @ 2019-07-03 14:27 UTC (permalink / raw)
To: Nathan Lynch, linuxppc-dev; +Cc: ego, mmc, julietk
In-Reply-To: <20190621060518.29616-1-nathanl@linux.ibm.com>
On Fri, 2019-06-21 at 06:05:18 UTC, Nathan Lynch wrote:
> The protocol for suspending or migrating an LPAR requires all present
> processor threads to enter H_JOIN. So if we have threads offline, we
> have to temporarily bring them up. This can race with administrator
> actions such as SMT state changes. As of dfd718a2ed1f ("powerpc/rtas:
> Fix a potential race between CPU-Offline & Migration"),
> rtas_ibm_suspend_me() accounts for this, but errors out with -EBUSY
> for what almost certainly is a transient condition in any reasonable
> scenario.
>
> Callers of rtas_ibm_suspend_me() already retry when -EAGAIN is
> returned, and it is typical during a migration for that to happen
> repeatedly for several minutes polling the H_VASI_STATE hcall result
> before proceeding to the next stage.
>
> So return -EAGAIN instead of -EBUSY when this race is
> encountered. Additionally: logging this event is still appropriate but
> use pr_info instead of pr_err; and remove use of unlikely() while here
> as this is not a hot path at all.
>
> Fixes: dfd718a2ed1f ("powerpc/rtas: Fix a potential race between CPU-Offline & Migration")
> Signed-off-by: Nathan Lynch <nathanl@linux.ibm.com>
Applied to powerpc next, thanks.
https://git.kernel.org/powerpc/c/9fb603050ffd94f8127df99c699cca2f575eb6a0
cheers
^ permalink raw reply
* Re: [PATCH 1/4] powerpc/powernv: remove the unused pnv_pci_set_p2p function
From: Michael Ellerman @ 2019-07-03 14:27 UTC (permalink / raw)
To: Christoph Hellwig, Benjamin Herrenschmidt, Paul Mackerras
Cc: Alexey Kardashevskiy, Frederic Barrat, Oliver O'Halloran,
linuxppc-dev, linux-kernel
In-Reply-To: <20190625145239.2759-2-hch@lst.de>
On Tue, 2019-06-25 at 14:52:36 UTC, Christoph Hellwig wrote:
> This function has never been used anywhere in the kernel tree since it
> was added to the tree. We also now have proper PCIe P2P APIs in the core
> kernel, and any new P2P support should be using those.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
Series applied to powerpc next, thanks.
https://git.kernel.org/powerpc/c/63982618662e2a05e5c5c3e4247456d1d3467f32
cheers
^ permalink raw reply
* Re: [PATCH] recordmcount: Fix spurious mcount entries on powerpc
From: Michael Ellerman @ 2019-07-03 14:27 UTC (permalink / raw)
To: Naveen N. Rao, Steven Rostedt, Christophe Leroy
Cc: linuxppc-dev, linux-kernel
In-Reply-To: <20190626183801.31247-1-naveen.n.rao@linux.vnet.ibm.com>
On Wed, 2019-06-26 at 18:38:01 UTC, "Naveen N. Rao" wrote:
> The recent change enabling HAVE_C_RECORDMCOUNT on powerpc started
> showing the following issue:
>
> # modprobe kprobe_example
> ftrace-powerpc: Not expected bl: opcode is 3c4c0001
> WARNING: CPU: 0 PID: 227 at kernel/trace/ftrace.c:2001 ftrace_bug+0x90/0x318
> Modules linked in:
> CPU: 0 PID: 227 Comm: modprobe Not tainted 5.2.0-rc6-00678-g1c329100b942 #2
> NIP: c000000000264318 LR: c00000000025d694 CTR: c000000000f5cd30
> REGS: c000000001f2b7b0 TRAP: 0700 Not tainted (5.2.0-rc6-00678-g1c329100b942)
> MSR: 900000010282b033 <SF,HV,VEC,VSX,EE,FP,ME,IR,DR,RI,LE,TM[E]> CR: 28228222 XER: 00000000
> CFAR: c0000000002642fc IRQMASK: 0
> <snip>
> NIP [c000000000264318] ftrace_bug+0x90/0x318
> LR [c00000000025d694] ftrace_process_locs+0x4f4/0x5e0
> Call Trace:
> [c000000001f2ba40] [0000000000000004] 0x4 (unreliable)
> [c000000001f2bad0] [c00000000025d694] ftrace_process_locs+0x4f4/0x5e0
> [c000000001f2bb90] [c00000000020ff10] load_module+0x25b0/0x30c0
> [c000000001f2bd00] [c000000000210cb0] sys_finit_module+0xc0/0x130
> [c000000001f2be20] [c00000000000bda4] system_call+0x5c/0x70
> Instruction dump:
> 419e0018 2f83ffff 419e00bc 2f83ffea 409e00cc 4800001c 0fe00000 3c62ff96
> 39000001 39400000 386386d0 480000c4 <0fe00000> 3ce20003 39000001 3c62ff96
> ---[ end trace 4c438d5cebf78381 ]---
> ftrace failed to modify
> [<c0080000012a0008>] 0xc0080000012a0008
> actual: 01:00:4c:3c
> Initializing ftrace call sites
> ftrace record flags: 2000000
> (0)
> expected tramp: c00000000006af4c
>
> Looking at the relocation records in __mcount_loc showed a few spurious
> entries:
> RELOCATION RECORDS FOR [__mcount_loc]:
> OFFSET TYPE VALUE
> 0000000000000000 R_PPC64_ADDR64 .text.unlikely+0x0000000000000008
> 0000000000000008 R_PPC64_ADDR64 .text.unlikely+0x0000000000000014
> 0000000000000010 R_PPC64_ADDR64 .text.unlikely+0x0000000000000060
> 0000000000000018 R_PPC64_ADDR64 .text.unlikely+0x00000000000000b4
> 0000000000000020 R_PPC64_ADDR64 .init.text+0x0000000000000008
> 0000000000000028 R_PPC64_ADDR64 .init.text+0x0000000000000014
>
> The first entry in each section is incorrect. Looking at the relocation
> records, the spurious entries correspond to the R_PPC64_ENTRY records:
> RELOCATION RECORDS FOR [.text.unlikely]:
> OFFSET TYPE VALUE
> 0000000000000000 R_PPC64_REL64 .TOC.-0x0000000000000008
> 0000000000000008 R_PPC64_ENTRY *ABS*
> 0000000000000014 R_PPC64_REL24 _mcount
> <snip>
>
> The problem is that we are not validating the return value from
> get_mcountsym() in sift_rel_mcount(). With this entry, mcountsym is 0,
> but Elf_r_sym(relp) also ends up being 0. Fix this by ensuring mcountsym
> is valid before processing the entry.
>
> Fixes: c7d64b560ce80 ("powerpc/ftrace: Enable C Version of recordmcount")
> Signed-off-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
> Tested-by: Satheesh Rajendran <sathnaga@linux.vnet.ibm.com>
> Acked-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Applied to powerpc next, thanks.
https://git.kernel.org/powerpc/c/80e5302e4bc85a6b685b7668c36c6487b5f90e9a
cheers
^ permalink raw reply
* Re: [PATCH] powerpc/xmon: Fix disabling tracing while in xmon
From: Michael Ellerman @ 2019-07-03 14:27 UTC (permalink / raw)
To: Naveen N. Rao; +Cc: linuxppc-dev
In-Reply-To: <20190627095940.7492-1-naveen.n.rao@linux.vnet.ibm.com>
On Thu, 2019-06-27 at 09:59:40 UTC, "Naveen N. Rao" wrote:
> Commit ed49f7fd6438d ("powerpc/xmon: Disable tracing when entering
> xmon") added code to disable recording trace entries while in xmon. The
> commit introduced a variable 'tracing_enabled' to record if tracing was
> enabled on xmon entry, and used this to conditionally enable tracing
> during exit from xmon.
>
> However, we are not checking the value of 'fromipi' variable in
> xmon_core() when setting 'tracing_enabled'. Due to this, when secondary
> cpus enter xmon, they will see tracing as being disabled already and
> tracing won't be re-enabled on exit. Fix the same.
>
> Fixes: ed49f7fd6438d ("powerpc/xmon: Disable tracing when entering xmon")
> Signed-off-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Applied to powerpc next, thanks.
https://git.kernel.org/powerpc/c/aaf06665f7ea3ee9f9754e16c1a507a89f1de5b1
cheers
^ permalink raw reply
* Re: [PATCH v5 0/4] *** SUBJECT HERE ***
From: Herbert Xu @ 2019-07-03 14:27 UTC (permalink / raw)
To: Christophe Leroy
Cc: linux-kernel, linuxppc-dev, David S. Miller, horia.geanta,
linux-crypto
In-Reply-To: <cover.1561360551.git.christophe.leroy@c-s.fr>
On Mon, Jun 24, 2019 at 07:20:13AM +0000, Christophe Leroy wrote:
> This series is the last set of fixes for the Talitos driver.
>
> We now get a fully clean boot on both SEC1 (SEC1.2 on mpc885) and
> SEC2 (SEC2.2 on mpc8321E) with CONFIG_CRYPTO_MANAGER_EXTRA_TESTS:
>
> [ 3.385197] bus: 'platform': really_probe: probing driver talitos with device ff020000.crypto
> [ 3.450982] random: fast init done
> [ 12.252548] alg: No test for authenc(hmac(md5),cbc(aes)) (authenc-hmac-md5-cbc-aes-talitos-hsna)
> [ 12.262226] alg: No test for authenc(hmac(md5),cbc(des3_ede)) (authenc-hmac-md5-cbc-3des-talitos-hsna)
> [ 43.310737] Bug in SEC1, padding ourself
> [ 45.603318] random: crng init done
> [ 54.612333] talitos ff020000.crypto: fsl,sec1.2 algorithms registered in /proc/crypto
> [ 54.620232] driver: 'talitos': driver_bound: bound to device 'ff020000.crypto'
>
> [ 1.193721] bus: 'platform': really_probe: probing driver talitos with device b0030000.crypto
> [ 1.229197] random: fast init done
> [ 2.714920] alg: No test for authenc(hmac(sha224),cbc(aes)) (authenc-hmac-sha224-cbc-aes-talitos)
> [ 2.724312] alg: No test for authenc(hmac(sha224),cbc(aes)) (authenc-hmac-sha224-cbc-aes-talitos-hsna)
> [ 4.482045] alg: No test for authenc(hmac(md5),cbc(aes)) (authenc-hmac-md5-cbc-aes-talitos)
> [ 4.490940] alg: No test for authenc(hmac(md5),cbc(aes)) (authenc-hmac-md5-cbc-aes-talitos-hsna)
> [ 4.500280] alg: No test for authenc(hmac(md5),cbc(des3_ede)) (authenc-hmac-md5-cbc-3des-talitos)
> [ 4.509727] alg: No test for authenc(hmac(md5),cbc(des3_ede)) (authenc-hmac-md5-cbc-3des-talitos-hsna)
> [ 6.631781] random: crng init done
> [ 11.521795] talitos b0030000.crypto: fsl,sec2.2 algorithms registered in /proc/crypto
> [ 11.529803] driver: 'talitos': driver_bound: bound to device 'b0030000.crypto'
>
> v2: dropped patch 1 which was irrelevant due to a rebase weirdness. Added Cc to stable on the 2 first patches.
>
> v3:
> - removed stable reference in patch 1
> - reworded patch 1 to include name of patch 2 for the dependency.
> - mentionned this dependency in patch 2 as well.
> - corrected the Fixes: sha1 in patch 4
>
> v4:
> - using scatterwalk_ffwd() instead of opencodying SG list forwarding.
> - Added a patch to fix sg_copy_to_buffer() when sg->offset() is greater than PAGE_SIZE,
> otherwise sg_copy_to_buffer() fails when the list has been forwarded with scatterwalk_ffwd().
> - taken the patch "crypto: talitos - eliminate unneeded 'done' functions at build time"
> out of the series because it is independent.
> - added a helper to find the header field associated to a request in flush_channe()
>
> v5:
> - Replacing the while loop by a direct shift/mask operation, as suggested by Herbert in patch 1.
>
> Christophe Leroy (4):
> lib/scatterlist: Fix mapping iterator when sg->offset is greater than
> PAGE_SIZE
> crypto: talitos - move struct talitos_edesc into talitos.h
> crypto: talitos - fix hash on SEC1.
> crypto: talitos - drop icv_ool
>
> drivers/crypto/talitos.c | 102 +++++++++++++++++++----------------------------
> drivers/crypto/talitos.h | 28 +++++++++++++
> lib/scatterlist.c | 9 +++--
> 3 files changed, 74 insertions(+), 65 deletions(-)
All applied. Thanks.
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply
* Re: [PATCH 1/4] powerpc/powernv: remove the unused pnv_pci_set_p2p function
From: Christoph Hellwig @ 2019-07-03 14:33 UTC (permalink / raw)
To: Michael Ellerman
Cc: Alexey Kardashevskiy, linux-kernel, Oliver O'Halloran,
Frederic Barrat, Paul Mackerras, linuxppc-dev, Christoph Hellwig
In-Reply-To: <45f3Mt388Xz9sPD@ozlabs.org>
On Thu, Jul 04, 2019 at 12:27:06AM +1000, Michael Ellerman wrote:
> On Tue, 2019-06-25 at 14:52:36 UTC, Christoph Hellwig wrote:
> > This function has never been used anywhere in the kernel tree since it
> > was added to the tree. We also now have proper PCIe P2P APIs in the core
> > kernel, and any new P2P support should be using those.
> >
> > Signed-off-by: Christoph Hellwig <hch@lst.de>
>
> Series applied to powerpc next, thanks.
>
> https://git.kernel.org/powerpc/c/63982618662e2a05e5c5c3e4247456d1d3467f32
Thanks. For P2P it would be good if you guys could chime in for
the "Removing struct page from P2PDMA" where we are discussion PCIe
P2P requirements so that our future changes can accommodate Power 9
and we can help upstreaming the P2P support in a proper way.
^ permalink raw reply
* [PATCH] arch: powerpc: Kconfig: pedantic formatting
From: Enrico Weigelt, metux IT consult @ 2019-07-03 16:04 UTC (permalink / raw)
To: linux-kernel; +Cc: alistair, kvm-ppc, oss, linuxppc-dev
Formatting of Kconfig files doesn't look so pretty, so let the
Great White Handkerchief come around and clean it up.
Also convert "---help---" as requested on lkml.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
arch/powerpc/Kconfig | 40 +++++++++++++++++-----------------
arch/powerpc/kvm/Kconfig | 6 ++---
arch/powerpc/platforms/40x/Kconfig | 7 +++---
arch/powerpc/platforms/44x/Kconfig | 10 ++++-----
arch/powerpc/platforms/85xx/Kconfig | 8 +++----
arch/powerpc/platforms/86xx/Kconfig | 6 ++---
arch/powerpc/platforms/maple/Kconfig | 2 +-
arch/powerpc/platforms/pseries/Kconfig | 18 +++++++--------
arch/powerpc/sysdev/xics/Kconfig | 13 +++++------
9 files changed, 54 insertions(+), 56 deletions(-)
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 8c1c636..2c9f911 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -48,7 +48,7 @@ config ARCH_MMAP_RND_COMPAT_BITS_MAX
# Allow randomisation to consume up to 512MB of address space (2^29).
default 11 if PPC_256K_PAGES # 11 = 29 (512MB) - 18 (256K)
default 13 if PPC_64K_PAGES # 13 = 29 (512MB) - 16 (64K)
- default 15 if PPC_16K_PAGES # 15 = 29 (512MB) - 14 (16K)
+ default 15 if PPC_16K_PAGES # 15 = 29 (512MB) - 14 (16K)
default 17 # 17 = 29 (512MB) - 12 (4K)
config ARCH_MMAP_RND_COMPAT_BITS_MIN
@@ -244,9 +244,9 @@ config PPC
#
config PPC_BARRIER_NOSPEC
- bool
- default y
- depends on PPC_BOOK3S_64 || PPC_FSL_BOOK3E
+ bool
+ default y
+ depends on PPC_BOOK3S_64 || PPC_FSL_BOOK3E
config EARLY_PRINTK
bool
@@ -398,7 +398,7 @@ config HUGETLB_PAGE_SIZE_VARIABLE
config MATH_EMULATION
bool "Math emulation"
depends on 4xx || PPC_8xx || PPC_MPC832x || BOOKE
- ---help---
+ help
Some PowerPC chips designed for embedded applications do not have
a floating-point unit and therefore do not implement the
floating-point instructions in the PowerPC instruction set. If you
@@ -417,27 +417,27 @@ choice
config MATH_EMULATION_FULL
bool "Emulate all the floating point instructions"
- ---help---
+ help
Select this option will enable the kernel to support to emulate
all the floating point instructions. If your SoC doesn't have
a FPU, you should select this.
config MATH_EMULATION_HW_UNIMPLEMENTED
bool "Just emulate the FPU unimplemented instructions"
- ---help---
+ help
Select this if you know there does have a hardware FPU on your
SoC, but some floating point instructions are not implemented by that.
endchoice
config PPC_TRANSACTIONAL_MEM
- bool "Transactional Memory support for POWERPC"
- depends on PPC_BOOK3S_64
- depends on SMP
- select ALTIVEC
- select VSX
- ---help---
- Support user-mode Transactional Memory on POWERPC.
+ bool "Transactional Memory support for POWERPC"
+ depends on PPC_BOOK3S_64
+ depends on SMP
+ select ALTIVEC
+ select VSX
+ help
+ Support user-mode Transactional Memory on POWERPC.
config LD_HEAD_STUB_CATCH
bool "Reserve 256 bytes to cope with linker stubs in HEAD text" if EXPERT
@@ -457,7 +457,7 @@ config HOTPLUG_CPU
bool "Support for enabling/disabling CPUs"
depends on SMP && (PPC_PSERIES || \
PPC_PMAC || PPC_POWERNV || FSL_SOC_BOOKE)
- ---help---
+ help
Say Y here to be able to disable and re-enable individual
CPUs at runtime on SMP machines.
@@ -825,7 +825,7 @@ config PPC_DENORMALISATION
bool "PowerPC denormalisation exception handling"
depends on PPC_BOOK3S_64
default "y" if PPC_POWERNV
- ---help---
+ help
Add support for handling denormalisation of single precision
values. Useful for bare metal only. If unsure say Y here.
@@ -938,7 +938,7 @@ config FSL_SOC
bool
config FSL_PCI
- bool
+ bool
select ARCH_HAS_DMA_SET_MASK
select PPC_INDIRECT_PCI
select PCI_QUIRKS
@@ -986,7 +986,7 @@ config FSL_RIO
bool "Freescale Embedded SRIO Controller support"
depends on RAPIDIO = y && HAVE_RAPIDIO
default "n"
- ---help---
+ help
Include support for RapidIO controller on Freescale embedded
processors (MPC8548, MPC8641, etc).
@@ -1050,14 +1050,14 @@ config DYNAMIC_MEMSTART
select NONSTATIC_KERNEL
help
This option enables the kernel to be loaded at any page aligned
- physical address. The kernel creates a mapping from KERNELBASE to
+ physical address. The kernel creates a mapping from KERNELBASE to
the address where the kernel is loaded. The page size here implies
the TLB page size of the mapping for kernel on the particular platform.
Please refer to the init code for finding the TLB page size.
DYNAMIC_MEMSTART is an easy way of implementing pseudo-RELOCATABLE
kernel image, where the only restriction is the page aligned kernel
- load address. When this option is enabled, the compile time physical
+ load address. When this option is enabled, the compile time physical
address CONFIG_PHYSICAL_START is ignored.
This option is overridden by CONFIG_RELOCATABLE
diff --git a/arch/powerpc/kvm/Kconfig b/arch/powerpc/kvm/Kconfig
index f53997a..8f714a1 100644
--- a/arch/powerpc/kvm/Kconfig
+++ b/arch/powerpc/kvm/Kconfig
@@ -183,9 +183,9 @@ config KVM_MPIC
select HAVE_KVM_MSI
help
Enable support for emulating MPIC devices inside the
- host kernel, rather than relying on userspace to emulate.
- Currently, support is limited to certain versions of
- Freescale's MPIC implementation.
+ host kernel, rather than relying on userspace to emulate.
+ Currently, support is limited to certain versions of
+ Freescale's MPIC implementation.
config KVM_XICS
bool "KVM in-kernel XICS emulation"
diff --git a/arch/powerpc/platforms/40x/Kconfig b/arch/powerpc/platforms/40x/Kconfig
index ad2bb14..6da813b 100644
--- a/arch/powerpc/platforms/40x/Kconfig
+++ b/arch/powerpc/platforms/40x/Kconfig
@@ -16,12 +16,12 @@ config EP405
This option enables support for the EP405/EP405PC boards.
config HOTFOOT
- bool "Hotfoot"
+ bool "Hotfoot"
depends on 40x
select PPC40x_SIMPLE
select FORCE_PCI
- help
- This option enables support for the ESTEEM 195E Hotfoot board.
+ help
+ This option enables support for the ESTEEM 195E Hotfoot board.
config KILAUEA
bool "Kilauea"
@@ -80,7 +80,6 @@ config OBS600
help
This option enables support for PlatHome OpenBlockS 600 server
-
config PPC40x_SIMPLE
bool "Simple PowerPC 40x board support"
depends on 40x
diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig
index 35be81f..b369ed4 100644
--- a/arch/powerpc/platforms/44x/Kconfig
+++ b/arch/powerpc/platforms/44x/Kconfig
@@ -40,12 +40,12 @@ config EBONY
This option enables support for the IBM PPC440GP evaluation board.
config SAM440EP
- bool "Sam440ep"
+ bool "Sam440ep"
depends on 44x
- select 440EP
- select FORCE_PCI
- help
- This option enables support for the ACube Sam440ep board.
+ select 440EP
+ select FORCE_PCI
+ help
+ This option enables support for the ACube Sam440ep board.
config SEQUOIA
bool "Sequoia"
diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig
index d1af0ee2..fa3d29d 100644
--- a/arch/powerpc/platforms/85xx/Kconfig
+++ b/arch/powerpc/platforms/85xx/Kconfig
@@ -147,10 +147,10 @@ config SOCRATES
This option enables support for the Socrates board.
config KSI8560
- bool "Emerson KSI8560"
- select DEFAULT_UIMAGE
- help
- This option enables support for the Emerson KSI8560 board
+ bool "Emerson KSI8560"
+ select DEFAULT_UIMAGE
+ help
+ This option enables support for the Emerson KSI8560 board
config XES_MPC85xx
bool "X-ES single-board computer"
diff --git a/arch/powerpc/platforms/86xx/Kconfig b/arch/powerpc/platforms/86xx/Kconfig
index 0a61011..07a9d60 100644
--- a/arch/powerpc/platforms/86xx/Kconfig
+++ b/arch/powerpc/platforms/86xx/Kconfig
@@ -62,9 +62,9 @@ config GEF_SBC610
This option enables support for the GE SBC610.
config MVME7100
- bool "Artesyn MVME7100"
- help
- This option enables support for the Emerson/Artesyn MVME7100 board.
+ bool "Artesyn MVME7100"
+ help
+ This option enables support for the Emerson/Artesyn MVME7100 board.
endif
diff --git a/arch/powerpc/platforms/maple/Kconfig b/arch/powerpc/platforms/maple/Kconfig
index 08d530a..86ae210 100644
--- a/arch/powerpc/platforms/maple/Kconfig
+++ b/arch/powerpc/platforms/maple/Kconfig
@@ -14,5 +14,5 @@ config PPC_MAPLE
select MMIO_NVRAM
select ATA_NONSTANDARD if ATA
help
- This option enables support for the Maple 970FX Evaluation Board.
+ This option enables support for the Maple 970FX Evaluation Board.
For more information, refer to <http://www.970eval.com>
diff --git a/arch/powerpc/platforms/pseries/Kconfig b/arch/powerpc/platforms/pseries/Kconfig
index 9c6b3d8..c7ad9818 100644
--- a/arch/powerpc/platforms/pseries/Kconfig
+++ b/arch/powerpc/platforms/pseries/Kconfig
@@ -80,19 +80,19 @@ config LPARCFG
bool "LPAR Configuration Data"
depends on PPC_PSERIES
help
- Provide system capacity information via human readable
- <key word>=<value> pairs through a /proc/ppc64/lparcfg interface.
+ Provide system capacity information via human readable
+ <key word>=<value> pairs through a /proc/ppc64/lparcfg interface.
config PPC_PSERIES_DEBUG
depends on PPC_PSERIES && PPC_EARLY_DEBUG
bool "Enable extra debug logging in platforms/pseries"
- help
+ default y
+ help
Say Y here if you want the pseries core to produce a bunch of
debug messages to the system log. Select this if you are having a
problem with the pseries core and want to see more of what is
going on. This does not enable debugging in lpar.c, which must
be manually done due to its verbosity.
- default y
config PPC_SMLPAR
bool "Support for shared-memory logical partitions"
@@ -117,16 +117,16 @@ config CMM
balance memory across many LPARs.
config HV_PERF_CTRS
- bool "Hypervisor supplied PMU events (24x7 & GPCI)"
- default y
- depends on PERF_EVENTS && PPC_PSERIES
- help
+ bool "Hypervisor supplied PMU events (24x7 & GPCI)"
+ default y
+ depends on PERF_EVENTS && PPC_PSERIES
+ help
Enable access to hypervisor supplied counters in perf. Currently,
this enables code that uses the hcall GetPerfCounterInfo and 24x7
interfaces to retrieve counters. GPCI exists on Power 6 and later
systems. 24x7 is available on Power 8 and later systems.
- If unsure, select Y.
+ If unsure, select Y.
config IBMVIO
depends on PPC_PSERIES
diff --git a/arch/powerpc/sysdev/xics/Kconfig b/arch/powerpc/sysdev/xics/Kconfig
index 86fee42..304614c 100644
--- a/arch/powerpc/sysdev/xics/Kconfig
+++ b/arch/powerpc/sysdev/xics/Kconfig
@@ -1,15 +1,14 @@
# SPDX-License-Identifier: GPL-2.0
config PPC_XICS
- def_bool n
- select PPC_SMP_MUXED_IPI
- select HARDIRQS_SW_RESEND
+ def_bool n
+ select PPC_SMP_MUXED_IPI
+ select HARDIRQS_SW_RESEND
config PPC_ICP_NATIVE
- def_bool n
+ def_bool n
config PPC_ICP_HV
- def_bool n
+ def_bool n
config PPC_ICS_RTAS
- def_bool n
-
+ def_bool n
--
1.9.1
^ permalink raw reply related
* [PATCH v2 02/35] powerpc: Add an allocation failure check
From: Fuqian Huang @ 2019-07-03 16:26 UTC (permalink / raw)
Cc: linux-kernel, Paul Mackerras, Fuqian Huang, linuxppc-dev
Add an allocation failure check.
Signed-off-by: Fuqian Huang <huangfq.daxian@gmail.com>
---
Changes in v2:
- Split into two patches
arch/powerpc/platforms/pseries/dlpar.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/powerpc/platforms/pseries/dlpar.c b/arch/powerpc/platforms/pseries/dlpar.c
index 437a74173db2..7488e40f5e47 100644
--- a/arch/powerpc/platforms/pseries/dlpar.c
+++ b/arch/powerpc/platforms/pseries/dlpar.c
@@ -385,6 +385,8 @@ void queue_hotplug_event(struct pseries_hp_errorlog *hp_errlog)
hp_errlog_copy = kmalloc(sizeof(struct pseries_hp_errorlog),
GFP_KERNEL);
+ if (!hp_errlog_copy)
+ return;
memcpy(hp_errlog_copy, hp_errlog, sizeof(struct pseries_hp_errorlog));
work = kmalloc(sizeof(struct pseries_hp_work), GFP_KERNEL);
--
2.11.0
^ permalink raw reply related
* [PATCH v2 03/35] powerpc: Use kmemdup rather than duplicating its implementation
From: Fuqian Huang @ 2019-07-03 16:26 UTC (permalink / raw)
Cc: linux-kernel, Paul Mackerras, Fuqian Huang, linuxppc-dev
kmemdup is introduced to duplicate a region of memory in a neat way.
Rather than kmalloc/kzalloc + memcpy, which the programmer needs to
write the size twice (sometimes lead to mistakes), kmemdup improves
readability, leads to smaller code and also reduce the chances of mistakes.
Suggestion to use kmemdup rather than using kmalloc/kzalloc + memcpy.
Signed-off-by: Fuqian Huang <huangfq.daxian@gmail.com>
---
Changes in v2:
- Fix a typo in commit message (memset -> memcpy)
arch/powerpc/platforms/pseries/dlpar.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch/powerpc/platforms/pseries/dlpar.c b/arch/powerpc/platforms/pseries/dlpar.c
index 7488e40f5e47..20fe7b79e09e 100644
--- a/arch/powerpc/platforms/pseries/dlpar.c
+++ b/arch/powerpc/platforms/pseries/dlpar.c
@@ -383,11 +383,10 @@ void queue_hotplug_event(struct pseries_hp_errorlog *hp_errlog)
struct pseries_hp_work *work;
struct pseries_hp_errorlog *hp_errlog_copy;
- hp_errlog_copy = kmalloc(sizeof(struct pseries_hp_errorlog),
+ hp_errlog_copy = kmemdup(hp_errlog, sizeof(struct pseries_hp_errorlog),
GFP_KERNEL);
if (!hp_errlog_copy)
return;
- memcpy(hp_errlog_copy, hp_errlog, sizeof(struct pseries_hp_errorlog));
work = kmalloc(sizeof(struct pseries_hp_work), GFP_KERNEL);
if (work) {
--
2.11.0
^ permalink raw reply related
* [PATCH v2 10/35] macintosh: Use kmemdup rather than duplicating its implementation
From: Fuqian Huang @ 2019-07-03 16:28 UTC (permalink / raw)
Cc: Fuqian Huang, linuxppc-dev, linux-kernel
kmemdup is introduced to duplicate a region of memory in a neat way.
Rather than kmalloc/kzalloc + memcpy, which the programmer needs to
write the size twice (sometimes lead to mistakes), kmemdup improves
readability, leads to smaller code and also reduce the chances of mistakes.
Suggestion to use kmemdup rather than using kmalloc/kzalloc + memcpy.
Signed-off-by: Fuqian Huang <huangfq.daxian@gmail.com>
---
Changes in v2:
- Fix a typo in commit message (memset -> memcpy)
drivers/macintosh/adbhid.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/macintosh/adbhid.c b/drivers/macintosh/adbhid.c
index 75482eeab2c4..5d14bebfb58f 100644
--- a/drivers/macintosh/adbhid.c
+++ b/drivers/macintosh/adbhid.c
@@ -789,7 +789,8 @@ adbhid_input_register(int id, int default_id, int original_handler_id,
switch (default_id) {
case ADB_KEYBOARD:
- hid->keycode = kmalloc(sizeof(adb_to_linux_keycodes), GFP_KERNEL);
+ hid->keycode = kmemdup(adb_to_linux_keycodes,
+ sizeof(adb_to_linux_keycodes), GFP_KERNEL);
if (!hid->keycode) {
err = -ENOMEM;
goto fail;
@@ -797,8 +798,6 @@ adbhid_input_register(int id, int default_id, int original_handler_id,
sprintf(hid->name, "ADB keyboard");
- memcpy(hid->keycode, adb_to_linux_keycodes, sizeof(adb_to_linux_keycodes));
-
switch (original_handler_id) {
default:
keyboard_type = "<unknown>";
--
2.11.0
^ permalink raw reply related
* [PATCH v3 0/9] Provide vcpu dispatch statistics
From: Naveen N. Rao @ 2019-07-03 17:03 UTC (permalink / raw)
To: Michael Ellerman
Cc: Nathan Lynch, Aneesh Kumar K.V, Mingming Cao, linuxppc-dev
Changes since v2:
- Moved most prototypes to asm/lppaca.h instead of asm/plpar_wrappers.h
- Patch 4/9 changed to use rwlocks for guarding DTL buffer usage across
debugfs and the new vcpudispatch_stats.
- Patch 6/9 has been updated to address breakage of the vphn selftest
under tools/testing/selftests/powerpc/vphn.
- Patch 7/9 has changes to accommodate use of rwlocks, as well as some
simplification for locking while enabling/disabling statistics.
Changes since v1:
- Changes have been done primarily to address a few build issues, by
moving changes out of mm/numa.c to other places.
- Patches 1-5,8-9 have been rebased with patches 4 and 5 being
interchanged, and patch 4 incorporating #ifdef CONFIG_PPC_SPLPAR.
- Patch 6 is new and moves vphn code under pseries.
- Patch 7 has changes to move most of the code from mm/numa.c into
platforms/pseries/lpar.c, along with guarding some of these under
CONFIG_PPC_SPLPAR.
Changes since RFC:
- Patches 1/8 to 5/8: no changes, except rebase to powerpc/merge
- Patch 6/8: The mutex guarding the vphn hcall has been dropped. It was
only meant to serialize hcalls issued when stats are initially
enabled. However, in reality, the various per-cpu workers will be
scheduled at slightly different times and chances of hcalls for
retrieving the same associativity information at the same time is very
less. Even in that case, there are no other side effects.
- Patch 6/8: The third column for vcpu dispatches on the same core, but
different thread has been dropped and merged with the second column.
- Patch 7/8: new patch to ensure we don't take too much time while
enabling/disabling statistics on large systems with heavy workload.
- Patch 8/8: new patch adding a document describing the fields in the
procfs file.
--
This series adds a new procfs file /proc/powerpc/vcpudispatch_stats for
providing statistics around how the LPAR processors are dispatched by
the POWER Hypervisor, in a shared LPAR environment. Patch 7/9 has more
details on how the statistics are gathered.
An example output:
$ sudo cat /proc/powerpc/vcpudispatch_stats
cpu0 6839 4126 2683 30 0 6821 18 0
cpu1 2515 1274 1229 12 0 2509 6 0
cpu2 2317 1198 1109 10 0 2312 5 0
cpu3 2259 1165 1088 6 0 2256 3 0
cpu4 2205 1143 1056 6 0 2202 3 0
cpu5 2165 1121 1038 6 0 2162 3 0
cpu6 2183 1127 1050 6 0 2180 3 0
cpu7 2193 1133 1052 8 0 2187 6 0
cpu8 2165 1115 1032 18 0 2156 9 0
cpu9 2301 1252 1033 16 0 2293 8 0
cpu10 2197 1138 1041 18 0 2187 10 0
cpu11 2273 1185 1062 26 0 2260 13 0
cpu12 2186 1125 1043 18 0 2177 9 0
cpu13 2161 1115 1030 16 0 2153 8 0
cpu14 2206 1153 1033 20 0 2196 10 0
cpu15 2163 1115 1032 16 0 2155 8 0
In the output above, for vcpu0, there have been 6839 dispatches since
statistics were enabled. 4126 of those dispatches were on the same
physical cpu as the last time. 2683 were on a different core, but within
the same chip, while 30 dispatches were on a different chip compared to
its last dispatch.
Also, out of the total of 6839 dispatches, we see that there have been
6821 dispatches on the vcpu's home node, while 18 dispatches were
outside its home node, on a neighbouring chip.
- Naveen
Naveen N. Rao (9):
powerpc/pseries: Use macros for referring to the DTL enable mask
powerpc/pseries: Do not save the previous DTL mask value
powerpc/pseries: Factor out DTL buffer allocation and registration
routines
powerpc/pseries: Introduce rwlock to gatekeep DTLB usage
powerpc/pseries: Generalize hcall_vphn()
powerpc/pseries: Move mm/book3s64/vphn.c under platforms/pseries/
powerpc/pseries: Provide vcpu dispatch statistics
powerpc/pseries: Protect against hogging the cpu while setting up the
stats
powerpc/pseries: Add documentation for vcpudispatch_stats
Documentation/powerpc/vcpudispatch_stats.txt | 68 ++
arch/powerpc/include/asm/lppaca.h | 40 ++
arch/powerpc/include/asm/topology.h | 6 +
arch/powerpc/mm/book3s64/Makefile | 1 -
arch/powerpc/mm/book3s64/vphn.h | 16 -
arch/powerpc/mm/numa.c | 35 +-
arch/powerpc/platforms/pseries/Makefile | 1 +
arch/powerpc/platforms/pseries/dtl.c | 23 +-
arch/powerpc/platforms/pseries/lpar.c | 602 +++++++++++++++++-
arch/powerpc/platforms/pseries/setup.c | 34 +-
.../{mm/book3s64 => platforms/pseries}/vphn.c | 20 +-
tools/testing/selftests/powerpc/vphn/Makefile | 2 +-
.../selftests/powerpc/vphn/asm/lppaca.h | 1 +
tools/testing/selftests/powerpc/vphn/vphn.c | 2 +-
tools/testing/selftests/powerpc/vphn/vphn.h | 1 -
15 files changed, 752 insertions(+), 100 deletions(-)
create mode 100644 Documentation/powerpc/vcpudispatch_stats.txt
delete mode 100644 arch/powerpc/mm/book3s64/vphn.h
rename arch/powerpc/{mm/book3s64 => platforms/pseries}/vphn.c (80%)
create mode 120000 tools/testing/selftests/powerpc/vphn/asm/lppaca.h
delete mode 120000 tools/testing/selftests/powerpc/vphn/vphn.h
--
2.22.0
^ permalink raw reply
* [PATCH v3 1/9] powerpc/pseries: Use macros for referring to the DTL enable mask
From: Naveen N. Rao @ 2019-07-03 17:03 UTC (permalink / raw)
To: Michael Ellerman
Cc: Nathan Lynch, Aneesh Kumar K.V, Mingming Cao, linuxppc-dev
In-Reply-To: <cover.1562171646.git.naveen.n.rao@linux.vnet.ibm.com>
Introduce macros to encode the DTL enable mask fields and use those
instead of hardcoding numbers.
Acked-by: Nathan Lynch <nathanl@linux.ibm.com>
Signed-off-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
---
arch/powerpc/include/asm/lppaca.h | 11 +++++++++++
arch/powerpc/platforms/pseries/dtl.c | 8 +-------
arch/powerpc/platforms/pseries/lpar.c | 2 +-
arch/powerpc/platforms/pseries/setup.c | 2 +-
4 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/arch/powerpc/include/asm/lppaca.h b/arch/powerpc/include/asm/lppaca.h
index 806494283e2a..9837bb2b3e69 100644
--- a/arch/powerpc/include/asm/lppaca.h
+++ b/arch/powerpc/include/asm/lppaca.h
@@ -141,6 +141,17 @@ struct dtl_entry {
#define DISPATCH_LOG_BYTES 4096 /* bytes per cpu */
#define N_DISPATCH_LOG (DISPATCH_LOG_BYTES / sizeof(struct dtl_entry))
+/*
+ * Dispatch trace log event enable mask:
+ * 0x1: voluntary virtual processor waits
+ * 0x2: time-slice preempts
+ * 0x4: virtual partition memory page faults
+ */
+#define DTL_LOG_CEDE 0x1
+#define DTL_LOG_PREEMPT 0x2
+#define DTL_LOG_FAULT 0x4
+#define DTL_LOG_ALL (DTL_LOG_CEDE | DTL_LOG_PREEMPT | DTL_LOG_FAULT)
+
extern struct kmem_cache *dtl_cache;
/*
diff --git a/arch/powerpc/platforms/pseries/dtl.c b/arch/powerpc/platforms/pseries/dtl.c
index ab5de985a787..337378f3d1fd 100644
--- a/arch/powerpc/platforms/pseries/dtl.c
+++ b/arch/powerpc/platforms/pseries/dtl.c
@@ -27,13 +27,7 @@ struct dtl {
};
static DEFINE_PER_CPU(struct dtl, cpu_dtl);
-/*
- * Dispatch trace log event mask:
- * 0x7: 0x1: voluntary virtual processor waits
- * 0x2: time-slice preempts
- * 0x4: virtual partition memory page faults
- */
-static u8 dtl_event_mask = 0x7;
+static u8 dtl_event_mask = DTL_LOG_ALL;
/*
diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c
index 73620dfb63a1..96c4677cf8ab 100644
--- a/arch/powerpc/platforms/pseries/lpar.c
+++ b/arch/powerpc/platforms/pseries/lpar.c
@@ -113,7 +113,7 @@ void vpa_init(int cpu)
pr_err("WARNING: DTL registration of cpu %d (hw %d) "
"failed with %ld\n", smp_processor_id(),
hwcpu, ret);
- lppaca_of(cpu).dtl_enable_mask = 2;
+ lppaca_of(cpu).dtl_enable_mask = DTL_LOG_PREEMPT;
}
}
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index 8fa012a65a71..a643e45d0544 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -312,7 +312,7 @@ static int alloc_dispatch_logs(void)
pr_err("WARNING: DTL registration of cpu %d (hw %d) failed "
"with %d\n", smp_processor_id(),
hard_smp_processor_id(), ret);
- get_paca()->lppaca_ptr->dtl_enable_mask = 2;
+ get_paca()->lppaca_ptr->dtl_enable_mask = DTL_LOG_PREEMPT;
return 0;
}
--
2.22.0
^ permalink raw reply related
* [PATCH v3 2/9] powerpc/pseries: Do not save the previous DTL mask value
From: Naveen N. Rao @ 2019-07-03 17:03 UTC (permalink / raw)
To: Michael Ellerman
Cc: Nathan Lynch, Aneesh Kumar K.V, Mingming Cao, linuxppc-dev
In-Reply-To: <cover.1562171646.git.naveen.n.rao@linux.vnet.ibm.com>
When CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is enabled, we always initialize
DTL enable mask to DTL_LOG_PREEMPT (0x2). There are no other places
where the mask is changed. As such, when reading the DTL log buffer
through debugfs, there is no need to save and restore the previous mask
value.
We don't need to save and restore the earlier mask value if
CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not enabled. So, remove the field
from the structure as well.
Acked-by: Nathan Lynch <nathanl@linux.ibm.com>
Signed-off-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
---
arch/powerpc/platforms/pseries/dtl.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/arch/powerpc/platforms/pseries/dtl.c b/arch/powerpc/platforms/pseries/dtl.c
index 337378f3d1fd..a88176afba32 100644
--- a/arch/powerpc/platforms/pseries/dtl.c
+++ b/arch/powerpc/platforms/pseries/dtl.c
@@ -42,7 +42,6 @@ struct dtl_ring {
struct dtl_entry *write_ptr;
struct dtl_entry *buf;
struct dtl_entry *buf_end;
- u8 saved_dtl_mask;
};
static DEFINE_PER_CPU(struct dtl_ring, dtl_rings);
@@ -92,7 +91,6 @@ static int dtl_start(struct dtl *dtl)
dtlr->write_ptr = dtl->buf;
/* enable event logging */
- dtlr->saved_dtl_mask = lppaca_of(dtl->cpu).dtl_enable_mask;
lppaca_of(dtl->cpu).dtl_enable_mask |= dtl_event_mask;
dtl_consumer = consume_dtle;
@@ -110,7 +108,7 @@ static void dtl_stop(struct dtl *dtl)
dtlr->buf = NULL;
/* restore dtl_enable_mask */
- lppaca_of(dtl->cpu).dtl_enable_mask = dtlr->saved_dtl_mask;
+ lppaca_of(dtl->cpu).dtl_enable_mask = DTL_LOG_PREEMPT;
if (atomic_dec_and_test(&dtl_count))
dtl_consumer = NULL;
--
2.22.0
^ permalink raw reply related
* [PATCH v3 3/9] powerpc/pseries: Factor out DTL buffer allocation and registration routines
From: Naveen N. Rao @ 2019-07-03 17:03 UTC (permalink / raw)
To: Michael Ellerman
Cc: Nathan Lynch, Aneesh Kumar K.V, Mingming Cao, linuxppc-dev
In-Reply-To: <cover.1562171646.git.naveen.n.rao@linux.vnet.ibm.com>
Introduce new helpers for DTL buffer allocation and registration and
have the existing code use those.
Signed-off-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
---
arch/powerpc/include/asm/lppaca.h | 3 ++
arch/powerpc/platforms/pseries/lpar.c | 66 +++++++++++++++++++-------
arch/powerpc/platforms/pseries/setup.c | 34 +------------
3 files changed, 53 insertions(+), 50 deletions(-)
diff --git a/arch/powerpc/include/asm/lppaca.h b/arch/powerpc/include/asm/lppaca.h
index 9837bb2b3e69..060697768287 100644
--- a/arch/powerpc/include/asm/lppaca.h
+++ b/arch/powerpc/include/asm/lppaca.h
@@ -162,6 +162,9 @@ extern struct kmem_cache *dtl_cache;
*/
extern void (*dtl_consumer)(struct dtl_entry *entry, u64 index);
+extern void register_dtl_buffer(int cpu);
+extern void alloc_dtl_buffers(void);
+
#endif /* CONFIG_PPC_BOOK3S */
#endif /* __KERNEL__ */
#endif /* _ASM_POWERPC_LPPACA_H */
diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c
index 96c4677cf8ab..8c5377fe9985 100644
--- a/arch/powerpc/platforms/pseries/lpar.c
+++ b/arch/powerpc/platforms/pseries/lpar.c
@@ -52,13 +52,58 @@ EXPORT_SYMBOL(plpar_hcall);
EXPORT_SYMBOL(plpar_hcall9);
EXPORT_SYMBOL(plpar_hcall_norets);
+void alloc_dtl_buffers(void)
+{
+ int cpu;
+ struct paca_struct *pp;
+ struct dtl_entry *dtl;
+
+ for_each_possible_cpu(cpu) {
+ pp = paca_ptrs[cpu];
+ dtl = kmem_cache_alloc(dtl_cache, GFP_KERNEL);
+ if (!dtl) {
+ pr_warn("Failed to allocate dispatch trace log for cpu %d\n",
+ cpu);
+ pr_warn("Stolen time statistics will be unreliable\n");
+ break;
+ }
+
+ pp->dtl_ridx = 0;
+ pp->dispatch_log = dtl;
+ pp->dispatch_log_end = dtl + N_DISPATCH_LOG;
+ pp->dtl_curr = dtl;
+ }
+}
+
+void register_dtl_buffer(int cpu)
+{
+ long ret;
+ struct paca_struct *pp;
+ struct dtl_entry *dtl;
+ int hwcpu = get_hard_smp_processor_id(cpu);
+
+ pp = paca_ptrs[cpu];
+ dtl = pp->dispatch_log;
+ if (dtl) {
+ pp->dtl_ridx = 0;
+ pp->dtl_curr = dtl;
+ lppaca_of(cpu).dtl_idx = 0;
+
+ /* hypervisor reads buffer length from this field */
+ dtl->enqueue_to_dispatch_time = cpu_to_be32(DISPATCH_LOG_BYTES);
+ ret = register_dtl(hwcpu, __pa(dtl));
+ if (ret)
+ pr_err("WARNING: DTL registration of cpu %d (hw %d) "
+ "failed with %ld\n", cpu, hwcpu, ret);
+ lppaca_of(cpu).dtl_enable_mask = DTL_LOG_PREEMPT;
+ }
+}
+
void vpa_init(int cpu)
{
int hwcpu = get_hard_smp_processor_id(cpu);
unsigned long addr;
long ret;
- struct paca_struct *pp;
- struct dtl_entry *dtl;
/*
* The spec says it "may be problematic" if CPU x registers the VPA of
@@ -99,22 +144,7 @@ void vpa_init(int cpu)
/*
* Register dispatch trace log, if one has been allocated.
*/
- pp = paca_ptrs[cpu];
- dtl = pp->dispatch_log;
- if (dtl) {
- pp->dtl_ridx = 0;
- pp->dtl_curr = dtl;
- lppaca_of(cpu).dtl_idx = 0;
-
- /* hypervisor reads buffer length from this field */
- dtl->enqueue_to_dispatch_time = cpu_to_be32(DISPATCH_LOG_BYTES);
- ret = register_dtl(hwcpu, __pa(dtl));
- if (ret)
- pr_err("WARNING: DTL registration of cpu %d (hw %d) "
- "failed with %ld\n", smp_processor_id(),
- hwcpu, ret);
- lppaca_of(cpu).dtl_enable_mask = DTL_LOG_PREEMPT;
- }
+ register_dtl_buffer(cpu);
}
#ifdef CONFIG_PPC_BOOK3S_64
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index a643e45d0544..e4d75b958593 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -273,46 +273,16 @@ struct kmem_cache *dtl_cache;
*/
static int alloc_dispatch_logs(void)
{
- int cpu, ret;
- struct paca_struct *pp;
- struct dtl_entry *dtl;
-
if (!firmware_has_feature(FW_FEATURE_SPLPAR))
return 0;
if (!dtl_cache)
return 0;
- for_each_possible_cpu(cpu) {
- pp = paca_ptrs[cpu];
- dtl = kmem_cache_alloc(dtl_cache, GFP_KERNEL);
- if (!dtl) {
- pr_warn("Failed to allocate dispatch trace log for cpu %d\n",
- cpu);
- pr_warn("Stolen time statistics will be unreliable\n");
- break;
- }
-
- pp->dtl_ridx = 0;
- pp->dispatch_log = dtl;
- pp->dispatch_log_end = dtl + N_DISPATCH_LOG;
- pp->dtl_curr = dtl;
- }
+ alloc_dtl_buffers();
/* Register the DTL for the current (boot) cpu */
- dtl = get_paca()->dispatch_log;
- get_paca()->dtl_ridx = 0;
- get_paca()->dtl_curr = dtl;
- get_paca()->lppaca_ptr->dtl_idx = 0;
-
- /* hypervisor reads buffer length from this field */
- dtl->enqueue_to_dispatch_time = cpu_to_be32(DISPATCH_LOG_BYTES);
- ret = register_dtl(hard_smp_processor_id(), __pa(dtl));
- if (ret)
- pr_err("WARNING: DTL registration of cpu %d (hw %d) failed "
- "with %d\n", smp_processor_id(),
- hard_smp_processor_id(), ret);
- get_paca()->lppaca_ptr->dtl_enable_mask = DTL_LOG_PREEMPT;
+ register_dtl_buffer(smp_processor_id());
return 0;
}
--
2.22.0
^ permalink raw reply related
* [PATCH v3 4/9] powerpc/pseries: Introduce rwlock to gatekeep DTLB usage
From: Naveen N. Rao @ 2019-07-03 17:03 UTC (permalink / raw)
To: Michael Ellerman
Cc: Nathan Lynch, Aneesh Kumar K.V, Mingming Cao, linuxppc-dev
In-Reply-To: <cover.1562171646.git.naveen.n.rao@linux.vnet.ibm.com>
Since we would be introducing a new user of the DTL buffer in a
subsequent patch, we need a way to gatekeep use of the DTL buffer.
The current debugfs interface for DTL allows registering and opening
cpu-specific DTL buffers. Cpu specific files are exposed under
debugfs 'powerpc/dtl/' node, and changing 'dtl_event_mask' in the same
directory enables controlling the event mask used when registering DTL
buffer for a particular cpu.
Subsequently, we will be introducing a user of the DTL buffers that
registers access to the DTL buffers across all cpus with the same event
mask. To ensure these two users do not step on each other, we introduce
a rwlock to gatekeep DTL buffer access. This fits the requirement of the
current debugfs interface wanting to allow multiple independent
cpu-specific users (read lock), and the subsequent user wanting
exclusive access (write lock).
Suggested-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
---
arch/powerpc/include/asm/lppaca.h | 2 ++
arch/powerpc/platforms/pseries/dtl.c | 11 ++++++++++-
arch/powerpc/platforms/pseries/lpar.c | 4 ++++
3 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/arch/powerpc/include/asm/lppaca.h b/arch/powerpc/include/asm/lppaca.h
index 060697768287..837a43a1b578 100644
--- a/arch/powerpc/include/asm/lppaca.h
+++ b/arch/powerpc/include/asm/lppaca.h
@@ -19,6 +19,7 @@
*/
#include <linux/cache.h>
#include <linux/threads.h>
+#include <linux/spinlock_types.h>
#include <asm/types.h>
#include <asm/mmu.h>
#include <asm/firmware.h>
@@ -153,6 +154,7 @@ struct dtl_entry {
#define DTL_LOG_ALL (DTL_LOG_CEDE | DTL_LOG_PREEMPT | DTL_LOG_FAULT)
extern struct kmem_cache *dtl_cache;
+extern rwlock_t dtl_access_lock;
/*
* When CONFIG_VIRT_CPU_ACCOUNTING_NATIVE = y, the cpu accounting code controls
diff --git a/arch/powerpc/platforms/pseries/dtl.c b/arch/powerpc/platforms/pseries/dtl.c
index a88176afba32..2b87480f2837 100644
--- a/arch/powerpc/platforms/pseries/dtl.c
+++ b/arch/powerpc/platforms/pseries/dtl.c
@@ -180,11 +180,16 @@ static int dtl_enable(struct dtl *dtl)
if (dtl->buf)
return -EBUSY;
+ /* ensure there are no other conflicting dtl users */
+ if (!read_trylock(&dtl_access_lock))
+ return -EBUSY;
+
n_entries = dtl_buf_entries;
buf = kmem_cache_alloc_node(dtl_cache, GFP_KERNEL, cpu_to_node(dtl->cpu));
if (!buf) {
printk(KERN_WARNING "%s: buffer alloc failed for cpu %d\n",
__func__, dtl->cpu);
+ read_unlock(&dtl_access_lock);
return -ENOMEM;
}
@@ -201,8 +206,11 @@ static int dtl_enable(struct dtl *dtl)
}
spin_unlock(&dtl->lock);
- if (rc)
+ if (rc) {
+ read_unlock(&dtl_access_lock);
kmem_cache_free(dtl_cache, buf);
+ }
+
return rc;
}
@@ -214,6 +222,7 @@ static void dtl_disable(struct dtl *dtl)
dtl->buf = NULL;
dtl->buf_entries = 0;
spin_unlock(&dtl->lock);
+ read_unlock(&dtl_access_lock);
}
/* file interface */
diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c
index 8c5377fe9985..1e105a3a9f83 100644
--- a/arch/powerpc/platforms/pseries/lpar.c
+++ b/arch/powerpc/platforms/pseries/lpar.c
@@ -99,6 +99,10 @@ void register_dtl_buffer(int cpu)
}
}
+#ifdef CONFIG_PPC_SPLPAR
+DEFINE_RWLOCK(dtl_access_lock);
+#endif /* CONFIG_PPC_SPLPAR */
+
void vpa_init(int cpu)
{
int hwcpu = get_hard_smp_processor_id(cpu);
--
2.22.0
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox