Commit bedc0fd0 authored Jul 11, 2019 by Qian Cai Committed by Jason Gunthorpe Jul 11, 2019

RDMA/core: Fix -Wunused-const-variable warnings



The commit below introduced a few compilation warnings.

In file included from ./include/rdma/ib_verbs.h:64,
                 from ./include/linux/mlx5/device.h:37,
                 from ./include/linux/mlx5/driver.h:51,
                 from drivers/net/ethernet/mellanox/mlx5/core/uar.c:36:
./include/linux/dim.h:378:1: warning: 'rdma_dim_prof' defined but not
used [-Wunused-const-variable=]
 rdma_dim_prof[RDMA_DIM_PARAMS_NUM_PROFILES] = {
 ^~~~~~~~~~~~~
In file included from ./include/rdma/ib_verbs.h:64,
                 from ./include/linux/mlx5/device.h:37,
                 from ./include/linux/mlx5/driver.h:51,
                 from
drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c:37:
./include/linux/dim.h:378:1: warning: 'rdma_dim_prof' defined but not
used [-Wunused-const-variable=]
 rdma_dim_prof[RDMA_DIM_PARAMS_NUM_PROFILES] = {
 ^~~~~~~~~~~~~

Since only ib_cq_rdma_dim_work() in drivers/infiniband/core/cq.c uses it,
just move the definition over there.

Fixes: f4915455 ("linux/dim: Implement RDMA adaptive moderation (DIM)")
Signed-off-by: Qian Cai <cai@lca.pw>
Reviewed-by: Jason Gunthorpe <jgg@mellanox.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

parent 855085d9

drivers/infiniband/core/cq.c

+13 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,19 @@
		#define IB_POLL_FLAGS \
		(IB_CQ_NEXT_COMP \| IB_CQ_REPORT_MISSED_EVENTS)

		static const struct dim_cq_moder
		rdma_dim_prof[RDMA_DIM_PARAMS_NUM_PROFILES] = {
		{1, 0, 1, 0},
		{1, 0, 4, 0},
		{2, 0, 4, 0},
		{2, 0, 8, 0},
		{4, 0, 8, 0},
		{16, 0, 8, 0},
		{16, 0, 16, 0},
		{32, 0, 16, 0},
		{32, 0, 32, 0},
		};

		static void ib_cq_rdma_dim_work(struct work_struct *w)
		{
		struct dim *dim = container_of(w, struct dim, work);

include/linux/dim.h

+0 −13

Original line number	Diff line number	Diff line
		@@ -374,19 +374,6 @@ void net_dim(struct dim *dim, struct dim_sample end_sample);
		#define RDMA_DIM_PARAMS_NUM_PROFILES 9
		#define RDMA_DIM_START_PROFILE 0

		static const struct dim_cq_moder
		rdma_dim_prof[RDMA_DIM_PARAMS_NUM_PROFILES] = {
		{1, 0, 1, 0},
		{1, 0, 4, 0},
		{2, 0, 4, 0},
		{2, 0, 8, 0},
		{4, 0, 8, 0},
		{16, 0, 8, 0},
		{16, 0, 16, 0},
		{32, 0, 16, 0},
		{32, 0, 32, 0},
		};

		/**
		* rdma_dim - Runs the adaptive moderation.
		* @dim: The moderation struct.

Admin message