Received-SPF: pass (google.com: domain of linux-kernel+bounces-186959-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Precedence: bulk
MIME-Version: 1.0
References: <mhng-e73e59bf-92fc-4122-9f9e-a329d20eba55@palmer-ri-x1c9>
In-Reply-To: <mhng-e73e59bf-92fc-4122-9f9e-a329d20eba55@palmer-ri-x1c9>
From: Masahiro Yamada <masahiroy@kernel.org>
Date: Thu, 23 May 2024 12:45:31 +0900
Message-ID: <CAK7LNASVhbtJ2=72TsCu1C7+uLsXySNffPcNZU2NiFKitM6-Ew@mail.gmail.com>
Subject: Re: [GIT PULL] RISC-V Patches for the 6.10 Merge Window, Part 1
To: Palmer Dabbelt <palmer@rivosinc.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>, linux-riscv@lists.infradead.org, 
	linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Thu, May 23, 2024 at 1:13=E2=80=AFAM Palmer Dabbelt <palmer@rivosinc.com=
> wrote:
>
> The following changes since commit 4cece764965020c22cff7665b18a0120063590=
95:
>
>   Linux 6.9-rc1 (2024-03-24 14:10:05 -0700)
>
> are available in the Git repository at:
>
>   git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git tags/risc=
v-for-linus-6.10-mw1
>
> for you to fetch changes up to 92cce91949a497a8a4615f9ba5813b03f7a1f1d5:
>
>   riscv: defconfig: Enable CONFIG_CLK_SOPHGO_CV1800 (2024-05-13 14:26:34 =
-0700)
>
> ----------------------------------------------------------------
> RISC-V Patches for the 6.10 Merge Window, Part 1
>
> * Support for byte/half-word compare-and-exchange, emulated via LR/SC
>   loops.
> * Support for Rust.
> * Support for Zihintpause in hwprobe.
> * Support for the PR_RISCV_SET_ICACHE_FLUSH_CTX prctl().
> * Support for lockless lockrefs.
>
> ----------------------------------------------------------------
> This was really meant to be last week's PR, but due to a handful of small
> issues.  There's a pair of driver build fixes that are already on the lis=
ts and
> a report of a ftrace failure that might be triggered by the ftrace/AIA fi=
x, but
> seems like we're better off with these than without.  I've got a few othe=
r
> smaller things queued up for Friday, but I figured it'd be best to get th=
is
> moving because there's a handful of merge conflicts.
>
> This first one isn't showing up in a in-flight merge `git diff`, but it l=
ooks
> pretty straight-forward
>
>     diff --git a/Documentation/rust/arch-support.rst b/Documentation/rust=
/arch-support.rst
>     index c9137710633a..4d1495ded2aa 100644
>     --- a/Documentation/rust/arch-support.rst
>     +++ b/Documentation/rust/arch-support.rst
>     @@ -16,7 +16,8 @@ support corresponds to ``S`` values in the ``MAINTA=
INERS`` file.
>      Architecture   Level of support  Constraints
>      =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D  =3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D  =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
>      ``arm64``      Maintained        Little Endian only.
>     -``loongarch``  Maintained        \-
>     +``loongarch``  Maintained        -
>     +``riscv``      Maintained        ``riscv64`` only.
>      ``um``         Maintained        ``x86_64`` only.
>      ``x86``        Maintained        ``x86_64`` only.
>      =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D  =3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D  =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
>
> There's also one in the IMSIC driver where there's really no way for git =
to
> pick up the conflict, as it's a far-away API change.  Here's my resolutio=
n,
> Anup likes it as well
> <https://lore.kernel.org/all/CAK9=3DC2UkTD0hYymjow-yHHfBDh4CtRv-G2BPt=3Dn=
cstLRmpYgyg@mail.gmail.com/>:
>
>     diff --git a/drivers/irqchip/irq-riscv-imsic-early.c b/drivers/irqchi=
p/irq-riscv-imsic-early.c
>     index 886418ec06cb..4fbb37074d29 100644
>     --- a/drivers/irqchip/irq-riscv-imsic-early.c
>     +++ b/drivers/irqchip/irq-riscv-imsic-early.c
>     @@ -49,7 +49,7 @@ static int __init imsic_ipi_domain_init(void)
>                 return virq < 0 ? virq : -ENOMEM;
>
>         /* Set vIRQ range */
>     -   riscv_ipi_set_virq_range(virq, IMSIC_NR_IPI, true);
>     +   riscv_ipi_set_virq_range(virq, IMSIC_NR_IPI);
>
>         /* Announce that IMSIC is providing IPIs */
>         pr_info("%pfwP: providing IPIs using interrupt %d\n", imsic->fwno=
de, IMSIC_IPI_ID);
>
> The rest show up pretty normally, so here's the regular merge diff output=
 from
> how I've resolved them:
>
>     diff --cc arch/riscv/Makefile
>     index 1e002d8003c5,321c057e2bdc..000000000000
>     --- a/arch/riscv/Makefile
>     +++ b/arch/riscv/Makefile
>     @@@ -151,20 -166,9 +166,9 @@@ endi
>       endif
>
>       vdso-install-y                    +=3D arch/riscv/kernel/vdso/vdso.=
so.dbg
>      -vdso-install-$(CONFIG_COMPAT)     +=3D arch/riscv/kernel/compat_vds=
o/compat_vdso.so.dbg:../compat_vdso/compat_vdso.so
>      +vdso-install-$(CONFIG_COMPAT)     +=3D arch/riscv/kernel/compat_vds=
o/compat_vdso.so.dbg
>
>     - ifneq ($(CONFIG_XIP_KERNEL),y)
>     - ifeq ($(CONFIG_RISCV_M_MODE)$(CONFIG_SOC_CANAAN_K210),yy)
>     - KBUILD_IMAGE :=3D $(boot)/loader.bin
>     - else
>     - ifeq ($(CONFIG_EFI_ZBOOT),)
>     - KBUILD_IMAGE :=3D $(boot)/Image.gz
>     - else
>     - KBUILD_IMAGE :=3D $(boot)/vmlinuz.efi
>     - endif
>     - endif
>     - endif
>     - BOOT_TARGETS :=3D Image Image.gz loader loader.bin xipImage vmlinuz=
efi
>     + BOOT_TARGETS :=3D Image Image.gz Image.bz2 Image.lz4 Image.lzma Ima=
ge.lzo Image.zst loader loader.bin xipImage vmlinuz.efi
>
>       all:      $(notdir $(KBUILD_IMAGE))
>
>     diff --cc include/uapi/linux/prctl.h
>     index 713d28788df7,524d546d697b..000000000000
>     --- a/include/uapi/linux/prctl.h
>     +++ b/include/uapi/linux/prctl.h
>     @@@ -306,20 -306,10 +306,26 @@@ struct prctl_mm_map
>       # define PR_RISCV_V_VSTATE_CTRL_NEXT_MASK 0xc
>       # define PR_RISCV_V_VSTATE_CTRL_MASK              0x1f
>
>     + #define PR_RISCV_SET_ICACHE_FLUSH_CTX     71
>     + # define PR_RISCV_CTX_SW_FENCEI_ON        0
>     + # define PR_RISCV_CTX_SW_FENCEI_OFF       1
>     + # define PR_RISCV_SCOPE_PER_PROCESS       0
>     + # define PR_RISCV_SCOPE_PER_THREAD        1
>     +
>      +/* PowerPC Dynamic Execution Control Register (DEXCR) controls */
>      +#define PR_PPC_GET_DEXCR          72
>      +#define PR_PPC_SET_DEXCR          73
>      +/* DEXCR aspect to act on */
>      +# define PR_PPC_DEXCR_SBHE                0 /* Speculative branch h=
int enable */
>      +# define PR_PPC_DEXCR_IBRTPD              1 /* Indirect branch recu=
rrent target prediction disable */
>      +# define PR_PPC_DEXCR_SRAPD               2 /* Subroutine return ad=
dress prediction disable */
>      +# define PR_PPC_DEXCR_NPHIE               3 /* Non-privileged hash =
instruction enable */
>      +/* Action to apply / return */
>      +# define PR_PPC_DEXCR_CTRL_EDITABLE        0x1 /* Aspect can be mod=
ified with PR_PPC_SET_DEXCR */
>      +# define PR_PPC_DEXCR_CTRL_SET             0x2 /* Set the aspect fo=
r this process */
>      +# define PR_PPC_DEXCR_CTRL_CLEAR   0x4 /* Clear the aspect for this=
 process */
>      +# define PR_PPC_DEXCR_CTRL_SET_ONEXEC      0x8 /* Set the aspect on=
 exec */
>      +# define PR_PPC_DEXCR_CTRL_CLEAR_ONEXEC   0x10 /* Clear the aspect =
on exec */
>      +# define PR_PPC_DEXCR_CTRL_MASK           0x1f
>      +
>       #endif /* _LINUX_PRCTL_H */
>     diff --cc kernel/sys.c
>     index f9c95410278c,1b7bda0722ca..000000000000
>     --- a/kernel/sys.c
>     +++ b/kernel/sys.c
>     @@@ -146,13 -146,10 +146,15 @@@
>       #ifndef RISCV_V_GET_CONTROL
>       # define RISCV_V_GET_CONTROL()            (-EINVAL)
>       #endif
>     + #ifndef RISCV_SET_ICACHE_FLUSH_CTX
>     + # define RISCV_SET_ICACHE_FLUSH_CTX(a, b) (-EINVAL)
>     + #endif
>      -
>      +#ifndef PPC_GET_DEXCR_ASPECT
>      +# define PPC_GET_DEXCR_ASPECT(a, b)       (-EINVAL)
>      +#endif
>      +#ifndef PPC_SET_DEXCR_ASPECT
>      +# define PPC_SET_DEXCR_ASPECT(a, b, c)    (-EINVAL)
>      +#endif
>     -
>       /*
>        * this is where the system-wide overflow UID and GID are defined, =
for
>        * architectures that now have 32-bit UID/GID but didn't in the pas=
t
>
>
> ----------------------------------------------------------------
> Alexandre Ghiti (2):
>       riscv: Remove superfluous smp_mb()
>       riscv: Fix text patching when IPI are used
>
> Charlie Jenkins (4):
>       riscv: Remove unnecessary irqflags processor.h include
>       riscv: Include riscv_set_icache_flush_ctx prctl
>       documentation: Document PR_RISCV_SET_ICACHE_FLUSH_CTX prctl
>       cpumask: Add assign cpu
>
> Cl=C3=A9ment L=C3=A9ger (2):
>       riscv: misaligned: remove CONFIG_RISCV_M_MODE specific code
>       riscv: hwprobe: export Zihintpause ISA extension
>
> Dawei Li (2):
>       riscv: Remove redundant CONFIG_64BIT from pgtable_l{4,5}_enabled
>       riscv: Annotate pgtable_l{4,5}_enabled with __ro_after_init
>
> Inochi Amaoto (1):
>       riscv: defconfig: Enable CONFIG_CLK_SOPHGO_CV1800
>
> Jisheng Zhang (4):
>       riscv: select ARCH_USE_CMPXCHG_LOCKREF
>       riscv: cmpxchg: implement arch_cmpxchg64_{relaxed|acquire|release}
>       riscv: mm: still create swiotlb buffer for kmalloc() bouncing if re=
quired
>       riscv: select ARCH_HAS_FAST_MULTIPLIER
>
> Leonardo Bras (5):
>       riscv/cmpxchg: Deduplicate xchg() asm functions
>       riscv/cmpxchg: Deduplicate cmpxchg() asm and macros
>       riscv/atomic.h : Deduplicate arch_atomic.*
>       riscv/cmpxchg: Implement cmpxchg for variables of size 1 and 2
>       riscv/cmpxchg: Implement xchg for variables of size 1 and 2
>
> Masahiro Yamada (2):
>       riscv: merge two if-blocks for KBUILD_IMAGE
>       export.h: remove include/asm-generic/export.h


I am confused.


This commit was applied two months ago by myself,
and it already existed in the mainline.


After this pull request, I do not see no such a commit
applied by Palmer.

Why did this show up in 'git request-pull' ?


The following is the commit in question.


commit 0316e4b04e0156633df7474bae8e8b0791ce028f
Author:     Masahiro Yamada <masahiroy@kernel.org>
AuthorDate: Sat Mar 23 18:06:15 2024 +0900
Commit:     Masahiro Yamada <masahiroy@kernel.org>
CommitDate: Thu Mar 28 11:04:20 2024 +0900

    export.h: remove include/asm-generic/export.h

    Commit 3a6dd5f614a1 ("riscv: remove unneeded #include
    <asm-generic/export.h>") removed the last use of
    include/asm-generic/export.h.

    This deprecated header can go away.

    Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>


--=20
Best Regards
Masahiro Yamada