Merge tag 'upstream-4.18-rc1' of git://git.infradead.org/linux-ubifs (ab0b2e59) · Commits · 戴 / test

drivers/mtd/ubi/build.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -526,6 +526,7 @@ void ubi_free_internal_volumes(struct ubi_device *ubi)
		for (i = ubi->vtbl_slots;
		i < ubi->vtbl_slots + UBI_INT_VOL_COUNT; i++) {
		ubi_eba_replace_table(ubi->volumes[i], NULL);
		ubi_fastmap_destroy_checkmap(ubi->volumes[i]);
		kfree(ubi->volumes[i]);
		}
		}
		@@ -1091,6 +1092,9 @@ int ubi_detach_mtd_dev(int ubi_num, int anyway)
		if (ubi->bgt_thread)
		kthread_stop(ubi->bgt_thread);

		#ifdef CONFIG_MTD_UBI_FASTMAP
		cancel_work_sync(&ubi->fm_work);
		#endif
		ubi_debugfs_exit_dev(ubi);
		uif_close(ubi);

drivers/mtd/ubi/eba.c

+110 −1

Original line number	Diff line number	Diff line
		@@ -490,6 +490,103 @@ out_unlock:
		return err;
		}

		#ifdef CONFIG_MTD_UBI_FASTMAP
		/**
		* check_mapping - check and fixup a mapping
		* @ubi: UBI device description object
		* @vol: volume description object
		* @lnum: logical eraseblock number
		* @pnum: physical eraseblock number
		*
		* Checks whether a given mapping is valid. Fastmap cannot track LEB unmap
		* operations, if such an operation is interrupted the mapping still looks
		* good, but upon first read an ECC is reported to the upper layer.
		* Normaly during the full-scan at attach time this is fixed, for Fastmap
		* we have to deal with it while reading.
		* If the PEB behind a LEB shows this symthom we change the mapping to
		* %UBI_LEB_UNMAPPED and schedule the PEB for erasure.
		*
		* Returns 0 on success, negative error code in case of failure.
		*/
		static int check_mapping(struct ubi_device ubi, struct ubi_volume vol, int lnum,
		int *pnum)
		{
		int err;
		struct ubi_vid_io_buf *vidb;
		struct ubi_vid_hdr *vid_hdr;

		if (!ubi->fast_attach)
		return 0;

		if (!vol->checkmap \|\| test_bit(lnum, vol->checkmap))
		return 0;

		vidb = ubi_alloc_vid_buf(ubi, GFP_NOFS);
		if (!vidb)
		return -ENOMEM;

		err = ubi_io_read_vid_hdr(ubi, *pnum, vidb, 0);
		if (err > 0 && err != UBI_IO_BITFLIPS) {
		int torture = 0;

		switch (err) {
		case UBI_IO_FF:
		case UBI_IO_FF_BITFLIPS:
		case UBI_IO_BAD_HDR:
		case UBI_IO_BAD_HDR_EBADMSG:
		break;
		default:
		ubi_assert(0);
		}

		if (err == UBI_IO_BAD_HDR_EBADMSG \|\| err == UBI_IO_FF_BITFLIPS)
		torture = 1;

		down_read(&ubi->fm_eba_sem);
		vol->eba_tbl->entries[lnum].pnum = UBI_LEB_UNMAPPED;
		up_read(&ubi->fm_eba_sem);
		ubi_wl_put_peb(ubi, vol->vol_id, lnum, *pnum, torture);

		*pnum = UBI_LEB_UNMAPPED;
		} else if (err < 0) {
		ubi_err(ubi, "unable to read VID header back from PEB %i: %i",
		*pnum, err);

		goto out_free;
		} else {
		int found_vol_id, found_lnum;

		ubi_assert(err == 0 \|\| err == UBI_IO_BITFLIPS);

		vid_hdr = ubi_get_vid_hdr(vidb);
		found_vol_id = be32_to_cpu(vid_hdr->vol_id);
		found_lnum = be32_to_cpu(vid_hdr->lnum);

		if (found_lnum != lnum \|\| found_vol_id != vol->vol_id) {
		ubi_err(ubi, "EBA mismatch! PEB %i is LEB %i:%i instead of LEB %i:%i",
		*pnum, found_vol_id, found_lnum, vol->vol_id, lnum);
		ubi_ro_mode(ubi);
		err = -EINVAL;
		goto out_free;
		}
		}

		set_bit(lnum, vol->checkmap);
		err = 0;

		out_free:
		ubi_free_vid_buf(vidb);

		return err;
		}
		#else
		static int check_mapping(struct ubi_device ubi, struct ubi_volume vol, int lnum,
		int *pnum)
		{
		return 0;
		}
		#endif

		/**
		* ubi_eba_read_leb - read data.
		* @ubi: UBI device description object
		@@ -522,7 +619,13 @@ int ubi_eba_read_leb(struct ubi_device ubi, struct ubi_volume vol, int lnum,
		return err;

		pnum = vol->eba_tbl->entries[lnum].pnum;
		if (pnum < 0) {
		if (pnum >= 0) {
		err = check_mapping(ubi, vol, lnum, &pnum);
		if (err < 0)
		goto out_unlock;
		}

		if (pnum == UBI_LEB_UNMAPPED) {
		/*
		* The logical eraseblock is not mapped, fill the whole buffer
		* with 0xFF bytes. The exception is static volumes for which
		@@ -930,6 +1033,12 @@ int ubi_eba_write_leb(struct ubi_device ubi, struct ubi_volume vol, int lnum,
		return err;

		pnum = vol->eba_tbl->entries[lnum].pnum;
		if (pnum >= 0) {
		err = check_mapping(ubi, vol, lnum, &pnum);
		if (err < 0)
		goto out;
		}

		if (pnum >= 0) {
		dbg_eba("write %d bytes at offset %d of LEB %d:%d, PEB %d",
		len, offset, vol_id, lnum, pnum);

drivers/mtd/ubi/fastmap.c

+20 −0

Original line number	Diff line number	Diff line
		@@ -1100,6 +1100,26 @@ free_fm_sb:
		goto out;
		}

		int ubi_fastmap_init_checkmap(struct ubi_volume *vol, int leb_count)
		{
		struct ubi_device *ubi = vol->ubi;

		if (!ubi->fast_attach)
		return 0;

		vol->checkmap = kcalloc(BITS_TO_LONGS(leb_count), sizeof(unsigned long),
		GFP_KERNEL);
		if (!vol->checkmap)
		return -ENOMEM;

		return 0;
		}

		void ubi_fastmap_destroy_checkmap(struct ubi_volume *vol)
		{
		kfree(vol->checkmap);
		}

		/**
		* ubi_write_fastmap - writes a fastmap.
		* @ubi: UBI device object

drivers/mtd/ubi/ubi-media.h

+3 −19

Original line number	Diff line number	Diff line
		/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */
		/*
		* Copyright (c) International Business Machines Corp., 2006
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License as published by
		* the Free Software Foundation; either version 2 of the License, or
		* (at your option) any later version.
		*
		* This program is distributed in the hope that it will be useful,
		* but WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
		* the GNU General Public License for more details.
		*
		* You should have received a copy of the GNU General Public License
		* along with this program; if not, write to the Free Software
		* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
		*
		* Copyright (C) International Business Machines Corp., 2006
		* Authors: Artem Bityutskiy (Битюцкий Артём)
		* Thomas Gleixner
		* Frank Haverkamp
		* Oliver Lohmann
		* Andreas Arnez
		*/

		/*
		*
		* This file defines the layout of UBI headers and all the other UBI on-flash
		* data structures.
		*/

drivers/mtd/ubi/ubi.h

+11 −0

Original line number	Diff line number	Diff line
		@@ -334,6 +334,9 @@ struct ubi_eba_leb_desc {
		* @changing_leb: %1 if the atomic LEB change ioctl command is in progress
		* @direct_writes: %1 if direct writes are enabled for this volume
		*
		* @checkmap: bitmap to remember which PEB->LEB mappings got checked,
		* protected by UBI LEB lock tree.
		*
		* The @corrupted field indicates that the volume's contents is corrupted.
		* Since UBI protects only static volumes, this field is not relevant to
		* dynamic volumes - it is user's responsibility to assure their data
		@@ -377,6 +380,10 @@ struct ubi_volume {
		unsigned int updating:1;
		unsigned int changing_leb:1;
		unsigned int direct_writes:1;

		#ifdef CONFIG_MTD_UBI_FASTMAP
		unsigned long *checkmap;
		#endif
		};

		/**
		@@ -965,8 +972,12 @@ size_t ubi_calc_fm_size(struct ubi_device *ubi);
		int ubi_update_fastmap(struct ubi_device *ubi);
		int ubi_scan_fastmap(struct ubi_device ubi, struct ubi_attach_info ai,
		struct ubi_attach_info *scan_ai);
		int ubi_fastmap_init_checkmap(struct ubi_volume *vol, int leb_count);
		void ubi_fastmap_destroy_checkmap(struct ubi_volume *vol);
		#else
		static inline int ubi_update_fastmap(struct ubi_device *ubi) { return 0; }
		int static inline ubi_fastmap_init_checkmap(struct ubi_volume *vol, int leb_count) { return 0; }
		static inline void ubi_fastmap_destroy_checkmap(struct ubi_volume *vol) {}
		#endif

		/* block.c */

Admin message