* [PATCH 2/5] KVM: mips: Use kvm_get_vcpu() instead of open-coded access
From: Marc Zyngier @ 2021-11-05 19:20 UTC (permalink / raw)
To: kvm, linux-mips, kvmarm, linuxppc-dev
Cc: Juergen Gross, Huacai Chen, Janosch Frank, Christian Borntraeger,
Sean Christopherson, Anup Patel, David Hildenbrand,
Nicholas Piggin, Atish Patra, Aleksandar Markovic, Paul Mackerras,
James Morse, Paolo Bonzini, kernel-team, Claudio Imbrenda,
Alexandru Elisei, Suzuki K Poulose
In-Reply-To: <20211105192101.3862492-1-maz@kernel.org>
As we are about to change the way vcpus are allocated, mandate
the use of kvm_get_vcpu() instead of open-coding the access.
Signed-off-by: Marc Zyngier <maz@kernel.org>
---
arch/mips/kvm/loongson_ipi.c | 4 ++--
arch/mips/kvm/mips.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/mips/kvm/loongson_ipi.c b/arch/mips/kvm/loongson_ipi.c
index 3681fc8fba38..5d53f32d837c 100644
--- a/arch/mips/kvm/loongson_ipi.c
+++ b/arch/mips/kvm/loongson_ipi.c
@@ -120,7 +120,7 @@ static int loongson_vipi_write(struct loongson_kvm_ipi *ipi,
s->status |= data;
irq.cpu = id;
irq.irq = 6;
- kvm_vcpu_ioctl_interrupt(kvm->vcpus[id], &irq);
+ kvm_vcpu_ioctl_interrupt(kvm_get_vcpu(kvm, id), &irq);
break;
case CORE0_CLEAR_OFF:
@@ -128,7 +128,7 @@ static int loongson_vipi_write(struct loongson_kvm_ipi *ipi,
if (!s->status) {
irq.cpu = id;
irq.irq = -6;
- kvm_vcpu_ioctl_interrupt(kvm->vcpus[id], &irq);
+ kvm_vcpu_ioctl_interrupt(kvm_get_vcpu(kvm, id), &irq);
}
break;
diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c
index ceacca74f808..6228bf396d63 100644
--- a/arch/mips/kvm/mips.c
+++ b/arch/mips/kvm/mips.c
@@ -479,7 +479,7 @@ int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu,
if (irq->cpu == -1)
dvcpu = vcpu;
else
- dvcpu = vcpu->kvm->vcpus[irq->cpu];
+ dvcpu = kvm_get_vcpu(vcpu->kvm, irq->cpu);
if (intr == 2 || intr == 3 || intr == 4 || intr == 6) {
kvm_mips_callbacks->queue_io_int(dvcpu, irq);
--
2.30.2
^ permalink raw reply related
* Re: [PATCH] drm/virtio: Fix NULL dereference error in virtio_gpu_poll
From: Christian Zigotzky @ 2021-11-05 18:05 UTC (permalink / raw)
To: Vivek Kasireddy, dri-devel
Cc: Darren Stevens, mad skateman, kvm-ppc@vger.kernel.org,
Gurchetan Singh, Gerd Hoffmann, R.T.Dickinson, linuxppc-dev,
Christian Zigotzky
In-Reply-To: <20211104214249.1802789-1-vivek.kasireddy@intel.com>
On 04 November 2021 at 10:42 pm, Vivek Kasireddy wrote:
> When virgl is not enabled, vfpriv pointer would not be allocated.
> Therefore, check for a valid value before dereferencing.
>
> Reported-by: Christian Zigotzky <chzigotzky@xenosoft.de>
> Cc: Gurchetan Singh <gurchetansingh@chromium.org>
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> Signed-off-by: Vivek Kasireddy <vivek.kasireddy@intel.com>
> ---
> drivers/gpu/drm/virtio/virtgpu_drv.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.c
b/drivers/gpu/drm/virtio/virtgpu_drv.c
> index 749db18dcfa2..d86e1ad4a972 100644
> --- a/drivers/gpu/drm/virtio/virtgpu_drv.c
> +++ b/drivers/gpu/drm/virtio/virtgpu_drv.c
> @@ -163,10 +163,11 @@ static __poll_t virtio_gpu_poll(struct file *filp,
> struct drm_file *drm_file = filp->private_data;
> struct virtio_gpu_fpriv *vfpriv = drm_file->driver_priv;
> struct drm_device *dev = drm_file->minor->dev;
> + struct virtio_gpu_device *vgdev = dev->dev_private;
> struct drm_pending_event *e = NULL;
> __poll_t mask = 0;
>
> - if (!vfpriv->ring_idx_mask)
> + if (!vgdev->has_virgl_3d || !vfpriv || !vfpriv->ring_idx_mask)
> return drm_poll(filp, wait);
>
> poll_wait(filp, &drm_file->event_wait, wait);
Tested-by: Christian Zigotzky <chzigotzky@xenosoft.de> [1]
[1] https://i.ibb.co/N1vL5Kd/Kernel-5-16-alpha3-Power-PC.png
^ permalink raw reply
* Re: Fwd: Fwd: X stopped working with 5.14 on iBook
From: Segher Boessenkool @ 2021-11-05 17:58 UTC (permalink / raw)
To: Finn Thain
Cc: Christopher M. Riedl, Stan Johnson, linuxppc-dev,
Riccardo Mottola
In-Reply-To: <de4b689-236e-505e-2632-6ce89110a1e9@linux-m68k.org>
On Fri, Nov 05, 2021 at 10:36:18AM +1100, Finn Thain wrote:
> There is no __get_user_asm2_goto in this tree, and __get_user_asm2 already
> has the "=&r" constraint:
>
> #define __get_user_asm2(x, addr, err) \
> __asm__ __volatile__( \
> "1: lwz%X2 %1, %2\n" \
> "2: lwz%X2 %L1, %L2\n" \
> "3:\n" \
> ".section .fixup,\"ax\"\n" \
> "4: li %0,%3\n" \
> " li %1,0\n" \
> " li %1+1,0\n" \
> " b 3b\n" \
> ".previous\n" \
> EX_TABLE(1b, 4b) \
> EX_TABLE(2b, 4b) \
> : "=r" (err), "=&r" (x) \
> : "m" (*addr), "i" (-EFAULT), "0" (err))
operand 0 needs an earlyclobber as well, in principle. But there is
nothing left it can be tied to, so this won't change generated code.
What is operand 4 about? It isn't used?
The "%1+1" can be written %L1 btw (it means exactly the same thing, but
work on more configs).
Segher
^ permalink raw reply
* Re: Fwd: Fwd: X stopped working with 5.14 on iBook
From: Christophe Leroy @ 2021-11-05 17:27 UTC (permalink / raw)
To: Finn Thain
Cc: Christopher M. Riedl, Stan Johnson, linuxppc-dev,
Riccardo Mottola
In-Reply-To: <de4b689-236e-505e-2632-6ce89110a1e9@linux-m68k.org>
Le 05/11/2021 à 00:36, Finn Thain a écrit :
> On Thu, 4 Nov 2021, Christophe Leroy wrote:
>
>> Le 02/11/2021 à 03:20, Finn Thain a écrit :
>>> Hi Christopher,
>>>
>>> After many builds and tests, Stan and I were able to determine that this
>>> regression only affects builds with CONFIG_USER_NS=y. That is,
>>>
>>> d3ccc9781560 + CONFIG_USER_NS=y --> fail
>>> d3ccc9781560 + CONFIG_USER_NS=n --> okay
>>> d3ccc9781560~ + CONFIG_USER_NS=y --> okay
>>> d3ccc9781560~ + CONFIG_USER_NS=n --> okay
>>>
>>> Stan also tested a PowerMac G3 system and found that the regression is not
>>> present there. Thus far, only PowerMac G4 systems are known to be affected
>>> (Stan's Cube and Riccardo's PowerBook).
>>>
>>> I asked Stan to try v5.15-rc after reverting commit d3ccc9781560.
>>> Unexpectedly, this build had the same issue. So, it appears there are
>>> multiple bad commits that produce this Xorg failure, of which d3ccc9781560
>>> is just the first.
>>>
>>> But there's no easy way to identify the other bad commits using bisection.
>>> So I've addressed this message to you. Can you help fix this regression?
>>>
>>
>> I'm wondering if this commit is really the cause of the problem.
>>
>> Are you using GCC 11 ?
>>
>> If yes, I think it could be a false positive, fixed by
>> https://github.com/linuxppc/linux/commit/7315e457d6bc
>>
>> Can you try with GCC 10 or older ?
>>
>
> AFAIK, all of Stan's builds were made with gcc 10.
>
>> Can you cherry pick 7315e457d6bc ("powerpc/uaccess: Fix __get_user() with
>> CONFIG_CC_HAS_ASM_GOTO_OUTPUT") on top of d3ccc9781560 and see what happens ?
>>
>
> $ git checkout d3ccc9781560
> $ git cherry-pick 7315e457d6bc
> Auto-merging arch/powerpc/include/asm/uaccess.h
> CONFLICT (content): Merge conflict in arch/powerpc/include/asm/uaccess.h
> error: could not apply 7315e457d6bc... powerpc/uaccess: Fix __get_user() with CONFIG_CC_HAS_ASM_GOTO_OUTPUT
>
> There is no __get_user_asm2_goto in this tree, and __get_user_asm2 already
> has the "=&r" constraint:
>
> #define __get_user_asm2(x, addr, err) \
> __asm__ __volatile__( \
> "1: lwz%X2 %1, %2\n" \
> "2: lwz%X2 %L1, %L2\n" \
> "3:\n" \
> ".section .fixup,\"ax\"\n" \
> "4: li %0,%3\n" \
> " li %1,0\n" \
> " li %1+1,0\n" \
> " b 3b\n" \
> ".previous\n" \
> EX_TABLE(1b, 4b) \
> EX_TABLE(2b, 4b) \
> : "=r" (err), "=&r" (x) \
> : "m" (*addr), "i" (-EFAULT), "0" (err))
>
You are right, __get_user_asm2_goto() was added later.
I think I found the issue.
__get_user_sigset() is wrong for 32 bits.
Could you change its content to return __get_user(*(u64*)&dst->sig[0],
(u64 __user *)&src->sig[0]);
If it works, for the mainline also change unsafe_get_user_sigset()
Christophe
^ permalink raw reply
* Re: [PATCH v3 2/4] mm: Make generic arch_is_kernel_initmem_freed() do what it says
From: Christophe Leroy @ 2021-11-05 17:23 UTC (permalink / raw)
To: Andrew Morton, Daniel Axtens
Cc: linux-arch, linux-s390, Kefeng Wang, arnd, linux-kernel, linux-mm,
Gerald Schaefer, linuxppc-dev
In-Reply-To: <20211104144442.7130ae4a104fca70623a2d1a@linux-foundation.org>
Le 04/11/2021 à 22:44, Andrew Morton a écrit :
> On Fri, 01 Oct 2021 17:14:41 +1000 Daniel Axtens <dja@axtens.net> wrote:
>
>>> #ifdef __KERNEL__
>>> +/*
>>> + * Check if an address is part of freed initmem. After initmem is freed,
>>> + * memory can be allocated from it, and such allocations would then have
>>> + * addresses within the range [_stext, _end].
>>> + */
>>> +#ifndef arch_is_kernel_initmem_freed
>>> +static int arch_is_kernel_initmem_freed(unsigned long addr)
>>> +{
>>> + if (system_state < SYSTEM_FREEING_INITMEM)
>>> + return 0;
>>> +
>>> + return init_section_contains((void *)addr, 1);
>>
>> Is init_section_contains sufficient here?
>>
>> include/asm-generic/sections.h says:
>> * [__init_begin, __init_end]: contains .init.* sections, but .init.text.*
>> * may be out of this range on some architectures.
>> * [_sinittext, _einittext]: contains .init.text.* sections
>>
>> init_section_contains only checks __init_*:
>> static inline bool init_section_contains(void *virt, size_t size)
>> {
>> return memory_contains(__init_begin, __init_end, virt, size);
>> }
>>
>> Do we need to check against _sinittext and _einittext?
>>
>> Your proposed generic code will work for powerpc and s390 because those
>> archs only test against __init_* anyway. I don't know if any platform
>> actually does place .init.text outside of __init_begin=>__init_end, but
>> the comment seems to suggest that they could.
>>
>
> Christophe?
>
Sorry for answering late.
I've been thorugh free_initmem() in each architecture. The only sections
involved in the freeing actions are [__init_begin, __init_end], so I
think checking against __init_being, __init_end is enough.
If some architecture has init text outside of this section, then it is
not freed hence not necessary to check.
Christophe
^ permalink raw reply
* Re: [PATCH 4/7] arch: Remove leftovers from mandatory file locking
From: Jeff Layton @ 2021-11-05 16:32 UTC (permalink / raw)
To: Alexandre Ghiti, Steve French, Jonathan Corbet, David Howells,
Russell King, Thomas Bogendoerfer, Michael Ellerman,
Benjamin Herrenschmidt, Paul Mackerras, Yoshinori Sato,
Rich Felker, Matti Vaittinen, Lee Jones, Greg Kroah-Hartman,
Arnd Bergmann, Ronnie Sahlberg, Guenter Roeck, Wim Van Sebroeck,
Lukas Bulwahn, Luis Chamberlain, Kalle Valo, linux-cifs,
samba-technical, linux-doc, linux-kernel, linux-cachefs,
linux-arm-kernel, linux-mips, linuxppc-dev, linux-sh, linux-power
In-Reply-To: <20211105154334.1841927-5-alexandre.ghiti@canonical.com>
On Fri, 2021-11-05 at 16:43 +0100, Alexandre Ghiti wrote:
> This config was removed so remove all references to it.
>
> Fixes: f7e33bdbd6d1 ("fs: remove mandatory file locking support")
> Signed-off-by: Alexandre Ghiti <alexandre.ghiti@canonical.com>
> ---
> arch/mips/configs/decstation_64_defconfig | 1 -
> arch/mips/configs/decstation_defconfig | 1 -
> arch/mips/configs/decstation_r4k_defconfig | 1 -
> 3 files changed, 3 deletions(-)
>
> diff --git a/arch/mips/configs/decstation_64_defconfig b/arch/mips/configs/decstation_64_defconfig
> index 85f1955b4b00..e2ed105f8c97 100644
> --- a/arch/mips/configs/decstation_64_defconfig
> +++ b/arch/mips/configs/decstation_64_defconfig
> @@ -144,7 +144,6 @@ CONFIG_EXT2_FS_SECURITY=y
> CONFIG_EXT3_FS=y
> CONFIG_EXT3_FS_POSIX_ACL=y
> CONFIG_EXT3_FS_SECURITY=y
> -# CONFIG_MANDATORY_FILE_LOCKING is not set
> CONFIG_ISO9660_FS=y
> CONFIG_JOLIET=y
> CONFIG_PROC_KCORE=y
> diff --git a/arch/mips/configs/decstation_defconfig b/arch/mips/configs/decstation_defconfig
> index 30a6eafdb1d0..7e987d6f5e34 100644
> --- a/arch/mips/configs/decstation_defconfig
> +++ b/arch/mips/configs/decstation_defconfig
> @@ -140,7 +140,6 @@ CONFIG_EXT2_FS_SECURITY=y
> CONFIG_EXT3_FS=y
> CONFIG_EXT3_FS_POSIX_ACL=y
> CONFIG_EXT3_FS_SECURITY=y
> -# CONFIG_MANDATORY_FILE_LOCKING is not set
> CONFIG_ISO9660_FS=y
> CONFIG_JOLIET=y
> CONFIG_PROC_KCORE=y
> diff --git a/arch/mips/configs/decstation_r4k_defconfig b/arch/mips/configs/decstation_r4k_defconfig
> index e2b58dbf4aa9..6df5f6f2ac8e 100644
> --- a/arch/mips/configs/decstation_r4k_defconfig
> +++ b/arch/mips/configs/decstation_r4k_defconfig
> @@ -140,7 +140,6 @@ CONFIG_EXT2_FS_SECURITY=y
> CONFIG_EXT3_FS=y
> CONFIG_EXT3_FS_POSIX_ACL=y
> CONFIG_EXT3_FS_SECURITY=y
> -# CONFIG_MANDATORY_FILE_LOCKING is not set
> CONFIG_ISO9660_FS=y
> CONFIG_JOLIET=y
> CONFIG_PROC_KCORE=y
Reviewed-by: Jeff Layton <jlayton@kernel.org>
^ permalink raw reply
* Re: [PATCH v2 2/5] powerpc/watchdog: Tighten non-atomic read-modify-write access
From: Laurent Dufour @ 2021-11-05 16:17 UTC (permalink / raw)
To: Nicholas Piggin, linuxppc-dev
In-Reply-To: <20211104161057.1255659-3-npiggin@gmail.com>
Le 04/11/2021 à 17:10, Nicholas Piggin a écrit :
> Most updates to wd_smp_cpus_pending are under lock except the watchdog
> interrupt bit clear.
>
> This can race with non-atomic RMW updates to the mask under lock, which
> can happen in two instances:
>
> Firstly, if another CPU detects this one is stuck, removes it from the
> mask, mask becomes empty and is re-filled with non-atomic stores. This
> is okay because it would re-fill the mask with this CPU's bit clear
> anyway (because this CPU is now stuck), so it doesn't matter that the
> bit clear update got "lost". Add a comment for this.
>
> Secondly, if another CPU detects a different CPU is stuck and removes it
> from the pending mask with a non-atomic store to bytes which also
> include the bit of this CPU. This case can result in the bit clear being
> lost and the end result being the bit is set. This should be so rare it
> hardly matters, but to make things simpler to reason about just avoid
> the non-atomic access for that case.
>
> Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Reviewed-by: Laurent Dufour <ldufour@linux.ibm.com>
> ---
> arch/powerpc/kernel/watchdog.c | 36 ++++++++++++++++++++++++----------
> 1 file changed, 26 insertions(+), 10 deletions(-)
>
> diff --git a/arch/powerpc/kernel/watchdog.c b/arch/powerpc/kernel/watchdog.c
> index be80071336a4..1d2623230297 100644
> --- a/arch/powerpc/kernel/watchdog.c
> +++ b/arch/powerpc/kernel/watchdog.c
> @@ -131,10 +131,10 @@ static void wd_lockup_ipi(struct pt_regs *regs)
> /* Do not panic from here because that can recurse into NMI IPI layer */
> }
>
> -static void set_cpumask_stuck(const struct cpumask *cpumask, u64 tb)
> +static bool set_cpu_stuck(int cpu, u64 tb)
> {
> - cpumask_or(&wd_smp_cpus_stuck, &wd_smp_cpus_stuck, cpumask);
> - cpumask_andnot(&wd_smp_cpus_pending, &wd_smp_cpus_pending, cpumask);
> + cpumask_set_cpu(cpu, &wd_smp_cpus_stuck);
> + cpumask_clear_cpu(cpu, &wd_smp_cpus_pending);
> /*
> * See wd_smp_clear_cpu_pending()
> */
> @@ -144,11 +144,9 @@ static void set_cpumask_stuck(const struct cpumask *cpumask, u64 tb)
> cpumask_andnot(&wd_smp_cpus_pending,
> &wd_cpus_enabled,
> &wd_smp_cpus_stuck);
> + return true;
> }
> -}
> -static void set_cpu_stuck(int cpu, u64 tb)
> -{
> - set_cpumask_stuck(cpumask_of(cpu), tb);
> + return false;
> }
>
> static void watchdog_smp_panic(int cpu, u64 tb)
> @@ -177,15 +175,17 @@ static void watchdog_smp_panic(int cpu, u64 tb)
> * get a backtrace on all of them anyway.
> */
> for_each_cpu(c, &wd_smp_cpus_pending) {
> + bool empty;
> if (c == cpu)
> continue;
> + /* Take the stuck CPUs out of the watch group */
> + empty = set_cpu_stuck(c, tb);
> smp_send_nmi_ipi(c, wd_lockup_ipi, 1000000);
> + if (empty)
> + break;
> }
> }
>
> - /* Take the stuck CPUs out of the watch group */
> - set_cpumask_stuck(&wd_smp_cpus_pending, tb);
> -
> wd_smp_unlock(&flags);
>
> if (sysctl_hardlockup_all_cpu_backtrace)
> @@ -232,6 +232,22 @@ static void wd_smp_clear_cpu_pending(int cpu, u64 tb)
> return;
> }
>
> + /*
> + * All other updates to wd_smp_cpus_pending are performed under
> + * wd_smp_lock. All of them are atomic except the case where the
> + * mask becomes empty and is reset. This will not happen here because
> + * cpu was tested to be in the bitmap (above), and a CPU only clears
> + * its own bit. _Except_ in the case where another CPU has detected a
> + * hard lockup on our CPU and takes us out of the pending mask. So in
> + * normal operation there will be no race here, no problem.
> + *
> + * In the lockup case, this atomic clear-bit vs a store that refills
> + * other bits in the accessed word wll not be a problem. The bit clear
> + * is atomic so it will not cause the store to get lost, and the store
> + * will never set this bit so it will not overwrite the bit clear. The
> + * only way for a stuck CPU to return to the pending bitmap is to
> + * become unstuck itself.
> + */
> cpumask_clear_cpu(cpu, &wd_smp_cpus_pending);
>
> /*
>
^ permalink raw reply
* Re: [GIT PULL] Please pull powerpc/linux.git powerpc-5.16-1 tag
From: pr-tracker-bot @ 2021-11-05 16:08 UTC (permalink / raw)
To: Michael Ellerman
Cc: lvivier, songkai01, aik, kda, linux-kernel, wanjiabing, cuibixuan,
peterz, joel, u.kleine-koenig, agust, atrajeev, nathanl, schnelle,
npiggin, clg, nixiaoming, hbathini, dja, atrajeev, linuxppc-dev,
ndesaulniers, gustavoars, hegdevasant, pbonzini, Linus Torvalds
In-Reply-To: <87v9167o32.fsf@mpe.ellerman.id.au>
The pull request you sent on Sat, 06 Nov 2021 00:02:09 +1100:
> https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git tags/powerpc-5.16-1
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/5c0b0c676ac2d84f69568715af91e45b610fe17a
Thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html
^ permalink raw reply
* Re: [PATCH] powerpc/pseries: Fix numa FORM2 parsing fallback code
From: Aneesh Kumar K.V @ 2021-11-05 16:05 UTC (permalink / raw)
To: Nicholas Piggin, linuxppc-dev; +Cc: Nicholas Piggin
In-Reply-To: <20211105132909.1582449-1-npiggin@gmail.com>
Nicholas Piggin <npiggin@gmail.com> writes:
> In case the FORM2 distance table from firmware is not the expected size,
> there is fallback code that just populates the lookup table as local vs
> remote.
>
> However it then continues on to use the distance table. Fix.
>
Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
> Cc: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
> Fixes: 1c6b5a7e7405 ("powerpc/pseries: Add support for FORM2 associativity")
> Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
> ---
> arch/powerpc/mm/numa.c | 29 +++++++++++++----------------
> 1 file changed, 13 insertions(+), 16 deletions(-)
>
> diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
> index 6f14c8fb6359..0789cde7f658 100644
> --- a/arch/powerpc/mm/numa.c
> +++ b/arch/powerpc/mm/numa.c
> @@ -380,6 +380,7 @@ static void initialize_form2_numa_distance_lookup_table(void)
> const __be32 *numa_lookup_index;
> int numa_dist_table_length;
> int max_numa_index, distance_index;
> + bool good = true;
>
> if (firmware_has_feature(FW_FEATURE_OPAL))
> root = of_find_node_by_path("/ibm,opal");
> @@ -407,30 +408,26 @@ static void initialize_form2_numa_distance_lookup_table(void)
>
> if (numa_dist_table_length != max_numa_index * max_numa_index) {
> WARN(1, "Wrong NUMA distance information\n");
> - /* consider everybody else just remote. */
> - for (i = 0; i < max_numa_index; i++) {
> - for (j = 0; j < max_numa_index; j++) {
> - int nodeA = numa_id_index_table[i];
> - int nodeB = numa_id_index_table[j];
> -
> - if (nodeA == nodeB)
> - numa_distance_table[nodeA][nodeB] = LOCAL_DISTANCE;
> - else
> - numa_distance_table[nodeA][nodeB] = REMOTE_DISTANCE;
> - }
> - }
> + good = false;
> }
> -
> distance_index = 0;
> for (i = 0; i < max_numa_index; i++) {
> for (j = 0; j < max_numa_index; j++) {
> int nodeA = numa_id_index_table[i];
> int nodeB = numa_id_index_table[j];
> -
> - numa_distance_table[nodeA][nodeB] = numa_dist_table[distance_index++];
> - pr_debug("dist[%d][%d]=%d ", nodeA, nodeB, numa_distance_table[nodeA][nodeB]);
> + int dist;
> +
> + if (good)
> + dist = numa_dist_table[distance_index++];
> + else if (nodeA == nodeB)
> + dist = LOCAL_DISTANCE;
> + else
> + dist = REMOTE_DISTANCE;
> + numa_distance_table[nodeA][nodeB] = dist;
> + pr_debug("dist[%d][%d]=%d ", nodeA, nodeB, dist);
> }
> }
> +
> of_node_put(root);
> }
>
> --
> 2.23.0
^ permalink raw reply
* Re: [PATCH 0/7] Cleanup after removal of configs
From: Arnd Bergmann @ 2021-11-05 15:56 UTC (permalink / raw)
To: Alexandre Ghiti
Cc: Rich Felker, open list:DOCUMENTATION,
open list:BROADCOM NVRAM DRIVER, David Howells, Paul Mackerras,
samba-technical, Lee Jones, linux-cifs, Yoshinori Sato,
Jonathan Corbet, Linux-sh list, Russell King, linux-cachefs,
Linux ARM, Lukas Bulwahn, Guenter Roeck, Arnd Bergmann,
Wim Van Sebroeck, Kalle Valo, Thomas Bogendoerfer,
Greg Kroah-Hartman, Matti Vaittinen, Linux Kernel Mailing List,
Ronnie Sahlberg, Steve French, Luis Chamberlain, Jeff Layton,
linuxppc-dev, linux-power
In-Reply-To: <20211105154334.1841927-1-alexandre.ghiti@canonical.com>
On Fri, Nov 5, 2021 at 4:43 PM Alexandre Ghiti
<alexandre.ghiti@canonical.com> wrote:
>
> While bumping from 5.13 to 5.15, I found that a few deleted configs had
> left some pieces here and there: this patchset cleans that.
>
> Alexandre Ghiti (7):
> Documentation, arch: Remove leftovers from fscache/cachefiles
> histograms
> Documentation, arch: Remove leftovers from raw device
> Documentation, arch: Remove leftovers from CIFS_WEAK_PW_HASH
> arch: Remove leftovers from mandatory file locking
> Documentation, arch, fs: Remove leftovers from fscache object list
> include: mfd: Remove leftovers from bd70528 watchdog
> arch: Remove leftovers from prism54 wireless driver
Looks all good to me, thanks a lot for the cleanup!
For arch/arm/configs:
Acked-by: Arnd Bergmann <arnd@arndb.de>
assuming this goes through someone else's tree. Let me know if you need me
to pick up the patches in the asm-generic tree for cross-architecture work.
Arnd
^ permalink raw reply
* [PATCH 7/7] arch: Remove leftovers from prism54 wireless driver
From: Alexandre Ghiti @ 2021-11-05 15:43 UTC (permalink / raw)
To: Steve French, Jonathan Corbet, David Howells, Russell King,
Thomas Bogendoerfer, Michael Ellerman, Benjamin Herrenschmidt,
Paul Mackerras, Yoshinori Sato, Rich Felker, Matti Vaittinen,
Lee Jones, Jeff Layton, Greg Kroah-Hartman, Arnd Bergmann,
Ronnie Sahlberg, Guenter Roeck, Wim Van Sebroeck, Lukas Bulwahn,
Luis Chamberlain, Kalle Valo, linux-cifs, samba-technical,
linux-doc, linux-kernel, linux-cachefs, linux-arm-kernel,
linux-mips, linuxppc-dev, linux-sh, linux-power
Cc: Alexandre Ghiti
In-Reply-To: <20211105154334.1841927-1-alexandre.ghiti@canonical.com>
This driver was removed so remove all references to it.
Fixes: d249ff28b1d8 ("intersil: remove obsolete prism54 wireless driver")
Signed-off-by: Alexandre Ghiti <alexandre.ghiti@canonical.com>
---
arch/mips/configs/ip27_defconfig | 1 -
arch/mips/configs/malta_defconfig | 1 -
arch/mips/configs/malta_kvm_defconfig | 1 -
arch/mips/configs/maltaup_xpa_defconfig | 1 -
arch/powerpc/configs/pmac32_defconfig | 1 -
5 files changed, 5 deletions(-)
diff --git a/arch/mips/configs/ip27_defconfig b/arch/mips/configs/ip27_defconfig
index 638d7cf5ef01..821630ac1be7 100644
--- a/arch/mips/configs/ip27_defconfig
+++ b/arch/mips/configs/ip27_defconfig
@@ -223,7 +223,6 @@ CONFIG_TMD_HERMES=m
CONFIG_NORTEL_HERMES=m
CONFIG_P54_COMMON=m
CONFIG_P54_PCI=m
-CONFIG_PRISM54=m
CONFIG_LIBERTAS=m
CONFIG_LIBERTAS_THINFIRM=m
CONFIG_MWL8K=m
diff --git a/arch/mips/configs/malta_defconfig b/arch/mips/configs/malta_defconfig
index 9cb2cf2595e0..3321bb576944 100644
--- a/arch/mips/configs/malta_defconfig
+++ b/arch/mips/configs/malta_defconfig
@@ -302,7 +302,6 @@ CONFIG_HOSTAP_FIRMWARE=y
CONFIG_HOSTAP_FIRMWARE_NVRAM=y
CONFIG_HOSTAP_PLX=m
CONFIG_HOSTAP_PCI=m
-CONFIG_PRISM54=m
CONFIG_LIBERTAS=m
CONFIG_INPUT_MOUSEDEV=y
CONFIG_MOUSE_PS2_ELANTECH=y
diff --git a/arch/mips/configs/malta_kvm_defconfig b/arch/mips/configs/malta_kvm_defconfig
index 5924e48fd3ec..009b30372226 100644
--- a/arch/mips/configs/malta_kvm_defconfig
+++ b/arch/mips/configs/malta_kvm_defconfig
@@ -310,7 +310,6 @@ CONFIG_HOSTAP_FIRMWARE=y
CONFIG_HOSTAP_FIRMWARE_NVRAM=y
CONFIG_HOSTAP_PLX=m
CONFIG_HOSTAP_PCI=m
-CONFIG_PRISM54=m
CONFIG_LIBERTAS=m
CONFIG_INPUT_MOUSEDEV=y
CONFIG_SERIAL_8250=y
diff --git a/arch/mips/configs/maltaup_xpa_defconfig b/arch/mips/configs/maltaup_xpa_defconfig
index c0d3156ef640..e214e136101c 100644
--- a/arch/mips/configs/maltaup_xpa_defconfig
+++ b/arch/mips/configs/maltaup_xpa_defconfig
@@ -309,7 +309,6 @@ CONFIG_HOSTAP_FIRMWARE=y
CONFIG_HOSTAP_FIRMWARE_NVRAM=y
CONFIG_HOSTAP_PLX=m
CONFIG_HOSTAP_PCI=m
-CONFIG_PRISM54=m
CONFIG_LIBERTAS=m
CONFIG_INPUT_MOUSEDEV=y
CONFIG_MOUSE_PS2_ELANTECH=y
diff --git a/arch/powerpc/configs/pmac32_defconfig b/arch/powerpc/configs/pmac32_defconfig
index 7aefac5afab0..13885ec563d1 100644
--- a/arch/powerpc/configs/pmac32_defconfig
+++ b/arch/powerpc/configs/pmac32_defconfig
@@ -169,7 +169,6 @@ CONFIG_USB_USBNET=m
CONFIG_B43=m
CONFIG_B43LEGACY=m
CONFIG_P54_COMMON=m
-CONFIG_PRISM54=m
CONFIG_INPUT_EVDEV=y
# CONFIG_KEYBOARD_ATKBD is not set
# CONFIG_MOUSE_PS2 is not set
--
2.32.0
^ permalink raw reply related
* [PATCH 6/7] include: mfd: Remove leftovers from bd70528 watchdog
From: Alexandre Ghiti @ 2021-11-05 15:43 UTC (permalink / raw)
To: Steve French, Jonathan Corbet, David Howells, Russell King,
Thomas Bogendoerfer, Michael Ellerman, Benjamin Herrenschmidt,
Paul Mackerras, Yoshinori Sato, Rich Felker, Matti Vaittinen,
Lee Jones, Jeff Layton, Greg Kroah-Hartman, Arnd Bergmann,
Ronnie Sahlberg, Guenter Roeck, Wim Van Sebroeck, Lukas Bulwahn,
Luis Chamberlain, Kalle Valo, linux-cifs, samba-technical,
linux-doc, linux-kernel, linux-cachefs, linux-arm-kernel,
linux-mips, linuxppc-dev, linux-sh, linux-power
Cc: Alexandre Ghiti
In-Reply-To: <20211105154334.1841927-1-alexandre.ghiti@canonical.com>
This driver was removed so remove all references to it.
Fixes: 52a5502507bc ("watchdog: bd70528 drop bd70528 support")
Signed-off-by: Alexandre Ghiti <alexandre.ghiti@canonical.com>
---
include/linux/mfd/rohm-bd70528.h | 24 ------------------------
1 file changed, 24 deletions(-)
diff --git a/include/linux/mfd/rohm-bd70528.h b/include/linux/mfd/rohm-bd70528.h
index 4a5966475a35..297a4a84fff5 100644
--- a/include/linux/mfd/rohm-bd70528.h
+++ b/include/linux/mfd/rohm-bd70528.h
@@ -362,28 +362,4 @@ enum {
#define BD70528_MASK_BUCK_RAMP 0x10
#define BD70528_SIFT_BUCK_RAMP 4
-#if IS_ENABLED(CONFIG_BD70528_WATCHDOG)
-
-int bd70528_wdt_set(struct rohm_regmap_dev *data, int enable, int *old_state);
-void bd70528_wdt_lock(struct rohm_regmap_dev *data);
-void bd70528_wdt_unlock(struct rohm_regmap_dev *data);
-
-#else /* CONFIG_BD70528_WATCHDOG */
-
-static inline int bd70528_wdt_set(struct rohm_regmap_dev *data, int enable,
- int *old_state)
-{
- return 0;
-}
-
-static inline void bd70528_wdt_lock(struct rohm_regmap_dev *data)
-{
-}
-
-static inline void bd70528_wdt_unlock(struct rohm_regmap_dev *data)
-{
-}
-
-#endif /* CONFIG_BD70528_WATCHDOG */
-
#endif /* __LINUX_MFD_BD70528_H__ */
--
2.32.0
^ permalink raw reply related
* [PATCH 5/7] Documentation, arch, fs: Remove leftovers from fscache object list
From: Alexandre Ghiti @ 2021-11-05 15:43 UTC (permalink / raw)
To: Steve French, Jonathan Corbet, David Howells, Russell King,
Thomas Bogendoerfer, Michael Ellerman, Benjamin Herrenschmidt,
Paul Mackerras, Yoshinori Sato, Rich Felker, Matti Vaittinen,
Lee Jones, Jeff Layton, Greg Kroah-Hartman, Arnd Bergmann,
Ronnie Sahlberg, Guenter Roeck, Wim Van Sebroeck, Lukas Bulwahn,
Luis Chamberlain, Kalle Valo, linux-cifs, samba-technical,
linux-doc, linux-kernel, linux-cachefs, linux-arm-kernel,
linux-mips, linuxppc-dev, linux-sh, linux-power
Cc: Alexandre Ghiti
In-Reply-To: <20211105154334.1841927-1-alexandre.ghiti@canonical.com>
A few references to the fscache object list were left in the
Documentation, some arch defconfigs and in fs: remove them since this
config does not exists anymore.
Fixes: 58f386a73f16 ("fscache: Remove the object list procfile")
Signed-off-by: Alexandre Ghiti <alexandre.ghiti@canonical.com>
---
Documentation/filesystems/caching/fscache.rst | 89 -------------------
arch/arm/configs/axm55xx_defconfig | 1 -
fs/fscache/object.c | 3 -
fs/fscache/proc.c | 12 ---
4 files changed, 105 deletions(-)
diff --git a/Documentation/filesystems/caching/fscache.rst b/Documentation/filesystems/caching/fscache.rst
index 66e31a6d1070..7cedab444947 100644
--- a/Documentation/filesystems/caching/fscache.rst
+++ b/Documentation/filesystems/caching/fscache.rst
@@ -411,95 +411,6 @@ proc file.
+--------------+-------+-------------------------------------------------------+
-
-Object List
-===========
-
-If CONFIG_FSCACHE_OBJECT_LIST is enabled, the FS-Cache facility will maintain a
-list of all the objects currently allocated and allow them to be viewed
-through::
-
- /proc/fs/fscache/objects
-
-This will look something like::
-
- [root@andromeda ~]# head /proc/fs/fscache/objects
- OBJECT PARENT STAT CHLDN OPS OOP IPR EX READS EM EV F S | NETFS_COOKIE_DEF TY FL NETFS_DATA OBJECT_KEY, AUX_DATA
- ======== ======== ==== ===== === === === == ===== == == = = | ================ == == ================ ================
- 17e4b 2 ACTV 0 0 0 0 0 0 7b 4 0 0 | NFS.fh DT 0 ffff88001dd82820 010006017edcf8bbc93b43298fdfbe71e50b57b13a172c0117f38472, e567634700000000000000000000000063f2404a000000000000000000000000c9030000000000000000000063f2404a
- 1693a 2 ACTV 0 0 0 0 0 0 7b 4 0 0 | NFS.fh DT 0 ffff88002db23380 010006017edcf8bbc93b43298fdfbe71e50b57b1e0162c01a2df0ea6, 420ebc4a000000000000000000000000420ebc4a0000000000000000000000000e1801000000000000000000420ebc4a
-
-where the first set of columns before the '|' describe the object:
-
- ======= ===============================================================
- COLUMN DESCRIPTION
- ======= ===============================================================
- OBJECT Object debugging ID (appears as OBJ%x in some debug messages)
- PARENT Debugging ID of parent object
- STAT Object state
- CHLDN Number of child objects of this object
- OPS Number of outstanding operations on this object
- OOP Number of outstanding child object management operations
- IPR
- EX Number of outstanding exclusive operations
- READS Number of outstanding read operations
- EM Object's event mask
- EV Events raised on this object
- F Object flags
- S Object work item busy state mask (1:pending 2:running)
- ======= ===============================================================
-
-and the second set of columns describe the object's cookie, if present:
-
- ================ ======================================================
- COLUMN DESCRIPTION
- ================ ======================================================
- NETFS_COOKIE_DEF Name of netfs cookie definition
- TY Cookie type (IX - index, DT - data, hex - special)
- FL Cookie flags
- NETFS_DATA Netfs private data stored in the cookie
- OBJECT_KEY Object key } 1 column, with separating comma
- AUX_DATA Object aux data } presence may be configured
- ================ ======================================================
-
-The data shown may be filtered by attaching the a key to an appropriate keyring
-before viewing the file. Something like::
-
- keyctl add user fscache:objlist <restrictions> @s
-
-where <restrictions> are a selection of the following letters:
-
- == =========================================================
- K Show hexdump of object key (don't show if not given)
- A Show hexdump of object aux data (don't show if not given)
- == =========================================================
-
-and the following paired letters:
-
- == =========================================================
- C Show objects that have a cookie
- c Show objects that don't have a cookie
- B Show objects that are busy
- b Show objects that aren't busy
- W Show objects that have pending writes
- w Show objects that don't have pending writes
- R Show objects that have outstanding reads
- r Show objects that don't have outstanding reads
- S Show objects that have work queued
- s Show objects that don't have work queued
- == =========================================================
-
-If neither side of a letter pair is given, then both are implied. For example:
-
- keyctl add user fscache:objlist KB @s
-
-shows objects that are busy, and lists their object keys, but does not dump
-their auxiliary data. It also implies "CcWwRrSs", but as 'B' is given, 'b' is
-not implied.
-
-By default all objects and all fields will be shown.
-
-
Debugging
=========
diff --git a/arch/arm/configs/axm55xx_defconfig b/arch/arm/configs/axm55xx_defconfig
index b36e0b347d1f..c0ea326d4c5e 100644
--- a/arch/arm/configs/axm55xx_defconfig
+++ b/arch/arm/configs/axm55xx_defconfig
@@ -205,7 +205,6 @@ CONFIG_CUSE=y
CONFIG_FSCACHE=y
CONFIG_FSCACHE_STATS=y
CONFIG_FSCACHE_DEBUG=y
-CONFIG_FSCACHE_OBJECT_LIST=y
CONFIG_CACHEFILES=y
CONFIG_ISO9660_FS=y
CONFIG_UDF_FS=y
diff --git a/fs/fscache/object.c b/fs/fscache/object.c
index 6a675652129b..f31257a74f35 100644
--- a/fs/fscache/object.c
+++ b/fs/fscache/object.c
@@ -321,9 +321,6 @@ void fscache_object_init(struct fscache_object *object,
object->cookie = cookie;
fscache_cookie_get(cookie, fscache_cookie_get_attach_object);
object->parent = NULL;
-#ifdef CONFIG_FSCACHE_OBJECT_LIST
- RB_CLEAR_NODE(&object->objlist_link);
-#endif
object->oob_event_mask = 0;
for (t = object->oob_table; t->events; t++)
diff --git a/fs/fscache/proc.c b/fs/fscache/proc.c
index 061df8f61ffc..4c327aeed91b 100644
--- a/fs/fscache/proc.c
+++ b/fs/fscache/proc.c
@@ -31,18 +31,9 @@ int __init fscache_proc_init(void)
goto error_stats;
#endif
-#ifdef CONFIG_FSCACHE_OBJECT_LIST
- if (!proc_create("fs/fscache/objects", S_IFREG | 0444, NULL,
- &fscache_objlist_proc_ops))
- goto error_objects;
-#endif
-
_leave(" = 0");
return 0;
-#ifdef CONFIG_FSCACHE_OBJECT_LIST
-error_objects:
-#endif
#ifdef CONFIG_FSCACHE_STATS
remove_proc_entry("fs/fscache/stats", NULL);
error_stats:
@@ -60,9 +51,6 @@ int __init fscache_proc_init(void)
*/
void fscache_proc_cleanup(void)
{
-#ifdef CONFIG_FSCACHE_OBJECT_LIST
- remove_proc_entry("fs/fscache/objects", NULL);
-#endif
#ifdef CONFIG_FSCACHE_STATS
remove_proc_entry("fs/fscache/stats", NULL);
#endif
--
2.32.0
^ permalink raw reply related
* [PATCH 4/7] arch: Remove leftovers from mandatory file locking
From: Alexandre Ghiti @ 2021-11-05 15:43 UTC (permalink / raw)
To: Steve French, Jonathan Corbet, David Howells, Russell King,
Thomas Bogendoerfer, Michael Ellerman, Benjamin Herrenschmidt,
Paul Mackerras, Yoshinori Sato, Rich Felker, Matti Vaittinen,
Lee Jones, Jeff Layton, Greg Kroah-Hartman, Arnd Bergmann,
Ronnie Sahlberg, Guenter Roeck, Wim Van Sebroeck, Lukas Bulwahn,
Luis Chamberlain, Kalle Valo, linux-cifs, samba-technical,
linux-doc, linux-kernel, linux-cachefs, linux-arm-kernel,
linux-mips, linuxppc-dev, linux-sh, linux-power
Cc: Alexandre Ghiti
In-Reply-To: <20211105154334.1841927-1-alexandre.ghiti@canonical.com>
This config was removed so remove all references to it.
Fixes: f7e33bdbd6d1 ("fs: remove mandatory file locking support")
Signed-off-by: Alexandre Ghiti <alexandre.ghiti@canonical.com>
---
arch/mips/configs/decstation_64_defconfig | 1 -
arch/mips/configs/decstation_defconfig | 1 -
arch/mips/configs/decstation_r4k_defconfig | 1 -
3 files changed, 3 deletions(-)
diff --git a/arch/mips/configs/decstation_64_defconfig b/arch/mips/configs/decstation_64_defconfig
index 85f1955b4b00..e2ed105f8c97 100644
--- a/arch/mips/configs/decstation_64_defconfig
+++ b/arch/mips/configs/decstation_64_defconfig
@@ -144,7 +144,6 @@ CONFIG_EXT2_FS_SECURITY=y
CONFIG_EXT3_FS=y
CONFIG_EXT3_FS_POSIX_ACL=y
CONFIG_EXT3_FS_SECURITY=y
-# CONFIG_MANDATORY_FILE_LOCKING is not set
CONFIG_ISO9660_FS=y
CONFIG_JOLIET=y
CONFIG_PROC_KCORE=y
diff --git a/arch/mips/configs/decstation_defconfig b/arch/mips/configs/decstation_defconfig
index 30a6eafdb1d0..7e987d6f5e34 100644
--- a/arch/mips/configs/decstation_defconfig
+++ b/arch/mips/configs/decstation_defconfig
@@ -140,7 +140,6 @@ CONFIG_EXT2_FS_SECURITY=y
CONFIG_EXT3_FS=y
CONFIG_EXT3_FS_POSIX_ACL=y
CONFIG_EXT3_FS_SECURITY=y
-# CONFIG_MANDATORY_FILE_LOCKING is not set
CONFIG_ISO9660_FS=y
CONFIG_JOLIET=y
CONFIG_PROC_KCORE=y
diff --git a/arch/mips/configs/decstation_r4k_defconfig b/arch/mips/configs/decstation_r4k_defconfig
index e2b58dbf4aa9..6df5f6f2ac8e 100644
--- a/arch/mips/configs/decstation_r4k_defconfig
+++ b/arch/mips/configs/decstation_r4k_defconfig
@@ -140,7 +140,6 @@ CONFIG_EXT2_FS_SECURITY=y
CONFIG_EXT3_FS=y
CONFIG_EXT3_FS_POSIX_ACL=y
CONFIG_EXT3_FS_SECURITY=y
-# CONFIG_MANDATORY_FILE_LOCKING is not set
CONFIG_ISO9660_FS=y
CONFIG_JOLIET=y
CONFIG_PROC_KCORE=y
--
2.32.0
^ permalink raw reply related
* [PATCH 3/7] Documentation, arch: Remove leftovers from CIFS_WEAK_PW_HASH
From: Alexandre Ghiti @ 2021-11-05 15:43 UTC (permalink / raw)
To: Steve French, Jonathan Corbet, David Howells, Russell King,
Thomas Bogendoerfer, Michael Ellerman, Benjamin Herrenschmidt,
Paul Mackerras, Yoshinori Sato, Rich Felker, Matti Vaittinen,
Lee Jones, Jeff Layton, Greg Kroah-Hartman, Arnd Bergmann,
Ronnie Sahlberg, Guenter Roeck, Wim Van Sebroeck, Lukas Bulwahn,
Luis Chamberlain, Kalle Valo, linux-cifs, samba-technical,
linux-doc, linux-kernel, linux-cachefs, linux-arm-kernel,
linux-mips, linuxppc-dev, linux-sh, linux-power
Cc: Alexandre Ghiti
In-Reply-To: <20211105154334.1841927-1-alexandre.ghiti@canonical.com>
This config was removed so remove all references to it.
Fixes: 76a3c92ec9e0 ("cifs: remove support for NTLM and weaker authentication algorithms")
Signed-off-by: Alexandre Ghiti <alexandre.ghiti@canonical.com>
---
Documentation/admin-guide/cifs/usage.rst | 7 +++----
arch/arm/configs/cm_x300_defconfig | 1 -
arch/arm/configs/ezx_defconfig | 1 -
arch/arm/configs/imote2_defconfig | 1 -
arch/arm/configs/nhk8815_defconfig | 1 -
arch/arm/configs/pxa_defconfig | 1 -
arch/mips/configs/fuloong2e_defconfig | 1 -
arch/mips/configs/malta_qemu_32r6_defconfig | 1 -
arch/mips/configs/maltaaprp_defconfig | 1 -
arch/mips/configs/maltasmvp_defconfig | 1 -
arch/mips/configs/maltasmvp_eva_defconfig | 1 -
arch/mips/configs/maltaup_defconfig | 1 -
arch/mips/configs/nlm_xlp_defconfig | 1 -
arch/mips/configs/nlm_xlr_defconfig | 1 -
arch/powerpc/configs/ppc6xx_defconfig | 1 -
arch/sh/configs/titan_defconfig | 1 -
16 files changed, 3 insertions(+), 19 deletions(-)
diff --git a/Documentation/admin-guide/cifs/usage.rst b/Documentation/admin-guide/cifs/usage.rst
index f170d8820258..3766bf8a1c20 100644
--- a/Documentation/admin-guide/cifs/usage.rst
+++ b/Documentation/admin-guide/cifs/usage.rst
@@ -734,10 +734,9 @@ SecurityFlags Flags which control security negotiation and
using weaker password hashes is 0x37037 (lanman,
plaintext, ntlm, ntlmv2, signing allowed). Some
SecurityFlags require the corresponding menuconfig
- options to be enabled (lanman and plaintext require
- CONFIG_CIFS_WEAK_PW_HASH for example). Enabling
- plaintext authentication currently requires also
- enabling lanman authentication in the security flags
+ options to be enabled. Enabling plaintext
+ authentication currently requires also enabling
+ lanman authentication in the security flags
because the cifs module only supports sending
laintext passwords using the older lanman dialect
form of the session setup SMB. (e.g. for authentication
diff --git a/arch/arm/configs/cm_x300_defconfig b/arch/arm/configs/cm_x300_defconfig
index 502a9d870ca4..45769d0ddd4e 100644
--- a/arch/arm/configs/cm_x300_defconfig
+++ b/arch/arm/configs/cm_x300_defconfig
@@ -146,7 +146,6 @@ CONFIG_NFS_V3_ACL=y
CONFIG_NFS_V4=y
CONFIG_ROOT_NFS=y
CONFIG_CIFS=m
-CONFIG_CIFS_WEAK_PW_HASH=y
CONFIG_PARTITION_ADVANCED=y
CONFIG_NLS_CODEPAGE_437=m
CONFIG_NLS_ISO8859_1=m
diff --git a/arch/arm/configs/ezx_defconfig b/arch/arm/configs/ezx_defconfig
index a49e699e52de..ec84d80096b1 100644
--- a/arch/arm/configs/ezx_defconfig
+++ b/arch/arm/configs/ezx_defconfig
@@ -314,7 +314,6 @@ CONFIG_NFSD_V3_ACL=y
CONFIG_SMB_FS=m
CONFIG_CIFS=m
CONFIG_CIFS_STATS=y
-CONFIG_CIFS_WEAK_PW_HASH=y
CONFIG_CIFS_XATTR=y
CONFIG_CIFS_POSIX=y
CONFIG_NLS_CODEPAGE_437=m
diff --git a/arch/arm/configs/imote2_defconfig b/arch/arm/configs/imote2_defconfig
index 118c4c927f26..6db871d4e077 100644
--- a/arch/arm/configs/imote2_defconfig
+++ b/arch/arm/configs/imote2_defconfig
@@ -288,7 +288,6 @@ CONFIG_NFSD_V3_ACL=y
CONFIG_SMB_FS=m
CONFIG_CIFS=m
CONFIG_CIFS_STATS=y
-CONFIG_CIFS_WEAK_PW_HASH=y
CONFIG_CIFS_XATTR=y
CONFIG_CIFS_POSIX=y
CONFIG_NLS_CODEPAGE_437=m
diff --git a/arch/arm/configs/nhk8815_defconfig b/arch/arm/configs/nhk8815_defconfig
index 23595fc5a29a..907d6512821a 100644
--- a/arch/arm/configs/nhk8815_defconfig
+++ b/arch/arm/configs/nhk8815_defconfig
@@ -127,7 +127,6 @@ CONFIG_NFS_FS=y
CONFIG_NFS_V3_ACL=y
CONFIG_ROOT_NFS=y
CONFIG_CIFS=m
-CONFIG_CIFS_WEAK_PW_HASH=y
CONFIG_NLS_CODEPAGE_437=y
CONFIG_NLS_ASCII=y
CONFIG_NLS_ISO8859_1=y
diff --git a/arch/arm/configs/pxa_defconfig b/arch/arm/configs/pxa_defconfig
index 58f4834289e6..dedaaae3d0d8 100644
--- a/arch/arm/configs/pxa_defconfig
+++ b/arch/arm/configs/pxa_defconfig
@@ -699,7 +699,6 @@ CONFIG_NFSD_V3_ACL=y
CONFIG_NFSD_V4=y
CONFIG_CIFS=m
CONFIG_CIFS_STATS=y
-CONFIG_CIFS_WEAK_PW_HASH=y
CONFIG_CIFS_XATTR=y
CONFIG_CIFS_POSIX=y
CONFIG_NLS_DEFAULT="utf8"
diff --git a/arch/mips/configs/fuloong2e_defconfig b/arch/mips/configs/fuloong2e_defconfig
index 5c24ac7fdf56..ba47c5e929b7 100644
--- a/arch/mips/configs/fuloong2e_defconfig
+++ b/arch/mips/configs/fuloong2e_defconfig
@@ -206,7 +206,6 @@ CONFIG_NFSD_V3_ACL=y
CONFIG_NFSD_V4=y
CONFIG_CIFS=m
CONFIG_CIFS_STATS2=y
-CONFIG_CIFS_WEAK_PW_HASH=y
CONFIG_CIFS_XATTR=y
CONFIG_CIFS_POSIX=y
CONFIG_CIFS_DEBUG2=y
diff --git a/arch/mips/configs/malta_qemu_32r6_defconfig b/arch/mips/configs/malta_qemu_32r6_defconfig
index 614af02d83e6..6fb9bc29f4a0 100644
--- a/arch/mips/configs/malta_qemu_32r6_defconfig
+++ b/arch/mips/configs/malta_qemu_32r6_defconfig
@@ -165,7 +165,6 @@ CONFIG_TMPFS=y
CONFIG_NFS_FS=y
CONFIG_ROOT_NFS=y
CONFIG_CIFS=m
-CONFIG_CIFS_WEAK_PW_HASH=y
CONFIG_CIFS_XATTR=y
CONFIG_CIFS_POSIX=y
CONFIG_NLS_CODEPAGE_437=m
diff --git a/arch/mips/configs/maltaaprp_defconfig b/arch/mips/configs/maltaaprp_defconfig
index 9c051f8fd330..eb72df528243 100644
--- a/arch/mips/configs/maltaaprp_defconfig
+++ b/arch/mips/configs/maltaaprp_defconfig
@@ -166,7 +166,6 @@ CONFIG_TMPFS=y
CONFIG_NFS_FS=y
CONFIG_ROOT_NFS=y
CONFIG_CIFS=m
-CONFIG_CIFS_WEAK_PW_HASH=y
CONFIG_CIFS_XATTR=y
CONFIG_CIFS_POSIX=y
CONFIG_NLS_CODEPAGE_437=m
diff --git a/arch/mips/configs/maltasmvp_defconfig b/arch/mips/configs/maltasmvp_defconfig
index 2e90d97551d6..1fb40d310f49 100644
--- a/arch/mips/configs/maltasmvp_defconfig
+++ b/arch/mips/configs/maltasmvp_defconfig
@@ -167,7 +167,6 @@ CONFIG_TMPFS=y
CONFIG_NFS_FS=y
CONFIG_ROOT_NFS=y
CONFIG_CIFS=m
-CONFIG_CIFS_WEAK_PW_HASH=y
CONFIG_CIFS_XATTR=y
CONFIG_CIFS_POSIX=y
CONFIG_NLS_CODEPAGE_437=m
diff --git a/arch/mips/configs/maltasmvp_eva_defconfig b/arch/mips/configs/maltasmvp_eva_defconfig
index d1f7fdb27284..75cb778c6149 100644
--- a/arch/mips/configs/maltasmvp_eva_defconfig
+++ b/arch/mips/configs/maltasmvp_eva_defconfig
@@ -169,7 +169,6 @@ CONFIG_TMPFS=y
CONFIG_NFS_FS=y
CONFIG_ROOT_NFS=y
CONFIG_CIFS=m
-CONFIG_CIFS_WEAK_PW_HASH=y
CONFIG_CIFS_XATTR=y
CONFIG_CIFS_POSIX=y
CONFIG_NLS_CODEPAGE_437=m
diff --git a/arch/mips/configs/maltaup_defconfig b/arch/mips/configs/maltaup_defconfig
index 48e5bd492452..7b4f247dc60c 100644
--- a/arch/mips/configs/maltaup_defconfig
+++ b/arch/mips/configs/maltaup_defconfig
@@ -165,7 +165,6 @@ CONFIG_TMPFS=y
CONFIG_NFS_FS=y
CONFIG_ROOT_NFS=y
CONFIG_CIFS=m
-CONFIG_CIFS_WEAK_PW_HASH=y
CONFIG_CIFS_XATTR=y
CONFIG_CIFS_POSIX=y
CONFIG_NLS_CODEPAGE_437=m
diff --git a/arch/mips/configs/nlm_xlp_defconfig b/arch/mips/configs/nlm_xlp_defconfig
index c97f00ece828..1c8b73d03263 100644
--- a/arch/mips/configs/nlm_xlp_defconfig
+++ b/arch/mips/configs/nlm_xlp_defconfig
@@ -459,7 +459,6 @@ CONFIG_NFSD=m
CONFIG_NFSD_V3_ACL=y
CONFIG_NFSD_V4=y
CONFIG_CIFS=m
-CONFIG_CIFS_WEAK_PW_HASH=y
CONFIG_CIFS_UPCALL=y
CONFIG_CIFS_XATTR=y
CONFIG_CIFS_POSIX=y
diff --git a/arch/mips/configs/nlm_xlr_defconfig b/arch/mips/configs/nlm_xlr_defconfig
index 60ea102783d9..11acfc173058 100644
--- a/arch/mips/configs/nlm_xlr_defconfig
+++ b/arch/mips/configs/nlm_xlr_defconfig
@@ -411,7 +411,6 @@ CONFIG_NFSD=m
CONFIG_NFSD_V3_ACL=y
CONFIG_NFSD_V4=y
CONFIG_CIFS=m
-CONFIG_CIFS_WEAK_PW_HASH=y
CONFIG_CIFS_UPCALL=y
CONFIG_CIFS_XATTR=y
CONFIG_CIFS_POSIX=y
diff --git a/arch/powerpc/configs/ppc6xx_defconfig b/arch/powerpc/configs/ppc6xx_defconfig
index 6697c5e6682f..bb549cb1c3e3 100644
--- a/arch/powerpc/configs/ppc6xx_defconfig
+++ b/arch/powerpc/configs/ppc6xx_defconfig
@@ -1022,7 +1022,6 @@ CONFIG_NFSD=m
CONFIG_NFSD_V3_ACL=y
CONFIG_NFSD_V4=y
CONFIG_CIFS=m
-CONFIG_CIFS_WEAK_PW_HASH=y
CONFIG_CIFS_UPCALL=y
CONFIG_CIFS_XATTR=y
CONFIG_CIFS_POSIX=y
diff --git a/arch/sh/configs/titan_defconfig b/arch/sh/configs/titan_defconfig
index ba887f1351be..cd5c58916c65 100644
--- a/arch/sh/configs/titan_defconfig
+++ b/arch/sh/configs/titan_defconfig
@@ -242,7 +242,6 @@ CONFIG_NFSD=y
CONFIG_NFSD_V3=y
CONFIG_SMB_FS=m
CONFIG_CIFS=m
-CONFIG_CIFS_WEAK_PW_HASH=y
CONFIG_PARTITION_ADVANCED=y
CONFIG_NLS_CODEPAGE_437=m
CONFIG_NLS_ASCII=m
--
2.32.0
^ permalink raw reply related
* [PATCH 2/7] Documentation, arch: Remove leftovers from raw device
From: Alexandre Ghiti @ 2021-11-05 15:43 UTC (permalink / raw)
To: Steve French, Jonathan Corbet, David Howells, Russell King,
Thomas Bogendoerfer, Michael Ellerman, Benjamin Herrenschmidt,
Paul Mackerras, Yoshinori Sato, Rich Felker, Matti Vaittinen,
Lee Jones, Jeff Layton, Greg Kroah-Hartman, Arnd Bergmann,
Ronnie Sahlberg, Guenter Roeck, Wim Van Sebroeck, Lukas Bulwahn,
Luis Chamberlain, Kalle Valo, linux-cifs, samba-technical,
linux-doc, linux-kernel, linux-cachefs, linux-arm-kernel,
linux-mips, linuxppc-dev, linux-sh, linux-power
Cc: Alexandre Ghiti
In-Reply-To: <20211105154334.1841927-1-alexandre.ghiti@canonical.com>
Raw device interface was removed so remove all references to configs
related to it.
Fixes: 603e4922f1c8 ("remove the raw driver")
Signed-off-by: Alexandre Ghiti <alexandre.ghiti@canonical.com>
---
Documentation/admin-guide/devices.txt | 8 +-------
arch/arm/configs/spear13xx_defconfig | 1 -
arch/arm/configs/spear3xx_defconfig | 1 -
arch/arm/configs/spear6xx_defconfig | 1 -
arch/powerpc/configs/pseries_defconfig | 1 -
5 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/Documentation/admin-guide/devices.txt b/Documentation/admin-guide/devices.txt
index 922c23bb4372..c07dc0ee860e 100644
--- a/Documentation/admin-guide/devices.txt
+++ b/Documentation/admin-guide/devices.txt
@@ -2339,13 +2339,7 @@
disks (see major number 3) except that the limit on
partitions is 31.
- 162 char Raw block device interface
- 0 = /dev/rawctl Raw I/O control device
- 1 = /dev/raw/raw1 First raw I/O device
- 2 = /dev/raw/raw2 Second raw I/O device
- ...
- max minor number of raw device is set by kernel config
- MAX_RAW_DEVS or raw module parameter 'max_raw_devs'
+ 162 char Used for (now removed) raw block device interface
163 char
diff --git a/arch/arm/configs/spear13xx_defconfig b/arch/arm/configs/spear13xx_defconfig
index 3b206a31902f..065553326b39 100644
--- a/arch/arm/configs/spear13xx_defconfig
+++ b/arch/arm/configs/spear13xx_defconfig
@@ -61,7 +61,6 @@ CONFIG_SERIAL_AMBA_PL011=y
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
# CONFIG_HW_RANDOM is not set
CONFIG_RAW_DRIVER=y
-CONFIG_MAX_RAW_DEVS=8192
CONFIG_I2C=y
CONFIG_I2C_DESIGNWARE_PLATFORM=y
CONFIG_SPI=y
diff --git a/arch/arm/configs/spear3xx_defconfig b/arch/arm/configs/spear3xx_defconfig
index fc5f71c765ed..afca722d6605 100644
--- a/arch/arm/configs/spear3xx_defconfig
+++ b/arch/arm/configs/spear3xx_defconfig
@@ -41,7 +41,6 @@ CONFIG_SERIAL_AMBA_PL011=y
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
# CONFIG_HW_RANDOM is not set
CONFIG_RAW_DRIVER=y
-CONFIG_MAX_RAW_DEVS=8192
CONFIG_I2C=y
CONFIG_I2C_DESIGNWARE_PLATFORM=y
CONFIG_SPI=y
diff --git a/arch/arm/configs/spear6xx_defconfig b/arch/arm/configs/spear6xx_defconfig
index 52a56b8ce6a7..bc32c02cb86b 100644
--- a/arch/arm/configs/spear6xx_defconfig
+++ b/arch/arm/configs/spear6xx_defconfig
@@ -36,7 +36,6 @@ CONFIG_INPUT_FF_MEMLESS=y
CONFIG_SERIAL_AMBA_PL011=y
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
CONFIG_RAW_DRIVER=y
-CONFIG_MAX_RAW_DEVS=8192
CONFIG_I2C=y
CONFIG_I2C_DESIGNWARE_PLATFORM=y
CONFIG_SPI=y
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig
index b183629f1bcf..d0494fbb4961 100644
--- a/arch/powerpc/configs/pseries_defconfig
+++ b/arch/powerpc/configs/pseries_defconfig
@@ -190,7 +190,6 @@ CONFIG_HVCS=m
CONFIG_VIRTIO_CONSOLE=m
CONFIG_IBM_BSR=m
CONFIG_RAW_DRIVER=y
-CONFIG_MAX_RAW_DEVS=1024
CONFIG_I2C_CHARDEV=y
CONFIG_FB=y
CONFIG_FIRMWARE_EDID=y
--
2.32.0
^ permalink raw reply related
* [PATCH 1/7] Documentation, arch: Remove leftovers from fscache/cachefiles histograms
From: Alexandre Ghiti @ 2021-11-05 15:43 UTC (permalink / raw)
To: Steve French, Jonathan Corbet, David Howells, Russell King,
Thomas Bogendoerfer, Michael Ellerman, Benjamin Herrenschmidt,
Paul Mackerras, Yoshinori Sato, Rich Felker, Matti Vaittinen,
Lee Jones, Jeff Layton, Greg Kroah-Hartman, Arnd Bergmann,
Ronnie Sahlberg, Guenter Roeck, Wim Van Sebroeck, Lukas Bulwahn,
Luis Chamberlain, Kalle Valo, linux-cifs, samba-technical,
linux-doc, linux-kernel, linux-cachefs, linux-arm-kernel,
linux-mips, linuxppc-dev, linux-sh, linux-power
Cc: Alexandre Ghiti
In-Reply-To: <20211105154334.1841927-1-alexandre.ghiti@canonical.com>
A few references to the fscache and cachefiles histograms were left in
the Documentation and some arch defconfigs: remove them since those
configs do not exist anymore.
Fixes: 6ae9bd8bb037("fscache, cachefiles: Remove the histogram stuff")
Signed-off-by: Alexandre Ghiti <alexandre.ghiti@canonical.com>
---
.../filesystems/caching/cachefiles.rst | 34 -------------------
Documentation/filesystems/caching/fscache.rst | 34 ++-----------------
arch/arm/configs/axm55xx_defconfig | 2 --
arch/mips/configs/nlm_xlp_defconfig | 1 -
arch/mips/configs/nlm_xlr_defconfig | 1 -
5 files changed, 2 insertions(+), 70 deletions(-)
diff --git a/Documentation/filesystems/caching/cachefiles.rst b/Documentation/filesystems/caching/cachefiles.rst
index e58bc1fd312a..e59861458029 100644
--- a/Documentation/filesystems/caching/cachefiles.rst
+++ b/Documentation/filesystems/caching/cachefiles.rst
@@ -424,40 +424,6 @@ for CacheFiles to run in a context of a specific security label, or to create
files and directories with another security label.
-Statistical Information
-=======================
-
-If FS-Cache is compiled with the following option enabled::
-
- CONFIG_CACHEFILES_HISTOGRAM=y
-
-then it will gather certain statistics and display them through a proc file.
-
- /proc/fs/cachefiles/histogram
-
- ::
-
- cat /proc/fs/cachefiles/histogram
- JIFS SECS LOOKUPS MKDIRS CREATES
- ===== ===== ========= ========= =========
-
- This shows the breakdown of the number of times each amount of time
- between 0 jiffies and HZ-1 jiffies a variety of tasks took to run. The
- columns are as follows:
-
- ======= =======================================================
- COLUMN TIME MEASUREMENT
- ======= =======================================================
- LOOKUPS Length of time to perform a lookup on the backing fs
- MKDIRS Length of time to perform a mkdir on the backing fs
- CREATES Length of time to perform a create on the backing fs
- ======= =======================================================
-
- Each row shows the number of events that took a particular range of times.
- Each step is 1 jiffy in size. The JIFS column indicates the particular
- jiffy range covered, and the SECS field the equivalent number of seconds.
-
-
Debugging
=========
diff --git a/Documentation/filesystems/caching/fscache.rst b/Documentation/filesystems/caching/fscache.rst
index 70de86922b6a..66e31a6d1070 100644
--- a/Documentation/filesystems/caching/fscache.rst
+++ b/Documentation/filesystems/caching/fscache.rst
@@ -201,10 +201,9 @@ Statistical Information
If FS-Cache is compiled with the following options enabled::
CONFIG_FSCACHE_STATS=y
- CONFIG_FSCACHE_HISTOGRAM=y
-then it will gather certain statistics and display them through a number of
-proc files.
+then it will gather certain statistics and display them through the following
+proc file.
/proc/fs/fscache/stats
----------------------
@@ -413,35 +412,6 @@ proc files.
-/proc/fs/fscache/histogram
---------------------------
-
- ::
-
- cat /proc/fs/fscache/histogram
- JIFS SECS OBJ INST OP RUNS OBJ RUNS RETRV DLY RETRIEVLS
- ===== ===== ========= ========= ========= ========= =========
-
- This shows the breakdown of the number of times each amount of time
- between 0 jiffies and HZ-1 jiffies a variety of tasks took to run. The
- columns are as follows:
-
- ========= =======================================================
- COLUMN TIME MEASUREMENT
- ========= =======================================================
- OBJ INST Length of time to instantiate an object
- OP RUNS Length of time a call to process an operation took
- OBJ RUNS Length of time a call to process an object event took
- RETRV DLY Time between an requesting a read and lookup completing
- RETRIEVLS Time between beginning and end of a retrieval
- ========= =======================================================
-
- Each row shows the number of events that took a particular range of times.
- Each step is 1 jiffy in size. The JIFS column indicates the particular
- jiffy range covered, and the SECS field the equivalent number of seconds.
-
-
-
Object List
===========
diff --git a/arch/arm/configs/axm55xx_defconfig b/arch/arm/configs/axm55xx_defconfig
index 46075216ee6d..b36e0b347d1f 100644
--- a/arch/arm/configs/axm55xx_defconfig
+++ b/arch/arm/configs/axm55xx_defconfig
@@ -204,11 +204,9 @@ CONFIG_FUSE_FS=y
CONFIG_CUSE=y
CONFIG_FSCACHE=y
CONFIG_FSCACHE_STATS=y
-CONFIG_FSCACHE_HISTOGRAM=y
CONFIG_FSCACHE_DEBUG=y
CONFIG_FSCACHE_OBJECT_LIST=y
CONFIG_CACHEFILES=y
-CONFIG_CACHEFILES_HISTOGRAM=y
CONFIG_ISO9660_FS=y
CONFIG_UDF_FS=y
CONFIG_MSDOS_FS=y
diff --git a/arch/mips/configs/nlm_xlp_defconfig b/arch/mips/configs/nlm_xlp_defconfig
index 32c290611723..c97f00ece828 100644
--- a/arch/mips/configs/nlm_xlp_defconfig
+++ b/arch/mips/configs/nlm_xlp_defconfig
@@ -420,7 +420,6 @@ CONFIG_FUSE_FS=y
CONFIG_CUSE=m
CONFIG_FSCACHE=m
CONFIG_FSCACHE_STATS=y
-CONFIG_FSCACHE_HISTOGRAM=y
CONFIG_CACHEFILES=m
CONFIG_ISO9660_FS=m
CONFIG_JOLIET=y
diff --git a/arch/mips/configs/nlm_xlr_defconfig b/arch/mips/configs/nlm_xlr_defconfig
index bf9b9244929e..60ea102783d9 100644
--- a/arch/mips/configs/nlm_xlr_defconfig
+++ b/arch/mips/configs/nlm_xlr_defconfig
@@ -372,7 +372,6 @@ CONFIG_FUSE_FS=y
CONFIG_CUSE=m
CONFIG_FSCACHE=m
CONFIG_FSCACHE_STATS=y
-CONFIG_FSCACHE_HISTOGRAM=y
CONFIG_CACHEFILES=m
CONFIG_ISO9660_FS=m
CONFIG_JOLIET=y
--
2.32.0
^ permalink raw reply related
* [PATCH 0/7] Cleanup after removal of configs
From: Alexandre Ghiti @ 2021-11-05 15:43 UTC (permalink / raw)
To: Steve French, Jonathan Corbet, David Howells, Russell King,
Thomas Bogendoerfer, Michael Ellerman, Benjamin Herrenschmidt,
Paul Mackerras, Yoshinori Sato, Rich Felker, Matti Vaittinen,
Lee Jones, Jeff Layton, Greg Kroah-Hartman, Arnd Bergmann,
Ronnie Sahlberg, Guenter Roeck, Wim Van Sebroeck, Lukas Bulwahn,
Luis Chamberlain, Kalle Valo, linux-cifs, samba-technical,
linux-doc, linux-kernel, linux-cachefs, linux-arm-kernel,
linux-mips, linuxppc-dev, linux-sh, linux-power
Cc: Alexandre Ghiti
While bumping from 5.13 to 5.15, I found that a few deleted configs had
left some pieces here and there: this patchset cleans that.
Alexandre Ghiti (7):
Documentation, arch: Remove leftovers from fscache/cachefiles
histograms
Documentation, arch: Remove leftovers from raw device
Documentation, arch: Remove leftovers from CIFS_WEAK_PW_HASH
arch: Remove leftovers from mandatory file locking
Documentation, arch, fs: Remove leftovers from fscache object list
include: mfd: Remove leftovers from bd70528 watchdog
arch: Remove leftovers from prism54 wireless driver
Documentation/admin-guide/cifs/usage.rst | 7 +-
Documentation/admin-guide/devices.txt | 8 +-
.../filesystems/caching/cachefiles.rst | 34 -----
Documentation/filesystems/caching/fscache.rst | 123 +-----------------
arch/arm/configs/axm55xx_defconfig | 3 -
arch/arm/configs/cm_x300_defconfig | 1 -
arch/arm/configs/ezx_defconfig | 1 -
arch/arm/configs/imote2_defconfig | 1 -
arch/arm/configs/nhk8815_defconfig | 1 -
arch/arm/configs/pxa_defconfig | 1 -
arch/arm/configs/spear13xx_defconfig | 1 -
arch/arm/configs/spear3xx_defconfig | 1 -
arch/arm/configs/spear6xx_defconfig | 1 -
arch/mips/configs/decstation_64_defconfig | 1 -
arch/mips/configs/decstation_defconfig | 1 -
arch/mips/configs/decstation_r4k_defconfig | 1 -
arch/mips/configs/fuloong2e_defconfig | 1 -
arch/mips/configs/ip27_defconfig | 1 -
arch/mips/configs/malta_defconfig | 1 -
arch/mips/configs/malta_kvm_defconfig | 1 -
arch/mips/configs/malta_qemu_32r6_defconfig | 1 -
arch/mips/configs/maltaaprp_defconfig | 1 -
arch/mips/configs/maltasmvp_defconfig | 1 -
arch/mips/configs/maltasmvp_eva_defconfig | 1 -
arch/mips/configs/maltaup_defconfig | 1 -
arch/mips/configs/maltaup_xpa_defconfig | 1 -
arch/mips/configs/nlm_xlp_defconfig | 2 -
arch/mips/configs/nlm_xlr_defconfig | 2 -
arch/powerpc/configs/pmac32_defconfig | 1 -
arch/powerpc/configs/ppc6xx_defconfig | 1 -
arch/powerpc/configs/pseries_defconfig | 1 -
arch/sh/configs/titan_defconfig | 1 -
fs/fscache/object.c | 3 -
fs/fscache/proc.c | 12 --
include/linux/mfd/rohm-bd70528.h | 24 ----
35 files changed, 6 insertions(+), 237 deletions(-)
--
2.32.0
^ permalink raw reply
* Re: [PATCH] powerpc/64s: introduce CONFIG_MAXSMP to test very large SMP
From: kernel test robot @ 2021-11-05 15:18 UTC (permalink / raw)
To: Nicholas Piggin, linuxppc-dev; +Cc: kbuild-all, Nicholas Piggin
In-Reply-To: <20211105041132.1443767-1-npiggin@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 7688 bytes --]
Hi Nicholas,
I love your patch! Yet something to improve:
[auto build test ERROR on powerpc/next]
[also build test ERROR on v5.15 next-20211105]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Nicholas-Piggin/powerpc-64s-introduce-CONFIG_MAXSMP-to-test-very-large-SMP/20211105-121250
base: https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git next
config: powerpc-allyesconfig (attached as .config)
compiler: powerpc-linux-gcc (GCC) 11.2.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/9ca640e0639b6bdab803c15ba0ea3321a846c466
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Nicholas-Piggin/powerpc-64s-introduce-CONFIG_MAXSMP-to-test-very-large-SMP/20211105-121250
git checkout 9ca640e0639b6bdab803c15ba0ea3321a846c466
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.2.0 make.cross ARCH=powerpc
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
drivers/cpufreq/cpufreq_ondemand.c: In function 'od_set_powersave_bias':
>> drivers/cpufreq/cpufreq_ondemand.c:446:1: error: the frame size of 2064 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]
446 | }
| ^
cc1: all warnings being treated as errors
--
kernel/trace/preemptirq_delay_test.c: In function 'preemptirq_delay_run':
>> kernel/trace/preemptirq_delay_test.c:145:1: error: the frame size of 2064 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]
145 | }
| ^
cc1: all warnings being treated as errors
--
drivers/powercap/dtpm_cpu.c: In function 'set_pd_power_limit':
>> drivers/powercap/dtpm_cpu.c:104:1: error: the frame size of 2064 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]
104 | }
| ^
drivers/powercap/dtpm_cpu.c: In function 'get_pd_power_uw':
drivers/powercap/dtpm_cpu.c:129:1: error: the frame size of 2064 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]
129 | }
| ^
cc1: all warnings being treated as errors
--
In file included from <command-line>:
drivers/leds/trigger/ledtrig-cpu.c: In function 'ledtrig_cpu_init':
>> include/linux/compiler_types.h:322:45: error: call to '__compiletime_assert_175' declared with attribute error: BUILD_BUG_ON failed: CONFIG_NR_CPUS > 9999
322 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
| ^
include/linux/compiler_types.h:303:25: note: in definition of macro '__compiletime_assert'
303 | prefix ## suffix(); \
| ^~~~~~
include/linux/compiler_types.h:322:9: note: in expansion of macro '_compiletime_assert'
322 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
| ^~~~~~~~~~~~~~~~~~~
include/linux/build_bug.h:39:37: note: in expansion of macro 'compiletime_assert'
39 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg)
| ^~~~~~~~~~~~~~~~~~
include/linux/build_bug.h:50:9: note: in expansion of macro 'BUILD_BUG_ON_MSG'
50 | BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition)
| ^~~~~~~~~~~~~~~~
drivers/leds/trigger/ledtrig-cpu.c:137:9: note: in expansion of macro 'BUILD_BUG_ON'
137 | BUILD_BUG_ON(CONFIG_NR_CPUS > 9999);
| ^~~~~~~~~~~~
--
drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c: In function 'update_xps.isra':
>> drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c:2495:1: error: the frame size of 2064 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]
2495 | }
| ^
cc1: all warnings being treated as errors
--
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c: In function 'stmmac_request_irq_multi_msi':
>> drivers/net/ethernet/stmicro/stmmac/stmmac_main.c:3554:1: error: the frame size of 2064 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]
3554 | }
| ^
cc1: all warnings being treated as errors
vim +446 drivers/cpufreq/cpufreq_ondemand.c
af926185231a6e3 Rafael J. Wysocki 2016-02-05 412
fb30809efa3edeb Jacob Shin 2013-04-02 413 static void od_set_powersave_bias(unsigned int powersave_bias)
fb30809efa3edeb Jacob Shin 2013-04-02 414 {
fb30809efa3edeb Jacob Shin 2013-04-02 415 unsigned int cpu;
fb30809efa3edeb Jacob Shin 2013-04-02 416 cpumask_t done;
fb30809efa3edeb Jacob Shin 2013-04-02 417
c28375583b6471c Jacob Shin 2013-06-25 418 default_powersave_bias = powersave_bias;
fb30809efa3edeb Jacob Shin 2013-04-02 419 cpumask_clear(&done);
fb30809efa3edeb Jacob Shin 2013-04-02 420
09681a0772f773d Sebastian Andrzej Siewior 2021-08-03 421 cpus_read_lock();
fb30809efa3edeb Jacob Shin 2013-04-02 422 for_each_online_cpu(cpu) {
8c8f77fd0719a07 Rafael J. Wysocki 2016-02-21 423 struct cpufreq_policy *policy;
e40e7b255e591d0 Rafael J. Wysocki 2016-02-10 424 struct policy_dbs_info *policy_dbs;
8c8f77fd0719a07 Rafael J. Wysocki 2016-02-21 425 struct dbs_data *dbs_data;
8c8f77fd0719a07 Rafael J. Wysocki 2016-02-21 426 struct od_dbs_tuners *od_tuners;
44152cb82d1ad6a Viresh Kumar 2015-07-18 427
fb30809efa3edeb Jacob Shin 2013-04-02 428 if (cpumask_test_cpu(cpu, &done))
fb30809efa3edeb Jacob Shin 2013-04-02 429 continue;
fb30809efa3edeb Jacob Shin 2013-04-02 430
8c8f77fd0719a07 Rafael J. Wysocki 2016-02-21 431 policy = cpufreq_cpu_get_raw(cpu);
10dd8573b09e84b Quentin Perret 2020-06-29 432 if (!policy || policy->governor != &CPU_FREQ_GOV_ONDEMAND)
8c8f77fd0719a07 Rafael J. Wysocki 2016-02-21 433 continue;
8c8f77fd0719a07 Rafael J. Wysocki 2016-02-21 434
8c8f77fd0719a07 Rafael J. Wysocki 2016-02-21 435 policy_dbs = policy->governor_data;
e40e7b255e591d0 Rafael J. Wysocki 2016-02-10 436 if (!policy_dbs)
c28375583b6471c Jacob Shin 2013-06-25 437 continue;
fb30809efa3edeb Jacob Shin 2013-04-02 438
fb30809efa3edeb Jacob Shin 2013-04-02 439 cpumask_or(&done, &done, policy->cpus);
c28375583b6471c Jacob Shin 2013-06-25 440
bc505475b85de9a Rafael J. Wysocki 2016-02-07 441 dbs_data = policy_dbs->dbs_data;
c28375583b6471c Jacob Shin 2013-06-25 442 od_tuners = dbs_data->tuners;
c28375583b6471c Jacob Shin 2013-06-25 443 od_tuners->powersave_bias = default_powersave_bias;
fb30809efa3edeb Jacob Shin 2013-04-02 444 }
09681a0772f773d Sebastian Andrzej Siewior 2021-08-03 445 cpus_read_unlock();
fb30809efa3edeb Jacob Shin 2013-04-02 @446 }
fb30809efa3edeb Jacob Shin 2013-04-02 447
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 72217 bytes --]
^ permalink raw reply
* Re: [PATCH] powerpc/8xx: Fix Oops with STRICT_KERNEL_RWX without DEBUG_RODATA_TEST
From: Michael Ellerman @ 2021-11-05 14:07 UTC (permalink / raw)
To: Christophe Leroy, Michael Ellerman, Paul Mackerras,
Benjamin Herrenschmidt
Cc: linuxppc-dev, linux-kernel
In-Reply-To: <3d5800b0bbcd7b19761b98f50421358667b45331.1635520232.git.christophe.leroy@csgroup.eu>
On Fri, 29 Oct 2021 17:10:45 +0200, Christophe Leroy wrote:
> Until now, all tests involving CONFIG_STRICT_KERNEL_RWX were done with
> DEBUG_RODATA_TEST to check the result. But now that
> CONFIG_STRICT_KERNEL_RWX is selected by default, it came without
> CONFIG_DEBUG_RODATA_TEST and led to the following Oops
>
> [ 6.830908] Freeing unused kernel image (initmem) memory: 352K
> [ 6.840077] BUG: Unable to handle kernel data access on write at 0xc1285200
> [ 6.846836] Faulting instruction address: 0xc0004b6c
> [ 6.851745] Oops: Kernel access of bad area, sig: 11 [#1]
> [ 6.857075] BE PAGE_SIZE=16K PREEMPT CMPC885
> [ 6.861348] SAF3000 DIE NOTIFICATION
> [ 6.864830] CPU: 0 PID: 1 Comm: swapper Not tainted 5.15.0-rc5-s3k-dev-02255-g2747d7b7916f #451
> [ 6.873429] NIP: c0004b6c LR: c0004b60 CTR: 00000000
> [ 6.878419] REGS: c902be60 TRAP: 0300 Not tainted (5.15.0-rc5-s3k-dev-02255-g2747d7b7916f)
> [ 6.886852] MSR: 00009032 <EE,ME,IR,DR,RI> CR: 53000335 XER: 8000ff40
> [ 6.893564] DAR: c1285200 DSISR: 82000000
> [ 6.893564] GPR00: 0c000000 c902bf20 c20f4000 08000000 00000001 04001f00 c1800000 00000035
> [ 6.893564] GPR08: ff0001ff c1280000 00000002 c0004b60 00001000 00000000 c0004b1c 00000000
> [ 6.893564] GPR16: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
> [ 6.893564] GPR24: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 c1060000
> [ 6.932034] NIP [c0004b6c] kernel_init+0x50/0x138
> [ 6.936682] LR [c0004b60] kernel_init+0x44/0x138
> [ 6.941245] Call Trace:
> [ 6.943653] [c902bf20] [c0004b60] kernel_init+0x44/0x138 (unreliable)
> [ 6.950022] [c902bf30] [c001122c] ret_from_kernel_thread+0x5c/0x64
> [ 6.956135] Instruction dump:
> [ 6.959060] 48ffc521 48045469 4800d8cd 3d20c086 89295fa0 2c090000 41820058 480796c9
> [ 6.966890] 4800e48d 3d20c128 39400002 3fe0c106 <91495200> 3bff8000 4806fa1d 481f7d75
> [ 6.974902] ---[ end trace 1e397bacba4aa610 ]---
>
> [...]
Applied to powerpc/next.
[1/1] powerpc/8xx: Fix Oops with STRICT_KERNEL_RWX without DEBUG_RODATA_TEST
https://git.kernel.org/powerpc/c/c12ab8dbc492b992e1ea717db933cee568780c47
cheers
^ permalink raw reply
* Re: [PATCH v2 4/5] powerpc/watchdog: Read TB close to where it is used
From: Laurent Dufour @ 2021-11-05 13:39 UTC (permalink / raw)
To: Nicholas Piggin, linuxppc-dev
In-Reply-To: <20211104161057.1255659-5-npiggin@gmail.com>
Le 04/11/2021 à 17:10, Nicholas Piggin a écrit :
> When taking watchdog actions, printing messages, comparing and
> re-setting wd_smp_last_reset_tb, etc., read TB close to the point of use
> and under wd_smp_lock or printing lock (if applicable).
>
> This should keep timebase mostly monotonic with kernel log messages, and
> could prevent (in theory) a laggy CPU updating wd_smp_last_reset_tb to
> something a long way in the past, and causing other CPUs to appear to be
> stuck.
>
> These additional TB reads are all slowpath (lockup has been detected),
> so performance does not matter.
>
> Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
> ---
> arch/powerpc/kernel/watchdog.c | 30 ++++++++++++++++++------------
> 1 file changed, 18 insertions(+), 12 deletions(-)
>
> diff --git a/arch/powerpc/kernel/watchdog.c b/arch/powerpc/kernel/watchdog.c
> index 0265d27340f1..2444cd10b61a 100644
> --- a/arch/powerpc/kernel/watchdog.c
> +++ b/arch/powerpc/kernel/watchdog.c
> @@ -94,6 +94,10 @@ static u64 wd_smp_last_reset_tb;
> * Try to take the exclusive watchdog action / NMI IPI / printing lock.
> * wd_smp_lock must be held. If this fails, we should return and wait
> * for the watchdog to kick in again (or another CPU to trigger it).
> + *
> + * Importantly, if hardlockup_panic is set, wd_try_report failure should
> + * not delay the panic, because whichever other CPU is reporting will
> + * call panic.
> */
I guess this comment should be part of the previous commit in this series.
Despite that, please consider
Reviewed-by: Laurent Dufour <ldufour@linux.ibm.com>
> static bool wd_try_report(void)
> {
> @@ -153,7 +157,7 @@ static void wd_lockup_ipi(struct pt_regs *regs)
> /* Do not panic from here because that can recurse into NMI IPI layer */
> }
>
> -static bool set_cpu_stuck(int cpu, u64 tb)
> +static bool set_cpu_stuck(int cpu)
> {
> cpumask_set_cpu(cpu, &wd_smp_cpus_stuck);
> cpumask_clear_cpu(cpu, &wd_smp_cpus_pending);
> @@ -162,7 +166,7 @@ static bool set_cpu_stuck(int cpu, u64 tb)
> */
> smp_mb();
> if (cpumask_empty(&wd_smp_cpus_pending)) {
> - wd_smp_last_reset_tb = tb;
> + wd_smp_last_reset_tb = get_tb();
> cpumask_andnot(&wd_smp_cpus_pending,
> &wd_cpus_enabled,
> &wd_smp_cpus_stuck);
> @@ -171,14 +175,16 @@ static bool set_cpu_stuck(int cpu, u64 tb)
> return false;
> }
>
> -static void watchdog_smp_panic(int cpu, u64 tb)
> +static void watchdog_smp_panic(int cpu)
> {
> static cpumask_t wd_smp_cpus_ipi; // protected by reporting
> unsigned long flags;
> + u64 tb;
> int c;
>
> wd_smp_lock(&flags);
> /* Double check some things under lock */
> + tb = get_tb();
> if ((s64)(tb - wd_smp_last_reset_tb) < (s64)wd_smp_panic_timeout_tb)
> goto out;
> if (cpumask_test_cpu(cpu, &wd_smp_cpus_pending))
> @@ -192,7 +198,7 @@ static void watchdog_smp_panic(int cpu, u64 tb)
> continue; // should not happen
>
> __cpumask_set_cpu(c, &wd_smp_cpus_ipi);
> - if (set_cpu_stuck(c, tb))
> + if (set_cpu_stuck(c))
> break;
> }
> if (cpumask_empty(&wd_smp_cpus_ipi)) {
> @@ -232,7 +238,7 @@ static void watchdog_smp_panic(int cpu, u64 tb)
> wd_smp_unlock(&flags);
> }
>
> -static void wd_smp_clear_cpu_pending(int cpu, u64 tb)
> +static void wd_smp_clear_cpu_pending(int cpu)
> {
> if (!cpumask_test_cpu(cpu, &wd_smp_cpus_pending)) {
> if (unlikely(cpumask_test_cpu(cpu, &wd_smp_cpus_stuck))) {
> @@ -240,7 +246,7 @@ static void wd_smp_clear_cpu_pending(int cpu, u64 tb)
> unsigned long flags;
>
> pr_emerg("CPU %d became unstuck TB:%lld\n",
> - cpu, tb);
> + cpu, get_tb());
> print_irqtrace_events(current);
> if (regs)
> show_regs(regs);
> @@ -301,7 +307,7 @@ static void wd_smp_clear_cpu_pending(int cpu, u64 tb)
> */
> wd_smp_lock(&flags);
> if (cpumask_empty(&wd_smp_cpus_pending)) {
> - wd_smp_last_reset_tb = tb;
> + wd_smp_last_reset_tb = get_tb();
> cpumask_andnot(&wd_smp_cpus_pending,
> &wd_cpus_enabled,
> &wd_smp_cpus_stuck);
> @@ -316,10 +322,10 @@ static void watchdog_timer_interrupt(int cpu)
>
> per_cpu(wd_timer_tb, cpu) = tb;
>
> - wd_smp_clear_cpu_pending(cpu, tb);
> + wd_smp_clear_cpu_pending(cpu);
>
> if ((s64)(tb - wd_smp_last_reset_tb) >= (s64)wd_smp_panic_timeout_tb)
> - watchdog_smp_panic(cpu, tb);
> + watchdog_smp_panic(cpu);
> }
>
> DEFINE_INTERRUPT_HANDLER_NMI(soft_nmi_interrupt)
> @@ -356,7 +362,7 @@ DEFINE_INTERRUPT_HANDLER_NMI(soft_nmi_interrupt)
> return 0;
> }
>
> - set_cpu_stuck(cpu, tb);
> + set_cpu_stuck(cpu);
>
> wd_smp_unlock(&flags);
>
> @@ -417,7 +423,7 @@ void arch_touch_nmi_watchdog(void)
> tb = get_tb();
> if (tb - per_cpu(wd_timer_tb, cpu) >= ticks) {
> per_cpu(wd_timer_tb, cpu) = tb;
> - wd_smp_clear_cpu_pending(cpu, tb);
> + wd_smp_clear_cpu_pending(cpu);
> }
> }
> EXPORT_SYMBOL(arch_touch_nmi_watchdog);
> @@ -475,7 +481,7 @@ static void stop_watchdog(void *arg)
> cpumask_clear_cpu(cpu, &wd_cpus_enabled);
> wd_smp_unlock(&flags);
>
> - wd_smp_clear_cpu_pending(cpu, get_tb());
> + wd_smp_clear_cpu_pending(cpu);
> }
>
> static int stop_watchdog_on_cpu(unsigned int cpu)
>
^ permalink raw reply
* [PATCH] powerpc/pseries: use slab context cpumask allocation in CPU hotplug init
From: Nicholas Piggin @ 2021-11-05 13:29 UTC (permalink / raw)
To: linuxppc-dev; +Cc: Nicholas Piggin
Slab is up at this point, using the bootmem allocator triggers a
warning. Switch to using the regular cpumask allocator.
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
This only matters when CONFIG_CPUMASK_OFFNODE=y, which has not been
possible before on powerpc.
Thanks,
Nick
arch/powerpc/platforms/pseries/hotplug-cpu.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/arch/powerpc/platforms/pseries/hotplug-cpu.c b/arch/powerpc/platforms/pseries/hotplug-cpu.c
index d646c22e94ab..78a70ba60d24 100644
--- a/arch/powerpc/platforms/pseries/hotplug-cpu.c
+++ b/arch/powerpc/platforms/pseries/hotplug-cpu.c
@@ -1016,12 +1016,13 @@ static int __init pseries_cpu_hotplug_init(void)
/* Processors can be added/removed only on LPAR */
if (firmware_has_feature(FW_FEATURE_LPAR)) {
for_each_node(node) {
- alloc_bootmem_cpumask_var(&node_recorded_ids_map[node]);
+ if (!alloc_cpumask_var_node(&node_recorded_ids_map[node],
+ GFP_KERNEL, node))
+ return -ENOMEM;
/* Record ids of CPU added at boot time */
- cpumask_or(node_recorded_ids_map[node],
- node_recorded_ids_map[node],
- cpumask_of_node(node));
+ cpumask_copy(node_recorded_ids_map[node],
+ cpumask_of_node(node));
}
of_reconfig_notifier_register(&pseries_smp_nb);
--
2.23.0
^ permalink raw reply related
* [PATCH] powerpc/pseries: Fix numa FORM2 parsing fallback code
From: Nicholas Piggin @ 2021-11-05 13:29 UTC (permalink / raw)
To: linuxppc-dev; +Cc: Aneesh Kumar K . V, Nicholas Piggin
In case the FORM2 distance table from firmware is not the expected size,
there is fallback code that just populates the lookup table as local vs
remote.
However it then continues on to use the distance table. Fix.
Cc: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Fixes: 1c6b5a7e7405 ("powerpc/pseries: Add support for FORM2 associativity")
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
arch/powerpc/mm/numa.c | 29 +++++++++++++----------------
1 file changed, 13 insertions(+), 16 deletions(-)
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index 6f14c8fb6359..0789cde7f658 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -380,6 +380,7 @@ static void initialize_form2_numa_distance_lookup_table(void)
const __be32 *numa_lookup_index;
int numa_dist_table_length;
int max_numa_index, distance_index;
+ bool good = true;
if (firmware_has_feature(FW_FEATURE_OPAL))
root = of_find_node_by_path("/ibm,opal");
@@ -407,30 +408,26 @@ static void initialize_form2_numa_distance_lookup_table(void)
if (numa_dist_table_length != max_numa_index * max_numa_index) {
WARN(1, "Wrong NUMA distance information\n");
- /* consider everybody else just remote. */
- for (i = 0; i < max_numa_index; i++) {
- for (j = 0; j < max_numa_index; j++) {
- int nodeA = numa_id_index_table[i];
- int nodeB = numa_id_index_table[j];
-
- if (nodeA == nodeB)
- numa_distance_table[nodeA][nodeB] = LOCAL_DISTANCE;
- else
- numa_distance_table[nodeA][nodeB] = REMOTE_DISTANCE;
- }
- }
+ good = false;
}
-
distance_index = 0;
for (i = 0; i < max_numa_index; i++) {
for (j = 0; j < max_numa_index; j++) {
int nodeA = numa_id_index_table[i];
int nodeB = numa_id_index_table[j];
-
- numa_distance_table[nodeA][nodeB] = numa_dist_table[distance_index++];
- pr_debug("dist[%d][%d]=%d ", nodeA, nodeB, numa_distance_table[nodeA][nodeB]);
+ int dist;
+
+ if (good)
+ dist = numa_dist_table[distance_index++];
+ else if (nodeA == nodeB)
+ dist = LOCAL_DISTANCE;
+ else
+ dist = REMOTE_DISTANCE;
+ numa_distance_table[nodeA][nodeB] = dist;
+ pr_debug("dist[%d][%d]=%d ", nodeA, nodeB, dist);
}
}
+
of_node_put(root);
}
--
2.23.0
^ permalink raw reply related
* Re: [PATCH 0/3] KEXEC_SIG with appended signature
From: Michal Suchánek @ 2021-11-05 13:14 UTC (permalink / raw)
To: Daniel Axtens
Cc: Thiago Jung Bauermann, Rob Herring, Vasily Gorbik, linux-s390,
Heiko Carstens, linux-kernel, David Howells,
Lakshmi Ramasubramanian, Luis Chamberlain, keyrings,
Paul Mackerras, Frank van der Linden, Jessica Yu,
Alexander Gordeev, linuxppc-dev, Christian Borntraeger,
Hari Bathini
In-Reply-To: <87czneeurr.fsf@dja-thinkpad.axtens.net>
On Fri, Nov 05, 2021 at 09:55:52PM +1100, Daniel Axtens wrote:
> Michal Suchanek <msuchanek@suse.de> writes:
>
> > S390 uses appended signature for kernel but implements the check
> > separately from module loader.
> >
> > Support for secure boot on powerpc with appended signature is planned -
> > grub patches submitted upstream but not yet merged.
>
> Power Non-Virtualised / OpenPower already supports secure boot via kexec
> with signature verification via IMA. I think you have now sent a
> follow-up series that merges some of the IMA implementation, I just
> wanted to make sure it was clear that we actually already have support
So is IMA_KEXEC and KEXEC_SIG redundant?
I see some architectures have both. I also see there is a lot of overlap
between the IMA framework and the KEXEC_SIG and MODULE_SIg.
Thanks
Michal
^ permalink raw reply
* Re: [PATCH 1/2] powerpc: remove cpu_online_cores_map function
From: Sachin Sant @ 2021-11-05 13:09 UTC (permalink / raw)
To: Nicholas Piggin; +Cc: linuxppc-dev
In-Reply-To: <20211105035042.1398309-1-npiggin@gmail.com>
> On 05-Nov-2021, at 9:20 AM, Nicholas Piggin <npiggin@gmail.com> wrote:
>
> This function builds the cores online map with on-stack cpumasks which
> can cause high stack usage with large NR_CPUS.
>
> It is not used in any performance sensitive paths, so instead just check
> for first thread sibling.
>
> Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
> ---
Tested-by: Sachin Sant <sachinp@linux.vnet.ibm.com>
Thanks
- Sachin
> arch/powerpc/include/asm/cputhreads.h | 33 -----------------------
> arch/powerpc/platforms/powernv/idle.c | 10 +++----
> arch/powerpc/platforms/powernv/opal-imc.c | 6 ++---
> 3 files changed, 8 insertions(+), 41 deletions(-)
>
> diff --git a/arch/powerpc/include/asm/cputhreads.h b/arch/powerpc/include/asm/cputhreads.h
> index b167186aaee4..f26c430f3982 100644
> --- a/arch/powerpc/include/asm/cputhreads.h
> +++ b/arch/powerpc/include/asm/cputhreads.h
> @@ -32,44 +32,11 @@ extern cpumask_t threads_core_mask;
> #define threads_core_mask (*get_cpu_mask(0))
> #endif
>
> -/* cpu_thread_mask_to_cores - Return a cpumask of one per cores
> - * hit by the argument
> - *
> - * @threads: a cpumask of online threads
> - *
> - * This function returns a cpumask which will have one online cpu's
> - * bit set for each core that has at least one thread set in the argument.
> - *
> - * This can typically be used for things like IPI for tlb invalidations
> - * since those need to be done only once per core/TLB
> - */
> -static inline cpumask_t cpu_thread_mask_to_cores(const struct cpumask *threads)
> -{
> - cpumask_t tmp, res;
> - int i, cpu;
> -
> - cpumask_clear(&res);
> - for (i = 0; i < NR_CPUS; i += threads_per_core) {
> - cpumask_shift_left(&tmp, &threads_core_mask, i);
> - if (cpumask_intersects(threads, &tmp)) {
> - cpu = cpumask_next_and(-1, &tmp, cpu_online_mask);
> - if (cpu < nr_cpu_ids)
> - cpumask_set_cpu(cpu, &res);
> - }
> - }
> - return res;
> -}
> -
> static inline int cpu_nr_cores(void)
> {
> return nr_cpu_ids >> threads_shift;
> }
>
> -static inline cpumask_t cpu_online_cores_map(void)
> -{
> - return cpu_thread_mask_to_cores(cpu_online_mask);
> -}
> -
> #ifdef CONFIG_SMP
> int cpu_core_index_of_thread(int cpu);
> int cpu_first_thread_of_core(int core);
> diff --git a/arch/powerpc/platforms/powernv/idle.c b/arch/powerpc/platforms/powernv/idle.c
> index e3ffdc8e8567..70da314fd2d7 100644
> --- a/arch/powerpc/platforms/powernv/idle.c
> +++ b/arch/powerpc/platforms/powernv/idle.c
> @@ -146,9 +146,13 @@ EXPORT_SYMBOL_GPL(pnv_get_supported_cpuidle_states);
> static void pnv_fastsleep_workaround_apply(void *info)
>
> {
> + int cpu = smp_processor_id();
> int rc;
> int *err = info;
>
> + if (cpu_first_thread_sibling(cpu) != cpu)
> + return;
> +
> rc = opal_config_cpu_idle_state(OPAL_CONFIG_IDLE_FASTSLEEP,
> OPAL_CONFIG_IDLE_APPLY);
> if (rc)
> @@ -175,7 +179,6 @@ static ssize_t store_fastsleep_workaround_applyonce(struct device *dev,
> struct device_attribute *attr, const char *buf,
> size_t count)
> {
> - cpumask_t primary_thread_mask;
> int err;
> u8 val;
>
> @@ -200,10 +203,7 @@ static ssize_t store_fastsleep_workaround_applyonce(struct device *dev,
> power7_fastsleep_workaround_exit = false;
>
> cpus_read_lock();
> - primary_thread_mask = cpu_online_cores_map();
> - on_each_cpu_mask(&primary_thread_mask,
> - pnv_fastsleep_workaround_apply,
> - &err, 1);
> + on_each_cpu(pnv_fastsleep_workaround_apply, &err, 1);
> cpus_read_unlock();
> if (err) {
> pr_err("fastsleep_workaround_applyonce change failed while running pnv_fastsleep_workaround_apply");
> diff --git a/arch/powerpc/platforms/powernv/opal-imc.c b/arch/powerpc/platforms/powernv/opal-imc.c
> index 05d3832019b9..3fea5da6d1b3 100644
> --- a/arch/powerpc/platforms/powernv/opal-imc.c
> +++ b/arch/powerpc/platforms/powernv/opal-imc.c
> @@ -200,13 +200,13 @@ static void disable_nest_pmu_counters(void)
>
> static void disable_core_pmu_counters(void)
> {
> - cpumask_t cores_map;
> int cpu, rc;
>
> cpus_read_lock();
> /* Disable the IMC Core functions */
> - cores_map = cpu_online_cores_map();
> - for_each_cpu(cpu, &cores_map) {
> + for_each_online_cpu(cpu) {
> + if (cpu_first_thread_sibling(cpu) != cpu)
> + continue;
> rc = opal_imc_counters_stop(OPAL_IMC_COUNTERS_CORE,
> get_hard_smp_processor_id(cpu));
> if (rc)
> --
> 2.23.0
>
^ 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