diff options
| author | Maxim Mikityanskiy <maximmi@nvidia.com> | 2022-06-08 18:34:45 +0300 |
|---|---|---|
| committer | David Ahern <dsahern@kernel.org> | 2022-06-12 09:51:34 -0600 |
| commit | b112043ea8f26ab61e932f3b25c670eeaa620b73 (patch) | |
| tree | 6607332897ca0d764a61d9bfe383b3e05405a9d0 | |
| parent | 266d0f854a50d31e188752965ec7c767818f55c4 (diff) | |
| download | iproute2-b112043ea8f26ab61e932f3b25c670eeaa620b73.tar.gz | |
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>
| -rw-r--r-- | misc/ss.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -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] = |