* [PATCH 2/3] iommu/fsl: Fix the device domain attach condition.
From: Varun Sethi @ 2014-06-24 13:57 UTC (permalink / raw)
To: iommu, joro, linux-kernel, linuxppc-dev, alex.williamson; +Cc: Varun Sethi
In-Reply-To: <1403618237-26248-1-git-send-email-Varun.Sethi@freescale.com>
^ permalink raw reply
* Re: [PATCH] vfio: Fix endianness handling for emulated BARs
From: Benjamin Herrenschmidt @ 2014-06-24 21:46 UTC (permalink / raw)
To: Alexander Graf
Cc: kvm, Nikunj A Dadhania, Alexey Kardashevskiy, linux-kernel,
Alex Williamson, linuxppc-dev
In-Reply-To: <53A955F5.6050801@suse.de>
On Tue, 2014-06-24 at 12:41 +0200, Alexander Graf wrote:
> Is there actually any difference in generated code with this patch
> applied and without? I would hope that iowrite..() is inlined and
> cancels out the cpu_to_le..() calls that are also inlined?
No, the former uses byteswapping asm, the compiler can't "cancel" it
out, but the overhead of the additional byteswap might not be
measurable.
Cheers,
Ben.
^ permalink raw reply
* Re: [PATCH] vfio: Fix endianness handling for emulated BARs
From: Benjamin Herrenschmidt @ 2014-06-24 21:54 UTC (permalink / raw)
To: Alexey Kardashevskiy
Cc: kvm, Nikunj A Dadhania, Alexander Graf, linux-kernel,
Alex Williamson, linuxppc-dev
In-Reply-To: <53A98C38.8020205@ozlabs.ru>
On Wed, 2014-06-25 at 00:33 +1000, Alexey Kardashevskiy wrote:
>
> I do not understand why @val is considered LE here and need to be
> converted
> to CPU. Really. I truly believe it should be cpu_to_le32().
No. Both are slightly wrong semantically but le32_to_cpu() is less
wrong :-)
iowrite32 supposedly takes a "cpu" value as argument and writes an "le"
value. So if anything, you need something that converts to a "cpu" value
before you call iowrite32.
Now it's still slightly wrong because the "input" to le32_to_cpu() is
supposed to be an "LE" value but of course here it's not, it's a "cpu"
value too :-)
But yes, I agree with aw here, either do nothing or stick a set of
iowriteXX_native or something equivalent in the generic iomap header,
define them in term of iowrite32be/iowrite32 based on the compile time
endian of the arch.
Hitting asm-generic/iomap.h I think will cover all archs except ARM.
For ARM, just hack arch/arm/asm/io.h
Cheers,
Ben.
^ permalink raw reply
* [PATCH v5 1/1] powerpc/perf: Adjust callchain based on DWARF debug info
From: Sukadev Bhattiprolu @ 2014-06-25 0:00 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo, Jiri Olsa
Cc: Michael Ellerman, linuxppc-dev, Anton Blanchard, linux-kernel,
ulrich.weigand, Maynard Johnson
[PATCH v5 1/1] powerpc/perf: Adjust callchain based on DWARF debug info
When saving the callchain on Power, the kernel conservatively saves excess
entries in the callchain. A few of these entries are needed in some cases
but not others. We should use the DWARF debug information to determine
when the entries are needed.
Eg: the value in the link register (LR) is needed only when it holds the
return address of a function. At other times it must be ignored.
If the unnecessary entries are not ignored, we end up with duplicate arcs
in the call-graphs.
Use the DWARF debug information to determine if any callchain entries
should be ignored when building call-graphs.
Callgraph before the patch:
14.67% 2234 sprintft libc-2.18.so [.] __random
|
--- __random
|
|--61.12%-- __random
| |
| |--97.15%-- rand
| | do_my_sprintf
| | main
| | generic_start_main.isra.0
| | __libc_start_main
| | 0x0
| |
| --2.85%-- do_my_sprintf
| main
| generic_start_main.isra.0
| __libc_start_main
| 0x0
|
--38.88%-- rand
|
|--94.01%-- rand
| do_my_sprintf
| main
| generic_start_main.isra.0
| __libc_start_main
| 0x0
|
--5.99%-- do_my_sprintf
main
generic_start_main.isra.0
__libc_start_main
0x0
Callgraph after the patch:
14.67% 2234 sprintft libc-2.18.so [.] __random
|
--- __random
|
|--95.93%-- rand
| do_my_sprintf
| main
| generic_start_main.isra.0
| __libc_start_main
| 0x0
|
--4.07%-- do_my_sprintf
main
generic_start_main.isra.0
__libc_start_main
0x0
TODO: For split-debug info objects like glibc, we can only determine
the call-frame-address only when both .eh_frame and .debug_info
sections are available. We should be able to determin the CFA
even without the .eh_frame section.
Fix suggested by Anton Blanchard.
Thanks to valuable input on DWARF debug information from Ulrich Weigand.
Reported-by: Maynard Johnson <maynard@us.ibm.com>
Tested-by: Maynard Johnson <maynard@us.ibm.com>
Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
---
Changelog[v5]
[Jiri Olsa] Avoid the new external symbol PERF_CONTEXT_IGNORE;
Revert back to previous version and use #ifdef directly in
machine__resolve_callchain_sample() to avoid performance impact
on other architectures.
Changelog[v4]
Move Powerpc-specific code into a separate patch
Changelog[v3]
[Jiri Olsa] Rename function to arch_skip_callchain_idx() to be
consistent with behavior.
[Jiri Olsa] Add '__maybe_unused' tags for unused parameters.
Changelog[v2]:
Add missing dwfl_end()
Fix merge conflicts due to some unwind code
tools/perf/arch/powerpc/Makefile | 1 +
tools/perf/arch/powerpc/util/skip-callchain-idx.c | 266 +++++++++++++++++++++
tools/perf/config/Makefile | 4 +
tools/perf/util/callchain.h | 13 +
tools/perf/util/machine.c | 18 +-
5 files changed, 300 insertions(+), 2 deletions(-)
create mode 100644 tools/perf/arch/powerpc/util/skip-callchain-idx.c
diff --git a/tools/perf/arch/powerpc/Makefile b/tools/perf/arch/powerpc/Makefile
index 744e629..b92219b 100644
--- a/tools/perf/arch/powerpc/Makefile
+++ b/tools/perf/arch/powerpc/Makefile
@@ -3,3 +3,4 @@ PERF_HAVE_DWARF_REGS := 1
LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/dwarf-regs.o
endif
LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/header.o
+LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/skip-callchain-idx.o
diff --git a/tools/perf/arch/powerpc/util/skip-callchain-idx.c b/tools/perf/arch/powerpc/util/skip-callchain-idx.c
new file mode 100644
index 0000000..a7c23a4
--- /dev/null
+++ b/tools/perf/arch/powerpc/util/skip-callchain-idx.c
@@ -0,0 +1,266 @@
+/*
+ * Use DWARF Debug information to skip unnecessary callchain entries.
+ *
+ * Copyright (C) 2014 Sukadev Bhattiprolu, IBM Corporation.
+ * Copyright (C) 2014 Ulrich Weigand, IBM Corporation.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+#include <inttypes.h>
+#include <dwarf.h>
+#include <elfutils/libdwfl.h>
+
+#include "util/thread.h"
+#include "util/callchain.h"
+
+/*
+ * When saving the callchain on Power, the kernel conservatively saves
+ * excess entries in the callchain. A few of these entries are needed
+ * in some cases but not others. If the unnecessary entries are not
+ * ignored, we end up with duplicate arcs in the call-graphs. Use
+ * DWARF debug information to skip over any unnecessary callchain
+ * entries.
+ *
+ * See function header for arch_adjust_callchain() below for more details.
+ *
+ * The libdwfl code in this file is based on code from elfutils
+ * (libdwfl/argp-std.c, libdwfl/tests/addrcfi.c, etc).
+ */
+static char *debuginfo_path;
+
+static const Dwfl_Callbacks offline_callbacks = {
+ .debuginfo_path = &debuginfo_path,
+ .find_debuginfo = dwfl_standard_find_debuginfo,
+ .section_address = dwfl_offline_section_address,
+};
+
+
+/*
+ * Use the DWARF expression for the Call-frame-address and determine
+ * if return address is in LR and if a new frame was allocated.
+ */
+static int check_return_reg(int ra_regno, Dwarf_Frame *frame)
+{
+ Dwarf_Op ops_mem[2];
+ Dwarf_Op dummy;
+ Dwarf_Op *ops = &dummy;
+ size_t nops;
+ int result;
+
+ result = dwarf_frame_register(frame, ra_regno, ops_mem, &ops, &nops);
+ if (result < 0) {
+ pr_debug("dwarf_frame_register() %s\n", dwarf_errmsg(-1));
+ return -1;
+ }
+
+ /*
+ * Check if return address is on the stack.
+ */
+ if (nops != 0 || ops != NULL)
+ return 0;
+
+ /*
+ * Return address is in LR. Check if a frame was allocated
+ * but not-yet used.
+ */
+ result = dwarf_frame_cfa(frame, &ops, &nops);
+ if (result < 0) {
+ pr_debug("dwarf_frame_cfa() returns %d, %s\n", result,
+ dwarf_errmsg(-1));
+ return -1;
+ }
+
+ /*
+ * If call frame address is in r1, no new frame was allocated.
+ */
+ if (nops == 1 && ops[0].atom == DW_OP_bregx && ops[0].number == 1 &&
+ ops[0].number2 == 0)
+ return 1;
+
+ /*
+ * A new frame was allocated but has not yet been used.
+ */
+ return 2;
+}
+
+/*
+ * Get the DWARF frame from the .eh_frame section.
+ */
+static Dwarf_Frame *get_eh_frame(Dwfl_Module *mod, Dwarf_Addr pc)
+{
+ int result;
+ Dwarf_Addr bias;
+ Dwarf_CFI *cfi;
+ Dwarf_Frame *frame;
+
+ cfi = dwfl_module_eh_cfi(mod, &bias);
+ if (!cfi) {
+ pr_debug("%s(): no CFI - %s\n", __func__, dwfl_errmsg(-1));
+ return NULL;
+ }
+
+ result = dwarf_cfi_addrframe(cfi, pc, &frame);
+ if (result) {
+ pr_debug("%s(): %s\n", __func__, dwfl_errmsg(-1));
+ return NULL;
+ }
+
+ return frame;
+}
+
+/*
+ * Get the DWARF frame from the .debug_frame section.
+ */
+static Dwarf_Frame *get_dwarf_frame(Dwfl_Module *mod, Dwarf_Addr pc)
+{
+ Dwarf_CFI *cfi;
+ Dwarf_Addr bias;
+ Dwarf_Frame *frame;
+ int result;
+
+ cfi = dwfl_module_dwarf_cfi(mod, &bias);
+ if (!cfi) {
+ pr_debug("%s(): no CFI - %s\n", __func__, dwfl_errmsg(-1));
+ return NULL;
+ }
+
+ result = dwarf_cfi_addrframe(cfi, pc, &frame);
+ if (result) {
+ pr_debug("%s(): %s\n", __func__, dwfl_errmsg(-1));
+ return NULL;
+ }
+
+ return frame;
+}
+
+/*
+ * Return:
+ * 0 if return address for the program counter @pc is on stack
+ * 1 if return address is in LR and no new stack frame was allocated
+ * 2 if return address is in LR and a new frame was allocated (but not
+ * yet used)
+ * -1 in case of errors
+ */
+static int check_return_addr(const char *exec_file, Dwarf_Addr pc)
+{
+ int rc = -1;
+ Dwfl *dwfl;
+ Dwfl_Module *mod;
+ Dwarf_Frame *frame;
+ int ra_regno;
+ Dwarf_Addr start = pc;
+ Dwarf_Addr end = pc;
+ bool signalp;
+
+ dwfl = dwfl_begin(&offline_callbacks);
+ if (!dwfl) {
+ pr_debug("dwfl_begin() failed: %s\n", dwarf_errmsg(-1));
+ return -1;
+ }
+
+ if (dwfl_report_offline(dwfl, "", exec_file, -1) == NULL) {
+ pr_debug("dwfl_report_offline() failed %s\n", dwarf_errmsg(-1));
+ goto out;
+ }
+
+ mod = dwfl_addrmodule(dwfl, pc);
+ if (!mod) {
+ pr_debug("dwfl_addrmodule() failed, %s\n", dwarf_errmsg(-1));
+ goto out;
+ }
+
+ /*
+ * To work with split debug info files (eg: glibc), check both
+ * .eh_frame and .debug_frame sections of the ELF header.
+ */
+ frame = get_eh_frame(mod, pc);
+ if (!frame) {
+ frame = get_dwarf_frame(mod, pc);
+ if (!frame)
+ goto out;
+ }
+
+ ra_regno = dwarf_frame_info(frame, &start, &end, &signalp);
+ if (ra_regno < 0) {
+ pr_debug("Return address register unavailable: %s\n",
+ dwarf_errmsg(-1));
+ goto out;
+ }
+
+ rc = check_return_reg(ra_regno, frame);
+
+out:
+ dwfl_end(dwfl);
+ return rc;
+}
+
+/*
+ * The callchain saved by the kernel always includes the link register (LR).
+ *
+ * 0: PERF_CONTEXT_USER
+ * 1: Program counter (Next instruction pointer)
+ * 2: LR value
+ * 3: Caller's caller
+ * 4: ...
+ *
+ * The value in LR is only needed when it holds a return address. If the
+ * return address is on the stack, we should ignore the LR value.
+ *
+ * Further, when the return address is in the LR, if a new frame was just
+ * allocated but the LR was not saved into it, then the LR contains the
+ * caller, slot 4: contains the caller's caller and the contents of slot 3:
+ * (chain->ips[3]) is undefined and must be ignored.
+ *
+ * Use DWARF debug information to determine if any entries need to be skipped.
+ *
+ * Return:
+ * index: of callchain entry that needs to be ignored (if any)
+ * -1 if no entry needs to be ignored or in case of errors
+ */
+int arch_skip_callchain_idx(struct machine *machine, struct thread *thread,
+ struct ip_callchain *chain)
+{
+ struct addr_location al;
+ struct dso *dso = NULL;
+ int rc;
+ u64 ip;
+ u64 skip_slot = -1;
+
+ if (chain->nr < 3)
+ return skip_slot;
+
+ ip = chain->ips[2];
+
+ thread__find_addr_location(thread, machine, PERF_RECORD_MISC_USER,
+ MAP__FUNCTION, ip, &al);
+
+ if (al.map)
+ dso = al.map->dso;
+
+ if (!dso) {
+ pr_debug("%" PRIx64 " dso is NULL\n", ip);
+ return skip_slot;
+ }
+
+ rc = check_return_addr(dso->long_name, ip);
+
+ pr_debug("DSO %s, nr %" PRIx64 ", ip 0x%" PRIx64 "rc %d\n",
+ dso->long_name, chain->nr, ip, rc);
+
+ if (rc == 0) {
+ /*
+ * Return address on stack. Ignore LR value in callchain
+ */
+ skip_slot = 2;
+ } else if (rc == 2) {
+ /*
+ * New frame allocated but return address still in LR.
+ * Ignore the caller's caller entry in callchain.
+ */
+ skip_slot = 3;
+ }
+ return skip_slot;
+}
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
index f30ac5e..346bdb6 100644
--- a/tools/perf/config/Makefile
+++ b/tools/perf/config/Makefile
@@ -48,6 +48,10 @@ ifneq ($(ARCH),$(filter $(ARCH),x86 arm))
NO_LIBDW_DWARF_UNWIND := 1
endif
+ifeq ($(ARCH),powerpc)
+ CFLAGS += -DHAVE_SKIP_CALLCHAIN_IDX
+endif
+
ifeq ($(LIBUNWIND_LIBS),)
NO_LIBUNWIND := 1
else
diff --git a/tools/perf/util/callchain.h b/tools/perf/util/callchain.h
index 8f84423..da43619 100644
--- a/tools/perf/util/callchain.h
+++ b/tools/perf/util/callchain.h
@@ -176,4 +176,17 @@ static inline void callchain_cursor_snapshot(struct callchain_cursor *dest,
dest->first = src->curr;
dest->nr -= src->pos;
}
+
+#ifdef HAVE_SKIP_CALLCHAIN_IDX
+extern int arch_skip_callchain_idx(struct machine *machine,
+ struct thread *thread, struct ip_callchain *chain);
+#else
+static inline int arch_skip_callchain_idx(struct machine *machine __maybe_unused,
+ struct thread *thread __maybe_unused,
+ struct ip_callchain *chain __maybe_unused)
+{
+ return -1;
+}
+#endif
+
#endif /* __PERF_CALLCHAIN_H */
diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index 0e5fea9..6221d01 100644
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -1291,7 +1291,9 @@ static int machine__resolve_callchain_sample(struct machine *machine,
u8 cpumode = PERF_RECORD_MISC_USER;
int chain_nr = min(max_stack, (int)chain->nr);
int i;
+ int j;
int err;
+ int skip_idx;
callchain_cursor_reset(&callchain_cursor);
@@ -1300,14 +1302,26 @@ static int machine__resolve_callchain_sample(struct machine *machine,
return 0;
}
+ /*
+ * Based on DWARF debug information, some architectures skip
+ * a callchain entry saved by the kernel.
+ */
+ skip_idx = arch_skip_callchain_idx(machine, thread, chain);
+
for (i = 0; i < chain_nr; i++) {
u64 ip;
struct addr_location al;
if (callchain_param.order == ORDER_CALLEE)
- ip = chain->ips[i];
+ j = i;
else
- ip = chain->ips[chain->nr - i - 1];
+ j = chain->nr - i - 1;
+
+#ifdef HAVE_SKIP_CALLCHAIN_IDX
+ if (j == skip_idx)
+ continue;
+#endif
+ ip = chain->ips[j];
if (ip >= PERF_CONTEXT_MAX) {
switch (ip) {
--
1.7.9.5
^ permalink raw reply related
* Re: [PATCH v1 2/3] powerpc/powernv: Support PCI error injection
From: Gavin Shan @ 2014-06-25 0:03 UTC (permalink / raw)
To: Benjamin Herrenschmidt
Cc: aik, Gavin Shan, kvm-ppc, agraf, Mike Qiu, linuxppc-dev
In-Reply-To: <1403593252.4587.163.camel@pasglop>
On Tue, Jun 24, 2014 at 05:00:52PM +1000, Benjamin Herrenschmidt wrote:
>On Tue, 2014-06-24 at 14:57 +0800, Mike Qiu wrote:
>> Is that mean *host* side error injection should base on
>> "CONFIG_IOMMU_API" ? If it is just host side(no guest, no pass through),
>> can't we do error inject?
>>
>> Maybe I misunderstand :)
>
>Ah no, make different patches, we don't want to use IOMMU group ID, just
>PE numbers. Maybe we should expose in sysfs the PEs from the platform
>code with the error injection files underneath ...
>
Yeah, "errinjct" needs grab PCI_domain_nr+PE number from sysfs. We
already had PE number sysfs file:
[root@ltcfbl8eb 0000:01:00.1]# pwd
/sys/bus/pci/devices/0000:01:00.1
[root@ltcfbl8eb 0000:01:00.1]# cat eeh_pe_config_addr
0x1
For guest support, we will rely on VFIO group ioctl command, which
naturally depends on pass-through.
---
We probably implement it like this. If there're anything wrong, please
correct me:
- Introduce EEH callback struct eeh_ops::err_inject(), which will be
implemented for PowerNV (NULL for pSeries) by calling the PCI error
injection dedicated OPAL API (opal_pci_err_inject()).
- Introduce global function eeh.c::eeh_err_inject(), which calls to
eeh_ops::err_inject() and newly introduced VFIO EEH operation
will be implemented based on this function.
- Introduce debugfs /sys/kernel/debug/powerpc/PCIxxxx/errinjct, which
receives PCI error injection parameters from "errinjct". It could
have format: "ei_token:addr:mask:PCI_domain_nr:PE_num:function".
Eventually, eeh_err_inject() is invoked to call the corresponding
OPAL API.
Thanks,
Gavin
^ permalink raw reply
* Re: [PATCH v1 2/3] powerpc/powernv: Support PCI error injection
From: Gavin Shan @ 2014-06-25 0:05 UTC (permalink / raw)
To: Michael Neuling; +Cc: aik, Gavin Shan, kvm-ppc, agraf, qiudayu, linuxppc-dev
In-Reply-To: <1403505404.28453.7.camel@ale.ozlabs.ibm.com>
On Mon, Jun 23, 2014 at 04:36:44PM +1000, Michael Neuling wrote:
>On Mon, 2014-06-23 at 12:14 +1000, Gavin Shan wrote:
>> The patch implements one OPAL firmware sysfs file to support PCI error
>> injection: "/sys/firmware/opal/errinjct", which will be used like the
>> way described as follows.
>>
>> According to PAPR spec, there are 3 RTAS calls related to error injection:
>> "ibm,open-errinjct": allocate token prior to doing error injection.
>> "ibm,close-errinjct": release the token allocated from "ibm,open-errinjct".
>> "ibm,errinjct": do error injection.
>>
>> Sysfs file /sys/firmware/opal/errinjct accepts strings that have fixed
>> format "ei_token ...". For now, we only support 32-bits and 64-bits
>> PCI error injection and they should have following strings written to
>> /sys/firmware/opal/errinjct as follows. We don't have corresponding
>> sysfs files for "ibm,open-errinjct" and "ibm,close-errinjct", which
>> means that we rely on userland to maintain the token by itself.
>
>This sounds cool.
>
>Can you document the sysfs interface in Documentation/powerpc?
>
Yeah, Documentation/powerpc/eeh-pci-error-recovery.txt needs update
as Ben suggested. It's something in my list :-)
Thanks,
Gavin
>>
>> 32-bits PCI error: "7:addr:mask:iommu_group_id:function".
>> 64-bits PCI error: "8:addr:mask:iommu_group_id:function".
>>
>> The above "7" and "8" represent 32-bits and 64-bits PCI error seperately
>> and "function" is one of the specific PCI errors (e.g. MMIO access address
>> parity error), which are defined by PAPR spec.
>>
>> Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
>> ---
>> arch/powerpc/include/asm/opal.h | 1 +
>> arch/powerpc/platforms/powernv/Makefile | 2 +-
>> arch/powerpc/platforms/powernv/opal-errinjct.c | 184 +++++++++++++++++++++++++
>> arch/powerpc/platforms/powernv/opal.c | 2 +
>> 4 files changed, 188 insertions(+), 1 deletion(-)
>> create mode 100644 arch/powerpc/platforms/powernv/opal-errinjct.c
>>
>> diff --git a/arch/powerpc/include/asm/opal.h b/arch/powerpc/include/asm/opal.h
>> index d982bb8..bf280d9 100644
>> --- a/arch/powerpc/include/asm/opal.h
>> +++ b/arch/powerpc/include/asm/opal.h
>> @@ -985,6 +985,7 @@ extern int opal_elog_init(void);
>> extern void opal_platform_dump_init(void);
>> extern void opal_sys_param_init(void);
>> extern void opal_msglog_init(void);
>> +extern void opal_errinjct_init(void);
>>
>> extern int opal_machine_check(struct pt_regs *regs);
>> extern bool opal_mce_check_early_recovery(struct pt_regs *regs);
>> diff --git a/arch/powerpc/platforms/powernv/Makefile b/arch/powerpc/platforms/powernv/Makefile
>> index 63cebb9..4711de8 100644
>> --- a/arch/powerpc/platforms/powernv/Makefile
>> +++ b/arch/powerpc/platforms/powernv/Makefile
>> @@ -1,7 +1,7 @@
>> obj-y += setup.o opal-takeover.o opal-wrappers.o opal.o opal-async.o
>> obj-y += opal-rtc.o opal-nvram.o opal-lpc.o opal-flash.o
>> obj-y += rng.o opal-elog.o opal-dump.o opal-sysparam.o opal-sensor.o
>> -obj-y += opal-msglog.o
>> +obj-y += opal-msglog.o opal-errinjct.o
>>
>> obj-$(CONFIG_SMP) += smp.o
>> obj-$(CONFIG_PCI) += pci.o pci-p5ioc2.o pci-ioda.o
>> diff --git a/arch/powerpc/platforms/powernv/opal-errinjct.c b/arch/powerpc/platforms/powernv/opal-errinjct.c
>> new file mode 100644
>> index 0000000..29c9e83
>> --- /dev/null
>> +++ b/arch/powerpc/platforms/powernv/opal-errinjct.c
>> @@ -0,0 +1,184 @@
>> +/*
>> + * The file supports error injection, which works based on OPAL API.
>> + * For now, we only support PCI error injection. We need support
>> + * injecting other types of errors in future.
>> + *
>> + * Copyright Gavin Shan, IBM Corporation 2014.
>> + *
>> + * This program is free software; you can redistribute it and/or modify
>> + * it under the terms of the GNU General Public License as published by
>> + * the Free Software Foundation; either version 2 of the License, or
>> + * (at your option) any later version.
>> + */
>> +
>> +#include <linux/kernel.h>
>> +#include <linux/init.h>
>> +#include <linux/msi.h>
>> +#include <linux/pci.h>
>> +#include <linux/iommu.h>
>> +#include <linux/random.h>
>> +#include <linux/slab.h>
>> +#include <linux/sysfs.h>
>> +#include <linux/fs.h>
>> +#include <linux/fcntl.h>
>> +#include <linux/kobject.h>
>> +
>> +#include <asm/msi_bitmap.h>
>> +#include <asm/iommu.h>
>> +#include <asm/pci-bridge.h>
>> +#include <asm/ppc-pci.h>
>> +#include <asm/opal.h>
>> +
>> +#include "powernv.h"
>> +#include "pci.h"
>> +
>> +static DEFINE_MUTEX(errinjct_mutex);
>> +
>> +static int errinjct_iommu_group_to_phb_and_pe(uint32_t iommu_grp_id,
>> + uint64_t *phb_id,
>> + uint32_t *pe_num)
>> +{
>> +#ifdef CONFIG_IOMMU_API
>> + struct iommu_group *iommu_grp;
>> + struct iommu_table *tbl;
>> + struct pnv_ioda_pe *pe;
>> +
>> + iommu_grp = iommu_group_get_by_id(iommu_grp_id);
>> + if (!iommu_grp)
>> + return -ENODEV;
>> +
>> + tbl = iommu_group_get_iommudata(iommu_grp);
>> + if (!tbl)
>> + return -ENODEV;
>> +
>> + pe = container_of(tbl, struct pnv_ioda_pe, tce32_table);
>> + if (!pe->phb)
>> + return -ENODEV;
>> +
>> + *phb_id = pe->phb->opal_id;
>> + *pe_num = pe->pe_number;
>> +
>> + return 0;
>> +#endif
>> +
>> + return -ENXIO;
>> +}
>> +
>> +static int errinjct_ioa_bus_error(const char *buf, struct OpalErrinjct *ei)
>> +{
>> + uint32_t iommu_grp_id;
>> + int ret;
>> +
>> + /* Extract parameters */
>> + ret = sscanf(buf, "%x:%x:%x:%x:%x",
>> + &ei->type, &ei->ioa.addr,
>> + &ei->ioa.mask, &iommu_grp_id, ei->ioa.function);
>> + if (ret != 5)
>> + return -EINVAL;
>> +
>> + /* Invalid function ? */
>> + if (ei->ioa.function < OpalEitIoaLoadMemAddr ||
>> + ei->ioa.function > OpalEitIoaDmaWriteMemTarget)
>> + return -ERANGE;
>> +
>> + /* Retrieve PHB ID and PE number */
>> + ret = errinjct_iommu_group_to_phb_and_pe(iommu_grp_id,
>> + &ei->ioa.phb_id,
>> + &ei->ioa.pe);
>> + if (ret)
>> + return ret;
>> +
>> + return 0;
>> +}
>> +
>> +static int errinjct_ioa_bus_error64(const char *buf, struct OpalErrinjct *ei)
>> +{
>> + uint32_t iommu_grp_id;
>> + int ret;
>> +
>> + /* Extract parameter */
>> + ret = sscanf(buf, "%x:%llx:%llx:%x:%x",
>> + &ei->type, &ei->ioa64.addr,
>> + &ei->ioa64.mask, &iommu_grp_id, &ei->ioa64.function);
>> + if (ret != 5)
>> + return -EINVAL;
>> +
>> + /* Invalid function ? */
>> + if (ei->ioa64.function < OpalEitIoaLoadMemAddr ||
>> + ei->ioa64.function > OpalEitIoaDmaWriteMemTarget)
>> + return -ERANGE;
>> +
>> + /* Retrieve PHB ID and PE number */
>> + ret = errinjct_iommu_group_to_phb_and_pe(iommu_grp_id,
>> + &ei->ioa64.phb_id,
>> + &ei->ioa64.pe);
>> + if (ret)
>> + return ret;
>> +
>> + return 0;
>> +}
>> +
>> +static ssize_t errinjct_store(struct kobject *kobj,
>> + struct kobj_attribute *attr,
>> + const char *buf, size_t count)
>> +{
>> + struct OpalErrinjct ei;
>> + int ret;
>> + long rc;
>> +
>> + /* Extract common parameters */
>> + ret = sscanf(buf, "%x", &ei.type);
>> + if (ret != 1)
>> + return -EINVAL;
>> +
>> + /* Error injection might be in progress */
>> + if (!mutex_trylock(&errinjct_mutex))
>> + return -EAGAIN;
>> +
>> + switch (ei.type) {
>> + case OpalErrinjctTypeIoaBusError:
>> + ret = errinjct_ioa_bus_error(buf, &ei);
>> + break;
>> + case OpalErrinjctTypeIoaBusError64:
>> + ret = errinjct_ioa_bus_error64(buf, &ei);
>> + break;
>> + default:
>> + ret = -ERANGE;
>> + }
>> +
>> + /* Invalid parameters ? */
>> + if (ret)
>> + goto mutex_unlock_exit;
>> +
>> + /* OPAL call */
>> + rc = opal_err_injct(&ei);
>> + if (rc == OPAL_SUCCESS)
>> + ret = count;
>> + else
>> + ret = -EIO;
>> +
>> +mutex_unlock_exit:
>> + mutex_unlock(&errinjct_mutex);
>> + return ret;
>> +}
>> +
>> +static struct kobj_attribute errinjct_attr =
>> + __ATTR(errinjct, 0600, NULL, errinjct_store);
>> +
>> +void __init opal_errinjct_init(void)
>> +{
>> + int ret;
>> +
>> + /* Make sure /sys/firmware/opal directory is created */
>> + if (!opal_kobj) {
>> + pr_warn("%s: opal kobject is not available\n",
>> + __func__);
>> + return;
>> + }
>> +
>> + /* Create the sysfs files */
>> + ret = sysfs_create_file(opal_kobj, &errinjct_attr.attr);
>> + if (ret)
>> + pr_warn("%s: Cannot create sysfs file (%d)\n",
>> + __func__, ret);
>> +}
>> diff --git a/arch/powerpc/platforms/powernv/opal.c b/arch/powerpc/platforms/powernv/opal.c
>> index 360ad80c..cb29bb5 100644
>> --- a/arch/powerpc/platforms/powernv/opal.c
>> +++ b/arch/powerpc/platforms/powernv/opal.c
>> @@ -604,6 +604,8 @@ static int __init opal_init(void)
>> opal_sys_param_init();
>> /* Setup message log interface. */
>> opal_msglog_init();
>> + /* Setup error injection interface */
>> + opal_errinjct_init();
>> }
>>
>> return 0;
>
>--
>To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
>the body of a message to majordomo@vger.kernel.org
>More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply
* Re: [PATCH v2] fsl-rio: add support for mapping inbound windows
From: Scott Wood @ 2014-06-25 0:40 UTC (permalink / raw)
To: Martijn de Gouw
Cc: Martijn de Gouw, Barry.Wood, Alexandre.Bounine, Liu Gang,
stef.van.os, linuxppc-dev
In-Reply-To: <1403532715-21389-1-git-send-email-martijn.de.gouw@prodrive-technologies.com>
On Mon, 2014-06-23 at 16:11 +0200, Martijn de Gouw wrote:
> From: Martijn de Gouw <martijn.de.gouw@prodrive.nl>
>
> Add support for mapping and unmapping of inbound rapidio windows.
>
> Signed-off-by: Martijn de Gouw <martijn.de.gouw@prodrive-technologies.com>
> ---
> arch/powerpc/sysdev/fsl_rio.c | 92 +++++++++++++++++++++++++++++++++++++++++
> arch/powerpc/sysdev/fsl_rio.h | 12 ++++++
> 2 files changed, 104 insertions(+)
Could you describe a bit more why this is needed?
Liu Gang, can you review this?
> +int fsl_map_inb_mem(struct rio_mport *mport, dma_addr_t lstart,
> + u64 rstart, u32 size, u32 flags)
> +{
> + struct rio_priv *priv = mport->priv;
> + u32 base_size;
> + unsigned int base_size_log;
> + u64 win_start, win_end;
> + u32 riwar;
> + int i;
> +
> + base_size_log = __ilog2(size) + ((size & (size - 1)) != 0);
Why __ilog2() and not ilog2()?
> @@ -598,6 +687,8 @@ int fsl_rio_setup(struct platform_device *dev)
> RIO_ATMU_REGS_PORT2_OFFSET));
>
> priv->maint_atmu_regs = priv->atmu_regs + 1;
> + priv->inb_atmu_regs = (struct rio_inb_atmu_regs *)
> + (priv->regs_win + RIO_INB_ATMU_REGS_OFFSET);
__iomem
-Scott
^ permalink raw reply
* [PATCH v2] sched: Fix compiler warnings
From: Guenter Roeck @ 2014-06-25 1:05 UTC (permalink / raw)
To: Ingo Molnar
Cc: Russell King, Peter Zijlstra, linux-kernel, Ingo Molnar,
Paul Mackerras, Guenter Roeck, Vincent Guittot, linuxppc-dev,
Dietmar Eggemann, linux-arm-kernel
Commit 143e1e28cb (sched: Rework sched_domain topology definition)
introduced a number of functions with a return value of 'const int'.
gcc doesn't know what to do with that and, if the kernel is compiled
with W=1, complains with the following warnings whenever sched.h
is included.
include/linux/sched.h:875:25: warning:
type qualifiers ignored on function return type
include/linux/sched.h:882:25: warning:
type qualifiers ignored on function return type
include/linux/sched.h:889:25: warning:
type qualifiers ignored on function return type
include/linux/sched.h:1002:21: warning:
type qualifiers ignored on function return type
Commits fb2aa855 (sched, ARM: Create a dedicated scheduler topology table)
and 607b45e9a (sched, powerpc: Create a dedicated topology table) introduce
the same warning in the arm and powerpc code.
Drop 'const' from the function declarations to fix the problem.
The fix for all three patches has to be applied together to avoid
compilation failures for the affected architectures.
Cc: Dietmar Eggemann <dietmar.eggemann@arm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Vincent Guittot <vincent.guittot@linaro.org>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
v2: Fix problem in all affected architectures with a single patch
to avoid compilation errors.
arch/arm/kernel/topology.c | 2 +-
arch/powerpc/kernel/smp.c | 2 +-
include/linux/sched.h | 8 ++++----
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/arm/kernel/topology.c b/arch/arm/kernel/topology.c
index 9d85318..e35d880 100644
--- a/arch/arm/kernel/topology.c
+++ b/arch/arm/kernel/topology.c
@@ -275,7 +275,7 @@ void store_cpu_topology(unsigned int cpuid)
cpu_topology[cpuid].socket_id, mpidr);
}
-static inline const int cpu_corepower_flags(void)
+static inline int cpu_corepower_flags(void)
{
return SD_SHARE_PKG_RESOURCES | SD_SHARE_POWERDOMAIN;
}
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index 51a3ff7..1007fb8 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -747,7 +747,7 @@ int setup_profiling_timer(unsigned int multiplier)
#ifdef CONFIG_SCHED_SMT
/* cpumask of CPUs with asymetric SMT dependancy */
-static const int powerpc_smt_flags(void)
+static int powerpc_smt_flags(void)
{
int flags = SD_SHARE_CPUCAPACITY | SD_SHARE_PKG_RESOURCES;
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 306f4f0..0376b05 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -872,21 +872,21 @@ enum cpu_idle_type {
#define SD_NUMA 0x4000 /* cross-node balancing */
#ifdef CONFIG_SCHED_SMT
-static inline const int cpu_smt_flags(void)
+static inline int cpu_smt_flags(void)
{
return SD_SHARE_CPUCAPACITY | SD_SHARE_PKG_RESOURCES;
}
#endif
#ifdef CONFIG_SCHED_MC
-static inline const int cpu_core_flags(void)
+static inline int cpu_core_flags(void)
{
return SD_SHARE_PKG_RESOURCES;
}
#endif
#ifdef CONFIG_NUMA
-static inline const int cpu_numa_flags(void)
+static inline int cpu_numa_flags(void)
{
return SD_NUMA;
}
@@ -999,7 +999,7 @@ void free_sched_domains(cpumask_var_t doms[], unsigned int ndoms);
bool cpus_share_cache(int this_cpu, int that_cpu);
typedef const struct cpumask *(*sched_domain_mask_f)(int cpu);
-typedef const int (*sched_domain_flags_f)(void);
+typedef int (*sched_domain_flags_f)(void);
#define SDTL_OVERLAP 0x01
--
1.9.1
^ permalink raw reply related
* Re: [RFC PATCH V3 06/17] ppc/pnv: allocate pe->iommu_table dynamically
From: Wei Yang @ 2014-06-25 1:12 UTC (permalink / raw)
To: Alexey Kardashevskiy
Cc: Wei Yang, benh, linux-pci, gwshan, yan, bhelgaas, qiudayu,
linuxppc-dev
In-Reply-To: <53A94DA8.6020206@ozlabs.ru>
On Tue, Jun 24, 2014 at 08:06:32PM +1000, Alexey Kardashevskiy wrote:
>On 06/10/2014 11:56 AM, Wei Yang wrote:
>> Current iommu_table of a PE is a static field. This will have a problem when
>> iommu_free_table is called.
>
>What kind of problem? This table is per PE and PE is not going anywhere.
>
Yes, for Bus PE, they will always sit in the system. When VF PE introduced,
they could be released on the fly. When they are released, so do the iommu
table for the PE.
--
Richard Yang
Help you, Help me
^ permalink raw reply
* [PATCH] powerpc: Don't skip ePAPR spin-table CPUs
From: Scott Wood @ 2014-06-25 1:15 UTC (permalink / raw)
To: linuxppc-dev; +Cc: Scott Wood, Michael Neuling, stable, Emil Medve
Commit 59a53afe70fd530040bdc69581f03d880157f15a "powerpc: Don't setup
CPUs with bad status" broke ePAPR SMP booting. ePAPR says that CPUs
that aren't presently running shall have status of disabled, with
enable-method being used to determine whether the CPU can be enabled.
Fix by checking for spin-table, which is currently the only supported
enable-method.
Signed-off-by: Scott Wood <scottwood@freescale.com>
Cc: Michael Neuling <mikey@neuling.org>
Cc: Emil Medve <Emilian.Medve@Freescale.com>
Cc: stable@vger.kernel.org
---
arch/powerpc/kernel/setup-common.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index e239df3..e5b022c 100644
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -469,9 +469,17 @@ void __init smp_setup_cpu_maps(void)
}
for (j = 0; j < nthreads && cpu < nr_cpu_ids; j++) {
+ bool avail;
+
DBG(" thread %d -> cpu %d (hard id %d)\n",
j, cpu, be32_to_cpu(intserv[j]));
- set_cpu_present(cpu, of_device_is_available(dn));
+
+ avail = of_device_is_available(dn);
+ if (!avail)
+ avail = !of_property_match_string(dn,
+ "enable-method", "spin-table");
+
+ set_cpu_present(cpu, avail);
set_hard_smp_processor_id(cpu, be32_to_cpu(intserv[j]));
set_cpu_possible(cpu, true);
cpu++;
--
1.9.1
^ permalink raw reply related
* Re: [PATCH v2] sched: Fix compiler warnings
From: Benjamin Herrenschmidt @ 2014-06-25 1:23 UTC (permalink / raw)
To: Guenter Roeck
Cc: Russell King, Peter Zijlstra, linux-kernel, Ingo Molnar,
Ingo Molnar, Paul Mackerras, Vincent Guittot, linuxppc-dev,
Dietmar Eggemann, linux-arm-kernel
In-Reply-To: <1403658329-13196-1-git-send-email-linux@roeck-us.net>
On Tue, 2014-06-24 at 18:05 -0700, Guenter Roeck wrote:
.../...
> Drop 'const' from the function declarations to fix the problem.
>
> The fix for all three patches has to be applied together to avoid
> compilation failures for the affected architectures.
>
> Cc: Dietmar Eggemann <dietmar.eggemann@arm.com>
> Cc: Peter Zijlstra <peterz@infradead.org>
> Cc: Ingo Molnar <mingo@kernel.org>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> Cc: Vincent Guittot <vincent.guittot@linaro.org>
> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
> ---
> v2: Fix problem in all affected architectures with a single patch
> to avoid compilation errors.
^ permalink raw reply
* [PATCH] spi: include "int ret" with macro
From: Zhao Qiang @ 2014-06-25 1:54 UTC (permalink / raw)
To: linuxppc-dev, broonie, linux-spi, B07421; +Cc: Zhao Qiang
ret is unused when CONFIG_FSL_SOC defined,
so include it with "#ifndef CONFIG_FSL_SOC".
Signed-off-by: Zhao Qiang <B45475@freescale.com>
---
drivers/spi/spi-fsl-lib.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/spi/spi-fsl-lib.c b/drivers/spi/spi-fsl-lib.c
index e5d45fc..44aace1 100644
--- a/drivers/spi/spi-fsl-lib.c
+++ b/drivers/spi/spi-fsl-lib.c
@@ -198,8 +198,9 @@ int of_mpc8xxx_spi_probe(struct platform_device *ofdev)
struct mpc8xxx_spi_probe_info *pinfo;
struct fsl_spi_platform_data *pdata;
const void *prop;
+#ifndef CONFIG_FSL_SOC
int ret = -ENOMEM;
-
+#endif
pinfo = devm_kzalloc(&ofdev->dev, sizeof(*pinfo), GFP_KERNEL);
if (!pinfo)
return -ENOMEM;
--
1.8.5
^ permalink raw reply related
* RE: [PATCH v2 1/2] flexcan: add err_irq handler for flexcan
From: qiang.zhao @ 2014-06-25 2:04 UTC (permalink / raw)
To: Scott Wood
Cc: mkl@pengutronix.de, linuxppc-dev@lists.ozlabs.org,
wg@grandegger.com, linux-can@vger.kernel.org
In-Reply-To: <1403631298.26908.1.camel@snotra.buserror.net>
=0A=
________________________________________=0A=
From: Wood Scott-B07421=0A=
Sent: Wednesday, June 25, 2014 1:34 AM=0A=
To: Zhao Qiang-B45475=0A=
Cc: linuxppc-dev@lists.ozlabs.org; linux-can@vger.kernel.org; wg@grandegger=
.com; mkl@pengutronix.de=0A=
Subject: Re: [PATCH v2 1/2] flexcan: add err_irq handler for flexcan=0A=
=0A=
On Mon, 2014-06-23 at 01:20 -0500, Zhao Qiang-B45475 wrote:=0A=
> On Sat, 2014-06-21 at 12:19, Wood Scott wrote:=0A=
>=0A=
> > -----Original Message-----=0A=
> > From: Wood Scott-B07421=0A=
> > Sent: Saturday, June 21, 2014 12:19 AM=0A=
> > To: Zhao Qiang-B45475=0A=
> > Cc: linuxppc-dev@lists.ozlabs.org; linux-can@vger.kernel.org;=0A=
> > wg@grandegger.com; mkl@pengutronix.de; Wood Scott-B07421=0A=
> > Subject: Re: [PATCH v2 1/2] flexcan: add err_irq handler for flexcan=0A=
> >=0A=
> > On Fri, 2014-06-20 at 10:01 +0800, Zhao Qiang wrote:=0A=
> > > when flexcan is not physically linked, command 'cantest' will trigger=
=0A=
> > > an err_irq, add err_irq handler for it.=0A=
> > >=0A=
> > > Signed-off-by: Zhao Qiang <B45475@freescale.com>=0A=
> > > ---=0A=
> > > Changes for v2:=0A=
> > > - use a space instead of tab=0A=
> > > - use flexcan_poll_state instead of print=0A=
> > >=0A=
> > > drivers/net/can/flexcan.c | 31 ++++++++++++++++++++++++++++++-=0A=
> > > 1 file changed, 30 insertions(+), 1 deletion(-)=0A=
> > >=0A=
> > > diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c=0A=
> > > index f425ec2..7432ba4 100644=0A=
> > > --- a/drivers/net/can/flexcan.c=0A=
> > > +++ b/drivers/net/can/flexcan.c=0A=
> > > @@ -208,6 +208,7 @@ struct flexcan_priv {=0A=
> > > void __iomem *base;=0A=
> > > u32 reg_esr;=0A=
> > > u32 reg_ctrl_default;=0A=
> > > + unsigned int err_irq;=0A=
> >=0A=
> > Why unsigned?=0A=
> Err_irq is from 0.=0A=
=0A=
So? irqs are plain "int" almost everywhere in the kernel.=0A=
=0A=
OK, I will change it.=0A=
=0A=
-Zhao =0A=
=0A=
^ permalink raw reply
* Re: [PATCH] vfio: Fix endianness handling for emulated BARs
From: Alexey Kardashevskiy @ 2014-06-25 2:43 UTC (permalink / raw)
To: Benjamin Herrenschmidt
Cc: kvm, Nikunj A Dadhania, Alexander Graf, linux-kernel,
Alex Williamson, linuxppc-dev
In-Reply-To: <1403646877.4587.184.camel@pasglop>
On 06/25/2014 07:54 AM, Benjamin Herrenschmidt wrote:
> On Wed, 2014-06-25 at 00:33 +1000, Alexey Kardashevskiy wrote:
>>
>> I do not understand why @val is considered LE here and need to be
>> converted
>> to CPU. Really. I truly believe it should be cpu_to_le32().
>
> No. Both are slightly wrong semantically but le32_to_cpu() is less
> wrong :-)
>
> iowrite32 supposedly takes a "cpu" value as argument and writes an "le"
> value. So if anything, you need something that converts to a "cpu" value
> before you call iowrite32.
>
> Now it's still slightly wrong because the "input" to le32_to_cpu() is
> supposed to be an "LE" value but of course here it's not, it's a "cpu"
> value too :-)
>
> But yes, I agree with aw here, either do nothing or stick a set of
> iowriteXX_native or something equivalent in the generic iomap header,
> define them in term of iowrite32be/iowrite32 based on the compile time
> endian of the arch.
Ok. I'll do nothing.
> Hitting asm-generic/iomap.h I think will cover all archs except ARM.
> For ARM, just hack arch/arm/asm/io.h
--
Alexey
^ permalink raw reply
* Re: [PATCH v1 2/3] powerpc/powernv: Support PCI error injection
From: Mike Qiu @ 2014-06-25 3:05 UTC (permalink / raw)
To: Gavin Shan; +Cc: aik, linuxppc-dev, agraf, kvm-ppc
In-Reply-To: <20140625000305.GA5742@shangw>
On 06/25/2014 08:03 AM, Gavin Shan wrote:
> On Tue, Jun 24, 2014 at 05:00:52PM +1000, Benjamin Herrenschmidt wrote:
>> On Tue, 2014-06-24 at 14:57 +0800, Mike Qiu wrote:
>>> Is that mean *host* side error injection should base on
>>> "CONFIG_IOMMU_API" ? If it is just host side(no guest, no pass through),
>>> can't we do error inject?
>>>
>>> Maybe I misunderstand :)
>> Ah no, make different patches, we don't want to use IOMMU group ID, just
>> PE numbers. Maybe we should expose in sysfs the PEs from the platform
>> code with the error injection files underneath ...
>>
> Yeah, "errinjct" needs grab PCI_domain_nr+PE number from sysfs. We
> already had PE number sysfs file:
>
> [root@ltcfbl8eb 0000:01:00.1]# pwd
> /sys/bus/pci/devices/0000:01:00.1
> [root@ltcfbl8eb 0000:01:00.1]# cat eeh_pe_config_addr
> 0x1
>
> For guest support, we will rely on VFIO group ioctl command, which
> naturally depends on pass-through.
>
> ---
>
> We probably implement it like this. If there're anything wrong, please
> correct me:
>
> - Introduce EEH callback struct eeh_ops::err_inject(), which will be
> implemented for PowerNV (NULL for pSeries) by calling the PCI error
> injection dedicated OPAL API (opal_pci_err_inject()).
> - Introduce global function eeh.c::eeh_err_inject(), which calls to
> eeh_ops::err_inject() and newly introduced VFIO EEH operation
> will be implemented based on this function.
> - Introduce debugfs /sys/kernel/debug/powerpc/PCIxxxx/errinjct, which
Here maybe "/sys/kernel/debug/powerpc/errinjct" is better, because it
will supply "PCI_domain_nr" in parameters, so no need supply errinjct
for each PCI domain.
Another reason is error inject not only for PCI(in future), so better
not in PCI domain entry.
Also it simple for userland tools to has a fixed path.
Thanks
Mike
> receives PCI error injection parameters from "errinjct". It could
> have format: "ei_token:addr:mask:PCI_domain_nr:PE_num:function".
> Eventually, eeh_err_inject() is invoked to call the corresponding
> OPAL API.
>
> Thanks,
> Gavin
>
^ permalink raw reply
* Re: [PATCH v1 2/3] powerpc/powernv: Support PCI error injection
From: Benjamin Herrenschmidt @ 2014-06-25 3:19 UTC (permalink / raw)
To: Mike Qiu; +Cc: aik, linuxppc-dev, Gavin Shan, kvm-ppc, agraf
In-Reply-To: <53AA3C5C.4080807@linux.vnet.ibm.com>
On Wed, 2014-06-25 at 11:05 +0800, Mike Qiu wrote:
> Here maybe "/sys/kernel/debug/powerpc/errinjct" is better, because
> it
> will supply "PCI_domain_nr" in parameters, so no need supply errinjct
> for each PCI domain.
>
> Another reason is error inject not only for PCI(in future), so better
> not in PCI domain entry.
>
> Also it simple for userland tools to has a fixed path.
I don't like this. I much prefer have dedicated error injection files
in their respective locations, something for PCI under the corresponding
PCI bridge etc...
Cheers,
Ben.
^ permalink raw reply
* [PATCH] Bugfix: powerpc/eeh: Create eeh sysfs entry in post_init()
From: Mike Qiu @ 2014-06-25 3:32 UTC (permalink / raw)
To: kvm-ppc; +Cc: Mike Qiu, linuxppc-dev, gwshan
Eeh sysfs entry created must be after EEH_ENABLED been set
in eeh_subsystem_flags.
In PowerNV platform, it try to create sysfs entry before
EEH_ENABLED been set, when boot up. So nothing will be
created for eeh in sysfs.
Signed-off-by: Mike Qiu <qiudayu@linux.vnet.ibm.com>
---
arch/powerpc/platforms/powernv/eeh-ioda.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/arch/powerpc/platforms/powernv/eeh-ioda.c b/arch/powerpc/platforms/powernv/eeh-ioda.c
index 8ad0c5b..5f95581 100644
--- a/arch/powerpc/platforms/powernv/eeh-ioda.c
+++ b/arch/powerpc/platforms/powernv/eeh-ioda.c
@@ -136,6 +136,9 @@ static int ioda_eeh_post_init(struct pci_controller *hose)
struct pnv_phb *phb = hose->private_data;
int ret;
+ /* Creat sysfs after EEH_ENABLED been set */
+ eeh_add_sysfs_files(hose->bus);
+
/* Register OPAL event notifier */
if (!ioda_eeh_nb_init) {
ret = opal_notifier_register(&ioda_eeh_nb);
--
1.8.1.4
^ permalink raw reply related
* [PATCH powerpc] Fix parameter restoring issue in commit 752a6422f
From: Li Zhong @ 2014-06-25 4:00 UTC (permalink / raw)
To: PowerPC email list; +Cc: Paul Mackerras, Anton Blanchard, ulrich.weigand
In commit 752a6422f, new stack frame is created for parameters.
However, the r1 is added back a little earlier, so r3 and r4 are
restored from a wrong place, which could cause following error during
boot:
Querying for OPAL presence... there !
DEFAULT CATCH!, exception-handler=fff00700
at %SRR0: 0000000004223058 %SRR1: 8000000000081002
Open Firmware exception handler entered from non-OF code
Client's Fix Pt Regs:
00 0000000004223054 0000000004223020 0000000004fbe838 0000000000000002
04 0000000028002024 0000000004fbe838 000000000427e838 0000000004222f20
08 0000000000000000 0000000000000000 0000000004222f20 0000000000001002
0c a000000000000001 0000000000000000 0000000001a3fd20 00000000040eb170
10 00000000040eb628 00000000040eb368 fffffffffffffffd 0000000001a3fd20
14 0000000001b37f00 000000000f340000 0000000000cc0000 000000000f340000
18 00000000040ebb08 0000000003580000 00000000040eb128 0000000004285920
1c 0000000001a3fd60 00000000040eb100 7c0802a6f8010010 f821ff914b91ebd1
Special Regs:
%IV: 00000700 %CR: 28002022 %XER: 00000000 %DSISR: 42000000
%SRR0: 0000000004223058 %SRR1: 8000000000081002
%LR: 0000000004223054 %CTR: 0000000000000000
%DAR: 01a3fcf00020b4ac
Virtual PID = 0
ok
Signed-off-by: Li Zhong <zhong@linux.vnet.ibm.com>
---
diff --git a/arch/powerpc/platforms/powernv/opal-takeover.S b/arch/powerpc/platforms/powernv/opal-takeover.S
index 11a3169..9093540 100644
--- a/arch/powerpc/platforms/powernv/opal-takeover.S
+++ b/arch/powerpc/platforms/powernv/opal-takeover.S
@@ -5,6 +5,7 @@
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
+B
* as published by the Free Software Foundation; either version
* 2 of the License, or (at your option) any later version.
*/
@@ -27,11 +28,11 @@ _GLOBAL(opal_query_takeover)
li r3,H_HAL_TAKEOVER
li r4,H_HAL_TAKEOVER_QUERY_MAGIC
HVSC
- addi r1,r1,STACKFRAMESIZE
ld r10,STK_PARAM(R3)(r1)
std r4,0(r10)
ld r10,STK_PARAM(R4)(r1)
std r5,0(r10)
+ addi r1,r1,STACKFRAMESIZE
lwz r0,8(r1)
mtcrf 0xff,r0
blr
^ permalink raw reply related
* Re: [PATCH powerpc] Fix parameter restoring issue in commit 752a6422f
From: Mike Qiu @ 2014-06-25 4:10 UTC (permalink / raw)
To: linuxppc-dev
In-Reply-To: <1403668804.5842.11.camel@ThinkPad-T5421.cn.ibm.com>
Hi Zhong,
I really need this patch :)
BTW, it seems that this bug just happens in 3.16-rc1 as I reported.
Thanks
Mike
On 06/25/2014 12:00 PM, Li Zhong wrote:
> In commit 752a6422f, new stack frame is created for parameters.
>
> However, the r1 is added back a little earlier, so r3 and r4 are
> restored from a wrong place, which could cause following error during
> boot:
>
> Querying for OPAL presence... there !
> DEFAULT CATCH!, exception-handler=fff00700
> at %SRR0: 0000000004223058 %SRR1: 8000000000081002
> Open Firmware exception handler entered from non-OF code
>
> Client's Fix Pt Regs:
> 00 0000000004223054 0000000004223020 0000000004fbe838 0000000000000002
> 04 0000000028002024 0000000004fbe838 000000000427e838 0000000004222f20
> 08 0000000000000000 0000000000000000 0000000004222f20 0000000000001002
> 0c a000000000000001 0000000000000000 0000000001a3fd20 00000000040eb170
> 10 00000000040eb628 00000000040eb368 fffffffffffffffd 0000000001a3fd20
> 14 0000000001b37f00 000000000f340000 0000000000cc0000 000000000f340000
> 18 00000000040ebb08 0000000003580000 00000000040eb128 0000000004285920
> 1c 0000000001a3fd60 00000000040eb100 7c0802a6f8010010 f821ff914b91ebd1
> Special Regs:
> %IV: 00000700 %CR: 28002022 %XER: 00000000 %DSISR: 42000000
> %SRR0: 0000000004223058 %SRR1: 8000000000081002
> %LR: 0000000004223054 %CTR: 0000000000000000
> %DAR: 01a3fcf00020b4ac
> Virtual PID = 0
> ok
>
> Signed-off-by: Li Zhong <zhong@linux.vnet.ibm.com>
> ---
> diff --git a/arch/powerpc/platforms/powernv/opal-takeover.S b/arch/powerpc/platforms/powernv/opal-takeover.S
> index 11a3169..9093540 100644
> --- a/arch/powerpc/platforms/powernv/opal-takeover.S
> +++ b/arch/powerpc/platforms/powernv/opal-takeover.S
> @@ -5,6 +5,7 @@
> *
> * This program is free software; you can redistribute it and/or
> * modify it under the terms of the GNU General Public License
> +B
> * as published by the Free Software Foundation; either version
> * 2 of the License, or (at your option) any later version.
> */
> @@ -27,11 +28,11 @@ _GLOBAL(opal_query_takeover)
> li r3,H_HAL_TAKEOVER
> li r4,H_HAL_TAKEOVER_QUERY_MAGIC
> HVSC
> - addi r1,r1,STACKFRAMESIZE
> ld r10,STK_PARAM(R3)(r1)
> std r4,0(r10)
> ld r10,STK_PARAM(R4)(r1)
> std r5,0(r10)
> + addi r1,r1,STACKFRAMESIZE
> lwz r0,8(r1)
> mtcrf 0xff,r0
> blr
>
>
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev@lists.ozlabs.org
> https://lists.ozlabs.org/listinfo/linuxppc-dev
^ permalink raw reply
* Re: [RFC PATCH V3 06/17] ppc/pnv: allocate pe->iommu_table dynamically
From: Alexey Kardashevskiy @ 2014-06-25 4:12 UTC (permalink / raw)
To: Wei Yang; +Cc: benh, linux-pci, gwshan, yan, bhelgaas, qiudayu, linuxppc-dev
In-Reply-To: <20140625011211.GA5785@richard>
On 06/25/2014 11:12 AM, Wei Yang wrote:
> On Tue, Jun 24, 2014 at 08:06:32PM +1000, Alexey Kardashevskiy wrote:
>> On 06/10/2014 11:56 AM, Wei Yang wrote:
>>> Current iommu_table of a PE is a static field. This will have a problem when
>>> iommu_free_table is called.
>>
>> What kind of problem? This table is per PE and PE is not going anywhere.
>>
>
> Yes, for Bus PE, they will always sit in the system. When VF PE introduced,
> they could be released on the fly. When they are released, so do the iommu
> table for the PE.
iommu_table is a part of PE struct. When PE is released, iommu_table will
go with it as well. Why to make is a pointer? I would understand it if you
added reference counting there but no - iommu_table's lifetime is equal to
PE lifetime.
--
Alexey
^ permalink raw reply
* Re: [PATCH powerpc] Fix parameter restoring issue in commit 752a6422f
From: Benjamin Herrenschmidt @ 2014-06-25 4:20 UTC (permalink / raw)
To: Li Zhong
Cc: Paul Mackerras, PowerPC email list, Anton Blanchard,
ulrich.weigand
In-Reply-To: <1403668804.5842.11.camel@ThinkPad-T5421.cn.ibm.com>
On Wed, 2014-06-25 at 12:00 +0800, Li Zhong wrote:
> In commit 752a6422f, new stack frame is created for parameters.
>
> However, the r1 is added back a little earlier, so r3 and r4 are
> restored from a wrong place, which could cause following error during
> boot:
Thanks ! However I've decided to apply Michael Ellerman's patch to take
the whole takeover code out instead.
Cheers,
Ben.
> Querying for OPAL presence... there !
> DEFAULT CATCH!, exception-handler=fff00700
> at %SRR0: 0000000004223058 %SRR1: 8000000000081002
> Open Firmware exception handler entered from non-OF code
>
> Client's Fix Pt Regs:
> 00 0000000004223054 0000000004223020 0000000004fbe838 0000000000000002
> 04 0000000028002024 0000000004fbe838 000000000427e838 0000000004222f20
> 08 0000000000000000 0000000000000000 0000000004222f20 0000000000001002
> 0c a000000000000001 0000000000000000 0000000001a3fd20 00000000040eb170
> 10 00000000040eb628 00000000040eb368 fffffffffffffffd 0000000001a3fd20
> 14 0000000001b37f00 000000000f340000 0000000000cc0000 000000000f340000
> 18 00000000040ebb08 0000000003580000 00000000040eb128 0000000004285920
> 1c 0000000001a3fd60 00000000040eb100 7c0802a6f8010010 f821ff914b91ebd1
> Special Regs:
> %IV: 00000700 %CR: 28002022 %XER: 00000000 %DSISR: 42000000
> %SRR0: 0000000004223058 %SRR1: 8000000000081002
> %LR: 0000000004223054 %CTR: 0000000000000000
> %DAR: 01a3fcf00020b4ac
> Virtual PID = 0
> ok
>
> Signed-off-by: Li Zhong <zhong@linux.vnet.ibm.com>
> ---
> diff --git a/arch/powerpc/platforms/powernv/opal-takeover.S b/arch/powerpc/platforms/powernv/opal-takeover.S
> index 11a3169..9093540 100644
> --- a/arch/powerpc/platforms/powernv/opal-takeover.S
> +++ b/arch/powerpc/platforms/powernv/opal-takeover.S
> @@ -5,6 +5,7 @@
> *
> * This program is free software; you can redistribute it and/or
> * modify it under the terms of the GNU General Public License
> +B
> * as published by the Free Software Foundation; either version
> * 2 of the License, or (at your option) any later version.
> */
> @@ -27,11 +28,11 @@ _GLOBAL(opal_query_takeover)
> li r3,H_HAL_TAKEOVER
> li r4,H_HAL_TAKEOVER_QUERY_MAGIC
> HVSC
> - addi r1,r1,STACKFRAMESIZE
> ld r10,STK_PARAM(R3)(r1)
> std r4,0(r10)
> ld r10,STK_PARAM(R4)(r1)
> std r5,0(r10)
> + addi r1,r1,STACKFRAMESIZE
> lwz r0,8(r1)
> mtcrf 0xff,r0
> blr
>
^ permalink raw reply
* Re: [PATCH powerpc] Fix parameter restoring issue in commit 752a6422f
From: Li Zhong @ 2014-06-25 4:20 UTC (permalink / raw)
To: PowerPC email list; +Cc: Paul Mackerras, Anton Blanchard, ulrich.weigand
In-Reply-To: <1403668804.5842.11.camel@ThinkPad-T5421.cn.ibm.com>
DaYu just reminded me that Michael already had a patch removing all the
related code.
Please ignore this patch..
Thanks, Zhong
On Wed, 2014-06-25 at 12:00 +0800, Li Zhong wrote:
> In commit 752a6422f, new stack frame is created for parameters.
>
> However, the r1 is added back a little earlier, so r3 and r4 are
> restored from a wrong place, which could cause following error during
> boot:
>
> Querying for OPAL presence... there !
> DEFAULT CATCH!, exception-handler=fff00700
> at %SRR0: 0000000004223058 %SRR1: 8000000000081002
> Open Firmware exception handler entered from non-OF code
>
> Client's Fix Pt Regs:
> 00 0000000004223054 0000000004223020 0000000004fbe838 0000000000000002
> 04 0000000028002024 0000000004fbe838 000000000427e838 0000000004222f20
> 08 0000000000000000 0000000000000000 0000000004222f20 0000000000001002
> 0c a000000000000001 0000000000000000 0000000001a3fd20 00000000040eb170
> 10 00000000040eb628 00000000040eb368 fffffffffffffffd 0000000001a3fd20
> 14 0000000001b37f00 000000000f340000 0000000000cc0000 000000000f340000
> 18 00000000040ebb08 0000000003580000 00000000040eb128 0000000004285920
> 1c 0000000001a3fd60 00000000040eb100 7c0802a6f8010010 f821ff914b91ebd1
> Special Regs:
> %IV: 00000700 %CR: 28002022 %XER: 00000000 %DSISR: 42000000
> %SRR0: 0000000004223058 %SRR1: 8000000000081002
> %LR: 0000000004223054 %CTR: 0000000000000000
> %DAR: 01a3fcf00020b4ac
> Virtual PID = 0
> ok
>
> Signed-off-by: Li Zhong <zhong@linux.vnet.ibm.com>
> ---
> diff --git a/arch/powerpc/platforms/powernv/opal-takeover.S b/arch/powerpc/platforms/powernv/opal-takeover.S
> index 11a3169..9093540 100644
> --- a/arch/powerpc/platforms/powernv/opal-takeover.S
> +++ b/arch/powerpc/platforms/powernv/opal-takeover.S
> @@ -5,6 +5,7 @@
> *
> * This program is free software; you can redistribute it and/or
> * modify it under the terms of the GNU General Public License
> +B
> * as published by the Free Software Foundation; either version
> * 2 of the License, or (at your option) any later version.
> */
> @@ -27,11 +28,11 @@ _GLOBAL(opal_query_takeover)
> li r3,H_HAL_TAKEOVER
> li r4,H_HAL_TAKEOVER_QUERY_MAGIC
> HVSC
> - addi r1,r1,STACKFRAMESIZE
> ld r10,STK_PARAM(R3)(r1)
> std r4,0(r10)
> ld r10,STK_PARAM(R4)(r1)
> std r5,0(r10)
> + addi r1,r1,STACKFRAMESIZE
> lwz r0,8(r1)
> mtcrf 0xff,r0
> blr
>
^ permalink raw reply
* Re: [PATCH powerpc] Fix parameter restoring issue in commit 752a6422f
From: Michael Ellerman @ 2014-06-25 4:36 UTC (permalink / raw)
To: Li Zhong
Cc: Paul Mackerras, PowerPC email list, Anton Blanchard,
ulrich.weigand
In-Reply-To: <1403670058.5842.15.camel@ThinkPad-T5421.cn.ibm.com>
On Wed, 2014-06-25 at 12:20 +0800, Li Zhong wrote:
> DaYu just reminded me that Michael already had a patch removing all the
> related code.
>
> Please ignore this patch..
Thanks for tracking down what the actual problem was.
cheers
^ permalink raw reply
* [PATCH 1/1] selftests/powerpc: fix TARGETS in powerpc selftests makefile
From: Sam Bobroff @ 2014-06-25 5:18 UTC (permalink / raw)
To: linuxppc-dev
This patch changes the name of a make variable (TARGETS) to prevent it
from colliding with a value set by the user on the command line (as
they are recommended to do by tools/testing/selftests/README.txt).
Before this patch, "make -C tools/testing/selftests TARGETS=powerpc"
would fail.
Signed-off-by: Sam Bobroff <sam.bobroff@au1.ibm.com>
---
tools/testing/selftests/powerpc/Makefile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/testing/selftests/powerpc/Makefile b/tools/testing/selftests/powerpc/Makefile
index 54833a7..84795c0 100644
--- a/tools/testing/selftests/powerpc/Makefile
+++ b/tools/testing/selftests/powerpc/Makefile
@@ -13,22 +13,22 @@ CFLAGS := -Wall -O2 -flto -Wall -Werror -DGIT_VERSION='"$(GIT_VERSION)"' -I$(CUR
export CC CFLAGS
-TARGETS = pmu copyloops mm tm
+SUB_TARGETS = pmu copyloops mm tm
endif
all:
- @for TARGET in $(TARGETS); do \
+ @for TARGET in $(SUB_TARGETS); do \
$(MAKE) -C $$TARGET all; \
done;
run_tests: all
- @for TARGET in $(TARGETS); do \
+ @for TARGET in $(SUB_TARGETS); do \
$(MAKE) -C $$TARGET run_tests; \
done;
clean:
- @for TARGET in $(TARGETS); do \
+ @for TARGET in $(SUB_TARGETS); do \
$(MAKE) -C $$TARGET clean; \
done;
rm -f tags
--
1.9.0
^ permalink raw reply related
* Re: [RFC PATCH V3 06/17] ppc/pnv: allocate pe->iommu_table dynamically
From: Wei Yang @ 2014-06-25 5:27 UTC (permalink / raw)
To: Alexey Kardashevskiy
Cc: Wei Yang, benh, linux-pci, gwshan, yan, bhelgaas, qiudayu,
linuxppc-dev
In-Reply-To: <53AA4C32.7060004@ozlabs.ru>
On Wed, Jun 25, 2014 at 02:12:34PM +1000, Alexey Kardashevskiy wrote:
>On 06/25/2014 11:12 AM, Wei Yang wrote:
>> On Tue, Jun 24, 2014 at 08:06:32PM +1000, Alexey Kardashevskiy wrote:
>>> On 06/10/2014 11:56 AM, Wei Yang wrote:
>>>> Current iommu_table of a PE is a static field. This will have a problem when
>>>> iommu_free_table is called.
>>>
>>> What kind of problem? This table is per PE and PE is not going anywhere.
>>>
>>
>> Yes, for Bus PE, they will always sit in the system. When VF PE introduced,
>> they could be released on the fly. When they are released, so do the iommu
>> table for the PE.
>
>iommu_table is a part of PE struct. When PE is released, iommu_table will
>go with it as well. Why to make is a pointer? I would understand it if you
>added reference counting there but no - iommu_table's lifetime is equal to
>PE lifetime.
>
Yes, iommu_talbe's life time equals to PE lifetime, so when releasing a PE we
need to release the iommu table. Currently, there is one function to release
the iommu table, iommu_free_table() which takes a pointer of the iommu_table
and release it.
If the iommu table in PE is just a part of PE, it will have some problem to
release it with iommu_free_table(). That's why I make it a pointer in PE
structure.
>
>
>--
>Alexey
--
Richard Yang
Help you, Help me
^ permalink raw reply
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