From patchwork Tue Apr 12 13:58:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antoine Tenart X-Patchwork-Id: 12810854 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DFD34C433F5 for ; Tue, 12 Apr 2022 13:59:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236367AbiDLOBR (ORCPT ); Tue, 12 Apr 2022 10:01:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36778 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229632AbiDLOBQ (ORCPT ); Tue, 12 Apr 2022 10:01:16 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C72B05C669 for ; Tue, 12 Apr 2022 06:58:58 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 7A1C1B81E80 for ; Tue, 12 Apr 2022 13:58:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 75134C385A9; Tue, 12 Apr 2022 13:58:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1649771936; bh=zMkEg32KnDcFv+Srq+fXn/V5ksJss3sMBSytko16YuE=; h=From:To:Cc:Subject:Date:From; b=kXJSSXpC6mkNGl8FLhqLKzNSGdmu8QlNcQPAd+6dkErWU4ySiHxtB3DXQ76/FTmxK VmGTPpXR9cHBfbjoYCRf14Hl3Ayjd5UjaT5MhuPNSnfKdvkFLoM77FY4tBKYvNKhFO kr8UIuECvoTHAjYJ0AWN+1rpt/fLWAH2hP3//6rdFIVe2cuErCoGB6/38nrBTxukmW UNOuzOk4ZYyMDV+8d7PrjyW+TiLJCNXkdO6lAWdUqIy5RqDvgvzwzQCPOehcPnMrxp TZkQHyoCySItrVQeebvlwDBn6FySk339gqRD2Yke7tzy3zQF7Koe9wgh6muxWce8Yb XDiOcZH/N9hdA== From: Antoine Tenart To: davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com Cc: Antoine Tenart , netdev@vger.kernel.org, Eric Dumazet Subject: [PATCH net] tun: annotate access to queue->trans_start Date: Tue, 12 Apr 2022 15:58:52 +0200 Message-Id: <20220412135852.466386-1-atenart@kernel.org> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Commit 5337824f4dc4 ("net: annotate accesses to queue->trans_start") introduced a new helper, txq_trans_cond_update, to update queue->trans_start using WRITE_ONCE. One snippet in drivers/net/tun.c was missed, as it was introduced roughly at the same time. Fixes: 5337824f4dc4 ("net: annotate accesses to queue->trans_start") Cc: Eric Dumazet Signed-off-by: Antoine Tenart Reviewed-by: Eric Dumazet --- drivers/net/tun.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 276a0e42ca8e..dbe4c0a4be2c 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -1124,7 +1124,7 @@ static netdev_tx_t tun_net_xmit(struct sk_buff *skb, struct net_device *dev) /* NETIF_F_LLTX requires to do our own update of trans_start */ queue = netdev_get_tx_queue(dev, txq); - queue->trans_start = jiffies; + txq_trans_cond_update(queue); /* Notify and wake up reader process */ if (tfile->flags & TUN_FASYNC)