| Message ID | 20220608153445.3152112-1-maximmi@nvidia.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | David Ahern |
| Headers | show |
| Series | [iproute2-next,v4] ss: Shorter display format for TLS zerocopy sendfile | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
On 6/8/22 9:34 AM, Maxim Mikityanskiy wrote: > 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> > --- > include/uapi/linux/tls.h | 2 +- > misc/ss.c | 5 +++-- > 2 files changed, 4 insertions(+), 3 deletions(-) > applied to iproute2-next
diff --git a/include/uapi/linux/tls.h b/include/uapi/linux/tls.h index 83a3cea4..4f868648 100644 --- a/include/uapi/linux/tls.h +++ b/include/uapi/linux/tls.h @@ -161,7 +161,7 @@ enum { TLS_INFO_CIPHER, TLS_INFO_TXCONF, TLS_INFO_RXCONF, - TLS_INFO_ZC_SENDFILE, + TLS_INFO_ZC_RO_TX, __TLS_INFO_MAX, }; #define TLS_INFO_MAX (__TLS_INFO_MAX - 1) diff --git a/misc/ss.c b/misc/ss.c index c4434a20..ff985cd8 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] =
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> --- include/uapi/linux/tls.h | 2 +- misc/ss.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-)