LU-13501 lnet: Skip health and resends for single rail configs

[fs/lustre-release.git] / lnet / klnds / socklnd / socklnd.h

diff --git a/lnet/klnds/socklnd/socklnd.h b/lnet/klnds/socklnd/socklnd.h
index a6b760c..950c756 100644 (file)
--- a/lnet/klnds/socklnd/socklnd.h
+++ b/lnet/klnds/socklnd/socklnd.h
@@ -255,31 +255,23 @@ struct ksock_tx {                 /* transmit packet */
        int            tx_nob;         /* # packet bytes */
        int            tx_resid;       /* residual bytes */
        int            tx_niov;        /* # packet kvec frags */
-       struct kvec  *tx_iov;         /* packet kvec frags */
         int            tx_nkiov;       /* # packet page frags */
         unsigned short tx_zc_aborted;  /* aborted ZC request */
         unsigned short tx_zc_capable:1; /* payload is large enough for ZC */
         unsigned short tx_zc_checked:1; /* Have I checked if I should ZC? */
         unsigned short tx_nonblk:1;    /* it's a non-blocking ACK */
        struct bio_vec *tx_kiov;        /* packet page frags */
-       struct ksock_conn *tx_conn;        /* owning conn */
-       struct lnet_msg   *tx_lnetmsg;  /* lnet message for lnet_finalize() */
-       time64_t           tx_deadline; /* when (in secs) tx times out */
-       struct ksock_msg   tx_msg;         /* socklnd message buffer */
-        int            tx_desc_size;   /* size of this descriptor */
+       struct ksock_conn *tx_conn;     /* owning conn */
+       struct lnet_msg *tx_lnetmsg;    /* lnet message for lnet_finalize() */
+       time64_t        tx_deadline;    /* when (in secs) tx times out */
+       struct ksock_msg tx_msg;        /* socklnd message buffer */
+       int             tx_desc_size;   /* size of this descriptor */
        enum lnet_msg_hstatus tx_hstatus; /* health status of tx */
-        union {
-                struct {
-                       struct kvec iov;        /* virt hdr */
-                       struct bio_vec kiov[0]; /* paged payload */
-                }                  paged;
-                struct {
-                       struct kvec iov[1];     /* virt hdr + payload */
-                }                  virt;
-        }                       tx_frags;
+       struct kvec     tx_hdr;         /* virt hdr */
+       struct bio_vec  tx_payload[0];  /* paged payload */
 };
 
-#define KSOCK_NOOP_TX_SIZE  ((int)offsetof(struct ksock_tx, tx_frags.paged.kiov[0]))
+#define KSOCK_NOOP_TX_SIZE  ((int)offsetof(struct ksock_tx, tx_payload[0]))
 
 /* network zero copy callback descriptor embedded in struct ksock_tx */
 
@@ -469,12 +461,12 @@ static inline __u32 ksocknal_csum(__u32 crc, unsigned char const *p, size_t len)
 static inline int
 ksocknal_route_mask(void)
 {
-        if (!*ksocknal_tunables.ksnd_typed_conns)
-                return (1 << SOCKLND_CONN_ANY);
+       if (!*ksocknal_tunables.ksnd_typed_conns)
+               return BIT(SOCKLND_CONN_ANY);
 
-        return ((1 << SOCKLND_CONN_CONTROL) |
-                (1 << SOCKLND_CONN_BULK_IN) |
-                (1 << SOCKLND_CONN_BULK_OUT));
+       return (BIT(SOCKLND_CONN_CONTROL) |
+               BIT(SOCKLND_CONN_BULK_IN) |
+               BIT(SOCKLND_CONN_BULK_OUT));
 }
 
 static inline void
@@ -575,13 +567,20 @@ ksocknal_peer_decref(struct ksock_peer_ni *peer_ni)
                ksocknal_destroy_peer(peer_ni);
 }
 
+static inline int ksocknal_timeout(void)
+{
+       return *ksocknal_tunables.ksnd_timeout ?
+               *ksocknal_tunables.ksnd_timeout :
+               lnet_get_lnd_timeout();
+}
+
 int ksocknal_startup(struct lnet_ni *ni);
 void ksocknal_shutdown(struct lnet_ni *ni);
 int ksocknal_ctl(struct lnet_ni *ni, unsigned int cmd, void *arg);
 int ksocknal_send(struct lnet_ni *ni, void *private, struct lnet_msg *lntmsg);
 int ksocknal_recv(struct lnet_ni *ni, void *private, struct lnet_msg *lntmsg,
                  int delayed, unsigned int niov,
-                 struct kvec *iov, struct bio_vec *kiov,
+                 struct bio_vec *kiov,
                   unsigned int offset, unsigned int mlen, unsigned int rlen);
 int ksocknal_accept(struct lnet_ni *ni, struct socket *sock);
 
@@ -641,7 +640,7 @@ extern void ksocknal_lib_reset_callback(struct socket *sock,
 extern void ksocknal_lib_push_conn(struct ksock_conn *conn);
 extern int ksocknal_lib_get_conn_addrs(struct ksock_conn *conn);
 extern int ksocknal_lib_setup_sock(struct socket *so);
-extern int ksocknal_lib_send_iov(struct ksock_conn *conn, struct ksock_tx *tx,
+extern int ksocknal_lib_send_hdr(struct ksock_conn *conn, struct ksock_tx *tx,
                                 struct kvec *scratch_iov);
 extern int ksocknal_lib_send_kiov(struct ksock_conn *conn, struct ksock_tx *tx,
                                  struct kvec *scratch_iov);