tls: Rename TLS_INFO_ZC_SENDFILE to TLS_INFO_ZC_TX
Subsystems (3)
PATCH v2 1/1 tls: Rename TLS_INFO_ZC_SENDFILE to TLS_INFO_ZC_TX
To embrace possible future optimizations of TLS, rename zerocopy sendfile definitions to more generic ones:
* setsockopt: TLS_TX_ZEROCOPY_SENDFILE- > TLS_TX_ZEROCOPY_RO
* sock_diag: TLS_INFO_ZC_SENDFILE -> TLS_INFO_ZC_RO_TX
RO stands for readonly and emphasizes that the application shouldn't modify the data being transmitted with zerocopy to avoid potential disconnection.
--- include/uapi/linux/tls.h | 4 ++-- net/tls/tls_main.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-)
include/uapi/linux/tls.h +2 -2
@@ -39,7 +39,7 @@/* TLS socket options */ #define TLS_TX 1/* Set transmit parameters */ #define TLS_RX 2/* Set receive parameters */ -#define TLS_TX_ZEROCOPY_SENDFILE 3/* transmit zerocopy sendfile */ +#define TLS_TX_ZEROCOPY_RO 3/* TX zerocopy (only sendfile now) */ /* Supported versions */ #define TLS_VERSION_MINOR (ver) ((ver) & 0xFF)
@@ -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)
net/tls/tls_main.c +4 -4
@@ -544,7 +544,7 @@ static int do_tls_getsockopt(struct sock *sk, int optname, rc =do_tls_getsockopt_conf (sk, optval, optlen, optname ==TLS_TX );break ; -case TLS_TX_ZEROCOPY_SENDFILE : +case TLS_TX_ZEROCOPY_RO : rc =do_tls_getsockopt_tx_zc (sk, optval, optlen);break ;default :
@@ -731,7 +731,7 @@ static int do_tls_setsockopt(struct sock *sk, int optname, sockptr_t optval, optname == TLS_TX);release_sock (sk);break ; -case TLS_TX_ZEROCOPY_SENDFILE : +case TLS_TX_ZEROCOPY_RO :lock_sock (sk); rc =do_tls_setsockopt_tx_zc (sk, optval, optlen);release_sock (sk);
@@ -970,7 +970,7 @@ static int tls_get_info(const struct sock *sk, struct sk_buff *skb) goto nla_failure;if (ctx->tx_conf ==TLS_HW && ctx->zerocopy_sendfile) { - err =nla_put_flag (skb,TLS_INFO_ZC_SENDFILE ); + err =nla_put_flag (skb,TLS_INFO_ZC_RO_TX );if (err) goto nla_failure; }
@@ -994,7 +994,7 @@ static size_t tls_get_info_size(const struct sock *sk)nla_total_size (sizeof (u16)) +/* TLS_INFO_CIPHER */ nla_total_size (sizeof (u16)) +/* TLS_INFO_RXCONF */ nla_total_size (sizeof (u16)) +/* TLS_INFO_TXCONF */ -nla_total_size (0 ) +/* TLS_INFO_ZC_SENDFILE */ +nla_total_size (0 ) +/* TLS_INFO_ZC_RO_TX */ 0 ;return size;
Signature · 1 line
2.25.1
This patch was applied to netdev/net.git (master) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (master)
by Jakub Kicinski <[email protected]>:
Quoted 11 lines · On Wed, 8 Jun 2022 18:34:25 +0300 you wrote:
To embrace possible future optimizations of TLS, rename zerocopy sendfile definitions to more generic ones:
* setsockopt: TLS_TX_ZEROCOPY_SENDFILE- >
TLS_TX_ZEROCOPY_RO
*sock_diag:TLS_INFO_ZC_SENDFILE->TLS_INFO_ZC_RO_TXRO stands for readonly and emphasizes that the application shouldn't modify the data being transmitted with zerocopy to avoid potential disconnection.
[...]
Here is the summary with links:
- [net,v2] tls: Rename TLS_INFO_ZC_SENDFILE to TLS_INFO_ZC_TX
https://git.kernel.org/netdev/net/c/b489a6e58716
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html