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

Commit e0e8a149 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'cxgb4-reduce-memory-footprint-for-collecting-firmware-dump' 



Rahul Lakkireddy says:

====================
cxgb4: reduce memory footprint for collecting firmware dump

Firmware dump can be large (upto 2 GB).  In low memory conditions,
ethtool fails to allocate such large memory.  So, use zlib deflate
to compress collected firmware dump.

Patch 1 updates collection logic to use compression.

Patch 2 adds zlib deflate to compress collected firmware dump.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 5165674f 91c1953d

drivers/net/ethernet/chelsio/cxgb4/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -12,3 +12,4 @@ cxgb4-objs := cxgb4_main.o l2t.o smt.o t4_hw.o sge.o clip_tbl.o cxgb4_ethtool.o 
cxgb4-$(CONFIG_CHELSIO_T4_DCB) +=  cxgb4_dcb.o

cxgb4-$(CONFIG_CHELSIO_T4_FCOE) +=  cxgb4_fcoe.o

cxgb4-$(CONFIG_DEBUG_FS) += cxgb4_debugfs.o

cxgb4-$(CONFIG_ZLIB_DEFLATE) += cudbg_zlib.o

drivers/net/ethernet/chelsio/cxgb4/cudbg_common.c

+19 −5
Original line number Diff line number Diff line
@@ -19,7 +19,8 @@ 
#include "cudbg_if.h"

#include "cudbg_lib_common.h"



int cudbg_get_buff(struct cudbg_buffer *pdbg_buff, u32 size,

int cudbg_get_buff(struct cudbg_init *pdbg_init,

		   struct cudbg_buffer *pdbg_buff, u32 size,

		   struct cudbg_buffer *pin_buff)

{

	u32 offset;
@@ -28,17 +29,30 @@ int cudbg_get_buff(struct cudbg_buffer *pdbg_buff, u32 size, 
	if (offset + size > pdbg_buff->size)

		return CUDBG_STATUS_NO_MEM;



	if (pdbg_init->compress_type != CUDBG_COMPRESSION_NONE) {

		if (size > pdbg_init->compress_buff_size)

			return CUDBG_STATUS_NO_MEM;



		pin_buff->data = (char *)pdbg_init->compress_buff;

		pin_buff->offset = 0;

		pin_buff->size = size;

		return 0;

	}



	pin_buff->data = (char *)pdbg_buff->data + offset;

	pin_buff->offset = offset;

	pin_buff->size = size;

	pdbg_buff->size -= size;

	return 0;

}



void cudbg_put_buff(struct cudbg_buffer *pin_buff,

		    struct cudbg_buffer *pdbg_buff)

void cudbg_put_buff(struct cudbg_init *pdbg_init,

		    struct cudbg_buffer *pin_buff)

{

	pdbg_buff->size += pin_buff->size;

	/* Clear compression buffer for re-use */

	if (pdbg_init->compress_type != CUDBG_COMPRESSION_NONE)

		memset(pdbg_init->compress_buff, 0,

		       pdbg_init->compress_buff_size);



	pin_buff->data = NULL;

	pin_buff->offset = 0;

	pin_buff->size = 0;

drivers/net/ethernet/chelsio/cxgb4/cudbg_if.h

+4 −0
Original line number Diff line number Diff line
@@ -87,6 +87,10 @@ struct cudbg_init { 
	struct adapter *adap; /* Pointer to adapter structure */

	void *outbuf; /* Output buffer */

	u32 outbuf_size;  /* Output buffer size */

	u8 compress_type; /* Type of compression to use */

	void *compress_buff; /* Compression buffer */

	u32 compress_buff_size; /* Compression buffer size */

	void *workspace; /* Workspace for zlib */

};



static inline unsigned int cudbg_mbytes_to_bytes(unsigned int size)

drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c

+151 −129

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/ethernet/chelsio/cxgb4/cudbg_lib_common.h

+5 −3
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ enum cudbg_dump_type { 


enum cudbg_compression_type {

	CUDBG_COMPRESSION_NONE = 1,

	CUDBG_COMPRESSION_ZLIB,

};



struct cudbg_hdr {
@@ -78,10 +79,11 @@ struct cudbg_error { 
#define CDUMP_MAX_COMP_BUF_SIZE ((64 * 1024) - 1)

#define CUDBG_CHUNK_SIZE ((CDUMP_MAX_COMP_BUF_SIZE / 1024) * 1024)



int cudbg_get_buff(struct cudbg_buffer *pdbg_buff, u32 size,

int cudbg_get_buff(struct cudbg_init *pdbg_init,

		   struct cudbg_buffer *pdbg_buff, u32 size,

		   struct cudbg_buffer *pin_buff);

void cudbg_put_buff(struct cudbg_init *pdbg_init,

		    struct cudbg_buffer *pin_buff);

void cudbg_put_buff(struct cudbg_buffer *pin_buff,

		    struct cudbg_buffer *pdbg_buff);

void cudbg_update_buff(struct cudbg_buffer *pin_buff,

		       struct cudbg_buffer *pout_buff);

#endif /* __CUDBG_LIB_COMMON_H__ */