From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x225bDYSqwpi9ZMYpGcHlsH7wUUX71WrzO5UCSqkRoHhd4Dg/xBs26EMMVTmPAAJqt3hzQvtI ARC-Seal: i=1; a=rsa-sha256; t=1517256927; cv=none; d=google.com; s=arc-20160816; b=vsNl/7smG+35/UzGoIpCmlO6ZVtauN4+XA/iq/rPZjHOkDDUNdHBUBjxaP6HtSUUvP EWSR8aIilcS1p/Hh/h2GrsoZMqPO+NCjffIkvmdxhG906VgtD4LSaGuz13kugw01uwTU QwLn4EoENvwMzNZIvw6gGayX07Ft4VeGjlgWezVihfj8MHcDC6S6qR/RKxWSDY2bCT0A 1km1BJSC1EVpRo0z/CItPNsoG3yj2Vxm5Dh1t1LIxGBQ31kHEurLRGptvikkKwnIUP1R RzNoj9uLj0/9Z4ltm2mfJrFrkxphCUQq0w7rODaugRGTWBMS64F5CRIqmkzro0V16eqR 5YFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=MK3OZV40Igxx9XCEN6LVqpiMIwXlPJdx8JMe4Y/F17A=; b=T7ZbAHSUF9ijiIYgmdI4tBneQs3nfLj2wVd8dn4uGbvuEUmvZxoTHadRbFQyauf3sa fiXcNH9dYmKoEmSw2vthbtt4hW63KJo5RmwpteSGSgBtJnL+4tqFtUXzd/v7I8cEiQDf 9IsMv1+7CDzYwC4t5jvVRIW+VBQurj915QDxZ5vr/6ZKQYvM4eGNJ/RrGfA2UVfOaclh Whp6lTWygo8x9M5/FPPbzTI39h/dBx+GNDP+Blus6vDcEXMizMr4SLn5uHtMRK3ztVHn m1i8rKxHvK4dH96VPpXwO73FyEwC+JWs461+fgyLEt9tmpbm+A8UP+sX//oxW9kLH6iU fU5w== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Francois Romieu , Oliver Freyermuth , "David S. Miller" Subject: [PATCH 4.9 42/66] r8169: fix memory corruption on retrieval of hardware statistics. Date: Mon, 29 Jan 2018 13:57:06 +0100 Message-Id: <20180129123842.099325529@linuxfoundation.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180129123839.842860149@linuxfoundation.org> References: <20180129123839.842860149@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1590958774708123843?= X-GMAIL-MSGID: =?utf-8?q?1590959199683714742?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Francois Romieu [ Upstream commit a78e93661c5fd30b9e1dee464b2f62f966883ef7 ] Hardware statistics retrieval hurts in tight invocation loops. Avoid extraneous write and enforce strict ordering of writes targeted to the tally counters dump area address registers. Signed-off-by: Francois Romieu Tested-by: Oliver Freyermuth Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/realtek/r8169.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -2222,19 +2222,14 @@ static bool rtl8169_do_counters(struct n void __iomem *ioaddr = tp->mmio_addr; dma_addr_t paddr = tp->counters_phys_addr; u32 cmd; - bool ret; RTL_W32(CounterAddrHigh, (u64)paddr >> 32); + RTL_R32(CounterAddrHigh); cmd = (u64)paddr & DMA_BIT_MASK(32); RTL_W32(CounterAddrLow, cmd); RTL_W32(CounterAddrLow, cmd | counter_cmd); - ret = rtl_udelay_loop_wait_low(tp, &rtl_counters_cond, 10, 1000); - - RTL_W32(CounterAddrLow, 0); - RTL_W32(CounterAddrHigh, 0); - - return ret; + return rtl_udelay_loop_wait_low(tp, &rtl_counters_cond, 10, 1000); } static bool rtl8169_reset_counters(struct net_device *dev)