From 85b4877e8544c8300efca640dab3c4dbbef3b97e Mon Sep 17 00:00:00 2001 From: adilger Date: Wed, 12 Nov 2003 06:27:19 +0000 Subject: [PATCH] Don't have a separate (inconsistent) MTU define for portals routers. Print out portals router messages with nicely formatted NIDs. --- lnet/klnds/socklnd/socklnd.h | 8 +------ lnet/klnds/socklnd/socklnd_cb.c | 37 ++++++++++++++++++------------- lnet/klnds/toelnd/toenal.h | 4 +--- lnet/klnds/toelnd/toenal_cb.c | 2 +- lustre/portals/knals/socknal/socknal.h | 8 +------ lustre/portals/knals/socknal/socknal_cb.c | 37 ++++++++++++++++++------------- lustre/portals/knals/toenal/toenal.h | 4 +--- lustre/portals/knals/toenal/toenal_cb.c | 2 +- 8 files changed, 50 insertions(+), 52 deletions(-) diff --git a/lnet/klnds/socklnd/socklnd.h b/lnet/klnds/socklnd/socklnd.h index 8c906e2..227a24f 100644 --- a/lnet/klnds/socklnd/socklnd.h +++ b/lnet/klnds/socklnd/socklnd.h @@ -82,12 +82,6 @@ #define SOCKNAL_PEER_HASH_SIZE 101 /* # peer lists */ -#if PTL_LARGE_MTU -# define SOCKNAL_MAX_FWD_PAYLOAD (256<<10) /* biggest payload I can forward */ -#else -# define SOCKNAL_MAX_FWD_PAYLOAD (64<<10) /* biggest payload I can forward */ -#endif - #define SOCKNAL_NLTXS 128 /* # normal transmit messages */ #define SOCKNAL_NNBLK_LTXS 128 /* # transmit messages reserved if can't block */ @@ -96,7 +90,7 @@ #define SOCKNAL_SMALL_FWD_PAGES 1 /* # pages in a small message fwd buffer */ -#define SOCKNAL_LARGE_FWD_PAGES (PAGE_ALIGN (sizeof (ptl_hdr_t) + SOCKNAL_MAX_FWD_PAYLOAD) >> PAGE_SHIFT) +#define SOCKNAL_LARGE_FWD_PAGES (PAGE_ALIGN (sizeof (ptl_hdr_t) + PTL_MTU) >> PAGE_SHIFT) /* # pages in a large message fwd buffer */ #define SOCKNAL_RESCHED 100 /* # scheduler loops before reschedule */ diff --git a/lnet/klnds/socklnd/socklnd_cb.c b/lnet/klnds/socklnd/socklnd_cb.c index 346d60e..6cd4e73 100644 --- a/lnet/klnds/socklnd/socklnd_cb.c +++ b/lnet/klnds/socklnd/socklnd_cb.c @@ -1406,37 +1406,43 @@ ksocknal_fwd_parse (ksock_conn_t *conn) { ksock_peer_t *peer; ptl_nid_t dest_nid = NTOH__u64 (conn->ksnc_hdr.dest_nid); + ptl_nid_t src_nid = NTOH__u64 (conn->ksnc_hdr.src_nid); int body_len = NTOH__u32 (conn->ksnc_hdr.payload_length); + char str[PTL_NALFMT_SIZE]; CDEBUG (D_NET, "%p "LPX64"->"LPX64" %d parsing header\n", conn, - NTOH__u64 (conn->ksnc_hdr.src_nid), - dest_nid, conn->ksnc_rx_nob_left); + src_nid, dest_nid, conn->ksnc_rx_nob_left); LASSERT (conn->ksnc_rx_state == SOCKNAL_RX_HEADER); LASSERT (conn->ksnc_rx_scheduled); if (body_len < 0) { /* length corrupt (overflow) */ - CERROR("dropping packet from "LPX64" for "LPX64": packet " - "size %d illegal\n", NTOH__u64 (conn->ksnc_hdr.src_nid), - dest_nid, body_len); + CERROR("dropping packet from "LPX64" (%s) for "LPX64" (%s): " + "packet size %d illegal\n", + src_nid, portals_nid2str(TCPNAL, src_nid, str), + dest_nid, portals_nid2str(TCPNAL, dest_nid, str), + body_len); ksocknal_new_packet (conn, 0); /* on to new packet */ return; } if (ksocknal_data.ksnd_fmbs == NULL) { /* not forwarding */ - CERROR("dropping packet from "LPX64" for "LPX64": not " - "forwarding\n", conn->ksnc_hdr.src_nid, - conn->ksnc_hdr.dest_nid); + CERROR("dropping packet from "LPX64" (%s) for "LPX64 + " (%s): not forwarding\n", + src_nid, portals_nid2str(TCPNAL, src_nid, str), + dest_nid, portals_nid2str(TCPNAL, dest_nid, str)); /* on to new packet (skip this one's body) */ ksocknal_new_packet (conn, body_len); return; } - if (body_len > SOCKNAL_MAX_FWD_PAYLOAD) { /* too big to forward */ - CERROR ("dropping packet from "LPX64" for "LPX64 - ": packet size %d too big\n", conn->ksnc_hdr.src_nid, - conn->ksnc_hdr.dest_nid, body_len); + if (body_len > PTL_MTU) { /* too big to forward */ + CERROR ("dropping packet from "LPX64" (%s) for "LPX64 + "(%s): packet size %d too big\n", + src_nid, portals_nid2str(TCPNAL, src_nid, str), + dest_nid, portals_nid2str(TCPNAL, dest_nid, str), + body_len); /* on to new packet (skip this one's body) */ ksocknal_new_packet (conn, body_len); return; @@ -1445,9 +1451,10 @@ ksocknal_fwd_parse (ksock_conn_t *conn) /* should have gone direct */ peer = ksocknal_get_peer (conn->ksnc_hdr.dest_nid); if (peer != NULL) { - CERROR ("dropping packet from "LPX64" for "LPX64 - ": target is a peer\n", conn->ksnc_hdr.src_nid, - conn->ksnc_hdr.dest_nid); + CERROR ("dropping packet from "LPX64" (%s) for "LPX64 + "(%s): target is a peer\n", + src_nid, portals_nid2str(TCPNAL, src_nid, str), + dest_nid, portals_nid2str(TCPNAL, dest_nid, str)); ksocknal_put_peer (peer); /* drop ref from get above */ /* on to next packet (skip this one's body) */ diff --git a/lnet/klnds/toelnd/toenal.h b/lnet/klnds/toelnd/toenal.h index 3654848..b211d6c 100644 --- a/lnet/klnds/toelnd/toenal.h +++ b/lnet/klnds/toelnd/toenal.h @@ -60,8 +60,6 @@ #include #include -#define SOCKNAL_MAX_FWD_PAYLOAD (64<<10) /* biggest payload I can forward */ - #define SOCKNAL_NLTXS 128 /* # normal transmit messages */ #define SOCKNAL_NNBLK_LTXS 128 /* # transmit messages reserved if can't block */ @@ -70,7 +68,7 @@ #define SOCKNAL_SMALL_FWD_PAGES 1 /* # pages in a small message fwd buffer */ -#define SOCKNAL_LARGE_FWD_PAGES (PAGE_ALIGN (sizeof (ptl_hdr_t) + SOCKNAL_MAX_FWD_PAYLOAD) >> PAGE_SHIFT) +#define SOCKNAL_LARGE_FWD_PAGES (PAGE_ALIGN (sizeof (ptl_hdr_t) + PTL_MTU) >> PAGE_SHIFT) /* # pages in a large message fwd buffer */ #define SOCKNAL_RESCHED 100 /* # scheduler loops before reschedule */ diff --git a/lnet/klnds/toelnd/toenal_cb.c b/lnet/klnds/toelnd/toenal_cb.c index 37e3f1e..f7fa794 100644 --- a/lnet/klnds/toelnd/toenal_cb.c +++ b/lnet/klnds/toelnd/toenal_cb.c @@ -718,7 +718,7 @@ ktoenal_fwd_parse (ksock_conn_t *conn) return; } - if (body_len > SOCKNAL_MAX_FWD_PAYLOAD) /* too big to forward */ + if (body_len > PTL_MTU) /* too big to forward */ { CERROR ("dropping packet from "LPX64" for "LPX64": packet size %d too big\n", conn->ksnc_hdr.src_nid, conn->ksnc_hdr.dest_nid, body_len); diff --git a/lustre/portals/knals/socknal/socknal.h b/lustre/portals/knals/socknal/socknal.h index 8c906e2..227a24f 100644 --- a/lustre/portals/knals/socknal/socknal.h +++ b/lustre/portals/knals/socknal/socknal.h @@ -82,12 +82,6 @@ #define SOCKNAL_PEER_HASH_SIZE 101 /* # peer lists */ -#if PTL_LARGE_MTU -# define SOCKNAL_MAX_FWD_PAYLOAD (256<<10) /* biggest payload I can forward */ -#else -# define SOCKNAL_MAX_FWD_PAYLOAD (64<<10) /* biggest payload I can forward */ -#endif - #define SOCKNAL_NLTXS 128 /* # normal transmit messages */ #define SOCKNAL_NNBLK_LTXS 128 /* # transmit messages reserved if can't block */ @@ -96,7 +90,7 @@ #define SOCKNAL_SMALL_FWD_PAGES 1 /* # pages in a small message fwd buffer */ -#define SOCKNAL_LARGE_FWD_PAGES (PAGE_ALIGN (sizeof (ptl_hdr_t) + SOCKNAL_MAX_FWD_PAYLOAD) >> PAGE_SHIFT) +#define SOCKNAL_LARGE_FWD_PAGES (PAGE_ALIGN (sizeof (ptl_hdr_t) + PTL_MTU) >> PAGE_SHIFT) /* # pages in a large message fwd buffer */ #define SOCKNAL_RESCHED 100 /* # scheduler loops before reschedule */ diff --git a/lustre/portals/knals/socknal/socknal_cb.c b/lustre/portals/knals/socknal/socknal_cb.c index 346d60e..6cd4e73 100644 --- a/lustre/portals/knals/socknal/socknal_cb.c +++ b/lustre/portals/knals/socknal/socknal_cb.c @@ -1406,37 +1406,43 @@ ksocknal_fwd_parse (ksock_conn_t *conn) { ksock_peer_t *peer; ptl_nid_t dest_nid = NTOH__u64 (conn->ksnc_hdr.dest_nid); + ptl_nid_t src_nid = NTOH__u64 (conn->ksnc_hdr.src_nid); int body_len = NTOH__u32 (conn->ksnc_hdr.payload_length); + char str[PTL_NALFMT_SIZE]; CDEBUG (D_NET, "%p "LPX64"->"LPX64" %d parsing header\n", conn, - NTOH__u64 (conn->ksnc_hdr.src_nid), - dest_nid, conn->ksnc_rx_nob_left); + src_nid, dest_nid, conn->ksnc_rx_nob_left); LASSERT (conn->ksnc_rx_state == SOCKNAL_RX_HEADER); LASSERT (conn->ksnc_rx_scheduled); if (body_len < 0) { /* length corrupt (overflow) */ - CERROR("dropping packet from "LPX64" for "LPX64": packet " - "size %d illegal\n", NTOH__u64 (conn->ksnc_hdr.src_nid), - dest_nid, body_len); + CERROR("dropping packet from "LPX64" (%s) for "LPX64" (%s): " + "packet size %d illegal\n", + src_nid, portals_nid2str(TCPNAL, src_nid, str), + dest_nid, portals_nid2str(TCPNAL, dest_nid, str), + body_len); ksocknal_new_packet (conn, 0); /* on to new packet */ return; } if (ksocknal_data.ksnd_fmbs == NULL) { /* not forwarding */ - CERROR("dropping packet from "LPX64" for "LPX64": not " - "forwarding\n", conn->ksnc_hdr.src_nid, - conn->ksnc_hdr.dest_nid); + CERROR("dropping packet from "LPX64" (%s) for "LPX64 + " (%s): not forwarding\n", + src_nid, portals_nid2str(TCPNAL, src_nid, str), + dest_nid, portals_nid2str(TCPNAL, dest_nid, str)); /* on to new packet (skip this one's body) */ ksocknal_new_packet (conn, body_len); return; } - if (body_len > SOCKNAL_MAX_FWD_PAYLOAD) { /* too big to forward */ - CERROR ("dropping packet from "LPX64" for "LPX64 - ": packet size %d too big\n", conn->ksnc_hdr.src_nid, - conn->ksnc_hdr.dest_nid, body_len); + if (body_len > PTL_MTU) { /* too big to forward */ + CERROR ("dropping packet from "LPX64" (%s) for "LPX64 + "(%s): packet size %d too big\n", + src_nid, portals_nid2str(TCPNAL, src_nid, str), + dest_nid, portals_nid2str(TCPNAL, dest_nid, str), + body_len); /* on to new packet (skip this one's body) */ ksocknal_new_packet (conn, body_len); return; @@ -1445,9 +1451,10 @@ ksocknal_fwd_parse (ksock_conn_t *conn) /* should have gone direct */ peer = ksocknal_get_peer (conn->ksnc_hdr.dest_nid); if (peer != NULL) { - CERROR ("dropping packet from "LPX64" for "LPX64 - ": target is a peer\n", conn->ksnc_hdr.src_nid, - conn->ksnc_hdr.dest_nid); + CERROR ("dropping packet from "LPX64" (%s) for "LPX64 + "(%s): target is a peer\n", + src_nid, portals_nid2str(TCPNAL, src_nid, str), + dest_nid, portals_nid2str(TCPNAL, dest_nid, str)); ksocknal_put_peer (peer); /* drop ref from get above */ /* on to next packet (skip this one's body) */ diff --git a/lustre/portals/knals/toenal/toenal.h b/lustre/portals/knals/toenal/toenal.h index 3654848..b211d6c 100644 --- a/lustre/portals/knals/toenal/toenal.h +++ b/lustre/portals/knals/toenal/toenal.h @@ -60,8 +60,6 @@ #include #include -#define SOCKNAL_MAX_FWD_PAYLOAD (64<<10) /* biggest payload I can forward */ - #define SOCKNAL_NLTXS 128 /* # normal transmit messages */ #define SOCKNAL_NNBLK_LTXS 128 /* # transmit messages reserved if can't block */ @@ -70,7 +68,7 @@ #define SOCKNAL_SMALL_FWD_PAGES 1 /* # pages in a small message fwd buffer */ -#define SOCKNAL_LARGE_FWD_PAGES (PAGE_ALIGN (sizeof (ptl_hdr_t) + SOCKNAL_MAX_FWD_PAYLOAD) >> PAGE_SHIFT) +#define SOCKNAL_LARGE_FWD_PAGES (PAGE_ALIGN (sizeof (ptl_hdr_t) + PTL_MTU) >> PAGE_SHIFT) /* # pages in a large message fwd buffer */ #define SOCKNAL_RESCHED 100 /* # scheduler loops before reschedule */ diff --git a/lustre/portals/knals/toenal/toenal_cb.c b/lustre/portals/knals/toenal/toenal_cb.c index 37e3f1e..f7fa794 100644 --- a/lustre/portals/knals/toenal/toenal_cb.c +++ b/lustre/portals/knals/toenal/toenal_cb.c @@ -718,7 +718,7 @@ ktoenal_fwd_parse (ksock_conn_t *conn) return; } - if (body_len > SOCKNAL_MAX_FWD_PAYLOAD) /* too big to forward */ + if (body_len > PTL_MTU) /* too big to forward */ { CERROR ("dropping packet from "LPX64" for "LPX64": packet size %d too big\n", conn->ksnc_hdr.src_nid, conn->ksnc_hdr.dest_nid, body_len); -- 1.8.3.1