Merge "defconfig: sdm845: Enable FBE config flag for ext4 FS" (2ba00604) · Commits · e / devices / android_kernel_fairphone_FP3

arch/arm64/configs/sdm845-perf_defconfig

+3 −0

Original line number	Diff line number	Diff line
		@@ -572,6 +572,8 @@ CONFIG_MSM_TZ_LOG=y
		CONFIG_EXT4_FS=y
		CONFIG_EXT4_FS_SECURITY=y
		CONFIG_EXT4_ENCRYPTION=y
		CONFIG_EXT4_FS_ENCRYPTION=y
		CONFIG_EXT4_FS_ICE_ENCRYPTION=y
		CONFIG_F2FS_FS=y
		CONFIG_F2FS_FS_SECURITY=y
		CONFIG_QUOTA=y
		@@ -605,6 +607,7 @@ CONFIG_CORESIGHT_CTI=y
		CONFIG_CORESIGHT_EVENT=y
		CONFIG_CORESIGHT_HWEVENT=y
		CONFIG_CORESIGHT_DUMMY=y
		CONFIG_PFK=y
		CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y
		CONFIG_SECURITY=y
		CONFIG_HARDENED_USERCOPY=y

+3 −0

Original line number	Diff line number	Diff line
		@@ -593,6 +593,8 @@ CONFIG_MSM_TZ_LOG=y
		CONFIG_EXT4_FS=y
		CONFIG_EXT4_FS_SECURITY=y
		CONFIG_EXT4_ENCRYPTION=y
		CONFIG_EXT4_FS_ENCRYPTION=y
		CONFIG_EXT4_FS_ICE_ENCRYPTION=y
		CONFIG_F2FS_FS=y
		CONFIG_F2FS_FS_SECURITY=y
		CONFIG_QUOTA=y
		@@ -670,6 +672,7 @@ CONFIG_CORESIGHT_EVENT=y
		CONFIG_CORESIGHT_TGU=y
		CONFIG_CORESIGHT_HWEVENT=y
		CONFIG_CORESIGHT_DUMMY=y
		CONFIG_PFK=y
		CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y
		CONFIG_SECURITY=y
		CONFIG_HARDENED_USERCOPY=y

+1 −1

Original line number	Diff line number	Diff line
		@@ -589,7 +589,7 @@ void __bio_clone_fast(struct bio bio, struct bio bio_src)
		bio->bi_opf = bio_src->bi_opf;
		bio->bi_iter = bio_src->bi_iter;
		bio->bi_io_vec = bio_src->bi_io_vec;

		bio->bi_dio_inode = bio_src->bi_dio_inode;
		bio_clone_blkcg_association(bio, bio_src);
		}
		EXPORT_SYMBOL(__bio_clone_fast);

+10 −1

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@
		#include <linux/bio.h>
		#include <linux/blkdev.h>
		#include <linux/scatterlist.h>

		#include <linux/pfk.h>
		#include <trace/events/block.h>

		#include "blk.h"
		@@ -725,6 +725,11 @@ static void blk_account_io_merge(struct request *req)
		}
		}

		static bool crypto_not_mergeable(const struct bio bio, const struct bio nxt)
		{
		return (!pfk_allow_merge_bio(bio, nxt));
		}

		/*
		* Has to be called with the request spinlock acquired
		*/
		@@ -752,6 +757,8 @@ static int attempt_merge(struct request_queue q, struct request req,
		!blk_write_same_mergeable(req->bio, next->bio))
		return 0;

		if (crypto_not_mergeable(req->bio, next->bio))
		return 0;
		/*
		* If we are allowed to merge, then append bio list
		* from next to rq and release next. merge_requests_fn
		@@ -862,6 +869,8 @@ bool blk_rq_merge_ok(struct request rq, struct bio bio)
		!blk_write_same_mergeable(rq->bio, bio))
		return false;

		if (crypto_not_mergeable(rq->bio, bio))
		return false;
		return true;
		}

+6 −2

Original line number	Diff line number	Diff line
		@@ -152,6 +152,9 @@ static int qti_ice_setting_config(struct request *req,
		return -EPERM;
		}

		if (!setting)
		return -EINVAL;

		if ((short)(crypto_data->key_index) >= 0) {

		memcpy(&setting->crypto_data, crypto_data,
		@@ -1488,7 +1491,7 @@ static int qcom_ice_config_start(struct platform_device *pdev,
		bool is_pfe = false;
		sector_t data_size;

		if (!pdev \|\| !req \|\| !setting) {
		if (!pdev \|\| !req) {
		pr_err("%s: Invalid params passed\n", __func__);
		return -EINVAL;
		}
		@@ -1507,6 +1510,7 @@ static int qcom_ice_config_start(struct platform_device *pdev,
		/* It is not an error to have a request with no bio */
		return 0;
		}
		//pr_err("%s bio is %pK\n", __func__, req->bio);

		ret = pfk_load_key_start(req->bio, &pfk_crypto_data, &is_pfe, async);
		if (is_pfe) {
		@@ -1664,7 +1668,7 @@ static struct ice_device *get_ice_device_from_storage_type

		list_for_each_entry(ice_dev, &ice_devices, list) {
		if (!strcmp(ice_dev->ice_instance_type, storage_type)) {
		pr_info("%s: found ice device %p\n", __func__, ice_dev);
		pr_debug("%s: ice device %pK\n", __func__, ice_dev);
		return ice_dev;
		}
		}