| Message ID | cb135696be86c21c144ef35a4d6f7f71394a3627.1477003235.git.swise@opengridcomputing.com (mailing list archive) |
|---|---|
| State | RFC |
| Headers | show |
On Thu, Oct 20, 2016 at 03:40:26PM -0700, Steve Wise wrote: > Return true if the peer consumer application rejected the > connection attempt. > > Signed-off-by: Steve Wise <swise@opengridcomputing.com> > --- > drivers/infiniband/core/cma.c | 13 +++++++++++++ > include/rdma/ib_cm.h | 9 +++++++++ > include/rdma/iw_cm.h | 9 +++++++++ > include/rdma/rdma_cm.h | 6 ++++++ > 4 files changed, 37 insertions(+) > > diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c > index 7cc7346..4ec16a3 100644 > --- a/drivers/infiniband/core/cma.c > +++ b/drivers/infiniband/core/cma.c > @@ -114,6 +114,19 @@ const char *__attribute_const__ rdma_reject_msg(struct rdma_cm_id *id, > } > EXPORT_SYMBOL(rdma_reject_msg); > > +bool rdma_consumer_reject(struct rdma_cm_id *id, int reason) > +{ > + if (rdma_ib_or_roce(id->device, id->port_num)) > + return ib_consumer_reject(reason); > + > + if (rdma_protocol_iwarp(id->device, id->port_num)) > + return iw_consumer_reject(reason); > + > + /* FIXME should we WARN_ONCE() here? */ > + return false; Yes. Also I'd just inline the ib_consumer_reject and iw_consumer_reject helpers here. Aso wouldn't it be better named rdma_consumer_is_reject or similar given that we don't reject anything here, but check if the request has been rejected? -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
> > On Thu, Oct 20, 2016 at 03:40:26PM -0700, Steve Wise wrote: > > Return true if the peer consumer application rejected the > > connection attempt. > > > > Signed-off-by: Steve Wise <swise@opengridcomputing.com> > > --- > > drivers/infiniband/core/cma.c | 13 +++++++++++++ > > include/rdma/ib_cm.h | 9 +++++++++ > > include/rdma/iw_cm.h | 9 +++++++++ > > include/rdma/rdma_cm.h | 6 ++++++ > > 4 files changed, 37 insertions(+) > > > > diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c > > index 7cc7346..4ec16a3 100644 > > --- a/drivers/infiniband/core/cma.c > > +++ b/drivers/infiniband/core/cma.c > > @@ -114,6 +114,19 @@ const char *__attribute_const__ > rdma_reject_msg(struct rdma_cm_id *id, > > } > > EXPORT_SYMBOL(rdma_reject_msg); > > > > +bool rdma_consumer_reject(struct rdma_cm_id *id, int reason) > > +{ > > + if (rdma_ib_or_roce(id->device, id->port_num)) > > + return ib_consumer_reject(reason); > > + > > + if (rdma_protocol_iwarp(id->device, id->port_num)) > > + return iw_consumer_reject(reason); > > + > > + /* FIXME should we WARN_ONCE() here? */ > > + return false; > > Yes. Also I'd just inline the ib_consumer_reject and iw_consumer_reject > helpers here. > > Aso wouldn't it be better named rdma_consumer_is_reject or similar > given that we don't reject anything here, but check if the request > has been rejected? How about rdma_rejected_by_consumer()? -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Oct 21, 2016 at 7:39 PM, Steve Wise <swise@opengridcomputing.com> wrote: >> >> On Thu, Oct 20, 2016 at 03:40:26PM -0700, Steve Wise wrote: >> > Return true if the peer consumer application rejected the >> > connection attempt. >> > >> > Signed-off-by: Steve Wise <swise@opengridcomputing.com> >> > --- >> > drivers/infiniband/core/cma.c | 13 +++++++++++++ >> > include/rdma/ib_cm.h | 9 +++++++++ >> > include/rdma/iw_cm.h | 9 +++++++++ >> > include/rdma/rdma_cm.h | 6 ++++++ >> > 4 files changed, 37 insertions(+) >> > >> > diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c >> > index 7cc7346..4ec16a3 100644 >> > --- a/drivers/infiniband/core/cma.c >> > +++ b/drivers/infiniband/core/cma.c >> > @@ -114,6 +114,19 @@ const char *__attribute_const__ >> rdma_reject_msg(struct rdma_cm_id *id, >> > } >> > EXPORT_SYMBOL(rdma_reject_msg); >> > >> > +bool rdma_consumer_reject(struct rdma_cm_id *id, int reason) >> > +{ >> > + if (rdma_ib_or_roce(id->device, id->port_num)) >> > + return ib_consumer_reject(reason); >> > + >> > + if (rdma_protocol_iwarp(id->device, id->port_num)) >> > + return iw_consumer_reject(reason); >> > + >> > + /* FIXME should we WARN_ONCE() here? */ >> > + return false; >> >> Yes. Also I'd just inline the ib_consumer_reject and iw_consumer_reject >> helpers here. >> >> Aso wouldn't it be better named rdma_consumer_is_reject or similar >> given that we don't reject anything here, but check if the request >> has been rejected? > > How about rdma_rejected_by_consumer()? > How about rdma_reject_by_ulp()? We have ulp directory holding iser, srp etc. -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
>>> Yes. Also I'd just inline the ib_consumer_reject and iw_consumer_reject >>> helpers here. >>> >>> Aso wouldn't it be better named rdma_consumer_is_reject or similar >>> given that we don't reject anything here, but check if the request >>> has been rejected? >> >> How about rdma_rejected_by_consumer()? >> > How about rdma_reject_by_ulp()? > We have ulp directory holding iser, srp etc. I like consumer better. -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
> > --- a/drivers/infiniband/core/cma.c > > +++ b/drivers/infiniband/core/cma.c > > @@ -114,6 +114,19 @@ const char *__attribute_const__ > rdma_reject_msg(struct rdma_cm_id *id, > > } > > EXPORT_SYMBOL(rdma_reject_msg); > > > > +bool rdma_consumer_reject(struct rdma_cm_id *id, int reason) > > +{ > > + if (rdma_ib_or_roce(id->device, id->port_num)) > > + return ib_consumer_reject(reason); > > + > > + if (rdma_protocol_iwarp(id->device, id->port_num)) > > + return iw_consumer_reject(reason); > > + > > + /* FIXME should we WARN_ONCE() here? */ > > + return false; > > Yes. Also I'd just inline the ib_consumer_reject and iw_consumer_reject > helpers here. > Why is that preferred vs the static inline functions in ib_cm.h and iw_cm.h? -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c index 7cc7346..4ec16a3 100644 --- a/drivers/infiniband/core/cma.c +++ b/drivers/infiniband/core/cma.c @@ -114,6 +114,19 @@ const char *__attribute_const__ rdma_reject_msg(struct rdma_cm_id *id, } EXPORT_SYMBOL(rdma_reject_msg); +bool rdma_consumer_reject(struct rdma_cm_id *id, int reason) +{ + if (rdma_ib_or_roce(id->device, id->port_num)) + return ib_consumer_reject(reason); + + if (rdma_protocol_iwarp(id->device, id->port_num)) + return iw_consumer_reject(reason); + + /* FIXME should we WARN_ONCE() here? */ + return false; +} +EXPORT_SYMBOL(rdma_consumer_reject); + static void cma_add_one(struct ib_device *device); static void cma_remove_one(struct ib_device *device, void *client_data); diff --git a/include/rdma/ib_cm.h b/include/rdma/ib_cm.h index af193b7..5595529 100644 --- a/include/rdma/ib_cm.h +++ b/include/rdma/ib_cm.h @@ -609,4 +609,13 @@ int ib_send_cm_sidr_rep(struct ib_cm_id *cm_id, */ const char *__attribute_const__ ib_reject_msg(int reason); +/** + * ib_consumer_reject - return true if the user rejected the connection. + * @reason: Value returned in the REJECT event status field. + */ +static inline bool ib_consumer_reject(int reason) +{ + return reason == IB_CM_REJ_CONSUMER_DEFINED; +}; + #endif /* IB_CM_H */ diff --git a/include/rdma/iw_cm.h b/include/rdma/iw_cm.h index 15b437e..1e5bd33 100644 --- a/include/rdma/iw_cm.h +++ b/include/rdma/iw_cm.h @@ -259,4 +259,13 @@ int iw_cm_init_qp_attr(struct iw_cm_id *cm_id, struct ib_qp_attr *qp_attr, */ const char *__attribute_const__ iw_reject_msg(int reason); +/** + * iw_consumer_reject - return true if the consumer rejected the connection. + * @reason: Value returned in the REJECT event status field. + */ +static inline bool iw_consumer_reject(int reason) +{ + return reason == -ECONNREFUSED; +} + #endif /* IW_CM_H */ diff --git a/include/rdma/rdma_cm.h b/include/rdma/rdma_cm.h index 712a70c..058dfbb 100644 --- a/include/rdma/rdma_cm.h +++ b/include/rdma/rdma_cm.h @@ -395,5 +395,11 @@ __be64 rdma_get_service_id(struct rdma_cm_id *id, struct sockaddr *addr); */ const char *__attribute_const__ rdma_reject_msg(struct rdma_cm_id *id, int reason); +/** + * rdma_consumer_reject - return true if the consumer rejected the connection. + * @id: Communication identifier that received the REJECT event + * @reason: Value returned in the REJECT event status field. + */ +bool rdma_consumer_reject(struct rdma_cm_id *id, int reason); #endif /* RDMA_CM_H */
Return true if the peer consumer application rejected the connection attempt. Signed-off-by: Steve Wise <swise@opengridcomputing.com> --- drivers/infiniband/core/cma.c | 13 +++++++++++++ include/rdma/ib_cm.h | 9 +++++++++ include/rdma/iw_cm.h | 9 +++++++++ include/rdma/rdma_cm.h | 6 ++++++ 4 files changed, 37 insertions(+)