From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A7008C04AB6 for ; Tue, 28 May 2019 18:44:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7FFF720883 for ; Tue, 28 May 2019 18:44:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=appneta.com header.i=@appneta.com header.b="Lk2CACNh" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728139AbfE1Sow (ORCPT ); Tue, 28 May 2019 14:44:52 -0400 Received: from mail-pf1-f196.google.com ([209.85.210.196]:35369 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728102AbfE1Sou (ORCPT ); Tue, 28 May 2019 14:44:50 -0400 Received: by mail-pf1-f196.google.com with SMTP id d126so9828818pfd.2 for ; Tue, 28 May 2019 11:44:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=appneta.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ze8jepWGPJAMG1ZkYXRAZC7ie5pYIznlEj3Thcizxdc=; b=Lk2CACNhUfJOlEsrpdkwp3TsobL5jgP8Odt2x4Yhj04b/CWFh9hbjkadTy5/1DdxIc YdHZJFey0T9ojsU6acWxmLHbDbw431gfyYpW884YqAgrL3pUfynITUIe+O6ChdzRkSBL LV3eTFqCrxTqPn08pzYOyNA4mzpUkSJYnk0zQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ze8jepWGPJAMG1ZkYXRAZC7ie5pYIznlEj3Thcizxdc=; b=bId0CcVdC0UyTgInpUkNpb5b0gHMs7cKpZqqkoIdwO9ilRUT7Y4lMgA6MhMi5Em/Rj rav03lKAhYdWqyfwu7tGE/U7G9H3/bxruOyvGazko0yLNDLJLy0e0tlZU0ipdDBgPJiI UWm1r7YAX0XPEXn4fP8dbVQYSXtS0kUPayUeS4vyz+gi0U2NJkEWwUDimBTqesP0LLUE h2DMSced85XFdSqTHjVS8MnNzWIBjTxj7dXeFJKoRVnwQX1F7hnPS2XjJ8GrVHpMs8Eq fs7nxsD8zahUFPgAC74sKde3sVegcWYRMsF+aBoypfy8TMe1TZhRhLyVxIE3aJFrgHle sXWw== X-Gm-Message-State: APjAAAVGdov/du0Z4XZ3V0cT+z8olFQrR9lgR5QWbmkwoh9Gw0lvpjO9 sKCWOp3nzOzb7Bif9zVLRTjL6Q== X-Google-Smtp-Source: APXvYqwRIFHxCOzNUoN9Zu949YKegjPx4slN0w0F1ZPNzNriC5ijJegKz8DEZgkpbW3xbpluDZlVsQ== X-Received: by 2002:a63:2315:: with SMTP id j21mr39559244pgj.414.1559069089903; Tue, 28 May 2019 11:44:49 -0700 (PDT) Received: from linux-net-fred.jaalam.net ([2001:4958:15a0:24:5054:ff:fecb:7a95]) by smtp.googlemail.com with ESMTPSA id j72sm3534085pje.12.2019.05.28.11.44.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 May 2019 11:44:49 -0700 (PDT) From: Fred Klassen To: "David S. Miller" , Alexey Kuznetsov , Hideaki YOSHIFUJI , Shuah Khan , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Willem de Bruijn Cc: Fred Klassen Subject: [PATCH net-next v3 1/1] net/udp_gso: Allow TX timestamp with UDP GSO Date: Tue, 28 May 2019 11:44:15 -0700 Message-Id: <20190528184415.16020-2-fklassen@appneta.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190528184415.16020-1-fklassen@appneta.com> References: <20190528184415.16020-1-fklassen@appneta.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fixes an issue where TX Timestamps are not arriving on the error queue when UDP_SEGMENT CMSG type is combined with CMSG type SO_TIMESTAMPING. This can be illustrated with an updated updgso_bench_tx program which includes the '-T' option to test for this condition. ./udpgso_bench_tx -4ucTPv -S 1472 -l2 -D 172.16.120.18 poll timeout udp tx: 0 MB/s 1 calls/s 1 msg/s The "poll timeout" message above indicates that TX timestamp never arrived. It also appears that other TX CMSG types cause similar issues, for example trying to set SOL_IP/IP_TOS. ./udpgso_bench_tx -4ucPv -S 1472 -q 182 -l2 -D 172.16.120.18 poll timeout udp tx: 0 MB/s 1 calls/s 1 msg/s This patch preserves tx_flags for the first UDP GSO segment. v2: Remove tests as noted by Willem de Bruijn Moving tests from net to net-next v3: Update only relevant tx_flag bits as per Willem de Bruijn Fixes: ee80d1ebe5ba ("udp: add udp gso") Signed-off-by: Fred Klassen --- net/ipv4/udp_offload.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/net/ipv4/udp_offload.c b/net/ipv4/udp_offload.c index 065334b41d57..de8ecba42d55 100644 --- a/net/ipv4/udp_offload.c +++ b/net/ipv4/udp_offload.c @@ -228,6 +228,11 @@ struct sk_buff *__udp_gso_segment(struct sk_buff *gso_skb, seg = segs; uh = udp_hdr(seg); + /* preserve TX timestamp and zero-copy info for first segment */ + skb_shinfo(seg)->tskey = skb_shinfo(gso_skb)->tskey; + skb_shinfo(seg)->tx_flags |= + (skb_shinfo(gso_skb)->tx_flags & SKBTX_ANY_TSTAMP); + /* compute checksum adjustment based on old length versus new */ newlen = htons(sizeof(*uh) + mss); check = csum16_add(csum16_sub(uh->check, uh->len), newlen); -- 2.11.0