RDMA/rtrs: Add error description to the logs

+4 -4

drivers/infiniband/ulp/rtrs/rtrs-clt-sysfs.c

··· 439 439 clt->kobj_paths, 440 440 "%s", str); 441 441 if (err) { 442 - pr_err("kobject_init_and_add: %d\n", err); 442 + pr_err("kobject_init_and_add: %pe\n", ERR_PTR(err)); 443 443 kobject_put(&clt_path->kobj); 444 444 return err; 445 445 } 446 446 err = sysfs_create_group(&clt_path->kobj, &rtrs_clt_path_attr_group); 447 447 if (err) { 448 - pr_err("sysfs_create_group(): %d\n", err); 448 + pr_err("sysfs_create_group(): %pe\n", ERR_PTR(err)); 449 449 goto put_kobj; 450 450 } 451 451 err = kobject_init_and_add(&clt_path->stats->kobj_stats, &ktype_stats, 452 452 &clt_path->kobj, "stats"); 453 453 if (err) { 454 - pr_err("kobject_init_and_add: %d\n", err); 454 + pr_err("kobject_init_and_add: %pe\n", ERR_PTR(err)); 455 455 kobject_put(&clt_path->stats->kobj_stats); 456 456 goto remove_group; 457 457 } ··· 459 459 err = sysfs_create_group(&clt_path->stats->kobj_stats, 460 460 &rtrs_clt_stats_attr_group); 461 461 if (err) { 462 - pr_err("failed to create stats sysfs group, err: %d\n", err); 462 + pr_err("failed to create stats sysfs group, err: %pe\n", ERR_PTR(err)); 463 463 goto put_kobj_stats; 464 464 } 465 465

+44 -44

drivers/infiniband/ulp/rtrs/rtrs-clt.c

··· 422 422 refcount_inc(&req->ref); 423 423 err = rtrs_inv_rkey(req); 424 424 if (err) { 425 - rtrs_err_rl(con->c.path, "Send INV WR key=%#x: %d\n", 426 - req->mr->rkey, err); 425 + rtrs_err_rl(con->c.path, "Send INV WR key=%#x: %pe\n", 426 + req->mr->rkey, ERR_PTR(err)); 427 427 } else if (can_wait) { 428 428 wait_for_completion(&req->inv_comp); 429 429 } ··· 443 443 444 444 if (errno) { 445 445 rtrs_err_rl(con->c.path, 446 - "IO %s request failed: error=%d path=%s [%s:%u] notify=%d\n", 447 - req->dir == DMA_TO_DEVICE ? "write" : "read", errno, 446 + "IO %s request failed: error=%pe path=%s [%s:%u] notify=%d\n", 447 + req->dir == DMA_TO_DEVICE ? "write" : "read", ERR_PTR(errno), 448 448 kobject_name(&clt_path->kobj), clt_path->hca_name, 449 449 clt_path->hca_port, notify); 450 450 } ··· 514 514 cqe); 515 515 err = rtrs_iu_post_recv(&con->c, iu); 516 516 if (err) { 517 - rtrs_err(con->c.path, "post iu failed %d\n", err); 517 + rtrs_err(con->c.path, "post iu failed %pe\n", ERR_PTR(err)); 518 518 rtrs_rdma_error_recovery(con); 519 519 } 520 520 } ··· 659 659 else 660 660 err = rtrs_post_recv_empty(&con->c, &io_comp_cqe); 661 661 if (err) { 662 - rtrs_err(con->c.path, "rtrs_post_recv_empty(): %d\n", 663 - err); 662 + rtrs_err(con->c.path, "rtrs_post_recv_empty(): %pe\n", 663 + ERR_PTR(err)); 664 664 rtrs_rdma_error_recovery(con); 665 665 } 666 666 break; ··· 731 731 732 732 err = post_recv_io(to_clt_con(clt_path->s.con[cid]), q_size); 733 733 if (err) { 734 - rtrs_err(clt_path->clt, "post_recv_io(), err: %d\n", 735 - err); 734 + rtrs_err(clt_path->clt, "post_recv_io(), err: %pe\n", 735 + ERR_PTR(err)); 736 736 return err; 737 737 } 738 738 } ··· 1122 1122 ret = rtrs_map_sg_fr(req, count); 1123 1123 if (ret < 0) { 1124 1124 rtrs_err_rl(s, 1125 - "Write request failed, failed to map fast reg. data, err: %d\n", 1126 - ret); 1125 + "Write request failed, failed to map fast reg. data, err: %pe\n", 1126 + ERR_PTR(ret)); 1127 1127 ib_dma_unmap_sg(clt_path->s.dev->ib_dev, req->sglist, 1128 1128 req->sg_cnt, req->dir); 1129 1129 return ret; ··· 1150 1150 imm, wr, NULL); 1151 1151 if (ret) { 1152 1152 rtrs_err_rl(s, 1153 - "Write request failed: error=%d path=%s [%s:%u]\n", 1154 - ret, kobject_name(&clt_path->kobj), clt_path->hca_name, 1155 - clt_path->hca_port); 1153 + "Write request failed: error=%pe path=%s [%s:%u]\n", 1154 + ERR_PTR(ret), kobject_name(&clt_path->kobj), 1155 + clt_path->hca_name, clt_path->hca_port); 1156 1156 if (req->mp_policy == MP_POLICY_MIN_INFLIGHT) 1157 1157 atomic_dec(&clt_path->stats->inflight); 1158 1158 if (req->mr->need_inval) { ··· 1208 1208 ret = rtrs_map_sg_fr(req, count); 1209 1209 if (ret < 0) { 1210 1210 rtrs_err_rl(s, 1211 - "Read request failed, failed to map fast reg. data, err: %d\n", 1212 - ret); 1211 + "Read request failed, failed to map fast reg. data, err: %pe\n", 1212 + ERR_PTR(ret)); 1213 1213 ib_dma_unmap_sg(dev->ib_dev, req->sglist, req->sg_cnt, 1214 1214 req->dir); 1215 1215 return ret; ··· 1260 1260 req->data_len, imm, wr); 1261 1261 if (ret) { 1262 1262 rtrs_err_rl(s, 1263 - "Read request failed: error=%d path=%s [%s:%u]\n", 1264 - ret, kobject_name(&clt_path->kobj), clt_path->hca_name, 1265 - clt_path->hca_port); 1263 + "Read request failed: error=%pe path=%s [%s:%u]\n", 1264 + ERR_PTR(ret), kobject_name(&clt_path->kobj), 1265 + clt_path->hca_name, clt_path->hca_port); 1266 1266 if (req->mp_policy == MP_POLICY_MIN_INFLIGHT) 1267 1267 atomic_dec(&clt_path->stats->inflight); 1268 1268 req->mr->need_inval = false; ··· 1774 1774 err = create_con_cq_qp(con); 1775 1775 mutex_unlock(&con->con_mutex); 1776 1776 if (err) { 1777 - rtrs_err(s, "create_con_cq_qp(), err: %d\n", err); 1777 + rtrs_err(s, "create_con_cq_qp(), err: %pe\n", ERR_PTR(err)); 1778 1778 return err; 1779 1779 } 1780 1780 err = rdma_resolve_route(con->c.cm_id, RTRS_CONNECT_TIMEOUT_MS); 1781 1781 if (err) 1782 - rtrs_err(s, "Resolving route failed, err: %d\n", err); 1782 + rtrs_err(s, "Resolving route failed, err: %pe\n", ERR_PTR(err)); 1783 1783 1784 1784 return err; 1785 1785 } ··· 1813 1813 1814 1814 err = rdma_connect_locked(con->c.cm_id, &param); 1815 1815 if (err) 1816 - rtrs_err(clt, "rdma_connect_locked(): %d\n", err); 1816 + rtrs_err(clt, "rdma_connect_locked(): %pe\n", ERR_PTR(err)); 1817 1817 1818 1818 return err; 1819 1819 } ··· 1846 1846 } 1847 1847 errno = le16_to_cpu(msg->errno); 1848 1848 if (errno) { 1849 - rtrs_err(clt, "Invalid RTRS message: errno %d\n", 1850 - errno); 1849 + rtrs_err(clt, "Invalid RTRS message: errno %pe\n", 1850 + ERR_PTR(errno)); 1851 1851 return -ECONNRESET; 1852 1852 } 1853 1853 if (con->c.cid == 0) { ··· 1936 1936 "Previous session is still exists on the server, please reconnect later\n"); 1937 1937 else 1938 1938 rtrs_err(s, 1939 - "Connect rejected: status %d (%s), rtrs errno %d\n", 1940 - status, rej_msg, errno); 1939 + "Connect rejected: status %d (%s), rtrs errno %pe\n", 1940 + status, rej_msg, ERR_PTR(errno)); 1941 1941 } else { 1942 1942 rtrs_err(s, 1943 - "Connect rejected but with malformed message: status %d (%s)\n", 1944 - status, rej_msg); 1943 + "Connect rejected but with malformed message: status %pe (%s)\n", 1944 + ERR_PTR(status), rej_msg); 1945 1945 } 1946 1946 1947 1947 return -ECONNRESET; ··· 2008 2008 case RDMA_CM_EVENT_UNREACHABLE: 2009 2009 case RDMA_CM_EVENT_ADDR_CHANGE: 2010 2010 case RDMA_CM_EVENT_TIMEWAIT_EXIT: 2011 - rtrs_wrn(s, "CM error (CM event: %s, err: %d)\n", 2012 - rdma_event_msg(ev->event), ev->status); 2011 + rtrs_wrn(s, "CM error (CM event: %s, err: %pe)\n", 2012 + rdma_event_msg(ev->event), ERR_PTR(ev->status)); 2013 2013 cm_err = -ECONNRESET; 2014 2014 break; 2015 2015 case RDMA_CM_EVENT_ADDR_ERROR: 2016 2016 case RDMA_CM_EVENT_ROUTE_ERROR: 2017 - rtrs_wrn(s, "CM error (CM event: %s, err: %d)\n", 2018 - rdma_event_msg(ev->event), ev->status); 2017 + rtrs_wrn(s, "CM error (CM event: %s, err: %pe)\n", 2018 + rdma_event_msg(ev->event), ERR_PTR(ev->status)); 2019 2019 cm_err = -EHOSTUNREACH; 2020 2020 break; 2021 2021 case RDMA_CM_EVENT_DEVICE_REMOVAL: 2022 2022 /* 2023 2023 * Device removal is a special case. Queue close and return 0. 2024 2024 */ 2025 - rtrs_wrn_rl(s, "CM event: %s, status: %d\n", rdma_event_msg(ev->event), 2026 - ev->status); 2025 + rtrs_wrn_rl(s, "CM event: %s, status: %pe\n", rdma_event_msg(ev->event), 2026 + ERR_PTR(ev->status)); 2027 2027 rtrs_clt_close_conns(clt_path, false); 2028 2028 return 0; 2029 2029 default: 2030 - rtrs_err(s, "Unexpected RDMA CM error (CM event: %s, err: %d)\n", 2031 - rdma_event_msg(ev->event), ev->status); 2030 + rtrs_err(s, "Unexpected RDMA CM error (CM event: %s, err: %pe)\n", 2031 + rdma_event_msg(ev->event), ERR_PTR(ev->status)); 2032 2032 cm_err = -ECONNRESET; 2033 2033 break; 2034 2034 } ··· 2065 2065 /* allow the port to be reused */ 2066 2066 err = rdma_set_reuseaddr(cm_id, 1); 2067 2067 if (err != 0) { 2068 - rtrs_err(s, "Set address reuse failed, err: %d\n", err); 2068 + rtrs_err(s, "Set address reuse failed, err: %pe\n", ERR_PTR(err)); 2069 2069 return err; 2070 2070 } 2071 2071 err = rdma_resolve_addr(cm_id, (struct sockaddr *)&clt_path->s.src_addr, 2072 2072 (struct sockaddr *)&clt_path->s.dst_addr, 2073 2073 RTRS_CONNECT_TIMEOUT_MS); 2074 2074 if (err) { 2075 - rtrs_err(s, "Failed to resolve address, err: %d\n", err); 2075 + rtrs_err(s, "Failed to resolve address, err: %pe\n", ERR_PTR(err)); 2076 2076 return err; 2077 2077 } 2078 2078 /* ··· 2547 2547 /* Prepare for getting info response */ 2548 2548 err = rtrs_iu_post_recv(&usr_con->c, rx_iu); 2549 2549 if (err) { 2550 - rtrs_err(clt_path->clt, "rtrs_iu_post_recv(), err: %d\n", err); 2550 + rtrs_err(clt_path->clt, "rtrs_iu_post_recv(), err: %pe\n", ERR_PTR(err)); 2551 2551 goto out; 2552 2552 } 2553 2553 rx_iu = NULL; ··· 2563 2563 /* Send info request */ 2564 2564 err = rtrs_iu_post_send(&usr_con->c, tx_iu, sizeof(*msg), NULL); 2565 2565 if (err) { 2566 - rtrs_err(clt_path->clt, "rtrs_iu_post_send(), err: %d\n", err); 2566 + rtrs_err(clt_path->clt, "rtrs_iu_post_send(), err: %pe\n", ERR_PTR(err)); 2567 2567 goto out; 2568 2568 } 2569 2569 tx_iu = NULL; ··· 2614 2614 err = init_conns(clt_path); 2615 2615 if (err) { 2616 2616 rtrs_err(clt_path->clt, 2617 - "init_conns() failed: err=%d path=%s [%s:%u]\n", err, 2618 - str, clt_path->hca_name, clt_path->hca_port); 2617 + "init_conns() failed: err=%pe path=%s [%s:%u]\n", 2618 + ERR_PTR(err), str, clt_path->hca_name, clt_path->hca_port); 2619 2619 goto out; 2620 2620 } 2621 2621 err = rtrs_send_path_info(clt_path); 2622 2622 if (err) { 2623 2623 rtrs_err(clt_path->clt, 2624 - "rtrs_send_path_info() failed: err=%d path=%s [%s:%u]\n", 2625 - err, str, clt_path->hca_name, clt_path->hca_port); 2624 + "rtrs_send_path_info() failed: err=%pe path=%s [%s:%u]\n", 2625 + ERR_PTR(err), str, clt_path->hca_name, clt_path->hca_port); 2626 2626 goto out; 2627 2627 } 2628 2628 rtrs_clt_path_up(clt_path);

+6 -6

drivers/infiniband/ulp/rtrs/rtrs-srv-sysfs.c

··· 176 176 dev_set_uevent_suppress(&srv->dev, true); 177 177 err = device_add(&srv->dev); 178 178 if (err) { 179 - pr_err("device_add(): %d\n", err); 179 + pr_err("device_add(): %pe\n", ERR_PTR(err)); 180 180 put_device(&srv->dev); 181 181 goto unlock; 182 182 } 183 183 srv->kobj_paths = kobject_create_and_add("paths", &srv->dev.kobj); 184 184 if (!srv->kobj_paths) { 185 185 err = -ENOMEM; 186 - pr_err("kobject_create_and_add(): %d\n", err); 186 + pr_err("kobject_create_and_add(): %pe\n", ERR_PTR(err)); 187 187 device_del(&srv->dev); 188 188 put_device(&srv->dev); 189 189 goto unlock; ··· 237 237 err = kobject_init_and_add(&srv_path->stats->kobj_stats, &ktype_stats, 238 238 &srv_path->kobj, "stats"); 239 239 if (err) { 240 - rtrs_err(s, "kobject_init_and_add(): %d\n", err); 240 + rtrs_err(s, "kobject_init_and_add(): %pe\n", ERR_PTR(err)); 241 241 kobject_put(&srv_path->stats->kobj_stats); 242 242 return err; 243 243 } 244 244 err = sysfs_create_group(&srv_path->stats->kobj_stats, 245 245 &rtrs_srv_stats_attr_group); 246 246 if (err) { 247 - rtrs_err(s, "sysfs_create_group(): %d\n", err); 247 + rtrs_err(s, "sysfs_create_group(): %pe\n", ERR_PTR(err)); 248 248 goto err; 249 249 } 250 250 ··· 276 276 err = kobject_init_and_add(&srv_path->kobj, &ktype, srv->kobj_paths, 277 277 "%s", str); 278 278 if (err) { 279 - rtrs_err(s, "kobject_init_and_add(): %d\n", err); 279 + rtrs_err(s, "kobject_init_and_add(): %pe\n", ERR_PTR(err)); 280 280 goto destroy_root; 281 281 } 282 282 err = sysfs_create_group(&srv_path->kobj, &rtrs_srv_path_attr_group); 283 283 if (err) { 284 - rtrs_err(s, "sysfs_create_group(): %d\n", err); 284 + rtrs_err(s, "sysfs_create_group(): %pe\n", ERR_PTR(err)); 285 285 goto put_kobj; 286 286 } 287 287 err = rtrs_srv_create_stats_files(srv_path);

+40 -38

drivers/infiniband/ulp/rtrs/rtrs-srv.c

··· 317 317 err = ib_post_send(id->con->c.qp, &id->tx_wr.wr, NULL); 318 318 if (err) 319 319 rtrs_err(s, 320 - "Posting RDMA-Write-Request to QP failed, err: %d\n", 321 - err); 320 + "Posting RDMA-Write-Request to QP failed, err: %pe\n", 321 + ERR_PTR(err)); 322 322 323 323 return err; 324 324 } ··· 434 434 435 435 err = ib_post_send(id->con->c.qp, wr, NULL); 436 436 if (err) 437 - rtrs_err_rl(s, "Posting RDMA-Reply to QP failed, err: %d\n", 438 - err); 437 + rtrs_err_rl(s, "Posting RDMA-Reply to QP failed, err: %pe\n", 438 + ERR_PTR(err)); 439 439 440 440 return err; 441 441 } ··· 519 519 err = rdma_write_sg(id); 520 520 521 521 if (err) { 522 - rtrs_err_rl(s, "IO response failed: %d: srv_path=%s\n", err, 523 - kobject_name(&srv_path->kobj)); 522 + rtrs_err_rl(s, "IO response failed: %pe: srv_path=%s\n", 523 + ERR_PTR(err), kobject_name(&srv_path->kobj)); 524 524 close_path(srv_path); 525 525 } 526 526 out: ··· 637 637 DMA_TO_DEVICE, rtrs_srv_rdma_done); 638 638 if (!srv_mr->iu) { 639 639 err = -ENOMEM; 640 - rtrs_err(ss, "rtrs_iu_alloc(), err: %d\n", err); 640 + rtrs_err(ss, "rtrs_iu_alloc(), err: %pe\n", ERR_PTR(err)); 641 641 goto dereg_mr; 642 642 } 643 643 } ··· 813 813 814 814 err = post_recv_path(srv_path); 815 815 if (err) { 816 - rtrs_err(s, "post_recv_path(), err: %d\n", err); 816 + rtrs_err(s, "post_recv_path(), err: %pe\n", ERR_PTR(err)); 817 817 return err; 818 818 } 819 819 ··· 876 876 get_device(&srv_path->srv->dev); 877 877 err = rtrs_srv_change_state(srv_path, RTRS_SRV_CONNECTED); 878 878 if (!err) { 879 - rtrs_err(s, "rtrs_srv_change_state(), err: %d\n", err); 879 + rtrs_err(s, "rtrs_srv_change_state(), err: %pe\n", ERR_PTR(err)); 880 880 goto iu_free; 881 881 } 882 882 ··· 890 890 */ 891 891 err = rtrs_srv_path_up(srv_path); 892 892 if (err) { 893 - rtrs_err(s, "rtrs_srv_path_up(), err: %d\n", err); 893 + rtrs_err(s, "rtrs_srv_path_up(), err: %pe\n", ERR_PTR(err)); 894 894 goto iu_free; 895 895 } 896 896 ··· 901 901 /* Send info response */ 902 902 err = rtrs_iu_post_send(&con->c, tx_iu, tx_sz, reg_wr); 903 903 if (err) { 904 - rtrs_err(s, "rtrs_iu_post_send(), err: %d\n", err); 904 + rtrs_err(s, "rtrs_iu_post_send(), err: %pe\n", ERR_PTR(err)); 905 905 iu_free: 906 906 rtrs_iu_free(tx_iu, srv_path->s.dev->ib_dev, 1); 907 907 } ··· 969 969 /* Prepare for getting info response */ 970 970 err = rtrs_iu_post_recv(&con->c, rx_iu); 971 971 if (err) { 972 - rtrs_err(s, "rtrs_iu_post_recv(), err: %d\n", err); 972 + rtrs_err(s, "rtrs_iu_post_recv(), err: %pe\n", ERR_PTR(err)); 973 973 rtrs_iu_free(rx_iu, srv_path->s.dev->ib_dev, 1); 974 974 return err; 975 975 } ··· 1015 1015 1016 1016 err = post_recv_io(to_srv_con(srv_path->s.con[cid]), q_size); 1017 1017 if (err) { 1018 - rtrs_err(s, "post_recv_io(), err: %d\n", err); 1018 + rtrs_err(s, "post_recv_io(), err: %pe\n", ERR_PTR(err)); 1019 1019 return err; 1020 1020 } 1021 1021 } ··· 1063 1063 1064 1064 if (ret) { 1065 1065 rtrs_err_rl(s, 1066 - "Processing read request failed, user module cb reported for msg_id %d, err: %d\n", 1067 - buf_id, ret); 1066 + "Processing read request failed, user module cb reported for msg_id %d, err: %pe\n", 1067 + buf_id, ERR_PTR(ret)); 1068 1068 goto send_err_msg; 1069 1069 } 1070 1070 ··· 1074 1074 ret = send_io_resp_imm(con, id, ret); 1075 1075 if (ret < 0) { 1076 1076 rtrs_err_rl(s, 1077 - "Sending err msg for failed RDMA-Write-Req failed, msg_id %d, err: %d\n", 1078 - buf_id, ret); 1077 + "Sending err msg for failed RDMA-Write-Req failed, msg_id %d, err: %pe\n", 1078 + buf_id, ERR_PTR(ret)); 1079 1079 close_path(srv_path); 1080 1080 } 1081 1081 rtrs_srv_put_ops_ids(srv_path); ··· 1115 1115 data + data_len, usr_len); 1116 1116 if (ret) { 1117 1117 rtrs_err_rl(s, 1118 - "Processing write request failed, user module callback reports err: %d\n", 1119 - ret); 1118 + "Processing write request failed, user module callback reports err: %pe\n", 1119 + ERR_PTR(ret)); 1120 1120 goto send_err_msg; 1121 1121 } 1122 1122 ··· 1126 1126 ret = send_io_resp_imm(con, id, ret); 1127 1127 if (ret < 0) { 1128 1128 rtrs_err_rl(s, 1129 - "Processing write request failed, sending I/O response failed, msg_id %d, err: %d\n", 1130 - buf_id, ret); 1129 + "Processing write request failed, sending I/O response failed, msg_id %d, err: %pe\n", 1130 + buf_id, ERR_PTR(ret)); 1131 1131 close_path(srv_path); 1132 1132 } 1133 1133 rtrs_srv_put_ops_ids(srv_path); ··· 1257 1257 srv_path->s.hb_missed_cnt = 0; 1258 1258 err = rtrs_post_recv_empty(&con->c, &io_comp_cqe); 1259 1259 if (err) { 1260 - rtrs_err(s, "rtrs_post_recv(), err: %d\n", err); 1260 + rtrs_err(s, "rtrs_post_recv(), err: %pe\n", 1261 + ERR_PTR(err)); 1261 1262 close_path(srv_path); 1262 1263 break; 1263 1264 } ··· 1283 1282 mr->msg_id = msg_id; 1284 1283 err = rtrs_srv_inv_rkey(con, mr); 1285 1284 if (err) { 1286 - rtrs_err(s, "rtrs_post_recv(), err: %d\n", 1287 - err); 1285 + rtrs_err(s, "rtrs_post_recv(), err: %pe\n", 1286 + ERR_PTR(err)); 1288 1287 close_path(srv_path); 1289 1288 break; 1290 1289 } ··· 1633 1632 1634 1633 err = rdma_accept(cm_id, &param); 1635 1634 if (err) 1636 - pr_err("rdma_accept(), err: %d\n", err); 1635 + pr_err("rdma_accept(), err: %pe\n", ERR_PTR(err)); 1637 1636 1638 1637 return err; 1639 1638 } ··· 1651 1650 1652 1651 err = rdma_reject(cm_id, &msg, sizeof(msg), IB_CM_REJ_CONSUMER_DEFINED); 1653 1652 if (err) 1654 - pr_err("rdma_reject(), err: %d\n", err); 1653 + pr_err("rdma_reject(), err: %pe\n", ERR_PTR(err)); 1655 1654 1656 1655 /* Bounce errno back */ 1657 1656 return errno; ··· 1727 1726 max_send_wr, max_recv_wr, 1728 1727 IB_POLL_WORKQUEUE); 1729 1728 if (err) { 1730 - rtrs_err(s, "rtrs_cq_qp_create(), err: %d\n", err); 1729 + rtrs_err(s, "rtrs_cq_qp_create(), err: %pe\n", ERR_PTR(err)); 1731 1730 goto free_con; 1732 1731 } 1733 1732 if (con->c.cid == 0) { ··· 1942 1941 } 1943 1942 err = create_con(srv_path, cm_id, cid); 1944 1943 if (err) { 1945 - rtrs_err((&srv_path->s), "create_con(), error %d\n", err); 1944 + rtrs_err((&srv_path->s), "create_con(), error %pe\n", ERR_PTR(err)); 1946 1945 rtrs_rdma_do_reject(cm_id, err); 1947 1946 /* 1948 1947 * Since session has other connections we follow normal way ··· 1953 1952 } 1954 1953 err = rtrs_rdma_do_accept(srv_path, cm_id); 1955 1954 if (err) { 1956 - rtrs_err((&srv_path->s), "rtrs_rdma_do_accept(), error %d\n", err); 1955 + rtrs_err((&srv_path->s), "rtrs_rdma_do_accept(), error %pe\n", 1956 + ERR_PTR(err)); 1957 1957 rtrs_rdma_do_reject(cm_id, err); 1958 1958 /* 1959 1959 * Since current connection was successfully added to the ··· 2005 2003 case RDMA_CM_EVENT_REJECTED: 2006 2004 case RDMA_CM_EVENT_CONNECT_ERROR: 2007 2005 case RDMA_CM_EVENT_UNREACHABLE: 2008 - rtrs_err(s, "CM error (CM event: %s, err: %d)\n", 2009 - rdma_event_msg(ev->event), ev->status); 2006 + rtrs_err(s, "CM error (CM event: %s, err: %pe)\n", 2007 + rdma_event_msg(ev->event), ERR_PTR(ev->status)); 2010 2008 fallthrough; 2011 2009 case RDMA_CM_EVENT_DISCONNECTED: 2012 2010 case RDMA_CM_EVENT_ADDR_CHANGE: ··· 2015 2013 close_path(srv_path); 2016 2014 break; 2017 2015 default: 2018 - pr_err("Ignoring unexpected CM event %s, err %d\n", 2019 - rdma_event_msg(ev->event), ev->status); 2016 + pr_err("Ignoring unexpected CM event %s, err %pe\n", 2017 + rdma_event_msg(ev->event), ERR_PTR(ev->status)); 2020 2018 break; 2021 2019 } 2022 2020 ··· 2040 2038 } 2041 2039 ret = rdma_bind_addr(cm_id, addr); 2042 2040 if (ret) { 2043 - pr_err("Binding RDMA address failed, err: %d\n", ret); 2041 + pr_err("Binding RDMA address failed, err: %pe\n", ERR_PTR(ret)); 2044 2042 goto err_cm; 2045 2043 } 2046 2044 ret = rdma_listen(cm_id, 64); 2047 2045 if (ret) { 2048 - pr_err("Listening on RDMA connection failed, err: %d\n", 2049 - ret); 2046 + pr_err("Listening on RDMA connection failed, err: %pe\n", 2047 + ERR_PTR(ret)); 2050 2048 goto err_cm; 2051 2049 } 2052 2050 ··· 2324 2322 2325 2323 err = check_module_params(); 2326 2324 if (err) { 2327 - pr_err("Failed to load module, invalid module parameters, err: %d\n", 2328 - err); 2325 + pr_err("Failed to load module, invalid module parameters, err: %pe\n", 2326 + ERR_PTR(err)); 2329 2327 return err; 2330 2328 } 2331 2329 err = class_register(&rtrs_dev_class);

+6 -3

drivers/infiniband/ulp/rtrs/rtrs.c

··· 273 273 274 274 ret = rdma_create_qp(cm_id, pd, &init_attr); 275 275 if (ret) { 276 - rtrs_err(con->path, "Creating QP failed, err: %d\n", ret); 276 + rtrs_err(con->path, "Creating QP failed, err: %pe\n", 277 + ERR_PTR(ret)); 277 278 return ret; 278 279 } 279 280 con->qp = cm_id->qp; ··· 342 341 err = rtrs_post_rdma_write_imm_empty(usr_con, path->hb_cqe, imm, 343 342 NULL); 344 343 if (err) { 345 - rtrs_err(path, "send HB ACK failed, errno: %d\n", err); 344 + rtrs_err(path, "send HB ACK failed, errno: %pe\n", 345 + ERR_PTR(err)); 346 346 path->hb_err_handler(usr_con); 347 347 return; 348 348 } ··· 377 375 err = rtrs_post_rdma_write_imm_empty(usr_con, path->hb_cqe, imm, 378 376 NULL); 379 377 if (err) { 380 - rtrs_err(path, "HB send failed, errno: %d\n", err); 378 + rtrs_err(path, "HB send failed, errno: %pe\n", 379 + ERR_PTR(err)); 381 380 path->hb_err_handler(usr_con); 382 381 return; 383 382 }

Configure Feed

Configure Feed