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

Commit 571b8b92 authored by Jack Morgenstein's avatar Jack Morgenstein Committed by David S. Miller
Browse files

net/mlx4_core: Initialize all mailbox buffers to zero before use 



To guarantee that all unused fields in all FW commands for both inboxes
and outboxes are zeroed out, initialize the mailbox buffer to all zeroes.

This is especially important for SRIOV comm-channel virtual commands
(such as QUERY_FUNC_CAP), where if new fields are added to support new
features, the driver can depend on older kernels passing zeroes in these
fields.

In addition to zeroing out the mailbox buffer at allocation time, all
(now unnecessary) calls to memset by the callers of
mlx4_alloc_cmd_mailbox() are removed.

Signed-off-by: default avatarMajd Dibbiny <majd@mellanox.com>
Signed-off-by: default avatarJack Morgenstein <jackm@dev.mellanox.co.il>
Signed-off-by: default avatarAmir Vadai <amirv@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 75a353d4

drivers/infiniband/hw/mlx4/main.c

+0 −6
Original line number Diff line number Diff line
@@ -526,7 +526,6 @@ static int mlx4_ib_modify_device(struct ib_device *ibdev, int mask, 
	if (IS_ERR(mailbox))

		return 0;



	memset(mailbox->buf, 0, 256);

	memcpy(mailbox->buf, props->node_desc, 64);

	mlx4_cmd(to_mdev(ibdev)->dev, mailbox->dma, 1, 0,

		 MLX4_CMD_SET_NODE, MLX4_CMD_TIME_CLASS_A, MLX4_CMD_NATIVE);
@@ -547,8 +546,6 @@ static int mlx4_SET_PORT(struct mlx4_ib_dev *dev, u8 port, int reset_qkey_viols, 
	if (IS_ERR(mailbox))

		return PTR_ERR(mailbox);



	memset(mailbox->buf, 0, 256);



	if (dev->dev->flags & MLX4_FLAG_OLD_PORT_CMDS) {

		*(u8 *) mailbox->buf	     = !!reset_qkey_viols << 6;

		((__be32 *) mailbox->buf)[2] = cpu_to_be32(cap_mask);
@@ -879,8 +876,6 @@ static int __mlx4_ib_create_flow(struct ib_qp *qp, struct ib_flow_attr *flow_att 
	struct mlx4_ib_dev *mdev = to_mdev(qp->device);

	struct mlx4_cmd_mailbox *mailbox;

	struct mlx4_net_trans_rule_hw_ctrl *ctrl;

	size_t rule_size = sizeof(struct mlx4_net_trans_rule_hw_ctrl) +

			   (sizeof(struct _rule_hw) * flow_attr->num_of_specs);



	static const u16 __mlx4_domain[] = {

		[IB_FLOW_DOMAIN_USER] = MLX4_DOMAIN_UVERBS,
@@ -905,7 +900,6 @@ static int __mlx4_ib_create_flow(struct ib_qp *qp, struct ib_flow_attr *flow_att 
	mailbox = mlx4_alloc_cmd_mailbox(mdev->dev);

	if (IS_ERR(mailbox))

		return PTR_ERR(mailbox);

	memset(mailbox->buf, 0, rule_size);

	ctrl = mailbox->buf;



	ctrl->prio = cpu_to_be16(__mlx4_domain[domain] |

drivers/net/ethernet/mellanox/mlx4/cmd.c

+2 −0
Original line number Diff line number Diff line
@@ -2199,6 +2199,8 @@ struct mlx4_cmd_mailbox *mlx4_alloc_cmd_mailbox(struct mlx4_dev *dev) 
		return ERR_PTR(-ENOMEM);

	}



	memset(mailbox->buf, 0, MLX4_MAILBOX_SIZE);



	return mailbox;

}

EXPORT_SYMBOL_GPL(mlx4_alloc_cmd_mailbox);

drivers/net/ethernet/mellanox/mlx4/cq.c

+0 −6
Original line number Diff line number Diff line
@@ -128,8 +128,6 @@ int mlx4_cq_modify(struct mlx4_dev *dev, struct mlx4_cq *cq, 
		return PTR_ERR(mailbox);



	cq_context = mailbox->buf;

	memset(cq_context, 0, sizeof *cq_context);



	cq_context->cq_max_count = cpu_to_be16(count);

	cq_context->cq_period    = cpu_to_be16(period);
@@ -153,8 +151,6 @@ int mlx4_cq_resize(struct mlx4_dev *dev, struct mlx4_cq *cq, 
		return PTR_ERR(mailbox);



	cq_context = mailbox->buf;

	memset(cq_context, 0, sizeof *cq_context);



	cq_context->logsize_usrpage = cpu_to_be32(ilog2(entries) << 24);

	cq_context->log_page_size   = mtt->page_shift - 12;

	mtt_addr = mlx4_mtt_addr(dev, mtt);
@@ -274,8 +270,6 @@ int mlx4_cq_alloc(struct mlx4_dev *dev, int nent, 
	}



	cq_context = mailbox->buf;

	memset(cq_context, 0, sizeof *cq_context);



	cq_context->flags	    = cpu_to_be32(!!collapsed << 18);

	if (timestamp_en)

		cq_context->flags  |= cpu_to_be32(1 << 19);

drivers/net/ethernet/mellanox/mlx4/en_port.c

+0 −3
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ int mlx4_SET_VLAN_FLTR(struct mlx4_dev *dev, struct mlx4_en_priv *priv) 
		return PTR_ERR(mailbox);



	filter = mailbox->buf;

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

	for (i = VLAN_FLTR_SIZE - 1; i >= 0; i--) {

		entry = 0;

		for (j = 0; j < 32; j++)
@@ -81,7 +80,6 @@ int mlx4_en_QUERY_PORT(struct mlx4_en_dev *mdev, u8 port) 
	mailbox = mlx4_alloc_cmd_mailbox(mdev->dev);

	if (IS_ERR(mailbox))

		return PTR_ERR(mailbox);

	memset(mailbox->buf, 0, sizeof(*qport_context));

	err = mlx4_cmd_box(mdev->dev, 0, mailbox->dma, port, 0,

			   MLX4_CMD_QUERY_PORT, MLX4_CMD_TIME_CLASS_B,

			   MLX4_CMD_WRAPPED);
@@ -127,7 +125,6 @@ int mlx4_en_DUMP_ETH_STATS(struct mlx4_en_dev *mdev, u8 port, u8 reset) 
	mailbox = mlx4_alloc_cmd_mailbox(mdev->dev);

	if (IS_ERR(mailbox))

		return PTR_ERR(mailbox);

	memset(mailbox->buf, 0, sizeof(*mlx4_en_stats));

	err = mlx4_cmd_box(mdev->dev, 0, mailbox->dma, in_mod, 0,

			   MLX4_CMD_DUMP_ETH_STATS, MLX4_CMD_TIME_CLASS_B,

			   MLX4_CMD_WRAPPED);

drivers/net/ethernet/mellanox/mlx4/eq.c

+0 −1
Original line number Diff line number Diff line
@@ -936,7 +936,6 @@ static int mlx4_create_eq(struct mlx4_dev *dev, int nent, 
	if (err)

		goto err_out_free_mtt;



	memset(eq_context, 0, sizeof *eq_context);

	eq_context->flags	  = cpu_to_be32(MLX4_EQ_STATUS_OK   |

						MLX4_EQ_STATE_ARMED);

	eq_context->log_eq_size	  = ilog2(eq->nent);