* [PATCH net-next] vxlan_core: delete unnecessary condition
@ 2022-03-07 12:57 Dan Carpenter
2022-03-07 13:05 ` Nikolay Aleksandrov
2022-03-08 6:30 ` patchwork-bot+netdevbpf
0 siblings, 2 replies; 6+ messages in thread
From: Dan Carpenter @ 2022-03-07 12:57 UTC (permalink / raw)
To: David S. Miller, Nikolay Aleksandrov
Cc: Jakub Kicinski, Roopa Prabhu, Eric Dumazet, netdev,
kernel-janitors
The previous check handled the "if (!nh)" condition so we know "nh"
is non-NULL here. Delete the check and pull the code in one tab.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
This not a bug so a Fixes tag is innappropriate, however for reviewers
this was introduced in commit 4095e0e1328a ("drivers: vxlan: vnifilter:
per vni stats")
---
drivers/net/vxlan/vxlan_core.c | 54 ++++++++++++++++------------------
1 file changed, 26 insertions(+), 28 deletions(-)
diff --git a/drivers/net/vxlan/vxlan_core.c b/drivers/net/vxlan/vxlan_core.c
index 4ab09dd5a32a..795f438940ee 100644
--- a/drivers/net/vxlan/vxlan_core.c
+++ b/drivers/net/vxlan/vxlan_core.c
@@ -811,37 +811,35 @@ static int vxlan_fdb_nh_update(struct vxlan_dev *vxlan, struct vxlan_fdb *fdb,
goto err_inval;
}
- if (nh) {
- if (!nexthop_get(nh)) {
- NL_SET_ERR_MSG(extack, "Nexthop has been deleted");
- nh = NULL;
- goto err_inval;
- }
- if (!nexthop_is_fdb(nh)) {
- NL_SET_ERR_MSG(extack, "Nexthop is not a fdb nexthop");
- goto err_inval;
- }
+ if (!nexthop_get(nh)) {
+ NL_SET_ERR_MSG(extack, "Nexthop has been deleted");
+ nh = NULL;
+ goto err_inval;
+ }
+ if (!nexthop_is_fdb(nh)) {
+ NL_SET_ERR_MSG(extack, "Nexthop is not a fdb nexthop");
+ goto err_inval;
+ }
- if (!nexthop_is_multipath(nh)) {
- NL_SET_ERR_MSG(extack, "Nexthop is not a multipath group");
+ if (!nexthop_is_multipath(nh)) {
+ NL_SET_ERR_MSG(extack, "Nexthop is not a multipath group");
+ goto err_inval;
+ }
+
+ /* check nexthop group family */
+ switch (vxlan->default_dst.remote_ip.sa.sa_family) {
+ case AF_INET:
+ if (!nexthop_has_v4(nh)) {
+ err = -EAFNOSUPPORT;
+ NL_SET_ERR_MSG(extack, "Nexthop group family not supported");
goto err_inval;
}
-
- /* check nexthop group family */
- switch (vxlan->default_dst.remote_ip.sa.sa_family) {
- case AF_INET:
- if (!nexthop_has_v4(nh)) {
- err = -EAFNOSUPPORT;
- NL_SET_ERR_MSG(extack, "Nexthop group family not supported");
- goto err_inval;
- }
- break;
- case AF_INET6:
- if (nexthop_has_v4(nh)) {
- err = -EAFNOSUPPORT;
- NL_SET_ERR_MSG(extack, "Nexthop group family not supported");
- goto err_inval;
- }
+ break;
+ case AF_INET6:
+ if (nexthop_has_v4(nh)) {
+ err = -EAFNOSUPPORT;
+ NL_SET_ERR_MSG(extack, "Nexthop group family not supported");
+ goto err_inval;
}
}
--
2.20.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH net-next] vxlan_core: delete unnecessary condition
2022-03-07 12:57 [PATCH net-next] vxlan_core: delete unnecessary condition Dan Carpenter
@ 2022-03-07 13:05 ` Nikolay Aleksandrov
2022-03-07 13:07 ` Nikolay Aleksandrov
2022-03-07 14:15 ` Dan Carpenter
2022-03-08 6:30 ` patchwork-bot+netdevbpf
1 sibling, 2 replies; 6+ messages in thread
From: Nikolay Aleksandrov @ 2022-03-07 13:05 UTC (permalink / raw)
To: Dan Carpenter, David S. Miller, Nikolay Aleksandrov
Cc: Jakub Kicinski, Roopa Prabhu, Eric Dumazet, netdev,
kernel-janitors
On 07/03/2022 14:57, Dan Carpenter wrote:
> The previous check handled the "if (!nh)" condition so we know "nh"
> is non-NULL here. Delete the check and pull the code in one tab.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> ---
> This not a bug so a Fixes tag is innappropriate, however for reviewers
> this was introduced in commit 4095e0e1328a ("drivers: vxlan: vnifilter:
> per vni stats")
No, it was not introduced by that commit.
It was introduced by commit:
1274e1cc4226 ("vxlan: ecmp support for mac fdb entries")
> ---
> drivers/net/vxlan/vxlan_core.c | 54 ++++++++++++++++------------------
> 1 file changed, 26 insertions(+), 28 deletions(-)
>
> diff --git a/drivers/net/vxlan/vxlan_core.c b/drivers/net/vxlan/vxlan_core.c
> index 4ab09dd5a32a..795f438940ee 100644
> --- a/drivers/net/vxlan/vxlan_core.c
> +++ b/drivers/net/vxlan/vxlan_core.c
> @@ -811,37 +811,35 @@ static int vxlan_fdb_nh_update(struct vxlan_dev *vxlan, struct vxlan_fdb *fdb,
> goto err_inval;
> }
>
> - if (nh) {
> - if (!nexthop_get(nh)) {
> - NL_SET_ERR_MSG(extack, "Nexthop has been deleted");
> - nh = NULL;
> - goto err_inval;
> - }
> - if (!nexthop_is_fdb(nh)) {
> - NL_SET_ERR_MSG(extack, "Nexthop is not a fdb nexthop");
> - goto err_inval;
> - }
> + if (!nexthop_get(nh)) {
> + NL_SET_ERR_MSG(extack, "Nexthop has been deleted");
> + nh = NULL;
> + goto err_inval;
> + }
> + if (!nexthop_is_fdb(nh)) {
> + NL_SET_ERR_MSG(extack, "Nexthop is not a fdb nexthop");
> + goto err_inval;
> + }
>
> - if (!nexthop_is_multipath(nh)) {
> - NL_SET_ERR_MSG(extack, "Nexthop is not a multipath group");
> + if (!nexthop_is_multipath(nh)) {
> + NL_SET_ERR_MSG(extack, "Nexthop is not a multipath group");
> + goto err_inval;
> + }
> +
> + /* check nexthop group family */
> + switch (vxlan->default_dst.remote_ip.sa.sa_family) {
> + case AF_INET:
> + if (!nexthop_has_v4(nh)) {
> + err = -EAFNOSUPPORT;
> + NL_SET_ERR_MSG(extack, "Nexthop group family not supported");
> goto err_inval;
> }
> -
> - /* check nexthop group family */
> - switch (vxlan->default_dst.remote_ip.sa.sa_family) {
> - case AF_INET:
> - if (!nexthop_has_v4(nh)) {
> - err = -EAFNOSUPPORT;
> - NL_SET_ERR_MSG(extack, "Nexthop group family not supported");
> - goto err_inval;
> - }
> - break;
> - case AF_INET6:
> - if (nexthop_has_v4(nh)) {
> - err = -EAFNOSUPPORT;
> - NL_SET_ERR_MSG(extack, "Nexthop group family not supported");
> - goto err_inval;
> - }
> + break;
> + case AF_INET6:
> + if (nexthop_has_v4(nh)) {
> + err = -EAFNOSUPPORT;
> + NL_SET_ERR_MSG(extack, "Nexthop group family not supported");
> + goto err_inval;
> }
> }
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH net-next] vxlan_core: delete unnecessary condition
2022-03-07 13:05 ` Nikolay Aleksandrov
@ 2022-03-07 13:07 ` Nikolay Aleksandrov
2022-03-08 3:46 ` Roopa Prabhu
2022-03-07 14:15 ` Dan Carpenter
1 sibling, 1 reply; 6+ messages in thread
From: Nikolay Aleksandrov @ 2022-03-07 13:07 UTC (permalink / raw)
To: Dan Carpenter, David S. Miller, Nikolay Aleksandrov
Cc: Jakub Kicinski, Roopa Prabhu, Eric Dumazet, netdev,
kernel-janitors
On 07/03/2022 15:05, Nikolay Aleksandrov wrote:
> On 07/03/2022 14:57, Dan Carpenter wrote:
>> The previous check handled the "if (!nh)" condition so we know "nh"
>> is non-NULL here. Delete the check and pull the code in one tab.
>>
>> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>> ---
>> This not a bug so a Fixes tag is innappropriate, however for reviewers
>> this was introduced in commit 4095e0e1328a ("drivers: vxlan: vnifilter:
>> per vni stats")
>
> No, it was not introduced by that commit.
> It was introduced by commit:
> 1274e1cc4226 ("vxlan: ecmp support for mac fdb entries")
>
Forgot to add: patch looks good to me. :)
Reviewed-by: Nikolay Aleksandrov <razor@blackwall.org>
Thanks,
Nik
>> ---
>> drivers/net/vxlan/vxlan_core.c | 54 ++++++++++++++++------------------
>> 1 file changed, 26 insertions(+), 28 deletions(-)
>>
>> diff --git a/drivers/net/vxlan/vxlan_core.c b/drivers/net/vxlan/vxlan_core.c
>> index 4ab09dd5a32a..795f438940ee 100644
>> --- a/drivers/net/vxlan/vxlan_core.c
>> +++ b/drivers/net/vxlan/vxlan_core.c
>> @@ -811,37 +811,35 @@ static int vxlan_fdb_nh_update(struct vxlan_dev *vxlan, struct vxlan_fdb *fdb,
>> goto err_inval;
>> }
>>
>> - if (nh) {
>> - if (!nexthop_get(nh)) {
>> - NL_SET_ERR_MSG(extack, "Nexthop has been deleted");
>> - nh = NULL;
>> - goto err_inval;
>> - }
>> - if (!nexthop_is_fdb(nh)) {
>> - NL_SET_ERR_MSG(extack, "Nexthop is not a fdb nexthop");
>> - goto err_inval;
>> - }
>> + if (!nexthop_get(nh)) {
>> + NL_SET_ERR_MSG(extack, "Nexthop has been deleted");
>> + nh = NULL;
>> + goto err_inval;
>> + }
>> + if (!nexthop_is_fdb(nh)) {
>> + NL_SET_ERR_MSG(extack, "Nexthop is not a fdb nexthop");
>> + goto err_inval;
>> + }
>>
>> - if (!nexthop_is_multipath(nh)) {
>> - NL_SET_ERR_MSG(extack, "Nexthop is not a multipath group");
>> + if (!nexthop_is_multipath(nh)) {
>> + NL_SET_ERR_MSG(extack, "Nexthop is not a multipath group");
>> + goto err_inval;
>> + }
>> +
>> + /* check nexthop group family */
>> + switch (vxlan->default_dst.remote_ip.sa.sa_family) {
>> + case AF_INET:
>> + if (!nexthop_has_v4(nh)) {
>> + err = -EAFNOSUPPORT;
>> + NL_SET_ERR_MSG(extack, "Nexthop group family not supported");
>> goto err_inval;
>> }
>> -
>> - /* check nexthop group family */
>> - switch (vxlan->default_dst.remote_ip.sa.sa_family) {
>> - case AF_INET:
>> - if (!nexthop_has_v4(nh)) {
>> - err = -EAFNOSUPPORT;
>> - NL_SET_ERR_MSG(extack, "Nexthop group family not supported");
>> - goto err_inval;
>> - }
>> - break;
>> - case AF_INET6:
>> - if (nexthop_has_v4(nh)) {
>> - err = -EAFNOSUPPORT;
>> - NL_SET_ERR_MSG(extack, "Nexthop group family not supported");
>> - goto err_inval;
>> - }
>> + break;
>> + case AF_INET6:
>> + if (nexthop_has_v4(nh)) {
>> + err = -EAFNOSUPPORT;
>> + NL_SET_ERR_MSG(extack, "Nexthop group family not supported");
>> + goto err_inval;
>> }
>> }
>>
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH net-next] vxlan_core: delete unnecessary condition
2022-03-07 13:07 ` Nikolay Aleksandrov
@ 2022-03-08 3:46 ` Roopa Prabhu
0 siblings, 0 replies; 6+ messages in thread
From: Roopa Prabhu @ 2022-03-08 3:46 UTC (permalink / raw)
To: Nikolay Aleksandrov, Dan Carpenter, David S. Miller,
Nikolay Aleksandrov
Cc: Jakub Kicinski, Eric Dumazet, netdev, kernel-janitors
On 3/7/22 05:07, Nikolay Aleksandrov wrote:
> On 07/03/2022 15:05, Nikolay Aleksandrov wrote:
>> On 07/03/2022 14:57, Dan Carpenter wrote:
>>> The previous check handled the "if (!nh)" condition so we know "nh"
>>> is non-NULL here. Delete the check and pull the code in one tab.
>>>
>>> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>>> ---
>>> This not a bug so a Fixes tag is innappropriate, however for reviewers
>>> this was introduced in commit 4095e0e1328a ("drivers: vxlan: vnifilter:
>>> per vni stats")
>> No, it was not introduced by that commit.
>> It was introduced by commit:
>> 1274e1cc4226 ("vxlan: ecmp support for mac fdb entries")
>>
> Forgot to add: patch looks good to me. :)
> Reviewed-by: Nikolay Aleksandrov <razor@blackwall.org>
+1
Reviewed-by: Roopa Prabhu <roopa@nvidia.com>
LGTM too, thanks Dan
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net-next] vxlan_core: delete unnecessary condition
2022-03-07 13:05 ` Nikolay Aleksandrov
2022-03-07 13:07 ` Nikolay Aleksandrov
@ 2022-03-07 14:15 ` Dan Carpenter
1 sibling, 0 replies; 6+ messages in thread
From: Dan Carpenter @ 2022-03-07 14:15 UTC (permalink / raw)
To: Nikolay Aleksandrov
Cc: David S. Miller, Nikolay Aleksandrov, Jakub Kicinski,
Roopa Prabhu, Eric Dumazet, netdev, kernel-janitors
On Mon, Mar 07, 2022 at 03:05:49PM +0200, Nikolay Aleksandrov wrote:
> On 07/03/2022 14:57, Dan Carpenter wrote:
> > The previous check handled the "if (!nh)" condition so we know "nh"
> > is non-NULL here. Delete the check and pull the code in one tab.
> >
> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> > ---
> > This not a bug so a Fixes tag is innappropriate, however for reviewers
> > this was introduced in commit 4095e0e1328a ("drivers: vxlan: vnifilter:
> > per vni stats")
>
> No, it was not introduced by that commit.
> It was introduced by commit:
> 1274e1cc4226 ("vxlan: ecmp support for mac fdb entries")
Yeah. Sorry. No idea how I got that wrong.
regards,
dan carpenter
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net-next] vxlan_core: delete unnecessary condition
2022-03-07 12:57 [PATCH net-next] vxlan_core: delete unnecessary condition Dan Carpenter
2022-03-07 13:05 ` Nikolay Aleksandrov
@ 2022-03-08 6:30 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 6+ messages in thread
From: patchwork-bot+netdevbpf @ 2022-03-08 6:30 UTC (permalink / raw)
To: Dan Carpenter
Cc: davem, nikolay, kuba, roopa, edumazet, netdev, kernel-janitors
Hello:
This patch was applied to netdev/net-next.git (master)
by Jakub Kicinski <kuba@kernel.org>:
On Mon, 7 Mar 2022 15:57:36 +0300 you wrote:
> The previous check handled the "if (!nh)" condition so we know "nh"
> is non-NULL here. Delete the check and pull the code in one tab.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> ---
> This not a bug so a Fixes tag is innappropriate, however for reviewers
> this was introduced in commit 4095e0e1328a ("drivers: vxlan: vnifilter:
> per vni stats")
>
> [...]
Here is the summary with links:
- [net-next] vxlan_core: delete unnecessary condition
https://git.kernel.org/netdev/net-next/c/8daf4e75fc09
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-03-08 6:30 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-03-07 12:57 [PATCH net-next] vxlan_core: delete unnecessary condition Dan Carpenter
2022-03-07 13:05 ` Nikolay Aleksandrov
2022-03-07 13:07 ` Nikolay Aleksandrov
2022-03-08 3:46 ` Roopa Prabhu
2022-03-07 14:15 ` Dan Carpenter
2022-03-08 6:30 ` patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).