[17/50] lnet: change lnet_prep_send to take net_processid

Message ID	1647783064-20688-18-git-send-email-jsimmons@infradead.org (mailing list archive)
State	New, archived
Headers	show Return-Path: <lustre-devel-bounces@lists.lustre.org> From: James Simmons <jsimmons@infradead.org> To: Andreas Dilger <adilger@whamcloud.com>, Oleg Drokin <green@whamcloud.com>, NeilBrown <neilb@suse.de> Date: Sun, 20 Mar 2022 09:30:31 -0400 Message-Id: <1647783064-20688-18-git-send-email-jsimmons@infradead.org> In-Reply-To: <1647783064-20688-1-git-send-email-jsimmons@infradead.org> References: <1647783064-20688-1-git-send-email-jsimmons@infradead.org> Subject: [lustre-devel] [PATCH 17/50] lnet: change lnet_prep_send to take net_processid Precedence: list Cc: Lustre Development List <lustre-devel@lists.lustre.org> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: lustre-devel-bounces@lists.lustre.org Sender: "lustre-devel" <lustre-devel-bounces@lists.lustre.org>
Series	lustre: update to OpenSFS tree as of March 20, 2022 \| expand [00/50] lustre: update to OpenSFS tree as of March 20, 2022 [01/50] lustre: type cleanups and remove debug statements [02/50] lustre: osc: Fix grant test for ARM [03/50] lnet: extend nids in struct lnet_msg [04/50] lnet: Change lnet_send() to take large-addr nids [05/50] lnet: use large nids in struct lnet_event [06/50] lnet: socklnd: prepare for new KSOCK_MSG type [07/50] lnet: socklnd: don't deref lnet_hdr in LNDs [08/50] lustre: sec: make client encryption compatible with ext4 [09/50] lustre: sec: allow subdir mount of encrypted dir [10/50] lustre: fld: repeat rpc in fld_client_rpc after EAGAIN [11/50] lustre: fld: don't obtain a slot for fld request [12/50] lustre: update version to 2.14.57 [13/50] lustre: llite: deadlock in ll_new_node() [14/50] lnet: o2iblnd: avoid static allocation for msg tx [15/50] lnet: separate lnet_hdr in msg from that in lnd. [16/50] lnet: change lnet_hdr to store large nids. [17/50] lnet: change lnet_prep_send to take net_processid [18/50] lnet: convert to struct lnet_process_id in lib-move [19/50] lnet: convert LNetGetID to return an large-addr pid [20/50] lnet: alter lnd_notify_peer_down() to take lnet_nid [21/50] lnet: socklnd: move lnet_hdr unpack into ->pro_unpack [22/50] lnet: socklnd: Change ksock_hello_msg to struct lnet_nid [23/50] lnet: socklnd: add hello message version 4 [24/50] lnet: Convert ping to support 16-bytes address [25/50] lnet: convert nids in lnet_parse to lnet_nid [26/50] lnet: change src_nid arg to lnet_parse() to 16byte [27/50] lnet: Fix NULL-deref in lnet_nidstr_r() [28/50] lnet: change lnet_del_route() to take lnet_nid [29/50] lustre: llite: Move free user pages [30/50] lustre: llite: Do not get/put DIO pages [31/50] lustre: llite: Remove unnecessary page get/put [32/50] lustre: llite: LL_IOC_LMV_GETSTRIPE 'default' shows inherit layout [33/50] lustre: hsm: update size upon completion of data version [34/50] lustre: llite: Delay dput in ll_dirty_page_discard_warn [35/50] lnet: libcfs: Use FAIL_CHECK_QUIET for fake i/o [36/50] lnet: Avoid peer NI recovery for local interface [37/50] lustre: osc: add OBD_IOC_GETATTR support for osc [38/50] lustre: sec: present .fscrypt in subdir mount [39/50] lnet: improve hash distribution across CPTs [40/50] lustre: osc: osc_extent_wait() deadlock [41/50] lustre: quota: delete unused quota ID [42/50] lnet: Check LNET_NID_IS_ANY in LNET_NID_NET [43/50] lustre: llite: clear async errors on write commit sync [44/50] lnet: lnet_peer_data_present() memory leak [45/50] lnet: Don't use pref NI for reserved portal [46/50] lnet: o2iblnd: avoid memory copy for short msg [47/50] lustre: llite: set default LMV hash type with 2.12 MDS [48/50] lnet: Stop discovery on deleted peer NI [49/50] lustre: sec: fix DIO for encrypted files [50/50] lustre: ptlrpc: Use after free of 'conn' in rhashtable retry

diff --git a/include/linux/lnet/lib-lnet.h b/include/linux/lnet/lib-lnet.h index 8c4940f..ce18897 100644 --- a/include/linux/lnet/lib-lnet.h +++ b/include/linux/lnet/lib-lnet.h @@ -613,7 +613,7 @@ void lnet_msg_attach_md(struct lnet_msg *msg, struct lnet_libmd *md, void lnet_msg_decommit(struct lnet_msg *msg, int cpt, int status); void lnet_prep_send(struct lnet_msg *msg, int type, - struct lnet_process_id target, unsigned int offset, + struct lnet_processid *target, unsigned int offset, unsigned int len); int lnet_send(struct lnet_nid *nid, struct lnet_msg *msg, struct lnet_nid *rtr_nid); diff --git a/net/lnet/lnet/lib-move.c b/net/lnet/lnet/lib-move.c index f4c24ff..1c72ea2 100644 --- a/net/lnet/lnet/lib-move.c +++ b/net/lnet/lnet/lib-move.c @@ -513,12 +513,11 @@ void lnet_usr_translate_stats(struct lnet_ioctl_element_msg_stats *msg_stats, } void -lnet_prep_send(struct lnet_msg *msg, int type, struct lnet_process_id target, +lnet_prep_send(struct lnet_msg *msg, int type, struct lnet_processid *target, unsigned int offset, unsigned int len) { msg->msg_type = type; - msg->msg_target.pid = target.pid; - lnet_nid4_to_nid(target.nid, &msg->msg_target.nid); + msg->msg_target = *target; msg->msg_len = len; msg->msg_offset = offset; @@ -528,8 +527,8 @@ void lnet_usr_translate_stats(struct lnet_ioctl_element_msg_stats *msg_stats, memset(&msg->msg_hdr, 0, sizeof(msg->msg_hdr)); msg->msg_hdr.type = type; /* dest_nid will be overwritten by lnet_select_pathway() */ - lnet_nid4_to_nid(target.nid, &msg->msg_hdr.dest_nid); - msg->msg_hdr.dest_pid = target.pid; + msg->msg_hdr.dest_nid = target->nid; + msg->msg_hdr.dest_pid = target->pid; /* src_nid will be set later */ msg->msg_hdr.src_pid = the_lnet.ln_pid; msg->msg_hdr.payload_length = len; @@ -3978,7 +3977,7 @@ void lnet_monitor_thr_stop(void) { struct lnet_match_info info; struct lnet_hdr *hdr = &msg->msg_hdr; - struct lnet_process_id source_id; + struct lnet_processid source_id; struct lnet_handle_wire reply_wmd; int rc; @@ -3988,7 +3987,7 @@ void lnet_monitor_thr_stop(void) le32_to_cpus(&hdr->msg.get.sink_length); le32_to_cpus(&hdr->msg.get.src_offset); - source_id.nid = lnet_nid_to_nid4(&hdr->src_nid); + source_id.nid = hdr->src_nid; source_id.pid = hdr->src_pid; /* Primary peer NID */ info.mi_id.nid = msg->msg_initiator; @@ -4014,7 +4013,7 @@ void lnet_monitor_thr_stop(void) reply_wmd = hdr->msg.get.return_wmd; - lnet_prep_send(msg, LNET_MSG_REPLY, source_id, + lnet_prep_send(msg, LNET_MSG_REPLY, &source_id, msg->msg_offset, msg->msg_wanted); msg->msg_hdr.msg.reply.dst_wmd = reply_wmd; @@ -4702,11 +4701,12 @@ void lnet_monitor_thr_stop(void) */ int LNetPut(lnet_nid_t self4, struct lnet_handle_md mdh, enum lnet_ack_req ack, - struct lnet_process_id target, unsigned int portal, + struct lnet_process_id target4, unsigned int portal, u64 match_bits, unsigned int offset, u64 hdr_data) { struct lnet_rsp_tracker *rspt = NULL; + struct lnet_processid target; struct lnet_msg *msg; struct lnet_libmd *md; struct lnet_nid self; @@ -4716,18 +4716,20 @@ void lnet_monitor_thr_stop(void) LASSERT(the_lnet.ln_refcount > 0); lnet_nid4_to_nid(self4, &self); + lnet_nid4_to_nid(target4.nid, &target.nid); + target.pid = target4.pid; - if (!list_empty(&the_lnet.ln_test_peers) && /* normally we don't */ - fail_peer(target.nid, 1)) { /* shall we now? */ + if (!list_empty(&the_lnet.ln_test_peers) && /* normally we don't */ + fail_peer(target4.nid, 1)) { /* shall we now? */ CERROR("Dropping PUT to %s: simulated failure\n", - libcfs_id2str(target)); + libcfs_id2str(target4)); return -EIO; } msg = kmem_cache_zalloc(lnet_msg_cachep, GFP_NOFS); if (!msg) { CERROR("Dropping PUT to %s: ENOMEM on struct lnet_msg\n", - libcfs_id2str(target)); + libcfs_id2str(target4)); return -ENOMEM; } msg->msg_vmflush = !!(current->flags & PF_MEMALLOC); @@ -4738,7 +4740,7 @@ void lnet_monitor_thr_stop(void) rspt = lnet_rspt_alloc(cpt); if (!rspt) { CERROR("Dropping PUT to %s: ENOMEM on response tracker\n", - libcfs_id2str(target)); + libcfs_id2str(target4)); return -ENOMEM; } INIT_LIST_HEAD(&rspt->rspt_on_list); @@ -4749,7 +4751,7 @@ void lnet_monitor_thr_stop(void) md = lnet_handle2md(&mdh); if (!md || !md->md_threshold || md->md_me) { CERROR("Dropping PUT (%llu:%d:%s): MD (%d) invalid\n", - match_bits, portal, libcfs_id2str(target), + match_bits, portal, libcfs_id2str(target4), !md ? -1 : md->md_threshold); if (md && md->md_me) CERROR("Source MD also attached to portal %d\n", @@ -4763,11 +4765,11 @@ void lnet_monitor_thr_stop(void) return -ENOENT; } - CDEBUG(D_NET, "%s -> %s\n", __func__, libcfs_id2str(target)); + CDEBUG(D_NET, "%s -> %s\n", __func__, libcfs_id2str(target4)); lnet_msg_attach_md(msg, md, 0, 0); - lnet_prep_send(msg, LNET_MSG_PUT, target, 0, md->md_length); + lnet_prep_send(msg, LNET_MSG_PUT, &target, 0, md->md_length); msg->msg_hdr.msg.put.match_bits = cpu_to_le64(match_bits); msg->msg_hdr.msg.put.ptl_index = cpu_to_le32(portal); @@ -4804,7 +4806,7 @@ void lnet_monitor_thr_stop(void) rc = lnet_send(&self, msg, NULL); if (rc) { CNETERR("Error sending PUT to %s: %d\n", - libcfs_id2str(target), rc); + libcfs_id2str(target4), rc); msg->msg_no_resend = true; lnet_finalize(msg, rc); } @@ -4946,10 +4948,11 @@ struct lnet_msg * */ int LNetGet(lnet_nid_t self4, struct lnet_handle_md mdh, - struct lnet_process_id target, unsigned int portal, + struct lnet_process_id target4, unsigned int portal, u64 match_bits, unsigned int offset, bool recovery) { struct lnet_rsp_tracker *rspt; + struct lnet_processid target; struct lnet_msg *msg; struct lnet_libmd *md; struct lnet_nid self; @@ -4959,18 +4962,20 @@ struct lnet_msg * LASSERT(the_lnet.ln_refcount > 0); lnet_nid4_to_nid(self4, &self); + lnet_nid4_to_nid(target4.nid, &target.nid); + target.pid = target4.pid; - if (!list_empty(&the_lnet.ln_test_peers) && /* normally we don't */ - fail_peer(target.nid, 1)) { /* shall we now? */ + if (!list_empty(&the_lnet.ln_test_peers) && /* normally we don't */ + fail_peer(target4.nid, 1)) { /* shall we now? */ CERROR("Dropping GET to %s: simulated failure\n", - libcfs_id2str(target)); + libcfs_id2str(target4)); return -EIO; } msg = kmem_cache_zalloc(lnet_msg_cachep, GFP_NOFS); if (!msg) { CERROR("Dropping GET to %s: ENOMEM on struct lnet_msg\n", - libcfs_id2str(target)); + libcfs_id2str(target4)); return -ENOMEM; } @@ -4979,7 +4984,7 @@ struct lnet_msg * rspt = lnet_rspt_alloc(cpt); if (!rspt) { CERROR("Dropping GET to %s: ENOMEM on response tracker\n", - libcfs_id2str(target)); + libcfs_id2str(target4)); return -ENOMEM; } INIT_LIST_HEAD(&rspt->rspt_on_list); @@ -4991,7 +4996,7 @@ struct lnet_msg * md = lnet_handle2md(&mdh); if (!md || !md->md_threshold || md->md_me) { CERROR("Dropping GET (%llu:%d:%s): MD (%d) invalid\n", - match_bits, portal, libcfs_id2str(target), + match_bits, portal, libcfs_id2str(target4), !md ? -1 : md->md_threshold); if (md && md->md_me) CERROR("REPLY MD also attached to portal %d\n", @@ -5004,11 +5009,11 @@ struct lnet_msg * return -ENOENT; } - CDEBUG(D_NET, "%s -> %s\n", __func__, libcfs_id2str(target)); + CDEBUG(D_NET, "%s -> %s\n", __func__, libcfs_id2str(target4)); lnet_msg_attach_md(msg, md, 0, 0); - lnet_prep_send(msg, LNET_MSG_GET, target, 0, 0); + lnet_prep_send(msg, LNET_MSG_GET, &target, 0, 0); msg->msg_hdr.msg.get.match_bits = cpu_to_le64(match_bits); msg->msg_hdr.msg.get.ptl_index = cpu_to_le32(portal); @@ -5033,7 +5038,7 @@ struct lnet_msg * rc = lnet_send(&self, msg, NULL); if (rc < 0) { CNETERR("Error sending GET to %s: %d\n", - libcfs_id2str(target), rc); + libcfs_id2str(target4), rc); msg->msg_no_resend = true; lnet_finalize(msg, rc); } diff --git a/net/lnet/lnet/lib-msg.c b/net/lnet/lnet/lib-msg.c index 9a4e268..88f017b 100644 --- a/net/lnet/lnet/lib-msg.c +++ b/net/lnet/lnet/lib-msg.c @@ -390,8 +390,7 @@ ack_wmd = msg->msg_hdr.msg.put.ack_wmd; - lnet_prep_send(msg, LNET_MSG_ACK, - lnet_pid_to_pid4(&msg->msg_ev.source), 0, 0); + lnet_prep_send(msg, LNET_MSG_ACK, &msg->msg_ev.source, 0, 0); msg->msg_hdr.msg.ack.dst_wmd = ack_wmd; msg->msg_hdr.msg.ack.match_bits = msg->msg_ev.match_bits;

[17/50] lnet: change lnet_prep_send to take net_processid

Commit Message

Patch