Commit graph

716 commits

Author SHA1 Message Date
Yifan Hong
3a460c90e1 Require CONFIG_MD=y.
Require devices launching with Q to support dynamic partitions.

Also, remove from recommended list.

Bug: 124527106
Test: builds
Change-Id: I8fbf9a671e0b58eacadbb02d204ab5935061a73d
2019-02-25 17:12:54 -08:00
Maciej enczykowski
dcaf9f78af p/android-4.9+: relax QTAGUID requirements am: 1d961dc1ab
am: 7160fe215f

Change-Id: I5b678f8a72517c4fab4474b403541fdf4b3c1d12
2019-02-25 17:05:11 -08:00
Xin Li
ac29030897 [automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master am: 9c1e14585f -s ours
am: 3ef6518b09 -s ours
am skip reason: subject contains skip directive

Change-Id: I3ad6ab823f4bb5812554cd4d0462c8c8661cc942
2019-02-25 08:09:40 -08:00
Xin Li
3ef6518b09 [automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
am: 9c1e14585f -s ours
am skip reason: subject contains skip directive

Change-Id: I447204a19cb6a304f10b8faaf7b5bad112113658
2019-02-25 05:47:42 -08:00
Maciej enczykowski
7160fe215f p/android-4.9+: relax QTAGUID requirements
am: 1d961dc1ab

Change-Id: Iea69dc40f99b3f994fea15cfdc2bff7525f36240
2019-02-22 17:21:40 -08:00
Maciej Żenczykowski
1d961dc1ab p/android-4.9+: relax QTAGUID requirements
Q userspace will use eBPF for bandwidth measurement
and does not require QTAGUID netfilter extension.
As such we are okay with either QTAGUID or the less
functional but sufficient OWNER extension (provided
the requisite eBPF config options are also enabled).

ie. we require either XT_MATCH_QTAGUID or XT_MATCH_OWNER.

Furthermore XT_MATCH_OWNER also requires:
  CONFIG_BPF_SYSCALL=y
  CONFIG_CGROUP_BPF=y
  CONFIG_NETFILTER_XT_MATCH_BPF=y
  CONFIG_NET_CLS_BPF=y
(the first 3 of which are already base requirements on P 4.9+)

Note: while this change is complex, it *widens* the
set of valid kernel configurations.  Any kernel that passed
configuration requirements before this change will also pass
them after this change.  However additionally this allows a
Q kernel to pass on a shipped as P but then upgraded to Q
device.

Also note that as Alistair points out this doesn't work for
shipped as O then upgraded to Q devices, as:
  system/bpf/libbpf_android/BpfUtils.cpp
is still checking "first_api_level" for P, and thus will not
use eBPF and thus it would actually break without QTAGUID.

Bug: 125362907
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ia6ce9e857d260cc6c74dd59731555479f7d38078
2019-02-22 13:49:45 -08:00
Xin Li
9c1e14585f DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
Bug: 120848293
Change-Id: If72428d426199fb2c6124ed1a6c9334acb138327
2019-02-20 16:19:31 -08:00
Maciej enczykowski
6323897e63 android-4.9+: add CONFIG_NET_SCH_NETEM=y to recommended config am: 8c186b2881 am: 1fc9c04a77
am: 93ee33a6bc

Change-Id: Ibad75061cd85126d85d37ea3db22a39508bff673
2019-02-14 17:58:15 -08:00
Maciej enczykowski
93ee33a6bc android-4.9+: add CONFIG_NET_SCH_NETEM=y to recommended config am: 8c186b2881
am: 1fc9c04a77

Change-Id: I7219b77c030a658e5c02ed85df2645874cad1ab4
2019-02-14 17:55:07 -08:00
Maciej enczykowski
1fc9c04a77 android-4.9+: add CONFIG_NET_SCH_NETEM=y to recommended config
am: 8c186b2881

Change-Id: I641a1542cd335fc9d2d212e69e0e82544562da14
2019-02-14 16:37:58 -08:00
Maciej Żenczykowski
8c186b2881 android-4.9+: add CONFIG_NET_SCH_NETEM=y to recommended config
I've received multiple requests to enable the use of the 'netem'
packet scheduling qdisc.  I've also wanted to use it myself.

The amount of code is trivial (~1000 lines of code), but it enables
some pretty useful functionality - although mostly for debugging,
troubleshooting and testing.

One can use netem to introduce delays or packet loss and in general
reproduce a lower quality network.

Now that we've fixed iproute2 to enable support for more qdiscs,
it makes sense to also enable support for it in the kernel.

Bug: 124467469
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I0169514a997a77d044209a5b017d5f306fb3308e
2019-02-14 15:13:13 -08:00
Chenbo Feng
68812b9519 Merge "Turn on xt_owner module to replace xt_qtaguid" am: 2ad58ef761 am: c6b87c0009
am: c11fc05626

Change-Id: I5ce2e1651576335a3f8e8ca4a0993d214f88c6c2
2019-02-11 16:29:16 -08:00
Chenbo Feng
c11fc05626 Merge "Turn on xt_owner module to replace xt_qtaguid" am: 2ad58ef761
am: c6b87c0009

Change-Id: I387518364448f3630423cbde73614152ee69acba
2019-02-11 16:08:01 -08:00
Chenbo Feng
c6b87c0009 Merge "Turn on xt_owner module to replace xt_qtaguid"
am: 2ad58ef761

Change-Id: I98243037ab10d21941f22dff4e63ce3094f5340e
2019-02-11 15:54:42 -08:00
Treehugger Robot
2ad58ef761 Merge "Turn on xt_owner module to replace xt_qtaguid" 2019-02-11 23:25:29 +00:00
Mark Salyzyn
093940c0c4 Add CONFIG_OVERLAY_FS=y am: ca6a1fe876 am: 32f1f25ccc
am: 6bf4397778

Change-Id: If85196ac490140f89198b231fd127b0f625c0805
2019-02-11 14:26:04 -08:00
Mark Salyzyn
6bf4397778 Add CONFIG_OVERLAY_FS=y am: ca6a1fe876
am: 32f1f25ccc

Change-Id: Ife0ee69de8c3588defd33afc4cb9fd5d09ec1f0b
2019-02-11 14:16:05 -08:00
Mark Salyzyn
32f1f25ccc Add CONFIG_OVERLAY_FS=y
am: ca6a1fe876

Change-Id: Ifcb9b0bfb26751671e98c9493399d473132b4a96
2019-02-11 14:10:59 -08:00
Mark Salyzyn
ca6a1fe876 Add CONFIG_OVERLAY_FS=y
Required for overlayfs integration support for adb remount
command.  A requirement for any device that supports a
readonly filesystem, which includes erofs, squashfs, ext4 dedupe,
or right sized (zero space remaining) for any filesystem type
selected for the system images.

Required for vendor overlays.

Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Test: adb-remount-test.sh
Bug: 109821005
Change-Id: I3ece03886db7cc97f864497cf93ec6c6c39bccd1
2019-02-11 11:42:58 -08:00
Benedict Wong
28038b85c0 Add XFRM Interfaces option to base am: 9f16115a26 am: 90569de2ea
am: 120616dd78

Change-Id: I2b21ec92176333200315266356413908986e19d6
2019-02-11 11:42:35 -08:00
Chenbo Feng
dea6da360c Turn on xt_owner module to replace xt_qtaguid
Once xt_qtaguid module is deprecated, the netd strictController which
uses owner match to filter egress traffic will not work because
xt_qtaguid masquerades as (and implements/extends) the "owner" module on
android devices. It can be resolved by turning upstream xt_owner module
back on since strictController only targets egress traffic and the
upstream xt_owner module works fine in this case.

Signed-off-by: Chenbo Feng <fengc@google.com>
Bug: 79938294
Test: manual cherry-pick and compile
Change-Id: I7247eb92827ed0db091ff8e954f7445e65f18606
2019-02-11 19:42:28 +00:00
Benedict Wong
120616dd78 Add XFRM Interfaces option to base am: 9f16115a26
am: 90569de2ea

Change-Id: I67b3698c12a01ec3b91a2a53073cabc328e2ff82
2019-02-11 11:37:20 -08:00
Benedict Wong
90569de2ea Add XFRM Interfaces option to base
am: 9f16115a26

Change-Id: Id8f0c9c7db985dacb07d0576ca5b9582e0a9f6f1
2019-02-11 11:32:19 -08:00
Benedict Wong
9f16115a26 Add XFRM Interfaces option to base
Required for all Q+ devices

Bug: 115914689
Change-Id: I74ca329b1cc703b3f0ec62391cedba9cc0539668
2019-02-08 10:03:02 -08:00
Steve Muckle
ba6e4c0bb5 README.md: update pointer to VTS test am: 62940e975d am: a93f70520b
am: f09b1c565e

Change-Id: Ic4feb817fd6cbea75373faad91efda53b0593d80
2019-01-25 14:29:56 -08:00
Steve Muckle
f09b1c565e README.md: update pointer to VTS test am: 62940e975d
am: a93f70520b

Change-Id: I1807ca3bb46edf2fdc368c827fbf3a36cdf4c510
2019-01-25 14:24:44 -08:00
Steve Muckle
a93f70520b README.md: update pointer to VTS test
am: 62940e975d

Change-Id: I6752c77384621201f65a4d8d7fd94562644f27ed
2019-01-25 14:18:51 -08:00
Steve Muckle
62940e975d README.md: update pointer to VTS test
The VTS test that verifies the kernel configuration has changed. Update
the documentation to reflect this.

Change-Id: Ibc9a5e3a5046953bbccb55e3456efd9c1dc48bff
Signed-off-by: Steve Muckle <smuckle@google.com>
2019-01-25 10:51:52 -08:00
Maciej enczykowski
8cb5c612f7 android-4.9+: add CONFIG_NET_CLS_BPF to base am: 7f4bb11d8e am: e0ca08b4e5
am: bb649dc462

Change-Id: If60b5ba33371f34ea87b4f2f72c75c8e092267fd
2019-01-15 17:03:12 -08:00
Maciej enczykowski
bb649dc462 android-4.9+: add CONFIG_NET_CLS_BPF to base am: 7f4bb11d8e
am: e0ca08b4e5

Change-Id: I9c714dccbdffec32cb8cefe482e17cb5223c2d1a
2019-01-15 16:47:59 -08:00
Maciej enczykowski
e0ca08b4e5 android-4.9+: add CONFIG_NET_CLS_BPF to base
am: 7f4bb11d8e

Change-Id: I381f116169c8038c2a64715db63fc00acb1e9d3c
2019-01-15 16:39:50 -08:00
Maciej Żenczykowski
7f4bb11d8e android-4.9+: add CONFIG_NET_CLS_BPF to base
Required for bpf qdisc for packet mangling.

Bug: 65674744
Change-Id: Ibec7de64ddf71ef865e83ca86df0254c8fe3a7db
Signed-off-by: Maciej Żenczykowski <maze@google.com>
2019-01-15 22:02:14 +00:00
Steve Muckle
7c4aa1d99f tools: add script to verify non-conditional config fragments am: 8954a954c5 am: 1f5acb7105
am: 741460cd14

Change-Id: I845b765f8dcbe9e41c8af59f04d40d048f2f8463
2019-01-07 17:01:15 -08:00
Steve Muckle
ed67031cb6 android-4.9: remove CONFIG_FUSE_FS from recommended am: ecc3ea7ed2 am: 05012dbcbb
am: 3db3f82e36

Change-Id: I6f364f5c392ff010d64c390ab8fd500d317cb41f
2019-01-07 16:59:15 -08:00
Steve Muckle
741460cd14 tools: add script to verify non-conditional config fragments am: 8954a954c5
am: 1f5acb7105

Change-Id: I37bce9c9e729b91fcb793432156988f982448d69
2019-01-07 15:54:58 -08:00
Steve Muckle
3db3f82e36 android-4.9: remove CONFIG_FUSE_FS from recommended am: ecc3ea7ed2
am: 05012dbcbb

Change-Id: I5250c958fd6120711f816d7681511a4a220417e9
2019-01-07 15:52:21 -08:00
Steve Muckle
1f5acb7105 tools: add script to verify non-conditional config fragments
am: 8954a954c5

Change-Id: I4c9ced9580d1846cf5ad2fe02457a54552fbb07a
2019-01-07 15:51:48 -08:00
Steve Muckle
05012dbcbb android-4.9: remove CONFIG_FUSE_FS from recommended
am: ecc3ea7ed2

Change-Id: Ia81d7e54288a105a45dfdcdea44598fcc2b9ad7b
2019-01-07 15:48:16 -08:00
Steve Muckle
8954a954c5 tools: add script to verify non-conditional config fragments
Add a script which can be used to verify that the non-conditional
config fragments are consistent, i.e. none of them disappear when
merged into an an allnoconfig.

Change-Id: I390823ead7ca5540f969a73e641855b8d9f55008
Signed-off-by: Steve Muckle <smuckle@google.com>
2019-01-07 11:25:59 -08:00
Steve Muckle
ecc3ea7ed2 android-4.9: remove CONFIG_FUSE_FS from recommended
SDCARD_FS is now recommended instead of FUSE_FS.

Change-Id: I4992841f6e0a108d5ecdb169f434763b4536e9d9
Signed-off-by: Steve Muckle <smuckle@google.com>
2019-01-07 10:16:01 -08:00
yangbill
cc492f6ef7 Merge "Change exit(0) to sys.exit(0) in kconfig_xml_fixup.py" am: 8cad0700d1 am: 73720d99d4
am: 8399fb29f6

Change-Id: Ia561284e900f2bbd632e6c0e8d9946d49ae6a043
2019-01-06 18:58:06 -08:00
yangbill
8399fb29f6 Merge "Change exit(0) to sys.exit(0) in kconfig_xml_fixup.py" am: 8cad0700d1
am: 73720d99d4

Change-Id: I79ac4d3308d4791693f8ef6fec1d3d8dfd990ff7
2019-01-06 18:55:05 -08:00
yangbill
73720d99d4 Merge "Change exit(0) to sys.exit(0) in kconfig_xml_fixup.py"
am: 8cad0700d1

Change-Id: I5f5b489317932e1ced7b021b36fe20973bb9d779
2019-01-06 18:50:04 -08:00
Treehugger Robot
8cad0700d1 Merge "Change exit(0) to sys.exit(0) in kconfig_xml_fixup.py" 2019-01-07 02:42:09 +00:00
Sandeep Patil
76041d8075 kernel/configs: Remove android-4.4 for the next release. am: baa86b6d1f am: 3d8b661b78
am: a4625713c3

Change-Id: I97100b59282dcbefe0d7a82203fd852aa121ddc5
2019-01-04 19:06:22 -08:00
Sandeep Patil
a4625713c3 kernel/configs: Remove android-4.4 for the next release. am: baa86b6d1f
am: 3d8b661b78

Change-Id: I7deb9833d6a155e00a644f183f02b878a12429d3
2019-01-04 18:58:18 -08:00
Sandeep Patil
3d8b661b78 kernel/configs: Remove android-4.4 for the next release.
am: baa86b6d1f

Change-Id: Ie9303c0fd36534924d142cc176a6d90284c000b2
2019-01-04 18:53:16 -08:00
yangbill
0d0907b407 Change exit(0) to sys.exit(0) in kconfig_xml_fixup.py
If pass -S option in python binaries wrapper, kconfig_xml_fixup
will meet below error (NameError: name 'exit' is not defined).

Bug:122343420
Test: 1. full build.
      2. m kconfig_xml_fixup
      out/soong/host/linux-x86/bin/kconfig_xml_fixup
      --input kernel/configs/android-4.14/android-base-conditional.xml
      --output-version
      out/soong/.intermediates/kernel/configs/android-4.14/kernel_config_current_4.14/gen/version.txt
      --output-matrix
      out/soong/.intermediates/kernel/configs/android-4.14/kernel_config_current_4.14/gen/conditional.xml

Change-Id: I1fef27321c1051a7a6e9e809328c0695f83cfced
2019-01-04 17:50:33 +08:00
Sandeep Patil
baa86b6d1f kernel/configs: Remove android-4.4 for the next release.
Bug: none
Test: none

Change-Id: I3049f1f8edcc65471bc24900fdfb9c4c1abaea7b
Signed-off-by: Sandeep Patil <sspatil@google.com>
2019-01-02 12:45:47 -08:00
Steve Muckle
3e2ead384e add some required configs am: 2639513b59 am: 82e7e2214d
am: 5f370461dd

Change-Id: I98382b366ac85d492dc94d969477ee7272dc4d91
2018-12-28 13:41:44 -08:00