Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit abe0ec5a authored by Todd Kjos's avatar Todd Kjos
Browse files

ANDROID: android-mainline quilt series for 5.4-ic1 



This introduces a quilt series that can be used to create
a rebase version of the android-mainline branch.

The series applies to mainline commit 54ecb8f7 ("Linux 5.4-rc1")
The generated tree matches android-mainline commit c8e152bc
("ANDROID: staging: ion: Fix missing entry in kerneldoc header")

Change-Id: I6fe8876981e342ae1f6a71afd6868d5c6e5de31e
Signed-off-by: default avatarTodd Kjos <tkjos@google.com>
parent babfa388

patches/ANDROID-AVB-error-handler-to-invalidate-vbmeta-parti.patch

0 → 100644
+332 −0
Original line number Diff line number Diff line 
From d3c3722eb2abb01afead5f23f529cd3bca4ab710 Mon Sep 17 00:00:00 2001

From: David Zeuthen <zeuthen@google.com>

Date: Tue, 24 Jan 2017 13:17:01 -0500

Subject: ANDROID: AVB error handler to invalidate vbmeta

 partition.



If androidboot.vbmeta.invalidate_on_error is 'yes' and

androidboot.vbmeta.device is set and points to a device with vbmeta

magic, this header will be overwritten upon an irrecoverable dm-verity

error. The side-effect of this is that the slot will fail to verify on

next reboot, effectively triggering the boot loader to fallback to

another slot. This work both if the vbmeta struct is at the start of a

partition or if there's an AVB footer at the end.



This code is based on drivers/md/dm-verity-chromeos.c from ChromiumOS.



Bug: 31622239

Bug: 120445368

Test: Manually tested (other arch).

Signed-off-by: David Zeuthen <zeuthen@google.com>

[astrachan: re-diffed against a kernel without dm-android-verity]

Change-Id: I571b5a75461da38ad832a9bea33c298bef859e26

Signed-off-by: Alistair Strachan <astrachan@google.com>

---

 drivers/md/Kconfig            |   9 ++

 drivers/md/Makefile           |   4 +

 drivers/md/dm-verity-avb.c    | 229 ++++++++++++++++++++++++++++++++++

 drivers/md/dm-verity-target.c |   6 +-

 drivers/md/dm-verity.h        |   2 +

 5 files changed, 249 insertions(+), 1 deletion(-)

 create mode 100644 drivers/md/dm-verity-avb.c



Index: common/drivers/md/Kconfig

===================================================================

--- common.orig/drivers/md/Kconfig

+++ common/drivers/md/Kconfig

@@ -517,6 +517,17 @@ config DM_VERITY_VERIFY_ROOTHASH_SIG

 

 	  If unsure, say N.

 

+config DM_VERITY_AVB

+	tristate "Support AVB specific verity error behavior"

+	depends on DM_VERITY

+	---help---

+	  Enables Android Verified Boot platform-specific error

+	  behavior. In particular, it will modify the vbmeta partition

+	  specified on the kernel command-line when non-transient error

+	  occurs (followed by a panic).

+

+	  If unsure, say N.

+

 config DM_VERITY_FEC

 	bool "Verity forward error correction support"

 	depends on DM_VERITY

Index: common/drivers/md/Makefile

===================================================================

--- common.orig/drivers/md/Makefile

+++ common/drivers/md/Makefile

@@ -80,6 +80,10 @@ ifeq ($(CONFIG_DM_UEVENT),y)

 dm-mod-objs			+= dm-uevent.o

 endif

 

+ifeq ($(CONFIG_DM_VERITY_AVB),y)

+dm-verity-objs			+= dm-verity-avb.o

+endif

+

 ifeq ($(CONFIG_DM_VERITY_FEC),y)

 dm-verity-objs			+= dm-verity-fec.o

 endif

Index: common/drivers/md/dm-verity-avb.c

===================================================================

--- /dev/null

+++ common/drivers/md/dm-verity-avb.c

@@ -0,0 +1,229 @@

+/*

+ * Copyright (C) 2017 Google.

+ *

+ * This file is released under the GPLv2.

+ *

+ * Based on drivers/md/dm-verity-chromeos.c

+ */

+

+#include <linux/device-mapper.h>

+#include <linux/module.h>

+#include <linux/mount.h>

+

+#define DM_MSG_PREFIX "verity-avb"

+

+/* Set via module parameters. */

+static char avb_vbmeta_device[64];

+static char avb_invalidate_on_error[4];

+

+static void invalidate_vbmeta_endio(struct bio *bio)

+{

+	if (bio->bi_status)

+		DMERR("invalidate_vbmeta_endio: error %d", bio->bi_status);

+	complete(bio->bi_private);

+}

+

+static int invalidate_vbmeta_submit(struct bio *bio,

+				    struct block_device *bdev,

+				    int op, int access_last_sector,

+				    struct page *page)

+{

+	DECLARE_COMPLETION_ONSTACK(wait);

+

+	bio->bi_private = &wait;

+	bio->bi_end_io = invalidate_vbmeta_endio;

+	bio_set_dev(bio, bdev);

+	bio_set_op_attrs(bio, op, REQ_SYNC);

+

+	bio->bi_iter.bi_sector = 0;

+	if (access_last_sector) {

+		sector_t last_sector;

+

+		last_sector = (i_size_read(bdev->bd_inode)>>SECTOR_SHIFT) - 1;

+		bio->bi_iter.bi_sector = last_sector;

+	}

+	if (!bio_add_page(bio, page, PAGE_SIZE, 0)) {

+		DMERR("invalidate_vbmeta_submit: bio_add_page error");

+		return -EIO;

+	}

+

+	submit_bio(bio);

+	/* Wait up to 2 seconds for completion or fail. */

+	if (!wait_for_completion_timeout(&wait, msecs_to_jiffies(2000)))

+		return -EIO;

+	return 0;

+}

+

+static int invalidate_vbmeta(dev_t vbmeta_devt)

+{

+	int ret = 0;

+	struct block_device *bdev;

+	struct bio *bio;

+	struct page *page;

+	fmode_t dev_mode;

+	/* Ensure we do synchronous unblocked I/O. We may also need

+	 * sync_bdev() on completion, but it really shouldn't.

+	 */

+	int access_last_sector = 0;

+

+	DMINFO("invalidate_vbmeta: acting on device %d:%d",

+	       MAJOR(vbmeta_devt), MINOR(vbmeta_devt));

+

+	/* First we open the device for reading. */

+	dev_mode = FMODE_READ | FMODE_EXCL;

+	bdev = blkdev_get_by_dev(vbmeta_devt, dev_mode,

+				 invalidate_vbmeta);

+	if (IS_ERR(bdev)) {

+		DMERR("invalidate_kernel: could not open device for reading");

+		dev_mode = 0;

+		ret = -ENOENT;

+		goto failed_to_read;

+	}

+

+	bio = bio_alloc(GFP_NOIO, 1);

+	if (!bio) {

+		ret = -ENOMEM;

+		goto failed_bio_alloc;

+	}

+

+	page = alloc_page(GFP_NOIO);

+	if (!page) {

+		ret = -ENOMEM;

+		goto failed_to_alloc_page;

+	}

+

+	access_last_sector = 0;

+	ret = invalidate_vbmeta_submit(bio, bdev, REQ_OP_READ,

+				       access_last_sector, page);

+	if (ret) {

+		DMERR("invalidate_vbmeta: error reading");

+		goto failed_to_submit_read;

+	}

+

+	/* We have a page. Let's make sure it looks right. */

+	if (memcmp("AVB0", page_address(page), 4) == 0) {

+		/* Stamp it. */

+		memcpy(page_address(page), "AVE0", 4);

+		DMINFO("invalidate_vbmeta: found vbmeta partition");

+	} else {

+		/* Could be this is on a AVB footer, check. Also, since the

+		 * AVB footer is in the last 64 bytes, adjust for the fact that

+		 * we're dealing with 512-byte sectors.

+		 */

+		size_t offset = (1<<SECTOR_SHIFT) - 64;

+

+		access_last_sector = 1;

+		ret = invalidate_vbmeta_submit(bio, bdev, REQ_OP_READ,

+					       access_last_sector, page);

+		if (ret) {

+			DMERR("invalidate_vbmeta: error reading");

+			goto failed_to_submit_read;

+		}

+		if (memcmp("AVBf", page_address(page) + offset, 4) != 0) {

+			DMERR("invalidate_vbmeta on non-vbmeta partition");

+			ret = -EINVAL;

+			goto invalid_header;

+		}

+		/* Stamp it. */

+		memcpy(page_address(page) + offset, "AVE0", 4);

+		DMINFO("invalidate_vbmeta: found vbmeta footer partition");

+	}

+

+	/* Now rewrite the changed page - the block dev was being

+	 * changed on read. Let's reopen here.

+	 */

+	blkdev_put(bdev, dev_mode);

+	dev_mode = FMODE_WRITE | FMODE_EXCL;

+	bdev = blkdev_get_by_dev(vbmeta_devt, dev_mode,

+				 invalidate_vbmeta);

+	if (IS_ERR(bdev)) {

+		DMERR("invalidate_vbmeta: could not open device for writing");

+		dev_mode = 0;

+		ret = -ENOENT;

+		goto failed_to_write;

+	}

+

+	/* We re-use the same bio to do the write after the read. Need to reset

+	 * it to initialize bio->bi_remaining.

+	 */

+	bio_reset(bio);

+

+	ret = invalidate_vbmeta_submit(bio, bdev, REQ_OP_WRITE,

+				       access_last_sector, page);

+	if (ret) {

+		DMERR("invalidate_vbmeta: error writing");

+		goto failed_to_submit_write;

+	}

+

+	DMERR("invalidate_vbmeta: completed.");

+	ret = 0;

+failed_to_submit_write:

+failed_to_write:

+invalid_header:

+	__free_page(page);

+failed_to_submit_read:

+	/* Technically, we'll leak a page with the pending bio, but

+	 * we're about to reboot anyway.

+	 */

+failed_to_alloc_page:

+	bio_put(bio);

+failed_bio_alloc:

+	if (dev_mode)

+		blkdev_put(bdev, dev_mode);

+failed_to_read:

+	return ret;

+}

+

+void dm_verity_avb_error_handler(void)

+{

+	dev_t dev;

+

+	DMINFO("AVB error handler called for %s", avb_vbmeta_device);

+

+	if (strcmp(avb_invalidate_on_error, "yes") != 0) {

+		DMINFO("Not configured to invalidate");

+		return;

+	}

+

+	if (avb_vbmeta_device[0] == '\0') {

+		DMERR("avb_vbmeta_device parameter not set");

+		goto fail_no_dev;

+	}

+

+	dev = name_to_dev_t(avb_vbmeta_device);

+	if (!dev) {

+		DMERR("No matching partition for device: %s",

+		      avb_vbmeta_device);

+		goto fail_no_dev;

+	}

+

+	invalidate_vbmeta(dev);

+

+fail_no_dev:

+	;

+}

+

+static int __init dm_verity_avb_init(void)

+{

+	DMINFO("AVB error handler initialized with vbmeta device: %s",

+	       avb_vbmeta_device);

+	return 0;

+}

+

+static void __exit dm_verity_avb_exit(void)

+{

+}

+

+module_init(dm_verity_avb_init);

+module_exit(dm_verity_avb_exit);

+

+MODULE_AUTHOR("David Zeuthen <zeuthen@google.com>");

+MODULE_DESCRIPTION("AVB-specific error handler for dm-verity");

+MODULE_LICENSE("GPL");

+

+/* Declare parameter with no module prefix */

+#undef MODULE_PARAM_PREFIX

+#define MODULE_PARAM_PREFIX	"androidboot.vbmeta."

+module_param_string(device, avb_vbmeta_device, sizeof(avb_vbmeta_device), 0);

+module_param_string(invalidate_on_error, avb_invalidate_on_error,

+		    sizeof(avb_invalidate_on_error), 0);

Index: common/drivers/md/dm-verity-target.c

===================================================================

--- common.orig/drivers/md/dm-verity-target.c

+++ common/drivers/md/dm-verity-target.c

@@ -251,8 +251,12 @@ out:

 	if (v->mode == DM_VERITY_MODE_LOGGING)

 		return 0;

 

-	if (v->mode == DM_VERITY_MODE_RESTART)

+	if (v->mode == DM_VERITY_MODE_RESTART) {

+#ifdef CONFIG_DM_VERITY_AVB

+		dm_verity_avb_error_handler();

+#endif

 		kernel_restart("dm-verity device corrupted");

+	}

 

 	return 1;

 }

Index: common/drivers/md/dm-verity.h

===================================================================

--- common.orig/drivers/md/dm-verity.h

+++ common/drivers/md/dm-verity.h

@@ -128,4 +128,6 @@ extern int verity_hash(struct dm_verity

 extern int verity_hash_for_block(struct dm_verity *v, struct dm_verity_io *io,

 				 sector_t block, u8 *digest, bool *is_zero);

 

+extern void dm_verity_avb_error_handler(void);

+

 #endif /* DM_VERITY_H */

patches/ANDROID-Add-dm-bow-to-cuttlefish-configuration.patch

0 → 100644
+39 −0
Original line number Diff line number Diff line 
From a41cdee10376397a2139dbf4de41ec492cc1565e Mon Sep 17 00:00:00 2001

From: Paul Lawrence <paullawrence@google.com>

Date: Thu, 21 Mar 2019 13:23:03 -0700

Subject: ANDROID: Add dm-bow to cuttlefish configuration



Change-Id: I7f265cb8c6274da414d2477da9953546510ce26b

Signed-off-by: Paul Lawrence <paullawrence@google.com>

---

 arch/arm64/configs/cuttlefish_defconfig      | 1 +

 arch/x86/configs/x86_64_cuttlefish_defconfig | 1 +

 2 files changed, 2 insertions(+)



diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig

index b3116d935c841..76a68561f2fb1 100644

--- a/arch/arm64/configs/cuttlefish_defconfig

+++ b/arch/arm64/configs/cuttlefish_defconfig

@@ -218,6 +218,7 @@ CONFIG_DM_UEVENT=y

 CONFIG_DM_VERITY=y

 CONFIG_DM_VERITY_AVB=y

 CONFIG_DM_VERITY_FEC=y

+CONFIG_DM_BOW=y

 CONFIG_NETDEVICES=y

 CONFIG_NETCONSOLE=y

 CONFIG_NETCONSOLE_DYNAMIC=y

diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig

index abd24a4f017d4..b2ad519f11c70 100644

--- a/arch/x86/configs/x86_64_cuttlefish_defconfig

+++ b/arch/x86/configs/x86_64_cuttlefish_defconfig

@@ -227,6 +227,7 @@ CONFIG_DM_UEVENT=y

 CONFIG_DM_VERITY=y

 CONFIG_DM_VERITY_AVB=y

 CONFIG_DM_VERITY_FEC=y

+CONFIG_DM_BOW=y

 CONFIG_NETDEVICES=y

 CONFIG_NETCONSOLE=y

 CONFIG_NETCONSOLE_DYNAMIC=y

-- 

2.23.0.444.g18eeb5a265-goog

patches/ANDROID-Add-initial-rockpi4_defconfig.patch

0 → 100644
+564 −0

File added.

Preview size limit exceeded, changes collapsed.

patches/ANDROID-Add-initial-x86_64-gki_defconfig.patch

0 → 100644
+464 −0
Original line number Diff line number Diff line 
From 7d1009ce0de9f6f018be997f32989c3b51d5d57f Mon Sep 17 00:00:00 2001

From: Ram Muthiah <rammuthiah@google.com>

Date: Fri, 17 May 2019 16:52:29 -0700

Subject: ANDROID: Add initial x86_64 gki_defconfig



That is a copy from the aarch64 gki_defconfig.



To be able to build in this configuration,



    + CONFIG_UNWINDER_FRAME_POINTER=y



was necessary.



Bug: 132113225

Bug: 132629930

Change-Id: I685ccea29efc7ba14f7b0a24f41983e37203f9a2

Signed-off-by: Ram Muthiah <rammuthiah@google.com>

Signed-off-by: Matthias Maennich <maennich@google.com>

---

 arch/x86/configs/gki_defconfig               | 328 +++++++++++++++++++

 arch/x86/configs/x86_64_cuttlefish_defconfig |   8 +-

 build.config.cuttlefish.aarch64              |   3 +-

 build.config.cuttlefish.x86_64               |   3 +-

 build.config.gki.x86_64                      |  17 +

 5 files changed, 352 insertions(+), 7 deletions(-)

 create mode 100644 arch/x86/configs/gki_defconfig

 create mode 100644 build.config.gki.x86_64



diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig

new file mode 100644

index 0000000000000..18ba312d0a602

--- /dev/null

+++ b/arch/x86/configs/gki_defconfig

@@ -0,0 +1,328 @@

+CONFIG_AUDIT=y

+CONFIG_NO_HZ=y

+CONFIG_HIGH_RES_TIMERS=y

+CONFIG_PREEMPT=y

+CONFIG_TASKSTATS=y

+CONFIG_TASK_XACCT=y

+CONFIG_TASK_IO_ACCOUNTING=y

+CONFIG_PSI=y

+CONFIG_IKCONFIG=y

+CONFIG_IKCONFIG_PROC=y

+CONFIG_MEMCG=y

+CONFIG_MEMCG_SWAP=y

+CONFIG_RT_GROUP_SCHED=y

+CONFIG_CGROUP_FREEZER=y

+CONFIG_CGROUP_CPUACCT=y

+CONFIG_CGROUP_BPF=y

+CONFIG_SCHED_AUTOGROUP=y

+CONFIG_BLK_DEV_INITRD=y

+# CONFIG_RD_BZIP2 is not set

+# CONFIG_RD_LZMA is not set

+# CONFIG_RD_XZ is not set

+# CONFIG_RD_LZO is not set

+# CONFIG_RD_LZ4 is not set

+# CONFIG_SYSFS_SYSCALL is not set

+# CONFIG_FHANDLE is not set

+CONFIG_KALLSYMS_ALL=y

+CONFIG_BPF_SYSCALL=y

+# CONFIG_RSEQ is not set

+CONFIG_EMBEDDED=y

+# CONFIG_VM_EVENT_COUNTERS is not set

+# CONFIG_COMPAT_BRK is not set

+# CONFIG_SLAB_MERGE_DEFAULT is not set

+CONFIG_PROFILING=y

+CONFIG_PM_WAKELOCKS=y

+CONFIG_PM_WAKELOCKS_LIMIT=0

+# CONFIG_PM_WAKELOCKS_GC is not set

+CONFIG_CPU_FREQ=y

+CONFIG_CPU_FREQ_TIMES=y

+CONFIG_CPU_FREQ_GOV_POWERSAVE=y

+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y

+CONFIG_KPROBES=y

+CONFIG_MODULES=y

+CONFIG_MODULE_UNLOAD=y

+CONFIG_MODVERSIONS=y

+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

+# CONFIG_SPARSEMEM_VMEMMAP is not set

+CONFIG_TRANSPARENT_HUGEPAGE=y

+CONFIG_ZSMALLOC=y

+CONFIG_NET=y

+CONFIG_PACKET=y

+CONFIG_UNIX=y

+CONFIG_XFRM_USER=y

+CONFIG_XFRM_INTERFACE=y

+CONFIG_XFRM_STATISTICS=y

+CONFIG_NET_KEY=y

+CONFIG_INET=y

+CONFIG_IP_MULTICAST=y

+CONFIG_IP_ADVANCED_ROUTER=y

+CONFIG_IP_MULTIPLE_TABLES=y

+CONFIG_NET_IPGRE_DEMUX=y

+CONFIG_NET_IPVTI=y

+CONFIG_INET_ESP=y

+CONFIG_INET_UDP_DIAG=y

+CONFIG_INET_DIAG_DESTROY=y

+CONFIG_IPV6_ROUTER_PREF=y

+CONFIG_IPV6_ROUTE_INFO=y

+CONFIG_IPV6_OPTIMISTIC_DAD=y

+CONFIG_INET6_ESP=y

+CONFIG_INET6_IPCOMP=y

+CONFIG_IPV6_MIP6=y

+CONFIG_IPV6_VTI=y

+CONFIG_IPV6_MULTIPLE_TABLES=y

+CONFIG_NETFILTER=y

+CONFIG_NF_CONNTRACK=y

+CONFIG_NF_CONNTRACK_SECMARK=y

+CONFIG_NF_CONNTRACK_EVENTS=y

+CONFIG_NF_CONNTRACK_AMANDA=y

+CONFIG_NF_CONNTRACK_FTP=y

+CONFIG_NF_CONNTRACK_H323=y

+CONFIG_NF_CONNTRACK_IRC=y

+CONFIG_NF_CONNTRACK_NETBIOS_NS=y

+CONFIG_NF_CONNTRACK_PPTP=y

+CONFIG_NF_CONNTRACK_SANE=y

+CONFIG_NF_CONNTRACK_TFTP=y

+CONFIG_NF_CT_NETLINK=y

+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y

+CONFIG_NETFILTER_XT_TARGET_CONNMARK=y

+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y

+CONFIG_NETFILTER_XT_TARGET_CT=y

+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y

+CONFIG_NETFILTER_XT_TARGET_MARK=y

+CONFIG_NETFILTER_XT_TARGET_NFLOG=y

+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y

+CONFIG_NETFILTER_XT_TARGET_TPROXY=y

+CONFIG_NETFILTER_XT_TARGET_TRACE=y

+CONFIG_NETFILTER_XT_TARGET_SECMARK=y

+CONFIG_NETFILTER_XT_TARGET_TCPMSS=y

+CONFIG_NETFILTER_XT_MATCH_BPF=y

+CONFIG_NETFILTER_XT_MATCH_COMMENT=y

+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y

+CONFIG_NETFILTER_XT_MATCH_CONNMARK=y

+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y

+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y

+CONFIG_NETFILTER_XT_MATCH_HELPER=y

+CONFIG_NETFILTER_XT_MATCH_IPRANGE=y

+CONFIG_NETFILTER_XT_MATCH_LENGTH=y

+CONFIG_NETFILTER_XT_MATCH_LIMIT=y

+CONFIG_NETFILTER_XT_MATCH_MAC=y

+CONFIG_NETFILTER_XT_MATCH_MARK=y

+CONFIG_NETFILTER_XT_MATCH_OWNER=y

+CONFIG_NETFILTER_XT_MATCH_POLICY=y

+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y

+CONFIG_NETFILTER_XT_MATCH_QUOTA=y

+CONFIG_NETFILTER_XT_MATCH_QUOTA2=y

+CONFIG_NETFILTER_XT_MATCH_SOCKET=y

+CONFIG_NETFILTER_XT_MATCH_STATE=y

+CONFIG_NETFILTER_XT_MATCH_STATISTIC=y

+CONFIG_NETFILTER_XT_MATCH_STRING=y

+CONFIG_NETFILTER_XT_MATCH_TIME=y

+CONFIG_NETFILTER_XT_MATCH_U32=y

+CONFIG_IP_NF_IPTABLES=y

+CONFIG_IP_NF_MATCH_ECN=y

+CONFIG_IP_NF_MATCH_TTL=y

+CONFIG_IP_NF_FILTER=y

+CONFIG_IP_NF_TARGET_REJECT=y

+CONFIG_IP_NF_NAT=y

+CONFIG_IP_NF_TARGET_MASQUERADE=y

+CONFIG_IP_NF_TARGET_NETMAP=y

+CONFIG_IP_NF_TARGET_REDIRECT=y

+CONFIG_IP_NF_MANGLE=y

+CONFIG_IP_NF_RAW=y

+CONFIG_IP_NF_SECURITY=y

+CONFIG_IP_NF_ARPTABLES=y

+CONFIG_IP_NF_ARPFILTER=y

+CONFIG_IP_NF_ARP_MANGLE=y

+CONFIG_IP6_NF_IPTABLES=y

+CONFIG_IP6_NF_MATCH_RPFILTER=y

+CONFIG_IP6_NF_FILTER=y

+CONFIG_IP6_NF_TARGET_REJECT=y

+CONFIG_IP6_NF_MANGLE=y

+CONFIG_IP6_NF_RAW=y

+CONFIG_L2TP=y

+CONFIG_NET_SCHED=y

+CONFIG_NET_SCH_HTB=y

+CONFIG_NET_SCH_INGRESS=y

+CONFIG_NET_CLS_U32=y

+CONFIG_NET_CLS_BPF=y

+CONFIG_NET_EMATCH=y

+CONFIG_NET_EMATCH_U32=y

+CONFIG_NET_CLS_ACT=y

+CONFIG_VSOCKETS=y

+CONFIG_VIRTIO_VSOCKETS=y

+CONFIG_CFG80211=y

+# CONFIG_CFG80211_DEFAULT_PS is not set

+# CONFIG_CFG80211_CRDA_SUPPORT is not set

+CONFIG_MAC80211=y

+# CONFIG_MAC80211_RC_MINSTREL is not set

+CONFIG_RFKILL=y

+# CONFIG_ALLOW_DEV_COREDUMP is not set

+CONFIG_DEBUG_DEVRES=y

+CONFIG_ZRAM=y

+CONFIG_BLK_DEV_LOOP=y

+CONFIG_BLK_DEV_RAM=y

+CONFIG_BLK_DEV_RAM_SIZE=8192

+CONFIG_VIRTIO_BLK=y

+CONFIG_UID_SYS_STATS=y

+CONFIG_SCSI=y

+# CONFIG_SCSI_PROC_FS is not set

+CONFIG_BLK_DEV_SD=y

+CONFIG_SCSI_VIRTIO=y

+CONFIG_MD=y

+CONFIG_BLK_DEV_DM=y

+CONFIG_DM_CRYPT=y

+CONFIG_DM_UEVENT=y

+CONFIG_DM_VERITY=y

+CONFIG_DM_VERITY_AVB=y

+CONFIG_DM_VERITY_FEC=y

+CONFIG_DM_BOW=y

+CONFIG_NETDEVICES=y

+CONFIG_TUN=y

+CONFIG_VIRTIO_NET=y

+# CONFIG_ETHERNET is not set

+CONFIG_PHYLIB=y

+CONFIG_PPP=y

+CONFIG_PPP_BSDCOMP=y

+CONFIG_PPP_DEFLATE=y

+CONFIG_PPP_MPPE=y

+CONFIG_PPTP=y

+CONFIG_PPPOL2TP=y

+CONFIG_USB_RTL8152=y

+CONFIG_USB_USBNET=y

+# CONFIG_USB_NET_AX8817X is not set

+# CONFIG_USB_NET_AX88179_178A is not set

+# CONFIG_USB_NET_CDCETHER is not set

+# CONFIG_USB_NET_CDC_NCM is not set

+# CONFIG_USB_NET_NET1080 is not set

+# CONFIG_USB_NET_CDC_SUBSET is not set

+# CONFIG_USB_NET_ZAURUS is not set

+# CONFIG_WLAN_VENDOR_ADMTEK is not set

+# CONFIG_WLAN_VENDOR_ATH is not set

+# CONFIG_WLAN_VENDOR_ATMEL is not set

+# CONFIG_WLAN_VENDOR_BROADCOM is not set

+# CONFIG_WLAN_VENDOR_CISCO is not set

+# CONFIG_WLAN_VENDOR_INTEL is not set

+# CONFIG_WLAN_VENDOR_INTERSIL is not set

+# CONFIG_WLAN_VENDOR_MARVELL is not set

+# CONFIG_WLAN_VENDOR_MEDIATEK is not set

+# CONFIG_WLAN_VENDOR_RALINK is not set

+# CONFIG_WLAN_VENDOR_REALTEK is not set

+# CONFIG_WLAN_VENDOR_RSI is not set

+# CONFIG_WLAN_VENDOR_ST is not set

+# CONFIG_WLAN_VENDOR_TI is not set

+# CONFIG_WLAN_VENDOR_ZYDAS is not set

+# CONFIG_WLAN_VENDOR_QUANTENNA is not set

+CONFIG_VIRT_WIFI=y

+CONFIG_INPUT_EVDEV=y

+# CONFIG_INPUT_KEYBOARD is not set

+# CONFIG_INPUT_MOUSE is not set

+CONFIG_INPUT_JOYSTICK=y

+CONFIG_INPUT_MISC=y

+CONFIG_INPUT_UINPUT=y

+# CONFIG_VT is not set

+# CONFIG_LEGACY_PTYS is not set

+# CONFIG_DEVMEM is not set

+CONFIG_SERIAL_8250=y

+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set

+CONFIG_SERIAL_8250_CONSOLE=y

+CONFIG_SERIAL_8250_NR_UARTS=48

+CONFIG_SERIAL_8250_EXTENDED=y

+CONFIG_SERIAL_8250_MANY_PORTS=y

+CONFIG_SERIAL_8250_SHARE_IRQ=y

+CONFIG_VIRTIO_CONSOLE=y

+CONFIG_HW_RANDOM=y

+CONFIG_HW_RANDOM_VIRTIO=y

+# CONFIG_I2C_COMPAT is not set

+# CONFIG_I2C_HELPER_AUTO is not set

+CONFIG_GPIOLIB=y

+# CONFIG_HWMON is not set

+CONFIG_DEVFREQ_THERMAL=y

+CONFIG_MEDIA_SUPPORT=y

+CONFIG_MEDIA_CAMERA_SUPPORT=y

+CONFIG_DRM=y

+# CONFIG_DRM_FBDEV_EMULATION is not set

+CONFIG_DRM_VIRTIO_GPU=y

+CONFIG_BACKLIGHT_CLASS_DEVICE=y

+CONFIG_SOUND=y

+CONFIG_SND=y

+CONFIG_SND_HRTIMER=y

+CONFIG_SND_DYNAMIC_MINORS=y

+# CONFIG_SND_SUPPORT_OLD_API is not set

+# CONFIG_SND_VERBOSE_PROCFS is not set

+# CONFIG_SND_DRIVERS is not set

+# CONFIG_SND_USB is not set

+CONFIG_HIDRAW=y

+CONFIG_UHID=y

+CONFIG_HID_APPLE=y

+CONFIG_HID_ELECOM=y

+CONFIG_HID_MAGICMOUSE=y

+CONFIG_HID_MICROSOFT=y

+CONFIG_HID_MULTITOUCH=y

+CONFIG_USB_HIDDEV=y

+CONFIG_USB=y

+CONFIG_USB_GADGET=y

+CONFIG_USB_CONFIGFS=y

+CONFIG_USB_CONFIGFS_UEVENT=y

+CONFIG_USB_CONFIGFS_F_FS=y

+CONFIG_USB_CONFIGFS_F_ACC=y

+CONFIG_USB_CONFIGFS_F_AUDIO_SRC=y

+CONFIG_USB_CONFIGFS_F_MIDI=y

+CONFIG_MMC=y

+# CONFIG_MMC_BLOCK is not set

+CONFIG_NEW_LEDS=y

+CONFIG_LEDS_CLASS=y

+CONFIG_LEDS_TRIGGERS=y

+CONFIG_RTC_CLASS=y

+# CONFIG_RTC_SYSTOHC is not set

+CONFIG_VIRTIO_BALLOON=y

+CONFIG_VIRTIO_INPUT=y

+CONFIG_VIRTIO_MMIO=y

+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y

+CONFIG_STAGING=y

+CONFIG_ASHMEM=y

+CONFIG_ION=y

+CONFIG_MAILBOX=y

+CONFIG_PM_DEVFREQ=y

+CONFIG_ANDROID=y

+CONFIG_ANDROID_BINDER_IPC=y

+CONFIG_EXT4_FS=y

+CONFIG_EXT4_FS_SECURITY=y

+CONFIG_F2FS_FS=y

+CONFIG_F2FS_FS_SECURITY=y

+# CONFIG_DNOTIFY is not set

+CONFIG_QUOTA=y

+CONFIG_QFMT_V2=y

+CONFIG_FUSE_FS=y

+CONFIG_MSDOS_FS=y

+CONFIG_VFAT_FS=y

+CONFIG_TMPFS=y

+CONFIG_TMPFS_POSIX_ACL=y

+CONFIG_PSTORE=y

+CONFIG_PSTORE_CONSOLE=y

+CONFIG_PSTORE_RAM=y

+CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y

+CONFIG_SECURITY=y

+CONFIG_SECURITY_NETWORK=y

+CONFIG_HARDENED_USERCOPY=y

+CONFIG_SECURITY_SELINUX=y

+CONFIG_CRYPTO_ADIANTUM=y

+CONFIG_CRYPTO_SHA512=y

+CONFIG_CRYPTO_LZ4=y

+CONFIG_CRYPTO_ZSTD=y

+CONFIG_CRYPTO_ANSI_CPRNG=y

+CONFIG_CRYPTO_DEV_VIRTIO=y

+CONFIG_CRC8=y

+CONFIG_XZ_DEC=y

+CONFIG_PRINTK_TIME=y

+CONFIG_DEBUG_INFO=y

+# CONFIG_ENABLE_MUST_CHECK is not set

+# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set

+CONFIG_MAGIC_SYSRQ=y

+CONFIG_DEBUG_STACK_USAGE=y

+CONFIG_DEBUG_MEMORY_INIT=y

+CONFIG_SOFTLOCKUP_DETECTOR=y

+# CONFIG_DETECT_HUNG_TASK is not set

+CONFIG_PANIC_TIMEOUT=5

+CONFIG_SCHEDSTATS=y

+# CONFIG_RUNTIME_TESTING_MENU is not set

+CONFIG_UNWINDER_FRAME_POINTER=y

diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig

index d1f0fa08eacfb..06c931405999c 100644

--- a/arch/x86/configs/x86_64_cuttlefish_defconfig

+++ b/arch/x86/configs/x86_64_cuttlefish_defconfig

@@ -67,7 +67,6 @@ CONFIG_IA32_EMULATION=y

 # CONFIG_FIRMWARE_MEMMAP is not set

 CONFIG_OPROFILE=y

 CONFIG_KPROBES=y

-CONFIG_JUMP_LABEL=y

 CONFIG_REFCOUNT_FULL=y

 CONFIG_MODULES=y

 CONFIG_MODULE_UNLOAD=y

@@ -96,7 +95,6 @@ CONFIG_IP_PIMSM_V2=y

 CONFIG_SYN_COOKIES=y

 CONFIG_NET_IPVTI=y

 CONFIG_INET_ESP=y

-# CONFIG_INET_XFRM_MODE_BEET is not set

 CONFIG_INET_UDP_DIAG=y

 CONFIG_INET_DIAG_DESTROY=y

 CONFIG_TCP_CONG_ADVANCED=y

@@ -199,7 +197,8 @@ CONFIG_VIRTIO_VSOCKETS=y

 CONFIG_CFG80211=y

 CONFIG_MAC80211=y

 CONFIG_RFKILL=y

-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

+CONFIG_PCI=y

+CONFIG_PCI_MSI=y

 CONFIG_DEVTMPFS=y

 CONFIG_DEBUG_DEVRES=y

 CONFIG_OF=y

@@ -459,10 +458,10 @@ CONFIG_DEBUG_INFO=y

 # CONFIG_ENABLE_MUST_CHECK is not set

 CONFIG_FRAME_WARN=1024

 # CONFIG_UNUSED_SYMBOLS is not set

+CONFIG_OPTIMIZE_INLINING=y

 CONFIG_MAGIC_SYSRQ=y

 CONFIG_DEBUG_STACK_USAGE=y

 CONFIG_DEBUG_MEMORY_INIT=y

-CONFIG_DEBUG_STACKOVERFLOW=y

 CONFIG_HARDLOCKUP_DETECTOR=y

 CONFIG_PANIC_TIMEOUT=5

 CONFIG_SCHEDSTATS=y

@@ -470,5 +469,4 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60

 CONFIG_ENABLE_DEFAULT_TRACERS=y

 CONFIG_IO_DELAY_NONE=y

 CONFIG_DEBUG_BOOT_PARAMS=y

-CONFIG_OPTIMIZE_INLINING=y

 CONFIG_UNWINDER_FRAME_POINTER=y

diff --git a/build.config.cuttlefish.aarch64 b/build.config.cuttlefish.aarch64

index ec53d6eac9ea3..bec1288d65e13 100644

--- a/build.config.cuttlefish.aarch64

+++ b/build.config.cuttlefish.aarch64

@@ -1,7 +1,8 @@

 ARCH=arm64

-BRANCH=android-4.19

+BRANCH=android-mainline

 CLANG_TRIPLE=aarch64-linux-gnu-

 CROSS_COMPILE=aarch64-linux-androidkernel-

+CC=clang

 DEFCONFIG=cuttlefish_defconfig

 EXTRA_CMDS=''

 KERNEL_DIR=common

diff --git a/build.config.cuttlefish.x86_64 b/build.config.cuttlefish.x86_64

index b49683d476d62..33063abed0edb 100644

--- a/build.config.cuttlefish.x86_64

+++ b/build.config.cuttlefish.x86_64

@@ -1,7 +1,8 @@

 ARCH=x86_64

-BRANCH=android-4.19

+BRANCH=android-mainline

 CLANG_TRIPLE=x86_64-linux-gnu-

 CROSS_COMPILE=x86_64-linux-androidkernel-

+CC=clang

 DEFCONFIG=x86_64_cuttlefish_defconfig

 EXTRA_CMDS=''

 KERNEL_DIR=common

diff --git a/build.config.gki.x86_64 b/build.config.gki.x86_64

new file mode 100644

index 0000000000000..69d339dce4a0f

--- /dev/null

+++ b/build.config.gki.x86_64

@@ -0,0 +1,17 @@

+ARCH=x86_64

+BRANCH=android-mainline

+CLANG_TRIPLE=x86_64-linux-gnu-

+CROSS_COMPILE=x86_64-linux-androidkernel-

+CC=clang

+DEFCONFIG=gki_defconfig

+EXTRA_CMDS=''

+KERNEL_DIR=common

+POST_DEFCONFIG_CMDS="check_defconfig"

+CLANG_PREBUILT_BIN=prebuilts-master/clang/host/linux-x86/clang-r353983c/bin

+LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin

+FILES="

+arch/x86/boot/bzImage

+vmlinux

+System.map

+"

+STOP_SHIP_TRACEPRINTK=1

-- 

2.23.0.444.g18eeb5a265-goog

patches/ANDROID-Add-show_options2-to-view-private-mount-data.patch

0 → 100644
+56 −0

File added.

Preview size limit exceeded, changes collapsed.