On 1/18/22 11:11 PM, Bernard Metzler wrote:
<...>
move these large inline functions to where they
are needed. No need to put those into .h file.
make forward declarations if needed more than once,
static otherwise.
OK, will fix.
+static inline int erdma_alloc_idx(struct erdma_resource_cb *res_cb)
no inline, move to erdma_verbs.c
Will fix,
+{
+ int idx;
+ unsigned long flags;
+ u32 start_idx = res_cb->next_alloc_idx;
+
better read while already under lock?
Nice, will fix.
+ spin_lock_irqsave(&res_cb->lock, flags);
+ idx = find_next_zero_bit(res_cb->bitmap, res_cb->max_cap,
start_idx);
+ if (idx == res_cb->max_cap) {
+ idx = find_first_zero_bit(res_cb->bitmap, res_cb->max_cap);
+ if (idx == res_cb->max_cap) {
+ res_cb->next_alloc_idx = 1;
+ spin_unlock_irqrestore(&res_cb->lock, flags);
+ return -ENOSPC;
+ }
+ }
+
+ set_bit(idx, res_cb->bitmap);
+ spin_unlock_irqrestore(&res_cb->lock, flags);
+ res_cb->next_alloc_idx = idx + 1;
should be set while still under lock?
Nice, will fix.
+ return idx;
+}
+
+static inline void erdma_free_idx(struct erdma_resource_cb *res_cb, u32
idx)
move to erdma_verbs.c
Will fix.
+{
+ unsigned long flags;
+ u32 used;
+
+ spin_lock_irqsave(&res_cb->lock, flags);
+ used = test_and_clear_bit(idx, res_cb->bitmap);
+ spin_unlock_irqrestore(&res_cb->lock, flags);
+ WARN_ON(!used);
+}
+
+#define ERDMA_EXTRA_BUFFER_SIZE 8
+
+struct erdma_dev {
+ struct ib_device ibdev;
+ struct net_device *netdev;
+ void *dmadev;
+ void *drvdata;
+ /* reference to drvdata->cmdq */
+ struct erdma_cmdq *cmdq;
+
+ void (*release_handler)(void *drvdata);
+
+ /* physical port state (only one port per device) */
+ enum ib_port_state state;
+
+ struct erdma_devattr attrs;
+
+ spinlock_t lock;
+
+ struct erdma_resource_cb res_cb[ERDMA_RES_CNT];
+ struct xarray qp_xa;
+ struct xarray cq_xa;
+
+ u32 next_alloc_qpn;
+ u32 next_alloc_cqn;
+
+ spinlock_t db_bitmap_lock;
+
+ /* We provide 64 uContexts that each has one SQ doorbell Page. */
+ DECLARE_BITMAP(sdb_page, ERDMA_DWQE_TYPE0_CNT);
+ /* We provide 496 uContexts that each has one SQ normal Db, and one
directWQE db */
+ DECLARE_BITMAP(sdb_entry, ERDMA_DWQE_TYPE1_CNT);
+
+ u8 __iomem *db_space;
+ resource_size_t db_space_addr;
+
most of these below atomics are never checked, so remove.
OK, will fix.
+ atomic_t num_pd;
+ atomic_t num_qp;
+ atomic_t num_cq;
+ atomic_t num_mr;
+ atomic_t num_ctx;
<...>
+ return FIELD_GET(filed_mask, val);
+}
+
+static inline int erdma_poll_ceq_event(struct erdma_eq *ceq)
better move it to erdma_eq.c, and make forward declaration for
erdma_cmdq.c or vice versa
I will check and fix it.
Thanks,
Cheng Xu,
