Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DAOS-14484 cart: Implement per-context inflight queue #13202

Merged
merged 23 commits into from
Jan 4, 2024
Merged

DAOS-14484 cart: Implement per-context inflight queue #13202

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
766df28
initial changes
frostedcmos Oct 10, 2023
f2b7192
- Add per-context quotas
frostedcmos Oct 19, 2023
7e46893
Merge branch 'master' into aaoganez/DAOS-14484
frostedcmos Oct 19, 2023
39db446
- update test_gurt to include new errors
frostedcmos Oct 19, 2023
94087bd
- Change the check of ep credits to account for rpcs queued in the waitq
frostedcmos Oct 19, 2023
0914730
- rename crt_quota_t -> crt_quota_type_t
frostedcmos Oct 21, 2023
0f82132
- Instead of release/re-request quota upon one rpc completion, keep
frostedcmos Oct 23, 2023
559fcb3
Merge branch 'master' into aaoganez/DAOS-14484
frostedcmos Oct 24, 2023
8d121b5
modify quota limit for a debug and add warning print
frostedcmos Oct 24, 2023
343c2e5
Merge branch 'master' into aaoganez/DAOS-14484
frostedcmos Nov 13, 2023
8b15d48
Merge branch 'master' into aaoganez/DAOS-14484
frostedcmos Nov 30, 2023
3229a82
Cleanup and refactoring a bit:
frostedcmos Dec 1, 2023
1f56841
Merge branch 'master' into aaoganez/DAOS-14484
frostedcmos Dec 1, 2023
59f45dc
Add lock around dequeue
frostedcmos Dec 5, 2023
3912044
Merge branch 'master' into aaoganez/DAOS-14484
frostedcmos Dec 11, 2023
c6820ce
- cleanup
frostedcmos Dec 11, 2023
d8fc6c9
fix
frostedcmos Dec 11, 2023
f561648
- disable quotas by default on engines
frostedcmos Dec 12, 2023
d37c9a5
Merge branch 'master' into aaoganez/DAOS-14484
frostedcmos Dec 13, 2023
45463df
- fix incorrect check
frostedcmos Dec 13, 2023
fe2543e
Merge branch 'master' into aaoganez/DAOS-14484
frostedcmos Dec 29, 2023
9010e17
- 'current' quota changed to atomic. locks removed
frostedcmos Dec 29, 2023
584aaf7
- change check to assert for null rpc
frostedcmos Dec 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
279 changes: 247 additions & 32 deletions src/cart/crt_context.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,13 @@ crt_context_init(crt_context_t crt_ctx)
if (rc != 0)
D_GOTO(out, rc);

rc = D_MUTEX_INIT(&ctx->cc_quotas.mutex, NULL);
if (rc != 0) {
D_MUTEX_DESTROY(&ctx->cc_mutex);
D_GOTO(out, rc);
}

D_INIT_LIST_HEAD(&ctx->cc_quotas.rpc_waitq);
D_INIT_LIST_HEAD(&ctx->cc_link);

/* create timeout binheap */
Expand All @@ -162,6 +169,8 @@ crt_context_init(crt_context_t crt_ctx)
D_GOTO(out_binheap_destroy, rc);
}

rc = crt_context_quotas_init(crt_ctx);

D_GOTO(out, rc);

out_binheap_destroy:
Expand Down Expand Up @@ -1167,6 +1176,7 @@ crt_context_req_track(struct crt_rpc_priv *rpc_priv)
d_list_t *rlink;
d_rank_t ep_rank;
int rc = 0;
int quota_rc = 0;
struct crt_grp_priv *grp_priv;

D_ASSERT(crt_ctx != NULL);
Expand All @@ -1177,6 +1187,10 @@ crt_context_req_track(struct crt_rpc_priv *rpc_priv)
D_GOTO(out, rc = CRT_REQ_TRACK_IN_INFLIGHQ);
}

/* check inflight quota. if exceeded, queue this rpc */
quota_rc = crt_context_get_quota_resource(rpc_priv->crp_pub.cr_ctx,
CRT_QUOTA_RPC_INFLIGHT);

grp_priv = crt_grp_pub2priv(rpc_priv->crp_pub.cr_ep.ep_grp);
ep_rank = crt_grp_priv_get_primary_rank(grp_priv,
rpc_priv->crp_pub.cr_ep.ep_rank);
Expand Down Expand Up @@ -1221,22 +1235,24 @@ crt_context_req_track(struct crt_rpc_priv *rpc_priv)
}
D_MUTEX_UNLOCK(&crt_ctx->cc_mutex);


/* add the RPC req to crt_ep_inflight */
D_MUTEX_LOCK(&epi->epi_mutex);
D_ASSERT(epi->epi_req_num >= epi->epi_reply_num);
crt_set_timeout(rpc_priv);
rpc_priv->crp_epi = epi;
RPC_ADDREF(rpc_priv);

if (crt_gdata.cg_credit_ep_ctx != 0 &&
if (quota_rc == -DER_QUOTA_LIMIT) {
epi->epi_req_num++;
rpc_priv->crp_state = RPC_STATE_QUEUED;
rc = CRT_REQ_TRACK_IN_WAITQ;
} else if (crt_gdata.cg_credit_ep_ctx != 0 &&
(epi->epi_req_num - epi->epi_reply_num) >= crt_gdata.cg_credit_ep_ctx) {
if (rpc_priv->crp_opc_info->coi_queue_front) {
d_list_add(&rpc_priv->crp_epi_link,
&epi->epi_req_waitq);
} else {
d_list_add_tail(&rpc_priv->crp_epi_link,
&epi->epi_req_waitq);
}
if (rpc_priv->crp_opc_info->coi_queue_front)
d_list_add(&rpc_priv->crp_epi_link, &epi->epi_req_waitq);
else
d_list_add_tail(&rpc_priv->crp_epi_link, &epi->epi_req_waitq);

epi->epi_req_wait_num++;
rpc_priv->crp_state = RPC_STATE_QUEUED;
Expand All @@ -1246,13 +1262,11 @@ crt_context_req_track(struct crt_rpc_priv *rpc_priv)
rc = crt_req_timeout_track(rpc_priv);
D_MUTEX_UNLOCK(&crt_ctx->cc_mutex);
if (rc == 0) {
d_list_add_tail(&rpc_priv->crp_epi_link,
&epi->epi_req_q);
d_list_add_tail(&rpc_priv->crp_epi_link, &epi->epi_req_q);
epi->epi_req_num++;
rc = CRT_REQ_TRACK_IN_INFLIGHQ;
} else {
RPC_ERROR(rpc_priv,
"crt_req_timeout_track failed, rc: %d.\n", rc);
RPC_ERROR(rpc_priv, "crt_req_timeout_track failed, rc: %d.\n", rc);
/* roll back the addref above */
RPC_DECREF(rpc_priv);
}
Expand All @@ -1264,6 +1278,10 @@ crt_context_req_track(struct crt_rpc_priv *rpc_priv)
/* reference taken by d_hash_rec_find or "epi->epi_ref = 1" above */
D_MUTEX_LOCK(&crt_ctx->cc_mutex);
d_hash_rec_decref(&crt_ctx->cc_epi_table, &epi->epi_link);

if (quota_rc == -DER_QUOTA_LIMIT)
d_list_add_tail(&rpc_priv->crp_waitq_link, &crt_ctx->cc_quotas.rpc_waitq);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is this not within the block at line 1254 ?

Copy link
Contributor Author

@frostedcmos frostedcmos Dec 12, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is this not within the block at line 1254 ?

So that it would not be done with epi->epi_mutex lock, but instead needs context lock.

We can reorganize things nicer once we can get rid of EP credits-related code, which should simplify this and few other calls greatly.


D_MUTEX_UNLOCK(&crt_ctx->cc_mutex);

out:
Expand All @@ -1280,9 +1298,10 @@ credits_available(struct crt_ep_inflight *epi)
{
int64_t inflight = epi->epi_req_num - epi->epi_reply_num;

D_ASSERTF(inflight >= 0 && inflight <= crt_gdata.cg_credit_ep_ctx,
"req_num=%ld reply_num=%ld credit_ep_ctx=%u\n", epi->epi_req_num,
epi->epi_reply_num, crt_gdata.cg_credit_ep_ctx);
/* TODO: inflight right now includes items queued in quota waitq, and can exceed credit limit */
if (inflight > crt_gdata.cg_credit_ep_ctx)
return 0;

return crt_gdata.cg_credit_ep_ctx - inflight;
}

Expand Down Expand Up @@ -1324,6 +1343,7 @@ crt_context_req_untrack_internal(struct crt_rpc_priv *rpc_priv)
} else {/* RPC_CANCELED or RPC_INITED or RPC_TIMEOUT */
epi->epi_req_num--;
}

D_ASSERT(epi->epi_req_num >= epi->epi_reply_num);

D_MUTEX_UNLOCK(&epi->epi_mutex);
Expand All @@ -1340,6 +1360,33 @@ crt_context_req_untrack_internal(struct crt_rpc_priv *rpc_priv)
RPC_DECREF(rpc_priv);
}

static void
dispatch_rpc(struct crt_rpc_priv *rpc) {
int rc;

if (rpc == NULL)
return;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn't that be an assert ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can just remove it now or change to assert yes. its a left-over from a previous behavior


/* No need to worry about rc here, we just released quota earlier */
rc = crt_context_get_quota_resource(rpc->crp_pub.cr_ctx,
CRT_QUOTA_RPC_INFLIGHT);
D_ASSERT(rc == 0);

crt_rpc_lock(rpc);

rc = crt_req_send_internal(rpc);
if (rc == 0) {
crt_rpc_unlock(rpc);
} else {
RPC_ADDREF(rpc);
RPC_ERROR(rpc, "crt_req_send_internal failed, rc: %d\n", rc);
rpc->crp_state = RPC_STATE_INITED;
crt_context_req_untrack_internal(rpc);
/* for error case here */
crt_rpc_complete_and_unlock(rpc, rc);
}
}

void
crt_context_req_untrack(struct crt_rpc_priv *rpc_priv)
{
Expand All @@ -1351,14 +1398,21 @@ crt_context_req_untrack(struct crt_rpc_priv *rpc_priv)

D_ASSERT(crt_ctx != NULL);

if (rpc_priv->crp_pub.cr_opc == CRT_OPC_URI_LOOKUP) {
RPC_TRACE(DB_NET, rpc_priv, "bypass untracking for URI_LOOKUP.\n");
if (rpc_priv->crp_pub.cr_opc == CRT_OPC_URI_LOOKUP)
return;
}

epi = rpc_priv->crp_epi;
D_ASSERT(epi != NULL);

/*
* Return quota resource and dispatch 1 rpc if any on waitq.
* dispatch_rpc() will either acquire a quota resource or will requeue this rpc
*/
crt_context_put_quota_resource(rpc_priv->crp_pub.cr_ctx, CRT_QUOTA_RPC_INFLIGHT);
tmp_rpc = d_list_pop_entry(&crt_ctx->cc_quotas.rpc_waitq,
struct crt_rpc_priv, crp_waitq_link);
dispatch_rpc(tmp_rpc);

crt_context_req_untrack_internal(rpc_priv);

/* done if flow control disabled */
Expand Down Expand Up @@ -1408,20 +1462,8 @@ crt_context_req_untrack(struct crt_rpc_priv *rpc_priv)
D_MUTEX_UNLOCK(&epi->epi_mutex);

/* re-submit the rpc req */
while ((tmp_rpc = d_list_pop_entry(&submit_list, struct crt_rpc_priv, crp_tmp_link))) {
crt_rpc_lock(tmp_rpc);
rc = crt_req_send_internal(tmp_rpc);
if (rc == 0) {
crt_rpc_unlock(tmp_rpc);
} else {
RPC_ADDREF(tmp_rpc);
RPC_ERROR(tmp_rpc, "crt_req_send_internal failed, rc: %d\n", rc);
tmp_rpc->crp_state = RPC_STATE_INITED;
crt_context_req_untrack_internal(tmp_rpc);
/* for error case here */
crt_rpc_complete_and_unlock(tmp_rpc, rc);
}
}
while ((tmp_rpc = d_list_pop_entry(&submit_list, struct crt_rpc_priv, crp_tmp_link)))
dispatch_rpc(tmp_rpc);
}

/* TODO: Need per-provider call */
Expand Down Expand Up @@ -1910,3 +1952,176 @@ crt_req_force_completion(struct crt_rpc_priv *rpc_priv)
crt_req_timeout_track(rpc_priv);
D_MUTEX_UNLOCK(&crt_ctx->cc_mutex);
}

int
crt_context_quotas_init(crt_context_t crt_ctx)
{
frostedcmos marked this conversation as resolved.
Show resolved Hide resolved
struct crt_context *ctx = crt_ctx;
struct crt_quotas *quotas;
int rc = 0;

if (ctx == NULL) {
D_ERROR("NULL context\n");
D_GOTO(out, rc = -DER_INVAL);
}

quotas = &ctx->cc_quotas;

if (quotas->enabled) {
D_ERROR("Quotas already enabled\n");
D_GOTO(out, rc = -DER_ALREADY);
}

quotas->limit[CRT_QUOTA_RPC_ALLOC_SOFT] = 64;
quotas->limit[CRT_QUOTA_RPC_ALLOC_HARD] = 512;

/* TODO: Set this to EP_CREDITS eventually; for now use 4 for testing */
quotas->limit[CRT_QUOTA_RPC_INFLIGHT] = 4;

quotas->current[CRT_QUOTA_RPC_ALLOC_SOFT] = 0;
quotas->current[CRT_QUOTA_RPC_ALLOC_HARD] = 0;
quotas->current[CRT_QUOTA_RPC_INFLIGHT] = 0;

quotas->enabled = true;
out:
return rc;
}

int
crt_context_quotas_finalize(crt_context_t crt_ctx)
{
struct crt_context *ctx = crt_ctx;
struct crt_quotas *quotas;
int rc = 0;

if (ctx == NULL) {
D_ERROR("NULL context\n");
D_GOTO(out, rc = -DER_INVAL);
}

quotas = &ctx->cc_quotas;

if (!quotas->enabled) {
D_ERROR("Quotas were not enabled\n");
D_GOTO(out, rc = -DER_ALREADY);
}

quotas->enabled = false;

out:
return rc;

}

int
crt_context_quota_limit_set(crt_context_t crt_ctx, crt_quota_t quota, int value)
{
struct crt_context *ctx = crt_ctx;
int rc = 0;

if (ctx == NULL) {
D_ERROR("NULL context\n");
D_GOTO(out, rc = -DER_INVAL);
}

if (quota < 0 || quota >= CRT_QUOTA_COUNT) {
D_ERROR("Invalid quota %d passed\n", quota);
D_GOTO(out, rc = -DER_INVAL);
}

D_MUTEX_LOCK(&ctx->cc_quotas.mutex);
ctx->cc_quotas.limit[quota] = value;
D_MUTEX_UNLOCK(&ctx->cc_quotas.mutex);

out:
return rc;
}

int
crt_context_quota_limit_get(crt_context_t crt_ctx, crt_quota_t quota, int *value)
{
struct crt_context *ctx = crt_ctx;
int rc = 0;

if (ctx == NULL) {
D_ERROR("NULL context\n");
D_GOTO(out, rc = -DER_INVAL);
}

if (quota < 0 || quota >= CRT_QUOTA_COUNT) {
D_ERROR("Invalid quota %d passed\n", quota);
D_GOTO(out, rc = -DER_INVAL);
}

if (value == NULL) {
D_ERROR("NULL value\n");
D_GOTO(out, rc = -DER_INVAL);
}

*value = ctx->cc_quotas.limit[quota];

out:
return rc;
}

int
crt_context_get_quota_resource(crt_context_t crt_ctx, crt_quota_t quota)
{
struct crt_context *ctx = crt_ctx;
int rc = 0;

if (ctx == NULL) {
D_ERROR("NULL context\n");
D_GOTO(out, rc = -DER_INVAL);
}

if (quota < 0 || quota >= CRT_QUOTA_COUNT) {
D_ERROR("Invalid quota %d passed\n", quota);
D_GOTO(out, rc = -DER_INVAL);
}

/* If quotas not enabled or unlimited quota */
if (!ctx->cc_quotas.enabled || ctx->cc_quotas.limit[quota] == 0)
return 0;

D_MUTEX_LOCK(&ctx->cc_quotas.mutex);

if (ctx->cc_quotas.current[quota] < ctx->cc_quotas.limit[quota])
ctx->cc_quotas.current[quota]++;
else
rc = -DER_QUOTA_LIMIT;

D_MUTEX_UNLOCK(&ctx->cc_quotas.mutex);
out:
return rc;
}

int
crt_context_put_quota_resource(crt_context_t crt_ctx, crt_quota_t quota)
{
struct crt_context *ctx = crt_ctx;
int rc = 0;

if (ctx == NULL) {
D_ERROR("NULL context\n");
D_GOTO(out, rc = -DER_INVAL);
}

if (quota < 0 || quota >= CRT_QUOTA_COUNT) {
D_ERROR("Invalid quota %d passed\n", quota);
D_GOTO(out, rc = -DER_INVAL);
}

/* If quotas not enabled or unlimited quota */
if (!ctx->cc_quotas.enabled || ctx->cc_quotas.limit[quota] == 0)
return 0;

D_MUTEX_LOCK(&ctx->cc_quotas.mutex);
D_ASSERTF(ctx->cc_quotas.current[quota] > 0, "Invalid current limit");
ctx->cc_quotas.current[quota]--;

D_MUTEX_UNLOCK(&ctx->cc_quotas.mutex);

out:
return rc;
}
2 changes: 1 addition & 1 deletion src/cart/crt_hg.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1397,7 +1397,7 @@ crt_hg_req_send_cb(const struct hg_cb_info *hg_cbinfo)
void
crt_hg_req_send(struct crt_rpc_priv *rpc_priv)
{
hg_return_t hg_ret;
hg_return_t hg_ret;

D_ASSERT(rpc_priv != NULL);

Expand Down
Loading