[dpdk-dev] [PATCH 1/3] net/sfc: move Rx checksum offload check to device level

[Andrew Rybchenko]

Rx checksum offloads are on device level and should be checked and
enforced on device level.

Avoid logging of Rx checksum offloads enforced for each Rx queue.

Fixes: ff6a1197c3b1 ("net/sfc: convert to new Rx offload API")
Cc: sta...@dpdk.org

Signed-off-by: Andrew Rybchenko <arybche...@solarflare.com>
Reviewed-by: Ivan Malov <ivan.ma...@oktetlabs.ru>
---
 drivers/net/sfc/sfc_rx.c | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/drivers/net/sfc/sfc_rx.c b/drivers/net/sfc/sfc_rx.c
index 158c8e94b..6ff922770 100644
--- a/drivers/net/sfc/sfc_rx.c
+++ b/drivers/net/sfc/sfc_rx.c
@@ -817,10 +817,8 @@ sfc_rx_get_queue_offload_caps(struct sfc_adapter *sa)
 static int
 sfc_rx_qcheck_conf(struct sfc_adapter *sa, unsigned int rxq_max_fill_level,
                   const struct rte_eth_rxconf *rx_conf,
-                  uint64_t offloads)
+                  __rte_unused uint64_t offloads)
 {
-       uint64_t offloads_supported = sfc_rx_get_dev_offload_caps(sa) |
-                                     sfc_rx_get_queue_offload_caps(sa);
        int rc = 0;
 
        if (rx_conf->rx_thresh.pthresh != 0 ||
@@ -842,14 +840,6 @@ sfc_rx_qcheck_conf(struct sfc_adapter *sa, unsigned int 
rxq_max_fill_level,
                rc = EINVAL;
        }
 
-       if ((offloads & DEV_RX_OFFLOAD_CHECKSUM) !=
-           DEV_RX_OFFLOAD_CHECKSUM)
-               sfc_warn(sa, "Rx checksum offloads cannot be disabled - always 
on (IPv4/TCP/UDP)");
-
-       if ((offloads_supported & DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM) &&
-           (~offloads & DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM))
-               sfc_warn(sa, "Rx outer IPv4 checksum offload cannot be disabled 
- always on");
-
        return rc;
 }
 
@@ -1424,6 +1414,8 @@ sfc_rx_qinit_info(struct sfc_adapter *sa, unsigned int 
sw_index)
 static int
 sfc_rx_check_mode(struct sfc_adapter *sa, struct rte_eth_rxmode *rxmode)
 {
+       uint64_t offloads_supported = sfc_rx_get_dev_offload_caps(sa) |
+                                     sfc_rx_get_queue_offload_caps(sa);
        struct sfc_rss *rss = &sa->rss;
        int rc = 0;
 
@@ -1451,6 +1443,18 @@ sfc_rx_check_mode(struct sfc_adapter *sa, struct 
rte_eth_rxmode *rxmode)
                rxmode->offloads |= DEV_RX_OFFLOAD_CRC_STRIP;
        }
 
+       if ((rxmode->offloads & DEV_RX_OFFLOAD_CHECKSUM) !=
+           DEV_RX_OFFLOAD_CHECKSUM) {
+               sfc_warn(sa, "Rx checksum offloads cannot be disabled - always 
on (IPv4/TCP/UDP)");
+               rxmode->offloads |= DEV_RX_OFFLOAD_CHECKSUM;
+       }
+
+       if ((offloads_supported & DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM) &&
+           (~rxmode->offloads & DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM)) {
+               sfc_warn(sa, "Rx outer IPv4 checksum offload cannot be disabled 
- always on");
+               rxmode->offloads |= DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM;
+       }
+
        return rc;
 }
 
-- 
2.17.1