From: Maxim Mikityanskiy Date: Wed, 8 Jun 2022 15:34:45 +0000 (+0300) Subject: ss: Shorter display format for TLS zerocopy sendfile X-Git-Tag: v6.0.0~38 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b112043ea8f26ab61e932f3b25c670eeaa620b73;p=thirdparty%2Fiproute2.git 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 Signed-off-by: David Ahern --- diff --git a/misc/ss.c b/misc/ss.c index c4434a20b..ff985cd8c 100644 --- 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] =