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

Commit 6d1dd93e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pstore-v4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux 

Pull pstore updates from Kees Cook:
 "Minor changes to pstore tree:

   - update MAINTAINERS with current git repo, add more files.

   - move prz allocation checks into the walker

   - initialize flags correctly (by accident spinlock was technically
     ok)"

* tag 'pstore-v4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  MAINTAINERS: Adjust pstore git repo URI, add files
  pstore: Check for prz allocation in walker
  pstore: Correctly initialize spinlock and flags
parents 81bbef23 fc1b326e

MAINTAINERS

+5 −2
Original line number Diff line number Diff line
@@ -9995,16 +9995,19 @@ S: Maintained 
F:	drivers/block/ps3vram.c



PSTORE FILESYSTEM

M:	Kees Cook <keescook@chromium.org>

M:	Anton Vorontsov <anton@enomsg.org>

M:	Colin Cross <ccross@android.com>

M:	Kees Cook <keescook@chromium.org>

M:	Tony Luck <tony.luck@intel.com>

S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/pstore

F:	fs/pstore/

F:	include/linux/pstore*

F:	drivers/firmware/efi/efi-pstore.c

F:	drivers/acpi/apei/erst.c

F:	Documentation/admin-guide/ramoops.rst

F:	Documentation/devicetree/bindings/reserved-memory/ramoops.txt

K:	\b(pstore|ramoops)



PTP HARDWARE CLOCK SUPPORT

M:	Richard Cochran <richardcochran@gmail.com>

fs/pstore/ram.c

+3 −2
Original line number Diff line number Diff line
@@ -133,7 +133,8 @@ ramoops_get_next_prz(struct persistent_ram_zone *przs[], uint *c, uint max, 
	struct persistent_ram_zone *prz;

	int i = (*c)++;



	if (i >= max)

	/* Give up if we never existed or have hit the end. */

	if (!przs || i >= max)

		return NULL;



	prz = przs[i];
@@ -280,7 +281,7 @@ static ssize_t ramoops_pstore_read(u64 *id, enum pstore_type_id *type, 
					   1, id, type, PSTORE_TYPE_PMSG, 0);



	/* ftrace is last since it may want to dynamically allocate memory. */

	if (!prz_ok(prz) && cxt->fprzs) {

	if (!prz_ok(prz)) {

		if (!(cxt->flags & RAMOOPS_FLAG_FTRACE_PER_CPU)) {

			prz = ramoops_get_next_prz(cxt->fprzs,

					&cxt->ftrace_read_cnt, 1, id, type,

fs/pstore/ram_core.c

+7 −5
Original line number Diff line number Diff line
@@ -467,8 +467,7 @@ static int persistent_ram_buffer_map(phys_addr_t start, phys_addr_t size, 
}



static int persistent_ram_post_init(struct persistent_ram_zone *prz, u32 sig,

				    struct persistent_ram_ecc_info *ecc_info,

				    unsigned long flags)

				    struct persistent_ram_ecc_info *ecc_info)

{

	int ret;
@@ -494,10 +493,9 @@ static int persistent_ram_post_init(struct persistent_ram_zone *prz, u32 sig, 
			 prz->buffer->sig);

	}



	/* Rewind missing or invalid memory area. */

	prz->buffer->sig = sig;

	persistent_ram_zap(prz);

	prz->buffer_lock = __RAW_SPIN_LOCK_UNLOCKED(buffer_lock);

	prz->flags = flags;



	return 0;

}
@@ -533,11 +531,15 @@ struct persistent_ram_zone *persistent_ram_new(phys_addr_t start, size_t size, 
		goto err;

	}



	/* Initialize general buffer state. */

	prz->buffer_lock = __RAW_SPIN_LOCK_UNLOCKED(buffer_lock);

	prz->flags = flags;



	ret = persistent_ram_buffer_map(start, size, prz, memtype);

	if (ret)

		goto err;



	ret = persistent_ram_post_init(prz, sig, ecc_info, flags);

	ret = persistent_ram_post_init(prz, sig, ecc_info);

	if (ret)

		goto err;