Merge tag 'xfs-5.18-merge-2' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux

[linux-block.git] / net / ethtool / rings.c

diff --git a/net/ethtool/rings.c b/net/ethtool/rings.c
index 18a5035d3beecea0734bd31fce959d7b796b91e9..9f33c9689b56949dc8cabe05d08a51e5fbe06df0 100644 (file)
--- a/net/ethtool/rings.c
+++ b/net/ethtool/rings.c
@@ -54,7 +54,8 @@ static int rings_reply_size(const struct ethnl_req_info *req_base,
               nla_total_size(sizeof(u32)) +    /* _RINGS_RX_JUMBO */
               nla_total_size(sizeof(u32)) +    /* _RINGS_TX */
               nla_total_size(sizeof(u32)) +    /* _RINGS_RX_BUF_LEN */
-              nla_total_size(sizeof(u8));      /* _RINGS_TCP_DATA_SPLIT */
+              nla_total_size(sizeof(u8))  +    /* _RINGS_TCP_DATA_SPLIT */
+              nla_total_size(sizeof(u32));     /* _RINGS_CQE_SIZE */
 }
 
 static int rings_fill_reply(struct sk_buff *skb,
@@ -91,7 +92,9 @@ static int rings_fill_reply(struct sk_buff *skb,
             (nla_put_u32(skb, ETHTOOL_A_RINGS_RX_BUF_LEN, kr->rx_buf_len))) ||
            (kr->tcp_data_split &&
             (nla_put_u8(skb, ETHTOOL_A_RINGS_TCP_DATA_SPLIT,
-                        kr->tcp_data_split))))
+                        kr->tcp_data_split))) ||
+           (kr->cqe_size &&
+            (nla_put_u32(skb, ETHTOOL_A_RINGS_CQE_SIZE, kr->cqe_size))))
                return -EMSGSIZE;
 
        return 0;
@@ -119,6 +122,7 @@ const struct nla_policy ethnl_rings_set_policy[] = {
        [ETHTOOL_A_RINGS_RX_JUMBO]              = { .type = NLA_U32 },
        [ETHTOOL_A_RINGS_TX]                    = { .type = NLA_U32 },
        [ETHTOOL_A_RINGS_RX_BUF_LEN]            = NLA_POLICY_MIN(NLA_U32, 1),
+       [ETHTOOL_A_RINGS_CQE_SIZE]              = NLA_POLICY_MIN(NLA_U32, 1),
 };
 
 int ethnl_set_rings(struct sk_buff *skb, struct genl_info *info)
@@ -159,6 +163,8 @@ int ethnl_set_rings(struct sk_buff *skb, struct genl_info *info)
        ethnl_update_u32(&ringparam.tx_pending, tb[ETHTOOL_A_RINGS_TX], &mod);
        ethnl_update_u32(&kernel_ringparam.rx_buf_len,
                         tb[ETHTOOL_A_RINGS_RX_BUF_LEN], &mod);
+       ethnl_update_u32(&kernel_ringparam.cqe_size,
+                        tb[ETHTOOL_A_RINGS_CQE_SIZE], &mod);
        ret = 0;
        if (!mod)
                goto out_ops;
@@ -190,6 +196,15 @@ int ethnl_set_rings(struct sk_buff *skb, struct genl_info *info)
                goto out_ops;
        }
 
+       if (kernel_ringparam.cqe_size &&
+           !(ops->supported_ring_params & ETHTOOL_RING_USE_CQE_SIZE)) {
+               ret = -EOPNOTSUPP;
+               NL_SET_ERR_MSG_ATTR(info->extack,
+                                   tb[ETHTOOL_A_RINGS_CQE_SIZE],
+                                   "setting cqe size not supported");
+               goto out_ops;
+       }
+
        ret = dev->ethtool_ops->set_ringparam(dev, &ringparam,
                                              &kernel_ringparam, info->extack);
        if (ret < 0)