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

Commit c3146eb6 authored by Dmitry Kravkov's avatar Dmitry Kravkov Committed by David S. Miller
Browse files

bnx2x: Correct memory preparation and release 



Since commit 15192a8c there have been a memory leak upon rmmod
of the bnx2x driver.

This corrects the memory leak and corrects the zeroing of internal
memories upon driver load.

Signed-off-by: default avatarDmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: default avatarYuval Mintz <yuvalmin@broadcom.com>
Signed-off-by: default avatarAriel Elior <ariele@broadcom.com>
Signed-off-by: default avatarEilon Greenstein <eilong@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6ab20355

drivers/net/ethernet/broadcom/bnx2x/bnx2x.h

+2 −0
Original line number Diff line number Diff line
@@ -1702,6 +1702,8 @@ struct bnx2x { 


	/* priority to cos mapping */

	u8					prio_to_cos[8];



	int fp_array_size;

	u32 dump_preset_idx;

};

drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

+14 −44
Original line number Diff line number Diff line
@@ -2308,50 +2308,16 @@ static void bnx2x_nic_load_afex_dcc(struct bnx2x *bp, int load_code) 
static void bnx2x_bz_fp(struct bnx2x *bp, int index)

{

	struct bnx2x_fastpath *fp = &bp->fp[index];

	struct bnx2x_fp_stats *fp_stats = &bp->fp_stats[index];



	int cos;

	struct napi_struct orig_napi = fp->napi;

	struct bnx2x_agg_info *orig_tpa_info = fp->tpa_info;

	/* bzero bnx2x_fastpath contents */

	if (bp->stats_init) {

		memset(fp->tpa_info, 0, sizeof(*fp->tpa_info));

		memset(fp, 0, sizeof(*fp));

	} else {

		/* Keep Queue statistics */

		struct bnx2x_eth_q_stats *tmp_eth_q_stats;

		struct bnx2x_eth_q_stats_old *tmp_eth_q_stats_old;



		tmp_eth_q_stats = kzalloc(sizeof(struct bnx2x_eth_q_stats),

					  GFP_KERNEL);

		if (tmp_eth_q_stats)

			memcpy(tmp_eth_q_stats, &fp_stats->eth_q_stats,

			       sizeof(struct bnx2x_eth_q_stats));



		tmp_eth_q_stats_old =

			kzalloc(sizeof(struct bnx2x_eth_q_stats_old),

				GFP_KERNEL);

		if (tmp_eth_q_stats_old)

			memcpy(tmp_eth_q_stats_old, &fp_stats->eth_q_stats_old,

			       sizeof(struct bnx2x_eth_q_stats_old));



		memset(fp->tpa_info, 0, sizeof(*fp->tpa_info));

	if (fp->tpa_info)

		memset(fp->tpa_info, 0, ETH_MAX_AGGREGATION_QUEUES_E1H_E2 *

		       sizeof(struct bnx2x_agg_info));

	memset(fp, 0, sizeof(*fp));



		if (tmp_eth_q_stats) {

			memcpy(&fp_stats->eth_q_stats, tmp_eth_q_stats,

			       sizeof(struct bnx2x_eth_q_stats));

			kfree(tmp_eth_q_stats);

		}



		if (tmp_eth_q_stats_old) {

			memcpy(&fp_stats->eth_q_stats_old, tmp_eth_q_stats_old,

			       sizeof(struct bnx2x_eth_q_stats_old));

			kfree(tmp_eth_q_stats_old);

		}



	}



	/* Restore the NAPI object as it has been already initialized */

	fp->napi = orig_napi;

	fp->tpa_info = orig_tpa_info;
@@ -4227,7 +4193,10 @@ int bnx2x_alloc_fp_mem(struct bnx2x *bp) 


void bnx2x_free_mem_bp(struct bnx2x *bp)

{

	kfree(bp->fp->tpa_info);

	int i;



	for (i = 0; i < bp->fp_array_size; i++)

		kfree(bp->fp[i].tpa_info);

	kfree(bp->fp);

	kfree(bp->sp_objs);

	kfree(bp->fp_stats);
@@ -4256,12 +4225,13 @@ int bnx2x_alloc_mem_bp(struct bnx2x *bp) 


	/* fp array: RSS plus CNIC related L2 queues */

	fp_array_size = BNX2X_MAX_RSS_COUNT(bp) + CNIC_SUPPORT(bp);

	BNX2X_DEV_INFO("fp_array_size %d", fp_array_size);

	bp->fp_array_size = fp_array_size;

	BNX2X_DEV_INFO("fp_array_size %d\n", bp->fp_array_size);



	fp = kcalloc(fp_array_size, sizeof(*fp), GFP_KERNEL);

	fp = kcalloc(bp->fp_array_size, sizeof(*fp), GFP_KERNEL);

	if (!fp)

		goto alloc_err;

	for (i = 0; i < fp_array_size; i++) {

	for (i = 0; i < bp->fp_array_size; i++) {

		fp[i].tpa_info =

			kcalloc(ETH_MAX_AGGREGATION_QUEUES_E1H_E2,

				sizeof(struct bnx2x_agg_info), GFP_KERNEL);
@@ -4272,13 +4242,13 @@ int bnx2x_alloc_mem_bp(struct bnx2x *bp) 
	bp->fp = fp;



	/* allocate sp objs */

	bp->sp_objs = kcalloc(fp_array_size, sizeof(struct bnx2x_sp_objs),

	bp->sp_objs = kcalloc(bp->fp_array_size, sizeof(struct bnx2x_sp_objs),

			      GFP_KERNEL);

	if (!bp->sp_objs)

		goto alloc_err;



	/* allocate fp_stats */

	bp->fp_stats = kcalloc(fp_array_size, sizeof(struct bnx2x_fp_stats),

	bp->fp_stats = kcalloc(bp->fp_array_size, sizeof(struct bnx2x_fp_stats),

			       GFP_KERNEL);

	if (!bp->fp_stats)

		goto alloc_err;