Patch "arm64: add dependency between vmlinuz.efi and Image" has been added to the 6.1-stable tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This is a note to let you know that I've just added the patch titled

    arm64: add dependency between vmlinuz.efi and Image

to the 6.1-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     arm64-add-dependency-between-vmlinuz.efi-and-image.patch
and it can be found in the queue-6.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 4db92c62345c1066393f040105bb3d202d13aad8
Author: Masahiro Yamada <masahiroy@xxxxxxxxxx>
Date:   Sun Nov 19 14:32:34 2023 +0900

    arm64: add dependency between vmlinuz.efi and Image
    
    [ Upstream commit c0a8574204054effad6ac83cc75c02576e2985fe ]
    
    A common issue in Makefile is a race in parallel building.
    
    You need to be careful to prevent multiple threads from writing to the
    same file simultaneously.
    
    Commit 3939f3345050 ("ARM: 8418/1: add boot image dependencies to not
    generate invalid images") addressed such a bad scenario.
    
    A similar symptom occurs with the following command:
    
      $ make -j$(nproc) ARCH=arm64 Image vmlinuz.efi
        [ snip ]
        SORTTAB vmlinux
        OBJCOPY arch/arm64/boot/Image
        OBJCOPY arch/arm64/boot/Image
        AS      arch/arm64/boot/zboot-header.o
        PAD     arch/arm64/boot/vmlinux.bin
        GZIP    arch/arm64/boot/vmlinuz
        OBJCOPY arch/arm64/boot/vmlinuz.o
        LD      arch/arm64/boot/vmlinuz.efi.elf
        OBJCOPY arch/arm64/boot/vmlinuz.efi
    
    The log "OBJCOPY arch/arm64/boot/Image" is displayed twice.
    
    It indicates that two threads simultaneously enter arch/arm64/boot/
    and write to arch/arm64/boot/Image.
    
    It occasionally leads to a build failure:
    
      $ make -j$(nproc) ARCH=arm64 Image vmlinuz.efi
        [ snip ]
        SORTTAB vmlinux
        OBJCOPY arch/arm64/boot/Image
        PAD     arch/arm64/boot/vmlinux.bin
      truncate: Invalid number: 'arch/arm64/boot/vmlinux.bin'
      make[2]: *** [drivers/firmware/efi/libstub/Makefile.zboot:13:
      arch/arm64/boot/vmlinux.bin] Error 1
      make[2]: *** Deleting file 'arch/arm64/boot/vmlinux.bin'
      make[1]: *** [arch/arm64/Makefile:163: vmlinuz.efi] Error 2
      make[1]: *** Waiting for unfinished jobs....
      make: *** [Makefile:234: __sub-make] Error 2
    
    vmlinuz.efi depends on Image, but such a dependency is not specified
    in arch/arm64/Makefile.
    
    Signed-off-by: Masahiro Yamada <masahiroy@xxxxxxxxxx>
    Acked-by: Ard Biesheuvel <ardb@xxxxxxxxxx>
    Reviewed-by: SImon Glass <sjg@xxxxxxxxxxxx>
    Link: https://lore.kernel.org/r/20231119053234.2367621-1-masahiroy@xxxxxxxxxx
    Signed-off-by: Catalin Marinas <catalin.marinas@xxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile
index 5e56d26a22398..c9496539c3351 100644
--- a/arch/arm64/Makefile
+++ b/arch/arm64/Makefile
@@ -157,7 +157,7 @@ endif
 
 all:	$(notdir $(KBUILD_IMAGE))
 
-
+vmlinuz.efi: Image
 Image vmlinuz.efi: vmlinux
 	$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
 




[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux