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

Commit 3773b3a5 authored by Blagovest Kolenichev's avatar Blagovest Kolenichev
Browse files

Merge android-4.14 (e709f59a) into msm-4.14 



* refs/heads/tmp-e709f59a:
  Revert "ANDROID: sched/fair: prevent possible infinite loop in sched_group_energy"
  Revert "UPSTREAM: zram: set BDI_CAP_STABLE_WRITES once"
  Revert "FROMLIST: ANDROID: binder: Add BINDER_GET_NODE_INFO_FOR_REF ioctl."
  Revert "ANDROID: sched: Add support for frequency/power energy model"
  ANDROID: restrict store of prefer_idle as boolean
  FROMLIST: ANDROID: binder: Add BINDER_GET_NODE_INFO_FOR_REF ioctl.
  ANDROID: squashfs: resolve merge conflict with 4.14.68
  UPSTREAM: xfrm: fix ptr_ret.cocci warnings
  UPSTREAM: xfrm: Return detailed errors from xfrmi_newlink
  UPSTREAM: xfrm: Allow xfrmi if_id to be updated by UPDSA
  UPSTREAM: xfrm: Remove xfrmi interface ID from flowi
  UPSTREAM: xfrm: Allow Set Mark to be Updated Using UPDSA
  UPSTREAM: xfrm: Add virtual xfrm interfaces
  UPSTREAM: xfrm: Add a new lookup key to match xfrm interfaces.
  UPSTREAM: flow: Extend flow informations with xfrm interface id.
  UPSTREAM: xfrm: Extend the output_mark to support input direction and masking.
  UPSTREAM: xfrm: fix XFRMA_OUTPUT_MARK policy entry
  BACKPORT: zram: drop max_zpage_size and use zs_huge_class_size()
  UPSTREAM: zsmalloc: introduce zs_huge_class_size()
  ANDROID: x86_64_cuttlefish_defconfig: Enable lz4 compression for zram
  UPSTREAM: drivers/block/zram/zram_drv.c: fix bug storing backing_dev
  UPSTREAM: zram: introduce zram memory tracking
  UPSTREAM: zram: record accessed second
  BACKPORT: zram: mark incompressible page as ZRAM_HUGE
  UPSTREAM: zram: correct flag name of ZRAM_ACCESS
  UPSTREAM: zram: Delete gendisk before cleaning up the request queue
  UPSTREAM: drivers/block/zram/zram_drv.c: make zram_page_end_io() static
  UPSTREAM: zram: set BDI_CAP_STABLE_WRITES once
  ANDROID: x86_64_cuttlefish_defconfig: Enable zram and zstd
  UPSTREAM: crypto: zstd - Add zstd support
  UPSTREAM: zram: add zstd to the supported algorithms list
  ANDROID: FIXUP: sched/fair: Fix hang during suspend in compute_energy
  ANDROID: sched/fair: prevent possible infinite loop in sched_group_energy
  ANDROID: sched: Add support for frequency/power energy model
  ANDROID: AVB error handler to invalidate vbmeta partition.
  ANDROID: remove android config fragments
  ANDROID: ftrace: fix function type mismatches

Conflicts:
	Documentation/blockdev/zram.txt
	drivers/block/zram/zram_drv.c
	kernel/configs/android-base.config
	kernel/configs/android-recommended.config

Change-Id: I2b4d018d19d4e2bddfdf5a7a58110d823bf1b274
Signed-off-by: default avatarBlagovest Kolenichev <bkolenichev@codeaurora.org>
parents 5c033b48 a75f1d1a

Documentation/blockdev/zram.txt

+25 −0
Original line number Diff line number Diff line
@@ -220,6 +220,7 @@ line of text and contains the following stats separated by whitespace: 
 pages_compacted  the number of pages freed during compaction

 dup_data_size	  deduplicated data size

 meta_data_size	  the amount of metadata allocated for deduplication feature

 huge_pages	  the number of incompressible pages



9) Deactivate:

	swapoff /dev/zram0
@@ -244,5 +245,29 @@ to backing storage rather than keeping it in memory. 
User should set up backing device via /sys/block/zramX/backing_dev

before disksize setting.



= memory tracking



With CONFIG_ZRAM_MEMORY_TRACKING, user can know information of the

zram block. It could be useful to catch cold or incompressible

pages of the process with*pagemap.

If you enable the feature, you could see block state via

/sys/kernel/debug/zram/zram0/block_state". The output is as follows,



	  300    75.033841 .wh

	  301    63.806904 s..

	  302    63.806919 ..h



First column is zram's block index.

Second column is access time since the system was booted

Third column is state of the block.

(s: same page

w: written page to backing store

h: huge page)



First line of above example says 300th block is accessed at 75.033841sec

and the block's state is huge so it is written back to the backing

storage. It's a debugging feature so anyone shouldn't rely on it to work

properly.



Nitin Gupta

ngupta@vflare.org

arch/x86/configs/x86_64_cuttlefish_defconfig

+4 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ CONFIG_X86_CPUID=y 
CONFIG_KSM=y

CONFIG_DEFAULT_MMAP_MIN_ADDR=65536

CONFIG_TRANSPARENT_HUGEPAGE=y

CONFIG_ZSMALLOC=y

# CONFIG_MTRR is not set

CONFIG_HZ_100=y

CONFIG_KEXEC=y
@@ -198,6 +199,7 @@ CONFIG_DEBUG_DEVRES=y 
CONFIG_OF=y

CONFIG_OF_UNITTEST=y

# CONFIG_PNP_DEBUG_MESSAGES is not set

CONFIG_ZRAM=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=8192
@@ -452,6 +454,8 @@ CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 
CONFIG_CRYPTO_RSA=y

# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set

CONFIG_CRYPTO_SHA512=y

CONFIG_CRYPTO_LZ4=y

CONFIG_CRYPTO_ZSTD=y

CONFIG_CRYPTO_DEV_VIRTIO=y

CONFIG_ASYMMETRIC_KEY_TYPE=y

CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y

crypto/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -1652,6 +1652,15 @@ config CRYPTO_LZ4HC 
	help

	  This is the LZ4 high compression mode algorithm.



config CRYPTO_ZSTD

	tristate "Zstd compression algorithm"

	select CRYPTO_ALGAPI

	select CRYPTO_ACOMP2

	select ZSTD_COMPRESS

	select ZSTD_DECOMPRESS

	help

	  This is the zstd algorithm.



comment "Random Number Generation"



config CRYPTO_ANSI_CPRNG

crypto/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ obj-$(CONFIG_CRYPTO_USER_API_HASH) += algif_hash.o 
obj-$(CONFIG_CRYPTO_USER_API_SKCIPHER) += algif_skcipher.o

obj-$(CONFIG_CRYPTO_USER_API_RNG) += algif_rng.o

obj-$(CONFIG_CRYPTO_USER_API_AEAD) += algif_aead.o

obj-$(CONFIG_CRYPTO_ZSTD) += zstd.o



ecdh_generic-y := ecc.o

ecdh_generic-y += ecdh.o

crypto/testmgr.c

+10 −0
Original line number Diff line number Diff line
@@ -3639,6 +3639,16 @@ static const struct alg_test_desc alg_test_descs[] = { 
				.decomp = __VECS(zlib_deflate_decomp_tv_template)

			}

		}

	}, {

		.alg = "zstd",

		.test = alg_test_comp,

		.fips_allowed = 1,

		.suite = {

			.comp = {

				.comp = __VECS(zstd_comp_tv_template),

				.decomp = __VECS(zstd_decomp_tv_template)

			}

		}

	}

};