From patchwork Sat Jan 31 15:40:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladislav Yasevich X-Patchwork-Id: 435154 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 52A4C140218 for ; Sun, 1 Feb 2015 02:41:16 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753950AbbAaPlL (ORCPT ); Sat, 31 Jan 2015 10:41:11 -0500 Received: from mail-qg0-f50.google.com ([209.85.192.50]:39465 "EHLO mail-qg0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752710AbbAaPlK (ORCPT ); Sat, 31 Jan 2015 10:41:10 -0500 Received: by mail-qg0-f50.google.com with SMTP id f51so42229350qge.9 for ; Sat, 31 Jan 2015 07:41:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=hedYnIp9ArpxltQOUAQ0gxvJuXQvtyYqVzTZ/BnawSQ=; b=WatuCA7UECOBaN7Grn/3S4+fAoAbIF1p2rrGrK7n574hqyUcgioNBZctnj+GwwCwEW JYlXazT1RaLOj7aEaVq95wXu2Ubh/rYil1p/31y2qKHmzArIc3Lpl6LLGDDwL4oNgCi9 kJwl6Gc8oDhTozN3s6O1388vJViQVxQiCsxHKlbjTp16IrmlJpDKBfyEh4rBiW6UJxX7 aNe+Ijugw4WeYwAFmky930v/yJA8HF30yB2C2gG/MSbmkO1KWmZ28ooS/oV9Zs1sPq5E yAP2nc5s2BvFRijI46eFwe65/GKcm2P0g0NgJ9X2HzZuV/rKaU6waECght9sAv8XcwWu uChA== X-Received: by 10.224.120.65 with SMTP id c1mr23771988qar.87.1422718869275; Sat, 31 Jan 2015 07:41:09 -0800 (PST) Received: from flash.wp.comcast.net (74-92-48-158-NewEngland.hfc.comcastbusiness.net. [74.92.48.158]) by mx.google.com with ESMTPSA id l1sm929602qag.33.2015.01.31.07.40.58 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 31 Jan 2015 07:41:08 -0800 (PST) From: Vladislav Yasevich X-Google-Original-From: Vladislav Yasevich To: netdev@vger.kernel.org Cc: herbert@gondor.apana.org.au, hannes@stressinduktion.org, Vladislav Yasevich Subject: [PATCH net-next 5/6] udpv6: Add lockless sendmsg() support Date: Sat, 31 Jan 2015 10:40:17 -0500 Message-Id: <1422718818-21093-6-git-send-email-vyasevic@redhat.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1422718818-21093-1-git-send-email-vyasevic@redhat.com> References: <1422718818-21093-1-git-send-email-vyasevic@redhat.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This commit adds the same functionaliy to IPv6 that commit 903ab86d195cca295379699299c5fc10beba31c7 Author: Herbert Xu Date: Tue Mar 1 02:36:48 2011 +0000 udp: Add lockless transmit path added to IPv4. UDP transmit path can now run without a socket lock, thus allowing multiple threads to send to a single socket more efficiently. This is only used when corking/MSG_MORE is not used. Signed-off-by: Vladislav Yasevich --- net/ipv6/udp.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index 67a3d70..d048d46 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -1177,6 +1177,7 @@ do_udp_sendmsg: if (len > INT_MAX - sizeof(struct udphdr)) return -EMSGSIZE; + getfrag = is_udplite ? udplite_getfrag : ip_generic_getfrag; if (up->pending) { /* * There are pending frames. @@ -1307,6 +1308,20 @@ do_udp_sendmsg: goto do_confirm; back_from_confirm: + /* Lockless fast path for the non-corking case */ + if (!corkreq) { + struct sk_buff *skb; + + skb = ip6_make_skb(sk, getfrag, msg, ulen, + sizeof(struct udphdr), hlimit, tclass, opt, + &fl6, (struct rt6_info *)dst, + msg->msg_flags, dontfrag); + err = PTR_ERR(skb); + if (!IS_ERR_OR_NULL(skb)) + err = udp_v6_send_skb(skb, &fl6); + goto release_dst; + } + lock_sock(sk); if (unlikely(up->pending)) { /* The socket is already corked while preparing it. */ @@ -1324,7 +1339,6 @@ do_append_data: if (dontfrag < 0) dontfrag = np->dontfrag; up->len += ulen; - getfrag = is_udplite ? udplite_getfrag : ip_generic_getfrag; err = ip6_append_data(sk, getfrag, msg, ulen, sizeof(struct udphdr), hlimit, tclass, opt, &fl6, (struct rt6_info *)dst, @@ -1336,6 +1350,11 @@ do_append_data: else if (unlikely(skb_queue_empty(&sk->sk_write_queue))) up->pending = 0; + if (err > 0) + err = np->recverr ? net_xmit_errno(err) : 0; + release_sock(sk); + +release_dst: if (dst) { if (connected) { ip6_dst_store(sk, dst, @@ -1352,9 +1371,6 @@ do_append_data: dst = NULL; } - if (err > 0) - err = np->recverr ? net_xmit_errno(err) : 0; - release_sock(sk); out: dst_release(dst); fl6_sock_release(flowlabel);