NTB: Fix transport stats for multiple devices (c8650fd0) · Commits · 戴 / test

Currently the debugfs does not have files for all NTB transport queue pairs. When there are multiple NTBs present in a system, the QP names of the last transport clobber the names of previously added transport QPs. Only the last added QPs can be observed via debugfs. Create a directory per NTB transport to associate the QPs with that transport. Name the directory the same as the PCI device. Signed-off-by:

Dave Jiang <dave.jiang@intel.com> Signed-off-by:

Jon Mason <jdmason@kudzu.us>

drivers/ntb/ntb_transport.c

+10 −2

Original line number	Diff line number	Diff line
		@@ -212,6 +212,8 @@ struct ntb_transport_ctx {
		bool link_is_up;
		struct delayed_work link_work;
		struct work_struct link_cleanup;

		struct dentry *debugfs_node_dir;
		};

		enum {
		@@ -945,12 +947,12 @@ static int ntb_transport_init_queue(struct ntb_transport_ctx *nt,
		qp->tx_max_frame = min(transport_mtu, tx_size / 2);
		qp->tx_max_entry = tx_size / qp->tx_max_frame;

		if (nt_debugfs_dir) {
		if (nt->debugfs_node_dir) {
		char debugfs_name[4];

		snprintf(debugfs_name, 4, "qp%d", qp_num);
		qp->debugfs_dir = debugfs_create_dir(debugfs_name,
		nt_debugfs_dir);
		nt->debugfs_node_dir);

		qp->debugfs_stats = debugfs_create_file("stats", S_IRUSR,
		qp->debugfs_dir, qp,
		@@ -1053,6 +1055,12 @@ static int ntb_transport_probe(struct ntb_client self, struct ntb_dev ndev)
		goto err2;
		}

		if (nt_debugfs_dir) {
		nt->debugfs_node_dir =
		debugfs_create_dir(pci_name(ndev->pdev),
		nt_debugfs_dir);
		}

		for (i = 0; i < qp_count; i++) {
		rc = ntb_transport_init_queue(nt, i);
		if (rc)

Admin message