Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp5467713pxu; Tue, 22 Dec 2020 19:03:13 -0800 (PST) X-Google-Smtp-Source: ABdhPJxX4ZiAvVt/cENn6ug6VuVqoFp3pUKhvA6EXq6fF+chB9uBumv53cqCyPYG4yhb46AfQPQ4 X-Received: by 2002:a17:906:3553:: with SMTP id s19mr21875815eja.95.1608692593404; Tue, 22 Dec 2020 19:03:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1608692593; cv=none; d=google.com; s=arc-20160816; b=UsJ4GJZWqbDM+dZZ6uZiyW0wYbRETjlbtaQ6UA6e+6V7dg9h5clK1/K0IJcNMQ1Uyd iAT3CPNxq0xm+DCVRLYkJO/cJM+cF/SXWZcBQX8FTCp9XhCI/J2agWEN85SduHf/5hOB 3dbFLJpbc2mM6UaHlqCNyRoHGV/AF1riZzxYyr8GXzLgfz1nlUXJYfnCJ6BCivzthGrR HSpBWn5UnECkgiI1pIUWcmKEauqLwvQn1m1Xc2kpPMXLIScsOfoW+O+aTYVtqRTQGYTT d1bmFrzSfKSKDPcuKlETz9m3B4OYI8FnyVGXmCvpl7W5k5H5a1GoRV5L2FbbNCoyWurk 33Eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=u0SCK5RVkXMwxAQmPZGH5wZaSFiHcrX6H/zRyyhcPJ4=; b=yZgSvDKXZa65vVOxNsT4t4XBzJRdLtRJNhllkTyUx3JAMor97ynGTSB9Tc4QK6XI1F ADRdTkaoIWPFwNl3RSyTGPCjMWIIvDeFOmybGo4NYVeJm9uGcABzppDuBweK0NQSLrXD hHrSvhYOMZqV8aw6k+sl/QS0ZCIhIY4faFI02VVgceG7gHpkgmg3YZKrl4sPlr1IVLIa UwvQEL4Flk3lyImnWF6MYKGLmmLwyYerTvWPd2hEkYJuXCLidtl8nna4Zk43J5aBWtO5 TVeKhZV04FutvJDLyeKwZSavkBQSpxUWfHh/kC2K0KIK5j46TN7nCoSKWTwkBTiywEU2 fiqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=r5zcuA2I; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id z2si13363802ede.501.2020.12.22.19.02.51; Tue, 22 Dec 2020 19:03:13 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=r5zcuA2I; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727687AbgLWCTv (ORCPT + 99 others); Tue, 22 Dec 2020 21:19:51 -0500 Received: from mail.kernel.org ([198.145.29.99]:46280 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728665AbgLWCTe (ORCPT ); Tue, 22 Dec 2020 21:19:34 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id CF4F722573; Wed, 23 Dec 2020 02:18:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1608689940; bh=CmCTXlo5QOeMaTIF2kxMvmLAeNqkCnl3FUaR/jTtx0U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=r5zcuA2IYTU6f8inH9SsD4vYIVn0pgec+lKsgSElGOqslJz+KIi/t6/w4XOk40ISP PXT1dOfhy+70MCAKunxVbMZQyRrJRy0aPsCQdLJpZYBAj1vHY3aY4PrLDIrsMOeG9y 9B/UOQn7JCvUW6345PUxjCE6m3DEdrYLbDh7ecTNF+IOw6roFeshkffhAemHLqH4be 2wb8zXg/a/gbPPMlJyse6Z01USZbvVcLis1VSBA7oDdSuLRmcxPGpawZIDp9XHfMuh 2mpXAsPODxZn6UvtMpgW5LNeAj4LrxAnqo/jtN9uUjdGc5X9MNTUsSVUxdNx9XNaXu N6YCtiOa2bD1Q== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Heiner Kallweit , Jakub Kicinski , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 036/130] r8169: use READ_ONCE in rtl_tx_slots_avail Date: Tue, 22 Dec 2020 21:16:39 -0500 Message-Id: <20201223021813.2791612-36-sashal@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201223021813.2791612-1-sashal@kernel.org> References: <20201223021813.2791612-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Heiner Kallweit [ Upstream commit 95f3c5458dfa5856bb110e31d156e00d894d0134 ] tp->dirty_tx and tp->cur_tx may be changed by a racing rtl_tx() or rtl8169_start_xmit(). Use READ_ONCE() to annotate the races and ensure that the compiler doesn't use cached values. Signed-off-by: Heiner Kallweit Link: https://lore.kernel.org/r/5676fee3-f6b4-84f2-eba5-c64949a371ad@gmail.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/realtek/r8169_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index fd5adb0c54d29..fca8252b4f21d 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -5856,7 +5856,8 @@ static bool rtl8169_tso_csum_v2(struct rtl8169_private *tp, static bool rtl_tx_slots_avail(struct rtl8169_private *tp, unsigned int nr_frags) { - unsigned int slots_avail = tp->dirty_tx + NUM_TX_DESC - tp->cur_tx; + unsigned int slots_avail = READ_ONCE(tp->dirty_tx) + NUM_TX_DESC + - READ_ONCE(tp->cur_tx); /* A skbuff with nr_frags needs nr_frags+1 entries in the tx queue */ return slots_avail > nr_frags; -- 2.27.0