[infiniband] Centralise assumption of 2048-byte payloads

IPoIB and the SMA have separate constants for the packet size to be
used to I/O buffer allocations.  Merge these into the single
IB_MAX_PAYLOAD_SIZE constant.

(Various other points in the Infiniband stack have hard-coded
assumptions of a 2048-byte payload; we don't currently support
variable MTUs.)

diff --git a/src/drivers/net/ipoib.c b/src/drivers/net/ipoib.c
index 51223e6d98d19827359de9653b368a11abeba612..03dfa53ac9d5730baed7659c3663932ca098a306 100644 (file)
--- a/src/drivers/net/ipoib.c
+++ b/src/drivers/net/ipoib.c
@@ -838,7 +838,7 @@ static int ipoib_open ( struct net_device *netdev ) {
                                     IPOIB_META_NUM_CQES, &ipoib_meta_cq_op,
                                     IPOIB_META_NUM_SEND_WQES,
                                     IPOIB_META_NUM_RECV_WQES,
-                                    IPOIB_PKT_LEN, IB_GLOBAL_QKEY ) ) != 0 ) {
+                                    IB_GLOBAL_QKEY ) ) != 0 ) {
                DBGC ( ipoib, "IPoIB %p could not allocate metadata QP: %s\n",
                       ipoib, strerror ( rc ) );
                goto err_create_meta_qset;
@@ -850,7 +850,7 @@ static int ipoib_open ( struct net_device *netdev ) {
                                     IPOIB_DATA_NUM_CQES, &ipoib_data_cq_op,
                                     IPOIB_DATA_NUM_SEND_WQES,
                                     IPOIB_DATA_NUM_RECV_WQES,
-                                    IPOIB_PKT_LEN, IB_GLOBAL_QKEY ) ) != 0 ) {
+                                    IB_GLOBAL_QKEY ) ) != 0 ) {
                DBGC ( ipoib, "IPoIB %p could not allocate data QP: %s\n",
                       ipoib, strerror ( rc ) );
                goto err_create_data_qset;
@@ -1040,7 +1040,7 @@ struct net_device * alloc_ipoibdev ( size_t priv_size ) {
        if ( netdev ) {
                netdev->ll_protocol = &ipoib_protocol;
                netdev->ll_broadcast = ( uint8_t * ) &ipoib_broadcast;
-               netdev->max_pkt_len = IPOIB_PKT_LEN;
+               netdev->max_pkt_len = IB_MAX_PAYLOAD_SIZE;
        }
        return netdev;
 }

diff --git a/src/include/gpxe/ib_qset.h b/src/include/gpxe/ib_qset.h
index 90c92a58917f60bc52acf70fcd3ede8ac770e200..d7a76178e0ad145ee5fd48ddf005b949625ca862 100644 (file)
--- a/src/include/gpxe/ib_qset.h
+++ b/src/include/gpxe/ib_qset.h
@@ -20,16 +20,13 @@ struct ib_queue_set {
        struct ib_queue_pair *qp;
        /** Receive work queue maximum fill level */
        unsigned int recv_max_fill;
-       /** Receive packet length */
-       size_t recv_pkt_len;
 };
 
 extern int ib_create_qset ( struct ib_device *ibdev,
                            struct ib_queue_set *qset, unsigned int num_cqes,
                            struct ib_completion_queue_operations *cq_op,
                            unsigned int num_send_wqes,
-                           unsigned int num_recv_wqes, size_t recv_pkt_len,
-                           unsigned long qkey );
+                           unsigned int num_recv_wqes, unsigned long qkey );
 extern void ib_qset_refill_recv ( struct ib_device *ibdev,
                                  struct ib_queue_set *qset );
 extern void ib_destroy_qset ( struct ib_device *ibdev,

diff --git a/src/include/gpxe/ib_sma.h b/src/include/gpxe/ib_sma.h
index af40a48a28720e856c52cacda5dae053dcbe3a1f..6d984804a2cbb00853d2ea2a4a3968ad366817ee 100644 (file)
--- a/src/include/gpxe/ib_sma.h
+++ b/src/include/gpxe/ib_sma.h
@@ -37,9 +37,6 @@ struct ib_sma {
        struct process poll;
 };
 
-/** SMA payload size allocated for received packets */
-#define IB_SMA_PAYLOAD_LEN 2048
-
 /** SMA number of send WQEs
  *
  * This is a policy decision.

diff --git a/src/include/gpxe/infiniband.h b/src/include/gpxe/infiniband.h
index 406933b6a7078deaa640534c603c89927a820264..6cfceda663385b92d0c96fc9f79be151bdc6ed86 100644 (file)
--- a/src/include/gpxe/infiniband.h
+++ b/src/include/gpxe/infiniband.h
@@ -24,6 +24,14 @@ FILE_LICENCE ( GPL2_OR_LATER );
 /** Subnet administrator queue key */
 #define IB_GLOBAL_QKEY 0x80010000UL
 
+/**
+ * Maximum payload size
+ *
+ * This is currently hard-coded in various places (drivers, subnet
+ * management agent, etc.) to 2048.
+ */
+#define IB_MAX_PAYLOAD_SIZE 2048
+
 struct ib_device;
 struct ib_queue_pair;
 struct ib_address_vector;

diff --git a/src/include/gpxe/ipoib.h b/src/include/gpxe/ipoib.h
index 79d7b3fbcacf18b70204a2b6a915552a405774fe..f8231db0818dc8891fcc646120b178a8b98e8307 100644 (file)
--- a/src/include/gpxe/ipoib.h
+++ b/src/include/gpxe/ipoib.h
@@ -10,9 +10,6 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <gpxe/infiniband.h>
 
-/** IPoIB packet length */
-#define IPOIB_PKT_LEN 2048
-
 /** IPoIB MAC address length */
 #define IPOIB_ALEN 20
 

diff --git a/src/net/infiniband.c b/src/net/infiniband.c
index 1c19fada49c931d089510da031b96c3bbddd69a1..4784f4044fef84e9f18eda1af5943b6b3eb78eb8 100644 (file)
--- a/src/net/infiniband.c
+++ b/src/net/infiniband.c
@@ -345,6 +345,13 @@ int ib_post_recv ( struct ib_device *ibdev, struct ib_queue_pair *qp,
                   struct io_buffer *iobuf ) {
        int rc;
 
+       /* Check packet length */
+       if ( iob_tailroom ( iobuf ) < IB_MAX_PAYLOAD_SIZE ) {
+               DBGC ( ibdev, "IBDEV %p QPN %#lx wrong RX buffer size (%zd)\n",
+                      ibdev, qp->qpn, iob_tailroom ( iobuf ) );
+               return -EINVAL;
+       }
+
        /* Check queue fill level */
        if ( qp->recv.fill >= qp->recv.num_wqes ) {
                DBGC ( ibdev, "IBDEV %p QPN %#lx receive queue full\n",

diff --git a/src/net/infiniband/ib_qset.c b/src/net/infiniband/ib_qset.c
index 1972b7abff9b617b82b89e4eb048e9fb3d665863..799489f946bdeb834b6faa1f25c3fc5672e5cc76 100644 (file)
--- a/src/net/infiniband/ib_qset.c
+++ b/src/net/infiniband/ib_qset.c
@@ -40,7 +40,6 @@ FILE_LICENCE ( GPL2_OR_LATER );
  * @v cq_op            Completion queue operations
  * @v num_send_wqes    Number of send work queue entries
  * @v num_recv_wqes    Number of receive work queue entries
- * @v recv_pkt_len     Receive packet length
  * @v qkey             Queue key
  * @ret rc             Return status code
  */
@@ -48,7 +47,7 @@ int ib_create_qset ( struct ib_device *ibdev, struct ib_queue_set *qset,
                     unsigned int num_cqes,
                     struct ib_completion_queue_operations *cq_op,
                     unsigned int num_send_wqes, unsigned int num_recv_wqes,
-                    size_t recv_pkt_len, unsigned long qkey ) {
+                    unsigned long qkey ) {
        int rc;
 
        /* Sanity check */
@@ -57,7 +56,6 @@ int ib_create_qset ( struct ib_device *ibdev, struct ib_queue_set *qset,
 
        /* Store queue parameters */
        qset->recv_max_fill = num_recv_wqes;
-       qset->recv_pkt_len = recv_pkt_len;
 
        /* Allocate completion queue */
        qset->cq = ib_create_cq ( ibdev, num_cqes, cq_op );
@@ -99,7 +97,7 @@ void ib_qset_refill_recv ( struct ib_device *ibdev,
        while ( qset->qp->recv.fill < qset->recv_max_fill ) {
 
                /* Allocate I/O buffer */
-               iobuf = alloc_iob ( qset->recv_pkt_len );
+               iobuf = alloc_iob ( IB_MAX_PAYLOAD_SIZE );
                if ( ! iobuf ) {
                        /* Non-fatal; we will refill on next attempt */
                        return;

diff --git a/src/net/infiniband/ib_sma.c b/src/net/infiniband/ib_sma.c
index cfc881c5cd29cef74d9476eb6461e61810e8d669..b83d20ea1d249f3fcdec34bc64d997fe2f9b7329 100644 (file)
--- a/src/net/infiniband/ib_sma.c
+++ b/src/net/infiniband/ib_sma.c
@@ -361,7 +361,7 @@ static void ib_sma_refill_recv ( struct ib_sma *sma ) {
        while ( sma->qp->recv.fill < IB_SMA_NUM_RECV_WQES ) {
 
                /* Allocate I/O buffer */
-               iobuf = alloc_iob ( IB_SMA_PAYLOAD_LEN );
+               iobuf = alloc_iob ( IB_MAX_PAYLOAD_SIZE );
                if ( ! iobuf ) {
                        /* Non-fatal; we will refill on next attempt */
                        return;