snapuserd: Create snapuserd_verify.h. (4ac7d0e8) · Commits · e / os / android_system_core

fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_core.cpp

+4 −0

Original line number	Diff line number	Diff line
		@@ -448,5 +448,9 @@ bool SnapshotHandler::IsIouringSupported() {
		return android::base::GetBoolProperty("ro.virtual_ab.io_uring.enabled", false);
		}

		bool SnapshotHandler::CheckPartitionVerification() {
		return update_verify_->CheckPartitionVerification();
		}

		} // namespace snapshot
		} // namespace android

fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_core.h

+2 −31

Original line number	Diff line number	Diff line
		@@ -47,6 +47,7 @@
		#include <snapuserd/snapuserd_kernel.h>
		#include <storage_literals/storage_literals.h>
		#include "snapuserd_readahead.h"
		#include "snapuserd_verify.h"

		namespace android {
		namespace snapshot {
		@@ -97,36 +98,6 @@ struct MergeGroupState {
		: merge_state_(state), num_ios_in_progress(n_ios) {}
		};

		class UpdateVerify {
		public:
		UpdateVerify(const std::string& misc_name);
		void VerifyUpdatePartition();
		bool CheckPartitionVerification();

		private:
		enum class UpdateVerifyState {
		VERIFY_UNKNOWN,
		VERIFY_FAILED,
		VERIFY_SUCCESS,
		};

		std::string misc_name_;
		UpdateVerifyState state_;
		std::mutex m_lock_;
		std::condition_variable m_cv_;

		int kMinThreadsToVerify = 1;
		int kMaxThreadsToVerify = 4;
		uint64_t kThresholdSize = 512_MiB;
		uint64_t kBlockSizeVerify = 1_MiB;

		bool IsBlockAligned(uint64_t read_size) { return ((read_size & (BLOCK_SZ - 1)) == 0); }
		void UpdatePartitionVerificationState(UpdateVerifyState state);
		bool VerifyPartition(const std::string& partition_name, const std::string& dm_block_device);
		bool VerifyBlocks(const std::string& partition_name, const std::string& dm_block_device,
		off_t offset, int skip_blocks, uint64_t dev_sz);
		};

		class Worker {
		public:
		Worker(const std::string& cow_device, const std::string& backing_device,
		@@ -308,7 +279,7 @@ class SnapshotHandler : public std::enable_shared_from_this<SnapshotHandler> {
		MERGE_GROUP_STATE ProcessMergingBlock(uint64_t new_block, void* buffer);

		bool IsIouringSupported();
		bool CheckPartitionVerification() { return update_verify_->CheckPartitionVerification(); }
		bool CheckPartitionVerification();

		private:
		bool ReadMetadata();

fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_verify.cpp

+3 −1

Original line number	Diff line number	Diff line
		@@ -14,12 +14,14 @@
		* limitations under the License.
		*/

		#include "snapuserd_core.h"
		#include "snapuserd_verify.h"

		#include <android-base/chrono_utils.h>
		#include <android-base/scopeguard.h>
		#include <android-base/strings.h>

		#include "snapuserd_core.h"

		namespace android {
		namespace snapshot {

fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_verify.h

0 → 100644

+64 −0

Original line number	Diff line number	Diff line
		// Copyright (C) 2023 The Android Open Source Project
		//
		// Licensed under the Apache License, Version 2.0 (the "License");
		// you may not use this file except in compliance with the License.
		// You may obtain a copy of the License at
		//
		// http://www.apache.org/licenses/LICENSE-2.0
		//
		// Unless required by applicable law or agreed to in writing, software
		// distributed under the License is distributed on an "AS IS" BASIS,
		// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		// See the License for the specific language governing permissions and
		// limitations under the License.
		//

		#pragma once

		#include <stdint.h>
		#include <sys/types.h>

		#include <condition_variable>
		#include <mutex>
		#include <string>

		#include <snapuserd/snapuserd_kernel.h>
		#include <storage_literals/storage_literals.h>

		namespace android {
		namespace snapshot {

		using namespace android::storage_literals;

		class UpdateVerify {
		public:
		UpdateVerify(const std::string& misc_name);
		void VerifyUpdatePartition();
		bool CheckPartitionVerification();

		private:
		enum class UpdateVerifyState {
		VERIFY_UNKNOWN,
		VERIFY_FAILED,
		VERIFY_SUCCESS,
		};

		std::string misc_name_;
		UpdateVerifyState state_;
		std::mutex m_lock_;
		std::condition_variable m_cv_;

		int kMinThreadsToVerify = 1;
		int kMaxThreadsToVerify = 4;
		uint64_t kThresholdSize = 512_MiB;
		uint64_t kBlockSizeVerify = 1_MiB;

		bool IsBlockAligned(uint64_t read_size) { return ((read_size & (BLOCK_SZ - 1)) == 0); }
		void UpdatePartitionVerificationState(UpdateVerifyState state);
		bool VerifyPartition(const std::string& partition_name, const std::string& dm_block_device);
		bool VerifyBlocks(const std::string& partition_name, const std::string& dm_block_device,
		off_t offset, int skip_blocks, uint64_t dev_sz);
		};

		} // namespace snapshot
		} // namespace android