From patchwork Fri Jan 12 18:10:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Fastabend X-Patchwork-Id: 860138 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="dgNao0oz"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zJ9mG17dbz9sBW for ; Sat, 13 Jan 2018 05:11:10 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965198AbeALSLH (ORCPT ); Fri, 12 Jan 2018 13:11:07 -0500 Received: from mail-pg0-f67.google.com ([74.125.83.67]:36251 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964996AbeALSLG (ORCPT ); Fri, 12 Jan 2018 13:11:06 -0500 Received: by mail-pg0-f67.google.com with SMTP id j2so5064146pgv.3 for ; Fri, 12 Jan 2018 10:11:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=IhqMlB/DT726vTViOYGUIXPkQUtSPMhemeelfSoA6aA=; b=dgNao0oz9VId+e88mmRvUAvE6f+8Med5BYRksmcymjN0DmwzSbI04Rs3feVBlRWJ4T Itoawb9A7hfL6jTSynuOGYnHyFiI/Jts/uuhhQSE4WGAvBAGx2dp56LEg1d1DIlYgb4+ lxv9QAM0a76RiCd/0dPGnXRNZjFztQpjNz+7VS3Al85nitxwXF6dWXxLCaR+wH9FDCm2 mJNE7L8jGZY2vuSBBeEneeKgyKVfZ1JQccaB4rGICntLSwCl9firlkcU8R2ru+9nLOyY rq14RY+8pL0eZrkeXpiIFgXfLrYqZPMT6JtIrbv2boWnSyfxcG1M2NJL1F86GRwbpCS+ e2YA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=IhqMlB/DT726vTViOYGUIXPkQUtSPMhemeelfSoA6aA=; b=EFnyYvazbiQENgKgkzXdTfBPFiy1Zh9GHoIHj/BHI9FyeUArkHepHzHjAeqyy0Tc4x VVbKqJ0MJnF06IhMBe50baGr4JAabfrrg+hjSPhMWwRc75m2AhzLOIH74GWCmLAWVN+1 MPb7TMJ/0ietrw4TMVpe/FelIqmxzxX3Jwqu2J0yDBApvtfLM9acKY3oIku11FbMSPWq vNUFM9QyHzwcvvfLN79WdElY4Fw/OCvjTk82C2rWJF5KxUmyB7RX1H+q+Z+DgzdccMP5 EWWRenCeg+3+hswD0vC58/wPf16kamRb378Jw1x1vx2hADCO4SCPzt8Yw7qcM3x27KXz 6i1g== X-Gm-Message-State: AKGB3mIc3aLfaedBj7uqWmXMB+VwFeYeXKKnC+YQGuVPxGxgj1jL5Z9w xQ3BWIdmCFwMWHi7ws3FcLZR6Q== X-Google-Smtp-Source: ACJfBovnNLaowrPOsJFN3f5wviJo29zWraFmGPayZwYUlSPJ7BHtN9UaqopRmwadpL61OIPu9rw+lg== X-Received: by 10.84.244.66 with SMTP id e2mr22710064plt.364.1515780665894; Fri, 12 Jan 2018 10:11:05 -0800 (PST) Received: from [127.0.1.1] ([75.106.27.153]) by smtp.gmail.com with ESMTPSA id q69sm48369017pfa.161.2018.01.12.10.11.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Jan 2018 10:11:05 -0800 (PST) Subject: [bpf-next PATCH 4/7] net: do_tcp_sendpages flag to avoid SKBTX_SHARED_FRAG From: John Fastabend To: borkmann@iogearbox.net, john.fastabend@gmail.com, ast@kernel.org Cc: netdev@vger.kernel.org, kafai@fb.com Date: Fri, 12 Jan 2018 10:10:55 -0800 Message-ID: <20180112181055.21531.95322.stgit@john-Precision-Tower-5810> In-Reply-To: <20180112175029.21531.54693.stgit@john-Precision-Tower-5810> References: <20180112175029.21531.54693.stgit@john-Precision-Tower-5810> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When calling do_tcp_sendpages() from in kernel and we know the data has no references from user side we can omit SKBTX_SHARED_FRAG flag. This patch adds an internal flag, NO_SKBTX_SHARED_FRAG that can be used to omit setting SKBTX_SHARED_FRAG. Signed-off-by: John Fastabend --- include/linux/socket.h | 1 + net/ipv4/tcp.c | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/include/linux/socket.h b/include/linux/socket.h index 9286a5a..add9360 100644 --- a/include/linux/socket.h +++ b/include/linux/socket.h @@ -287,6 +287,7 @@ struct ucred { #define MSG_SENDPAGE_NOTLAST 0x20000 /* sendpage() internal : not the last page */ #define MSG_BATCH 0x40000 /* sendmmsg(): more messages coming */ #define MSG_EOF MSG_FIN +#define MSG_NO_SHARED_FRAGS 0x80000 /* sendpage() internal : page frags are not shared */ #define MSG_ZEROCOPY 0x4000000 /* Use user data in kernel path */ #define MSG_FASTOPEN 0x20000000 /* Send data in TCP SYN */ diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 7ac583a..56c6f49 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -995,7 +995,9 @@ ssize_t do_tcp_sendpages(struct sock *sk, struct page *page, int offset, get_page(page); skb_fill_page_desc(skb, i, page, offset, copy); } - skb_shinfo(skb)->tx_flags |= SKBTX_SHARED_FRAG; + + if (!(flags & MSG_NO_SHARED_FRAGS)) + skb_shinfo(skb)->tx_flags |= SKBTX_SHARED_FRAG; skb->len += copy; skb->data_len += copy;