Skip to contentSkip to conversation

linux-next: Tree for November 17

PATCH In review Stephen Rothwell 11 participants 25 messages Nov 17, 2009 – Nov 19, 2009

Subsystems (5)
Staging Linux-next tree MIPS s390 +1 more subsystems
lore
Share & tools
lore
#0 lore raw

Hi all,

Changes since 20091116:

New tree:
edac-amd (returned rather than new)

The mips tree lost its conflicts.

The kvm tree lost its conflict.

The net tree gained a conflict against the net-current tree.

The trivial tree gained conflicts against the wireless and pci trees.

The tip tree lost its build error in the sparc build.

The sysctl tree gained conflicts against Linus' and the net trees.

----------------------------------------------------------------------------

I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/v2.6/next/ ). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" as mentioned in the FAQ on the wiki (see below).

You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the final fixups (if any), it is also built with powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig and allyesconfig (minus CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc and sparc64 defconfig. These builds also have CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and CONFIG_DEBUG_INFO disabled when necessary.

Below is a summary of the state of the merge.

We are up to 151 trees (counting Linus' and 22 trees of patches pending for Linus' tree), more are welcome (even if they are currently empty). Thanks to those who have contributed, and to those who haven't, please do.

Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds.

Thanks to Jan Dittmer for adding the linux-next tree to his build tests at http://l4x.org/k/ , the guys at http://test.kernel.org/ and Randy Dunlap for doing many randconfig builds.

There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel.

Signature · 205 lines
Cheers,
Stephen Rothwell                    [email protected]

$ git checkout master
$ git reset --hard stable
Merging origin/master
Merging fixes/fixes
Merging arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging sparc-current/master
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging kbuild-current/master
Merging quilt/driver-core.current
Merging quilt/tty.current
Merging quilt/usb.current
Merging quilt/staging.current
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-linus
Merging audit-current/for-linus
Merging crypto-current/master
Merging ide-curent/master
Merging dwmw2/master
Merging arm/devel
Merging davinci/davinci-next
Merging msm/for-next
Merging omap/for-next
Merging pxa/for-next
Merging avr32/avr32-arch
CONFLICT (content): Merge conflict in arch/avr32/mach-at32ap/include/mach/cpu.h
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
CONFLICT (content): Merge conflict in drivers/rtc/Kconfig
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
Merging parisc/next
Merging powerpc/next
Merging 4xx/next
Merging 52xx-and-virtex/next
Merging galak/next
Merging s390/features
Merging sh/master
Merging sparc/master
Merging xtensa/master
Merging ceph/for-next
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/next
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging jfs/next
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
Merging ubifs/linux-next
Merging xfs/master
Merging reiserfs-bkl/reiserfs/kill-bkl
Merging vfs/for-next
Merging pci/linux-next
Merging hid/for-next
Merging quilt/i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
CONFLICT (content): Merge conflict in drivers/media/common/tuners/tda18271-fe.c
Merging kbuild/master
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/linux-next
Merging dlm/next
Merging scsi/master
Merging async_tx/next
Merging net/master
CONFLICT (content): Merge conflict in drivers/net/can/Kconfig
CONFLICT (delete/modify): drivers/net/sfc/sfe4001.c deleted in net/master and modified in HEAD. Version HEAD of drivers/net/sfc/sfe4001.c left in tree.
CONFLICT (content): Merge conflict in drivers/net/wireless/libertas/cmd.c
CONFLICT (content): Merge conflict in drivers/staging/Kconfig
CONFLICT (content): Merge conflict in drivers/staging/Makefile
CONFLICT (content): Merge conflict in drivers/staging/rtl8187se/Kconfig
CONFLICT (content): Merge conflict in drivers/staging/rtl8192e/Kconfig
$ git rm -f drivers/net/sfc/sfe4001.c
Applying: net: merge fixup for drivers/net/sfc/falcon_boards.c
Merging wireless/master
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging cpufreq/next
CONFLICT (content): Merge conflict in include/acpi/processor.h
Merging quilt/rr
Applying: modpost: autoconf.h has moved to include/generated
Merging mmc/next
Merging tmio-mmc/linux-next
Merging input/next
Merging lsm/for-next
Merging block/for-next
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
CONFLICT (content): Merge conflict in drivers/mtd/maps/pcmciamtd.c
CONFLICT (content): Merge conflict in drivers/net/wireless/ray_cs.c
CONFLICT (content): Merge conflict in drivers/pcmcia/Makefile
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging voltage/for-next
CONFLICT (content): Merge conflict in drivers/mfd/Kconfig
CONFLICT (content): Merge conflict in drivers/mfd/Makefile
Merging security-testing/next
CONFLICT (content): Merge conflict in Documentation/dontdiff
Merging lblnet/master
Merging agp/agp-next
Merging uwb/for-upstream
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
CONFLICT (content): Merge conflict in arch/x86/pci/amd_bus.c
CONFLICT (content): Merge conflict in drivers/net/wireless/rt2x00/rt2800usb.h
Merging audit/for-next
Merging quilt/aoe
Merging suspend/linux-next
Merging bluetooth/master
Merging fsnotify/for-next
CONFLICT (content): Merge conflict in arch/x86/ia32/ia32entry.S
CONFLICT (content): Merge conflict in arch/x86/include/asm/unistd_32.h
CONFLICT (content): Merge conflict in arch/x86/include/asm/unistd_64.h
CONFLICT (content): Merge conflict in arch/x86/kernel/syscall_table_32.S
CONFLICT (content): Merge conflict in fs/afs/write.c
CONFLICT (content): Merge conflict in fs/ubifs/file.c
CONFLICT (content): Merge conflict in include/asm-generic/fcntl.h
CONFLICT (content): Merge conflict in net/socket.c
Merging irda/for-next
Merging hwlat/for-linus
CONFLICT (content): Merge conflict in drivers/misc/Makefile
Merging drbd/for-jens
Merging catalin/for-next
Merging alacrity/linux-next
CONFLICT (content): Merge conflict in drivers/net/Kconfig
CONFLICT (content): Merge conflict in include/linux/Kbuild
CONFLICT (content): Merge conflict in lib/Kconfig
Merging i7core_edac/linux_next
Applying: i7core_edac: do not export static functions
Merging devicetree/next-devicetree
Merging limits/writable_limits
Merging omap_dss2/for-next
CONFLICT (content): Merge conflict in arch/arm/configs/omap_3430sdp_defconfig
Merging tip/auto-latest
CONFLICT (content): Merge conflict in arch/x86/kernel/kgdb.c
CONFLICT (content): Merge conflict in kernel/irq/chip.c
Merging edac-amd/for-next
Merging oprofile/for-next
Merging percpu/for-next
CONFLICT (content): Merge conflict in arch/powerpc/platforms/pseries/hvCall.S
CONFLICT (content): Merge conflict in arch/x86/kvm/svm.c
CONFLICT (content): Merge conflict in kernel/softlockup.c
Applying: percpu: merge fixup for variable renaming
Merging workqueues/for-next
Merging sfi/sfi-test
Merging asm-generic/next
Merging hwpoison/hwpoison
Merging sysctl/master
CONFLICT (content): Merge conflict in net/decnet/sysctl_net_decnet.c
CONFLICT (content): Merge conflict in net/ipv6/addrconf.c
Merging quilt/driver-core
Merging quilt/tty
Merging quilt/usb
Merging quilt/staging
CONFLICT (content): Merge conflict in drivers/staging/Kconfig
CONFLICT (content): Merge conflict in drivers/staging/Makefile
CONFLICT (content): Merge conflict in drivers/staging/comedi/drivers/cb_das16_cs.c
CONFLICT (content): Merge conflict in drivers/staging/comedi/drivers/ni_labpc_cs.c
CONFLICT (content): Merge conflict in drivers/staging/comedi/drivers/ni_mio_cs.c
Merging scsi-post-merge/master
#1 lore raw

[-next Nov 17] s390 build break(arch/s390/kernel/compat_wrapper.S)

Today's next 20091117 build failed on s390 with

arch/s390/kernel/compat_wrapper.S: Assembler messages:
arch/s390/kernel/compat_wrapper.S:1871: Error: operand out of range (164 is not between 0 and 15) arch/s390/kernel/compat_wrapper.S:1871: Error: junk at end of line: `(%r15)' make[1]: *** [arch/s390/kernel/compat_wrapper.o] Error 1

The code in question was added by commit 9db3031ac785b068eb4636465eebb7b346c48dbb

fanotify: sys_fanotify_mark declartion

I had applied the following patch to get past another build break reported against yesterday's next (20091116)

http://marc.info/?l=linux-next&m=125844478708886&w=2 <http://marc.info/?l=linux-next&m=125844478708886&w=2>

Thanks
-Sachin

Signature · 6 lines
---------------------------------
Sachin Sant
IBM Linux Technology Center
India Systems and Technology Labs
Bangalore, India
---------------------------------
#2 lore raw

Re: [-next Nov 17] s390 build break(arch/s390/kernel/compat_wrapper.S)

Quoted 10 lines · Sachin Sant

Today's next 20091117 build failed on s390 with

arch/s390/kernel/compat_wrapper.S: Assembler messages:
arch/s390/kernel/compat_wrapper.S:1871: Error: operand out of range (164 is not between 0 and 15) arch/s390/kernel/compat_wrapper.S:1871: Error: junk at end of line: `(%r15)' make[1]: *** [arch/s390/kernel/compat_wrapper.o] Error 1

The code in question was added by commit 9db3031ac785b068eb4636465eebb7b346c48dbb

fanotify: sys_fanotify_mark declartion

Hmm, the compat wrapper for sys_fanotify_mark is more broken (besides the fact that it doesn't compile).
The same is true for sys_fanotify_init.

I thought it was general consensus that new syscalls should be wired up only on x86 and let arch maintainers wire them up on their architectures. Besides that a simple C source needs to be delivered so it can be easily tested on each architecture.

Especially we want to avoid subtle sign extension bugs like we have them here. Probably gone unnoticed if there wouldn't be a compile bug.

#3 lore raw

Re: [-next Nov 17] s390 build break(arch/s390/kernel/compat_wrapper.S)

Quoted 16 lines · Heiko Carstens
Quoted 10 lines · Sachin Sant

Today's next 20091117 build failed on s390 with

arch/s390/kernel/compat_wrapper.S: Assembler messages:
arch/s390/kernel/compat_wrapper.S:1871: Error: operand out of range (164 is not between 0 and 15) arch/s390/kernel/compat_wrapper.S:1871: Error: junk at end of line: `(%r15)' make[1]: *** [arch/s390/kernel/compat_wrapper.o] Error 1

The code in question was added by commit 9db3031ac785b068eb4636465eebb7b346c48dbb

fanotify: sys_fanotify_mark declartion

Hmm, the compat wrapper for sys_fanotify_mark is more broken (besides the fact that it doesn't compile).
The same is true for sys_fanotify_init.

Quoted 7 lines

I thought it was general consensus that new syscalls should be wired up only on x86 and let arch maintainers wire them up on their architectures. Besides that a simple C source needs to be delivered so it can be easily tested on each architecture.

Especially we want to avoid subtle sign extension bugs like we have them here. Probably gone unnoticed if there wouldn't be a compile bug.

I'll un-wire tonight or fix it if you tell me how. I guess my code was supposed to use l instead of or as in sys_fallocate_wrapper() instead of copying sys32_lookup_dcookie_wrapper().

Simple C source is available, but without s390 syscall definitions at people.redhat.com/~eparis/fanotify

touch /tmp/tmp
./fanotify /tmp/tmp &
^Z
echo hello > /tmp/tmp
fg
^C

-Eric

#4 lore raw

Re: [-next Nov 17] s390 build break(arch/s390/kernel/compat_wrapper.S)

Quoted 22 lines · Eric Paris
Quoted 21 lines · Heiko Carstens
Quoted 10 lines · Sachin Sant

Today's next 20091117 build failed on s390 with

arch/s390/kernel/compat_wrapper.S: Assembler messages:
arch/s390/kernel/compat_wrapper.S:1871: Error: operand out of range (164 is not between 0 and 15) arch/s390/kernel/compat_wrapper.S:1871: Error: junk at end of line: `(%r15)' make[1]: *** [arch/s390/kernel/compat_wrapper.o] Error 1

The code in question was added by commit 9db3031ac785b068eb4636465eebb7b346c48dbb

fanotify: sys_fanotify_mark declartion

Hmm, the compat wrapper for sys_fanotify_mark is more broken (besides the fact that it doesn't compile).
The same is true for sys_fanotify_init.

I thought it was general consensus that new syscalls should be wired up only on x86 and let arch maintainers wire them up on their architectures. Besides that a simple C source needs to be delivered so it can be easily tested on each architecture.

Quoted 6 lines
Quoted 2 lines

Especially we want to avoid subtle sign extension bugs like we have them here. Probably gone unnoticed if there wouldn't be a compile bug.

I'll un-wire tonight or fix it if you tell me how. I guess my code was supposed to use l instead of or as in sys_fallocate_wrapper() instead of copying sys32_lookup_dcookie_wrapper().

Yes, also some places should have used lgfr instead of llgfr for proper sign extension. But please, just drop the s390 bits from your patch. Its easier and less painful for us to do it ourselves instead of reviewing and fixing these things. (No offence intended!).

Quoted 9 lines

Simple C source is available, but without s390 syscall definitions at people.redhat.com/~eparis/fanotify

touch /tmp/tmp
./fanotify /tmp/tmp &
^Z
echo hello > /tmp/tmp
fg
^C

Ok, thanks!

#5 lore raw

Re: [-next Nov 17] s390 build break(arch/s390/kernel/compat_wrapper.S)

Quoted 4 lines · Heiko Carstens

Yes, also some places should have used lgfr instead of llgfr for proper sign extension. But please, just drop the s390 bits from your patch. Its easier and less painful for us to do it ourselves instead of reviewing and fixing these things. (No offence intended!).

dropped and won't show up in -next tomorrow.

This what I thought it should be and would love to read if you say it's right....

arch/s390/include/asm/unistd.h +3 -1
index cb5232d..8962161 100644
@@ -269,7 +269,9 @@
 #define	__NR_pwritev		329
 #define __NR_rt_tgsigqueueinfo	330
 #define __NR_perf_event_open	331
-#define NR_syscalls 332
+#define __NR_fanotify_init	332
+#define __NR_fanotify_mark	333
+#define NR_syscalls 334
 
 /* 
  * There are some system calls that are not present on 64 bit, some
arch/s390/kernel/compat_wrapper.S +17 -0
index cbd9901..c81723d 100644
@@ -1855,3 +1855,20 @@ sys32_execve_wrapper:
 	llgtr	%r3,%r3			# compat_uptr_t *
 	llgtr	%r4,%r4			# compat_uptr_t *
 	jg	sys32_execve		# branch to system call
+
+	.globl	sys_fanotify_init_wrapper
+sys_fanotify_init_wrapper:
+	llgfr	%r2,%r2			# unsigned int
+	llgfr	%r3,%r3			# unsigned int
+	llgfr	%r4,%r4			# unsigned int
+	jg	sys_fanotify_init	# branch to system call
+
+	.globl	sys32_fanotify_mark_wrapper
+sys32_fanotify_mark_wrapper:
+	lgfr	%r2,%r2			# int
+	llgfr	%r3,%r3			# unsigned int
+	lgfr	%r4,%r4			# int
+	llgtr	%r5,%r5			# char *
+	sllg	%r6,%r6,32		# get high word of 64bit mask
+	l	%r6,164(%r15)		# get low word of 64bit mask
+	jg	sys_fanotify_mark
arch/s390/kernel/syscalls.S +2 -0
index 30eca07..cc781f1 100644
@@ -340,3 +340,5 @@ SYSCALL(sys_preadv,sys_preadv,compat_sys_preadv_wrapper)
 SYSCALL(sys_pwritev,sys_pwritev,compat_sys_pwritev_wrapper)
 SYSCALL(sys_rt_tgsigqueueinfo,sys_rt_tgsigqueueinfo,compat_sys_rt_tgsigqueueinfo_wrapper) /* 330 */
 SYSCALL(sys_perf_event_open,sys_perf_event_open,sys_perf_event_open_wrapper)
+SYSCALL(sys_fanotify_init,sys_fanotify_init,sys_fanotify_init_wrapper)
+SYSCALL(sys_fanotify_mark,sys_fanotify_mark,sys32_fanotify_mark_wrapper)
#6 lore raw

Re: [-next Nov 17] s390 build break(arch/s390/kernel/compat_wrapper.S)

Quoted 11 lines · Eric Paris
Quoted 4 lines · Heiko Carstens

Yes, also some places should have used lgfr instead of llgfr for proper sign extension. But please, just drop the s390 bits from your patch. Its easier and less painful for us to do it ourselves instead of reviewing and fixing these things. (No offence intended!).

dropped and won't show up in -next tomorrow.

This what I thought it should be and would love to read if you say it's right....

Yes, it is except for one thing:

Quoted 20 lines
arch/s390/include/asm/unistd.h +3 -1
index cb5232d..8962161 100644
@@ -269,7 +269,9 @@
 #define	__NR_pwritev		329
 #define __NR_rt_tgsigqueueinfo	330
 #define __NR_perf_event_open	331
-#define NR_syscalls 332
+#define __NR_fanotify_init	332
+#define __NR_fanotify_mark	333
+#define NR_syscalls 334
 
 /* 
  * There are some system calls that are not present on 64 bit, some
arch/s390/kernel/compat_wrapper.S +0 -0
index cbd9901..c81723d 100644

arch/s390/kernel/compat_wrapper.S sys32_execve_wrapper: · line 1864

Quoted 10 lines
arch/s390/kernel/compat_wrapper.S +7 -0
@@ -1855,3 +1855,20 @@ sys32_execve_wrapper:
 	llgtr	%r3,%r3			# compat_uptr_t *
 	llgtr	%r4,%r4			# compat_uptr_t *
 	jg	sys32_execve		# branch to system call
+
+	.globl	sys_fanotify_init_wrapper
+sys_fanotify_init_wrapper:
+	llgfr	%r2,%r2			# unsigned int
+	llgfr	%r3,%r3			# unsigned int
+	llgfr	%r4,%r4			# unsigned int
+	jg	sys_fanotify_init	# branch to system call

The third argument an int and hence it should have been lgfr ;)

#7 lore raw

Re: [-next Nov 17] s390 build break(arch/s390/kernel/compat_wrapper.S)

Quoted 39 lines · Heiko Carstens
Quoted 11 lines · Eric Paris
Quoted 4 lines · Heiko Carstens

Yes, also some places should have used lgfr instead of llgfr for proper sign extension. But please, just drop the s390 bits from your patch. Its easier and less painful for us to do it ourselves instead of reviewing and fixing these things. (No offence intended!).

dropped and won't show up in -next tomorrow.

This what I thought it should be and would love to read if you say it's right....

Yes, it is except for one thing:

Quoted 24 lines
arch/s390/include/asm/unistd.h +3 -1
index cb5232d..8962161 100644
@@ -269,7 +269,9 @@
 #define	__NR_pwritev		329
 #define __NR_rt_tgsigqueueinfo	330
 #define __NR_perf_event_open	331
-#define NR_syscalls 332
+#define __NR_fanotify_init	332
+#define __NR_fanotify_mark	333
+#define NR_syscalls 334
 
 /* 
  * There are some system calls that are not present on 64 bit, some
arch/s390/kernel/compat_wrapper.S +1 -0
index cbd9901..c81723d 100644
@@ -1855,3 +1855,20 @@ sys32_execve_wrapper:
 	llgtr	%r3,%r3			# compat_uptr_t *
 	llgtr	%r4,%r4			# compat_uptr_t *
 	jg	sys32_execve		# branch to system call
+
Quoted 8 lines

arch/s390/kernel/compat_wrapper.S sys32_execve_wrapper: · line 1864

Quoted 6 lines
arch/s390/kernel/compat_wrapper.S +6 -0
+	.globl	sys_fanotify_init_wrapper
+sys_fanotify_init_wrapper:
+	llgfr	%r2,%r2			# unsigned int
+	llgfr	%r3,%r3			# unsigned int
+	llgfr	%r4,%r4			# unsigned int
+	jg	sys_fanotify_init	# branch to system call

The third argument an int and hence it should have been lgfr ;)

It should have been an unsigned int, just noticed it today (because of this discussion) and fixed it. You'll see in a patch which does so in -next tomorrow.

I'll let this settle a bit and come back to linux-s390 in a week or two to ask you guys to write/review some hooks!

-Eric

#8 lore raw

Re: [-next Nov 17] s390 build break(arch/s390/kernel/compat_wrapper.S)

Quoted 11 lines · Eric Paris
Quoted 3 lines · Heiko Carstens
Quoted 1 line · Eric Paris

On Tue, 2009-11-17 at 14:55 +0100, Heiko Carstens wrote:

The third argument an int and hence it should have been lgfr ;)

It should have been an unsigned int, just noticed it today (because of this discussion) and fixed it. You'll see in a patch which does so in -next tomorrow.

I'll let this settle a bit and come back to linux-s390 in a week or two to ask you guys to write/review some hooks!

We will be triggered automatically as soon as your patch gets merged. The build system emits a warning for each new syscall which isn't wired up and present for x86.

#9 lore raw

Re: [-next Nov 17] s390 build break(arch/s390/kernel/compat_wrapper.S)

In reply to Eric Paris
Quoted 12 lines · Eric Paris
Quoted 4 lines · Heiko Carstens

Yes, also some places should have used lgfr instead of llgfr for proper sign extension. But please, just drop the s390 bits from your patch. Its easier and less painful for us to do it ourselves instead of reviewing and fixing these things. (No offence intended!).

dropped and won't show up in -next tomorrow.

This what I thought it should be and would love to read if you say it's right....

[...]

arch/s390/kernel/compat_wrapper.S sys32_execve_wrapper: · line 1874

Quoted 8 lines
arch/s390/kernel/compat_wrapper.S +8 -0
+sys32_fanotify_mark_wrapper:
+	lgfr	%r2,%r2			# int
+	llgfr	%r3,%r3			# unsigned int
+	lgfr	%r4,%r4			# int
+	llgtr	%r5,%r5			# char *
+	sllg	%r6,%r6,32		# get high word of 64bit mask
+	l	%r6,164(%r15)		# get low word of 64bit mask
+	jg	sys_fanotify_mark

Oh wait, I have to correct myself:

With

long sys_fanotify_mark(int fanotify_fd, unsigned int flags,
int fd, const char __user *pathname, u64 mask);

we have a 64 bit type as 5th argument. That doesn't work for syscalls on 32 bit s390.
I just simplify the reason for this: on 32 bit long longs will be passed via two consecutive registers _unless_ the first register would be r6 (which is the case here). In that case the whole 64 bits would be passed on the stack. Our glibc syscall code will always put the contents of the first parameter stack slot into register r7, so we have six registers for parameter passing (r2-r7). So with the 64 bit value put into two stack slots we would miss the second part of the 5th argument.

Please note that other architectures (I think at least arm and powerpc) put 64 bit values into even/odd register pairs and add padding if the first free available register is an odd one. So any of the following interfaces should work for all architectures:

long sys_fanotify_mark(int fanotify_fd, unsigned int flags,
int fd, const char __user *pathname, u32 mask_high, u32 mask_low);

long sys_fanotify_mark(int fanotify_fd, unsigned int flags,

                       u64 mask,
     	 	       int fd, const char  __user *pathname);

long sys_fanotify_mark(u64 mask,
int fanotify_fd, unsigned int flags, int fd, const char __user *pathname);

#10 lore raw

Re: [-next Nov 17] s390 build break(arch/s390/kernel/compat_wrapper.S)

Quoted 9 lines · Heiko Carstens

On Tue, Nov 17, 2009 at 10:23:56AM -0500, Eric Paris wrote:
With

long sys_fanotify_mark(int fanotify_fd, unsigned int flags,
int fd, const char __user *pathname, u64 mask);

we have a 64 bit type as 5th argument. That doesn't work for syscalls on 32 bit s390.

Note that the above works on ARM, since we end up with the following register allocation:

r0: fanotify_fd
r1: flags
r2: fd
r3: pathname
r4,r5: mask

since 'mask' is an even,odd pair, and the arguments all fit within r0 - r5 inclusive.

Quoted 4 lines

Please note that other architectures (I think at least arm and powerpc) put 64 bit values into even/odd register pairs and add padding if the first free available register is an odd one. So any of the following interfaces should work for all architectures:

Indeed.

Since we're going around the loop of re-organizing the argument order of syscalls, the question which needs asking is: what's happening with HPA's idea of having a set of per-arch rules and generating the interfaces according to those rules?

Signature · 3 lines
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:
#11 lore raw

Re: [-next Nov 17] s390 build break(arch/s390/kernel/compat_wrapper.S)

In reply to Heiko Carstens
Quoted 9 lines · Heiko Carstens

Please note that other architectures (I think at least arm and powerpc) put 64 bit values into even/odd register pairs and add padding if the first free available register is an odd one. So any of the following interfaces should work for all architectures:

long sys_fanotify_mark(int fanotify_fd, unsigned int flags,
int fd, const char __user *pathname, u32 mask_high, u32 mask_low);

Quoted 7 lines

long sys_fanotify_mark(int fanotify_fd, unsigned int flags,

                       u64 mask,
     	 	       int fd, const char  __user *pathname);

long sys_fanotify_mark(u64 mask,
int fanotify_fd, unsigned int flags, int fd, const char __user *pathname);

Correct - but the splitting is unnecessary pain for some platforms like 64-bit userland on 64-bit MIPS where the 64-bit argument would be passed in a single register so I have preference for the 2nd or 3rd suggestion.

The 1st prototype has the advantage of avoiding the need for a compat wrapper which otherwise would look like:

long compat_sys_fanotify_mark(int fanotify_fd, unsigned int flags,

                       u32 a2, u32 a3,
     	 	       int fd, const char  __user *pathname);
{
	/* assuming 2nd suggested prototype from above */
	return sys_fanotify_mark(fd, flags,
				 merge64(a2, a3),
				 fd, pathname);
}

I'd prefer to see the compat code carrying the burden.

Ralf

#12 lore raw

Re: [-next Nov 17] s390 build break(arch/s390/kernel/compat_wrapper.S)

In reply to Heiko Carstens
Quoted 33 lines · Heiko Carstens
Quoted 12 lines · Eric Paris
Quoted 4 lines · Heiko Carstens

Yes, also some places should have used lgfr instead of llgfr for proper sign extension. But please, just drop the s390 bits from your patch. Its easier and less painful for us to do it ourselves instead of reviewing and fixing these things. (No offence intended!).

dropped and won't show up in -next tomorrow.

This what I thought it should be and would love to read if you say it's right....

[...]

arch/s390/kernel/compat_wrapper.S sys32_execve_wrapper: · line 1874

Quoted 8 lines
arch/s390/kernel/compat_wrapper.S +8 -0
+sys32_fanotify_mark_wrapper:
+	lgfr	%r2,%r2			# int
+	llgfr	%r3,%r3			# unsigned int
+	lgfr	%r4,%r4			# int
+	llgtr	%r5,%r5			# char *
+	sllg	%r6,%r6,32		# get high word of 64bit mask
+	l	%r6,164(%r15)		# get low word of 64bit mask
+	jg	sys_fanotify_mark

Oh wait, I have to correct myself:

With

long sys_fanotify_mark(int fanotify_fd, unsigned int flags,
int fd, const char __user *pathname, u64 mask);

Quoted 9 lines

we have a 64 bit type as 5th argument. That doesn't work for syscalls on 32 bit s390.
I just simplify the reason for this: on 32 bit long longs will be passed via two consecutive registers _unless_ the first register would be r6 (which is the case here). In that case the whole 64 bits would be passed on the stack. Our glibc syscall code will always put the contents of the first parameter stack slot into register r7, so we have six registers for parameter passing (r2-r7). So with the 64 bit value put into two stack slots we would miss the second part of the 5th argument.

asmlinkage long sys_fallocate(int fd, int mode, loff_t offset, loff_t len);

sys_fallocate_wrapper:

        lgfr    %r2,%r2                 # int
        lgfr    %r3,%r3                 # int
        sllg    %r4,%r4,32              # get high word of 64bit loff_t
        lr      %r4,%r5                 # get low word of 64bit loff_t
        sllg    %r5,%r6,32              # get high word of 64bit loff_t
        l       %r5,164(%r15)           # get low word of 64bit loff_t
        jg      sys_fallocate

Does this work? It's basically the same thing, right? I'm willing to
hear "that's fine you are clueless" Just saw it and hoping that we
have everything right....

-Eric

#13 lore raw

Re: [-next Nov 17] s390 build break(arch/s390/kernel/compat_wrapper.S)

Quoted 12 lines · Eric Paris

asmlinkage long sys_fallocate(int fd, int mode, loff_t offset, loff_t len);

sys_fallocate_wrapper:

        lgfr    %r2,%r2                 # int
        lgfr    %r3,%r3                 # int
        sllg    %r4,%r4,32              # get high word of 64bit loff_t
        lr      %r4,%r5                 # get low word of 64bit loff_t
        sllg    %r5,%r6,32              # get high word of 64bit loff_t
        l       %r5,164(%r15)           # get low word of 64bit loff_t
        jg      sys_fallocate
Quoted 3 lines

Does this work? It's basically the same thing, right? I'm willing to
hear "that's fine you are clueless" Just saw it and hoping that we
have everything right....

It works, because for 32 bit s390 it's not the interface above but this one:
(see arch/s390/kernel/sys_s390.c):

/*
* This is a wrapper to call sys_fallocate(). For 31 bit s390 the last
* 64 bit argument "len" is split into the upper and lower 32 bits. The
* system call wrapper in the user space loads the value to %r6/%r7.
* The code in entry.S keeps the values in %r2 - %r6 where they are and
* stores %r7 to 96(%r15). But the standard C linkage requires that
* the whole 64 bit value for len is stored on the stack and doesn't
* use %r6 at all. So s390_fallocate has to convert the arguments from
* %r2: fd, %r3: mode, %r4/%r5: offset, %r6/96(%r15)-99(%r15): len
* to
* %r2: fd, %r3: mode, %r4/%r5: offset, 96(%r15)-103(%r15): len
*/
SYSCALL_DEFINE(s390_fallocate)(int fd, int mode, loff_t offset,

			       u32 len_high, u32 len_low)
{
	return sys_fallocate(fd, mode, offset, ((u64)len_high << 32) | len_low);
}
#ifdef CONFIG_HAVE_SYSCALL_WRAPPERS
asmlinkage long SyS_s390_fallocate(long fd, long mode, loff_t offset,
				   long len_high, long len_low)
{
	return SYSC_s390_fallocate((int) fd, (int) mode, offset,
				   (u32) len_high, (u32) len_low);
}

SYSCALL_ALIAS(sys_s390_fallocate, SyS_s390_fallocate); #endif

We (or better: Martin ;) had to define a special s390 fallocate system call because the "real" system call interface doesn't work on s390 for the same reason like your proposed system call.

#14 lore raw

Re: [-next Nov 17] s390 build break(arch/s390/kernel/compat_wrapper.S)

In reply to Eric Paris
Quoted 30 lines · On Wed, 18 Nov 2009 11:02:57 -0500 Eric Paris <[email protected]> wrote:
Quoted 8 lines · Heiko Carstens

Oh wait, I have to correct myself:

With

long sys_fanotify_mark(int fanotify_fd, unsigned int flags,
int fd, const char __user *pathname, u64 mask);

Quoted 9 lines

we have a 64 bit type as 5th argument. That doesn't work for syscalls on 32 bit s390.
I just simplify the reason for this: on 32 bit long longs will be passed via two consecutive registers _unless_ the first register would be r6 (which is the case here). In that case the whole 64 bits would be passed on the stack. Our glibc syscall code will always put the contents of the first parameter stack slot into register r7, so we have six registers for parameter passing (r2-r7). So with the 64 bit value put into two stack slots we would miss the second part of the 5th argument.

asmlinkage long sys_fallocate(int fd, int mode, loff_t offset, loff_t len);

sys_fallocate_wrapper:

        lgfr    %r2,%r2                 # int
        lgfr    %r3,%r3                 # int
        sllg    %r4,%r4,32              # get high word of 64bit loff_t
        lr      %r4,%r5                 # get low word of 64bit loff_t
        sllg    %r5,%r6,32              # get high word of 64bit loff_t
        l       %r5,164(%r15)           # get low word of 64bit loff_t
        jg      sys_fallocate
Quoted 3 lines

Does this work? It's basically the same thing, right? I'm willing to
hear "that's fine you are clueless" Just saw it and hoping that we
have everything right....

Ok, we need the full version of the story..
The 32 bit ELF ABI specifies that the 32 bit registers %r2 to %r6 are used for parameter passing. 64 bit values are passed as registers pairs with the first register an even numbered register. The effect of that rule is that parameter registers may be skipped or that the whole 64 bit value is passed on the stack. Examples:

fn(int a, int b, long long c)
a is passed in %r2, b is passed in %r3, c is passed in %r4/%r5.

fn(int a, long long b, int c)
a is passed in %r2, b is passed in %r4/%r5, c is passed in %r6, %r3 is skipped.

fn(int a, int b, int c, int d, long long e)
a is passed in %r2, b is passed in %r3, c is passed in %r4, d is passed in %r5, e is passed on the stack, %r6 is skipped.

The second fact to understand is how the system call arguments are passed. The original system call ABI used the same calling conventions as the ELF ABI. That is only registers %r2 to %r6 are used. Now futex came along with 6 parameters. We did not want to use the user process stack to pass the parameters because that would require a copy_from_user which is expensive. Instead we tricked a little bit. The 6th parameter is passed by glue code in glibc in register %r7 (no user copy). The code in entry.S stores %r7 to the beginning of the pt_regs structure:

struct pt_regs

{
        unsigned long args[1];
	...
};

The C function that implements a system call with 6 32-bit parameters expects 5 parameters in registers, the 6th is located on the stack. The args element of pt_regs "happens" to be at the same offset where the C function is looking for the first overflow argument (= the 6th parameter).

Now consider a system call with an overflowing 64 bit parameter. The glue code in glibc could be hacked in a way that the 64 bit value is split into %r6 and %r7. But the system call function is just a C function. It follows the ELF ABI and expects the 64 bit argument on the stack. It would take two 32 bit overflow registers in pt_regs to make one 64 bit parameter. With the current code that won't work. We would need a wrapper function in the kernel to untangle this parameter mess.

The avoid all this all 64 bit parameter have to be placed at positions where no register is skipped because of the even/odd rule and where it is not affected by the %r7 trick (= may not be the last parameter). Easy, no?

Signature · 4 lines
blue skies,
   Martin.

"Reality continues to ruin my life." - Calvin.
#15 lore raw

Re: [-next Nov 17] s390 build break(arch/s390/kernel/compat_wrapper.S)

Quoted 4 lines · Martin Schwidefsky

used for parameter passing. 64 bit values are passed as registers pairs with the first register an even numbered register. The effect of that rule is that parameter registers may be skipped or that the whole 64 bit value is passed on the stack. Examples:

Erm, did I miss something? The 32 bit ABI doesn't say anything about even/odd register pairs for 64 bit values. Also gcc doesn't generate such code:

Quoted 3 lines

fn(int a, long long b, int c)
a is passed in %r2, b is passed in %r4/%r5, c is passed in %r6, %r3 is skipped.

extern void fn(int a, long long b, int c);

void bla(void)

{
	fn(0, 1, 2);
}

00000000 <bla>:

   0:   90 ef f0 38             stm     %r14,%r15,56(%r15)
   4:   a7 fa ff a0             ahi     %r15,-96
   8:   a7 28 00 00             lhi     %r2,0
   c:   a7 38 00 00             lhi     %r3,0
  10:   a7 48 00 01             lhi     %r4,1
  14:   a7 58 00 02             lhi     %r5,2
  18:   c0 e5 00 00 00 00       brasl   %r14,18 <bla+0x18>
  1e:   98 ef f0 98             lm      %r14,%r15,152(%r15)
  22:   07 fe                   br      %r14

Not that it really matters, since other archs enforce the rule anyway.

#16 lore raw

Re: [-next Nov 17] s390 build break(arch/s390/kernel/compat_wrapper.S)

Quoted 9 lines · On Wed, 18 Nov 2009 19:41:56 +0100 Heiko Carstens <[email protected]>…
Quoted 4 lines · Martin Schwidefsky

used for parameter passing. 64 bit values are passed as registers pairs with the first register an even numbered register. The effect of that rule is that parameter registers may be skipped or that the whole 64 bit value is passed on the stack. Examples:

Erm, did I miss something? The 32 bit ABI doesn't say anything about even/odd register pairs for 64 bit values. Also gcc doesn't generate such code:

Odd, I can remember that there has been a rule like that. It is indeed not in the ABI, seems like we dropped it/never added it. There are quite a few 32 bit instruction that operate on 64 bit values in even/odd registers which makes it beneficial to pass 64 bit values in a way that they already are located in even/odd and not in odd/even registers.

Quoted 22 lines
Quoted 3 lines

fn(int a, long long b, int c)
a is passed in %r2, b is passed in %r4/%r5, c is passed in %r6, %r3 is skipped.

extern void fn(int a, long long b, int c);

void bla(void)

{
	fn(0, 1, 2);
}

00000000 <bla>:

   0:   90 ef f0 38             stm     %r14,%r15,56(%r15)
   4:   a7 fa ff a0             ahi     %r15,-96
   8:   a7 28 00 00             lhi     %r2,0
   c:   a7 38 00 00             lhi     %r3,0
  10:   a7 48 00 01             lhi     %r4,1
  14:   a7 58 00 02             lhi     %r5,2
  18:   c0 e5 00 00 00 00       brasl   %r14,18 <bla+0x18>
  1e:   98 ef f0 98             lm      %r14,%r15,152(%r15)
  22:   07 fe                   br      %r14
Quoted 1 line

Not that it really matters, since other archs enforce the rule anyway.

Perhaps that is what confused me. Anyway, the thing to remember here is that passing a long long as the last parameter which would end up in %r6/%r7 requires a system call wrapper for the standard 32 bit system call for a 32 bit kernel. So please don't do that.

Signature · 4 lines
blue skies,
   Martin.

"Reality continues to ruin my life." - Calvin.
#17 lore raw

Re: [-next Nov 17] s390 build break(arch/s390/kernel/compat_wrapper.S)

In reply to Heiko Carstens
Quoted 3 lines · Heiko Carstens

long sys_fanotify_mark(int fanotify_fd, unsigned int flags,

                       u64 mask,
     	 	       int fd, const char  __user *pathname);

I'm willing to go with this interface if that works the best for most arches. I'll queue it up for -next tomorrow.

-Eric

#18 lore raw

Re: linux-next: Tree for November 17 (exofs)

In reply to Stephen Rothwell
Quoted 3 lines · On Tue, 17 Nov 2009 19:53:09 +1100 Stephen Rothwell wrote:

Hi all,

Changes since 20091116:

on i386 (X86_32):

fs/built-in.o: In function `exofs_sbi_read':
(.text+0x592964): undefined reference to `__umoddi3'

---
~Randy

#19 lore raw

Re: linux-next: Tree for November 17 (exofs)

Quoted 7 lines · Randy Dunlap
Quoted 3 lines · On Tue, 17 Nov 2009 19:53:09 +1100 Stephen Rothwell wrote:

Hi all,

Changes since 20091116:

Quoted 7 lines

on i386 (X86_32):

fs/built-in.o: In function `exofs_sbi_read':
(.text+0x592964): undefined reference to `__umoddi3'

---
~Randy

exofs_sbi_read is a totally simple loop thing. What does the __umoddi3 means? Please help?

Boaz

#20 lore raw

Re: linux-next: Tree for November 17 (exofs)

Quoted 13 lines · Boaz Harrosh
Quoted 12 lines · Randy Dunlap
Quoted 3 lines · On Tue, 17 Nov 2009 19:53:09 +1100 Stephen Rothwell wrote:

Hi all,

Changes since 20091116:

on i386 (X86_32):

fs/built-in.o: In function `exofs_sbi_read':
(.text+0x592964): undefined reference to `__umoddi3'

Quoted 7 lines
Quoted 2 lines

---
~Randy

exofs_sbi_read is a totally simple loop thing. What does the __umoddi3 means? Please help?

Boaz

OK I think I get it. It's that u64 mod (%) operation. I'll try to find a ready made macro for that. Sorry

Boaz

#21 lore raw

Re: linux-next: Tree for November 17 (exofs)

Quoted 20 lines · Boaz Harrosh
Quoted 19 lines · Boaz Harrosh
Quoted 7 lines · Randy Dunlap
Quoted 3 lines · On Tue, 17 Nov 2009 19:53:09 +1100 Stephen Rothwell wrote:

Hi all,

Changes since 20091116:

Quoted 7 lines

on i386 (X86_32):

fs/built-in.o: In function `exofs_sbi_read':
(.text+0x592964): undefined reference to `__umoddi3'

---
~Randy

exofs_sbi_read is a totally simple loop thing. What does the __umoddi3 means? Please help?

Quoted 7 lines
Quoted 1 line

Boaz

OK I think I get it. It's that u64 mod (%) operation. I'll try to find a ready made macro for that. Sorry

Boaz

I'll push this fix for tomorrow. Thanks for helping me find it.

4G devices is more than enough thank you ;-)

Boaz
---
git diff --stat -p -M fs/exofs/ios.c

 fs/exofs/ios.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
fs/exofs/ios.c +2 -1
index 14b2600..5bad01f 100644
@@ -320,8 +320,9 @@ int exofs_sbi_read(struct exofs_io_state *ios)
 
 	for (i = 0; i < 1; i++) {
 		struct osd_request *or;
-		unsigned first_dev = ios->obj.id % ios->sbi->s_numdevs;
+		unsigned first_dev = (unsigned)ios->obj.id;
 
+		first_dev %= ios->sbi->s_numdevs;
 		or = osd_start_request(ios->sbi->s_ods[first_dev], GFP_KERNEL);
 		if (unlikely(!or)) {
 			EXOFS_ERR("%s: osd_start_request failed\n", __func__);
Acked-by
#22 lore raw

Re: linux-next: Tree for November 17 (exofs)

Quoted 23 lines · On Tue, 17 Nov 2009 19:24:22 +0200 Boaz Harrosh wrote:
Quoted 22 lines · Boaz Harrosh
Quoted 20 lines · Boaz Harrosh
Quoted 7 lines · Randy Dunlap
Quoted 3 lines · On Tue, 17 Nov 2009 19:53:09 +1100 Stephen Rothwell wrote:

Hi all,

Changes since 20091116:

Quoted 7 lines

on i386 (X86_32):

fs/built-in.o: In function `exofs_sbi_read':
(.text+0x592964): undefined reference to `__umoddi3'

---
~Randy

exofs_sbi_read is a totally simple loop thing. What does the __umoddi3 means? Please help?

Boaz

Quoted 7 lines
Quoted 5 lines

OK I think I get it. It's that u64 mod (%) operation. I'll try to find a ready made macro for that. Sorry

Boaz

I'll push this fix for tomorrow. Thanks for helping me find it.

Thanks!

Quoted 14 lines

4G devices is more than enough thank you ;-)

Boaz
---
git diff --stat -p -M fs/exofs/ios.c

 fs/exofs/ios.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
fs/exofs/ios.c +0 -0
index 14b2600..5bad01f 100644

fs/exofs/ios.c int exofs_sbi_read(struct exofs_io_state *ios) · line 328

Quoted 10 lines
fs/exofs/ios.c +2 -1
@@ -320,8 +320,9 @@ int exofs_sbi_read(struct exofs_io_state *ios)
 
 	for (i = 0; i < 1; i++) {
 		struct osd_request *or;
-		unsigned first_dev = ios->obj.id % ios->sbi->s_numdevs;
+		unsigned first_dev = (unsigned)ios->obj.id;
 
+		first_dev %= ios->sbi->s_numdevs;
 		or = osd_start_request(ios->sbi->s_ods[first_dev], GFP_KERNEL);
 		if (unlikely(!or)) {
 			EXOFS_ERR("%s: osd_start_request failed\n", __func__);

---
~Randy

#23 lore raw

PATCH 1/1 sep: fix 2 warnings

In reply to Stephen Rothwell

From: Randy Dunlap <[email protected]>

Fix printk format warning:
drivers/staging/sep/sep_driver.c:276: warning: format '%08llx' expects type 'long long unsigned int', but argument 2 has type 'dma_addr_t'

and variable may be used uninitialized (correct):
drivers/staging/sep/sep_driver.c:1774: warning: 'error' may be used uninitialized in this function

---
 drivers/staging/sep/sep_driver.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/staging/sep/sep_driver.c +3 -1
@@ -273,7 +273,8 @@ static dma_addr_t sep_shared_virt_to_bus
 						void *virt_address)
 {
 	dma_addr_t pa = sep->shared_bus + (virt_address - sep->shared_addr);
-	edbg("sep: virt to bus b %08llx v %p\n", pa, virt_address);
+	edbg("sep: virt to bus b %08llx v %p\n",
+		(unsigned long long)pa, virt_address);
 	return pa;
 }
 
@@ -1788,6 +1789,7 @@ static int sep_create_flow_dma_tables_ha
 	first_table_data.physical_address = 0xffffffff;
 
 	/* find the free structure for flow data */
+	error = -EINVAL;
 	flow_context_ptr = sep_find_flow_context(sep, SEP_FREE_FLOW_ID);
 	if (flow_context_ptr == NULL)
 		goto end_function;
Acked-by on v1 1/1
#24 lore raw

Re: [PATCH -next] sep: fix 2 warnings

Quoted 9 lines · On Tue, 17 Nov 2009 10:17:42 -0800 Randy Dunlap <[email protected]> wrote:

From: Randy Dunlap <[email protected]>

Fix printk format warning:
drivers/staging/sep/sep_driver.c:276: warning: format '%08llx' expects type 'long long unsigned int', but argument 2 has type 'dma_addr_t'

and variable may be used uninitialized (correct):
drivers/staging/sep/sep_driver.c:1774: warning: 'error' may be used uninitialized in this function