From patchwork Sun Apr 19 17:39:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 221014 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=-8.1 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, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_SANE_1 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 328EDC38A30 for ; Sun, 19 Apr 2020 17:44:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F0B36206E9 for ; Sun, 19 Apr 2020 17:44:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="JSby5esj" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726211AbgDSRoj (ORCPT ); Sun, 19 Apr 2020 13:44:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55432 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725793AbgDSRoi (ORCPT ); Sun, 19 Apr 2020 13:44:38 -0400 Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6C8F0C061A0C for ; Sun, 19 Apr 2020 10:44:38 -0700 (PDT) Received: by mail-wr1-x442.google.com with SMTP id k1so9221343wrx.4 for ; Sun, 19 Apr 2020 10:44:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=hOJKu6+hXN4oWwRYPk4f7modmHIuix1R+fKs55WqgOk=; b=JSby5esjSkoPk51QNFnWooYwRIuxK/1AmCRj3osEmyLP14oNp6p0MS4kS4yiiqjSvf LRbOtY+KmKxiO5S0+xOLaVitcZ3ZB+izirRXdvtafNSWWbnQ9DrX7G09IpTiaXMuYIPO VTHXToJY5vpWKsVKtPlfFzXMJbZzXDcy6IU/rTcRxCy75bhRyVRMyMZf9LUD/NkKY9A0 bI/iRqC0ErMPNWCsOJthw1p/ysJ5BfqEvcFckndHnbroh7uLYFDYsEQIUvyW8kkhKBfY +KADyFwZAUfVkPr+MYwj0QvB3KoHeUM/EBAp1hwgHu77Bc2881qaz5zb30cCD9BPjqp4 byOw== 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:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=hOJKu6+hXN4oWwRYPk4f7modmHIuix1R+fKs55WqgOk=; b=IlXHrrsASywqaijC2KBGnqFZJEWOMespSUuCHR7VONMEyHi3X65nihsBupZVgYuSYq zNpzKmvrEn6hqPfRDFN+KAVVfFhTx2XI4CwcDpBI2Hl+0mDm329q/JmAs5jIYgW9MPN3 mkd04X5muou+VvICPl27rBr253LWL7YWbL7I16YYuQrtKk6EL132EeQxTF4KlwIBmXu7 JQAUiV+O+Z01TySeaEbxgOk5QlZdbM4mtOpDJM84uDmluYGO+2Pq9vogXZQSkfgwmPAv C84Cmuzj6IQKPODOyXdi1ut3Wx+rRSTSYoqQM3B4ZD8ILjbu0gDPFzn0KUTX9xmHOgaI rGGw== X-Gm-Message-State: AGi0PubJAKrRE+ONWSWc0v1uEVyvvA5lCSw/klq6LIJXVgEkEDMAJcbz pSpvOkiez9S/ed+MTb3MivWVq2p1 X-Google-Smtp-Source: APiQypKCSWJMsQXUmIYC7CpzljcpBbJwgV1tAB065QH7q2yzIzlVavohfOsU9E1kRIZ/6cHqsOipEw== X-Received: by 2002:a05:6000:1008:: with SMTP id a8mr14967587wrx.189.1587318276431; Sun, 19 Apr 2020 10:44:36 -0700 (PDT) Received: from ?IPv6:2003:ea:8f29:6000:39dc:7003:657c:dd6e? (p200300EA8F29600039DC7003657CDD6E.dip0.t-ipconnect.de. [2003:ea:8f29:6000:39dc:7003:657c:dd6e]) by smtp.googlemail.com with ESMTPSA id v7sm13320195wmg.3.2020.04.19.10.44.35 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 19 Apr 2020 10:44:35 -0700 (PDT) Subject: [PATCH net-next 1/4] r8169: use smp_store_mb in rtl_tx From: Heiner Kallweit To: Realtek linux nic maintainers , David Miller Cc: "netdev@vger.kernel.org" References: Message-ID: Date: Sun, 19 Apr 2020 19:39:03 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Use helper smp_store_mb() instead of open-coding the functionality. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169_main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index 1bc415d00..dd6113fd7 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -4438,7 +4438,6 @@ static void rtl_tx(struct net_device *dev, struct rtl8169_private *tp, tp->tx_stats.bytes += bytes_compl; u64_stats_update_end(&tp->tx_stats.syncp); - tp->dirty_tx = dirty_tx; /* Sync with rtl8169_start_xmit: * - publish dirty_tx ring index (write barrier) * - refresh cur_tx ring index and queue status (read barrier) @@ -4446,7 +4445,7 @@ static void rtl_tx(struct net_device *dev, struct rtl8169_private *tp, * a racing xmit thread can only have a right view of the * ring status. */ - smp_mb(); + smp_store_mb(tp->dirty_tx, dirty_tx); if (netif_queue_stopped(dev) && rtl_tx_slots_avail(tp, MAX_SKB_FRAGS)) { netif_wake_queue(dev); From patchwork Sun Apr 19 17:41:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 221013 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=-8.1 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, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_SANE_1 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 3D422C54F70 for ; Sun, 19 Apr 2020 17:44:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1FB73206E9 for ; Sun, 19 Apr 2020 17:44:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="MS1ar4iY" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726385AbgDSRol (ORCPT ); Sun, 19 Apr 2020 13:44:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55434 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725927AbgDSRoj (ORCPT ); Sun, 19 Apr 2020 13:44:39 -0400 Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CB365C061A0F for ; Sun, 19 Apr 2020 10:44:38 -0700 (PDT) Received: by mail-wm1-x344.google.com with SMTP id h2so8319817wmb.4 for ; Sun, 19 Apr 2020 10:44:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=A+Vd2BXyliJgGE4HKrw7OlmjrDOuLp+ovt0puIdwfOo=; b=MS1ar4iYJo0qt9U5bK4ofu3nMObl8J2GEO6ZXTyGasNqiZMFVsGB3HFdsj2VF6jeKG duXffJh/5R+boDmV/5zs+G1nlfEo+NcYjtvVyEjHIE7Nr24hdxdcOSHNujEHz6hqGULP C+vfayT4qYaCUIsJYvfIEeDfESF/krtEahPb4OceqFLHSL0uJNrNCSSx/MJPbUK6bhpn nfbn/ZpdC/5bL473+xUZgafDsJi3JnPhtRrhDooeWjT1tvrNd9WNQO00hbqUkzTkDVfj MMvleL3aEJF62O2wPBie8NnttGL93f06c489vYP/Kuy/PX+7JOK5ekQ3nnzhMEUxMZ/E j1rA== 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:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=A+Vd2BXyliJgGE4HKrw7OlmjrDOuLp+ovt0puIdwfOo=; b=h+dksZRnFq7SnAWETv7GKszDxSORj+i42duBcMphmti6nZQTi+3zULEfv31aXukxqN lB+Hmhw/bTclYmCrQ/+rM5AXq0lb8fNDzyRy682j3Spfw20ueDt+l9MwogefszfqV2rJ CRvEGiFl98ROjia/Cm1MaCkZjKzTMPu9VMXTYqbda1KvIVBBT32WC1lvQyhYgW/79g73 HcYtU+MucrssQSzdIk61AjkL3tUDemIsip9tKn+HLoyZRUvogHmOoJYSZWlxvFO4Jyle BZQKCE8gBkzAJp2RLmBE4cXt0K3Nk/SA5dqje4fxHMjqFXk3YqNXdvNYgfLmebIhrffF YqGw== X-Gm-Message-State: AGi0PuZHlZSY5guTloMUZBrDt0faKr7WHYwqSuXwBNIocWSW7yhYOO/h rAORwoZG/+sUNNX9jbZYHcMDsnm9 X-Google-Smtp-Source: APiQypLHWqdNcC+K5FHDeHiIqcPGtegonYNs+cBAO/O2kI1d+4k2NbdG7krGEhvqvaP9kea+c2llAw== X-Received: by 2002:a1c:1c8:: with SMTP id 191mr9566679wmb.37.1587318277311; Sun, 19 Apr 2020 10:44:37 -0700 (PDT) Received: from ?IPv6:2003:ea:8f29:6000:39dc:7003:657c:dd6e? (p200300EA8F29600039DC7003657CDD6E.dip0.t-ipconnect.de. [2003:ea:8f29:6000:39dc:7003:657c:dd6e]) by smtp.googlemail.com with ESMTPSA id u30sm20775248wru.13.2020.04.19.10.44.36 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 19 Apr 2020 10:44:36 -0700 (PDT) Subject: [PATCH net-next 2/4] r8169: change wmb to dma_wmb in rtl8169_start_xmit From: Heiner Kallweit To: Realtek linux nic maintainers , David Miller Cc: "netdev@vger.kernel.org" References: Message-ID: Date: Sun, 19 Apr 2020 19:41:20 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org It's the typical dma_wmb() use case to finish descriptor writes before ringing the device doorbell. Therefore switch to this lighter barrier. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index dd6113fd7..038cd6fde 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -4259,7 +4259,7 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb, txd_first->opts1 |= cpu_to_le32(DescOwn | FirstFrag); /* Force all memory writes to complete before notifying device */ - wmb(); + dma_wmb(); tp->cur_tx += frags + 1;