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

Commit 3b8ab700 authored by Ira Weiny's avatar Ira Weiny Committed by Doug Ledford
Browse files

IB/mad: Remove improper use of BUG_ON 



We recently added BUG_ON's which were inappropriate for a condition which
should never happen. Change these to be WARN_ON_ONCE as a debugging aid.

Fixes: 4cd7c947 ('IB/mad: Add support for additional MAD info to/from drivers')

Signed-off-by: default avatarIra Weiny <ira.weiny@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent cd4cd565

drivers/infiniband/hw/ehca/ehca_sqp.c

+3 −2
Original line number Diff line number Diff line
@@ -226,8 +226,9 @@ int ehca_process_mad(struct ib_device *ibdev, int mad_flags, u8 port_num, 
	const struct ib_mad *in_mad = (const struct ib_mad *)in;

	struct ib_mad *out_mad = (struct ib_mad *)out;



	BUG_ON(in_mad_size != sizeof(*in_mad) ||

	       *out_mad_size != sizeof(*out_mad));

	if (WARN_ON_ONCE(in_mad_size != sizeof(*in_mad) ||

			 *out_mad_size != sizeof(*out_mad)))

		return IB_MAD_RESULT_FAILURE;



	if (!port_num || port_num > ibdev->phys_port_cnt || !in_wc)

		return IB_MAD_RESULT_FAILURE;

drivers/infiniband/hw/ipath/ipath_mad.c

+3 −2
Original line number Diff line number Diff line
@@ -1499,8 +1499,9 @@ int ipath_process_mad(struct ib_device *ibdev, int mad_flags, u8 port_num, 
	const struct ib_mad *in_mad = (const struct ib_mad *)in;

	struct ib_mad *out_mad = (struct ib_mad *)out;



	BUG_ON(in_mad_size != sizeof(*in_mad) ||

	       *out_mad_size != sizeof(*out_mad));

	if (WARN_ON_ONCE(in_mad_size != sizeof(*in_mad) ||

			 *out_mad_size != sizeof(*out_mad)))

		return IB_MAD_RESULT_FAILURE;



	switch (in_mad->mad_hdr.mgmt_class) {

	case IB_MGMT_CLASS_SUBN_DIRECTED_ROUTE:

drivers/infiniband/hw/mlx4/mad.c

+3 −2
Original line number Diff line number Diff line
@@ -861,8 +861,9 @@ int mlx4_ib_process_mad(struct ib_device *ibdev, int mad_flags, u8 port_num, 
	const struct ib_mad *in_mad = (const struct ib_mad *)in;

	struct ib_mad *out_mad = (struct ib_mad *)out;



	BUG_ON(in_mad_size != sizeof(*in_mad) ||

	       *out_mad_size != sizeof(*out_mad));

	if (WARN_ON_ONCE(in_mad_size != sizeof(*in_mad) ||

			 *out_mad_size != sizeof(*out_mad)))

		return IB_MAD_RESULT_FAILURE;



	switch (rdma_port_get_link_layer(ibdev, port_num)) {

	case IB_LINK_LAYER_INFINIBAND:

drivers/infiniband/hw/mlx5/mad.c

+3 −2
Original line number Diff line number Diff line
@@ -68,8 +68,9 @@ int mlx5_ib_process_mad(struct ib_device *ibdev, int mad_flags, u8 port_num, 
	const struct ib_mad *in_mad = (const struct ib_mad *)in;

	struct ib_mad *out_mad = (struct ib_mad *)out;



	BUG_ON(in_mad_size != sizeof(*in_mad) ||

	       *out_mad_size != sizeof(*out_mad));

	if (WARN_ON_ONCE(in_mad_size != sizeof(*in_mad) ||

			 *out_mad_size != sizeof(*out_mad)))

		return IB_MAD_RESULT_FAILURE;



	slid = in_wc ? in_wc->slid : be16_to_cpu(IB_LID_PERMISSIVE);

drivers/infiniband/hw/mthca/mthca_mad.c

+3 −2
Original line number Diff line number Diff line
@@ -209,8 +209,9 @@ int mthca_process_mad(struct ib_device *ibdev, 
	const struct ib_mad *in_mad = (const struct ib_mad *)in;

	struct ib_mad *out_mad = (struct ib_mad *)out;



	BUG_ON(in_mad_size != sizeof(*in_mad) ||

	       *out_mad_size != sizeof(*out_mad));

	if (WARN_ON_ONCE(in_mad_size != sizeof(*in_mad) ||

			 *out_mad_size != sizeof(*out_mad)))

		return IB_MAD_RESULT_FAILURE;



	/* Forward locally generated traps to the SM */

	if (in_mad->mad_hdr.method == IB_MGMT_METHOD_TRAP &&