RDMA/rtrs: Avoid Wtautological-constant-out-of-range-compare
authorJack Wang <jinpu.wang@ionos.com>
Mon, 31 May 2021 12:28:35 +0000 (14:28 +0200)
committerJason Gunthorpe <jgg@nvidia.com>
Mon, 31 May 2021 18:38:08 +0000 (15:38 -0300)
drivers/infiniband/ulp/rtrs/rtrs-clt.c:1786:19: warning: result of comparison of
constant 'MAX_SESS_QUEUE_DEPTH' (65536) with expression of type 'u16'
(aka 'unsigned short') is always false [-Wtautological-constant-out-of-range-compare]

To fix it, limit MAX_SESS_QUEUE_DEPTH to u16 max, which is 65535, and
drop the check in rtrs-clt, as it's the type u16 max.

Link: https://lore.kernel.org/r/20210531122835.58329-1-jinpu.wang@ionos.com
Signed-off-by: Jack Wang <jinpu.wang@ionos.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
drivers/infiniband/ulp/rtrs/rtrs-clt.c
drivers/infiniband/ulp/rtrs/rtrs-pri.h

index 8e05a71d8da1f2406c035826f5f004b29bd4aed7..f1fd7ae9ac5378fe767d37b3d448c17a5cd86fac 100644 (file)
@@ -1775,11 +1775,6 @@ static int rtrs_rdma_conn_established(struct rtrs_clt_con *con,
        if (con->c.cid == 0) {
                queue_depth = le16_to_cpu(msg->queue_depth);
 
-               if (queue_depth > MAX_SESS_QUEUE_DEPTH) {
-                       rtrs_err(clt, "Invalid RTRS message: queue=%d\n",
-                                 queue_depth);
-                       return -ECONNRESET;
-               }
                if (sess->queue_depth > 0 && queue_depth != sess->queue_depth) {
                        rtrs_err(clt, "Error: queue depth changed\n");
 
index 1705197b8c2263c55941b87777db7c95ba6306e8..bd06a79fd516700b24f6ab9559c5a7fddec478e5 100644 (file)
@@ -53,9 +53,9 @@ enum {
         * But mempool_create, create_qp and ib_post_send fail with
         * "cannot allocate memory" error if sess_queue_depth is too big.
         * Therefore the pratical max value of sess_queue_depth is
-        * somewhere between 1 and 65536 and it depends on the system.
+        * somewhere between 1 and 65534 and it depends on the system.
         */
-       MAX_SESS_QUEUE_DEPTH = 65536,
+       MAX_SESS_QUEUE_DEPTH = 65535,
        MIN_CHUNK_SIZE = 8192,
 
        RTRS_HB_INTERVAL_MS = 5000,