* [PATCH RFC iproute2-next 2/3] xfrm: support xfrm SA direction attribute
2024-05-19 18:36 [PATCH RFC iproute2-next 0/3] xfrm: Add support for SA direction and output cleanup Antony Antony
2024-05-19 18:37 ` [PATCH RFC iproute2-next 1/3] uapi: Update kernel headers xfrm.h Antony Antony
@ 2024-05-19 18:37 ` Antony Antony
2024-05-19 22:58 ` Stephen Hemminger
2024-05-19 18:37 ` [PATCH RFC iproute2-next 3/3] xfrm: update ip xfrm state output for SA with " Antony Antony
2 siblings, 1 reply; 8+ messages in thread
From: Antony Antony @ 2024-05-19 18:37 UTC (permalink / raw)
To: Stephen Hemminger, David Ahern
Cc: netdev, devel, Steffen Klassert, Eyal Birger, Antony Antony,
Nicolas Dichtel, Sabrina Dubroca, Christian Hopps
- Add parsing "ip xfrm state add .. dir [ in|out ]
- Add printing XFRMA_SA_DIR.
- allow replay-window 0 on output state with esn
Previously:
ip xfrm state add src 192.1.3.33 dst 192.1.2.23 proto esp spi 1 \
reqid 1 mode tunnel aead 'rfc4106(gcm(aes))' \
0x1111111111111111111111111111111111111111 96
sel src 192.0.3.0/25 dst 192.0.2.0/25 dir out flag esn
Error: esn flag set without replay-window.
When the SA direction is set, kernel only allows oputput SA, with ESN
and replay-window zero. This change would not affect any existing use
cases; configuring SA.
Signed-off-by: Antony Antony <antony.antony@secunet.com>
---
ip/ipxfrm.c | 12 ++++++++++++
ip/xfrm_state.c | 44 ++++++++++++++++++++++++++++++++++++++++----
2 files changed, 52 insertions(+), 4 deletions(-)
diff --git a/ip/ipxfrm.c b/ip/ipxfrm.c
index b78c712d..3c0faf62 100644
--- a/ip/ipxfrm.c
+++ b/ip/ipxfrm.c
@@ -904,6 +904,18 @@ void xfrm_xfrma_print(struct rtattr *tb[], __u16 family, FILE *fp,
fprintf(fp, "tfcpad %u", tfcpad);
fprintf(fp, "%s", _SL_);
}
+ if (tb[XFRMA_SA_DIR]) {
+ __u8 dir = rta_getattr_u8(tb[XFRMA_SA_DIR]);
+
+ fprintf(fp, "\tdir ");
+ if (dir == XFRM_SA_DIR_IN)
+ fprintf(fp, "in");
+ else if (dir == XFRM_SA_DIR_OUT)
+ fprintf(fp, "out");
+ else
+ fprintf(fp, " %d", dir);
+ fprintf(fp, "%s", _SL_);
+ }
}
static int xfrm_selector_iszero(struct xfrm_selector *s)
diff --git a/ip/xfrm_state.c b/ip/xfrm_state.c
index 9be65b2f..214d0d07 100644
--- a/ip/xfrm_state.c
+++ b/ip/xfrm_state.c
@@ -47,9 +47,9 @@ static void usage(void)
" [ coa ADDR[/PLEN] ] [ ctx CTX ] [ extra-flag EXTRA-FLAG-LIST ]\n"
" [ offload [ crypto | packet ] dev DEV dir DIR ]\n"
" [ output-mark OUTPUT-MARK [ mask MASK ] ]\n"
- " [ if_id IF_ID ] [ tfcpad LENGTH ]\n"
+ " [ if_id IF_ID ] [ tfcpad LENGTH ] [dir DIR]\n"
"Usage: ip xfrm state allocspi ID [ mode MODE ] [ mark MARK [ mask MASK ] ]\n"
- " [ reqid REQID ] [ seq SEQ ] [ min SPI max SPI ]\n"
+ " [ reqid REQID ] [ seq SEQ ] [ min SPI max SPI ] [dir DIR]\n"
"Usage: ip xfrm state { delete | get } ID [ mark MARK [ mask MASK ] ]\n"
"Usage: ip xfrm state deleteall [ ID ] [ mode MODE ] [ reqid REQID ]\n"
" [ flag FLAG-LIST ]\n"
@@ -290,7 +290,9 @@ static int xfrm_state_modify(int cmd, unsigned int flags, int argc, char **argv)
struct xfrm_replay_state_esn replay_esn = {};
struct xfrm_user_offload xuo = {};
unsigned int ifindex = 0;
- __u8 dir = 0;
+ __u8 dir = 0; /* only used with xuo XFRMA_OFFLOAD */
+ __u8 sa_dir = 0; /* state direction. Should match the above when offload */
+
bool is_offload = false, is_packet_offload = false;
__u32 replay_window = 0;
__u32 seq = 0, oseq = 0, seq_hi = 0, oseq_hi = 0;
@@ -462,6 +464,14 @@ static int xfrm_state_modify(int cmd, unsigned int flags, int argc, char **argv)
NEXT_ARG();
if (get_u32(&tfcpad, *argv, 0))
invarg("value after \"tfcpad\" is invalid", *argv);
+ } else if (strcmp(*argv, "dir") == 0) {
+ NEXT_ARG();
+ if (strcmp(*argv, "in") == 0)
+ sa_dir = XFRM_SA_DIR_IN;
+ else if (strcmp(*argv, "out") == 0)
+ sa_dir = XFRM_SA_DIR_OUT;
+ else
+ invarg("value after \"dir\" is invalid", *argv);
} else {
/* try to assume ALGO */
int type = xfrm_algotype_getbyname(*argv);
@@ -587,7 +597,7 @@ static int xfrm_state_modify(int cmd, unsigned int flags, int argc, char **argv)
}
if (req.xsinfo.flags & XFRM_STATE_ESN &&
- replay_window == 0) {
+ replay_window == 0 && sa_dir != XFRM_SA_DIR_OUT ) {
fprintf(stderr, "Error: esn flag set without replay-window.\n");
exit(-1);
}
@@ -760,6 +770,14 @@ static int xfrm_state_modify(int cmd, unsigned int flags, int argc, char **argv)
if (output_mark.m)
addattr32(&req.n, sizeof(req.buf), XFRMA_SET_MARK_MASK, output_mark.m);
+ if (sa_dir) {
+ int r = addattr8(&req.n, sizeof(req.buf), XFRMA_SA_DIR, sa_dir);
+ if (r < 0) {
+ fprintf(stderr, "XFRMA_SA_DIR failed\n");
+ exit(1);
+ }
+ }
+
if (rtnl_open_byproto(&rth, 0, NETLINK_XFRM) < 0)
exit(1);
@@ -792,6 +810,7 @@ static int xfrm_state_allocspi(int argc, char **argv)
char *maxp = NULL;
struct xfrm_mark mark = {0, 0};
struct nlmsghdr *answer;
+ __u8 sa_dir = 0;
while (argc > 0) {
if (strcmp(*argv, "mode") == 0) {
@@ -823,6 +842,14 @@ static int xfrm_state_allocspi(int argc, char **argv)
if (get_u32(&req.xspi.max, *argv, 0))
invarg("value after \"max\" is invalid", *argv);
+ } else if (strcmp(*argv, "dir") == 0) {
+ NEXT_ARG();
+ if (strcmp(*argv, "in") == 0)
+ sa_dir = XFRM_SA_DIR_IN;
+ else if (strcmp(*argv, "out") == 0)
+ sa_dir = XFRM_SA_DIR_OUT;
+ else
+ invarg("value after \"dir\" is invalid", *argv);
} else {
/* try to assume ID */
if (idp)
@@ -875,6 +902,15 @@ static int xfrm_state_allocspi(int argc, char **argv)
req.xspi.max = 0xffff;
}
+ if (sa_dir) {
+ int r = addattr8(&req.n, sizeof(req.buf), XFRMA_SA_DIR, sa_dir);
+
+ if (r < 0) {
+ fprintf(stderr, "XFRMA_SA_DIR failed\n");
+ exit(1);
+ }
+ }
+
if (mark.m & mark.v) {
int r = addattr_l(&req.n, sizeof(req.buf), XFRMA_MARK,
(void *)&mark, sizeof(mark));
--
2.30.2
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH RFC iproute2-next 3/3] xfrm: update ip xfrm state output for SA with direction attribute
2024-05-19 18:36 [PATCH RFC iproute2-next 0/3] xfrm: Add support for SA direction and output cleanup Antony Antony
2024-05-19 18:37 ` [PATCH RFC iproute2-next 1/3] uapi: Update kernel headers xfrm.h Antony Antony
2024-05-19 18:37 ` [PATCH RFC iproute2-next 2/3] xfrm: support xfrm SA direction attribute Antony Antony
@ 2024-05-19 18:37 ` Antony Antony
2024-05-19 22:59 ` Stephen Hemminger
2 siblings, 1 reply; 8+ messages in thread
From: Antony Antony @ 2024-05-19 18:37 UTC (permalink / raw)
To: Stephen Hemminger, David Ahern
Cc: netdev, devel, Steffen Klassert, Eyal Birger, Antony Antony,
Nicolas Dichtel, Sabrina Dubroca, Christian Hopps
With the introduction of the new SA direction attribute, I propose
removing redundant attributes in 'ip xfrm state' output.
When the SA has direction set, 'ip xfrm state' output can be simpler,
as several attributes for the opposite direction become redundant.
This commit is experimental. Review the output format. Examples of
the old and new styles are provided below.
This patch also re-formats the output to provide only direction-specific
information, reducing confusion.
Main changes:
- Only show oseq_hi/oseq for output SA.
- Only show seq_hi/seq for input SA.
- Show replay-window attributes only for input SA.
- Show replay-window or ESN replay-window, not both.
- Use replay-window consistently with ESN and non-ESN.
* previously there was replay_window and replay-window.
Here is an exmple of input SA and output SA with ESN set.
-- input state ip xfrm state
-- new output wtih dir in --
ip xfrm state add src 10.1.3.4 dst 10.1.2.3 proto esp spi 3 reqid 2 \
mode tunnel aead 'rfc4106(gcm(aes))' \
0x2222222222222222222222222222222222222222 96 dir in flag esn \
replay-window 36
-- new outpu "ip xfrm state"
src 10.1.3.4 dst 10.1.2.3
proto esp spi 0x00000003 reqid 2 mode tunnel dir in
flag esn
aead rfc4106(gcm(aes)) 0x2222222222222222222222222222222222222222 96
seq-hi 0x0, seq 0x0
replay-window 36, bitmap-length 2
00000000 00000000
sel src 0.0.0.0/0 dst 0.0.0.0/0
-- old output ip xfrm state
src 10.1.3.4 dst 10.1.2.3
proto esp spi 0x00000003 reqid 2 mode tunnel
replay-window 0 flag esn
aead rfc4106(gcm(aes)) 0x2222222222222222222222222222222222222222 96
anti-replay esn context:
seq-hi 0x0, seq 0x0, oseq-hi 0x0, oseq 0x0
replay_window 36, bitmap-length 2
00000000 00000000
sel src 0.0.0.0/0 dst 0.0.0.0/0
--- example of output state :
ip xfrm state add src 10.1.3.4 dst 10.1.2.3 proto esp spi 3 reqid 2 \
mode tunnel aead 'rfc4106(gcm(aes))' \
0x2222222222222222222222222222222222222222 96 dir out flag esn
-- new output; ip xfrm state
src 10.1.3.4 dst 10.1.2.3
proto esp spi 0x00000003 reqid 2 mode tunnel dir out
flag esn
aead rfc4106(gcm(aes))
0x2222222222222222222222222222222222222222 96
oseq-hi 0x0, oseq 0x0
sel src 0.0.0.0/0 dst 0.0.0.0/0
-- old output; ip xfrm state
src 10.1.3.4 dst 10.1.2.3
proto esp spi 0x00000003 reqid 2 mode tunnel
replay-window 0 flag esn
aead rfc4106(gcm(aes)) 0x2222222222222222222222222222222222222222 96
anti-replay esn context:
seq-hi 0x0, seq 0x0, oseq-hi 0x0, oseq 0x0
replay_window 0, bitmap-length 0
sel src 0.0.0.0/0 dst 0.0.0.0/0
Noitce minor fixes to output of the following commands when the direction is set.
Old API and output works the same when the SA direction is not set.
"ip xfrm state"
"ip -s xfrm state"
"ip -d xfrm state"
"ip xfrm monitor"
"ip -s xfrm monitor"
"ip -d xfrm monitor"
Please test it and give feedback, did I miss a white space, tab..
Signed-off-by: Antony Antony <antony.antony@secunet.com>
---
ip/ipxfrm.c | 138 ++++++++++++++++++++++++++++++++++------------------
1 file changed, 90 insertions(+), 48 deletions(-)
diff --git a/ip/ipxfrm.c b/ip/ipxfrm.c
index 3c0faf62..d631c28d 100644
--- a/ip/ipxfrm.c
+++ b/ip/ipxfrm.c
@@ -257,7 +257,8 @@ const char *strxf_ptype(__u8 ptype)
static void xfrm_id_info_print(xfrm_address_t *saddr, struct xfrm_id *id,
__u8 mode, __u32 reqid, __u16 family, int force_spi,
- FILE *fp, const char *prefix, const char *title)
+ __u8 sa_dir, FILE *fp, const char *prefix,
+ const char *title)
{
if (title)
fputs(title, fp);
@@ -307,6 +308,15 @@ static void xfrm_id_info_print(xfrm_address_t *saddr, struct xfrm_id *id,
fprintf(fp, "%u", mode);
break;
}
+
+ if (sa_dir) {
+ fprintf(fp, " dir ");
+ if (sa_dir == XFRM_SA_DIR_IN)
+ fprintf(fp, "in");
+ else
+ fprintf(fp, "out");
+ }
+
fprintf(fp, "%s", _SL_);
}
@@ -322,7 +332,7 @@ static const char *strxf_limit(__u64 limit)
return str;
}
-static void xfrm_stats_print(struct xfrm_stats *s, FILE *fp,
+static void xfrm_stats_print(struct xfrm_stats *s, __u8 sa_dir, FILE *fp,
const char *prefix)
{
if (prefix)
@@ -331,8 +341,14 @@ static void xfrm_stats_print(struct xfrm_stats *s, FILE *fp,
if (prefix)
fputs(prefix, fp);
- fprintf(fp, " replay-window %u replay %u failed %u%s",
- s->replay_window, s->replay, s->integrity_failed, _SL_);
+
+ if (sa_dir == XFRM_SA_DIR_OUT) {
+ /* would the fail occur on OUT??? */
+ fprintf(fp, " failed %u%s", s->integrity_failed, _SL_);
+ } else {
+ fprintf(fp, " replay-window %u replay %u failed %u%s",
+ s->replay_window, s->replay, s->integrity_failed, _SL_);
+ }
}
static const char *strxf_time(__u64 time)
@@ -584,7 +600,7 @@ static void xfrm_tmpl_print(struct xfrm_user_tmpl *tmpls, int len,
fputs(prefix, fp);
xfrm_id_info_print(&tmpl->saddr, &tmpl->id, tmpl->mode,
- tmpl->reqid, tmpl->family, 0, fp, prefix, "tmpl ");
+ tmpl->reqid, tmpl->family, 0, 0, fp, prefix, "tmpl ");
if (show_stats > 0 || tmpl->optional) {
if (prefix)
@@ -675,6 +691,8 @@ done:
void xfrm_xfrma_print(struct rtattr *tb[], __u16 family, FILE *fp,
const char *prefix, bool nokeys, bool dir)
{
+ __u8 sa_dir = tb[XFRMA_SA_DIR] ? rta_getattr_u8(tb[XFRMA_SA_DIR]) : 0;
+
if (tb[XFRMA_MARK]) {
struct rtattr *rta = tb[XFRMA_MARK];
struct xfrm_mark *m = RTA_DATA(rta);
@@ -813,7 +831,6 @@ void xfrm_xfrma_print(struct rtattr *tb[], __u16 family, FILE *fp,
if (prefix)
fputs(prefix, fp);
- fprintf(fp, "anti-replay context: ");
if (RTA_PAYLOAD(tb[XFRMA_REPLAY_VAL]) < sizeof(*replay)) {
fprintf(fp, "(ERROR truncated)");
@@ -822,8 +839,11 @@ void xfrm_xfrma_print(struct rtattr *tb[], __u16 family, FILE *fp,
}
replay = RTA_DATA(tb[XFRMA_REPLAY_VAL]);
- fprintf(fp, "seq 0x%x, oseq 0x%x, bitmap 0x%08x",
- replay->seq, replay->oseq, replay->bitmap);
+ if (sa_dir == XFRM_SA_DIR_OUT)
+ fprintf(fp, "oseq 0x%x", replay->oseq);
+ else
+ fprintf(fp, "seq 0x%x, oseq 0x%x, bitmap 0x%08x",
+ replay->seq, replay->oseq, replay->bitmap);
fprintf(fp, "%s", _SL_);
}
@@ -833,36 +853,55 @@ void xfrm_xfrma_print(struct rtattr *tb[], __u16 family, FILE *fp,
if (prefix)
fputs(prefix, fp);
- fprintf(fp, "anti-replay esn context:");
+ if (!sa_dir) {
+ fprintf(fp, "anti-replay esn context:");
+ fprintf(fp, "%s", _SL_);
+ }
if (RTA_PAYLOAD(tb[XFRMA_REPLAY_ESN_VAL]) < sizeof(*replay)) {
- fprintf(fp, "(ERROR truncated)");
+ fprintf(fp, "(ERROR esn truncated)");
fprintf(fp, "%s", _SL_);
return;
}
- fprintf(fp, "%s", _SL_);
replay = RTA_DATA(tb[XFRMA_REPLAY_ESN_VAL]);
- if (prefix)
+
+ if (!sa_dir && prefix)
fputs(prefix, fp);
- fprintf(fp, " seq-hi 0x%x, seq 0x%x, oseq-hi 0x%0x, oseq 0x%0x",
- replay->seq_hi, replay->seq, replay->oseq_hi,
- replay->oseq);
+ if (!sa_dir)
+ fprintf(fp, " ");
+ if (!sa_dir || sa_dir == XFRM_SA_DIR_IN)
+ fprintf(fp, "seq-hi 0x%x, seq 0x%x",
+ replay->seq_hi, replay->seq);
+ if (!sa_dir)
+ fprintf(fp, " ");
+ if (!sa_dir || sa_dir == XFRM_SA_DIR_OUT)
+ fprintf(fp, "oseq-hi 0x%0x, oseq 0x%0x",
+ replay->oseq_hi, replay->oseq);
fprintf(fp, "%s", _SL_);
- if (prefix)
- fputs(prefix, fp);
- fprintf(fp, " replay_window %u, bitmap-length %u",
- replay->replay_window, replay->bmp_len);
- for (i = replay->bmp_len, j = 0; i; i--) {
- if (j++ % 8 == 0) {
- fprintf(fp, "%s", _SL_);
- if (prefix)
- fputs(prefix, fp);
+
+ if (sa_dir != XFRM_SA_DIR_OUT) {
+ if (prefix)
+ fputs(prefix, fp);
+ if (!sa_dir)
fprintf(fp, " ");
+ if (sa_dir)
+ fprintf(fp, "replay-window");
+ else
+ fprintf(fp, "replay_window"); /* for historic reasons */
+ fprintf(fp, " %u, bitmap-length %u", replay->replay_window,
+ replay->bmp_len);
+ for (i = replay->bmp_len, j = 0; i; i--) {
+ if (j++ % 8 == 0) {
+ fprintf(fp, "%s", _SL_);
+ if (prefix)
+ fputs(prefix, fp);
+ fprintf(fp, " ");
+ }
+ fprintf(fp, "%08x ", replay->bmp[i - 1]);
}
- fprintf(fp, "%08x ", replay->bmp[i - 1]);
+ fprintf(fp, "%s", _SL_);
}
- fprintf(fp, "%s", _SL_);
}
if (tb[XFRMA_OFFLOAD_DEV]) {
struct xfrm_user_offload *xuo;
@@ -904,18 +943,6 @@ void xfrm_xfrma_print(struct rtattr *tb[], __u16 family, FILE *fp,
fprintf(fp, "tfcpad %u", tfcpad);
fprintf(fp, "%s", _SL_);
}
- if (tb[XFRMA_SA_DIR]) {
- __u8 dir = rta_getattr_u8(tb[XFRMA_SA_DIR]);
-
- fprintf(fp, "\tdir ");
- if (dir == XFRM_SA_DIR_IN)
- fprintf(fp, "in");
- else if (dir == XFRM_SA_DIR_OUT)
- fprintf(fp, "out");
- else
- fprintf(fp, " %d", dir);
- fprintf(fp, "%s", _SL_);
- }
}
static int xfrm_selector_iszero(struct xfrm_selector *s)
@@ -944,22 +971,30 @@ void xfrm_state_info_print(struct xfrm_usersa_info *xsinfo,
{
char buf[STRBUF_SIZE] = {};
int force_spi = xfrm_xfrmproto_is_ipsec(xsinfo->id.proto);
+ __u8 sa_dir = tb[XFRMA_SA_DIR] ? rta_getattr_u8(tb[XFRMA_SA_DIR]) : 0;
+ bool sl = false;
xfrm_id_info_print(&xsinfo->saddr, &xsinfo->id, xsinfo->mode,
- xsinfo->reqid, xsinfo->family, force_spi, fp,
+ xsinfo->reqid, xsinfo->family, force_spi, sa_dir, fp,
prefix, title);
if (prefix)
strlcat(buf, prefix, sizeof(buf));
+
strlcat(buf, "\t", sizeof(buf));
- fputs(buf, fp);
- fprintf(fp, "replay-window %u ", xsinfo->replay_window);
- if (show_stats > 0)
- fprintf(fp, "seq 0x%08u ", xsinfo->seq);
+ if (sa_dir == 0 || (sa_dir == XFRM_SA_DIR_IN && tb[XFRMA_REPLAY_VAL])) {
+ fputs(buf, fp);
+ fprintf(fp, "replay-window %u ", xsinfo->replay_window);
+ if (show_stats > 0)
+ fprintf(fp, "seq 0x%08u ", xsinfo->seq);
+ sl = true;
+ }
+
if (show_stats > 0 || xsinfo->flags) {
__u8 flags = xsinfo->flags;
+ fputs(buf, fp);
fprintf(fp, "flag ");
XFRM_FLAG_PRINT(fp, flags, XFRM_STATE_NOECN, "noecn");
XFRM_FLAG_PRINT(fp, flags, XFRM_STATE_DECAP_DSCP, "decap-dscp");
@@ -969,8 +1004,10 @@ void xfrm_state_info_print(struct xfrm_usersa_info *xsinfo,
XFRM_FLAG_PRINT(fp, flags, XFRM_STATE_AF_UNSPEC, "af-unspec");
XFRM_FLAG_PRINT(fp, flags, XFRM_STATE_ALIGN4, "align4");
XFRM_FLAG_PRINT(fp, flags, XFRM_STATE_ESN, "esn");
- if (flags)
+ if (flags) {
fprintf(fp, "%x", flags);
+ }
+ sl = true;
}
if (show_stats > 0 && tb[XFRMA_SA_EXTRA_FLAGS]) {
__u32 extra_flags = rta_getattr_u32(tb[XFRMA_SA_EXTRA_FLAGS]);
@@ -982,12 +1019,17 @@ void xfrm_state_info_print(struct xfrm_usersa_info *xsinfo,
XFRM_FLAG_PRINT(fp, extra_flags,
XFRM_SA_XFLAG_OSEQ_MAY_WRAP,
"oseq-may-wrap");
- if (extra_flags)
+ if (extra_flags) {
fprintf(fp, "%x", extra_flags);
+ sl = true;
+ }
}
- if (show_stats > 0)
+ if (show_stats > 0) {
fprintf(fp, " (0x%s)", strxf_mask8(xsinfo->flags));
- fprintf(fp, "%s", _SL_);
+ sl = true;
+ }
+ if (sl)
+ fprintf(fp, "%s", _SL_);
xfrm_xfrma_print(tb, xsinfo->family, fp, buf, nokeys, true);
@@ -1002,7 +1044,7 @@ void xfrm_state_info_print(struct xfrm_usersa_info *xsinfo,
if (show_stats > 0) {
xfrm_lifetime_print(&xsinfo->lft, &xsinfo->curlft, fp, buf);
- xfrm_stats_print(&xsinfo->stats, fp, buf);
+ xfrm_stats_print(&xsinfo->stats, sa_dir, fp, buf);
}
if (tb[XFRMA_SEC_CTX])
--
2.30.2
^ permalink raw reply related [flat|nested] 8+ messages in thread