Commit Graph

962 Commits

Author SHA1 Message Date
Justin Cormack
fb6aeacf7c Merge pull request #312 from justincormack/vsuddvmbus
Use platform name not vmbus
2016-07-21 09:52:48 +01:00
Justin Cormack
48e4100e2f Merge pull request #306 from justincormack/chronyconfig
Fix up chronyd support for editions
2016-07-21 00:45:27 +01:00
Justin Cormack
13453d6fb5 Merge pull request #320 from nathanleclaire/diagnostic_oops
Diagnostic oops
2016-07-21 00:43:56 +01:00
Nathan LeClaire
cf0fc1f75b Remove unused file
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-07-20 13:48:52 -07:00
Nathan LeClaire
a9ced0a205 Fix error in diagnostic server init code
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-07-20 13:48:21 -07:00
Justin Cormack
cd4c7bf36a Merge pull request #318 from dsheets/llmnrd-finish-removal
finish removal of llmnrd from #311
2016-07-20 17:12:25 +01:00
David Sheets
f61be6860b finish removal of llmnrd from #311
Signed-off-by: David Sheets <dsheets@docker.com>
2016-07-20 17:03:51 +01:00
Justin Cormack
80cab7bb26 Merge pull request #317 from dsheets/kernel-af_vsock-lockdep
kernel: backport af_vsock lockdep cleanliness patch from v4.7-rc6
2016-07-20 16:27:33 +01:00
David Sheets
97ea6ed818 kernel: backport af_vsock lockdep cleanliness patch from v4.7-rc6
From torvalds/linux@4192f672fa which was
part of torvalds/linux@v4.7-rc6. The change is purely to ensure that vsock
is lockdep-clean.

Signed-off-by: David Sheets <dsheets@docker.com>
2016-07-20 16:22:21 +01:00
Justin Cormack
b53d30b9ac Merge pull request #316 from dsheets/kernel-aufs-lockdep
kernel: apply the AUFS patch to integrate with lockdep
2016-07-20 16:18:42 +01:00
Rolf Neugebauer
198de9219c Merge pull request #311 from justincormack/nollmnr
Remove llmnrd
2016-07-20 16:14:14 +01:00
David Sheets
a2269275b6 kernel: apply the AUFS patch to integrate with lockdep
AUFS introduces new lockdep relations which are beyond the maximum variants
that lockdep ships with. Without this patch, AUFS triggers lockdep BUG sanity
checks and disables lockdep for the rest of the system.

The present value of the patch is:

```diff
aufs4.4 lockdep patch

diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
index c57e424..4153563 100644
--- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
@@ -29,7 +29,7 @@ extern int lock_stat;
  */
 #define XXX_LOCK_USAGE_STATES		(1+3*4)

-#define MAX_LOCKDEP_SUBCLASSES		8UL
+#define MAX_LOCKDEP_SUBCLASSES		(8UL + 4)

 /*
  * NR_LOCKDEP_CACHING_CLASSES ... Number of classes
@@ -203,7 +203,7 @@ struct lock_chain {
 	u64				chain_key;
 };

-#define MAX_LOCKDEP_KEYS_BITS		13
+#define MAX_LOCKDEP_KEYS_BITS		(13 + 3)
 /*
  * Subtract one because we offset hlock->class_idx by 1 in order
  * to make 0 mean no class. This avoids overflowing the class_idx
diff --git a/kernel/locking/lockdep_internals.h b/kernel/locking/lockdep_internals.h
index 51c4b24..fba7557 100644
--- a/kernel/locking/lockdep_internals.h
+++ b/kernel/locking/lockdep_internals.h
@@ -54,9 +54,9 @@ enum {
  * table (if it's not there yet), and we check it for lock order
  * conflicts and deadlocks.
  */
-#define MAX_LOCKDEP_ENTRIES	32768UL
+#define MAX_LOCKDEP_ENTRIES	(32768UL << 5)

-#define MAX_LOCKDEP_CHAINS_BITS	16
+#define MAX_LOCKDEP_CHAINS_BITS	(16 + 5)
 #define MAX_LOCKDEP_CHAINS	(1UL << MAX_LOCKDEP_CHAINS_BITS)

 #define MAX_LOCKDEP_CHAIN_HLOCKS (MAX_LOCKDEP_CHAINS*5)
@@ -65,7 +65,7 @@ enum {
  * Stack-trace: tightly packed array of stack backtrace
  * addresses. Protected by the hash_lock.
  */
-#define MAX_STACK_TRACE_ENTRIES	524288UL
+#define MAX_STACK_TRACE_ENTRIES	(524288UL << 5)

 extern struct list_head all_lock_classes;
 extern struct lock_chain lock_chains[];
```

Signed-off-by: David Sheets <dsheets@docker.com>
2016-07-20 16:08:00 +01:00
Justin Cormack
0989e2caf4 Merge pull request #315 from dsheets/kernel-vmlinux
kernel: make sure to gitignore vmlinux
2016-07-20 15:42:39 +01:00
David Sheets
cae79c7ce3 kernel: make sure to gitignore vmlinux
Signed-off-by: David Sheets <dsheets@docker.com>
2016-07-20 15:40:54 +01:00
Justin Cormack
b2024c0543 Merge pull request #314 from dsheets/kernel-vmlinux
kernel: add vmlinux target to make kernel debugging easier
2016-07-20 15:40:52 +01:00
David Sheets
cdac4fde34 kernel: add vmlinux target to make kernel debugging easier
With this patch, it is easy to get an unstripped kernel object to use with
gdb.

Signed-off-by: David Sheets <dsheets@docker.com>
2016-07-20 15:37:04 +01:00
Justin Cormack
7f1595d11b Use platform name not vmbus
See #301

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-20 14:44:43 +01:00
Justin Cormack
bbf4def475 Remove llmnrd
Not really required as ports exposed on localhost. If users
want to connext to VM ports they can use the IP address, as
this is discouraged. llmnr names are very slow to access,
so not nice to use.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-20 14:32:14 +01:00
Justin Cormack
b4bba1fd65 Merge pull request #310 from justincormack/posixlyequal
Posixly correct = not ==
2016-07-20 14:20:52 +01:00
Justin Cormack
3c8c48f459 Posixly correct = not ==
See #161 #170 should be covered...

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-20 12:33:01 +01:00
Rolf Neugebauer
13d92bd082 Merge pull request #308 from justincormack/transfusedvmbus
Only run transfused on mac platform
2016-07-20 12:21:18 +01:00
Rolf Neugebauer
d2961a7641 Merge pull request #307 from justincormack/proxyvmbus
use platform not vmbus consistently
2016-07-20 12:17:20 +01:00
Justin Cormack
db7bc9cb8c Only run transfused on mac platform
See #301

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-20 12:11:39 +01:00
Justin Cormack
3601348fef use platform not vmbus consistently
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-20 12:07:40 +01:00
Justin Cormack
4202e575c0 Fix up chronyd support for editions
See #305 #301

This sets AWS to use the amazon ntp pool, windows to do nothing,
mac uses ntp it gets from DNS. Azure currently uses default pool,
this probably needs fixing.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-20 12:02:59 +01:00
Justin Cormack
9b1b244212 Merge pull request #304 from justincormack/norawtcp
Remove rawtcp from diagnostics server
2016-07-20 11:48:18 +01:00
Justin Cormack
878c3ab3af Remove rawtcp from diagnostics server
See https://github.com/docker/moby/pull/303

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-20 11:46:54 +01:00
Justin Cormack
56657e4656 Merge pull request #303 from nathanleclaire/diagnostic_server_cloud
Add cloud/HTTP support to diagnostics server
2016-07-20 11:45:50 +01:00
Nathan LeClaire
0de5faabc7 Re-write diagnostic server to support cloud/HTTP
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-07-19 17:40:15 -07:00
Justin Cormack
85ee976d0d Merge pull request #284 from nathanleclaire/azure
Add support for Azure (VHD) build to Moby
2016-07-19 22:44:01 +01:00
Justin Cormack
64a25604e2 Merge pull request #300 from justincormack/nodnsfix
Remove dnsfix
2016-07-19 10:09:43 +01:00
Justin Cormack
3cd4f80032 Remove dnsfix
This was there to workaround an issue with vmnet, not applicable now.
A user reported that they were getting unexpected 8.8.8.8 addresses
and it could possible be applied erroneously under some circumstances.

Signed-off-by: Justin Cormack <justin@specialbusservice.com>
2016-07-19 10:04:09 +01:00
Nathan LeClaire
329476944a Add Azure provider support
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-07-18 16:22:21 -07:00
Justin Cormack
e53116e40c Merge pull request #283 from nathanleclaire/aws
Add AWS build support to Moby
2016-07-18 20:01:33 +01:00
Nathan LeClaire
aaa6cc05e7 Add AWS build support
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-07-18 11:08:44 -07:00
Justin Cormack
49faf93e85 Merge pull request #299 from justincormack/bettertestrun
Improve make test output
2016-07-18 16:24:12 +01:00
Justin Cormack
626ad90e41 Improve make test output
Incrementally output log, and exit as soon as tests pass
or fail. Will still timeout on a kernel panic or suchlike
though...

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-18 16:05:01 +01:00
Justin Cormack
ebbbad474f Merge pull request #295 from justincormack/nottytests
make test should not need a tty
2016-07-18 14:53:54 +01:00
Justin Cormack
d94742d46a Merge pull request #297 from justincormack/mobyplatform
Add conditional services based on mobyplatform
2016-07-18 14:53:38 +01:00
Justin Cormack
3d3b67d0c3 Add conditional services based on mobyplatform
Replaces https://github.com/docker/moby/pull/282

Use mobyplatform=xxx to specify platform in boot command

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-18 12:39:14 +01:00
Justin Cormack
07052d1875 make test should not need a tty
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-18 11:08:26 +01:00
Justin Cormack
e115aebeaa Merge pull request #294 from justincormack/armfixes
fix arm build
2016-07-15 17:10:34 +01:00
Justin Cormack
7e495fb7a8 fix arm build
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-15 17:02:14 +01:00
Justin Cormack
0f86d03edd Merge pull request #293 from justincormack/inittabfix
do not remove inittab in clean
2016-07-15 16:52:30 +01:00
Justin Cormack
43b9834123 do not remove inittab in clean
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-15 16:51:57 +01:00
Justin Cormack
77f5063e76 Merge pull request #292 from justincormack/slashes
clean up trailing slashes
2016-07-15 16:24:43 +01:00
Justin Cormack
2cdf39c72f clean up trailing slashes
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-15 16:23:33 +01:00
Justin Cormack
6c8e17e773 Merge pull request #291 from justincormack/capdoc
remove unnecessary capabilities from nginx example
2016-07-15 15:26:05 +01:00
Justin Cormack
86d898cac8 remove unnecessary capabilities from nginx example
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-15 15:25:40 +01:00
Justin Cormack
7308da55dc Merge pull request #290 from justincormack/containerd-docs
Add documentation for system containerd
2016-07-15 15:18:05 +01:00