Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp872028rwd; Wed, 7 Jun 2023 08:01:05 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5xODkR5ZIe9VAXu8OapEp8jYm6EfxFKFUvEHqwhAvY/Kb6B+RvAJc5mF/pT0ubZ1nXaAUj X-Received: by 2002:a05:6a21:9986:b0:10b:e88f:5983 with SMTP id ve6-20020a056a21998600b0010be88f5983mr3608080pzb.43.1686150065619; Wed, 07 Jun 2023 08:01:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686150065; cv=none; d=google.com; s=arc-20160816; b=BZpWV7YbwA5z66PGsff3d3n2xg1Y7qUrmCd+hsn2oybpZJJgVRcfoPx53lKNbm+516 FGQSD2Qkbtx79mnnvEUqmt5m1NftcE03x6sc5V+iFUDhwp7JbbLzI/QPEQ+f5h+9FPz+ PmRI88Vs/YcfRYsid+Vz1u8/mS6zy/LBPYhrOPgTqTdyj4yLRYZNvDARLhUKnaSwVpwj EELKuuTquOWpLgx2WfOAF+heSXbwAIXV3CgR9qm3dDAu7pClle7fbUeoS0nBdIQWes6y qxZwojriMJ2QNhYxSahCZhnXqzifS/Rs4kf6eX5qP2KxhpwK98Q9+hQDV7EFDvOC5QKS 9kTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=fFpvHzgaRY/5j/9ELb8QxJWBpaTq1Vb8GSt760xxeFM=; b=QDUWc5IjhGWXHOsOMzIw7W2yTmfHrrjh76aINnsrh8/L7MsOabiQuoMSR0Q7bzw/4r HCGDjX3Amsll3sDAk26HI3iKCAYjT21tNhm1WbMsb0LCj2JAtew5Y3z/s6fT33HXeDQz 8yXnSUmnFekylH02JHeVjT6QPmTPaqXXWr9pSxjAV4amqT1u74UAr4WGmRSi3MhxiIQF ufXwu6KCQjI1inwFQBWajrRXFDIhPxc4jjr7u4Ukdw7bVOideX0PE+OaPR0p9SStX6q2 mVm4tFSS/LSISjuk1BAW7sxjnHdd3USgk4U/am9sp31jaAh4LG57VR5D9Uj73D7NsQzI toVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=f1ZQNlGo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v9-20020a63b649000000b005440dcfee56si1445215pgt.265.2023.06.07.08.00.50; Wed, 07 Jun 2023 08:01:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=f1ZQNlGo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240766AbjFGOcC (ORCPT + 99 others); Wed, 7 Jun 2023 10:32:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57486 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234667AbjFGOb4 (ORCPT ); Wed, 7 Jun 2023 10:31:56 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A5AAF172E for ; Wed, 7 Jun 2023 07:31:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1686148272; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fFpvHzgaRY/5j/9ELb8QxJWBpaTq1Vb8GSt760xxeFM=; b=f1ZQNlGokxo8D0j2VH2RAZ1bHt/FyZNpT5KXvHdFM4353K1L9FGx7jtoJuSHEAJQLfSzvW kaltBnFc4HlBnpWLDvpXHFu+pSSo8Gfiz+wPz2Z/pteNmbAu5v5F3oFyKzQy9mYKpJUkXY 62e6r5FJj5X673EC89kR49CMWuQ6RMg= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-442-0ndtglCKMsqgcKb-RlBYPQ-1; Wed, 07 Jun 2023 10:06:31 -0400 X-MC-Unique: 0ndtglCKMsqgcKb-RlBYPQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 382973C02195; Wed, 7 Jun 2023 14:06:30 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.42.28.182]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1BF922166B25; Wed, 7 Jun 2023 14:06:27 +0000 (UTC) From: David Howells To: netdev@vger.kernel.org, Linus Torvalds Cc: David Howells , Chuck Lever , Boris Pismenny , John Fastabend , Jakub Kicinski , "David S. Miller" , Eric Dumazet , Paolo Abeni , Willem de Bruijn , David Ahern , Matthew Wilcox , Jens Axboe , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next v5 06/14] tls/device: Use splice_eof() to flush Date: Wed, 7 Jun 2023 15:05:51 +0100 Message-ID: <20230607140559.2263470-7-dhowells@redhat.com> In-Reply-To: <20230607140559.2263470-1-dhowells@redhat.com> References: <20230607140559.2263470-1-dhowells@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Allow splice to end a TLS record after prematurely ending a splice/sendfile due to getting an EOF condition (->splice_read() returned 0) after splice had called TLS with a sendmsg() with MSG_MORE set when the user didn't set MSG_MORE. Suggested-by: Linus Torvalds Link: https://lore.kernel.org/r/CAHk-=wh=V579PDYvkpnTobCLGczbgxpMgGmmhqiTyE34Cpi5Gg@mail.gmail.com/ Signed-off-by: David Howells cc: Chuck Lever cc: Boris Pismenny cc: John Fastabend cc: Jakub Kicinski cc: Eric Dumazet cc: "David S. Miller" cc: Paolo Abeni cc: Jens Axboe cc: Matthew Wilcox cc: netdev@vger.kernel.org --- net/tls/tls.h | 1 + net/tls/tls_device.c | 23 +++++++++++++++++++++++ net/tls/tls_main.c | 2 ++ 3 files changed, 26 insertions(+) diff --git a/net/tls/tls.h b/net/tls/tls.h index 4922668fefaa..d002c3af1966 100644 --- a/net/tls/tls.h +++ b/net/tls/tls.h @@ -116,6 +116,7 @@ ssize_t tls_sw_splice_read(struct socket *sock, loff_t *ppos, size_t len, unsigned int flags); int tls_device_sendmsg(struct sock *sk, struct msghdr *msg, size_t size); +void tls_device_splice_eof(struct socket *sock); int tls_device_sendpage(struct sock *sk, struct page *page, int offset, size_t size, int flags); int tls_tx_records(struct sock *sk, int flags); diff --git a/net/tls/tls_device.c b/net/tls/tls_device.c index 9ef766e41c7a..439be833dcf9 100644 --- a/net/tls/tls_device.c +++ b/net/tls/tls_device.c @@ -590,6 +590,29 @@ int tls_device_sendmsg(struct sock *sk, struct msghdr *msg, size_t size) return rc; } +void tls_device_splice_eof(struct socket *sock) +{ + struct sock *sk = sock->sk; + struct tls_context *tls_ctx = tls_get_ctx(sk); + union tls_iter_offset iter; + struct iov_iter iov_iter = {}; + + if (!tls_is_partially_sent_record(tls_ctx)) + return; + + mutex_lock(&tls_ctx->tx_lock); + lock_sock(sk); + + if (tls_is_partially_sent_record(tls_ctx)) { + iov_iter_bvec(&iov_iter, ITER_SOURCE, NULL, 0, 0); + iter.msg_iter = &iov_iter; + tls_push_data(sk, iter, 0, 0, TLS_RECORD_TYPE_DATA, NULL); + } + + release_sock(sk); + mutex_unlock(&tls_ctx->tx_lock); +} + int tls_device_sendpage(struct sock *sk, struct page *page, int offset, size_t size, int flags) { diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c index 82ec5c654f32..7b9c83dd7de2 100644 --- a/net/tls/tls_main.c +++ b/net/tls/tls_main.c @@ -1044,10 +1044,12 @@ static void build_protos(struct proto prot[TLS_NUM_CONFIG][TLS_NUM_CONFIG], #ifdef CONFIG_TLS_DEVICE prot[TLS_HW][TLS_BASE] = prot[TLS_BASE][TLS_BASE]; prot[TLS_HW][TLS_BASE].sendmsg = tls_device_sendmsg; + prot[TLS_HW][TLS_BASE].splice_eof = tls_device_splice_eof; prot[TLS_HW][TLS_BASE].sendpage = tls_device_sendpage; prot[TLS_HW][TLS_SW] = prot[TLS_BASE][TLS_SW]; prot[TLS_HW][TLS_SW].sendmsg = tls_device_sendmsg; + prot[TLS_HW][TLS_SW].splice_eof = tls_device_splice_eof; prot[TLS_HW][TLS_SW].sendpage = tls_device_sendpage; prot[TLS_BASE][TLS_HW] = prot[TLS_BASE][TLS_SW];