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=-5.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,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 ADB04C43381 for ; Tue, 12 Mar 2019 19:51:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 732652087C for ; Tue, 12 Mar 2019 19:51:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="iQMBDjdK" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727017AbfCLTvD (ORCPT ); Tue, 12 Mar 2019 15:51:03 -0400 Received: from mail-it1-f195.google.com ([209.85.166.195]:53521 "EHLO mail-it1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726372AbfCLTvD (ORCPT ); Tue, 12 Mar 2019 15:51:03 -0400 Received: by mail-it1-f195.google.com with SMTP id x189so6466959itd.3 for ; Tue, 12 Mar 2019 12:51:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=1zHoVoORdu6u/7jwmfV/Gpz4KQxLB/RaqUIMrhTOD4o=; b=iQMBDjdK9MyfMZ66NtlhSEyVe8qpMsbllyxQRnquf2+6WOjRlfQD9xxH1VR8LYgtyd 1mCz0C4PGPwMtN75zfEyVcuVu+pp5YGjKxii4qRIhnGsX/MCq/mVI7kgWN4ZWrxYBpPa TB6msdD8BC2eD2b0n7SpD8bY5G0YhMp9YBBY0pwPcOWXcJ6eFOr7Yna3aj/uR41kWYxn yy9t/Xa9T9a3QhgGF+Nxis60gi0ckLijIl2NkPghyqpShVrGbl3tAnBiJv2Xk7pXNEVS 4v2sPsWC/MDTBfktrowZ9k9lmlxAeIidoH+NFeZW5cfYjs6tMyRXzudm3a4Jc9xqeZgW DLaA== 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; bh=1zHoVoORdu6u/7jwmfV/Gpz4KQxLB/RaqUIMrhTOD4o=; b=p5hBcirb6i2DxM4XsWdtcZzNgIwvQ+232KBSZWKSGn71/L5wuX+aK43YYwZYrbyN04 vJ89A8/TgZEPKqUMr92i7i89sbBUh1Unm1DDsF7Pm7h8tvDc5xe/T9vCG0T7X+i01pso L6MLGw506i5ENtEbOEXJnTUIoEiaPwJqivmtsS3hPW8sowXqLtVvLW0lJRJRzZRNgU4C plNrOVGajPQAkedSJqrafE4OcwOZDxKfRSUHweC/WOBo+2RMOoX1cfERckFuDMhjgzgq s7OE+1eHBCmeVAvfhlzLSaaLS0XjOEyKMiyaOijc2sXzmVM1Y8Zv0nqlhSV6vs2alpLA exHA== X-Gm-Message-State: APjAAAX2dOB+ZOlMISoCDeGoQMWs9iAXWqjs749Fux7bzuOmYdHe3TQ8 kDkpGOw2tCLRaJq6v1gMyppLPwJn X-Google-Smtp-Source: APXvYqzXD+PpClfHj56TdHOEq/Eh6Lxppbkju4c8A4D795Fz14dRe3HIYH9GH4EQhjuXScbyTuB52w== X-Received: by 2002:a02:c6a9:: with SMTP id o9mr22387081jan.70.1552420262013; Tue, 12 Mar 2019 12:51:02 -0700 (PDT) Received: from pthomas-desktop.amsc.com ([50.239.78.34]) by smtp.gmail.com with ESMTPSA id m25sm733198iti.16.2019.03.12.12.51.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Mar 2019 12:51:01 -0700 (PDT) From: Paul Thomas To: netdev@vger.kernel.org Cc: Paul Thomas Subject: [PATCH] Check for SKBTX_HW_TSTAMP in macb driver Date: Tue, 12 Mar 2019 15:50:53 -0400 Message-Id: <20190312195053.21741-1-pthomas8589@gmail.com> X-Mailer: git-send-email 2.17.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Make sure SKBTX_HW_TSTAMP (i.e. SOF_TIMESTAMPING_TX_HARDWARE) has been enabled for this skb This is a concept for discussion, more testing is needed. It does fix the issue where normal socks that aren't expecting a timestamp will not wake up on select. --- drivers/net/ethernet/cadence/macb_main.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index ad099fd01b45..b2f184fc1370 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -898,11 +898,13 @@ static void macb_tx_interrupt(struct macb_queue *queue) /* First, update TX stats if needed */ if (skb) { - if (gem_ptp_do_txstamp(queue, skb, desc) == 0) { - /* skb now belongs to timestamp buffer - * and will be removed later - */ - tx_skb->skb = NULL; + if(unlikely(skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP)) { + if (gem_ptp_do_txstamp(queue, skb, desc) == 0) { + /* skb now belongs to timestamp buffer + * and will be removed later + */ + tx_skb->skb = NULL; + } } netdev_vdbg(bp->dev, "skb %u (data %p) TX complete\n", macb_tx_ring_wrap(bp, tail), -- 2.17.1