Skip to contentSkip to conversation

UML updates for 4.4-rc1

GIT PULL Richard Weinberger 5 participants 6 messages Nov 10, 2015 – Nov 22, 2015 User-mode Linux (UML)

lore
Share & tools
lore

Richard Weinberger

author maintainer
#0 lore raw

Linus,

the following changes since commit 6a13feb9c82803e2b815eca72fa7a9f5561d7861:

Linux 4.3 (2015-11-01 16:05:25 -0800)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git for-linus-4.4-rc1

for you to fetch changes up to 2eb5f31bc4ea24bb293e82934cfa1cce9573304b:

um: Switch clocksource to hrtimers (2015-11-06 22:54:49 +0100)

----------------------------------------------------------------
This pull request includes the following UML changes:
* A new hrtimer based clocksource by Anton Ivanov
* ptrace() enhancments by Richard Weinberger
* random cleanups and bug fixes all over the place

----------------------------------------------------------------
Anton Ivanov (1):
um: Switch clocksource to hrtimers

Richard Weinberger (7):
um: Define PTRACE_OLDSETOPTIONS
um: Store syscall number after syscall_trace_enter()
um: Get rid of open coded NR_SYSCALLS
um: Remove dead code from x86_64 syscall stub
um: Remove dead symbol from i386 syscall stub
um: Simplify STUB_DATA loading
um: Report host OOM more nicely

Saurabh Sengar (1):
um: net: replace GFP_KERNEL with GFP_ATOMIC when spinlock is held

 arch/um/Makefile                        |   2 +-
 arch/um/drivers/net_kern.c              |  17 ++-
 arch/um/include/asm/ptrace-generic.h    |   2 +
 arch/um/include/shared/os.h             |  19 ++-
 arch/um/include/shared/skas/stub-data.h |   7 +-
 arch/um/include/shared/timer-internal.h |  13 ++
 arch/um/kernel/process.c                |   8 +-
 arch/um/kernel/skas/clone.c             |   6 +-
 arch/um/kernel/skas/mmu.c               |   3 +
 arch/um/kernel/skas/syscall.c           |  21 +--
 arch/um/kernel/time.c                   |  73 ++++++----
 arch/um/kernel/tlb.c                    |  16 +-
 arch/um/os-Linux/internal.h             |   1 -
 arch/um/os-Linux/main.c                 |   7 +-
 arch/um/os-Linux/process.c              |   6 +
 arch/um/os-Linux/signal.c               |  41 +++---
 arch/um/os-Linux/skas/process.c         |  55 +++----
 arch/um/os-Linux/time.c                 | 249 ++++++++++++++++----------------
 arch/x86/um/stub_32.S                   |   1 -
 arch/x86/um/stub_64.S                   |  18 +--
 20 files changed, 296 insertions(+), 269 deletions(-)
 create mode 100644 arch/um/include/shared/timer-internal.h
 delete mode 100644 arch/um/os-Linux/internal.h
#1 lore raw
Quoted 22 lines · Richard Weinberger

Linus,

the following changes since commit
6a13feb9c82803e2b815eca72fa7a9f5561d7861:

Linux 4.3 (2015-11-01 16:05:25 -0800)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git
for-linus-4.4-rc1

for you to fetch changes up to 2eb5f31bc4ea24bb293e82934cfa1cce9573304b:

um: Switch clocksource to hrtimers (2015-11-06 22:54:49 +0100)

----------------------------------------------------------------
This pull request includes the following UML changes:
* A new hrtimer based clocksource by Anton Ivanov
* ptrace() enhancments by Richard Weinberger
* random cleanups and bug fixes all over the place

Quoted 4 lines

----------------------------------------------------------------
Anton Ivanov (1):
um: Switch clocksource to hrtimers

This commit (2eb5f31bc4) seems to have broken the UML defconfig build in latest Linus master for me:

[...]
LINK vmlinux
LD vmlinux.o
MODPOST vmlinux.o

 GEN     .version
 CHK     include/generated/compile.h
 UPD     include/generated/compile.h
 CC      init/version.o
 LD      init/built-in.o

arch/um/os-Linux/built-in.o: In function `os_timer_create':
/home/vegard/linux/arch/um/os-Linux/time.c:51: undefined reference to `timer_create'
arch/um/os-Linux/built-in.o: In function `os_timer_set_interval':
/home/vegard/linux/arch/um/os-Linux/time.c:84: undefined reference to `timer_settime'
arch/um/os-Linux/built-in.o: In function `os_timer_remain':
/home/vegard/linux/arch/um/os-Linux/time.c:109: undefined reference to `timer_gettime'
arch/um/os-Linux/built-in.o: In function `os_timer_one_shot':
/home/vegard/linux/arch/um/os-Linux/time.c:132: undefined reference to `timer_settime'
arch/um/os-Linux/built-in.o: In function `os_timer_disable':
/home/vegard/linux/arch/um/os-Linux/time.c:145: undefined reference to `timer_settime'
collect2: error: ld returned 1 exit status
make: *** [vmlinux] Error 1

Vegard

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

_______________________________________________
User-mode-linux-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel

#2 lore raw

set_timer needs -lrt which the patch adds to the link arguments. For some reason on your config it is not in the correct location in the command line.

This is being discussed on the list, [email protected] was working on a patch.

In any case, can you send the actual gcc line leading to it so we see why -lrt is not in the right place.

A.

Quoted 66 lines · Vegard Nossum

On 10 November 2015 at 23:08, Richard Weinberger <[email protected] <mailto:[email protected]>> wrote:

Linus,

the following changes since commit
6a13feb9c82803e2b815eca72fa7a9f5561d7861:

Linux 4.3 (2015-11-01 16:05:25 -0800)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git
<http://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git>
for-linus-4.4-rc1

for you to fetch changes up to
2eb5f31bc4ea24bb293e82934cfa1cce9573304b:

um: Switch clocksource to hrtimers (2015-11-06 22:54:49 +0100)

----------------------------------------------------------------
This pull request includes the following UML changes:
* A new hrtimer based clocksource by Anton Ivanov
* ptrace() enhancments by Richard Weinberger
* random cleanups and bug fixes all over the place

----------------------------------------------------------------
Anton Ivanov (1):
um: Switch clocksource to hrtimers

This commit (2eb5f31bc4) seems to have broken the UML defconfig build in latest Linus master for me:

[...]
LINK vmlinux
LD vmlinux.o
MODPOST vmlinux.o

 GEN     .version
 CHK     include/generated/compile.h
 UPD     include/generated/compile.h
 CC      init/version.o
 LD      init/built-in.o

arch/um/os-Linux/built-in.o: In function `os_timer_create':
/home/vegard/linux/arch/um/os-Linux/time.c:51: undefined reference to `timer_create'
arch/um/os-Linux/built-in.o: In function `os_timer_set_interval':
/home/vegard/linux/arch/um/os-Linux/time.c:84: undefined reference to `timer_settime'
arch/um/os-Linux/built-in.o: In function `os_timer_remain':
/home/vegard/linux/arch/um/os-Linux/time.c:109: undefined reference to `timer_gettime'
arch/um/os-Linux/built-in.o: In function `os_timer_one_shot':
/home/vegard/linux/arch/um/os-Linux/time.c:132: undefined reference to `timer_settime'
arch/um/os-Linux/built-in.o: In function `os_timer_disable':
/home/vegard/linux/arch/um/os-Linux/time.c:145: undefined reference to `timer_settime'
collect2: error: ld returned 1 exit status
make: *** [vmlinux] Error 1

Vegard

Quoted 7 lines

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

_______________________________________________
User-mode-linux-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel

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

_______________________________________________
User-mode-linux-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel

#3 lore raw
Quoted 5 lines · Anton Ivanov

set_timer needs -lrt which the patch adds to the link arguments. For some reason on your config it is not in the correct location in the command line.

This is being discussed on the list, [email protected] was working on a patch.

I sent out the patch a few days ago:
http://sourceforge.net/p/user-mode-linux/mailman/message/34629247/

------------------------------------------------------------------------------
_______________________________________________
User-mode-linux-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel

#4 lore raw
Quoted 11 lines · Lorenzo Colitti
Quoted 5 lines · Anton Ivanov

set_timer needs -lrt which the patch adds to the link arguments. For some reason on your config it is not in the correct location in the command line.

This is being discussed on the list, [email protected] was working on a patch.

I sent out the patch a few days ago:
http://sourceforge.net/p/user-mode-linux/mailman/message/34629247/

That patch fixes the problem for me, thanks!

Vegard

------------------------------------------------------------------------------
_______________________________________________
User-mode-linux-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel

#5 lore raw
Quoted 7 lines · Vegard Nossum
Quoted 6 lines · Lorenzo Colitti
Quoted 3 lines · Anton Ivanov

set_timer needs -lrt which the patch adds to the link arguments. For some reason on your config it is not in the correct location in the command line.

Quoted 7 lines
Quoted 5 lines
Quoted 2 lines

This is being discussed on the list, [email protected] was working on a patch.

I sent out the patch a few days ago:
http://sourceforge.net/p/user-mode-linux/mailman/message/34629247/

That patch fixes the problem for me, thanks!

I'll send a pull request as soon as I'm at home.
/me is traveling...

Signature · 8 lines
Thanks,
//richard

------------------------------------------------------------------------------
_______________________________________________
User-mode-linux-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel