[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20211126134311.920808-2-alexander.mikhalitsyn@virtuozzo.com>
Date: Fri, 26 Nov 2021 16:43:11 +0300
From: Alexander Mikhalitsyn <alexander.mikhalitsyn@...tuozzo.com>
To: netdev@...r.kernel.org
Cc: Alexander Mikhalitsyn <alexander.mikhalitsyn@...tuozzo.com>,
David Miller <davem@...emloft.net>,
David Ahern <dsahern@...il.com>,
Stephen Hemminger <stephen@...workplumber.org>,
Ido Schimmel <idosch@...dia.com>,
Jakub Kicinski <kuba@...nel.org>,
Roopa Prabhu <roopa@...dia.com>,
Andrei Vagin <avagin@...il.com>,
Pavel Tikhomirov <ptikhomirov@...tuozzo.com>,
Alexander Mikhalitsyn <alexander@...alicyn.com>
Subject: [PATCH net-next] rtnetlink: add RTNH_REJECT_MASK
Introduce RTNH_REJECT_MASK mask which contains
all rtnh_flags which can't be set by the userspace
directly.
This mask will be used in the iproute utility
to exclude rtnh_flags which can't be restored
from "ip route save" image.
This patch doesn't change kernel behavior at all.
Please, take a look on
[PATCH iproute2] ip route: save: exclude rtnh_flags which can't be set
Cc: David Miller <davem@...emloft.net>
Cc: David Ahern <dsahern@...il.com>
Cc: Stephen Hemminger <stephen@...workplumber.org>
Cc: Ido Schimmel <idosch@...dia.com>
Cc: Jakub Kicinski <kuba@...nel.org>
Cc: Roopa Prabhu <roopa@...dia.com>
Cc: Andrei Vagin <avagin@...il.com>
Cc: Pavel Tikhomirov <ptikhomirov@...tuozzo.com>
Cc: Alexander Mikhalitsyn <alexander@...alicyn.com>
Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@...tuozzo.com>
---
include/uapi/linux/rtnetlink.h | 3 +++
net/ipv4/fib_semantics.c | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/include/uapi/linux/rtnetlink.h b/include/uapi/linux/rtnetlink.h
index 5888492a5257..9c065e2fdef9 100644
--- a/include/uapi/linux/rtnetlink.h
+++ b/include/uapi/linux/rtnetlink.h
@@ -417,6 +417,9 @@ struct rtnexthop {
#define RTNH_COMPARE_MASK (RTNH_F_DEAD | RTNH_F_LINKDOWN | \
RTNH_F_OFFLOAD | RTNH_F_TRAP)
+/* these flags can't be set by the userspace */
+#define RTNH_REJECT_MASK (RTNH_F_DEAD | RTNH_F_LINKDOWN)
+
/* Macros to handle hexthops */
#define RTNH_ALIGNTO 4
diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
index 4c0c33e4710d..805f5e05b56d 100644
--- a/net/ipv4/fib_semantics.c
+++ b/net/ipv4/fib_semantics.c
@@ -685,7 +685,7 @@ static int fib_get_nhs(struct fib_info *fi, struct rtnexthop *rtnh,
return -EINVAL;
}
- if (rtnh->rtnh_flags & (RTNH_F_DEAD | RTNH_F_LINKDOWN)) {
+ if (rtnh->rtnh_flags & RTNH_REJECT_MASK) {
NL_SET_ERR_MSG(extack,
"Invalid flags for nexthop - can not contain DEAD or LINKDOWN");
return -EINVAL;
@@ -1363,7 +1363,7 @@ struct fib_info *fib_create_info(struct fib_config *cfg,
goto err_inval;
}
- if (cfg->fc_flags & (RTNH_F_DEAD | RTNH_F_LINKDOWN)) {
+ if (cfg->fc_flags & RTNH_REJECT_MASK) {
NL_SET_ERR_MSG(extack,
"Invalid rtm_flags - can not contain DEAD or LINKDOWN");
goto err_inval;
--
2.31.1
Powered by blists - more mailing lists