| Message ID | 20200507150004.1423069-8-ira.weiny@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Remove duplicated kmap code | expand |
On Thu, May 07, 2020 at 07:59:55AM -0700, ira.weiny@intel.com wrote: > From: Ira Weiny <ira.weiny@intel.com> > > Every single architecture (including !CONFIG_HIGHMEM) calls... > > pagefault_enable(); > preempt_enable(); > > ... before returning from __kunmap_atomic(). Lift this code into the > kunmap_atomic() macro. > > While we are at it rename __kunmap_atomic() to kunmap_atomic_high() to > be consistent. > > Reviewed-by: Christoph Hellwig <hch@lst.de> > Signed-off-by: Ira Weiny <ira.weiny@intel.com> This patch results in: Starting init: /bin/sh exists but couldn't execute it (error -14) when trying to boot microblazeel:petalogix-ml605 in qemu. Bisect log attached. Guenter --- # bad: [bdecf38f228bcca73b31ada98b5b7ba1215eb9c9] Add linux-next specific files for 20200515 # good: [2ef96a5bb12be62ef75b5828c0aab838ebb29cb8] Linux 5.7-rc5 git bisect start 'HEAD' 'v5.7-rc5' # good: [3674d7aa7a8e61d993886c2fb7c896c5ef85e988] Merge remote-tracking branch 'crypto/master' git bisect good 3674d7aa7a8e61d993886c2fb7c896c5ef85e988 # good: [87f6f21783522e6d62127cf33ae5e95f50874beb] Merge remote-tracking branch 'spi/for-next' git bisect good 87f6f21783522e6d62127cf33ae5e95f50874beb # good: [5c428e8277d5d97c85126387d4e00aa5adde4400] Merge remote-tracking branch 'staging/staging-next' git bisect good 5c428e8277d5d97c85126387d4e00aa5adde4400 # good: [f68de67ed934e7bdef4799fd7777c86f33f14982] Merge remote-tracking branch 'hyperv/hyperv-next' git bisect good f68de67ed934e7bdef4799fd7777c86f33f14982 # bad: [54acd2dc52b069da59639eea0d0c92726f32fb01] mm/memblock: fix a typo in comment "implict"->"implicit" git bisect bad 54acd2dc52b069da59639eea0d0c92726f32fb01 # good: [784a17aa58a529b84f7cc50f351ed4acf3bd11f3] mm: remove the pgprot argument to __vmalloc git bisect good 784a17aa58a529b84f7cc50f351ed4acf3bd11f3 # good: [6cd8137ff37e9a37aee2d2a8889c8beb8eab192f] khugepaged: replace the usage of system(3) in the test git bisect good 6cd8137ff37e9a37aee2d2a8889c8beb8eab192f # bad: [6987da379826ed01b8a1cf046b67cc8cc10117cc] sparc: remove unnecessary includes git bisect bad 6987da379826ed01b8a1cf046b67cc8cc10117cc # good: [bc17b545388f64c09e83e367898e28f60277c584] mm/hugetlb: define a generic fallback for is_hugepage_only_range() git bisect good bc17b545388f64c09e83e367898e28f60277c584 # bad: [9b5aa5b43f957f03a1f4a9aff5f7924e2ebbc011] arch-kmap_atomic-consolidate-duplicate-code-checkpatch-fixes git bisect bad 9b5aa5b43f957f03a1f4a9aff5f7924e2ebbc011 # good: [0941a38ff0790c1004270f952067a5918a4ba32d] arch/kmap: remove redundant arch specific kmaps git bisect good 0941a38ff0790c1004270f952067a5918a4ba32d # good: [56e635a64c2cbfa815c851af10e0f811e809977b] arch-kunmap-remove-duplicate-kunmap-implementations-fix git bisect good 56e635a64c2cbfa815c851af10e0f811e809977b # bad: [60f96b2233c790d4f1c49317643051f1670bcb29] arch/kmap_atomic: consolidate duplicate code git bisect bad 60f96b2233c790d4f1c49317643051f1670bcb29 # good: [7b3708dc3bf72a647243064fe7ddf9a76248ddfd] {x86,powerpc,microblaze}/kmap: move preempt disable git bisect good 7b3708dc3bf72a647243064fe7ddf9a76248ddfd # first bad commit: [60f96b2233c790d4f1c49317643051f1670bcb29] arch/kmap_atomic: consolidate duplicate code
On Sat, May 16, 2020 at 03:33:06PM -0700, Guenter Roeck wrote: > On Thu, May 07, 2020 at 07:59:55AM -0700, ira.weiny@intel.com wrote: > > From: Ira Weiny <ira.weiny@intel.com> > > > > Every single architecture (including !CONFIG_HIGHMEM) calls... > > > > pagefault_enable(); > > preempt_enable(); > > > > ... before returning from __kunmap_atomic(). Lift this code into the > > kunmap_atomic() macro. > > > > While we are at it rename __kunmap_atomic() to kunmap_atomic_high() to > > be consistent. > > > > Reviewed-by: Christoph Hellwig <hch@lst.de> > > Signed-off-by: Ira Weiny <ira.weiny@intel.com> > > This patch results in: > > Starting init: /bin/sh exists but couldn't execute it (error -14) > > when trying to boot microblazeel:petalogix-ml605 in qemu. Thanks for the report. I'm not readily seeing the issue. Do you have a kernel config? Specifically is CONFIG_HIGHMEM set? > > Bisect log attached. > > Guenter > > --- > # bad: [bdecf38f228bcca73b31ada98b5b7ba1215eb9c9] Add linux-next specific files for 20200515 > # good: [2ef96a5bb12be62ef75b5828c0aab838ebb29cb8] Linux 5.7-rc5 > git bisect start 'HEAD' 'v5.7-rc5' > # good: [3674d7aa7a8e61d993886c2fb7c896c5ef85e988] Merge remote-tracking branch 'crypto/master' > git bisect good 3674d7aa7a8e61d993886c2fb7c896c5ef85e988 > # good: [87f6f21783522e6d62127cf33ae5e95f50874beb] Merge remote-tracking branch 'spi/for-next' > git bisect good 87f6f21783522e6d62127cf33ae5e95f50874beb > # good: [5c428e8277d5d97c85126387d4e00aa5adde4400] Merge remote-tracking branch 'staging/staging-next' > git bisect good 5c428e8277d5d97c85126387d4e00aa5adde4400 > # good: [f68de67ed934e7bdef4799fd7777c86f33f14982] Merge remote-tracking branch 'hyperv/hyperv-next' > git bisect good f68de67ed934e7bdef4799fd7777c86f33f14982 > # bad: [54acd2dc52b069da59639eea0d0c92726f32fb01] mm/memblock: fix a typo in comment "implict"->"implicit" > git bisect bad 54acd2dc52b069da59639eea0d0c92726f32fb01 > # good: [784a17aa58a529b84f7cc50f351ed4acf3bd11f3] mm: remove the pgprot argument to __vmalloc > git bisect good 784a17aa58a529b84f7cc50f351ed4acf3bd11f3 > # good: [6cd8137ff37e9a37aee2d2a8889c8beb8eab192f] khugepaged: replace the usage of system(3) in the test > git bisect good 6cd8137ff37e9a37aee2d2a8889c8beb8eab192f > # bad: [6987da379826ed01b8a1cf046b67cc8cc10117cc] sparc: remove unnecessary includes > git bisect bad 6987da379826ed01b8a1cf046b67cc8cc10117cc > # good: [bc17b545388f64c09e83e367898e28f60277c584] mm/hugetlb: define a generic fallback for is_hugepage_only_range() > git bisect good bc17b545388f64c09e83e367898e28f60277c584 > # bad: [9b5aa5b43f957f03a1f4a9aff5f7924e2ebbc011] arch-kmap_atomic-consolidate-duplicate-code-checkpatch-fixes > git bisect bad 9b5aa5b43f957f03a1f4a9aff5f7924e2ebbc011 > # good: [0941a38ff0790c1004270f952067a5918a4ba32d] arch/kmap: remove redundant arch specific kmaps > git bisect good 0941a38ff0790c1004270f952067a5918a4ba32d > # good: [56e635a64c2cbfa815c851af10e0f811e809977b] arch-kunmap-remove-duplicate-kunmap-implementations-fix > git bisect good 56e635a64c2cbfa815c851af10e0f811e809977b > # bad: [60f96b2233c790d4f1c49317643051f1670bcb29] arch/kmap_atomic: consolidate duplicate code > git bisect bad 60f96b2233c790d4f1c49317643051f1670bcb29 > # good: [7b3708dc3bf72a647243064fe7ddf9a76248ddfd] {x86,powerpc,microblaze}/kmap: move preempt disable > git bisect good 7b3708dc3bf72a647243064fe7ddf9a76248ddfd > # first bad commit: [60f96b2233c790d4f1c49317643051f1670bcb29] arch/kmap_atomic: consolidate duplicate code I'm confused by this. This points to an earlier commit being bad? commit 60f96b2233c790d4f1c49317643051f1670bcb29 Author: Ira Weiny <ira.weiny@intel.com> Date: Thu May 14 13:39:54 2020 +1000 arch/kmap_atomic: consolidate duplicate code Every arch has the same code to ensure atomic operations and a check for !HIGHMEM page. Remove the duplicate code by defining a core kmap_atomic() which only calls the arch specific kmap_atomic_high() when the page is high memory. Link: http://lkml.kernel.org/r/20200507150004.1423069-7-ira.weiny@intel.com Signed-off-by: Ira Weiny <ira.weiny@intel.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: Andy Lutomirski <luto@kernel.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Borislav Petkov <bp@alien8.de> Cc: Christian König <christian.koenig@amd.com> Cc: Chris Zankel <chris@zankel.net> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Dan Williams <dan.j.williams@intel.com> Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: "David S. Miller" <davem@davemloft.net> Cc: Helge Deller <deller@gmx.de> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com> Cc: Max Filippov <jcmvbkbc@gmail.com> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Cc: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Any idea which one it is? Ira
On Sun, May 17, 2020 at 08:49:39PM -0700, Ira Weiny wrote: > On Sat, May 16, 2020 at 03:33:06PM -0700, Guenter Roeck wrote: > > On Thu, May 07, 2020 at 07:59:55AM -0700, ira.weiny@intel.com wrote: > > > From: Ira Weiny <ira.weiny@intel.com> > > > > > > Every single architecture (including !CONFIG_HIGHMEM) calls... > > > > > > pagefault_enable(); > > > preempt_enable(); > > > > > > ... before returning from __kunmap_atomic(). Lift this code into the > > > kunmap_atomic() macro. > > > > > > While we are at it rename __kunmap_atomic() to kunmap_atomic_high() to > > > be consistent. > > > > > > Reviewed-by: Christoph Hellwig <hch@lst.de> > > > Signed-off-by: Ira Weiny <ira.weiny@intel.com> > > > > This patch results in: > > > > Starting init: /bin/sh exists but couldn't execute it (error -14) > > > > when trying to boot microblazeel:petalogix-ml605 in qemu. > > Thanks for the report. I'm not readily seeing the issue. > > Do you have a kernel config? Specifically is CONFIG_HIGHMEM set? > See below. Yes, CONFIG_HIGHMEM is set. The scripts used to build and boot the image are at: https://github.com/groeck/linux-build-test/tree/master/rootfs/microblazeel Hope this helps, Guenter --- CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y CONFIG_AUDIT=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_SYSFS_DEPRECATED=y CONFIG_SYSFS_DEPRECATED_V2=y CONFIG_BLK_DEV_INITRD=y # CONFIG_BASE_FULL is not set CONFIG_KALLSYMS_ALL=y CONFIG_EMBEDDED=y CONFIG_SLAB=y CONFIG_KERNEL_BASE_ADDR=0x50000000 CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR=1 CONFIG_XILINX_MICROBLAZE0_USE_PCMP_INSTR=1 CONFIG_XILINX_MICROBLAZE0_USE_BARREL=1 CONFIG_XILINX_MICROBLAZE0_USE_DIV=1 CONFIG_XILINX_MICROBLAZE0_USE_HW_MUL=2 CONFIG_XILINX_MICROBLAZE0_USE_FPU=2 CONFIG_XILINX_MICROBLAZE0_HW_VER="10.0.a" CONFIG_HZ_100=y CONFIG_MMU=y CONFIG_HIGHMEM=y CONFIG_PCI_XILINX=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y # CONFIG_BLK_DEV_BSG is not set CONFIG_PARTITION_ADVANCED=y # CONFIG_EFI_PARTITION is not set CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_INET=y # CONFIG_IPV6 is not set CONFIG_BRIDGE=m CONFIG_PCI=y CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_MTD=y CONFIG_MTD_CFI=y CONFIG_MTD_CFI_INTELEXT=y CONFIG_MTD_CFI_AMDSTD=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_SIZE=8192 CONFIG_NETDEVICES=y CONFIG_XILINX_EMACLITE=y CONFIG_XILINX_LL_TEMAC=y # CONFIG_INPUT is not set # CONFIG_SERIO is not set # CONFIG_VT is not set CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_OF_PLATFORM=y CONFIG_SERIAL_UARTLITE=y CONFIG_SERIAL_UARTLITE_CONSOLE=y # CONFIG_HW_RANDOM is not set CONFIG_XILINX_HWICAP=y CONFIG_I2C=y CONFIG_I2C_XILINX=y CONFIG_SPI=y CONFIG_SPI_XILINX=y CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y CONFIG_GPIO_XILINX=y # CONFIG_HWMON is not set CONFIG_WATCHDOG=y CONFIG_XILINX_WATCHDOG=y CONFIG_FB=y CONFIG_FB_XILINX=y # CONFIG_USB_SUPPORT is not set CONFIG_UIO=y CONFIG_UIO_PDRV_GENIRQ=y CONFIG_UIO_DMEM_GENIRQ=y CONFIG_EXT2_FS=y # CONFIG_DNOTIFY is not set CONFIG_CRAMFS=y CONFIG_ROMFS_FS=y CONFIG_NFS_FS=y CONFIG_CIFS=y CONFIG_CIFS_STATS2=y CONFIG_ENCRYPTED_KEYS=y CONFIG_DEBUG_INFO=y CONFIG_KGDB=y CONFIG_KGDB_TESTS=y CONFIG_KGDB_KDB=y CONFIG_DEBUG_SLAB=y CONFIG_DETECT_HUNG_TASK=y CONFIG_DEBUG_SPINLOCK=y
On Sun, May 17, 2020 at 08:49:39PM -0700, Ira Weiny wrote: [ ... ] > > > > --- > > # bad: [bdecf38f228bcca73b31ada98b5b7ba1215eb9c9] Add linux-next specific files for 20200515 > > # good: [2ef96a5bb12be62ef75b5828c0aab838ebb29cb8] Linux 5.7-rc5 > > git bisect start 'HEAD' 'v5.7-rc5' > > # good: [3674d7aa7a8e61d993886c2fb7c896c5ef85e988] Merge remote-tracking branch 'crypto/master' > > git bisect good 3674d7aa7a8e61d993886c2fb7c896c5ef85e988 > > # good: [87f6f21783522e6d62127cf33ae5e95f50874beb] Merge remote-tracking branch 'spi/for-next' > > git bisect good 87f6f21783522e6d62127cf33ae5e95f50874beb > > # good: [5c428e8277d5d97c85126387d4e00aa5adde4400] Merge remote-tracking branch 'staging/staging-next' > > git bisect good 5c428e8277d5d97c85126387d4e00aa5adde4400 > > # good: [f68de67ed934e7bdef4799fd7777c86f33f14982] Merge remote-tracking branch 'hyperv/hyperv-next' > > git bisect good f68de67ed934e7bdef4799fd7777c86f33f14982 > > # bad: [54acd2dc52b069da59639eea0d0c92726f32fb01] mm/memblock: fix a typo in comment "implict"->"implicit" > > git bisect bad 54acd2dc52b069da59639eea0d0c92726f32fb01 > > # good: [784a17aa58a529b84f7cc50f351ed4acf3bd11f3] mm: remove the pgprot argument to __vmalloc > > git bisect good 784a17aa58a529b84f7cc50f351ed4acf3bd11f3 > > # good: [6cd8137ff37e9a37aee2d2a8889c8beb8eab192f] khugepaged: replace the usage of system(3) in the test > > git bisect good 6cd8137ff37e9a37aee2d2a8889c8beb8eab192f > > # bad: [6987da379826ed01b8a1cf046b67cc8cc10117cc] sparc: remove unnecessary includes > > git bisect bad 6987da379826ed01b8a1cf046b67cc8cc10117cc > > # good: [bc17b545388f64c09e83e367898e28f60277c584] mm/hugetlb: define a generic fallback for is_hugepage_only_range() > > git bisect good bc17b545388f64c09e83e367898e28f60277c584 > > # bad: [9b5aa5b43f957f03a1f4a9aff5f7924e2ebbc011] arch-kmap_atomic-consolidate-duplicate-code-checkpatch-fixes > > git bisect bad 9b5aa5b43f957f03a1f4a9aff5f7924e2ebbc011 > > # good: [0941a38ff0790c1004270f952067a5918a4ba32d] arch/kmap: remove redundant arch specific kmaps > > git bisect good 0941a38ff0790c1004270f952067a5918a4ba32d > > # good: [56e635a64c2cbfa815c851af10e0f811e809977b] arch-kunmap-remove-duplicate-kunmap-implementations-fix > > git bisect good 56e635a64c2cbfa815c851af10e0f811e809977b > > # bad: [60f96b2233c790d4f1c49317643051f1670bcb29] arch/kmap_atomic: consolidate duplicate code > > git bisect bad 60f96b2233c790d4f1c49317643051f1670bcb29 > > # good: [7b3708dc3bf72a647243064fe7ddf9a76248ddfd] {x86,powerpc,microblaze}/kmap: move preempt disable > > git bisect good 7b3708dc3bf72a647243064fe7ddf9a76248ddfd > > # first bad commit: [60f96b2233c790d4f1c49317643051f1670bcb29] arch/kmap_atomic: consolidate duplicate code > > I'm confused by this. This points to an earlier commit being bad? > Yes, you are correct. I was looking up the wrong commit; it had a similar subject line. Sorry for the confusion. Guenter
On Sun, May 17, 2020 at 09:29:32PM -0700, Guenter Roeck wrote: > On Sun, May 17, 2020 at 08:49:39PM -0700, Ira Weiny wrote: > > On Sat, May 16, 2020 at 03:33:06PM -0700, Guenter Roeck wrote: > > > On Thu, May 07, 2020 at 07:59:55AM -0700, ira.weiny@intel.com wrote: > > > > From: Ira Weiny <ira.weiny@intel.com> > > > > > > > > Every single architecture (including !CONFIG_HIGHMEM) calls... > > > > > > > > pagefault_enable(); > > > > preempt_enable(); > > > > > > > > ... before returning from __kunmap_atomic(). Lift this code into the > > > > kunmap_atomic() macro. > > > > > > > > While we are at it rename __kunmap_atomic() to kunmap_atomic_high() to > > > > be consistent. > > > > > > > > Reviewed-by: Christoph Hellwig <hch@lst.de> > > > > Signed-off-by: Ira Weiny <ira.weiny@intel.com> > > > > > > This patch results in: > > > > > > Starting init: /bin/sh exists but couldn't execute it (error -14) > > > > > > when trying to boot microblazeel:petalogix-ml605 in qemu. > > > > Thanks for the report. I'm not readily seeing the issue. > > > > Do you have a kernel config? Specifically is CONFIG_HIGHMEM set? > > > See below. Yes, CONFIG_HIGHMEM is set. > > The scripts used to build and boot the image are at: > > https://github.com/groeck/linux-build-test/tree/master/rootfs/microblazeel > > Hope this helps, Thank you ... Could you try the following patch? commit 82c284b2bb74ca195dfcd35b70a175f010b9fd46 (HEAD -> lm-kmap17) Author: Ira Weiny <ira.weiny@intel.com> Date: Mon May 18 11:01:10 2020 -0700 microblaze/kmap: Don't enable pagefault/preempt twice The kunmap_atomic clean up failed to remove the pagefault/preempt enables on this path. Fixes: bee2128a09e6 ("arch/kunmap_atomic: consolidate duplicate code") Signed-off-by: Ira Weiny <ira.weiny@intel.com> diff --git a/arch/microblaze/mm/highmem.c b/arch/microblaze/mm/highmem.c index ee8a422b2b76..92e0890416c9 100644 --- a/arch/microblaze/mm/highmem.c +++ b/arch/microblaze/mm/highmem.c @@ -57,11 +57,8 @@ void kunmap_atomic_high(void *kvaddr) int type; unsigned int idx; - if (vaddr < __fix_to_virt(FIX_KMAP_END)) { - pagefault_enable(); - preempt_enable(); + if (vaddr < __fix_to_virt(FIX_KMAP_END)) return; - } type = kmap_atomic_idx();
On Sun, May 17, 2020 at 09:29:32PM -0700, Guenter Roeck wrote: > On Sun, May 17, 2020 at 08:49:39PM -0700, Ira Weiny wrote: > > On Sat, May 16, 2020 at 03:33:06PM -0700, Guenter Roeck wrote: > > > On Thu, May 07, 2020 at 07:59:55AM -0700, ira.weiny@intel.com wrote: > > > > From: Ira Weiny <ira.weiny@intel.com> > > > > > > > > Every single architecture (including !CONFIG_HIGHMEM) calls... > > > > > > > > pagefault_enable(); > > > > preempt_enable(); > > > > > > > > ... before returning from __kunmap_atomic(). Lift this code into the > > > > kunmap_atomic() macro. > > > > > > > > While we are at it rename __kunmap_atomic() to kunmap_atomic_high() to > > > > be consistent. > > > > > > > > Reviewed-by: Christoph Hellwig <hch@lst.de> > > > > Signed-off-by: Ira Weiny <ira.weiny@intel.com> > > > > > > This patch results in: > > > > > > Starting init: /bin/sh exists but couldn't execute it (error -14) > > > > > > when trying to boot microblazeel:petalogix-ml605 in qemu. > > > > Thanks for the report. I'm not readily seeing the issue. > > > > Do you have a kernel config? Specifically is CONFIG_HIGHMEM set? > > > See below. Yes, CONFIG_HIGHMEM is set. > > The scripts used to build and boot the image are at: > > https://github.com/groeck/linux-build-test/tree/master/rootfs/microblazeel Despite finding the obvious error earlier today I've still been trying to get this to work. I had to make some slight modifications to use the 0-day cross compile build and my local qemu build. But those were pretty minor modifications. I'm running on x86_64 host. With those slight mods to the scripts I get the following error even without my patch set on 5.7-rc4. I have 1 cpu pegged at 100% while it is running... Is there anything I can do to get more debug output? Perhaps I just need to let it run longer? Thanks, Ira 16:46:54 > ../linux-build-test/rootfs/microblazeel/run-qemu-microblazeel.sh Build reference: v5.7-rc4-2-g7c2411d7fb6a Building microblaze:petalogix-s3adsp1800:qemu_microblazeel_defconfig ... running ................ failed (silent) ------------ qemu log: qemu-system-microblazeel: terminating on signal 15 from pid 3277686 (/bin/bash) ------------ Building microblaze:petalogix-ml605:qemu_microblazeel_ml605_defconfig ... running ................ failed (silent) ------------ qemu log: qemu-system-microblazeel: terminating on signal 15 from pid 3277686 (/bin/bash) ------------ <env changes> 16:47:23 > git di diff --git a/rootfs/microblazeel/run-qemu-microblazeel.sh b/rootfs/microblazeel/run-qemu-microblazeel.sh index 68d4de39ab50..0d6a4f85308f 100755 --- a/rootfs/microblazeel/run-qemu-microblazeel.sh +++ b/rootfs/microblazeel/run-qemu-microblazeel.sh @@ -3,7 +3,8 @@ dir=$(cd $(dirname $0); pwd) . ${dir}/../scripts/common.sh -QEMU=${QEMU:-${QEMU_BIN}/qemu-system-microblazeel} +#QEMU=${QEMU:-${QEMU_BIN}/qemu-system-microblazeel} +QEMU=/home/iweiny/dev/qemu/microblazeel-softmmu/qemu-system-microblazeel PREFIX=microblazeel-linux- ARCH=microblaze PATH_MICROBLAZE=/opt/kernel/microblazeel/gcc-4.9.1/usr/bin diff --git a/rootfs/scripts/common.sh b/rootfs/scripts/common.sh index 8fa6a9be2b2f..c4550a27beaa 100644 --- a/rootfs/scripts/common.sh +++ b/rootfs/scripts/common.sh @@ -1,5 +1,9 @@ #!/bin/bash +# Set up make.cross +export COMPILER_INSTALL_PATH=$HOME/0day +export GCC_VERSION=6.5.0 + # Set the following variable to true to skip DC395/AM53C97 build tests __skip_dc395=0 @@ -569,7 +573,7 @@ doclean() then git clean -x -d -f -q else - make ARCH=${ARCH} mrproper >/dev/null 2>&1 + make.cross ARCH=${ARCH} mrproper >/dev/null 2>&1 fi } @@ -669,7 +673,7 @@ __setup_config() cp ${__progdir}/${defconfig} arch/${arch}/configs fi - if ! make ARCH=${ARCH} CROSS_COMPILE=${PREFIX} ${defconfig} >/dev/null 2>&1 </dev/null; then + if ! make.cross ARCH=${ARCH} ${defconfig} >/dev/null 2>&1 </dev/null; then return 2 fi @@ -687,7 +691,7 @@ __setup_config() if [[ "${rel}" = "v3.16" ]]; then target="oldconfig" fi - if ! make ARCH=${ARCH} CROSS_COMPILE=${PREFIX} ${target} >/dev/null 2>&1 </dev/null; then + if ! make.cross ARCH=${ARCH} ${target} >/dev/null 2>&1 </dev/null; then return 1 fi fi @@ -1038,7 +1042,7 @@ dosetup() rootfs="$(setup_rootfs ${dynamic} ${rootfs})" __common_fixups "${fixups}" "${rootfs}" - make -j${maxload} ARCH=${ARCH} CROSS_COMPILE=${PREFIX} ${EXTRAS} </dev/null >/dev/null 2>${logfile} + make.cross -j${maxload} ARCH=${ARCH} ${EXTRAS} </dev/null >/dev/null 2>${logfile} rv=$? if [ ${rv} -ne 0 ] then </env changes>
Hi Ira, On 5/18/20 5:03 PM, Ira Weiny wrote: > On Sun, May 17, 2020 at 09:29:32PM -0700, Guenter Roeck wrote: >> On Sun, May 17, 2020 at 08:49:39PM -0700, Ira Weiny wrote: >>> On Sat, May 16, 2020 at 03:33:06PM -0700, Guenter Roeck wrote: >>>> On Thu, May 07, 2020 at 07:59:55AM -0700, ira.weiny@intel.com wrote: >>>>> From: Ira Weiny <ira.weiny@intel.com> >>>>> >>>>> Every single architecture (including !CONFIG_HIGHMEM) calls... >>>>> >>>>> pagefault_enable(); >>>>> preempt_enable(); >>>>> >>>>> ... before returning from __kunmap_atomic(). Lift this code into the >>>>> kunmap_atomic() macro. >>>>> >>>>> While we are at it rename __kunmap_atomic() to kunmap_atomic_high() to >>>>> be consistent. >>>>> >>>>> Reviewed-by: Christoph Hellwig <hch@lst.de> >>>>> Signed-off-by: Ira Weiny <ira.weiny@intel.com> >>>> >>>> This patch results in: >>>> >>>> Starting init: /bin/sh exists but couldn't execute it (error -14) >>>> >>>> when trying to boot microblazeel:petalogix-ml605 in qemu. >>> >>> Thanks for the report. I'm not readily seeing the issue. >>> >>> Do you have a kernel config? Specifically is CONFIG_HIGHMEM set? >>> >> See below. Yes, CONFIG_HIGHMEM is set. >> >> The scripts used to build and boot the image are at: >> >> https://github.com/groeck/linux-build-test/tree/master/rootfs/microblazeel > > Despite finding the obvious error earlier today I've still been trying to get > this to work. > > I had to make some slight modifications to use the 0-day cross compile build > and my local qemu build. But those were pretty minor modifications. I'm > running on x86_64 host. > > With those slight mods to the scripts I get the following error even without my > patch set on 5.7-rc4. I have 1 cpu pegged at 100% while it is running... Is > there anything I can do to get more debug output? Perhaps I just need to let > it run longer? > I don't think so. Try running it with "-d" parameter (run-qemu-microblazeel.sh -d petalogix-s3adsp1800); that gives you the qemu command line. Once it says "running", abort the script and execute qemu directly. Oh, and please update the repository; turns out I didn't push for a while and made a number of changes. My compiler was compiled with buildroot (a long time ago). I don't recall if it needed something special in the configuration, unfortunately. Guenter > Thanks, > Ira > > 16:46:54 > ../linux-build-test/rootfs/microblazeel/run-qemu-microblazeel.sh > Build reference: v5.7-rc4-2-g7c2411d7fb6a > > Building microblaze:petalogix-s3adsp1800:qemu_microblazeel_defconfig ... > running ................ failed (silent) > ------------ > qemu log: > qemu-system-microblazeel: terminating on signal 15 from pid 3277686 (/bin/bash) > ------------ > Building microblaze:petalogix-ml605:qemu_microblazeel_ml605_defconfig ... > running ................ failed (silent) > ------------ > qemu log: > qemu-system-microblazeel: terminating on signal 15 from pid 3277686 (/bin/bash) > ------------ > > <env changes> > 16:47:23 > git di > diff --git a/rootfs/microblazeel/run-qemu-microblazeel.sh b/rootfs/microblazeel/run-qemu-microblazeel.sh > index 68d4de39ab50..0d6a4f85308f 100755 > --- a/rootfs/microblazeel/run-qemu-microblazeel.sh > +++ b/rootfs/microblazeel/run-qemu-microblazeel.sh > @@ -3,7 +3,8 @@ > dir=$(cd $(dirname $0); pwd) > . ${dir}/../scripts/common.sh > > -QEMU=${QEMU:-${QEMU_BIN}/qemu-system-microblazeel} > +#QEMU=${QEMU:-${QEMU_BIN}/qemu-system-microblazeel} > +QEMU=/home/iweiny/dev/qemu/microblazeel-softmmu/qemu-system-microblazeel > PREFIX=microblazeel-linux- > ARCH=microblaze > PATH_MICROBLAZE=/opt/kernel/microblazeel/gcc-4.9.1/usr/bin > diff --git a/rootfs/scripts/common.sh b/rootfs/scripts/common.sh > index 8fa6a9be2b2f..c4550a27beaa 100644 > --- a/rootfs/scripts/common.sh > +++ b/rootfs/scripts/common.sh > @@ -1,5 +1,9 @@ > #!/bin/bash > > +# Set up make.cross > +export COMPILER_INSTALL_PATH=$HOME/0day > +export GCC_VERSION=6.5.0 > + > # Set the following variable to true to skip DC395/AM53C97 build tests > __skip_dc395=0 > > @@ -569,7 +573,7 @@ doclean() > then > git clean -x -d -f -q > else > - make ARCH=${ARCH} mrproper >/dev/null 2>&1 > + make.cross ARCH=${ARCH} mrproper >/dev/null 2>&1 > fi > } > > @@ -669,7 +673,7 @@ __setup_config() > cp ${__progdir}/${defconfig} arch/${arch}/configs > fi > > - if ! make ARCH=${ARCH} CROSS_COMPILE=${PREFIX} ${defconfig} >/dev/null 2>&1 </dev/null; then > + if ! make.cross ARCH=${ARCH} ${defconfig} >/dev/null 2>&1 </dev/null; then > return 2 > fi > > @@ -687,7 +691,7 @@ __setup_config() > if [[ "${rel}" = "v3.16" ]]; then > target="oldconfig" > fi > - if ! make ARCH=${ARCH} CROSS_COMPILE=${PREFIX} ${target} >/dev/null 2>&1 </dev/null; then > + if ! make.cross ARCH=${ARCH} ${target} >/dev/null 2>&1 </dev/null; then > return 1 > fi > fi > @@ -1038,7 +1042,7 @@ dosetup() > rootfs="$(setup_rootfs ${dynamic} ${rootfs})" > __common_fixups "${fixups}" "${rootfs}" > > - make -j${maxload} ARCH=${ARCH} CROSS_COMPILE=${PREFIX} ${EXTRAS} </dev/null >/dev/null 2>${logfile} > + make.cross -j${maxload} ARCH=${ARCH} ${EXTRAS} </dev/null >/dev/null 2>${logfile} > rv=$? > if [ ${rv} -ne 0 ] > then > > </env changes> >
On Mon, May 18, 2020 at 07:50:36PM -0700, Guenter Roeck wrote: > Hi Ira, > > On 5/18/20 5:03 PM, Ira Weiny wrote: > > On Sun, May 17, 2020 at 09:29:32PM -0700, Guenter Roeck wrote: > >> On Sun, May 17, 2020 at 08:49:39PM -0700, Ira Weiny wrote: > >>> On Sat, May 16, 2020 at 03:33:06PM -0700, Guenter Roeck wrote: > >>>> On Thu, May 07, 2020 at 07:59:55AM -0700, ira.weiny@intel.com wrote: > >>>>> From: Ira Weiny <ira.weiny@intel.com> > >>>>> > >>> Sorry for the delay I missed this email last night... I blame outlook... ;-) ... > >>> Do you have a kernel config? Specifically is CONFIG_HIGHMEM set? > >>> > >> See below. Yes, CONFIG_HIGHMEM is set. > >> > >> The scripts used to build and boot the image are at: > >> > >> https://github.com/groeck/linux-build-test/tree/master/rootfs/microblazeel > > > > Despite finding the obvious error earlier today I've still been trying to get > > this to work. > > > > I had to make some slight modifications to use the 0-day cross compile build > > and my local qemu build. But those were pretty minor modifications. I'm > > running on x86_64 host. > > > > With those slight mods to the scripts I get the following error even without my > > patch set on 5.7-rc4. I have 1 cpu pegged at 100% while it is running... Is > > there anything I can do to get more debug output? Perhaps I just need to let > > it run longer? > > > > I don't think so. Try running it with "-d" parameter (run-qemu-microblazeel.sh > -d petalogix-s3adsp1800); that gives you the qemu command line. Once it says > "running", abort the script and execute qemu directly. FYI Minor nit... a simple copy/paste failed... that print of the cmd line did not include quotes around the -append text: 09:06:03 > /home/iweiny/dev/qemu/microblazeel-softmmu/qemu-system-microblazeel -M petalogix-s3adsp1800 -m 256 -kernel arch/microblaze/boot/linux.bin -no-reboot -initrd /tmp/buildbot-cache/microblazeel/rootfs.cpio -append panic=-1 slub_debug=FZPUA rdinit=/sbin/init console=ttyUL0,115200 -monitor none -serial stdio -nographic qemu-system-microblazeel: slub_debug=FZPUA: Could not open 'slub_debug=FZPUA': No such file or directory > Oh, and please update > the repository; turns out I didn't push for a while and made a number of > changes. Cool beans... I've updated. > > My compiler was compiled with buildroot (a long time ago). I don't recall if > it needed something special in the configuration, unfortunately. AFAICT the compile is working... It is running from the command line now... I expected it to be slow so I have also increased the timeouts last night. So far it still fails. I did notice that there is a new 'R' in the wait output. <quote> .........................R......................... failed (silent) ------------ qemu log: qemu-system-microblazeel: terminating on signal 15 from pid 3357146 (/bin/bash) </quote> I was hoping that meant it found qemu 'running' but looks like that was just a retry... :-( Last night I increased some of the timeouts I could find. <quote> LOOPTIME=5 # Wait time before checking status -MAXTIME=150 # Maximum wait time for qemu session to complete -MAXSTIME=60 # Maximum wait time for qemu session to generate output +#MAXTIME=150 # Maximum wait time for qemu session to complete +#MAXSTIME=60 # Maximum wait time for qemu session to generate output +MAXTIME=300 # Maximum wait time for qemu session to complete +MAXSTIME=120 # Maximum wait time for qemu session to generate output </quote> But thanks to the qemu command line hint I can see these were not nearly enough... (It has been running for > 20 minutes... and I'm not getting output...) Or I've done something really wrong. Shouldn't qemu be at least showing something on the terminal by now? I normally run qemu with different display options (and my qemu foo is weak) so I'm not sure what I should be seeing with this command line. 09:06:28 > /home/iweiny/dev/qemu/microblazeel-softmmu/qemu-system-microblazeel -M petalogix-s3adsp1800 -m 256 -kernel arch/microblaze/boot/linux.bin -no-reboot -initrd /tmp/buildbot-cache/microblazeel/rootfs.cpio -append "panic=-1 slub_debug=FZPUA rdinit=/sbin/init console=ttyUL0,115200" -monitor none -serial stdio -nographic Maybe I just have too slow of a machine... :-/ My qemu was built back in March. I'm updating that now... Sorry for being so dense... Ira
diff --git a/arch/arc/include/asm/highmem.h b/arch/arc/include/asm/highmem.h index db425cd38545..70900a73bfc8 100644 --- a/arch/arc/include/asm/highmem.h +++ b/arch/arc/include/asm/highmem.h @@ -30,8 +30,6 @@ #include <asm/cacheflush.h> -extern void __kunmap_atomic(void *kvaddr); - extern void kmap_init(void); static inline void flush_cache_kmaps(void) diff --git a/arch/arc/mm/highmem.c b/arch/arc/mm/highmem.c index 0964b011c29f..5d3eab4ac0b0 100644 --- a/arch/arc/mm/highmem.c +++ b/arch/arc/mm/highmem.c @@ -65,7 +65,7 @@ void *kmap_atomic_high(struct page *page) } EXPORT_SYMBOL(kmap_atomic_high); -void __kunmap_atomic(void *kv) +void kunmap_atomic_high(void *kv) { unsigned long kvaddr = (unsigned long)kv; @@ -87,11 +87,8 @@ void __kunmap_atomic(void *kv) kmap_atomic_idx_pop(); } - - pagefault_enable(); - preempt_enable(); } -EXPORT_SYMBOL(__kunmap_atomic); +EXPORT_SYMBOL(kunmap_atomic_high); static noinline pte_t * __init alloc_kmap_pgtable(unsigned long kvaddr) { diff --git a/arch/arm/include/asm/highmem.h b/arch/arm/include/asm/highmem.h index 8c80bfe18a34..b0d4bd8dc3c1 100644 --- a/arch/arm/include/asm/highmem.h +++ b/arch/arm/include/asm/highmem.h @@ -60,7 +60,6 @@ static inline void *kmap_high_get(struct page *page) * when CONFIG_HIGHMEM is not set. */ #ifdef CONFIG_HIGHMEM -extern void __kunmap_atomic(void *kvaddr); extern void *kmap_atomic_pfn(unsigned long pfn); #endif diff --git a/arch/arm/mm/highmem.c b/arch/arm/mm/highmem.c index 075fdc235091..ac8394655a6e 100644 --- a/arch/arm/mm/highmem.c +++ b/arch/arm/mm/highmem.c @@ -73,7 +73,7 @@ void *kmap_atomic_high(struct page *page) } EXPORT_SYMBOL(kmap_atomic_high); -void __kunmap_atomic(void *kvaddr) +void kunmap_atomic_high(void *kvaddr) { unsigned long vaddr = (unsigned long) kvaddr & PAGE_MASK; int idx, type; @@ -95,10 +95,8 @@ void __kunmap_atomic(void *kvaddr) /* this address was obtained through kmap_high_get() */ kunmap_high(pte_page(pkmap_page_table[PKMAP_NR(vaddr)])); } - pagefault_enable(); - preempt_enable(); } -EXPORT_SYMBOL(__kunmap_atomic); +EXPORT_SYMBOL(kunmap_atomic_high); void *kmap_atomic_pfn(unsigned long pfn) { diff --git a/arch/csky/include/asm/highmem.h b/arch/csky/include/asm/highmem.h index 8ceee12f9bc1..263fbddcd0a3 100644 --- a/arch/csky/include/asm/highmem.h +++ b/arch/csky/include/asm/highmem.h @@ -32,7 +32,6 @@ extern pte_t *pkmap_page_table; #define ARCH_HAS_KMAP_FLUSH_TLB extern void kmap_flush_tlb(unsigned long addr); -extern void __kunmap_atomic(void *kvaddr); extern void *kmap_atomic_pfn(unsigned long pfn); extern struct page *kmap_atomic_to_page(void *ptr); diff --git a/arch/csky/mm/highmem.c b/arch/csky/mm/highmem.c index 63d74b47eee6..0aafbbbe651c 100644 --- a/arch/csky/mm/highmem.c +++ b/arch/csky/mm/highmem.c @@ -39,13 +39,13 @@ void *kmap_atomic_high(struct page *page) } EXPORT_SYMBOL(kmap_atomic_high); -void __kunmap_atomic(void *kvaddr) +void kunmap_atomic_high(void *kvaddr) { unsigned long vaddr = (unsigned long) kvaddr & PAGE_MASK; int idx; if (vaddr < FIXADDR_START) - goto out; + return; #ifdef CONFIG_DEBUG_HIGHMEM idx = KM_TYPE_NR*smp_processor_id() + kmap_atomic_idx(); @@ -58,11 +58,8 @@ void __kunmap_atomic(void *kvaddr) (void) idx; /* to kill a warning */ #endif kmap_atomic_idx_pop(); -out: - pagefault_enable(); - preempt_enable(); } -EXPORT_SYMBOL(__kunmap_atomic); +EXPORT_SYMBOL(kunmap_atomic_high); /* * This is the same as kmap_atomic() but can map memory that doesn't diff --git a/arch/microblaze/include/asm/highmem.h b/arch/microblaze/include/asm/highmem.h index f7c5467df5ad..c3cbda90391d 100644 --- a/arch/microblaze/include/asm/highmem.h +++ b/arch/microblaze/include/asm/highmem.h @@ -61,7 +61,6 @@ static inline void *kmap_atomic_prot(struct page *page, pgprot_t prot) return kmap_atomic_high_prot(page, prot); } -extern void __kunmap_atomic(void *kvaddr); static inline void *kmap_atomic_high(struct page *page) { diff --git a/arch/microblaze/mm/highmem.c b/arch/microblaze/mm/highmem.c index 0e3efaa8a004..ee8a422b2b76 100644 --- a/arch/microblaze/mm/highmem.c +++ b/arch/microblaze/mm/highmem.c @@ -51,7 +51,7 @@ void *kmap_atomic_high_prot(struct page *page, pgprot_t prot) } EXPORT_SYMBOL(kmap_atomic_high_prot); -void __kunmap_atomic(void *kvaddr) +void kunmap_atomic_high(void *kvaddr) { unsigned long vaddr = (unsigned long) kvaddr & PAGE_MASK; int type; @@ -77,7 +77,5 @@ void __kunmap_atomic(void *kvaddr) local_flush_tlb_page(NULL, vaddr); kmap_atomic_idx_pop(); - pagefault_enable(); - preempt_enable(); } -EXPORT_SYMBOL(__kunmap_atomic); +EXPORT_SYMBOL(kunmap_atomic_high); diff --git a/arch/mips/include/asm/highmem.h b/arch/mips/include/asm/highmem.h index 8bdbbfc322ad..76dec0bd4f59 100644 --- a/arch/mips/include/asm/highmem.h +++ b/arch/mips/include/asm/highmem.h @@ -48,7 +48,6 @@ extern pte_t *pkmap_page_table; #define ARCH_HAS_KMAP_FLUSH_TLB extern void kmap_flush_tlb(unsigned long addr); -extern void __kunmap_atomic(void *kvaddr); extern void *kmap_atomic_pfn(unsigned long pfn); #define flush_cache_kmaps() BUG_ON(cpu_has_dc_aliases) diff --git a/arch/mips/mm/cache.c b/arch/mips/mm/cache.c index f015bb51fab0..1873c2a01fdb 100644 --- a/arch/mips/mm/cache.c +++ b/arch/mips/mm/cache.c @@ -104,7 +104,7 @@ void __flush_dcache_page(struct page *page) flush_data_cache_page(addr); if (PageHighMem(page)) - __kunmap_atomic((void *)addr); + kunmap_atomic((void *)addr); } EXPORT_SYMBOL(__flush_dcache_page); @@ -147,7 +147,7 @@ void __update_cache(unsigned long address, pte_t pte) flush_data_cache_page(addr); if (PageHighMem(page)) - __kunmap_atomic((void *)addr); + kunmap_atomic((void *)addr); ClearPageDcacheDirty(page); } diff --git a/arch/mips/mm/highmem.c b/arch/mips/mm/highmem.c index 2bda56372995..155fbb107b35 100644 --- a/arch/mips/mm/highmem.c +++ b/arch/mips/mm/highmem.c @@ -36,7 +36,7 @@ void *kmap_atomic_high(struct page *page) } EXPORT_SYMBOL(kmap_atomic_high); -void __kunmap_atomic(void *kvaddr) +void kunmap_atomic_high(void *kvaddr) { unsigned long vaddr = (unsigned long) kvaddr & PAGE_MASK; int type __maybe_unused; @@ -63,10 +63,8 @@ void __kunmap_atomic(void *kvaddr) } #endif kmap_atomic_idx_pop(); - pagefault_enable(); - preempt_enable(); } -EXPORT_SYMBOL(__kunmap_atomic); +EXPORT_SYMBOL(kunmap_atomic_high); /* * This is the same as kmap_atomic() but can map memory that doesn't diff --git a/arch/nds32/include/asm/highmem.h b/arch/nds32/include/asm/highmem.h index a3970e566ede..4d21308549c9 100644 --- a/arch/nds32/include/asm/highmem.h +++ b/arch/nds32/include/asm/highmem.h @@ -51,7 +51,6 @@ extern void kmap_init(void); * when CONFIG_HIGHMEM is not set. */ #ifdef CONFIG_HIGHMEM -extern void __kunmap_atomic(void *kvaddr); extern void *kmap_atomic_pfn(unsigned long pfn); extern struct page *kmap_atomic_to_page(void *ptr); #endif diff --git a/arch/nds32/mm/highmem.c b/arch/nds32/mm/highmem.c index f5f3a21460c4..f6e6915c0d31 100644 --- a/arch/nds32/mm/highmem.c +++ b/arch/nds32/mm/highmem.c @@ -34,7 +34,7 @@ void *kmap_atomic_high(struct page *page) EXPORT_SYMBOL(kmap_atomic_high); -void __kunmap_atomic(void *kvaddr) +void kunmap_atomic_high(void *kvaddr) { if (kvaddr >= (void *)FIXADDR_START) { unsigned long vaddr = (unsigned long)kvaddr; @@ -45,8 +45,6 @@ void __kunmap_atomic(void *kvaddr) ptep = pte_offset_kernel(pmd_off_k(vaddr), vaddr); set_pte(ptep, 0); } - pagefault_enable(); - preempt_enable(); } -EXPORT_SYMBOL(__kunmap_atomic); +EXPORT_SYMBOL(kunmap_atomic_high); diff --git a/arch/parisc/include/asm/cacheflush.h b/arch/parisc/include/asm/cacheflush.h index 0c83644bfa5c..119c9a7681bc 100644 --- a/arch/parisc/include/asm/cacheflush.h +++ b/arch/parisc/include/asm/cacheflush.h @@ -122,11 +122,9 @@ static inline void *kmap_atomic(struct page *page) return page_address(page); } -static inline void __kunmap_atomic(void *addr) +static inline void kunmap_atomic_high(void *addr) { flush_kernel_dcache_page_addr(addr); - pagefault_enable(); - preempt_enable(); } #define kmap_atomic_prot(page, prot) kmap_atomic(page) diff --git a/arch/powerpc/include/asm/highmem.h b/arch/powerpc/include/asm/highmem.h index 74fa2c726fde..373a470df205 100644 --- a/arch/powerpc/include/asm/highmem.h +++ b/arch/powerpc/include/asm/highmem.h @@ -69,7 +69,6 @@ static inline void *kmap_atomic_prot(struct page *page, pgprot_t prot) return kmap_atomic_high_prot(page, prot); } -extern void __kunmap_atomic(void *kvaddr); static inline void *kmap_atomic_high(struct page *page) { diff --git a/arch/powerpc/mm/highmem.c b/arch/powerpc/mm/highmem.c index 67aaa5217f7f..35071c2913f1 100644 --- a/arch/powerpc/mm/highmem.c +++ b/arch/powerpc/mm/highmem.c @@ -40,7 +40,7 @@ void *kmap_atomic_high_prot(struct page *page, pgprot_t prot) } EXPORT_SYMBOL(kmap_atomic_high_prot); -void __kunmap_atomic(void *kvaddr) +void kunmap_atomic_high(void *kvaddr) { unsigned long vaddr = (unsigned long) kvaddr & PAGE_MASK; @@ -66,7 +66,5 @@ void __kunmap_atomic(void *kvaddr) } kmap_atomic_idx_pop(); - pagefault_enable(); - preempt_enable(); } -EXPORT_SYMBOL(__kunmap_atomic); +EXPORT_SYMBOL(kunmap_atomic_high); diff --git a/arch/sparc/include/asm/highmem.h b/arch/sparc/include/asm/highmem.h index 458210c5bc38..f4babe67cb5d 100644 --- a/arch/sparc/include/asm/highmem.h +++ b/arch/sparc/include/asm/highmem.h @@ -50,8 +50,6 @@ void kmap_init(void) __init; #define PKMAP_END (PKMAP_ADDR(LAST_PKMAP)) -void __kunmap_atomic(void *kvaddr); - #define flush_cache_kmaps() flush_cache_all() #endif /* __KERNEL__ */ diff --git a/arch/sparc/mm/highmem.c b/arch/sparc/mm/highmem.c index b53070ab6a31..469786bc430f 100644 --- a/arch/sparc/mm/highmem.c +++ b/arch/sparc/mm/highmem.c @@ -84,7 +84,7 @@ void *kmap_atomic_high(struct page *page) } EXPORT_SYMBOL(kmap_atomic_high); -void __kunmap_atomic(void *kvaddr) +void kunmap_atomic_high(void *kvaddr) { unsigned long vaddr = (unsigned long) kvaddr & PAGE_MASK; int type; @@ -126,7 +126,5 @@ void __kunmap_atomic(void *kvaddr) #endif kmap_atomic_idx_pop(); - pagefault_enable(); - preempt_enable(); } -EXPORT_SYMBOL(__kunmap_atomic); +EXPORT_SYMBOL(kunmap_atomic_high); diff --git a/arch/x86/include/asm/highmem.h b/arch/x86/include/asm/highmem.h index 9393d55a2adb..be66b77885a0 100644 --- a/arch/x86/include/asm/highmem.h +++ b/arch/x86/include/asm/highmem.h @@ -72,7 +72,6 @@ static inline void *kmap_atomic_high(struct page *page) { return kmap_atomic_high_prot(page, kmap_prot); } -void __kunmap_atomic(void *kvaddr); void *kmap_atomic_pfn(unsigned long pfn); void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot); diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c index c3e272a759e0..075fe51317b0 100644 --- a/arch/x86/mm/highmem_32.c +++ b/arch/x86/mm/highmem_32.c @@ -30,7 +30,7 @@ void *kmap_atomic_pfn(unsigned long pfn) } EXPORT_SYMBOL_GPL(kmap_atomic_pfn); -void __kunmap_atomic(void *kvaddr) +void kunmap_atomic_high(void *kvaddr) { unsigned long vaddr = (unsigned long) kvaddr & PAGE_MASK; @@ -60,11 +60,8 @@ void __kunmap_atomic(void *kvaddr) BUG_ON(vaddr >= (unsigned long)high_memory); } #endif - - pagefault_enable(); - preempt_enable(); } -EXPORT_SYMBOL(__kunmap_atomic); +EXPORT_SYMBOL(kunmap_atomic_high); void __init set_highmem_pages_init(void) { diff --git a/arch/xtensa/include/asm/highmem.h b/arch/xtensa/include/asm/highmem.h index 1e6aa15c4bdf..d6a10704307a 100644 --- a/arch/xtensa/include/asm/highmem.h +++ b/arch/xtensa/include/asm/highmem.h @@ -68,8 +68,6 @@ static inline void flush_cache_kmaps(void) flush_cache_all(); } -void __kunmap_atomic(void *kvaddr); - void kmap_init(void); #endif diff --git a/arch/xtensa/mm/highmem.c b/arch/xtensa/mm/highmem.c index 90b85a897cb0..4de323e43682 100644 --- a/arch/xtensa/mm/highmem.c +++ b/arch/xtensa/mm/highmem.c @@ -54,7 +54,7 @@ void *kmap_atomic_high(struct page *page) } EXPORT_SYMBOL(kmap_atomic_high); -void __kunmap_atomic(void *kvaddr) +void kunmap_atomic_high(void *kvaddr) { if (kvaddr >= (void *)FIXADDR_START && kvaddr < (void *)FIXADDR_TOP) { @@ -73,11 +73,8 @@ void __kunmap_atomic(void *kvaddr) kmap_atomic_idx_pop(); } - - pagefault_enable(); - preempt_enable(); } -EXPORT_SYMBOL(__kunmap_atomic); +EXPORT_SYMBOL(kunmap_atomic_high); void __init kmap_init(void) { diff --git a/include/linux/highmem.h b/include/linux/highmem.h index 86b93dee758a..c36c0ee09423 100644 --- a/include/linux/highmem.h +++ b/include/linux/highmem.h @@ -33,6 +33,7 @@ static inline void invalidate_kernel_vmap_range(void *vaddr, int size) #ifdef CONFIG_HIGHMEM extern void *kmap_atomic_high(struct page *page); +extern void kunmap_atomic_high(void *kvaddr); #include <asm/highmem.h> #ifndef ARCH_HAS_KMAP_FLUSH_TLB @@ -146,10 +147,10 @@ static inline void *kmap_atomic(struct page *page) } #define kmap_atomic_prot(page, prot) kmap_atomic(page) -static inline void __kunmap_atomic(void *addr) +static inline void kunmap_atomic_high(void *addr) { - pagefault_enable(); - preempt_enable(); + /* Nothing to do in the CONFIG_HIGHMEM=n case as kunmap_atomic() + * handles re-enabling faults + preemption */ } #define kmap_atomic_pfn(pfn) kmap_atomic(pfn_to_page(pfn)) @@ -199,7 +200,9 @@ static inline void kmap_atomic_idx_pop(void) #define kunmap_atomic(addr) \ do { \ BUILD_BUG_ON(__same_type((addr), struct page *)); \ - __kunmap_atomic(addr); \ + kunmap_atomic_high(addr); \ + pagefault_enable(); \ + preempt_enable(); \ } while (0)