IB/rxe: Add port protocol stats (0b1e5b99) · Commits · 戴 / test

drivers/infiniband/sw/rxe/Makefile

+2 −1

Original line number	Diff line number	Diff line
		@@ -20,4 +20,5 @@ rdma_rxe-y := \
		rxe_mcast.o \
		rxe_task.o \
		rxe_net.o \
		rxe_sysfs.o
		rxe_sysfs.o \
		rxe_hw_counters.o

drivers/infiniband/sw/rxe/rxe_comp.c

+13 −1

Original line number	Diff line number	Diff line
		@@ -154,6 +154,8 @@ void rxe_comp_queue_pkt(struct rxe_dev rxe, struct rxe_qp qp,
		skb_queue_tail(&qp->resp_pkts, skb);

		must_sched = skb_queue_len(&qp->resp_pkts) > 1;
		if (must_sched != 0)
		rxe_counter_inc(rxe, RXE_CNT_COMPLETER_SCHED);
		rxe_run_task(&qp->comp.task, must_sched);
		}

		@@ -236,6 +238,7 @@ static inline enum comp_state check_ack(struct rxe_qp *qp,
		{
		unsigned int mask = pkt->mask;
		u8 syn;
		struct rxe_dev *rxe = to_rdev(qp->ibqp.device);

		/* Check the sequence only */
		switch (qp->comp.opcode) {
		@@ -298,6 +301,7 @@ static inline enum comp_state check_ack(struct rxe_qp *qp,
		return COMPST_WRITE_SEND;

		case AETH_RNR_NAK:
		rxe_counter_inc(rxe, RXE_CNT_RCV_RNR);
		return COMPST_RNR_RETRY;

		case AETH_NAK:
		@@ -307,6 +311,8 @@ static inline enum comp_state check_ack(struct rxe_qp *qp,
		* before
		*/
		if (psn_compare(pkt->psn, qp->comp.psn) > 0) {
		rxe_counter_inc(rxe,
		RXE_CNT_RCV_SEQ_ERR);
		qp->comp.psn = pkt->psn;
		if (qp->req.wait_psn) {
		qp->req.wait_psn = 0;
		@@ -534,6 +540,7 @@ static void rxe_drain_resp_pkts(struct rxe_qp *qp, bool notify)
		int rxe_completer(void *arg)
		{
		struct rxe_qp qp = (struct rxe_qp )arg;
		struct rxe_dev *rxe = to_rdev(qp->ibqp.device);
		struct rxe_send_wqe *wqe = wqe;
		struct sk_buff *skb = NULL;
		struct rxe_pkt_info *pkt = NULL;
		@@ -683,8 +690,10 @@ int rxe_completer(void *arg)
		if (psn_compare(qp->req.psn,
		qp->comp.psn) > 0) {
		/* tell the requester to retry the
		* send send queue next time around
		* send queue next time around
		*/
		rxe_counter_inc(rxe,
		RXE_CNT_COMP_RETRY);
		qp->req.need_retry = 1;
		rxe_run_task(&qp->req.task, 1);
		}
		@@ -699,6 +708,7 @@ int rxe_completer(void *arg)
		goto exit;

		} else {
		rxe_counter_inc(rxe, RXE_CNT_RETRY_EXCEEDED);
		wqe->status = IB_WC_RETRY_EXC_ERR;
		state = COMPST_ERROR;
		}
		@@ -720,6 +730,8 @@ int rxe_completer(void *arg)
		skb = NULL;
		goto exit;
		} else {
		rxe_counter_inc(rxe,
		RXE_CNT_RNR_RETRY_EXCEEDED);
		wqe->status = IB_WC_RNR_RETRY_EXC_ERR;
		state = COMPST_ERROR;
		}

drivers/infiniband/sw/rxe/rxe_hw_counters.c

0 → 100644

+78 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2017 Mellanox Technologies Ltd. All rights reserved.
		*
		* This software is available to you under a choice of one of two
		* licenses. You may choose to be licensed under the terms of the GNU
		* General Public License (GPL) Version 2, available from the file
		* COPYING in the main directory of this source tree, or the
		* OpenIB.org BSD license below:
		*
		* Redistribution and use in source and binary forms, with or
		* without modification, are permitted provided that the following
		* conditions are met:
		*
		* - Redistributions of source code must retain the above
		* copyright notice, this list of conditions and the following
		* disclaimer.
		*
		* - Redistributions in binary form must reproduce the above
		* copyright notice, this list of conditions and the following
		* disclaimer in the documentation and/or other materials
		* provided with the distribution.
		*
		* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
		* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
		* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
		* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
		* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
		* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
		* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
		* SOFTWARE.
		*/

		#include "rxe.h"
		#include "rxe_hw_counters.h"

		const char * const rxe_counter_name[] = {
		[RXE_CNT_SENT_PKTS] = "sent_pkts",
		[RXE_CNT_RCVD_PKTS] = "rcvd_pkts",
		[RXE_CNT_DUP_REQ] = "duplicate_request",
		[RXE_CNT_OUT_OF_SEQ_REQ] = "out_of_sequence",
		[RXE_CNT_RCV_RNR] = "rcvd_rnr_err",
		[RXE_CNT_SND_RNR] = "send_rnr_err",
		[RXE_CNT_RCV_SEQ_ERR] = "rcvd_seq_err",
		[RXE_CNT_COMPLETER_SCHED] = "ack_deffered",
		[RXE_CNT_RETRY_EXCEEDED] = "retry_exceeded_err",
		[RXE_CNT_RNR_RETRY_EXCEEDED] = "retry_rnr_exceeded_err",
		[RXE_CNT_COMP_RETRY] = "completer_retry_err",
		[RXE_CNT_SEND_ERR] = "send_err",
		};

		int rxe_ib_get_hw_stats(struct ib_device *ibdev,
		struct rdma_hw_stats *stats,
		u8 port, int index)
		{
		struct rxe_dev *dev = to_rdev(ibdev);
		unsigned int cnt;

		if (!port \|\| !stats)
		return -EINVAL;

		for (cnt = 0; cnt < ARRAY_SIZE(rxe_counter_name); cnt++)
		stats->value[cnt] = dev->stats_counters[cnt];

		return ARRAY_SIZE(rxe_counter_name);
		}

		struct rdma_hw_stats rxe_ib_alloc_hw_stats(struct ib_device ibdev,
		u8 port_num)
		{
		BUILD_BUG_ON(ARRAY_SIZE(rxe_counter_name) != RXE_NUM_OF_COUNTERS);
		/* We support only per port stats */
		if (!port_num)
		return NULL;

		return rdma_alloc_hw_stats_struct(rxe_counter_name,
		ARRAY_SIZE(rxe_counter_name),
		RDMA_HW_STATS_DEFAULT_LIFESPAN);
		}

drivers/infiniband/sw/rxe/rxe_hw_counters.h

0 → 100644

+61 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2017 Mellanox Technologies Ltd. All rights reserved.
		*
		* This software is available to you under a choice of one of two
		* licenses. You may choose to be licensed under the terms of the GNU
		* General Public License (GPL) Version 2, available from the file
		* COPYING in the main directory of this source tree, or the
		* OpenIB.org BSD license below:
		*
		* Redistribution and use in source and binary forms, with or
		* without modification, are permitted provided that the following
		* conditions are met:
		*
		* - Redistributions of source code must retain the above
		* copyright notice, this list of conditions and the following
		* disclaimer.
		*
		* - Redistributions in binary form must reproduce the above
		* copyright notice, this list of conditions and the following
		* disclaimer in the documentation and/or other materials
		* provided with the distribution.
		*
		* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
		* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
		* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
		* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
		* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
		* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
		* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
		* SOFTWARE.
		*/

		#ifndef RXE_HW_COUNTERS_H
		#define RXE_HW_COUNTERS_H

		/*
		* when adding counters to enum also add
		* them to rxe_counter_name[] vector.
		*/
		enum rxe_counters {
		RXE_CNT_SENT_PKTS,
		RXE_CNT_RCVD_PKTS,
		RXE_CNT_DUP_REQ,
		RXE_CNT_OUT_OF_SEQ_REQ,
		RXE_CNT_RCV_RNR,
		RXE_CNT_SND_RNR,
		RXE_CNT_RCV_SEQ_ERR,
		RXE_CNT_COMPLETER_SCHED,
		RXE_CNT_RETRY_EXCEEDED,
		RXE_CNT_RNR_RETRY_EXCEEDED,
		RXE_CNT_COMP_RETRY,
		RXE_CNT_SEND_ERR,
		RXE_NUM_OF_COUNTERS
		};

		struct rdma_hw_stats rxe_ib_alloc_hw_stats(struct ib_device ibdev,
		u8 port_num);
		int rxe_ib_get_hw_stats(struct ib_device *ibdev,
		struct rdma_hw_stats *stats,
		u8 port, int index);
		#endif /* RXE_HW_COUNTERS_H */

drivers/infiniband/sw/rxe/rxe_loc.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -278,6 +278,7 @@ static inline int rxe_xmit_packet(struct rxe_dev rxe, struct rxe_qp qp,

		if (err) {
		rxe->xmit_errors++;
		rxe_counter_inc(rxe, RXE_CNT_SEND_ERR);
		return err;
		}

		@@ -287,6 +288,7 @@ static inline int rxe_xmit_packet(struct rxe_dev rxe, struct rxe_qp qp,
		rxe_run_task(&qp->comp.task, 1);
		}

		rxe_counter_inc(rxe, RXE_CNT_SENT_PKTS);
		goto done;

		drop:

Admin message