ss: Shorter display format for TLS zerocopy sendfile

Commit 21c07b45688f ("ss: Show zerocopy sendfile status of TLS
sockets") started displaying the activation status of zerocopy sendfile
on TLS sockets, exposed via sock_diag. This commit makes the format more
compact: the flag's name is shorter and is printed only when the feature
is active, similar to other flag options.

The flag's name is also generalized ("sendfile" -> "tx") to embrace
possible future optimizations, and includes an explicit indication that
the underlying data must not be modified during transfer ("ro").

Signed-off-by: Maxim Mikityanskiy <maximmi@nvidia.com>
Signed-off-by: David Ahern <dsahern@kernel.org>

diff --git a/misc/ss.c b/misc/ss.c
index c4434a20bcfee8730c9ff6ce2dc465c86bd6705a..ff985cd8cae91f80fe24a505b4890d3a6e4aa194 100644 (file)
--- a/misc/ss.c
+++ b/misc/ss.c
@@ -2988,7 +2988,8 @@ static void tcp_tls_conf(const char *name, struct rtattr *attr)
 
 static void tcp_tls_zc_sendfile(struct rtattr *attr)
 {
-       out(" zerocopy_sendfile: %s", attr ? "active" : "inactive");
+       if (attr)
+               out(" zc_ro_tx");
 }
 
 static void mptcp_subflow_info(struct rtattr *tb[])
@@ -3221,7 +3222,7 @@ static void tcp_show_info(const struct nlmsghdr *nlh, struct inet_diag_msg *r,
                        tcp_tls_cipher(tlsinfo[TLS_INFO_CIPHER]);
                        tcp_tls_conf("rxconf", tlsinfo[TLS_INFO_RXCONF]);
                        tcp_tls_conf("txconf", tlsinfo[TLS_INFO_TXCONF]);
-                       tcp_tls_zc_sendfile(tlsinfo[TLS_INFO_ZC_SENDFILE]);
+                       tcp_tls_zc_sendfile(tlsinfo[TLS_INFO_ZC_RO_TX]);
                }
                if (ulpinfo[INET_ULP_INFO_MPTCP]) {
                        struct rtattr *sfinfo[MPTCP_SUBFLOW_ATTR_MAX + 1] =