Commit b3b515bb authored by Aruna Balakrishnaiah's avatar Aruna Balakrishnaiah Committed by Tony Luck
Browse files

pstore: Add new argument 'compressed' in pstore write callback 



Addition of new argument 'compressed' in the write call back will
help the backend to know if the data passed from pstore is compressed
or not (In case where compression fails.). If compressed, the backend
can add a tag indicating the data is compressed while writing to
persistent store.

Signed-off-by: default avatarAruna Balakrishnaiah <aruna@linux.vnet.ibm.com>
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent a3a5e941

arch/powerpc/platforms/pseries/nvram.c

+2 −2
Original line number Diff line number Diff line
@@ -554,7 +554,7 @@ static int nvram_pstore_open(struct pstore_info *psi) 
 * @part:               pstore writes data to registered buffer in parts,

 *                      part number will indicate the same.

 * @count:              Indicates oops count

 * @hsize:              Size of header added by pstore

 * @compressed:         Flag to indicate the log is compressed

 * @size:               number of bytes written to the registered buffer

 * @psi:                registered pstore_info structure

 *
@@ -565,7 +565,7 @@ static int nvram_pstore_open(struct pstore_info *psi) 
static int nvram_pstore_write(enum pstore_type_id type,

				enum kmsg_dump_reason reason,

				u64 *id, unsigned int part, int count,

				size_t hsize, size_t size,

				bool compressed, size_t size,

				struct pstore_info *psi)

{

	int rc;

drivers/acpi/apei/erst.c

+2 −2
Original line number Diff line number Diff line
@@ -937,7 +937,7 @@ static ssize_t erst_reader(u64 *id, enum pstore_type_id *type, int *count, 
			   struct timespec *time, char **buf,

			   struct pstore_info *psi);

static int erst_writer(enum pstore_type_id type, enum kmsg_dump_reason reason,

		       u64 *id, unsigned int part, int count, size_t hsize,

		       u64 *id, unsigned int part, int count, bool compressed,

		       size_t size, struct pstore_info *psi);

static int erst_clearer(enum pstore_type_id type, u64 id, int count,

			struct timespec time, struct pstore_info *psi);
@@ -1057,7 +1057,7 @@ out: 
}



static int erst_writer(enum pstore_type_id type, enum kmsg_dump_reason reason,

		       u64 *id, unsigned int part, int count, size_t hsize,

		       u64 *id, unsigned int part, int count, bool compressed,

		       size_t size, struct pstore_info *psi)

{

	struct cper_pstore_record *rcd = (struct cper_pstore_record *)

drivers/firmware/efi/efi-pstore.c

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ static ssize_t efi_pstore_read(u64 *id, enum pstore_type_id *type, 


static int efi_pstore_write(enum pstore_type_id type,

		enum kmsg_dump_reason reason, u64 *id,

		unsigned int part, int count, size_t hsize, size_t size,

		unsigned int part, int count, bool compressed, size_t size,

		struct pstore_info *psi)

{

	char name[DUMP_NAME_LEN];

fs/pstore/platform.c

+4 −3
Original line number Diff line number Diff line
@@ -149,6 +149,7 @@ static void pstore_dump(struct kmsg_dumper *dumper, 
		unsigned long size;

		int hsize;

		size_t len;

		bool compressed = false;



		dst = psinfo->buf;

		hsize = sprintf(dst, "%s#%d Part%d\n", why, oopscount, part);
@@ -159,7 +160,7 @@ static void pstore_dump(struct kmsg_dumper *dumper, 
			break;



		ret = psinfo->write(PSTORE_TYPE_DMESG, reason, &id, part,

				    oopscount, hsize, hsize + len, psinfo);

				    oopscount, compressed, hsize + len, psinfo);

		if (ret == 0 && reason == KMSG_DUMP_OOPS && pstore_is_mounted())

			pstore_new_entry = 1;
@@ -221,10 +222,10 @@ static void pstore_register_console(void) {} 
static int pstore_write_compat(enum pstore_type_id type,

			       enum kmsg_dump_reason reason,

			       u64 *id, unsigned int part, int count,

			       size_t hsize, size_t size,

			       bool compressed, size_t size,

			       struct pstore_info *psi)

{

	return psi->write_buf(type, reason, id, part, psinfo->buf, hsize,

	return psi->write_buf(type, reason, id, part, psinfo->buf, compressed,

			     size, psi);

}

fs/pstore/ram.c

+1 −1
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ static int notrace ramoops_pstore_write_buf(enum pstore_type_id type, 
					    enum kmsg_dump_reason reason,

					    u64 *id, unsigned int part,

					    const char *buf,

					    size_t hsize, size_t size,

					    bool compressed, size_t size,

					    struct pstore_info *psi)

{

	struct ramoops_context *cxt = psi->data;

CRA Git | Maintained and supported by SUSTech CRA and CCSE