devlink: ignore -EOPNOTSUPP errors on dumpit
Subsystems (2)
Jakub Kicinski
maintainerPATCH 1/1 devlink: ignore -EOPNOTSUPP errors on dumpit
Number of .dumpit functions try to ignore -EOPNOTSUPP errors. Recent change missed that, and started reporting all errors but -EMSGSIZE back from dumps. This leads to situation like this:
$ devlink dev info devlink answers: Operation not supported
Dump should not report an error just because the last device to be queried could not provide an answer.
To fix this and avoid similar confusion make sure we clear err properly, and not leave it set to an error if we don't terminate the iteration.
--- net/core/devlink.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-)
net/core/devlink.c +18 -6
@@ -1065,7 +1065,9 @@ static int devlink_nl_cmd_sb_pool_get_dumpit(struct sk_buff *msg, devlink_sb,NETLINK_CB (cb->skb).portid, cb->nlh->nlmsg_seq); -if (err && err != -EOPNOTSUPP ) { +if (err == -EOPNOTSUPP ) { + err =0 ; + }else if (err) {mutex_unlock (&devlink->lock); goto out; }
@@ -1266,7 +1268,9 @@ static int devlink_nl_cmd_sb_port_pool_get_dumpit(struct sk_buff *msg, devlink, devlink_sb,NETLINK_CB (cb->skb).portid, cb->nlh->nlmsg_seq); -if (err && err != -EOPNOTSUPP ) { +if (err == -EOPNOTSUPP ) { + err =0 ; + }else if (err) {mutex_unlock (&devlink->lock); goto out; }
@@ -1498,7 +1502,9 @@ devlink_nl_cmd_sb_tc_pool_bind_get_dumpit(struct sk_buff *msg, devlink_sb,NETLINK_CB (cb->skb).portid, cb->nlh->nlmsg_seq); -if (err && err != -EOPNOTSUPP ) { +if (err == -EOPNOTSUPP ) { + err =0 ; + }else if (err) {mutex_unlock (&devlink->lock); goto out; }
@@ -3299,7 +3305,9 @@ static int devlink_nl_cmd_param_get_dumpit(struct sk_buff *msg,NETLINK_CB (cb->skb).portid, cb->nlh->nlmsg_seq, NLM_F_MULTI); -if (err && err != -EOPNOTSUPP ) { +if (err == -EOPNOTSUPP ) { + err =0 ; + }else if (err) {mutex_unlock (&devlink->lock); goto out; }
@@ -3569,7 +3577,9 @@ static int devlink_nl_cmd_port_param_get_dumpit(struct sk_buff *msg,NETLINK_CB (cb->skb).portid, cb->nlh->nlmsg_seq, NLM_F_MULTI); -if (err && err != -EOPNOTSUPP ) { +if (err == -EOPNOTSUPP ) { + err =0 ; + }else if (err) {mutex_unlock (&devlink->lock); goto out; }
@@ -4518,7 +4528,9 @@ static int devlink_nl_cmd_info_get_dumpit(struct sk_buff *msg, cb->nlh->nlmsg_seq,NLM_F_MULTI , cb->extack);mutex_unlock (&devlink->lock); -if (err && err != -EOPNOTSUPP ) +if (err == -EOPNOTSUPP ) + err =0 ; +else if (err)break ; idx++; }
Signature · 1 line
2.26.2
Quoted 8 lines · Jakub Kicinski
Number of .dumpit functions try to ignore
-EOPNOTSUPPerrors. Recent change missed that, and started reporting all errors but-EMSGSIZEback from dumps. This leads to situation like this:$ devlink dev info devlink answers: Operation not supported
Quoted 7 lines
Dump should not report an error just because the last device to be queried could not provide an answer.
To fix this and avoid similar confusion make sure we clear err properly, and not leave it set to an error if we don't terminate the iteration.
Makes sense to me.
Quoted 77 lines
Fixes c62c2cfb801b ("net: devlink: don't ignore errors during dumpit")Signed-off-by Jakub Kicinski <[email protected]>--- net/core/devlink.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-)net/core/devlink.c +18
-6@@ -1065,7 +1065,9 @@ static int devlink_nl_cmd_sb_pool_get_dumpit(struct sk_buff *msg, devlink_sb,NETLINK_CB (cb->skb).portid, cb->nlh->nlmsg_seq); -if (err && err != -EOPNOTSUPP ) { +if (err == -EOPNOTSUPP ) { + err =0 ; + }else if (err) {mutex_unlock (&devlink->lock); goto out; }@@ -1266,7 +1268,9 @@ static int devlink_nl_cmd_sb_port_pool_get_dumpit(struct sk_buff *msg, devlink, devlink_sb,NETLINK_CB (cb->skb).portid, cb->nlh->nlmsg_seq); -if (err && err != -EOPNOTSUPP ) { +if (err == -EOPNOTSUPP ) { + err =0 ; + }else if (err) {mutex_unlock (&devlink->lock); goto out; }@@ -1498,7 +1502,9 @@ devlink_nl_cmd_sb_tc_pool_bind_get_dumpit(struct sk_buff *msg, devlink_sb,NETLINK_CB (cb->skb).portid, cb->nlh->nlmsg_seq); -if (err && err != -EOPNOTSUPP ) { +if (err == -EOPNOTSUPP ) { + err =0 ; + }else if (err) {mutex_unlock (&devlink->lock); goto out; }@@ -3299,7 +3305,9 @@ static int devlink_nl_cmd_param_get_dumpit(struct sk_buff *msg,NETLINK_CB (cb->skb).portid, cb->nlh->nlmsg_seq, NLM_F_MULTI); -if (err && err != -EOPNOTSUPP ) { +if (err == -EOPNOTSUPP ) { + err =0 ; + }else if (err) {mutex_unlock (&devlink->lock); goto out; }@@ -3569,7 +3577,9 @@ static int devlink_nl_cmd_port_param_get_dumpit(struct sk_buff *msg,NETLINK_CB (cb->skb).portid, cb->nlh->nlmsg_seq, NLM_F_MULTI); -if (err && err != -EOPNOTSUPP ) { +if (err == -EOPNOTSUPP ) { + err =0 ; + }else if (err) {mutex_unlock (&devlink->lock); goto out; }@@ -4518,7 +4528,9 @@ static int devlink_nl_cmd_info_get_dumpit(struct sk_buff *msg, cb->nlh->nlmsg_seq,NLM_F_MULTI , cb->extack);mutex_unlock (&devlink->lock); -if (err && err != -EOPNOTSUPP ) +if (err == -EOPNOTSUPP ) + err =0 ; +else if (err)break ; idx++; }
Quoted 11 lines · Wed, Jul 29, 2020 at 01:15:07AM CEST, [email protected] wrote:
Number of .dumpit functions try to ignore
-EOPNOTSUPPerrors. Recent change missed that, and started reporting all errors but-EMSGSIZEback from dumps. This leads to situation like this:$ devlink dev info devlink answers: Operation not supportedDump should not report an error just because the last device to be queried could not provide an answer.
Quoted 6 lines
To fix this and avoid similar confusion make sure we clear err properly, and not leave it set to an error if we don't terminate the iteration.
Fixes c62c2cfb801b ("net: devlink: don't ignore errors during dumpit")Signed-off-by Jakub Kicinski <[email protected]>
Yeah, that makes perfect sense. Thanks for the fix Kuba!
David Miller
maintainerFrom: Jakub Kicinski <[email protected]>
Date: Tue, 28 Jul 2020 16:15:07 -0700
Quoted 11 lines
Number of .dumpit functions try to ignore
-EOPNOTSUPPerrors. Recent change missed that, and started reporting all errors but-EMSGSIZEback from dumps. This leads to situation like this:$ devlink dev info devlink answers: Operation not supportedDump should not report an error just because the last device to be queried could not provide an answer.
Quoted 6 lines
To fix this and avoid similar confusion make sure we clear err properly, and not leave it set to an error if we don't terminate the iteration.
Fixes c62c2cfb801b ("net: devlink: don't ignore errors during dumpit")Signed-off-by Jakub Kicinski <[email protected]>
Applied and queued up for -stable, thanks.