[LTP] [PATCH] Re: compile fails for libcpuset.c on SLES-11 s390x with ltp-full-20090930

[LTP] [PATCH] Re: compile fails for libcpuset.c on SLES-11 s390x with ltp-full-20090930

[Subrata Modak]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 3598 bytes --]

Hi Mark,

>On Tue, 2009-10-13 at 20:42 -0700, Garrett Cooper wrote:
>On Tue, Oct 13, 2009 at 7:18 PM, Mark Ver <markver@us.ibm.com> wrote:
> > Trying to build ltp-full-20090930 on SLES-11. The "make all" gets the
> > following:
> >
> > ...
> > make[5]: Entering directory
> > `/root/ltp-full-20090930/testcases/kernel/controllers/cpuset/cpuset_lib'
> > gcc -g -O2 -Wall -g -Wextra -I../../../../include -c -o cpuinfo.o cpuinfo.c
> > gcc -g -O2 -Wall -g -Wextra -I../../../../include -c -o libbitmask.o
> > libbitmask.c
> > gcc -g -O2 -Wall -g -Wextra -I../../../../include -c -o libcpuset.o
> > libcpuset.c
> > libcpuset.c: In function ���get_mempolicy���:
> > libcpuset.c:3092: error: ���__NR_get_mempolicy��� undeclared (first use in this
> > function)
> > libcpuset.c:3092: error: (Each undeclared identifier is reported only once
> > libcpuset.c:3092: error: for each function it appears in.)
> > libcpuset.c: In function ���set_mempolicy���:
> > libcpuset.c:3097: error: ���__NR_set_mempolicy��� undeclared (first use in this
> > function)
> > make[5]: *** [libcpuset.o] Error 1
> > make[5]: Leaving directory
> > `/root/ltp-full-20090930/testcases/kernel/controllers/cpuset/cpuset_lib'
> > make[4]: *** [all] Error 2
> > make[4]: Leaving directory
> > `/root/ltp-full-20090930/testcases/kernel/controllers/cpuset'
> > make[3]: *** [all] Error 2
> > make[3]: Leaving directory
> > `/root/ltp-full-20090930/testcases/kernel/controllers'
> > make[2]: *** [all] Error 2
> > make[2]: Leaving directory `/root/ltp-full-20090930/testcases/kernel'
> > make[1]: *** [all] Error 2
> > make[1]: Leaving directory `/root/ltp-full-20090930/testcases'
> > make: *** [all] Error 2
> >
> > As far as I can tell the architecture does not support get_mempolicy and
> > set_mem_policy.
> >
> > Here are the configure logs and stuff from the build attempt:
> > (See attached file: ltp-full-20090930-s390x-builderr.tar.gz)
> 
> The constant is defined for the platform, but not with the correct name:
> 
> /usr/src/linux/arch/s390/kernel/syscalls.S:NI_SYSCALL
>                                  /* 269 sys_get_mempolicy */
> /usr/src/linux/arch/s390/include/asm/unistd.h:/* Number 269 is
> reserved for new sys_get_mempolicy */
> /usr/src/linux/arch/s390/include/asm/unistd.h:#define __IGNORE_get_mempolicy
> 
> This needs to be added to testcases/kernel/include/generate.sh for
> linux_syscall_numbers.h, or an arch specific #ifdef should be added
> for that test / to an autoconf test that would automatically determine
> whether or not your platform had a usable get_mempolicy syscall.
> 
> Hope that helps describe what needs to take place next...

As Garret proposed, can you please apply the following Patch and see if it
solves your build problem. I get the following instructions from 2.6.31
kernel sources:

linux-2.6.31/arch/s390/include/asm/unistd.h:
208 #define __NR_remap_file_pages   267
209 /* Number 268 is reserved for new sys_mbind */
210 /* Number 269 is reserved for new sys_get_mempolicy */
211 /* Number 270 is reserved for new sys_set_mempolicy */
212 #define __NR_mq_open            271

Signed-off-by: Subrata Modak <subrata@linux.vnet.ibm.com>,
---

--- ltp-intermediate-20091013/testcases/kernel/include/s390x.in.orig	2009-10-14 17:14:39.000000000 +0530
+++ ltp-intermediate-20091013/testcases/kernel/include/s390x.in	2009-10-14 17:15:26.000000000 +0530
@@ -14,3 +14,6 @@ fchmodat (__NR_openat + 11)
 faccessat (__NR_openat + 12)
 eventfd 318
 fallocate 314
+get_mempolicy 269
+set_mempolicy 270
+

---
Regards--
Subrata

-Garrett
> 
> 


[-- Attachment #2: Type: text/plain, Size: 399 bytes --]

------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay 
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference

[-- Attachment #3: Type: text/plain, Size: 155 bytes --]

_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

Re: [LTP] [PATCH] Re: compile fails for libcpuset.c on SLES-11 s390x with ltp-full-20090930

[Cyril Hrubis]

Hi!
> --- ltp-intermediate-20091013/testcases/kernel/include/s390x.in.orig	2009-10-14 17:14:39.000000000 +0530
> +++ ltp-intermediate-20091013/testcases/kernel/include/s390x.in	2009-10-14 17:15:26.000000000 +0530
> @@ -14,3 +14,6 @@ fchmodat (__NR_openat + 11)
>  faccessat (__NR_openat + 12)
>  eventfd 318
>  fallocate 314
> +get_mempolicy 269
> +set_mempolicy 270

This should fix it. Anyway, I have some more architectures that are broken on
sles9.  Will send patch soon.

-- 
Cyril Hrubis
chrubis@suse.cz

------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay 
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

Re: [LTP] [PATCH] Re: compile fails for libcpuset.c on SLES-11 s390x with ltp-full-20090930

[Cyril Hrubis]

[-- Attachment #1: Type: text/plain, Size: 460 bytes --]

Hi!
Following patch should fix all troubles with get/set_mempolicy. Header
linux_syscall_numbers.h wasn't included in libcpuset.c and part of makefile
that creates symlink in $(LTP_TOPDIR)/include to this header was lost in
buildsystem rework. May be it would be be cleaner to move content of
testcases/kernel/include somewhere into include but at least with this patch it
should compile fine.

signed-off-by: chrubis@suse.cz

-- 
Cyril Hrubis
chrubis@suse.cz

[-- Attachment #2: get_set_memopolicy_syscall_missing.patch --]
[-- Type: text/x-patch, Size: 2273 bytes --]

Index: delme/testcases/kernel/include/powerpc.in
===================================================================
--- delme.orig/testcases/kernel/include/powerpc.in
+++ delme/testcases/kernel/include/powerpc.in
@@ -3,6 +3,8 @@ timer_settime 241
 timer_delete 244
 clock_settime 245
 clock_gettime 246
+get_mempolicy 260
+set_mempolicy 261
 splice 283
 tee 284
 vmsplice 285
Index: delme/testcases/kernel/include/powerpc64.in
===================================================================
--- delme.orig/testcases/kernel/include/powerpc64.in
+++ delme/testcases/kernel/include/powerpc64.in
@@ -3,6 +3,8 @@ timer_settime 241
 timer_delete 244
 clock_settime 245
 clock_gettime 246
+get_mempolicy 260
+set_mempolicy 261
 splice 283
 tee 284
 vmsplice 285
Index: delme/testcases/kernel/controllers/cpuset/cpuset_lib/libcpuset.c
===================================================================
--- delme.orig/testcases/kernel/controllers/cpuset/cpuset_lib/libcpuset.c
+++ delme/testcases/kernel/controllers/cpuset/cpuset_lib/libcpuset.c
@@ -48,6 +48,9 @@
 #include "cpuset.h"
 #include "common.h"
 
+#include "test.h"
+#include "linux_syscall_numbers.h"
+
 /* Bump version, and update Change History, when libcpuset API changes */
 #define CPUSET_VERSION 3
 
Index: delme/testcases/kernel/include/Makefile
===================================================================
--- delme.orig/testcases/kernel/include/Makefile
+++ delme/testcases/kernel/include/Makefile
@@ -18,6 +18,7 @@
 #    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # Garrett Cooper, July 2009
+# Cyril Hrubis, October 2009
 #
 
 top_srcdir		?= ../../..
@@ -30,5 +31,7 @@ MAKE_TARGETS		:= linux_syscall_numbers.h
 
 linux_syscall_numbers.h:
 	@set -e; $(SHELL) $(abs_srcdir)/regen.sh
+	rm -f $(top_srcdir)/include/$(MAKE_TARGETS)
+	ln -s $(abs_srcdir)/$(MAKE_TARGETS) $(top_srcdir)/include/
 
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
Index: delme/testcases/kernel/include/s390x.in
===================================================================
--- delme.orig/testcases/kernel/include/s390x.in
+++ delme/testcases/kernel/include/s390x.in
@@ -1,3 +1,5 @@
+get_mempolicy 269
+set_mempolicy 270
 openat 288
 mkdirat (__NR_openat + 1)
 mknodat (__NR_openat + 2)

[-- Attachment #3: Type: text/plain, Size: 399 bytes --]

------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay 
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference

[-- Attachment #4: Type: text/plain, Size: 155 bytes --]

_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

Re: [LTP] [PATCH] Re: compile fails for libcpuset.c on SLES-11 s390x with ltp-full-20090930

[Cyril Hrubis]

[-- Attachment #1: Type: text/plain, Size: 905 bytes --]

Hi!
>     This logic is covered in include/mk/testcases.mk as follows:
> 
> include $(top_srcdir)/include/mk/env_pre.mk
> 
> # For linux_syscall_numbers.h
> CPPFLAGS                += -I$(abs_top_builddir)/testcases/kernel/include
> 
> INSTALL_DIR             := testcases/bin
> 
> LDLIBS                  += -lltp
> 
>     There's no reason why we have to go back to the hackish Makefile's
> -- we can just include testcases.mk if it's not included already (I
> admit, a smallhandful of testcases/... Makefile's didn't do this, but
> I did this on need-to-have basis).

I still would rather have one place to store all commonly used headers eg.
$(topdir)/include. And stroring makefile "libraries" in $(topdir)/include/mk/
is IMHO not cleanest solution, may be it sould have it's onw directory in
$(topdir).

Anyway fixed patch attached.

Signed-off-by: chrubis@suse.cz

-- 
Cyril Hrubis
chrubis@suse.cz

[-- Attachment #2: get_set_memopolicy_syscall_missing.patch --]
[-- Type: text/x-patch, Size: 2181 bytes --]

Index: delme/testcases/kernel/include/powerpc.in
===================================================================
--- delme.orig/testcases/kernel/include/powerpc.in
+++ delme/testcases/kernel/include/powerpc.in
@@ -3,6 +3,8 @@ timer_settime 241
 timer_delete 244
 clock_settime 245
 clock_gettime 246
+get_mempolicy 260
+set_mempolicy 261
 splice 283
 tee 284
 vmsplice 285
Index: delme/testcases/kernel/include/powerpc64.in
===================================================================
--- delme.orig/testcases/kernel/include/powerpc64.in
+++ delme/testcases/kernel/include/powerpc64.in
@@ -3,6 +3,8 @@ timer_settime 241
 timer_delete 244
 clock_settime 245
 clock_gettime 246
+get_mempolicy 260
+set_mempolicy 261
 splice 283
 tee 284
 vmsplice 285
Index: delme/testcases/kernel/controllers/cpuset/cpuset_lib/libcpuset.c
===================================================================
--- delme.orig/testcases/kernel/controllers/cpuset/cpuset_lib/libcpuset.c
+++ delme/testcases/kernel/controllers/cpuset/cpuset_lib/libcpuset.c
@@ -48,6 +48,9 @@
 #include "cpuset.h"
 #include "common.h"
 
+#include "test.h"
+#include "linux_syscall_numbers.h"
+
 /* Bump version, and update Change History, when libcpuset API changes */
 #define CPUSET_VERSION 3
 
Index: delme/testcases/kernel/include/s390x.in
===================================================================
--- delme.orig/testcases/kernel/include/s390x.in
+++ delme/testcases/kernel/include/s390x.in
@@ -1,3 +1,5 @@
+get_mempolicy 269
+set_mempolicy 270
 openat 288
 mkdirat (__NR_openat + 1)
 mknodat (__NR_openat + 2)
Index: delme/testcases/kernel/controllers/cpuset/cpuset_lib/Makefile
===================================================================
--- delme.orig/testcases/kernel/controllers/cpuset/cpuset_lib/Makefile
+++ delme/testcases/kernel/controllers/cpuset/cpuset_lib/Makefile
@@ -18,11 +18,12 @@
 #    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # Garrett Cooper, July 2009
+# Cyril Hrubis, October 2009
 #
 
 top_srcdir 		?= ../../../../..
 
-include $(top_srcdir)/include/mk/env_pre.mk
+include $(top_srcdir)/include/mk/testcases.mk
 
 LDLIBS			+= -lm -lcontrollers
 

[-- Attachment #3: Type: text/plain, Size: 399 bytes --]

------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay 
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference

[-- Attachment #4: Type: text/plain, Size: 155 bytes --]

_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

Re: [LTP] [PATCH] Re: compile fails for libcpuset.c on SLES-11 s390x with ltp-full-20090930

[Cyril Hrubis]

Hi!
Hmm, may be we should really move testcases/kernel/include into
$(topdir)/include or better move them them to subdir in $(topdir)/include and
put the generated header into $(topdir)/include, it would save us some more
complexity when creating makefiles.

-- 
Cyril Hrubis
chrubis@suse.cz

------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay 
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

Re: [LTP] [PATCH] Re: compile fails for libcpuset.c on SLES-11 s390x with ltp-full-20090930

[Cyril Hrubis]

Hi!
>     This can be corrected by adding this logic to a common Makefile if
> you like, so that way it does get picked up from one common source.
> This makes more sense from a design perspective.

Okay, this way people wouldn't be using ugly hacks to include that header. IMHO
the easier to use is the buildsystem, the less ugly hacks will come.

-- 
Cyril Hrubis
chrubis@suse.cz

------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay 
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

Re: [LTP] [PATCH] Re: compile fails for libcpuset.c on SLES-11 s390x with ltp-full-20090930

[Cyril Hrubis]

Hi!
> >> Hmm, may be we should really move testcases/kernel/include into
> >> $(topdir)/include or better move them them to subdir in $(topdir)/include and
> >> put the generated header into $(topdir)/include, it would save us some more
> >> complexity when creating makefiles.
> >
> > Cyril,
> >    Files generated at build time should _never_ live in the source
> > directory. Otherwise tidiness becomes a serious issue, esp with source
> > control.
> >    This can be corrected by adding this logic to a common Makefile if
> > you like, so that way it does get picked up from one common source.
> > This makes more sense from a design perspective.
> 
>     Ugh, I'm tired... yes, what you proposed above was correct, but
> not complete from a submake perspective, but then again making
> Makefiles aren't correct. I will implement the complete part this
> weekend.

Okay ;)

-- 
Cyril Hrubis
chrubis@suse.cz

------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay 
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list