Add const to various core functions
Subsystems (7)
cover Add const to various core functions
From: Ira Weiny <[email protected]>
In order to support some of Jason's comments to add const to the functions I am adding for OPA the following patches clean up the call trees of the currently defined functions.
They stand on their own as clean up patches. Therefore, I am submitting them separately from the OPA patches.
---
Changes from V1:
Clean up 0-day build
Clean up commit messages
Ira Weiny (3):
IB/core cleanup: Add const to RDMA helpers IB/core cleanup: Add const on args - device->process_mad IB/core cleanup: Add const to args - agent_send_response
drivers/infiniband/core/addr.c | 4 +- drivers/infiniband/core/agent.c | 8 ++-- drivers/infiniband/core/agent.h | 4 +- drivers/infiniband/core/cache.c | 8 ++-- drivers/infiniband/core/verbs.c | 9 +++-- drivers/infiniband/hw/amso1100/c2_provider.c | 6 ++-- drivers/infiniband/hw/cxgb3/iwch_provider.c | 6 ++-- drivers/infiniband/hw/cxgb4/provider.c | 5 ++- drivers/infiniband/hw/ehca/ehca_iverbs.h | 4 +- drivers/infiniband/hw/ehca/ehca_sqp.c | 14 ++++---- drivers/infiniband/hw/ipath/ipath_mad.c | 8 ++-- drivers/infiniband/hw/ipath/ipath_verbs.h | 6 ++-- drivers/infiniband/hw/mlx4/mad.c | 21 +++++++------ drivers/infiniband/hw/mlx4/mlx4_ib.h | 8 ++-- drivers/infiniband/hw/mlx5/mad.c | 8 ++-- drivers/infiniband/hw/mlx5/mlx5_ib.h | 8 ++-- drivers/infiniband/hw/mthca/mthca_cmd.c | 4 +- drivers/infiniband/hw/mthca/mthca_cmd.h | 4 +- drivers/infiniband/hw/mthca/mthca_dev.h | 6 ++-- drivers/infiniband/hw/mthca/mthca_mad.c | 10 +++--- drivers/infiniband/hw/nes/nes_verbs.c | 4 +- drivers/infiniband/hw/ocrdma/ocrdma_ah.c | 6 ++-- drivers/infiniband/hw/ocrdma/ocrdma_ah.h | 6 ++-- drivers/infiniband/hw/qib/qib_mad.c | 10 +++--- drivers/infiniband/hw/qib/qib_verbs.h | 4 +- drivers/net/ethernet/mellanox/mlx5/core/mad.c | 2 +- include/linux/mlx5/driver.h | 2 +- include/rdma/ib_addr.h | 6 ++-- include/rdma/ib_cache.h | 8 ++-- include/rdma/ib_verbs.h | 39 +++++++++++++------------ 30 files changed, 121 insertions(+), 117 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
A message that is not in the archive (sent off-list or not yet received): 1433106931-5215-1-git-send-email-ira.weiny-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org
PATCH 1/3 IB/core cleanup: Add const to RDMA helpers
From: Ira Weiny <[email protected]>
The ib_device passed to the new RDMA helpers is constant. Declare the ib_device as const in the following functions.
rdma_protocol_ibrdma_protocol_rocerdma_protocol_iwarprdma_ib_or_rocerdma_cap_ib_madrdma_cap_ib_smirdma_cap_ib_cmrdma_cap_iw_cmrdma_cap_ib_sardma_cap_ib_mcastrdma_cap_af_ibrdma_cap_eth_ah
---
Changes from V1:
Update commit message
include/rdma/ib_verbs.h | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-)
include/rdma/ib_verbs.h +12 -12
@@ -1831,22 +1831,22 @@ static inline u8 rdma_end_port(const struct ib_device *device) 0 : device->phys_port_cnt; } -static inline bool rdma_protocol_ib (struct ib_device *device,u8 port_num) +static inline bool rdma_protocol_ib (const struct ib_device *device,u8 port_num) {return device->port_immutable[port_num].core_cap_flags &RDMA_CORE_CAP_PROT_IB ; } -static inline bool rdma_protocol_roce (struct ib_device *device,u8 port_num) +static inline bool rdma_protocol_roce (const struct ib_device *device,u8 port_num) {return device->port_immutable[port_num].core_cap_flags &RDMA_CORE_CAP_PROT_ROCE ; } -static inline bool rdma_protocol_iwarp (struct ib_device *device,u8 port_num) +static inline bool rdma_protocol_iwarp (const struct ib_device *device,u8 port_num) {return device->port_immutable[port_num].core_cap_flags &RDMA_CORE_CAP_PROT_IWARP ; } -static inline bool rdma_ib_or_roce (struct ib_device *device,u8 port_num) +static inline bool rdma_ib_or_roce (const struct ib_device *device,u8 port_num) {return device->port_immutable[port_num].core_cap_flags & (RDMA_CORE_CAP_PROT_IB |RDMA_CORE_CAP_PROT_ROCE );
@@ -1864,7 +1864,7 @@ static inline bool rdma_ib_or_roce(struct ib_device *device, u8 port_num)* * Return: true if the port supports sending/receiving of MAD packets. */ -static inline bool rdma_cap_ib_mad (struct ib_device *device,u8 port_num) +static inline bool rdma_cap_ib_mad (const struct ib_device *device,u8 port_num) {return device->port_immutable[port_num].core_cap_flags &RDMA_CORE_CAP_IB_MAD ; }
@@ -1889,7 +1889,7 @@ static inline bool rdma_cap_ib_mad(struct ib_device *device, u8 port_num)* * Return: true if the port provides an SMI. */ -static inline bool rdma_cap_ib_smi (struct ib_device *device,u8 port_num) +static inline bool rdma_cap_ib_smi (const struct ib_device *device,u8 port_num) {return device->port_immutable[port_num].core_cap_flags &RDMA_CORE_CAP_IB_SMI ; }
@@ -1909,7 +1909,7 @@ static inline bool rdma_cap_ib_smi(struct ib_device *device, u8 port_num)* Return: true if the port supports an IB CM (this does not guarantee that * a CM is actually running however). */ -static inline bool rdma_cap_ib_cm (struct ib_device *device,u8 port_num) +static inline bool rdma_cap_ib_cm (const struct ib_device *device,u8 port_num) {return device->port_immutable[port_num].core_cap_flags &RDMA_CORE_CAP_IB_CM ; }
@@ -1926,7 +1926,7 @@ static inline bool rdma_cap_ib_cm(struct ib_device *device, u8 port_num)* Return: true if the port supports an iWARP CM (this does not guarantee that * a CM is actually running however). */ -static inline bool rdma_cap_iw_cm (struct ib_device *device,u8 port_num) +static inline bool rdma_cap_iw_cm (const struct ib_device *device,u8 port_num) {return device->port_immutable[port_num].core_cap_flags &RDMA_CORE_CAP_IW_CM ; }
@@ -1946,7 +1946,7 @@ static inline bool rdma_cap_iw_cm(struct ib_device *device, u8 port_num)* Administration interface. This does not imply that the SA service is * running locally. */ -static inline bool rdma_cap_ib_sa (struct ib_device *device,u8 port_num) +static inline bool rdma_cap_ib_sa (const struct ib_device *device,u8 port_num) {return device->port_immutable[port_num].core_cap_flags &RDMA_CORE_CAP_IB_SA ; }
@@ -1968,7 +1968,7 @@ static inline bool rdma_cap_ib_sa(struct ib_device *device, u8 port_num)* overhead of registering/unregistering with the SM and tracking of the * total number of queue pairs attached to the multicast group. */ -static inline bool rdma_cap_ib_mcast (struct ib_device *device,u8 port_num) +static inline bool rdma_cap_ib_mcast (const struct ib_device *device,u8 port_num) {return rdma_cap_ib_sa (device, port_num); }
@@ -1986,7 +1986,7 @@ static inline bool rdma_cap_ib_mcast(struct ib_device *device, u8 port_num)* Return: true if the port uses a GID address to identify devices on the * network. */ -static inline bool rdma_cap_af_ib (struct ib_device *device,u8 port_num) +static inline bool rdma_cap_af_ib (const struct ib_device *device,u8 port_num) {return device->port_immutable[port_num].core_cap_flags &RDMA_CORE_CAP_AF_IB ; }
@@ -2007,7 +2007,7 @@ static inline bool rdma_cap_af_ib(struct ib_device *device, u8 port_num)* addition of a Global Route Header built from our Ethernet Address * Handle into our header list for connectionless packets. */ -static inline bool rdma_cap_eth_ah (struct ib_device *device,u8 port_num) +static inline bool rdma_cap_eth_ah (const struct ib_device *device,u8 port_num) {return device->port_immutable[port_num].core_cap_flags &RDMA_CORE_CAP_ETH_AH ; }
Signature · 6 lines
1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH 2/3 IB/core cleanup: Add const on args - device->process_mad
In reply to a message not in the archiveFrom: Ira Weiny <[email protected]>
The process_mad device function declares some parameters as "in". Make those parameters const and adjust the call tree under process_mad in the various drivers accordingly.
---
Changes from V1:
Fix 0-day build warnings on ehca
Update commit message
drivers/infiniband/hw/amso1100/c2_provider.c | 6 +++--- drivers/infiniband/hw/cxgb3/iwch_provider.c | 6 +++--- drivers/infiniband/hw/cxgb4/provider.c | 5 +++-- drivers/infiniband/hw/ehca/ehca_iverbs.h | 4 ++-- drivers/infiniband/hw/ehca/ehca_sqp.c | 14 +++++++------- drivers/infiniband/hw/ipath/ipath_mad.c | 8 ++++---- drivers/infiniband/hw/ipath/ipath_verbs.h | 6 +++--- drivers/infiniband/hw/mlx4/mad.c | 21 +++++++++++---------- drivers/infiniband/hw/mlx4/mlx4_ib.h | 8 ++++---- drivers/infiniband/hw/mlx5/mad.c | 8 ++++---- drivers/infiniband/hw/mlx5/mlx5_ib.h | 8 ++++---- drivers/infiniband/hw/mthca/mthca_cmd.c | 4 ++-- drivers/infiniband/hw/mthca/mthca_cmd.h | 4 ++-- drivers/infiniband/hw/mthca/mthca_dev.h | 6 +++--- drivers/infiniband/hw/mthca/mthca_mad.c | 10 +++++----- drivers/infiniband/hw/nes/nes_verbs.c | 4 ++-- drivers/infiniband/hw/ocrdma/ocrdma_ah.c | 6 +++--- drivers/infiniband/hw/ocrdma/ocrdma_ah.h | 6 +++--- drivers/infiniband/hw/qib/qib_mad.c | 10 +++++----- drivers/infiniband/hw/qib/qib_verbs.h | 4 ++-- drivers/net/ethernet/mellanox/mlx5/core/mad.c | 2 +- include/linux/mlx5/driver.h | 2 +- include/rdma/ib_verbs.h | 6 +++--- 23 files changed, 80 insertions(+), 78 deletions(-)
drivers/infiniband/hw/amso1100/c2_provider.c +3 -3
@@ -582,9 +582,9 @@ static int c2_multicast_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)static int c2_process_mad (struct ib_device *ibdev,int mad_flags,u8 port_num, -struct ib_wc *in_wc, -struct ib_grh *in_grh, -struct ib_mad *in_mad,struct ib_mad *out_mad) +const struct ib_wc *in_wc, +const struct ib_grh *in_grh, +const struct ib_mad *in_mad,struct ib_mad *out_mad) {pr_debug ("%s:%u\n" , __func__, __LINE__);return -ENOSYS ;
drivers/infiniband/hw/cxgb3/iwch_provider.c +3 -3
@@ -85,9 +85,9 @@ static int iwch_multicast_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)static int iwch_process_mad (struct ib_device *ibdev,int mad_flags,u8 port_num, -struct ib_wc *in_wc, -struct ib_grh *in_grh, -struct ib_mad *in_mad,struct ib_mad *out_mad) +const struct ib_wc *in_wc, +const struct ib_grh *in_grh, +const struct ib_mad *in_mad,struct ib_mad *out_mad) {return -ENOSYS ; }
drivers/infiniband/hw/cxgb4/provider.c +3 -2
@@ -80,8 +80,9 @@ static int c4iw_multicast_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid) }static int c4iw_process_mad (struct ib_device *ibdev,int mad_flags, -u8 port_num,struct ib_wc *in_wc, -struct ib_grh *in_grh,struct ib_mad *in_mad, +u8 port_num,const struct ib_wc *in_wc, +const struct ib_grh *in_grh, +const struct ib_mad *in_mad,struct ib_mad *out_mad) {return -ENOSYS ;
drivers/infiniband/hw/ehca/ehca_iverbs.h +2 -2
@@ -191,8 +191,8 @@ int ehca_dealloc_ucontext(struct ib_ucontext *context);int ehca_mmap (struct ib_ucontext *context,struct vm_area_struct *vma);int ehca_process_mad (struct ib_device *ibdev,int mad_flags,u8 port_num, -struct ib_wc *in_wc,struct ib_grh *in_grh, -struct ib_mad *in_mad, +const struct ib_wc *in_wc,const struct ib_grh *in_grh, +const struct ib_mad *in_mad,struct ib_mad *out_mad);void ehca_poll_eqs (unsigned long data);
drivers/infiniband/hw/ehca/ehca_sqp.c +7 -7
@@ -140,10 +140,10 @@ struct vertcfl { } __attribute__ ((packed));static int ehca_process_perf (struct ib_device *ibdev,u8 port_num, -struct ib_wc *in_wc,struct ib_grh *in_grh, -struct ib_mad *in_mad,struct ib_mad *out_mad) +const struct ib_wc *in_wc,const struct ib_grh *in_grh, +const struct ib_mad *in_mad,struct ib_mad *out_mad) { -struct ib_perf *in_perf = (struct ib_perf *)in_mad; +const struct ib_perf *in_perf = (const struct ib_perf *)in_mad;struct ib_perf *out_perf = (struct ib_perf *)out_mad;struct ib_class_port_info *poi = (struct ib_class_port_info *)out_perf->data;
@@ -187,8 +187,8 @@ static int ehca_process_perf(struct ib_device *ibdev, u8 port_num,/* if request was globally routed, copy route info */ if (in_grh) { -struct vertcfl *vertcfl = - (struct vertcfl *)&in_grh->version_tclass_flow; +const struct vertcfl *vertcfl = + (const struct vertcfl *)&in_grh->version_tclass_flow;memcpy (poi->redirect_gid, in_grh->dgid.raw,sizeof (poi->redirect_gid)); tcslfl->tc = vertcfl->tc;
@@ -217,8 +217,8 @@ perf_reply: }int ehca_process_mad (struct ib_device *ibdev,int mad_flags,u8 port_num, -struct ib_wc *in_wc,struct ib_grh *in_grh, -struct ib_mad *in_mad,struct ib_mad *out_mad) +const struct ib_wc *in_wc,const struct ib_grh *in_grh, +const struct ib_mad *in_mad,struct ib_mad *out_mad) {int ret;
drivers/infiniband/hw/ipath/ipath_mad.c +4 -4
@@ -1257,7 +1257,7 @@ static int recv_pma_set_portcounters_ext(struct ib_pma_mad *pmp, }static int process_subn (struct ib_device *ibdev,int mad_flags, -u8 port_num,struct ib_mad *in_mad, +u8 port_num,const struct ib_mad *in_mad,struct ib_mad *out_mad) {struct ib_smp *smp = (struct ib_smp *)out_mad;
@@ -1389,7 +1389,7 @@ bail: }static int process_perf (struct ib_device *ibdev,u8 port_num, -struct ib_mad *in_mad, +const struct ib_mad *in_mad,struct ib_mad *out_mad) {struct ib_pma_mad *pmp = (struct ib_pma_mad *)out_mad;
@@ -1490,8 +1490,8 @@ bail:* This is called by the ib_mad module. */ int ipath_process_mad (struct ib_device *ibdev,int mad_flags,u8 port_num, -struct ib_wc *in_wc,struct ib_grh *in_grh, -struct ib_mad *in_mad,struct ib_mad *out_mad) +const struct ib_wc *in_wc,const struct ib_grh *in_grh, +const struct ib_mad *in_mad,struct ib_mad *out_mad) {int ret;
drivers/infiniband/hw/ipath/ipath_verbs.h +3 -3
@@ -701,9 +701,9 @@ static inline void ipath_schedule_send(struct ipath_qp *qp)int ipath_process_mad (struct ib_device *ibdev,int mad_flags,u8 port_num, -struct ib_wc *in_wc, -struct ib_grh *in_grh, -struct ib_mad *in_mad,struct ib_mad *out_mad); +const struct ib_wc *in_wc, +const struct ib_grh *in_grh, +const struct ib_mad *in_mad,struct ib_mad *out_mad);/* * Compare the lower 24 bits of the two values.
drivers/infiniband/hw/mlx4/mad.c +11 -10
@@ -111,8 +111,9 @@ __be64 mlx4_ib_get_new_demux_tid(struct mlx4_ib_demux_ctx *ctx) }int mlx4_MAD_IFC (struct mlx4_ib_dev *dev,int mad_ifc_flags, -int port,struct ib_wc *in_wc,struct ib_grh *in_grh, -void *in_mad,void *response_mad) +int port,const struct ib_wc *in_wc, +const struct ib_grh *in_grh, +const void *in_mad,void *response_mad) {struct mlx4_cmd_mailbox *inmailbox, *outmailbox;void *inbox;
@@ -220,7 +221,7 @@ static void update_sm_ah(struct mlx4_ib_dev *dev, u8 port_num, u16 lid, u8 sl)* Snoop SM MADs for port info, GUID info, and P_Key table sets, so we can * synthesize LID change, Client-Rereg, GID change, and P_Key change events. */ -static void smp_snoop (struct ib_device *ibdev,u8 port_num,struct ib_mad *mad, +static void smp_snoop (struct ib_device *ibdev,u8 port_num,const struct ib_mad *mad,u16 prev_lid) {struct ib_port_info *pinfo;
@@ -356,7 +357,7 @@ static void node_desc_override(struct ib_device *dev, } } -static void forward_trap (struct mlx4_ib_dev *dev,u8 port_num,struct ib_mad *mad) +static void forward_trap (struct mlx4_ib_dev *dev,u8 port_num,const struct ib_mad *mad) {int qpn = mad->mad_hdr.mgmt_class !=IB_MGMT_CLASS_SUBN_LID_ROUTED ;struct ib_mad_send_buf *send_buf;
@@ -722,8 +723,8 @@ static int mlx4_ib_demux_mad(struct ib_device *ibdev, u8 port, }static int ib_process_mad (struct ib_device *ibdev,int mad_flags,u8 port_num, -struct ib_wc *in_wc,struct ib_grh *in_grh, -struct ib_mad *in_mad,struct ib_mad *out_mad) +const struct ib_wc *in_wc,const struct ib_grh *in_grh, +const struct ib_mad *in_mad,struct ib_mad *out_mad) {u16 slid, prev_lid =0 ;int err;
@@ -825,8 +826,8 @@ static void edit_counter(struct mlx4_counter *cnt, }static int iboe_process_mad (struct ib_device *ibdev,int mad_flags,u8 port_num, -struct ib_wc *in_wc,struct ib_grh *in_grh, -struct ib_mad *in_mad,struct ib_mad *out_mad) +const struct ib_wc *in_wc,const struct ib_grh *in_grh, +const struct ib_mad *in_mad,struct ib_mad *out_mad) {struct mlx4_cmd_mailbox *mailbox;struct mlx4_ib_dev *dev =to_mdev (ibdev);
@@ -866,8 +867,8 @@ static int iboe_process_mad(struct ib_device *ibdev, int mad_flags, u8 port_num, }int mlx4_ib_process_mad (struct ib_device *ibdev,int mad_flags,u8 port_num, -struct ib_wc *in_wc,struct ib_grh *in_grh, -struct ib_mad *in_mad,struct ib_mad *out_mad) +const struct ib_wc *in_wc,const struct ib_grh *in_grh, +const struct ib_mad *in_mad,struct ib_mad *out_mad) {switch (rdma_port_get_link_layer (ibdev, port_num)) {case IB_LINK_LAYER_INFINIBAND :
drivers/infiniband/hw/mlx4/mlx4_ib.h +4 -4
@@ -706,11 +706,11 @@ int mlx4_ib_post_recv(struct ib_qp *ibqp, struct ib_recv_wr *wr, struct ib_recv_wr **bad_wr);int mlx4_MAD_IFC (struct mlx4_ib_dev *dev,int mad_ifc_flags, -int port,struct ib_wc *in_wc,struct ib_grh *in_grh, -void *in_mad,void *response_mad); +int port,const struct ib_wc *in_wc,const struct ib_grh *in_grh, +const void *in_mad,void *response_mad);int mlx4_ib_process_mad (struct ib_device *ibdev,int mad_flags,u8 port_num, -struct ib_wc *in_wc,struct ib_grh *in_grh, -struct ib_mad *in_mad,struct ib_mad *out_mad); +const struct ib_wc *in_wc,const struct ib_grh *in_grh, +const struct ib_mad *in_mad,struct ib_mad *out_mad);int mlx4_ib_mad_init (struct mlx4_ib_dev *dev);void mlx4_ib_mad_cleanup (struct mlx4_ib_dev *dev);
drivers/infiniband/hw/mlx5/mad.c +4 -4
@@ -41,8 +41,8 @@ enum { };int mlx5_MAD_IFC (struct mlx5_ib_dev *dev,int ignore_mkey,int ignore_bkey, -u8 port,struct ib_wc *in_wc,struct ib_grh *in_grh, -void *in_mad,void *response_mad) +u8 port,const struct ib_wc *in_wc,const struct ib_grh *in_grh, +const void *in_mad,void *response_mad) {u8 op_modifier =0 ;
@@ -58,8 +58,8 @@ int mlx5_MAD_IFC(struct mlx5_ib_dev *dev, int ignore_mkey, int ignore_bkey, }int mlx5_ib_process_mad (struct ib_device *ibdev,int mad_flags,u8 port_num, -struct ib_wc *in_wc,struct ib_grh *in_grh, -struct ib_mad *in_mad,struct ib_mad *out_mad) +const struct ib_wc *in_wc,const struct ib_grh *in_grh, +const struct ib_mad *in_mad,struct ib_mad *out_mad) {u16 slid;int err;
drivers/infiniband/hw/mlx5/mlx5_ib.h +4 -4
@@ -525,8 +525,8 @@ void __mlx5_ib_cq_clean(struct mlx5_ib_cq *cq, u32 qpn, struct mlx5_ib_srq *srq)void mlx5_ib_cq_clean (struct mlx5_ib_cq *cq,u32 qpn,struct mlx5_ib_srq *srq);void mlx5_ib_free_srq_wqe (struct mlx5_ib_srq *srq,int wqe_index);int mlx5_MAD_IFC (struct mlx5_ib_dev *dev,int ignore_mkey,int ignore_bkey, -u8 port,struct ib_wc *in_wc,struct ib_grh *in_grh, -void *in_mad,void *response_mad); +u8 port,const struct ib_wc *in_wc,const struct ib_grh *in_grh, +const void *in_mad,void *response_mad);struct ib_ah *create_ib_ah (struct ib_ah_attr *ah_attr,struct mlx5_ib_ah *ah);struct ib_ah *mlx5_ib_create_ah (struct ib_pd *pd,struct ib_ah_attr *ah_attr);
@@ -586,8 +586,8 @@ int mlx5_ib_map_phys_fmr(struct ib_fmr *ibfmr, u64 *page_list,int mlx5_ib_unmap_fmr (struct list_head *fmr_list);int mlx5_ib_fmr_dealloc (struct ib_fmr *ibfmr);int mlx5_ib_process_mad (struct ib_device *ibdev,int mad_flags,u8 port_num, -struct ib_wc *in_wc,struct ib_grh *in_grh, -struct ib_mad *in_mad,struct ib_mad *out_mad); +const struct ib_wc *in_wc,const struct ib_grh *in_grh, +const struct ib_mad *in_mad,struct ib_mad *out_mad);struct ib_xrcd *mlx5_ib_alloc_xrcd (struct ib_device *ibdev,struct ib_ucontext *context,struct ib_udata *udata);
drivers/infiniband/hw/mthca/mthca_cmd.c +2 -2
@@ -1858,8 +1858,8 @@ int mthca_CONF_SPECIAL_QP(struct mthca_dev *dev, int type, u32 qpn) }int mthca_MAD_IFC (struct mthca_dev *dev,int ignore_mkey,int ignore_bkey, -int port,struct ib_wc *in_wc,struct ib_grh *in_grh, -void *in_mad,void *response_mad) +int port,const struct ib_wc *in_wc,const struct ib_grh *in_grh, +const void *in_mad,void *response_mad) {struct mthca_mailbox *inmailbox, *outmailbox;void *inbox;
drivers/infiniband/hw/mthca/mthca_cmd.h +2 -2
@@ -312,8 +312,8 @@ int mthca_QUERY_QP(struct mthca_dev *dev, u32 num, int is_ee, struct mthca_mailbox *mailbox);int mthca_CONF_SPECIAL_QP (struct mthca_dev *dev,int type,u32 qpn);int mthca_MAD_IFC (struct mthca_dev *dev,int ignore_mkey,int ignore_bkey, -int port,struct ib_wc *in_wc,struct ib_grh *in_grh, -void *in_mad,void *response_mad); +int port,const struct ib_wc *in_wc,const struct ib_grh *in_grh, +const void *in_mad,void *response_mad);int mthca_READ_MGM (struct mthca_dev *dev,int index,struct mthca_mailbox *mailbox); int mthca_WRITE_MGM(struct mthca_dev *dev, int index,
drivers/infiniband/hw/mthca/mthca_dev.h +3 -3
@@ -576,9 +576,9 @@ int mthca_multicast_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid);int mthca_process_mad (struct ib_device *ibdev,int mad_flags,u8 port_num, -struct ib_wc *in_wc, -struct ib_grh *in_grh, -struct ib_mad *in_mad, +const struct ib_wc *in_wc, +const struct ib_grh *in_grh, +const struct ib_mad *in_mad,struct ib_mad *out_mad);int mthca_create_agents (struct mthca_dev *dev);void mthca_free_agents (struct mthca_dev *dev);
drivers/infiniband/hw/mthca/mthca_mad.c +5 -5
@@ -104,7 +104,7 @@ static void update_sm_ah(struct mthca_dev *dev,*/ static void smp_snoop (struct ib_device *ibdev,u8 port_num, -struct ib_mad *mad, +const struct ib_mad *mad,u16 prev_lid) {struct ib_event event;
@@ -160,7 +160,7 @@ static void node_desc_override(struct ib_device *dev,static void forward_trap (struct mthca_dev *dev,u8 port_num, -struct ib_mad *mad) +const struct ib_mad *mad) {int qpn = mad->mad_hdr.mgmt_class !=IB_MGMT_CLASS_SUBN_LID_ROUTED ;struct ib_mad_send_buf *send_buf;
@@ -195,9 +195,9 @@ static void forward_trap(struct mthca_dev *dev,int mthca_process_mad (struct ib_device *ibdev,int mad_flags,u8 port_num, -struct ib_wc *in_wc, -struct ib_grh *in_grh, -struct ib_mad *in_mad, +const struct ib_wc *in_wc, +const struct ib_grh *in_grh, +const struct ib_mad *in_mad,struct ib_mad *out_mad) {int err;
drivers/infiniband/hw/nes/nes_verbs.c +2 -2
@@ -3221,8 +3221,8 @@ static int nes_multicast_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)* nes_process_mad */ static int nes_process_mad (struct ib_device *ibdev,int mad_flags, -u8 port_num,struct ib_wc *in_wc,struct ib_grh *in_grh, -struct ib_mad *in_mad,struct ib_mad *out_mad) +u8 port_num,const struct ib_wc *in_wc,const struct ib_grh *in_grh, +const struct ib_mad *in_mad,struct ib_mad *out_mad) {nes_debug (NES_DBG_INIT ,"\n" );return -ENOSYS ;
drivers/infiniband/hw/ocrdma/ocrdma_ah.c +3 -3
@@ -196,9 +196,9 @@ int ocrdma_modify_ah(struct ib_ah *ibah, struct ib_ah_attr *attr)int ocrdma_process_mad (struct ib_device *ibdev,int process_mad_flags,u8 port_num, -struct ib_wc *in_wc, -struct ib_grh *in_grh, -struct ib_mad *in_mad,struct ib_mad *out_mad) +const struct ib_wc *in_wc, +const struct ib_grh *in_grh, +const struct ib_mad *in_mad,struct ib_mad *out_mad) {int status;struct ocrdma_dev *dev;
drivers/infiniband/hw/ocrdma/ocrdma_ah.h +3 -3
@@ -42,7 +42,7 @@ int ocrdma_modify_ah(struct ib_ah *, struct ib_ah_attr *);int ocrdma_process_mad (struct ib_device *,int process_mad_flags,u8 port_num, -struct ib_wc *in_wc, -struct ib_grh *in_grh, -struct ib_mad *in_mad,struct ib_mad *out_mad); +const struct ib_wc *in_wc, +const struct ib_grh *in_grh, +const struct ib_mad *in_mad,struct ib_mad *out_mad);#endif /* __OCRDMA_AH_H__ */
drivers/infiniband/hw/qib/qib_mad.c +5 -5
@@ -1854,7 +1854,7 @@ static int pma_set_portcounters_ext(struct ib_pma_mad *pmp, }static int process_subn (struct ib_device *ibdev,int mad_flags, -u8 port,struct ib_mad *in_mad, +u8 port,const struct ib_mad *in_mad,struct ib_mad *out_mad) {struct ib_smp *smp = (struct ib_smp *)out_mad;
@@ -2006,7 +2006,7 @@ bail: }static int process_perf (struct ib_device *ibdev,u8 port, -struct ib_mad *in_mad, +const struct ib_mad *in_mad,struct ib_mad *out_mad) {struct ib_pma_mad *pmp = (struct ib_pma_mad *)out_mad;
@@ -2299,7 +2299,7 @@ static int check_cc_key(struct qib_ibport *ibp, }static int process_cc (struct ib_device *ibdev,int mad_flags, -u8 port,struct ib_mad *in_mad, +u8 port,const struct ib_mad *in_mad,struct ib_mad *out_mad) {struct ib_cc_mad *ccp = (struct ib_cc_mad *)out_mad;
@@ -2400,8 +2400,8 @@ bail:* This is called by the ib_mad module. */ int qib_process_mad (struct ib_device *ibdev,int mad_flags,u8 port, -struct ib_wc *in_wc,struct ib_grh *in_grh, -struct ib_mad *in_mad,struct ib_mad *out_mad) +const struct ib_wc *in_wc,const struct ib_grh *in_grh, +const struct ib_mad *in_mad,struct ib_mad *out_mad) {int ret;struct qib_ibport *ibp =to_iport (ibdev, port);
drivers/infiniband/hw/qib/qib_verbs.h +2 -2
@@ -872,8 +872,8 @@ void qib_cap_mask_chg(struct qib_ibport *ibp);void qib_sys_guid_chg (struct qib_ibport *ibp);void qib_node_desc_chg (struct qib_ibport *ibp);int qib_process_mad (struct ib_device *ibdev,int mad_flags,u8 port_num, -struct ib_wc *in_wc,struct ib_grh *in_grh, -struct ib_mad *in_mad,struct ib_mad *out_mad); +const struct ib_wc *in_wc,const struct ib_grh *in_grh, +const struct ib_mad *in_mad,struct ib_mad *out_mad);int qib_create_agents (struct qib_ibdev *dev);void qib_free_agents (struct qib_ibdev *dev);
drivers/net/ethernet/mellanox/mlx5/core/mad.c +1 -1
@@ -36,7 +36,7 @@#include <linux/mlx5/cmd.h> #include "mlx5_core.h" -int mlx5_core_mad_ifc (struct mlx5_core_dev *dev,void *inb,void *outb, +int mlx5_core_mad_ifc (struct mlx5_core_dev *dev,const void *inb,void *outb,u16 opmod,u8 port) {struct mlx5_mad_ifc_mbox_in *in =NULL ;
include/linux/mlx5/driver.h +1 -1
@@ -696,7 +696,7 @@ int mlx5_core_dump_fill_mkey(struct mlx5_core_dev *dev, struct mlx5_core_mr *mr, u32 *mkey);int mlx5_core_alloc_pd (struct mlx5_core_dev *dev,u32 *pdn);int mlx5_core_dealloc_pd (struct mlx5_core_dev *dev,u32 pdn); -int mlx5_core_mad_ifc (struct mlx5_core_dev *dev,void *inb,void *outb, +int mlx5_core_mad_ifc (struct mlx5_core_dev *dev,const void *inb,void *outb,u16 opmod,u8 port);void mlx5_pagealloc_init (struct mlx5_core_dev *dev);void mlx5_pagealloc_cleanup (struct mlx5_core_dev *dev);
include/rdma/ib_verbs.h +3 -3
@@ -1690,9 +1690,9 @@ struct ib_device {int (*process_mad)(struct ib_device *device,int process_mad_flags,u8 port_num, -struct ib_wc *in_wc, -struct ib_grh *in_grh, -struct ib_mad *in_mad, +const struct ib_wc *in_wc, +const struct ib_grh *in_grh, +const struct ib_mad *in_mad,struct ib_mad *out_mad); struct ib_xrcd * (*alloc_xrcd)(struct ib_device *device, struct ib_ucontext *ucontext,
Signature · 6 lines
1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH 3/3 IB/core cleanup: Add const to args - agent_send_response
In reply to a message not in the archiveFrom: Ira Weiny <[email protected]>
In order to support constant callers of agent_send_response we add const specifiers to the its pointer arguments.
Adjust the call tree accordingly.
---
Changes from V1:
Update commit message
drivers/infiniband/core/addr.c | 4 ++-- drivers/infiniband/core/agent.c | 8 ++++---- drivers/infiniband/core/agent.h | 4 ++-- drivers/infiniband/core/cache.c | 8 ++++---- drivers/infiniband/core/verbs.c | 9 +++++---- include/rdma/ib_addr.h | 6 +++--- include/rdma/ib_cache.h | 8 ++++---- include/rdma/ib_verbs.h | 9 +++++---- 8 files changed, 29 insertions(+), 27 deletions(-)
drivers/infiniband/core/addr.c +2 -2
@@ -457,8 +457,8 @@ static void resolve_cb(int status, struct sockaddr *src_addr,complete (&((struct resolve_cb_context *)context)->comp); } -int rdma_addr_find_dmac_by_grh (union ib_gid *sgid,union ib_gid *dgid,u8 *dmac, -u16 *vlan_id) +int rdma_addr_find_dmac_by_grh (const union ib_gid *sgid,const union ib_gid *dgid, +u8 *dmac,u16 *vlan_id) {int ret =0 ;struct rdma_dev_addr dev_addr;
drivers/infiniband/core/agent.c +4 -4
@@ -54,7 +54,7 @@ static DEFINE_SPINLOCK(ib_agent_port_list_lock);static LIST_HEAD (ib_agent_port_list);static struct ib_agent_port_private * -__ib_get_agent_port (struct ib_device *device,int port_num) +__ib_get_agent_port (const struct ib_device *device,int port_num) {struct ib_agent_port_private *entry;
@@ -67,7 +67,7 @@ __ib_get_agent_port(struct ib_device *device, int port_num) }static struct ib_agent_port_private * -ib_get_agent_port (struct ib_device *device,int port_num) +ib_get_agent_port (const struct ib_device *device,int port_num) {struct ib_agent_port_private *entry;unsigned long flags;
@@ -78,8 +78,8 @@ ib_get_agent_port(struct ib_device *device, int port_num)return entry; } -void agent_send_response (struct ib_mad *mad,struct ib_grh *grh, -struct ib_wc *wc,struct ib_device *device, +void agent_send_response (const struct ib_mad *mad,const struct ib_grh *grh, +const struct ib_wc *wc,const struct ib_device *device,int port_num,int qpn) {struct ib_agent_port_private *port_priv;
drivers/infiniband/core/agent.h +2 -2
@@ -44,8 +44,8 @@ extern int ib_agent_port_open(struct ib_device *device, int port_num);extern int ib_agent_port_close (struct ib_device *device,int port_num); -extern void agent_send_response (struct ib_mad *mad,struct ib_grh *grh, -struct ib_wc *wc,struct ib_device *device, +extern void agent_send_response (const struct ib_mad *mad,const struct ib_grh *grh, +const struct ib_wc *wc,const struct ib_device *device,int port_num,int qpn);#endif /* __AGENT_H_ */
drivers/infiniband/core/cache.c +4 -4
@@ -85,10 +85,10 @@ int ib_get_cached_gid(struct ib_device *device, }EXPORT_SYMBOL (ib_get_cached_gid); -int ib_find_cached_gid (struct ib_device *device, -union ib_gid *gid, -u8 *port_num, -u16 *index) +int ib_find_cached_gid (struct ib_device *device, +const union ib_gid *gid, +u8 *port_num, +u16 *index) {struct ib_gid_cache *cache;unsigned long flags;
drivers/infiniband/core/verbs.c +5 -4
@@ -257,8 +257,9 @@ struct ib_ah *ib_create_ah(struct ib_pd *pd, struct ib_ah_attr *ah_attr) }EXPORT_SYMBOL (ib_create_ah); -int ib_init_ah_from_wc (struct ib_device *device,u8 port_num,struct ib_wc *wc, -struct ib_grh *grh,struct ib_ah_attr *ah_attr) +int ib_init_ah_from_wc (struct ib_device *device,u8 port_num, +const struct ib_wc *wc,const struct ib_grh *grh, +struct ib_ah_attr *ah_attr) {u32 flow_class;u16 gid_index;
@@ -307,8 +308,8 @@ int ib_init_ah_from_wc(struct ib_device *device, u8 port_num, struct ib_wc *wc, }EXPORT_SYMBOL (ib_init_ah_from_wc); -struct ib_ah *ib_create_ah_from_wc (struct ib_pd *pd,struct ib_wc *wc, -struct ib_grh *grh,u8 port_num) +struct ib_ah *ib_create_ah_from_wc (struct ib_pd *pd,const struct ib_wc *wc, +const struct ib_grh *grh,u8 port_num) {struct ib_ah_attr ah_attr;int ret;
include/rdma/ib_addr.h +3 -3
@@ -111,8 +111,8 @@ int rdma_copy_addr(struct rdma_dev_addr *dev_addr, struct net_device *dev,int rdma_addr_size (struct sockaddr *addr);int rdma_addr_find_smac_by_sgid (union ib_gid *sgid,u8 *smac,u16 *vlan_id); -int rdma_addr_find_dmac_by_grh (union ib_gid *sgid,union ib_gid *dgid,u8 *smac, -u16 *vlan_id); +int rdma_addr_find_dmac_by_grh (const union ib_gid *sgid,const union ib_gid *dgid, +u8 *smac,u16 *vlan_id);static inline u16 ib_addr_get_pkey (struct rdma_dev_addr *dev_addr) {
@@ -160,7 +160,7 @@ static inline int rdma_ip2gid(struct sockaddr *addr, union ib_gid *gid) }/* Important - sockaddr should be a union of sockaddr_in and sockaddr_in6 */ -static inline void rdma_gid2ip (struct sockaddr *out,union ib_gid *gid) +static inline void rdma_gid2ip (struct sockaddr *out,const union ib_gid *gid) {if (ipv6_addr_v4mapped ((struct in6_addr *)gid)) {struct sockaddr_in *out_in = (struct sockaddr_in *)out;
include/rdma/ib_cache.h +4 -4
@@ -64,10 +64,10 @@ int ib_get_cached_gid(struct ib_device *device,* ib_find_cached_gid() searches for the specified GID value in * the local software cache. */ -int ib_find_cached_gid (struct ib_device *device, -union ib_gid *gid, -u8 *port_num, -u16 *index); +int ib_find_cached_gid (struct ib_device *device, +const union ib_gid *gid, +u8 *port_num, +u16 *index);/** * ib_get_cached_pkey - Returns a cached PKey table entry
include/rdma/ib_verbs.h +5 -4
@@ -2096,8 +2096,9 @@ struct ib_ah *ib_create_ah(struct ib_pd *pd, struct ib_ah_attr *ah_attr);* @ah_attr: Returned attributes that can be used when creating an address * handle for replying to the message. */ -int ib_init_ah_from_wc (struct ib_device *device,u8 port_num,struct ib_wc *wc, -struct ib_grh *grh,struct ib_ah_attr *ah_attr); +int ib_init_ah_from_wc (struct ib_device *device,u8 port_num, +const struct ib_wc *wc,const struct ib_grh *grh, +struct ib_ah_attr *ah_attr);/** * ib_create_ah_from_wc - Creates an address handle associated with the
@@ -2111,8 +2112,8 @@ int ib_init_ah_from_wc(struct ib_device *device, u8 port_num, struct ib_wc *wc,* The address handle is used to reference a local or global destination * in all UD QP post sends. */ -struct ib_ah *ib_create_ah_from_wc (struct ib_pd *pd,struct ib_wc *wc, -struct ib_grh *grh,u8 port_num); +struct ib_ah *ib_create_ah_from_wc (struct ib_pd *pd,const struct ib_wc *wc, +const struct ib_grh *grh,u8 port_num);/** * ib_modify_ah - Modifies the address vector associated with an address
Signature · 6 lines
1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Hal Rosenstock
Reviewed-byQuoted 42 lines · On 5/31/2015 5:15 PM, [email protected] wrote:
From: Ira Weiny <[email protected]>
In order to support some of Jason's comments to add const to the functions I am adding for OPA the following patches clean up the call trees of the currently defined functions.
They stand on their own as clean up patches. Therefore, I am submitting them separately from the OPA patches.
---
Changes from V1:
Clean up 0-day build
Clean up commit messagesIra Weiny (3):
IB/core cleanup: Add const to RDMA helpers IB/core cleanup: Add const on args -device->process_madIB/core cleanup: Add const to args -agent_send_responsedrivers/infiniband/core/addr.c | 4 +- drivers/infiniband/core/agent.c | 8 ++-- drivers/infiniband/core/agent.h | 4 +- drivers/infiniband/core/cache.c | 8 ++-- drivers/infiniband/core/verbs.c | 9 +++-- drivers/infiniband/hw/amso1100/c2_provider.c | 6 ++-- drivers/infiniband/hw/cxgb3/iwch_provider.c | 6 ++-- drivers/infiniband/hw/cxgb4/provider.c | 5 ++- drivers/infiniband/hw/ehca/ehca_iverbs.h | 4 +- drivers/infiniband/hw/ehca/ehca_sqp.c | 14 ++++---- drivers/infiniband/hw/ipath/ipath_mad.c | 8 ++-- drivers/infiniband/hw/ipath/ipath_verbs.h | 6 ++-- drivers/infiniband/hw/mlx4/mad.c | 21 +++++++------ drivers/infiniband/hw/mlx4/mlx4_ib.h | 8 ++-- drivers/infiniband/hw/mlx5/mad.c | 8 ++-- drivers/infiniband/hw/mlx5/mlx5_ib.h | 8 ++-- drivers/infiniband/hw/mthca/mthca_cmd.c | 4 +- drivers/infiniband/hw/mthca/mthca_cmd.h | 4 +- drivers/infiniband/hw/mthca/mthca_dev.h | 6 ++-- drivers/infiniband/hw/mthca/mthca_mad.c | 10 +++--- drivers/infiniband/hw/nes/nes_verbs.c | 4 +- drivers/infiniband/hw/ocrdma/ocrdma_ah.c | 6 ++-- drivers/infiniband/hw/ocrdma/ocrdma_ah.h | 6 ++--
Quoted 8 lines
drivers/infiniband/hw/qib/qib_mad.c | 10 +++--- drivers/infiniband/hw/qib/qib_verbs.h | 4 +- drivers/net/ethernet/mellanox/mlx5/core/mad.c | 2 +- include/linux/mlx5/driver.h | 2 +- include/rdma/ib_addr.h | 6 ++-- include/rdma/ib_cache.h | 8 ++-- include/rdma/ib_verbs.h | 39 +++++++++++++------------ 30 files changed, 121 insertions(+), 117 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Jason Gunthorpe
Reviewed-byQuoted 5 lines · On Sun, May 31, 2015 at 05:15:28PM -0400…
From: Ira Weiny <[email protected]>
In order to support some of Jason's comments to add const to the functions I am adding for OPA the following patches clean up the call trees of the currently defined functions.
This is longer than I imagined, but looks good.
Jason
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html