Commit 7d549995 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma 

Pull rdma fixes from Jason Gunthorpe:
 "Nothing very exciting here, mainly just a bunch of irdma fixes. irdma
  is a new driver this cycle so it to be expected.

   - Many more irdma fixups from bots/etc

   - bnxt_re regression in their counters from a FW upgrade

   - User triggerable memory leak in rxe"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma:
  RDMA/irdma: Change returned type of irdma_setup_virt_qp to void
  RDMA/irdma: Change the returned type of irdma_set_hw_rsrc to void
  RDMA/irdma: change the returned type of irdma_sc_repost_aeq_entries to void
  RDMA/irdma: Check vsi pointer before using it
  RDMA/rxe: Fix memory leak in error path code
  RDMA/irdma: Change the returned type to void
  RDMA/irdma: Make spdxcheck.py happy
  RDMA/irdma: Fix unused variable total_size warning
  RDMA/bnxt_re: Fix stats counters
parents 51bbe7eb dc6afef7

drivers/infiniband/hw/bnxt_re/main.c

+3 −1
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ static int bnxt_re_setup_chip_ctx(struct bnxt_re_dev *rdev, u8 wqe_mode) 
	if (!chip_ctx)

		return -ENOMEM;

	chip_ctx->chip_num = bp->chip_num;

	chip_ctx->hw_stats_size = bp->hw_ring_stats_size;



	rdev->chip_ctx = chip_ctx;

	/* rest members to follow eventually */
@@ -550,6 +551,7 @@ static int bnxt_re_net_stats_ctx_alloc(struct bnxt_re_dev *rdev, 
				       dma_addr_t dma_map,

				       u32 *fw_stats_ctx_id)

{

	struct bnxt_qplib_chip_ctx *chip_ctx = rdev->chip_ctx;

	struct hwrm_stat_ctx_alloc_output resp = {0};

	struct hwrm_stat_ctx_alloc_input req = {0};

	struct bnxt_en_dev *en_dev = rdev->en_dev;
@@ -566,7 +568,7 @@ static int bnxt_re_net_stats_ctx_alloc(struct bnxt_re_dev *rdev, 
	bnxt_re_init_hwrm_hdr(rdev, (void *)&req, HWRM_STAT_CTX_ALLOC, -1, -1);

	req.update_period_ms = cpu_to_le32(1000);

	req.stats_dma_addr = cpu_to_le64(dma_map);

	req.stats_dma_length = cpu_to_le16(sizeof(struct ctx_hw_stats_ext));

	req.stats_dma_length = cpu_to_le16(chip_ctx->hw_stats_size);

	req.stat_ctx_flags = STAT_CTX_ALLOC_REQ_STAT_CTX_FLAGS_ROCE;

	bnxt_re_fill_fw_msg(&fw_msg, (void *)&req, sizeof(req), (void *)&resp,

			    sizeof(resp), DFLT_HWRM_CMD_TIMEOUT);

drivers/infiniband/hw/bnxt_re/qplib_res.c

+4 −6
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ 
static void bnxt_qplib_free_stats_ctx(struct pci_dev *pdev,

				      struct bnxt_qplib_stats *stats);

static int bnxt_qplib_alloc_stats_ctx(struct pci_dev *pdev,

				      struct bnxt_qplib_chip_ctx *cctx,

				      struct bnxt_qplib_stats *stats);



/* PBL */
@@ -559,7 +560,7 @@ int bnxt_qplib_alloc_ctx(struct bnxt_qplib_res *res, 
		goto fail;

stats_alloc:

	/* Stats */

	rc = bnxt_qplib_alloc_stats_ctx(res->pdev, &ctx->stats);

	rc = bnxt_qplib_alloc_stats_ctx(res->pdev, res->cctx, &ctx->stats);

	if (rc)

		goto fail;
@@ -889,15 +890,12 @@ static void bnxt_qplib_free_stats_ctx(struct pci_dev *pdev, 
}



static int bnxt_qplib_alloc_stats_ctx(struct pci_dev *pdev,

				      struct bnxt_qplib_chip_ctx *cctx,

				      struct bnxt_qplib_stats *stats)

{

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

	stats->fw_id = -1;

	/* 128 byte aligned context memory is required only for 57500.

	 * However making this unconditional, it does not harm previous

	 * generation.

	 */

	stats->size = ALIGN(sizeof(struct ctx_hw_stats), 128);

	stats->size = cctx->hw_stats_size;

	stats->dma = dma_alloc_coherent(&pdev->dev, stats->size,

					&stats->dma_map, GFP_KERNEL);

	if (!stats->dma) {

drivers/infiniband/hw/bnxt_re/qplib_res.h

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ struct bnxt_qplib_chip_ctx { 
	u16	chip_num;

	u8	chip_rev;

	u8	chip_metal;

	u16	hw_stats_size;

	struct bnxt_qplib_drv_modes modes;

};

drivers/infiniband/hw/irdma/ctrl.c

+5 −8
Original line number Diff line number Diff line
@@ -2845,7 +2845,7 @@ static u64 irdma_sc_decode_fpm_commit(struct irdma_sc_dev *dev, __le64 *buf, 
 * parses fpm commit info and copy base value

 * of hmc objects in hmc_info

 */

static enum irdma_status_code

static void

irdma_sc_parse_fpm_commit_buf(struct irdma_sc_dev *dev, __le64 *buf,

			      struct irdma_hmc_obj_info *info, u32 *sd)

{
@@ -2915,7 +2915,6 @@ irdma_sc_parse_fpm_commit_buf(struct irdma_sc_dev *dev, __le64 *buf, 
	else

		*sd = (u32)(size >> 21);



	return 0;

}



/**
@@ -4187,11 +4186,9 @@ enum irdma_status_code irdma_sc_get_next_aeqe(struct irdma_sc_aeq *aeq, 
 * @dev: sc device struct

 * @count: allocate count

 */

enum irdma_status_code irdma_sc_repost_aeq_entries(struct irdma_sc_dev *dev, u32 count)

void irdma_sc_repost_aeq_entries(struct irdma_sc_dev *dev, u32 count)

{

	writel(count, dev->hw_regs[IRDMA_AEQALLOC]);



	return 0;

}



/**
@@ -4434,7 +4431,7 @@ static enum irdma_status_code irdma_sc_cfg_iw_fpm(struct irdma_sc_dev *dev, 
	ret_code = irdma_sc_commit_fpm_val(dev->cqp, 0, hmc_info->hmc_fn_id,

					   &commit_fpm_mem, true, wait_type);

	if (!ret_code)

		ret_code = irdma_sc_parse_fpm_commit_buf(dev, dev->fpm_commit_buf,

		irdma_sc_parse_fpm_commit_buf(dev, dev->fpm_commit_buf,

					      hmc_info->hmc_obj,

					      &hmc_info->sd_table.sd_cnt);

	print_hex_dump_debug("HMC: COMMIT FPM BUFFER", DUMP_PREFIX_OFFSET, 16,

drivers/infiniband/hw/irdma/hw.c

+2 −9
Original line number Diff line number Diff line
@@ -1920,7 +1920,7 @@ enum irdma_status_code irdma_ctrl_init_hw(struct irdma_pci_f *rf) 
 * irdma_set_hw_rsrc - set hw memory resources.

 * @rf: RDMA PCI function

 */

static u32 irdma_set_hw_rsrc(struct irdma_pci_f *rf)

static void irdma_set_hw_rsrc(struct irdma_pci_f *rf)

{

	rf->allocated_qps = (void *)(rf->mem_rsrc +

		   (sizeof(struct irdma_arp_entry) * rf->arp_table_size));
@@ -1937,8 +1937,6 @@ static u32 irdma_set_hw_rsrc(struct irdma_pci_f *rf) 
	spin_lock_init(&rf->arp_lock);

	spin_lock_init(&rf->qptable_lock);

	spin_lock_init(&rf->qh_list_lock);



	return 0;

}



/**
@@ -2000,9 +1998,7 @@ u32 irdma_initialize_hw_rsrc(struct irdma_pci_f *rf) 


	rf->arp_table = (struct irdma_arp_entry *)rf->mem_rsrc;



	ret = irdma_set_hw_rsrc(rf);

	if (ret)

		goto set_hw_rsrc_fail;

	irdma_set_hw_rsrc(rf);



	set_bit(0, rf->allocated_mrs);

	set_bit(0, rf->allocated_qps);
@@ -2025,9 +2021,6 @@ u32 irdma_initialize_hw_rsrc(struct irdma_pci_f *rf) 


	return 0;



set_hw_rsrc_fail:

	kfree(rf->mem_rsrc);

	rf->mem_rsrc = NULL;

mem_rsrc_kzalloc_fail:

	kfree(rf->allocated_ws_nodes);

	rf->allocated_ws_nodes = NULL;