RDMA/cxgb4: Remove kfifo usage (ec3eead2) · Commits · 戴 / test

drivers/infiniband/hw/cxgb4/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,4 +2,4 @@ ccflags-y := -Idrivers/net/ethernet/chelsio/cxgb4

		obj-$(CONFIG_INFINIBAND_CXGB4) += iw_cxgb4.o

		iw_cxgb4-y := device.o cm.o provider.o mem.o cq.o qp.o resource.o ev.o
		iw_cxgb4-y := device.o cm.o provider.o mem.o cq.o qp.o resource.o ev.o id_table.o

drivers/infiniband/hw/cxgb4/device.c

+22 −15

Original line number	Diff line number	Diff line
		@@ -252,25 +252,26 @@ static int stats_show(struct seq_file seq, void v)
		{
		struct c4iw_dev *dev = seq->private;

		seq_printf(seq, " Object: %10s %10s %10s\n", "Total", "Current", "Max");
		seq_printf(seq, " PDID: %10llu %10llu %10llu\n",
		seq_printf(seq, " Object: %10s %10s %10s %10s\n", "Total", "Current",
		"Max", "Fail");
		seq_printf(seq, " PDID: %10llu %10llu %10llu %10llu\n",
		dev->rdev.stats.pd.total, dev->rdev.stats.pd.cur,
		dev->rdev.stats.pd.max);
		seq_printf(seq, " QID: %10llu %10llu %10llu\n",
		dev->rdev.stats.pd.max, dev->rdev.stats.pd.fail);
		seq_printf(seq, " QID: %10llu %10llu %10llu %10llu\n",
		dev->rdev.stats.qid.total, dev->rdev.stats.qid.cur,
		dev->rdev.stats.qid.max);
		seq_printf(seq, " TPTMEM: %10llu %10llu %10llu\n",
		dev->rdev.stats.qid.max, dev->rdev.stats.qid.fail);
		seq_printf(seq, " TPTMEM: %10llu %10llu %10llu %10llu\n",
		dev->rdev.stats.stag.total, dev->rdev.stats.stag.cur,
		dev->rdev.stats.stag.max);
		seq_printf(seq, " PBLMEM: %10llu %10llu %10llu\n",
		dev->rdev.stats.stag.max, dev->rdev.stats.stag.fail);
		seq_printf(seq, " PBLMEM: %10llu %10llu %10llu %10llu\n",
		dev->rdev.stats.pbl.total, dev->rdev.stats.pbl.cur,
		dev->rdev.stats.pbl.max);
		seq_printf(seq, " RQTMEM: %10llu %10llu %10llu\n",
		dev->rdev.stats.pbl.max, dev->rdev.stats.pbl.fail);
		seq_printf(seq, " RQTMEM: %10llu %10llu %10llu %10llu\n",
		dev->rdev.stats.rqt.total, dev->rdev.stats.rqt.cur,
		dev->rdev.stats.rqt.max);
		seq_printf(seq, " OCQPMEM: %10llu %10llu %10llu\n",
		dev->rdev.stats.rqt.max, dev->rdev.stats.rqt.fail);
		seq_printf(seq, " OCQPMEM: %10llu %10llu %10llu %10llu\n",
		dev->rdev.stats.ocqp.total, dev->rdev.stats.ocqp.cur,
		dev->rdev.stats.ocqp.max);
		dev->rdev.stats.ocqp.max, dev->rdev.stats.ocqp.fail);
		seq_printf(seq, " DB FULL: %10llu\n", dev->rdev.stats.db_full);
		seq_printf(seq, " DB EMPTY: %10llu\n", dev->rdev.stats.db_empty);
		seq_printf(seq, " DB DROP: %10llu\n", dev->rdev.stats.db_drop);
		@@ -292,11 +293,17 @@ static ssize_t stats_clear(struct file file, const char __user buf,

		mutex_lock(&dev->rdev.stats.lock);
		dev->rdev.stats.pd.max = 0;
		dev->rdev.stats.pd.fail = 0;
		dev->rdev.stats.qid.max = 0;
		dev->rdev.stats.qid.fail = 0;
		dev->rdev.stats.stag.max = 0;
		dev->rdev.stats.stag.fail = 0;
		dev->rdev.stats.pbl.max = 0;
		dev->rdev.stats.pbl.fail = 0;
		dev->rdev.stats.rqt.max = 0;
		dev->rdev.stats.rqt.fail = 0;
		dev->rdev.stats.ocqp.max = 0;
		dev->rdev.stats.ocqp.fail = 0;
		dev->rdev.stats.db_full = 0;
		dev->rdev.stats.db_empty = 0;
		dev->rdev.stats.db_drop = 0;
		@@ -350,8 +357,8 @@ void c4iw_release_dev_ucontext(struct c4iw_rdev *rdev,
		entry = list_entry(pos, struct c4iw_qid_list, entry);
		list_del_init(&entry->entry);
		if (!(entry->qid & rdev->qpmask)) {
		c4iw_put_resource(&rdev->resource.qid_fifo, entry->qid,
		&rdev->resource.qid_fifo_lock);
		c4iw_put_resource(&rdev->resource.qid_table,
		entry->qid);
		mutex_lock(&rdev->stats.lock);
		rdev->stats.qid.cur -= rdev->qpmask + 1;
		mutex_unlock(&rdev->stats.lock);

drivers/infiniband/hw/cxgb4/id_table.c

0 → 100644

+112 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2011 Chelsio Communications. 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 <linux/kernel.h>
		#include <linux/random.h>
		#include "iw_cxgb4.h"

		#define RANDOM_SKIP 16

		/*
		* Trivial bitmap-based allocator. If the random flag is set, the
		* allocator is designed to:
		* - pseudo-randomize the id returned such that it is not trivially predictable.
		* - avoid reuse of recently used id (at the expense of predictability)
		*/
		u32 c4iw_id_alloc(struct c4iw_id_table *alloc)
		{
		unsigned long flags;
		u32 obj;

		spin_lock_irqsave(&alloc->lock, flags);

		obj = find_next_zero_bit(alloc->table, alloc->max, alloc->last);
		if (obj >= alloc->max)
		obj = find_first_zero_bit(alloc->table, alloc->max);

		if (obj < alloc->max) {
		if (alloc->flags & C4IW_ID_TABLE_F_RANDOM)
		alloc->last += random32() % RANDOM_SKIP;
		else
		alloc->last = obj + 1;
		if (alloc->last >= alloc->max)
		alloc->last = 0;
		set_bit(obj, alloc->table);
		obj += alloc->start;
		} else
		obj = -1;

		spin_unlock_irqrestore(&alloc->lock, flags);
		return obj;
		}

		void c4iw_id_free(struct c4iw_id_table *alloc, u32 obj)
		{
		unsigned long flags;

		obj -= alloc->start;
		BUG_ON((int)obj < 0);

		spin_lock_irqsave(&alloc->lock, flags);
		clear_bit(obj, alloc->table);
		spin_unlock_irqrestore(&alloc->lock, flags);
		}

		int c4iw_id_table_alloc(struct c4iw_id_table *alloc, u32 start, u32 num,
		u32 reserved, u32 flags)
		{
		int i;

		alloc->start = start;
		alloc->flags = flags;
		if (flags & C4IW_ID_TABLE_F_RANDOM)
		alloc->last = random32() % RANDOM_SKIP;
		else
		alloc->last = 0;
		alloc->max = num;
		spin_lock_init(&alloc->lock);
		alloc->table = kmalloc(BITS_TO_LONGS(num) * sizeof(long),
		GFP_KERNEL);
		if (!alloc->table)
		return -ENOMEM;

		bitmap_zero(alloc->table, num);
		if (!(alloc->flags & C4IW_ID_TABLE_F_EMPTY))
		for (i = 0; i < reserved; ++i)
		set_bit(i, alloc->table);

		return 0;
		}

		void c4iw_id_table_free(struct c4iw_id_table *alloc)
		{
		kfree(alloc->table);
		}

drivers/infiniband/hw/cxgb4/iw_cxgb4.h

+25 −10

Original line number	Diff line number	Diff line
		@@ -45,7 +45,6 @@
		#include <linux/kref.h>
		#include <linux/timer.h>
		#include <linux/io.h>
		#include <linux/kfifo.h>

		#include <asm/byteorder.h>

		@@ -79,13 +78,22 @@ static inline void cplhdr(struct sk_buff skb)
		return skb->data;
		}

		#define C4IW_ID_TABLE_F_RANDOM 1 /* Pseudo-randomize the id's returned */
		#define C4IW_ID_TABLE_F_EMPTY 2 /* Table is initially empty */

		struct c4iw_id_table {
		u32 flags;
		u32 start; /* logical minimal id */
		u32 last; /* hint for find */
		u32 max;
		spinlock_t lock;
		unsigned long *table;
		};

		struct c4iw_resource {
		struct kfifo tpt_fifo;
		spinlock_t tpt_fifo_lock;
		struct kfifo qid_fifo;
		spinlock_t qid_fifo_lock;
		struct kfifo pdid_fifo;
		spinlock_t pdid_fifo_lock;
		struct c4iw_id_table tpt_table;
		struct c4iw_id_table qid_table;
		struct c4iw_id_table pdid_table;
		};

		struct c4iw_qid_list {
		@@ -107,6 +115,7 @@ struct c4iw_stat {
		u64 total;
		u64 cur;
		u64 max;
		u64 fail;
		};

		struct c4iw_stats {
		@@ -253,7 +262,7 @@ static inline int _insert_handle(struct c4iw_dev rhp, struct idr idr,
		if (lock)
		spin_lock_irq(&rhp->lock);
		ret = idr_get_new_above(idr, handle, id, &newid);
		BUG_ON(newid != id);
		BUG_ON(!ret && newid != id);
		if (lock)
		spin_unlock_irq(&rhp->lock);
		} while (ret == -EAGAIN);
		@@ -755,14 +764,20 @@ static inline int compute_wscale(int win)
		return wscale;
		}

		u32 c4iw_id_alloc(struct c4iw_id_table *alloc);
		void c4iw_id_free(struct c4iw_id_table *alloc, u32 obj);
		int c4iw_id_table_alloc(struct c4iw_id_table *alloc, u32 start, u32 num,
		u32 reserved, u32 flags);
		void c4iw_id_table_free(struct c4iw_id_table *alloc);

		typedef int (c4iw_handler_func)(struct c4iw_dev dev, struct sk_buff *skb);

		int c4iw_ep_redirect(void ctx, struct dst_entry old, struct dst_entry *new,
		struct l2t_entry *l2t);
		void c4iw_put_qpid(struct c4iw_rdev *rdev, u32 qpid,
		struct c4iw_dev_ucontext *uctx);
		u32 c4iw_get_resource(struct kfifo fifo, spinlock_t lock);
		void c4iw_put_resource(struct kfifo fifo, u32 entry, spinlock_t lock);
		u32 c4iw_get_resource(struct c4iw_id_table *id_table);
		void c4iw_put_resource(struct c4iw_id_table *id_table, u32 entry);
		int c4iw_init_resource(struct c4iw_rdev *rdev, u32 nr_tpt, u32 nr_pdid);
		int c4iw_init_ctrl_qp(struct c4iw_rdev *rdev);
		int c4iw_pblpool_create(struct c4iw_rdev *rdev);

drivers/infiniband/hw/cxgb4/mem.c

+4 −6

Original line number	Diff line number	Diff line
		@@ -131,8 +131,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
		stag_idx = (*stag) >> 8;

		if ((!reset_tpt_entry) && (*stag == T4_STAG_UNSET)) {
		stag_idx = c4iw_get_resource(&rdev->resource.tpt_fifo,
		&rdev->resource.tpt_fifo_lock);
		stag_idx = c4iw_get_resource(&rdev->resource.tpt_table);
		if (!stag_idx)
		return -ENOMEM;
		mutex_lock(&rdev->stats.lock);
		@@ -171,8 +170,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
		sizeof(tpt), &tpt);

		if (reset_tpt_entry) {
		c4iw_put_resource(&rdev->resource.tpt_fifo, stag_idx,
		&rdev->resource.tpt_fifo_lock);
		c4iw_put_resource(&rdev->resource.tpt_table, stag_idx);
		mutex_lock(&rdev->stats.lock);
		rdev->stats.stag.cur -= 32;
		mutex_unlock(&rdev->stats.lock);
		@@ -695,8 +693,8 @@ int c4iw_dealloc_mw(struct ib_mw *mw)
		mhp = to_c4iw_mw(mw);
		rhp = mhp->rhp;
		mmid = (mw->rkey) >> 8;
		deallocate_window(&rhp->rdev, mhp->attr.stag);
		remove_handle(rhp, &rhp->mmidr, mmid);
		deallocate_window(&rhp->rdev, mhp->attr.stag);
		kfree(mhp);
		PDBG("%s ib_mw %p mmid 0x%x ptr %p\n", __func__, mw, mmid, mhp);
		return 0;
		@@ -798,12 +796,12 @@ int c4iw_dereg_mr(struct ib_mr *ib_mr)
		mhp = to_c4iw_mr(ib_mr);
		rhp = mhp->rhp;
		mmid = mhp->attr.stag >> 8;
		remove_handle(rhp, &rhp->mmidr, mmid);
		dereg_mem(&rhp->rdev, mhp->attr.stag, mhp->attr.pbl_size,
		mhp->attr.pbl_addr);
		if (mhp->attr.pbl_size)
		c4iw_pblpool_free(&mhp->rhp->rdev, mhp->attr.pbl_addr,
		mhp->attr.pbl_size << 3);
		remove_handle(rhp, &rhp->mmidr, mmid);
		if (mhp->kva)
		kfree((void *) (unsigned long) mhp->kva);
		if (mhp->umem)

Admin message