* Re: [PATCH 04/21] mm: free_area_init: use maximal zone PFNs rather than zone sizes
From: Greg Ungerer @ 2020-06-15 7:17 UTC (permalink / raw)
To: Mike Rapoport
Cc: dalias, linux-ia64, linux-doc, catalin.marinas, heiko.carstens,
x86, linux-mips, James.Bottomley, jcmvbkbc, guoren, linux-csky,
sparclinux, linux-riscv, linux-arch, linux-s390, linux-c6x-dev,
bcain, corbet, linux-hexagon, deller, linux-sh, linux,
ley.foon.tan, rppt, ysato, geert, linux-arm-kernel, msalter,
mattst88, linux-snps-arc, uclinux-h8-devel, linux-xtensa, nickhu,
linux-um, richard, linux-m68k, openrisc, green.hu, paul.walmsley,
shorne, mhocko, gxt, Hoan, monstr, tony.luck, bhe, linux-parisc,
linux-mm, vgupta, linux-kernel, linux-alpha, akpm, tsbogend,
linuxppc-dev, davem
In-Reply-To: <20200615062234.GA7882@kernel.org>
Hi Mike,
On 15/6/20 4:22 pm, Mike Rapoport wrote:
> On Mon, Jun 15, 2020 at 01:53:42PM +1000, Greg Ungerer wrote:
>> From: Mike Rapoport <rppt@linux.ibm.com>
>>> Currently, architectures that use free_area_init() to initialize memory map
>>> and node and zone structures need to calculate zone and hole sizes. We can
>>> use free_area_init_nodes() instead and let it detect the zone boundaries
>>> while the architectures will only have to supply the possible limits for
>>> the zones.
>>>
>>> Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
>>
>> This is causing some new warnings for me on boot on at least one non-MMU m68k target:
>
> There were a couple of changes that cause this. The free_area_init()
> now relies on memblock data and architectural limits for zone sizes
> rather than on explisit pfns calculated by the arch code. I've update
> motorola variant and missed coldfire. Angelo sent a fix for mcfmmu.c
> [1] and I've updated it to include nommu as well
>
> [1] https://lore.kernel.org/linux-m68k/20200614225119.777702-1-angelo.dureghello@timesys.com
>
>>From 55b8523df2a5c4565b132c0691990f0821040fec Mon Sep 17 00:00:00 2001
> From: Angelo Dureghello <angelo.dureghello@timesys.com>
> Date: Mon, 15 Jun 2020 00:51:19 +0200
> Subject: [PATCH] m68k: fix registration of memory regions with memblock
>
> Commit 3f08a302f533 ("mm: remove CONFIG_HAVE_MEMBLOCK_NODE_MAP option")
> introduced assumption that UMA systems have their memory at node 0 and
> updated most of them, but it forgot nommu and coldfire variants of m68k.
>
> The later change in free area initialization in commit fa3354e4ea39 ("mm:
> free_area_init: use maximal zone PFNs rather than zone sizes") exposed that
> and caused a lot of "BUG: Bad page state in process swapper" reports.
Even with this patch applied I am still seeing the same messages.
Regards
Greg
> Using memblock_add_node() with nid = 0 to register memory banks solves the
> problem.
>
> Fixes: 3f08a302f533 ("mm: remove CONFIG_HAVE_MEMBLOCK_NODE_MAP option")
> Fixes: fa3354e4ea39 ("mm: free_area_init: use maximal zone PFNs rather than zone sizes")
> Signed-off-by: Angelo Dureghello <angelo.dureghello@timesys.com>
> Co-developed-by: Mike Rapoport <rppt@linux.ibm.com>
> Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
> ---
> arch/m68k/kernel/setup_no.c | 2 +-
> arch/m68k/mm/mcfmmu.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/m68k/kernel/setup_no.c b/arch/m68k/kernel/setup_no.c
> index e779b19e0193..0c4589a39ba9 100644
> --- a/arch/m68k/kernel/setup_no.c
> +++ b/arch/m68k/kernel/setup_no.c
> @@ -138,7 +138,7 @@ void __init setup_arch(char **cmdline_p)
> pr_debug("MEMORY -> ROMFS=0x%p-0x%06lx MEM=0x%06lx-0x%06lx\n ",
> __bss_stop, memory_start, memory_start, memory_end);
>
> - memblock_add(memory_start, memory_end - memory_start);
> + memblock_add_node(memory_start, memory_end - memory_start, 0);
>
> /* Keep a copy of command line */
> *cmdline_p = &command_line[0];
> diff --git a/arch/m68k/mm/mcfmmu.c b/arch/m68k/mm/mcfmmu.c
> index 29f47923aa46..7d04210d34f0 100644
> --- a/arch/m68k/mm/mcfmmu.c
> +++ b/arch/m68k/mm/mcfmmu.c
> @@ -174,7 +174,7 @@ void __init cf_bootmem_alloc(void)
> m68k_memory[0].addr = _rambase;
> m68k_memory[0].size = _ramend - _rambase;
>
> - memblock_add(m68k_memory[0].addr, m68k_memory[0].size);
> + memblock_add_node(m68k_memory[0].addr, m68k_memory[0].size, 0);
>
> /* compute total pages in system */
> num_pages = PFN_DOWN(_ramend - _rambase);
>
^ permalink raw reply
* Re: PowerPC KVM-PR issue
From: Christian Zigotzky @ 2020-06-15 7:34 UTC (permalink / raw)
To: Nicholas Piggin, kvm-ppc@vger.kernel.org, linuxppc-dev
Cc: Darren Stevens, R.T.Dickinson, Christian Zigotzky
In-Reply-To: <292cba7f-ca2b-efb0-db3d-ecd7ee5f1fad@xenosoft.de>
On 15 June 2020 at 01:39 am, Christian Zigotzky wrote:
> On 14 June 2020 at 04:52 pm, Christian Zigotzky wrote:
>> On 14 June 2020 at 02:53 pm, Nicholas Piggin wrote:
>>> Excerpts from Christian Zigotzky's message of June 12, 2020 11:01 pm:
>>>> On 11 June 2020 at 04:47 pm, Christian Zigotzky wrote:
>>>>> On 10 June 2020 at 01:23 pm, Christian Zigotzky wrote:
>>>>>> On 10 June 2020 at 11:06 am, Christian Zigotzky wrote:
>>>>>>> On 10 June 2020 at 00:18 am, Christian Zigotzky wrote:
>>>>>>>> Hello,
>>>>>>>>
>>>>>>>> KVM-PR doesn't work anymore on my Nemo board [1]. I figured out
>>>>>>>> that the Git kernels and the kernel 5.7 are affected.
>>>>>>>>
>>>>>>>> Error message: Fienix kernel: kvmppc_exit_pr_progint: emulation at
>>>>>>>> 700 failed (00000000)
>>>>>>>>
>>>>>>>> I can boot virtual QEMU PowerPC machines with KVM-PR with the
>>>>>>>> kernel 5.6 without any problems on my Nemo board.
>>>>>>>>
>>>>>>>> I tested it with QEMU 2.5.0 and QEMU 5.0.0 today.
>>>>>>>>
>>>>>>>> Could you please check KVM-PR on your PowerPC machine?
>>>>>>>>
>>>>>>>> Thanks,
>>>>>>>> Christian
>>>>>>>>
>>>>>>>> [1] https://en.wikipedia.org/wiki/AmigaOne_X1000
>>>>>>> I figured out that the PowerPC updates 5.7-1 [1] are responsible
>>>>>>> for
>>>>>>> the KVM-PR issue. Please test KVM-PR on your PowerPC machines and
>>>>>>> check the PowerPC updates 5.7-1 [1].
>>>>>>>
>>>>>>> Thanks
>>>>>>>
>>>>>>> [1]
>>>>>>> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=d38c07afc356ddebaa3ed8ecb3f553340e05c969
>>>>>>>
>>>>>>>
>>>>>>>
>>>>>> I tested the latest Git kernel with Mac-on-Linux/KVM-PR today.
>>>>>> Unfortunately I can't use KVM-PR with MoL anymore because of this
>>>>>> issue (see screenshots [1]). Please check the PowerPC updates 5.7-1.
>>>>>>
>>>>>> Thanks
>>>>>>
>>>>>> [1]
>>>>>> -
>>>>>> https://i.pinimg.com/originals/0c/b3/64/0cb364a40241fa2b7f297d4272bbb8b7.png
>>>>>>
>>>>>> -
>>>>>> https://i.pinimg.com/originals/9a/61/d1/9a61d170b1c9f514f7a78a3014ffd18f.png
>>>>>>
>>>>>>
>>>>> Hi All,
>>>>>
>>>>> I bisected today because of the KVM-PR issue.
>>>>>
>>>>> Result:
>>>>>
>>>>> 9600f261acaaabd476d7833cec2dd20f2919f1a0 is the first bad commit
>>>>> commit 9600f261acaaabd476d7833cec2dd20f2919f1a0
>>>>> Author: Nicholas Piggin <npiggin@gmail.com>
>>>>> Date: Wed Feb 26 03:35:21 2020 +1000
>>>>>
>>>>> powerpc/64s/exception: Move KVM test to common code
>>>>>
>>>>> This allows more code to be moved out of unrelocated regions.
>>>>> The
>>>>> system call KVMTEST is changed to be open-coded and remain in
>>>>> the
>>>>> tramp area to avoid having to move it to entry_64.S. The custom
>>>>> nature
>>>>> of the system call entry code means the hcall case can be
>>>>> made more
>>>>> streamlined than regular interrupt handlers.
>>>>>
>>>>> mpe: Incorporate fix from Nick:
>>>>>
>>>>> Moving KVM test to the common entry code missed the case of
>>>>> HMI and
>>>>> MCE, which do not do __GEN_COMMON_ENTRY (because they don't
>>>>> want to
>>>>> switch to virt mode).
>>>>>
>>>>> This means a MCE or HMI exception that is taken while KVM is
>>>>> running a
>>>>> guest context will not be switched out of that context, and
>>>>> KVM won't
>>>>> be notified. Found by running sigfuz in guest with patched
>>>>> host on
>>>>> POWER9 DD2.3, which causes some TM related HMI interrupts
>>>>> (which are
>>>>> expected and supposed to be handled by KVM).
>>>>>
>>>>> This fix adds a __GEN_REALMODE_COMMON_ENTRY for those
>>>>> handlers to add
>>>>> the KVM test. This makes them look a little more like other
>>>>> handlers
>>>>> that all use __GEN_COMMON_ENTRY.
>>>>>
>>>>> Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
>>>>> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
>>>>> Link:
>>>>> https://lore.kernel.org/r/20200225173541.1549955-13-npiggin@gmail.com
>>>>>
>>>>> :040000 040000 ec21cec22d165f8696d69532734cb2985d532cb0
>>>>> 87dd49a9cd7202ec79350e8ca26cea01f1dbd93d M arch
>>>>>
>>>>> -----
>>>>>
>>>>> The following commit is the problem: powerpc/64s/exception: Move KVM
>>>>> test to common code [1]
>>>>>
>>>>> These changes were included in the PowerPC updates 5.7-1. [2]
>>>>>
>>>>> Another test:
>>>>>
>>>>> git checkout d38c07afc356ddebaa3ed8ecb3f553340e05c969 (PowerPC
>>>>> updates
>>>>> 5.7-1 [2] ) -> KVM-PR doesn't work.
>>>>>
>>>>> After that: git revert d38c07afc356ddebaa3ed8ecb3f553340e05c969 -m 1
>>>>> -> KVM-PR works.
>>>>>
>>>>> Could you please check the first bad commit? [1]
>>>>>
>>>>> Thanks,
>>>>> Christian
>>>>>
>>>>>
>>>>> [1]
>>>>> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=9600f261acaaabd476d7833cec2dd20f2919f1a0
>>>>>
>>>>> [2]
>>>>> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=d38c07afc356ddebaa3ed8ecb3f553340e05c969
>>>>>
>>>> Hi All,
>>>>
>>>> I tried to revert the __GEN_REALMODE_COMMON_ENTRY fix for the
>>>> latest Git
>>>> kernel and for the stable kernel 5.7.2 but without any success. There
>>>> was a lot of restructuring work during the kernel 5.7 development
>>>> time in
>>>> the PowerPC area so it isn't possible to reactivate the old code. That
>>>> means we have lost the whole KVM-PR support. I also reported this
>>>> issue
>>>> to Alexander Graf two days ago. He wrote: "Howdy :). It looks pretty
>>>> broken. Have you ever made a bisect to see where the problem comes
>>>> from?"
>>>>
>>>> Please check the KVM-PR code.
>>> Does this patch fix it for you?
>>>
>>> The CTR register reload in the KVM interrupt path used the wrong save
>>> area for SLB (and NMI) interrupts.
>>>
>>> Fixes: 9600f261acaaa ("powerpc/64s/exception: Move KVM test to
>>> common code")
>>> Reported-by: Christian Zigotzky <chzigotzky@xenosoft.de>
>>> Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
>>> ---
>>> arch/powerpc/kernel/exceptions-64s.S | 4 ++--
>>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/arch/powerpc/kernel/exceptions-64s.S
>>> b/arch/powerpc/kernel/exceptions-64s.S
>>> index e70ebb5c318c..fa080694e581 100644
>>> --- a/arch/powerpc/kernel/exceptions-64s.S
>>> +++ b/arch/powerpc/kernel/exceptions-64s.S
>>> @@ -270,7 +270,7 @@ BEGIN_FTR_SECTION
>>> END_FTR_SECTION_IFSET(CPU_FTR_CFAR)
>>> .endif
>>> - ld r10,PACA_EXGEN+EX_CTR(r13)
>>> + ld r10,IAREA+EX_CTR(r13)
>>> mtctr r10
>>> BEGIN_FTR_SECTION
>>> ld r10,IAREA+EX_PPR(r13)
>>> @@ -298,7 +298,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_HAS_PPR)
>>> .if IKVM_SKIP
>>> 89: mtocrf 0x80,r9
>>> - ld r10,PACA_EXGEN+EX_CTR(r13)
>>> + ld r10,IAREA+EX_CTR(r13)
>>> mtctr r10
>>> ld r9,IAREA+EX_R9(r13)
>>> ld r10,IAREA+EX_R10(r13)
>> Many thanks for the fix! I will test it with the RC1 tomorrow.
>>
>> -- Christian
>
> It works! :-) Thanks a lot! Screenshot:
> https://i.pinimg.com/originals/5d/5f/e5/5d5fe584db474dc88bcc641450b2a7e0.png
>
> -- Christian
I also successfully tested it with Mac-on-Linux/KVM-PR today.
Screenshot:
https://i.pinimg.com/originals/d6/5e/3c/d65e3c694ca22996569a193dd0aabbdc.png
-- Christian
^ permalink raw reply
* Re: [PATCH v2 00/12] x86: tag application address space for devices
From: Peter Zijlstra @ 2020-06-15 7:52 UTC (permalink / raw)
To: Fenghua Yu
Cc: Dave Hansen, H Peter Anvin, Dave Jiang, Ashok Raj, Joerg Roedel,
x86, amd-gfx, Ingo Molnar, Ravi V Shankar, Yu-cheng Yu,
Andrew Donnellan, Borislav Petkov, Sohil Mehta, Thomas Gleixner,
Tony Luck, linuxppc-dev, Felix Kuehling, linux-kernel, iommu,
Jacob Jun Pan, Frederic Barrat, David Woodhouse, Lu Baolu
In-Reply-To: <1592008893-9388-1-git-send-email-fenghua.yu@intel.com>
On Fri, Jun 12, 2020 at 05:41:21PM -0700, Fenghua Yu wrote:
> This series only provides simple and basic support for ENQCMD and the MSR:
> 1. Clean up type definitions (patch 1-3). These patches can be in a
> separate series.
> - Define "pasid" as "unsigned int" consistently (patch 1 and 2).
> - Define "flags" as "unsigned int"
> 2. Explain different various technical terms used in the series (patch 4).
> 3. Enumerate support for ENQCMD in the processor (patch 5).
> 4. Handle FPU PASID state and the MSR during context switch (patches 6-7).
> 5. Define "pasid" in mm_struct (patch 8).
> 5. Clear PASID state for new mm and forked and cloned thread (patch 9-10).
> 6. Allocate and free PASID for a process (patch 11).
> 7. Fix up the PASID MSR in #GP handler when one thread in a process
> executes ENQCMD for the first time (patches 12).
If this is per mm, should not switch_mm() update the MSR ? I'm not
seeing that, nor do I see it explained why not.
^ permalink raw reply
* Re: [PATCH v2 12/12] x86/traps: Fix up invalid PASID
From: Peter Zijlstra @ 2020-06-15 7:53 UTC (permalink / raw)
To: Fenghua Yu
Cc: Dave Hansen, H Peter Anvin, Dave Jiang, Ashok Raj, Joerg Roedel,
x86, amd-gfx, Ingo Molnar, Ravi V Shankar, Yu-cheng Yu,
Andrew Donnellan, Borislav Petkov, Sohil Mehta, Thomas Gleixner,
Tony Luck, linuxppc-dev, Felix Kuehling, linux-kernel, iommu,
Jacob Jun Pan, Frederic Barrat, David Woodhouse, Lu Baolu
In-Reply-To: <1592008893-9388-13-git-send-email-fenghua.yu@intel.com>
On Fri, Jun 12, 2020 at 05:41:33PM -0700, Fenghua Yu wrote:
> @@ -447,6 +458,18 @@ dotraplinkage void do_general_protection(struct pt_regs *regs, long error_code)
> int ret;
>
> RCU_LOCKDEP_WARN(!rcu_is_watching(), "entry code didn't wake RCU");
> +
> + /*
> + * Perform the check for a user mode PASID exception before enable
> + * interrupts. Doing this here ensures that the PASID MSR can be simply
> + * accessed because the contents are known to be still associated
> + * with the current process.
> + */
> + if (user_mode(regs) && fixup_pasid_exception()) {
> + cond_local_irq_enable(regs);
> + return;
OK, so we're done with the exception, lets enable interrupts?
> + }
^ permalink raw reply
* Re: [PATCH v2 12/12] x86/traps: Fix up invalid PASID
From: Peter Zijlstra @ 2020-06-15 7:56 UTC (permalink / raw)
To: Fenghua Yu
Cc: Dave Hansen, H Peter Anvin, Dave Jiang, Ashok Raj, Joerg Roedel,
x86, amd-gfx, Ingo Molnar, Ravi V Shankar, Yu-cheng Yu,
Andrew Donnellan, Borislav Petkov, Sohil Mehta, Thomas Gleixner,
Tony Luck, linuxppc-dev, Felix Kuehling, linux-kernel, iommu,
Jacob Jun Pan, Frederic Barrat, David Woodhouse, Lu Baolu
In-Reply-To: <1592008893-9388-13-git-send-email-fenghua.yu@intel.com>
On Fri, Jun 12, 2020 at 05:41:33PM -0700, Fenghua Yu wrote:
> +/*
> + * Apply some heuristics to see if the #GP fault was caused by a thread
> + * that hasn't had the IA32_PASID MSR initialized. If it looks like that
> + * is the problem, try initializing the IA32_PASID MSR. If the heuristic
> + * guesses incorrectly, take one more #GP fault.
How is that going to help? Aren't we then going to run this same
heuristic again and again and again?
> + */
> +bool __fixup_pasid_exception(void)
> +{
> + u64 pasid_msr;
> + unsigned int pasid;
> +
> + /*
> + * This function is called only when this #GP was triggered from user
> + * space. So the mm cannot be NULL.
> + */
> + pasid = current->mm->pasid;
> + /* If the mm doesn't have a valid PASID, then can't help. */
> + if (invalid_pasid(pasid))
> + return false;
> +
> + /*
> + * Since IRQ is disabled now, the current task still owns the FPU on
That's just weird and confusing. What you want to say is that you rely
on the exception disabling the interrupt.
> + * this CPU and the PASID MSR can be directly accessed.
> + *
> + * If the MSR has a valid PASID, the #GP must be for some other reason.
> + *
> + * If rdmsr() is really a performance issue, a TIF_ flag may be
> + * added to check if the thread has a valid PASID instead of rdmsr().
I don't understand any of this. Nobody except us writes to this MSR, we
should bloody well know what's in it. What gives?
> + */
> + rdmsrl(MSR_IA32_PASID, pasid_msr);
> + if (pasid_msr & MSR_IA32_PASID_VALID)
> + return false;
> +
> + /* Fix up the MSR if the MSR doesn't have a valid PASID. */
> + wrmsrl(MSR_IA32_PASID, pasid | MSR_IA32_PASID_VALID);
> +
> + return true;
> +}
> --
> 2.19.1
>
^ permalink raw reply
* [PATCH] powerpc/fixmap: Fix FIX_EARLY_DEBUG_BASE when page size is 256k
From: Christophe Leroy @ 2020-06-15 7:48 UTC (permalink / raw)
To: Benjamin Herrenschmidt, Paul Mackerras, Michael Ellerman,
Albert Herranz
Cc: linuxppc-dev, linux-kernel
FIX_EARLY_DEBUG_BASE reserves a 128k area for debuging.
When page size is 256k, the calculation results in a 0 number of
pages, leading to the following failure:
CC arch/powerpc/kernel/asm-offsets.s
In file included from ./arch/powerpc/include/asm/nohash/32/pgtable.h:77:0,
from ./arch/powerpc/include/asm/nohash/pgtable.h:8,
from ./arch/powerpc/include/asm/pgtable.h:20,
from ./include/linux/pgtable.h:6,
from ./arch/powerpc/include/asm/kup.h:42,
from ./arch/powerpc/include/asm/uaccess.h:9,
from ./include/linux/uaccess.h:11,
from ./include/linux/crypto.h:21,
from ./include/crypto/hash.h:11,
from ./include/linux/uio.h:10,
from ./include/linux/socket.h:8,
from ./include/linux/compat.h:15,
from arch/powerpc/kernel/asm-offsets.c:14:
./arch/powerpc/include/asm/fixmap.h:75:2: error: overflow in enumeration values
__end_of_permanent_fixed_addresses,
^
make[2]: *** [arch/powerpc/kernel/asm-offsets.s] Error 1
Ensure the debug area is at least one page.
Reported-by: kernel test robot <lkp@intel.com>
Fixes: b8e8efaa8639 ("powerpc: reserve fixmap entries for early debug")
Cc: stable@vger.kernel.org
Cc: Albert Herranz <albert_herranz@yahoo.es>
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
---
arch/powerpc/include/asm/fixmap.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/powerpc/include/asm/fixmap.h b/arch/powerpc/include/asm/fixmap.h
index 29188810ba30..925cf89cbf4b 100644
--- a/arch/powerpc/include/asm/fixmap.h
+++ b/arch/powerpc/include/asm/fixmap.h
@@ -52,7 +52,7 @@ enum fixed_addresses {
FIX_HOLE,
/* reserve the top 128K for early debugging purposes */
FIX_EARLY_DEBUG_TOP = FIX_HOLE,
- FIX_EARLY_DEBUG_BASE = FIX_EARLY_DEBUG_TOP+((128*1024)/PAGE_SIZE)-1,
+ FIX_EARLY_DEBUG_BASE = FIX_EARLY_DEBUG_TOP+(ALIGN(SZ_128, PAGE_SIZE)/PAGE_SIZE)-1,
#ifdef CONFIG_HIGHMEM
FIX_KMAP_BEGIN, /* reserved pte's for temporary kernel mappings */
FIX_KMAP_END = FIX_KMAP_BEGIN+(KM_TYPE_NR*NR_CPUS)-1,
--
2.25.0
^ permalink raw reply related
* [PATCH 00/29] Documentation fixes
From: Mauro Carvalho Chehab @ 2020-06-15 6:46 UTC (permalink / raw)
To: Linux Doc Mailing List
Cc: Heiko Stübner, Geert Uytterhoeven, Catalin Marinas,
Linus Walleij, dri-devel, Paul Mackerras, Christoph Hellwig,
Marek Szyprowski, linux-arch, Mike Snitzer, Bartosz Golaszewski,
kasan-dev, Ingo Molnar, Alan Stern, NXP Linux Team, Boqun Feng,
Nicholas Piggin, Alexander Viro, Thomas Gleixner,
Greg Kroah-Hartman, linux-kernel, linux-spi,
Pengutronix Kernel Team, linux-fsdevel, Andrew Morton, alsa-devel,
linux-ia64, David Airlie, James E.J. Bottomley, Eric Dumazet,
keyrings, Shuah Khan, Alasdair Kergon, Daniel Kiss,
Stephen Rothwell, Fabio Estevam, Helge Deller, linux-rockchip,
linux-media, Andrea Parri, linux-arm-msm, Sean Wang, linux-gpio,
Bjorn Helgaas, Jaegeuk Kim, linux-arm-kernel,
Niklas Söderlund, Tony Luck, dm-devel, Alexey Gladkov,
Arnaud Pouliquen, Sandy Huang, linux-f2fs-devel,
linux-renesas-soc, Eric W. Biederman, Mike Kravetz, linux-pci,
Akira Yokosawa, Lai Jiangshan, Jarkko Sakkinen, Dave Hansen,
linux-kselftest, Joel Fernandes, Sukadev Bhattiprolu, Will Deacon,
Florian Fainelli, Jonathan Corbet, Haren Myneni, Gerald Schaefer,
Federico Vaga, Jade Alglave, Alexey Dobriyan, Fenghua Yu,
Marco Elver, Kees Cook, Josh Triplett, Steven Rostedt, rcu,
Mark Brown, Mathieu Desnoyers, Luc Maranget, Thomas Bogendoerfer,
linux-parisc, Jeff Layton, Liam Girdwood, iommu, netdev,
Shawn Guo, David S. Miller, Thiago Jung Bauermann, Jan Kara,
Peter Zijlstra (Intel), Bjorn Andersson, David Howells, linux-mm,
Sandipan Das, H. Peter Anvin, Mauro Carvalho Chehab, x86,
Russell King, Andy Gross, Jakub Kicinski, Sascha Hauer,
devicetree, Philipp Zabel, Paul E. McKenney, Daniel Lustig,
Chao Yu, Lubomir Rintel, Rob Herring, linux-mediatek,
Matthias Brugger, Dmitry Vyukov, Robin Murphy, Akira Shimahara,
linux-mips, linux-bluetooth, Daniel Vetter, Borislav Petkov,
linuxppc-dev
Hi Jon,
That's a bunch of files I have to be applied on the top of v5.8-rc1 fixing
documentation warnings. I already removed some duplicated stuff.
Regards,
Mauro
Mauro Carvalho Chehab (29):
mm: vmalloc.c: remove a kernel-doc annotation from a removed parameter
net: dev: add a missing kernel-doc annotation
net: netdevice.h: add a description for napi_defer_hard_irqs
scripts/kernel-doc: parse __ETHTOOL_DECLARE_LINK_MODE_MASK
net: pylink.h: add kernel-doc descriptions for new fields at
phylink_config
scripts/kernel-doc: handle function pointer prototypes
fs: fs.h: fix a kernel-doc parameter description
gpio: driver.h: fix kernel-doc markup
kcsan: fix a kernel-doc warning
rcu: fix some kernel-doc warnings
fs: docs: f2fs.rst: fix a broken table
dt: update a reference for reneases pcar file renamed to yaml
dt: fix broken links due to txt->yaml renames
dt: Fix broken references to renamed docs
dt: fix reference to olpc,xo1.75-ec.txt
selftests/vm/keys: fix a broken reference at protection_keys.c
docs: hugetlbpage.rst: fix some warnings
docs: powerpc: fix some issues at vas-api.rst
docs: driver-model: remove a duplicated markup at driver.rst
docs: watch_queue.rst: supress some Sphinx warnings and move to
core-api
docs: device-mapper: add dm-ebs.rst to an index file
docs: it_IT: add two missing references
docs: ABI: fix a typo when pointing to w1-generic.rst
docs: fs: locking.rst: fix a broken table
docs: add bus-virt-phys-mapping.txt to core-api
docs: fix references for DMA*.txt files
docs: dt: minor adjustments at writing-schema.rst
docs: fs: proc.rst: fix a warning due to a merge conflict
docs: fs: proc.rst: convert a new chapter to ReST
.../ABI/testing/sysfs-driver-w1_therm | 2 +-
Documentation/PCI/pci.rst | 6 +-
.../admin-guide/device-mapper/index.rst | 1 +
Documentation/admin-guide/mm/hugetlbpage.rst | 25 ++-
Documentation/block/biodoc.rst | 2 +-
.../bus-virt-phys-mapping.rst} | 2 +-
Documentation/core-api/dma-api.rst | 6 +-
Documentation/core-api/dma-isa-lpc.rst | 2 +-
Documentation/core-api/index.rst | 2 +
Documentation/{ => core-api}/watch_queue.rst | 34 ++--
.../bindings/arm/freescale/fsl,scu.txt | 2 +-
.../bindings/display/bridge/sii902x.txt | 2 +-
.../bindings/display/imx/fsl-imx-drm.txt | 4 +-
.../devicetree/bindings/display/imx/ldb.txt | 4 +-
.../display/rockchip/rockchip-drm.yaml | 2 +-
.../bindings/misc/olpc,xo1.75-ec.txt | 2 +-
.../bindings/net/mediatek-bluetooth.txt | 2 +-
.../bindings/pinctrl/renesas,pfc-pinctrl.txt | 2 +-
.../bindings/sound/audio-graph-card.txt | 2 +-
.../bindings/sound/st,sti-asoc-card.txt | 2 +-
.../bindings/spi/qcom,spi-geni-qcom.txt | 2 +-
Documentation/devicetree/writing-schema.rst | 9 +-
.../driver-api/driver-model/driver.rst | 2 -
Documentation/driver-api/usb/dma.rst | 6 +-
Documentation/filesystems/f2fs.rst | 150 ++++++++++++------
Documentation/filesystems/locking.rst | 6 +-
Documentation/filesystems/proc.rst | 46 +++---
Documentation/memory-barriers.txt | 6 +-
Documentation/mips/ingenic-tcu.rst | 2 +-
Documentation/powerpc/vas-api.rst | 23 ++-
Documentation/security/keys/core.rst | 2 +-
.../it_IT/process/management-style.rst | 2 +
.../it_IT/process/submitting-patches.rst | 2 +
.../translations/ko_KR/memory-barriers.txt | 6 +-
MAINTAINERS | 8 +-
arch/ia64/hp/common/sba_iommu.c | 12 +-
arch/parisc/kernel/pci-dma.c | 2 +-
arch/x86/include/asm/dma-mapping.h | 4 +-
arch/x86/kernel/amd_gart_64.c | 2 +-
drivers/parisc/sba_iommu.c | 14 +-
include/linux/dma-mapping.h | 2 +-
include/linux/fs.h | 2 +-
include/linux/gpio/driver.h | 2 +-
include/linux/kcsan-checks.h | 10 +-
include/linux/netdevice.h | 2 +
include/linux/phylink.h | 4 +
include/linux/rculist.h | 2 +-
include/linux/watch_queue.h | 2 +-
include/media/videobuf-dma-sg.h | 2 +-
init/Kconfig | 2 +-
kernel/dma/debug.c | 2 +-
kernel/watch_queue.c | 2 +-
mm/vmalloc.c | 1 -
net/core/dev.c | 1 +
scripts/kernel-doc | 7 +
tools/testing/selftests/vm/protection_keys.c | 2 +-
56 files changed, 282 insertions(+), 175 deletions(-)
rename Documentation/{bus-virt-phys-mapping.txt => core-api/bus-virt-phys-mapping.rst} (99%)
rename Documentation/{ => core-api}/watch_queue.rst (94%)
--
2.26.2
^ permalink raw reply
* Re: [PATCH 09/10] mtd: rawnand: fsl_upm: Get rid of the legacy interface implementation
From: Miquel Raynal @ 2020-06-15 9:01 UTC (permalink / raw)
To: Boris Brezillon, Anton Vorontsov, Miquel Raynal, linux-mtd
Cc: Vignesh Raghavendra, Tudor Ambarus, Richard Weinberger,
Paul Mackerras, linuxppc-dev
In-Reply-To: <20200603134922.1352340-10-boris.brezillon@collabora.com>
On Wed, 2020-06-03 at 13:49:21 UTC, Boris Brezillon wrote:
> Now that the driver implements exec_op(), we can get rid of the legacy
> interface implementation.
>
> Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next, thanks.
Miquel
^ permalink raw reply
* Re: [PATCH 08/10] mtd: rawnand: fsl_upm: Implement exec_op()
From: Miquel Raynal @ 2020-06-15 9:01 UTC (permalink / raw)
To: Boris Brezillon, Anton Vorontsov, Miquel Raynal, linux-mtd
Cc: Vignesh Raghavendra, Tudor Ambarus, Richard Weinberger,
Paul Mackerras, linuxppc-dev
In-Reply-To: <20200603134922.1352340-9-boris.brezillon@collabora.com>
On Wed, 2020-06-03 at 13:49:20 UTC, Boris Brezillon wrote:
> Implement exec_op() so we can get rid of the legacy interface
> implementation.
>
> Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
> Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com>
Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next, thanks.
Miquel
^ permalink raw reply
* Re: [PATCH 07/10] mtd: rawnand: fsl_upm: Inherit from nand_controller
From: Miquel Raynal @ 2020-06-15 9:01 UTC (permalink / raw)
To: Boris Brezillon, Anton Vorontsov, Miquel Raynal, linux-mtd
Cc: Vignesh Raghavendra, Tudor Ambarus, Richard Weinberger,
Paul Mackerras, linuxppc-dev
In-Reply-To: <20200603134922.1352340-8-boris.brezillon@collabora.com>
On Wed, 2020-06-03 at 13:49:19 UTC, Boris Brezillon wrote:
> Explicitly inherit from nand_controller instead of relying on the
> nand_chip.legacy.dummy_controller field.
>
> Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
> Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com>
Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next, thanks.
Miquel
^ permalink raw reply
* Re: [PATCH 06/10] mtd: rawnand: fsl_upm: Use gpio descriptors
From: Miquel Raynal @ 2020-06-15 9:01 UTC (permalink / raw)
To: Boris Brezillon, Anton Vorontsov, Miquel Raynal, linux-mtd
Cc: Vignesh Raghavendra, Tudor Ambarus, Richard Weinberger,
Paul Mackerras, linuxppc-dev
In-Reply-To: <20200603134922.1352340-7-boris.brezillon@collabora.com>
On Wed, 2020-06-03 at 13:49:18 UTC, Boris Brezillon wrote:
> The integer-based GPIO ids are now deprecated in favor of the GPIO desc
> API. The PPC platforms have already been converted to GPIOLIB, so let's
> use gpio descs in the NAND driver too.
>
> While at it, we use devm_gpiod_get_index_optional() so we can get rid
> of the manual gpio desc release done in the init error path and in the
> remove function.
>
> Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
> Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com>
Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next, thanks.
Miquel
^ permalink raw reply
* Re: [PATCH 05/10] mtd: rawnand: fsl_upm: Use platform_get_resource() + devm_ioremap_resource()
From: Miquel Raynal @ 2020-06-15 9:01 UTC (permalink / raw)
To: Boris Brezillon, Anton Vorontsov, Miquel Raynal, linux-mtd
Cc: Vignesh Raghavendra, Tudor Ambarus, Richard Weinberger,
Paul Mackerras, linuxppc-dev
In-Reply-To: <20200603134922.1352340-6-boris.brezillon@collabora.com>
On Wed, 2020-06-03 at 13:49:17 UTC, Boris Brezillon wrote:
> Replace the of_address_to_resource() + devm_ioremap() calls by
> platform_get_resource() + devm_ioremap_resource() ones which allows us
> to get rid of one error message since devm_ioremap_resource() already
> takes care of that.
>
> Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next, thanks.
Miquel
^ permalink raw reply
* Re: [PATCH 04/10] mtd: rawnand: fsl_upm: Use devm_kasprintf() to allocate the MTD name
From: Miquel Raynal @ 2020-06-15 9:02 UTC (permalink / raw)
To: Boris Brezillon, Anton Vorontsov, Miquel Raynal, linux-mtd
Cc: Vignesh Raghavendra, Tudor Ambarus, Richard Weinberger,
Paul Mackerras, linuxppc-dev
In-Reply-To: <20200603134922.1352340-5-boris.brezillon@collabora.com>
On Wed, 2020-06-03 at 13:49:16 UTC, Boris Brezillon wrote:
> This simplifies the init() error path and the remove() handler.
>
> Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next, thanks.
Miquel
^ permalink raw reply
* Re: [PATCH 03/10] mtd: rawnand: fsl_upm: Allocate the fsl_upm_nand object using devm_kzalloc()
From: Miquel Raynal @ 2020-06-15 9:02 UTC (permalink / raw)
To: Boris Brezillon, Anton Vorontsov, Miquel Raynal, linux-mtd
Cc: Vignesh Raghavendra, Tudor Ambarus, Richard Weinberger,
Paul Mackerras, linuxppc-dev
In-Reply-To: <20200603134922.1352340-4-boris.brezillon@collabora.com>
On Wed, 2020-06-03 at 13:49:15 UTC, Boris Brezillon wrote:
> This simplifies the init error patch and remove function.
>
> Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
> Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com>
Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next, thanks.
Miquel
^ permalink raw reply
* Re: [PATCH 02/10] mtd: rawnand: fsl_upm: Get rid of the unused fsl_upm_nand.parts field
From: Miquel Raynal @ 2020-06-15 9:02 UTC (permalink / raw)
To: Boris Brezillon, Anton Vorontsov, Miquel Raynal, linux-mtd
Cc: Vignesh Raghavendra, Tudor Ambarus, Richard Weinberger,
Paul Mackerras, linuxppc-dev
In-Reply-To: <20200603134922.1352340-3-boris.brezillon@collabora.com>
On Wed, 2020-06-03 at 13:49:14 UTC, Boris Brezillon wrote:
> fsl_upm_nand.parts is unused, let's get rid of it.
>
> Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
> Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com>
Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next, thanks.
Miquel
^ permalink raw reply
* Re: [PATCH 01/10] mtd: rawnand: fsl_upm: Remove unused mtd var
From: Miquel Raynal @ 2020-06-15 9:02 UTC (permalink / raw)
To: Boris Brezillon, Anton Vorontsov, Miquel Raynal, linux-mtd
Cc: Vignesh Raghavendra, Tudor Ambarus, Richard Weinberger,
Paul Mackerras, linuxppc-dev
In-Reply-To: <20200603134922.1352340-2-boris.brezillon@collabora.com>
On Wed, 2020-06-03 at 13:49:13 UTC, Boris Brezillon wrote:
> The mtd var in fun_wait_rnb() is now unused, let's get rid of it and
> fix the warning resulting from this unused var.
>
> Fixes: 50a487e7719c ("mtd: rawnand: Pass a nand_chip object to chip->dev_ready()")
> Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
> Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com>
Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next, thanks.
Miquel
^ permalink raw reply
* [PATCH] powerpc/8xx: use pmd_off() to access a PMD entry in pte_update()
From: Mike Rapoport @ 2020-06-15 9:22 UTC (permalink / raw)
To: Andrew Morton, Michael Ellerman
Cc: Christophe Leroy, linux-kernel, Mike Rapoport, linux-mm,
linuxppc-dev, Mike Rapoport
From: Mike Rapoport <rppt@linux.ibm.com>
The pte_update() implementation for PPC_8xx unfolds page table from the PGD
level to access a PMD entry. Since 8xx has only 2-level page table this can
be simplified with pmd_off() shortcut.
Replace explicit unfolding with pmd_off() and drop defines of pgd_index()
and pgd_offset() that are no longer needed.
Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
---
I think it's powerpc material, but I won't mind if Andrew picks it up :)
arch/powerpc/include/asm/nohash/32/pgtable.h | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/arch/powerpc/include/asm/nohash/32/pgtable.h b/arch/powerpc/include/asm/nohash/32/pgtable.h
index b56f14160ae5..5a590ceaec14 100644
--- a/arch/powerpc/include/asm/nohash/32/pgtable.h
+++ b/arch/powerpc/include/asm/nohash/32/pgtable.h
@@ -205,10 +205,6 @@ static inline void pmd_clear(pmd_t *pmdp)
*pmdp = __pmd(0);
}
-/* to find an entry in a page-table-directory */
-#define pgd_index(address) ((address) >> PGDIR_SHIFT)
-#define pgd_offset(mm, address) ((mm)->pgd + pgd_index(address))
-
/*
* PTE updates. This function is called whenever an existing
* valid PTE is updated. This does -not- include set_pte_at()
@@ -230,6 +226,8 @@ static inline void pmd_clear(pmd_t *pmdp)
* For other page sizes, we have a single entry in the table.
*/
#ifdef CONFIG_PPC_8xx
+static pmd_t *pmd_off(struct mm_struct *mm, unsigned long addr);
+
static inline pte_basic_t pte_update(struct mm_struct *mm, unsigned long addr, pte_t *p,
unsigned long clr, unsigned long set, int huge)
{
@@ -237,7 +235,7 @@ static inline pte_basic_t pte_update(struct mm_struct *mm, unsigned long addr, p
pte_basic_t old = pte_val(*p);
pte_basic_t new = (old & ~(pte_basic_t)clr) | set;
int num, i;
- pmd_t *pmd = pmd_offset(pud_offset(p4d_offset(pgd_offset(mm, addr), addr), addr), addr);
+ pmd_t *pmd = pmd_off(mm, addr);
if (!huge)
num = PAGE_SIZE / SZ_4K;
--
2.26.2
^ permalink raw reply related
* Re: [PATCH] powerpc/8xx: use pmd_off() to access a PMD entry in pte_update()
From: Christophe Leroy @ 2020-06-15 9:32 UTC (permalink / raw)
To: Mike Rapoport, Andrew Morton, Michael Ellerman
Cc: Christophe Leroy, linux-mm, linuxppc-dev, linux-kernel,
Mike Rapoport
In-Reply-To: <20200615092229.23142-1-rppt@kernel.org>
Le 15/06/2020 à 11:22, Mike Rapoport a écrit :
> From: Mike Rapoport <rppt@linux.ibm.com>
>
> The pte_update() implementation for PPC_8xx unfolds page table from the PGD
> level to access a PMD entry. Since 8xx has only 2-level page table this can
> be simplified with pmd_off() shortcut.
>
> Replace explicit unfolding with pmd_off() and drop defines of pgd_index()
> and pgd_offset() that are no longer needed.
>
> Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
Nice. When I implemented this function, I was not able to use pmd_ptr()
due to some circular header inclusion (See comment in commit log). Looks
like since the replacement of pmd_ptr() by pmd_off(), it works.
Reviewed-by: Christophe Leroy <christophe.leroy@c-s.fr>
Christophe
> ---
>
> I think it's powerpc material, but I won't mind if Andrew picks it up :)
>
>
> arch/powerpc/include/asm/nohash/32/pgtable.h | 8 +++-----
> 1 file changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/arch/powerpc/include/asm/nohash/32/pgtable.h b/arch/powerpc/include/asm/nohash/32/pgtable.h
> index b56f14160ae5..5a590ceaec14 100644
> --- a/arch/powerpc/include/asm/nohash/32/pgtable.h
> +++ b/arch/powerpc/include/asm/nohash/32/pgtable.h
> @@ -205,10 +205,6 @@ static inline void pmd_clear(pmd_t *pmdp)
> *pmdp = __pmd(0);
> }
>
> -/* to find an entry in a page-table-directory */
> -#define pgd_index(address) ((address) >> PGDIR_SHIFT)
> -#define pgd_offset(mm, address) ((mm)->pgd + pgd_index(address))
> -
> /*
> * PTE updates. This function is called whenever an existing
> * valid PTE is updated. This does -not- include set_pte_at()
> @@ -230,6 +226,8 @@ static inline void pmd_clear(pmd_t *pmdp)
> * For other page sizes, we have a single entry in the table.
> */
> #ifdef CONFIG_PPC_8xx
> +static pmd_t *pmd_off(struct mm_struct *mm, unsigned long addr);
> +
> static inline pte_basic_t pte_update(struct mm_struct *mm, unsigned long addr, pte_t *p,
> unsigned long clr, unsigned long set, int huge)
> {
> @@ -237,7 +235,7 @@ static inline pte_basic_t pte_update(struct mm_struct *mm, unsigned long addr, p
> pte_basic_t old = pte_val(*p);
> pte_basic_t new = (old & ~(pte_basic_t)clr) | set;
> int num, i;
> - pmd_t *pmd = pmd_offset(pud_offset(p4d_offset(pgd_offset(mm, addr), addr), addr), addr);
> + pmd_t *pmd = pmd_off(mm, addr);
>
> if (!huge)
> num = PAGE_SIZE / SZ_4K;
>
^ permalink raw reply
* [PATCH v2 6/8] PCI/AER: Convert PCIBIOS_* errors to generic -E* errors
From: refactormyself @ 2020-06-15 7:32 UTC (permalink / raw)
To: helgaas
Cc: Sam Bobroff, Bolarinwa Olayemi Saheed, linux-pci, linux-kernel,
Oliver O'Halloran, skhan, bjorn, linuxppc-dev,
linux-kernel-mentees
In-Reply-To: <20200615073225.24061-1-refactormyself@gmail.com>
From: Bolarinwa Olayemi Saheed <refactormyself@gmail.com>
pci_enable_pcie_error_reporting() return PCIBIOS_ error codes which were
passed on down the call heirarchy from PCIe capability accessors.
PCIBIOS_ error codes have positive values. Passing on these values is
inconsistent with functions which return only a negative value on failure.
Before passing on the return value of PCIe capability accessors, call
pcibios_err_to_errno() to convert any positive PCIBIOS_ error codes to
negative generic error values.
Suggested-by: Bjorn Helgaas <bjorn@helgaas.com>
Signed-off-by: Bolarinwa Olayemi Saheed <refactormyself@gmail.com>
---
drivers/pci/pcie/aer.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c
index f4274d301235..95d480a52078 100644
--- a/drivers/pci/pcie/aer.c
+++ b/drivers/pci/pcie/aer.c
@@ -349,13 +349,17 @@ bool aer_acpi_firmware_first(void)
int pci_enable_pcie_error_reporting(struct pci_dev *dev)
{
+ int rc;
+
if (pcie_aer_get_firmware_first(dev))
return -EIO;
if (!dev->aer_cap)
return -EIO;
- return pcie_capability_set_word(dev, PCI_EXP_DEVCTL, PCI_EXP_AER_FLAGS);
+ rc = pcie_capability_set_word(dev, PCI_EXP_DEVCTL, PCI_EXP_AER_FLAGS);
+
+ return pcibios_err_to_errno(rc);
}
EXPORT_SYMBOL_GPL(pci_enable_pcie_error_reporting);
--
2.18.2
^ permalink raw reply related
* [PATCH v2 7/8] PCI/AER: Convert PCIBIOS_* errors to generic -E* errors
From: refactormyself @ 2020-06-15 7:32 UTC (permalink / raw)
To: helgaas
Cc: Sam Bobroff, Bolarinwa Olayemi Saheed, linux-pci, linux-kernel,
Oliver O'Halloran, skhan, bjorn, linuxppc-dev,
linux-kernel-mentees
In-Reply-To: <20200615073225.24061-1-refactormyself@gmail.com>
From: Bolarinwa Olayemi Saheed <refactormyself@gmail.com>
pci_disable_pcie_error_reporting() returns PCIBIOS_ error code which were
passed down the call heirarchy from PCIe capability accessors.
PCIBIOS_ error codes have positive values. Passing on these values is
inconsistent with functions which return only a negative value on failure.
Before passing on the return value of PCIe capability accessors, call
pcibios_err_to_errno() to convert any positive PCIBIOS_ error codes to
negative error values.
Suggested-by: Bjorn Helgaas <bjorn@helgaas.com>
Signed-off-by: Bolarinwa Olayemi Saheed <refactormyself@gmail.com>
---
drivers/pci/pcie/aer.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c
index 95d480a52078..53e2ecb64c72 100644
--- a/drivers/pci/pcie/aer.c
+++ b/drivers/pci/pcie/aer.c
@@ -365,11 +365,15 @@ EXPORT_SYMBOL_GPL(pci_enable_pcie_error_reporting);
int pci_disable_pcie_error_reporting(struct pci_dev *dev)
{
+ int rc;
+
if (pcie_aer_get_firmware_first(dev))
return -EIO;
- return pcie_capability_clear_word(dev, PCI_EXP_DEVCTL,
+ rc = pcie_capability_clear_word(dev, PCI_EXP_DEVCTL,
PCI_EXP_AER_FLAGS);
+
+ return pcibios_err_to_errno(rc);
}
EXPORT_SYMBOL_GPL(pci_disable_pcie_error_reporting);
--
2.18.2
^ permalink raw reply related
* [PATCH 0/8 v2] PCI: Align return values of PCIe capability and PCI accessors
From: refactormyself @ 2020-06-15 7:32 UTC (permalink / raw)
To: helgaas
Cc: Don Brace, linux-pci, Oliver O'Halloran, linux-scsi,
linux-rdma, esc.storagedev, Jason Gunthorpe, Doug Ledford,
linux-kernel-mentees, James E.J. Bottomley, skhan, bjorn,
Mike Marciniszyn, Martin K. Petersen, Sam Bobroff,
Bolarinwa Olayemi Saheed, Dennis Dalessandro, linux-kernel,
Vinod Koul, dmaengine, linuxppc-dev
From: Bolarinwa Olayemi Saheed <refactormyself@gmail.com>
PATCH 1/8 to 7/8:
PCIBIOS_ error codes have positive values and they are passed down the
call heirarchy from accessors. For functions which are meant to return
only a negative value on failure, passing on this value is a bug.
To mitigate this, call pcibios_err_to_errno() before passing on return
value from PCIe capability accessors call heirarchy. This function
converts any positive PCIBIOS_ error codes to negative generic error
values.
PATCH 8/8:
The PCIe capability accessors can return 0, -EINVAL, or any PCIBIOS_ error
code. The pci accessor on the other hand can only return 0 or any PCIBIOS_
error code.This inconsistency among these accessor makes it harder for
callers to check for errors.
Return PCIBIOS_BAD_REGISTER_NUMBER instead of -EINVAL in all PCIe
capability accessors.
MERGING:
These may all be merged via the PCI tree, since it is a collection of
similar fixes. This way they all get merged at once.
Version 2:
* cc to maintainers and mailing lists
* Edit the Subject to conform with previous style
* reorder "Signed by" and "Suggested by"
* made spelling corrections
* fixed redundant initialisation in PATCH 3/8
* include missing call to pcibios_err_to_errno() in PATCH 6/8 and 7/8
Bolarinwa Olayemi Saheed (8):
dmaengine: ioatdma: Convert PCIBIOS_* errors to generic -E* errors
IB/hfi1: Convert PCIBIOS_* errors to generic -E* errors
IB/hfi1: Convert PCIBIOS_* errors to generic -E* errors
PCI: Convert PCIBIOS_* errors to generic -E* errors
scsi: smartpqi: Convert PCIBIOS_* errors to generic -E* errors
PCI/AER: Convert PCIBIOS_* errors to generic -E* errors
PCI/AER: Convert PCIBIOS_* errors to generic -E* errors
PCI: Align return values of PCIe capability and PCI accessorss
drivers/dma/ioat/init.c | 4 ++--
drivers/infiniband/hw/hfi1/pcie.c | 18 +++++++++++++-----
drivers/pci/access.c | 8 ++++----
drivers/pci/pci.c | 10 ++++++++--
drivers/pci/pcie/aer.c | 12 ++++++++++--
drivers/scsi/smartpqi/smartpqi_init.c | 6 +++++-
6 files changed, 42 insertions(+), 16 deletions(-)
--
2.18.2
^ permalink raw reply
* [Bug 208181] New: BUG: KASAN: stack-out-of-bounds in strcmp+0x58/0xd8
From: bugzilla-daemon @ 2020-06-15 11:17 UTC (permalink / raw)
To: linuxppc-dev
https://bugzilla.kernel.org/show_bug.cgi?id=208181
Bug ID: 208181
Summary: BUG: KASAN: stack-out-of-bounds in strcmp+0x58/0xd8
Product: Platform Specific/Hardware
Version: 2.5
Kernel Version: 5.8-rc1
Hardware: PPC-32
OS: Linux
Tree: Mainline
Status: NEW
Severity: normal
Priority: P1
Component: PPC-32
Assignee: platform_ppc-32@kernel-bugs.osdl.org
Reporter: erhard_f@mailbox.org
Regression: No
Created attachment 289659
--> https://bugzilla.kernel.org/attachment.cgi?id=289659&action=edit
dmesg (5.8-rc1, INLINE KASAN, PowerMac G4 DP)
The G4 DP boots up and is useable, though I get this at early boot:
[...]
Jun 15 11:41:11 T600 kernel: setbat: no BAT available for mapping 0x2a000000
Jun 15 11:41:11 T600 kernel: setbat: no BAT available for mapping 0x2c000000
Jun 15 11:41:11 T600 kernel: KASAN init done
Jun 15 11:41:11 T600 kernel:
==================================================================
Jun 15 11:41:11 T600 kernel: BUG: KASAN: stack-out-of-bounds in
strcmp+0x58/0xd8
Jun 15 11:41:11 T600 kernel: Read of size 1 at addr c11c1a80 by task swapper/0
Jun 15 11:41:11 T600 kernel:
Jun 15 11:41:11 T600 kernel: CPU: 0 PID: 0 Comm: swapper Not tainted
5.8.0-rc1-PowerMacG4 #2
Jun 15 11:41:11 T600 kernel: Call Trace:
Jun 15 11:41:11 T600 kernel: [c1ae97d0] [c0a2069c] dump_stack+0xfc/0x158
(unreliable)
Jun 15 11:41:11 T600 kernel: [c1ae9800] [c04ac5cc]
print_address_description.isra.0+0x30/0x3fc
Jun 15 11:41:11 T600 kernel: [c1ae9870] [c04acb28] kasan_report+0x110/0x170
Jun 15 11:41:11 T600 kernel: [c1ae98b0] [c0a44c00] strcmp+0x58/0xd8
Jun 15 11:41:11 T600 kernel: [c1ae98d0] [c0170790]
register_lock_class+0xfa4/0x10a0
Jun 15 11:41:11 T600 kernel: [c1ae9990] [c0170a34] __lock_acquire+0x1a8/0x382c
Jun 15 11:41:11 T600 kernel: [c1ae9b40] [c016f398] lock_acquire+0x5e0/0x854
Jun 15 11:41:11 T600 kernel: [c1ae9c00] [c1144014]
_raw_spin_lock_irqsave+0x48/0x70
Jun 15 11:41:11 T600 kernel: [c1ae9c20] [c0ccbe84] of_find_property+0x2c/0x5c
Jun 15 11:41:11 T600 kernel: [c1ae9c50] [c0ccbec8] of_get_property+0x14/0x6c
Jun 15 11:41:11 T600 kernel: [c1ae9c70] [c0cdbcd8]
unflatten_dt_nodes+0xc4c/0xcdc
Jun 15 11:41:11 T600 kernel: [c1ae9ec0] [c0cdbe90]
__unflatten_device_tree+0x114/0x1e0
Jun 15 11:41:11 T600 kernel: [c1ae9ef0] [c184a294]
unflatten_device_tree+0x38/0x54
Jun 15 11:41:11 T600 kernel: [c1ae9f10] [c1808600] setup_arch+0xc8/0x630
Jun 15 11:41:11 T600 kernel: [c1ae9f50] [c1803268] start_kernel+0xcc/0x4cc
Jun 15 11:41:11 T600 kernel: [c1ae9ff0] [000038a0] 0x38a0
Jun 15 11:41:11 T600 kernel:
Jun 15 11:41:11 T600 kernel: The buggy address belongs to the variable:
Jun 15 11:41:11 T600 kernel: __func__.22122+0x80/0x320
Jun 15 11:41:11 T600 kernel:
Jun 15 11:41:11 T600 kernel: Memory state around the buggy address:
Jun 15 11:41:11 T600 kernel: c11c1980: 00 00 00 00 00 00 00 00 00 00 f1 f1 f1
f1 f1 f1
Jun 15 11:41:11 T600 kernel: c11c1a00: 04 f2 04 f2 04 f2 04 f2 04 f2 00 00 00
04 f2 f2
Jun 15 11:41:11 T600 kernel: >c11c1a80: f2 f2 00 00 00 04 f3 f3 f3 f3 00 00 00
00 00 00
Jun 15 11:41:11 T600 kernel: ^
Jun 15 11:41:11 T600 kernel: c11c1b00: 00 00 00 00 00 00 00 00 00 00 f1 f1 f1
f1 00 00
Jun 15 11:41:11 T600 kernel: c11c1b80: 00 00 f3 f3 f3 f3 00 00 00 00 00 00 00
00 00 00
Jun 15 11:41:11 T600 kernel:
==================================================================
Jun 15 11:41:11 T600 kernel: Disabling lock debugging due to kernel taint
[...]
--
You are receiving this mail because:
You are watching the assignee of the bug.
^ permalink raw reply
* [Bug 208181] BUG: KASAN: stack-out-of-bounds in strcmp+0x58/0xd8
From: bugzilla-daemon @ 2020-06-15 11:22 UTC (permalink / raw)
To: linuxppc-dev
In-Reply-To: <bug-208181-206035@https.bugzilla.kernel.org/>
https://bugzilla.kernel.org/show_bug.cgi?id=208181
--- Comment #1 from Erhard F. (erhard_f@mailbox.org) ---
Created attachment 289661
--> https://bugzilla.kernel.org/attachment.cgi?id=289661&action=edit
kernel .config (5.8-rc1, PowerMac G4 DP)
--
You are receiving this mail because:
You are watching the assignee of the bug.
^ permalink raw reply
* [PATCH v12 0/6] powerpc/papr_scm: Add support for reporting nvdimm health
From: Vaibhav Jain @ 2020-06-15 12:26 UTC (permalink / raw)
To: linuxppc-dev, linux-nvdimm, linux-kernel
Cc: Santosh Sivaraj, Steven Rostedt, Oliver O'Halloran,
Aneesh Kumar K . V, Vaibhav Jain, Dan Williams, Ira Weiny
Changes since v11 [1]:
* Minor update to 'papr_pdsm.h' fixing a misleading comment about
'possible' padding being added by GCC which doesn't apply in case
structs are marked as __packed.
* Fix the order of initialization of 'struct nd_papr_pdsm_health' in
papr_pdsm_health().
* Added acks from Ira for various patches.
[1] https://lore.kernel.org/linux-nvdimm/20200607131339.476036-1-vaibhav@linux.ibm.com
---
The PAPR standard[2][4] provides mechanisms to query the health and
performance stats of an NVDIMM via various hcalls as described in
Ref[3]. Until now these stats were never available nor exposed to the
user-space tools like 'ndctl'. This is partly due to PAPR platform not
having support for ACPI and NFIT. Hence 'ndctl' is unable to query and
report the dimm health status and a user had no way to determine the
current health status of a NDVIMM.
To overcome this limitation, this patch-set updates papr_scm kernel
module to query and fetch NVDIMM health stats using hcalls described
in Ref[3]. This health and performance stats are then exposed to
userspace via sysfs and PAPR-NVDIMM-Specific-Methods(PDSM) issued by
libndctl.
These changes coupled with proposed ndtcl changes located at Ref[5]
should provide a way for the user to retrieve NVDIMM health status
using ndtcl.
Below is a sample output using proposed kernel + ndctl for PAPR NVDIMM
in a emulation environment:
# ndctl list -DH
[
{
"dev":"nmem0",
"health":{
"health_state":"fatal",
"shutdown_state":"dirty"
}
}
]
Dimm health report output on a pseries guest lpar with vPMEM or HMS
based NVDIMMs that are in perfectly healthy conditions:
# ndctl list -d nmem0 -H
[
{
"dev":"nmem0",
"health":{
"health_state":"ok",
"shutdown_state":"clean"
}
}
]
PAPR NVDIMM-Specific-Methods(PDSM)
==================================
PDSM requests are issued by vendor specific code in libndctl to
execute certain operations or fetch information from NVDIMMS. PDSMs
requests can be sent to papr_scm module via libndctl(userspace) and
libnvdimm (kernel) using the ND_CMD_CALL ioctl command which can be
handled in the dimm control function papr_scm_ndctl(). Current
patchset proposes a single PDSM to retrieve NVDIMM health, defined in
the newly introduced uapi header named 'papr_pdsm.h'. Support for
more PDSMs will be added in future.
Structure of the patch-set
==========================
The patch-set starts with a doc patch documenting details of hcall
H_SCM_HEALTH. Second patch exports kernel symbol seq_buf_printf()
thats used in subsequent patches to generate sysfs attribute content.
Third patch implements support for fetching NVDIMM health information
from PHYP and partially exposing it to user-space via a NVDIMM sysfs
flag.
Fourth patch updates papr_scm_ndctl() to handle a possible error case
and also improve debug logging.
Fifth patch deals with implementing support for servicing PDSM
commands in papr_scm module.
Finally the last patch implements support for servicing PDSM
'PAPR_PDSM_HEALTH' that returns the NVDIMM health information to
libndctl.
References:
[2] "Power Architecture Platform Reference"
https://en.wikipedia.org/wiki/Power_Architecture_Platform_Reference
[3] commit 58b278f568f0
("powerpc: Provide initial documentation for PAPR hcalls")
[4] "Linux on Power Architecture Platform Reference"
https://members.openpowerfoundation.org/document/dl/469
[5] https://github.com/vaibhav92/ndctl/tree/papr_scm_health_v12
---
Vaibhav Jain (6):
powerpc: Document details on H_SCM_HEALTH hcall
seq_buf: Export seq_buf_printf
powerpc/papr_scm: Fetch nvdimm health information from PHYP
powerpc/papr_scm: Improve error logging and handling papr_scm_ndctl()
ndctl/papr_scm,uapi: Add support for PAPR nvdimm specific methods
powerpc/papr_scm: Implement support for PAPR_PDSM_HEALTH
Documentation/ABI/testing/sysfs-bus-papr-pmem | 27 ++
Documentation/powerpc/papr_hcalls.rst | 46 ++-
arch/powerpc/include/uapi/asm/papr_pdsm.h | 125 ++++++
arch/powerpc/platforms/pseries/papr_scm.c | 373 +++++++++++++++++-
include/uapi/linux/ndctl.h | 1 +
lib/seq_buf.c | 1 +
6 files changed, 562 insertions(+), 11 deletions(-)
create mode 100644 Documentation/ABI/testing/sysfs-bus-papr-pmem
create mode 100644 arch/powerpc/include/uapi/asm/papr_pdsm.h
--
2.26.2
^ permalink raw reply
* [PATCH v12 1/6] powerpc: Document details on H_SCM_HEALTH hcall
From: Vaibhav Jain @ 2020-06-15 12:26 UTC (permalink / raw)
To: linuxppc-dev, linux-nvdimm, linux-kernel
Cc: Santosh Sivaraj, Steven Rostedt, Oliver O'Halloran,
Aneesh Kumar K . V, Vaibhav Jain, Dan Williams, Ira Weiny
In-Reply-To: <20200615122644.31887-1-vaibhav@linux.ibm.com>
Add documentation to 'papr_hcalls.rst' describing the bitmap flags
that are returned from H_SCM_HEALTH hcall as per the PAPR-SCM
specification.
Cc: "Aneesh Kumar K . V" <aneesh.kumar@linux.ibm.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Ira Weiny <ira.weiny@intel.com>
Acked-by: Ira Weiny <ira.weiny@intel.com>
Signed-off-by: Vaibhav Jain <vaibhav@linux.ibm.com>
---
Changelog:
v11..v12:
* None
v10..v11:
* None
v9..v10:
* Added ack from Ira.
Resend:
* None
v8..v9:
* s/SCM/PMEM device. [ Dan Williams, Aneesh ]
v7..v8:
* Added a clarification on bit-ordering of Health Bitmap
Resend:
* None
v6..v7:
* None
v5..v6:
* New patch in the series
---
Documentation/powerpc/papr_hcalls.rst | 46 ++++++++++++++++++++++++---
1 file changed, 42 insertions(+), 4 deletions(-)
diff --git a/Documentation/powerpc/papr_hcalls.rst b/Documentation/powerpc/papr_hcalls.rst
index 3493631a60f8..48fcf1255a33 100644
--- a/Documentation/powerpc/papr_hcalls.rst
+++ b/Documentation/powerpc/papr_hcalls.rst
@@ -220,13 +220,51 @@ from the LPAR memory.
**H_SCM_HEALTH**
| Input: drcIndex
-| Out: *health-bitmap, health-bit-valid-bitmap*
+| Out: *health-bitmap (r4), health-bit-valid-bitmap (r5)*
| Return Value: *H_Success, H_Parameter, H_Hardware*
Given a DRC Index return the info on predictive failure and overall health of
-the NVDIMM. The asserted bits in the health-bitmap indicate a single predictive
-failure and health-bit-valid-bitmap indicate which bits in health-bitmap are
-valid.
+the PMEM device. The asserted bits in the health-bitmap indicate one or more states
+(described in table below) of the PMEM device and health-bit-valid-bitmap indicate
+which bits in health-bitmap are valid. The bits are reported in
+reverse bit ordering for example a value of 0xC400000000000000
+indicates bits 0, 1, and 5 are valid.
+
+Health Bitmap Flags:
+
++------+-----------------------------------------------------------------------+
+| Bit | Definition |
++======+=======================================================================+
+| 00 | PMEM device is unable to persist memory contents. |
+| | If the system is powered down, nothing will be saved. |
++------+-----------------------------------------------------------------------+
+| 01 | PMEM device failed to persist memory contents. Either contents were |
+| | not saved successfully on power down or were not restored properly on |
+| | power up. |
++------+-----------------------------------------------------------------------+
+| 02 | PMEM device contents are persisted from previous IPL. The data from |
+| | the last boot were successfully restored. |
++------+-----------------------------------------------------------------------+
+| 03 | PMEM device contents are not persisted from previous IPL. There was no|
+| | data to restore from the last boot. |
++------+-----------------------------------------------------------------------+
+| 04 | PMEM device memory life remaining is critically low |
++------+-----------------------------------------------------------------------+
+| 05 | PMEM device will be garded off next IPL due to failure |
++------+-----------------------------------------------------------------------+
+| 06 | PMEM device contents cannot persist due to current platform health |
+| | status. A hardware failure may prevent data from being saved or |
+| | restored. |
++------+-----------------------------------------------------------------------+
+| 07 | PMEM device is unable to persist memory contents in certain conditions|
++------+-----------------------------------------------------------------------+
+| 08 | PMEM device is encrypted |
++------+-----------------------------------------------------------------------+
+| 09 | PMEM device has successfully completed a requested erase or secure |
+| | erase procedure. |
++------+-----------------------------------------------------------------------+
+|10:63 | Reserved / Unused |
++------+-----------------------------------------------------------------------+
**H_SCM_PERFORMANCE_STATS**
--
2.26.2
^ 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