DAOS-18963 cart: Add rpc origin address

src/cart/crt_bulk.c

@@ -292,7 +292,8 @@ crt_bulk_transfer(struct crt_bulk_desc *bulk_desc, crt_bulk_cb_t complete_cb,
 
 	rc = crt_hg_bulk_transfer(bulk_desc, verify_complete_cb, complete_cb, arg, opid, false);
 	if (rc != 0)
-		DL_ERROR(rc, "crt_hg_bulk_transfer() failed");
+		DL_ERROR(rc, "crt_hg_bulk_transfer() failed; origin=%s",
+			 crt_req_origin_addr_get(bulk_desc->bd_rpc));
 out:
 	return rc;
 }
@@ -313,7 +314,8 @@ crt_bulk_bind_transfer(struct crt_bulk_desc *bulk_desc, crt_bulk_cb_t complete_c
 
 	rc = crt_hg_bulk_transfer(bulk_desc, verify_complete_cb, complete_cb, arg, opid, true);
 	if (rc != 0)
-		DL_ERROR(rc, "crt_hg_bulk_transfer() failed");
+		DL_ERROR(rc, "crt_hg_bulk_transfer() failed; origin=%s",
+			 crt_req_origin_addr_get(bulk_desc->bd_rpc));
 out:
 	return rc;
 }

src/cart/crt_hg.c

@@ -1585,8 +1585,8 @@ crt_hg_reply_send_cb(const struct hg_cb_info *hg_cbinfo)
 	 * see CART-146 for details
 	 */
 	if (hg_ret != HG_SUCCESS)
-		D_WARN("hg_cbinfo->ret: " DF_HG_RC ", opc: %#x.\n",
-		       DP_HG_RC(hg_ret), opc);
+		D_WARN("hg_cbinfo->ret: " DF_HG_RC ", opc: %#x from %s\n", DP_HG_RC(hg_ret), opc,
+		       crt_rpc_priv_get_origin_addr(rpc_priv));
 
 	/* corresponding to the crt_req_addref in crt_hg_reply_send */
 	RPC_DECREF(rpc_priv);
@@ -2010,3 +2010,40 @@ crt_hg_bulk_transfer(struct crt_bulk_desc *bulk_desc, crt_bulk_cb_t verify_cb,
 out:
 	return rc;
 }
+
+char *
+crt_rpc_priv_get_origin_addr(struct crt_rpc_priv *rpc_priv)
+{
+	const struct hg_info *hg_info;
+	char                  addr[48];
+	hg_size_t             addr_size = 48;
+	int                   rc;
+
+	if (rpc_priv->crp_orig_uri != NULL)
+		return rpc_priv->crp_orig_uri;
+
+	hg_info = HG_Get_info(rpc_priv->crp_hg_hdl);
+	if (hg_info == NULL)
+		return "NOINFO";
+
+	rc = HG_Addr_to_string(hg_info->hg_class, addr, (hg_size_t *)&addr_size, hg_info->addr);
+	if (rc != 0)
+		return "NONE";
+
+	D_ALLOC(rpc_priv->crp_orig_uri, addr_size);
+	if (rpc_priv->crp_orig_uri == NULL)
+		return "NOMEM";
+
+	memcpy(rpc_priv->crp_orig_uri, addr, addr_size);
+
+	return rpc_priv->crp_orig_uri;
+}
+
+char *
+crt_req_origin_addr_get(crt_rpc_t *rpc_pub)
+{
+	struct crt_rpc_priv *rpc_priv;
+
+	rpc_priv = container_of(rpc_pub, struct crt_rpc_priv, crp_pub);
+	return crt_rpc_priv_get_origin_addr(rpc_priv);
+}

src/cart/crt_internal.h

@@ -1,5 +1,6 @@
 /*
  * (C) Copyright 2016-2024 Intel Corporation.
+ * (C) Copyright 2025 Google LLC
  * (C) Copyright 2025-2026 Hewlett Packard Enterprise Development LP
  *
  * SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -43,10 +44,11 @@
 				      (rpc)->crp_req_hdr.cch_rpcid, ##__VA_ARGS__);                \
 		} else {                                                                           \
 			D_TRACE_DEBUG(mask, (rpc),                                                 \
-				      "[opc=%#x (%s:%s) rpcid=%#lx rank:tag=%d:%d] " fmt,          \
+				      "[opc=%#x (%s:%s) rpcid=%#lx rank:tag=%d:%d orig=%s] " fmt,  \
 				      (rpc)->crp_pub.cr_opc, _module, _opc,                        \
 				      (rpc)->crp_req_hdr.cch_rpcid, (rpc)->crp_pub.cr_ep.ep_rank,  \
-				      (rpc)->crp_pub.cr_ep.ep_tag, ##__VA_ARGS__);                 \
+				      (rpc)->crp_pub.cr_ep.ep_tag,                                 \
+				      crt_rpc_priv_get_origin_addr((rpc)), ##__VA_ARGS__);         \
 		}                                                                                  \
 	} while (0)
 
@@ -62,10 +64,11 @@
 				      (rpc)->crp_pub.cr_opc, _module, _opc,                        \
 				      (rpc)->crp_req_hdr.cch_rpcid, ##__VA_ARGS__);                \
 		} else {                                                                           \
-			D_TRACE_ERROR((rpc), "[opc=%#x (%s:%s) rpcid=%#lx rank:tag=%d:%d] " fmt,   \
-				      (rpc)->crp_pub.cr_opc, _module, _opc,                        \
-				      (rpc)->crp_req_hdr.cch_rpcid, (rpc)->crp_pub.cr_ep.ep_rank,  \
-				      (rpc)->crp_pub.cr_ep.ep_tag, ##__VA_ARGS__);                 \
+			D_TRACE_ERROR(                                                             \
+			    (rpc), "[opc=%#x (%s:%s) rpcid=%#lx rank:tag=%d:%d orig=%s] " fmt,     \
+			    (rpc)->crp_pub.cr_opc, _module, _opc, (rpc)->crp_req_hdr.cch_rpcid,    \
+			    (rpc)->crp_pub.cr_ep.ep_rank, (rpc)->crp_pub.cr_ep.ep_tag,             \
+			    crt_rpc_priv_get_origin_addr((rpc)), ##__VA_ARGS__);                   \
 		}                                                                                  \
 	} while (0)
 
@@ -81,10 +84,11 @@
 				     (rpc)->crp_pub.cr_opc, _module, _opc,                         \
 				     (rpc)->crp_req_hdr.cch_rpcid, ##__VA_ARGS__);                 \
 		} else {                                                                           \
-			D_TRACE_WARN((rpc), "[opc=%#x (%s:%s) rpcid=%#lx rank:tag=%d:%d] " fmt,    \
-				     (rpc)->crp_pub.cr_opc, _module, _opc,                         \
-				     (rpc)->crp_req_hdr.cch_rpcid, (rpc)->crp_pub.cr_ep.ep_rank,   \
-				     (rpc)->crp_pub.cr_ep.ep_tag, ##__VA_ARGS__);                  \
+			D_TRACE_WARN(                                                              \
+			    (rpc), "[opc=%#x (%s:%s) rpcid=%#lx rank:tag=%d:%d orig=%s] " fmt,     \
+			    (rpc)->crp_pub.cr_opc, _module, _opc, (rpc)->crp_req_hdr.cch_rpcid,    \
+			    (rpc)->crp_pub.cr_ep.ep_rank, (rpc)->crp_pub.cr_ep.ep_tag,             \
+			    crt_rpc_priv_get_origin_addr((rpc)), ##__VA_ARGS__);                   \
 		}                                                                                  \
 	} while (0)
 
@@ -100,10 +104,11 @@
 				     (rpc)->crp_pub.cr_opc, _module, _opc,                         \
 				     (rpc)->crp_req_hdr.cch_rpcid, ##__VA_ARGS__);                 \
 		} else {                                                                           \
-			D_TRACE_INFO((rpc), "[opc=%#x (%s:%s) rpcid=%#lx rank:tag=%d:%d] " fmt,    \
-				     (rpc)->crp_pub.cr_opc, _module, _opc,                         \
-				     (rpc)->crp_req_hdr.cch_rpcid, (rpc)->crp_pub.cr_ep.ep_rank,   \
-				     (rpc)->crp_pub.cr_ep.ep_tag, ##__VA_ARGS__);                  \
+			D_TRACE_INFO(                                                              \
+			    (rpc), "[opc=%#x (%s:%s) rpcid=%#lx rank:tag=%d:%d] orig=%s" fmt,      \
+			    (rpc)->crp_pub.cr_opc, _module, _opc, (rpc)->crp_req_hdr.cch_rpcid,    \
+			    (rpc)->crp_pub.cr_ep.ep_rank, (rpc)->crp_pub.cr_ep.ep_tag,             \
+			    crt_rpc_priv_get_origin_addr((rpc)), ##__VA_ARGS__);                   \
 		}                                                                                  \
 	} while (0)
 /**

src/cart/crt_internal_fns.h

@@ -1,5 +1,6 @@
 /*
  * (C) Copyright 2016-2024 Intel Corporation.
+ * (C) Copyright 2025 Google LLC
  * (C) Copyright 2025-2026 Hewlett Packard Enterprise Development LP
  *
  * SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -80,5 +81,7 @@ crt_trigger_hlc_error_cb(void);
 void
 crt_trigger_event_cbs(d_rank_t rank, uint64_t incarnation, enum crt_event_source src,
 		      enum crt_event_type type);
+char *
+crt_rpc_priv_get_origin_addr(struct crt_rpc_priv *rpc_priv);
 
 #endif /* __CRT_INTERNAL_FNS_H__ */

src/cart/crt_rpc.c

@@ -1,5 +1,6 @@
 /*
  * (C) Copyright 2016-2024 Intel Corporation.
+ * (C) Copyright 2025 Google LLC
  * (C) Copyright 2025-2026 Hewlett Packard Enterprise Development LP
  *
  * SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -580,6 +581,7 @@ crt_rpc_priv_free(struct crt_rpc_priv *rpc_priv)
 
 	RPC_TRACE(DB_TRACE, rpc_priv, "destroying\n");
 
+	D_FREE(rpc_priv->crp_orig_uri);
 	D_FREE(rpc_priv);
 }
 
@@ -1549,8 +1551,8 @@ crt_reply_send(crt_rpc_t *req)
 		RPC_TRACE(DB_ALL, rpc_priv, "reply_send\n");
 		rc = crt_hg_reply_send(rpc_priv);
 		if (rc != 0)
-			D_ERROR("crt_hg_reply_send failed, rc: %d,opc: %#x.\n",
-				rc, rpc_priv->crp_pub.cr_opc);
+			D_ERROR("crt_hg_reply_send failed, rc: %d opc: %#x orig: %s\n", rc,
+				rpc_priv->crp_pub.cr_opc, crt_req_origin_addr_get(req));
 	}
 
 	rpc_priv->crp_reply_pending = 0;

src/cart/crt_rpc.h

@@ -1,5 +1,6 @@
 /*
  * (C) Copyright 2016-2024 Intel Corporation.
+ * (C) Copyright 2025 Google LLC
  * (C) Copyright 2025-2026 Hewlett Packard Enterprise Development LP
  *
  * SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -179,6 +180,7 @@ struct crt_rpc_priv {
 	hg_addr_t		crp_hg_addr; /* target na address */
 	struct crt_hg_hdl	*crp_hdl_reuse; /* reused hg_hdl */
 	char                    *crp_tgt_uri;   /* target uri address */
+	char                    *crp_orig_uri;  /* where the RPC comes from */
 	crt_rpc_t		*crp_ul_req; /* uri lookup request */
 
 	uint32_t		crp_ul_retry; /* uri lookup retry counter */

src/include/cart/api.h

@@ -1,6 +1,7 @@
 /*
  * (C) Copyright 2016-2024 Intel Corporation.
- * (C) Copyright 2025 Hewlett Packard Enterprise Development LP
+ * (C) Copyright 2025 Google LLC
+ * (C) Copyright 2025-2026 Hewlett Packard Enterprise Development LP
  *
  * SPDX-License-Identifier: BSD-2-Clause-Patent
  */
@@ -2314,6 +2315,15 @@ int crt_context_quota_limit_set(crt_context_t crt_ctx, crt_quota_type_t quota, i
  */
 int crt_context_quota_limit_get(crt_context_t crt_ctx, crt_quota_type_t quota, int *value);
 
+/**
+ * Get the rpc origin address.
+ *
+ * \param[in] rpc		pointer to RPC request
+ * \return			the origin address of the RPC
+ */
+char *
+crt_req_origin_addr_get(crt_rpc_t *rpc);
+
 /**
  * Get the proto version of an RPC request.
  *