Commit 25fd735a authored Nov 03, 2022 by Bob Pearson Committed by Jason Gunthorpe Nov 10, 2022

RDMA/rxe: Replace pr_xxx by rxe_dbg_xxx in rxe_av.c

Replace calls to pr_xxx() in rxe_av.c with rxe_dbg_xxx().

Link: https://lore.kernel.org/r/20221103171013.20659-13-rpearsonhpe@gmail.com


Signed-off-by: Bob Pearson <rpearsonhpe@gmail.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>

parent 14e501fd

drivers/infiniband/sw/rxe/rxe_av.c

+36 −7

Original line number	Diff line number	Diff line
		@@ -14,17 +14,32 @@ void rxe_init_av(struct rdma_ah_attr attr, struct rxe_av av)
		memcpy(av->dmac, attr->roce.dmac, ETH_ALEN);
		}

		int rxe_av_chk_attr(struct rxe_dev rxe, struct rdma_ah_attr attr)
		static int chk_attr(void obj, struct rdma_ah_attr attr, bool obj_is_ah)
		{
		const struct ib_global_route *grh = rdma_ah_read_grh(attr);
		struct rxe_port *port;
		struct rxe_dev *rxe;
		struct rxe_qp *qp;
		struct rxe_ah *ah;
		int type;

		if (obj_is_ah) {
		ah = obj;
		rxe = to_rdev(ah->ibah.device);
		} else {
		qp = obj;
		rxe = to_rdev(qp->ibqp.device);
		}

		port = &rxe->port;

		if (rdma_ah_get_ah_flags(attr) & IB_AH_GRH) {
		if (grh->sgid_index > port->attr.gid_tbl_len) {
		pr_warn("invalid sgid index = %d\n",
		if (obj_is_ah)
		rxe_dbg_ah(ah, "invalid sgid index = %d\n",
		grh->sgid_index);
		else
		rxe_dbg_qp(qp, "invalid sgid index = %d\n",
		grh->sgid_index);
		return -EINVAL;
		}
		@@ -32,7 +47,11 @@ int rxe_av_chk_attr(struct rxe_dev rxe, struct rdma_ah_attr attr)
		type = rdma_gid_attr_network_type(grh->sgid_attr);
		if (type < RDMA_NETWORK_IPV4 \|\|
		type > RDMA_NETWORK_IPV6) {
		pr_warn("invalid network type for rdma_rxe = %d\n",
		if (obj_is_ah)
		rxe_dbg_ah(ah, "invalid network type for rdma_rxe = %d\n",
		type);
		else
		rxe_dbg_qp(qp, "invalid network type for rdma_rxe = %d\n",
		type);
		return -EINVAL;
		}
		@@ -41,6 +60,16 @@ int rxe_av_chk_attr(struct rxe_dev rxe, struct rdma_ah_attr attr)
		return 0;
		}

		int rxe_av_chk_attr(struct rxe_qp qp, struct rdma_ah_attr attr)
		{
		return chk_attr(qp, attr, false);
		}

		int rxe_ah_chk_attr(struct rxe_ah ah, struct rdma_ah_attr attr)
		{
		return chk_attr(ah, attr, true);
		}

		void rxe_av_from_attr(u8 port_num, struct rxe_av *av,
		struct rdma_ah_attr *attr)
		{
		@@ -121,12 +150,12 @@ struct rxe_av rxe_get_av(struct rxe_pkt_info pkt, struct rxe_ah **ahp)
		/* only new user provider or kernel client */
		ah = rxe_pool_get_index(&pkt->rxe->ah_pool, ah_num);
		if (!ah) {
		pr_warn("Unable to find AH matching ah_num\n");
		rxe_dbg_qp(pkt->qp, "Unable to find AH matching ah_num\n");
		return NULL;
		}

		if (rxe_ah_pd(ah) != pkt->qp->pd) {
		pr_warn("PDs don't match for AH and QP\n");
		rxe_dbg_qp(pkt->qp, "PDs don't match for AH and QP\n");
		rxe_put(ah);
		return NULL;
		}

drivers/infiniband/sw/rxe/rxe_loc.h

+2 −6

Original line number	Diff line number	Diff line
		@@ -9,16 +9,12 @@

		/* rxe_av.c */
		void rxe_init_av(struct rdma_ah_attr attr, struct rxe_av av);

		int rxe_av_chk_attr(struct rxe_dev rxe, struct rdma_ah_attr attr);

		int rxe_av_chk_attr(struct rxe_qp qp, struct rdma_ah_attr attr);
		int rxe_ah_chk_attr(struct rxe_ah ah, struct rdma_ah_attr attr);
		void rxe_av_from_attr(u8 port_num, struct rxe_av *av,
		struct rdma_ah_attr *attr);

		void rxe_av_to_attr(struct rxe_av av, struct rdma_ah_attr attr);

		void rxe_av_fill_ip_info(struct rxe_av av, struct rdma_ah_attr attr);

		struct rxe_av rxe_get_av(struct rxe_pkt_info pkt, struct rxe_ah **ahp);

		/* rxe_cq.c */

drivers/infiniband/sw/rxe/rxe_qp.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -414,11 +414,11 @@ int rxe_qp_chk_attr(struct rxe_dev rxe, struct rxe_qp qp,
		if (mask & IB_QP_CAP && rxe_qp_chk_cap(rxe, &attr->cap, !!qp->srq))
		goto err1;

		if (mask & IB_QP_AV && rxe_av_chk_attr(rxe, &attr->ah_attr))
		if (mask & IB_QP_AV && rxe_av_chk_attr(qp, &attr->ah_attr))
		goto err1;

		if (mask & IB_QP_ALT_PATH) {
		if (rxe_av_chk_attr(rxe, &attr->alt_ah_attr))
		if (rxe_av_chk_attr(qp, &attr->alt_ah_attr))
		goto err1;
		if (!rdma_is_port_valid(&rxe->ib_dev, attr->alt_port_num)) {
		rxe_dbg_qp(qp, "invalid alt port %d\n", attr->alt_port_num);

drivers/infiniband/sw/rxe/rxe_verbs.c

+7 −6

Original line number	Diff line number	Diff line
		@@ -172,10 +172,6 @@ static int rxe_create_ah(struct ib_ah *ibah,
		ah->is_user = false;
		}

		err = rxe_av_chk_attr(rxe, init_attr->ah_attr);
		if (err)
		return err;

		err = rxe_add_to_pool_ah(&rxe->ah_pool, ah,
		init_attr->flags & RDMA_CREATE_AH_SLEEPABLE);
		if (err)
		@@ -184,6 +180,12 @@ static int rxe_create_ah(struct ib_ah *ibah,
		/* create index > 0 */
		ah->ah_num = ah->elem.index;

		err = rxe_ah_chk_attr(ah, init_attr->ah_attr);
		if (err) {
		rxe_cleanup(ah);
		return err;
		}

		if (uresp) {
		/* only if new user provider */
		err = copy_to_user(&uresp->ah_num, &ah->ah_num,
		@@ -206,10 +208,9 @@ static int rxe_create_ah(struct ib_ah *ibah,
		static int rxe_modify_ah(struct ib_ah ibah, struct rdma_ah_attr attr)
		{
		int err;
		struct rxe_dev *rxe = to_rdev(ibah->device);
		struct rxe_ah *ah = to_rah(ibah);

		err = rxe_av_chk_attr(rxe, attr);
		err = rxe_ah_chk_attr(ah, attr);
		if (err)
		return err;