From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Anna Schumaker <Anna.Schumaker@Netapp.com>,
Sasha Levin <sashal@kernel.org>,
trond.myklebust@hammerspace.com, anna.schumaker@netapp.com,
chuck.lever@oracle.com, davem@davemloft.net, kuba@kernel.org,
linux-nfs@vger.kernel.org, netdev@vger.kernel.org
Subject: [PATCH AUTOSEL 5.15 13/41] sunrpc: Fix potential race conditions in rpc_sysfs_xprt_state_change()
Date: Thu, 3 Feb 2022 15:32:17 -0500 [thread overview]
Message-ID: <20220203203245.3007-13-sashal@kernel.org> (raw)
In-Reply-To: <20220203203245.3007-1-sashal@kernel.org>
From: Anna Schumaker <Anna.Schumaker@Netapp.com>
[ Upstream commit 1a48db3fef499f615b56093947ec4b0d3d8e3021 ]
We need to use test_and_set_bit() when changing xprt state flags to
avoid potentially getting xps->xps_nactive out of sync.
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
net/sunrpc/sysfs.c | 35 +++++++++++++++++++----------------
1 file changed, 19 insertions(+), 16 deletions(-)
diff --git a/net/sunrpc/sysfs.c b/net/sunrpc/sysfs.c
index 379cf0e4d965b..326a31422a3c1 100644
--- a/net/sunrpc/sysfs.c
+++ b/net/sunrpc/sysfs.c
@@ -305,25 +305,28 @@ static ssize_t rpc_sysfs_xprt_state_change(struct kobject *kobj,
goto release_tasks;
}
if (offline) {
- set_bit(XPRT_OFFLINE, &xprt->state);
- spin_lock(&xps->xps_lock);
- xps->xps_nactive--;
- spin_unlock(&xps->xps_lock);
+ if (!test_and_set_bit(XPRT_OFFLINE, &xprt->state)) {
+ spin_lock(&xps->xps_lock);
+ xps->xps_nactive--;
+ spin_unlock(&xps->xps_lock);
+ }
} else if (online) {
- clear_bit(XPRT_OFFLINE, &xprt->state);
- spin_lock(&xps->xps_lock);
- xps->xps_nactive++;
- spin_unlock(&xps->xps_lock);
+ if (test_and_clear_bit(XPRT_OFFLINE, &xprt->state)) {
+ spin_lock(&xps->xps_lock);
+ xps->xps_nactive++;
+ spin_unlock(&xps->xps_lock);
+ }
} else if (remove) {
if (test_bit(XPRT_OFFLINE, &xprt->state)) {
- set_bit(XPRT_REMOVE, &xprt->state);
- xprt_force_disconnect(xprt);
- if (test_bit(XPRT_CONNECTED, &xprt->state)) {
- if (!xprt->sending.qlen &&
- !xprt->pending.qlen &&
- !xprt->backlog.qlen &&
- !atomic_long_read(&xprt->queuelen))
- rpc_xprt_switch_remove_xprt(xps, xprt);
+ if (!test_and_set_bit(XPRT_REMOVE, &xprt->state)) {
+ xprt_force_disconnect(xprt);
+ if (test_bit(XPRT_CONNECTED, &xprt->state)) {
+ if (!xprt->sending.qlen &&
+ !xprt->pending.qlen &&
+ !xprt->backlog.qlen &&
+ !atomic_long_read(&xprt->queuelen))
+ rpc_xprt_switch_remove_xprt(xps, xprt);
+ }
}
} else {
count = -EINVAL;
--
2.34.1
next prev parent reply other threads:[~2022-02-03 20:36 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-03 20:32 [PATCH AUTOSEL 5.15 01/41] NFS: change nfs_access_get_cached to only report the mask Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 02/41] NFSv4 only print the label when its queried Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 03/41] nfs: nfs4clinet: check the return value of kstrdup() Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 04/41] NFSv4.1: Fix uninitialised variable in devicenotify Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 05/41] netfilter: nf_conntrack_netbios_ns: fix helper module alias Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 06/41] NFSv4 remove zero number of fs_locations entries error check Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 07/41] NFSv4 store server support for fs_location attribute Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 08/41] NFSv4.1 query for fs_location attr on a new file system Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 09/41] NFSv4 expose nfs_parse_server_name function Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 10/41] NFSv4 handle port presence in fs_location server string Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 11/41] SUNRPC allow for unspecified transport time in rpc_clnt_add_xprt Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 12/41] net/sunrpc: fix reference count leaks in rpc_sysfs_xprt_state_change Sasha Levin
2022-02-03 20:32 ` Sasha Levin [this message]
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 14/41] irqchip/realtek-rtl: Service all pending interrupts Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 15/41] perf/x86/rapl: fix AMD event handling Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 16/41] x86/perf: Avoid warning for Arch LBR without XSAVE Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 17/41] sched/pelt: Relax the sync of runnable_sum with runnable_avg Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 18/41] sched: Avoid double preemption in __cond_resched_*lock*() Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 19/41] drm/vc4: Fix deadlock on DSI device attach error Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 20/41] drm: panel-orientation-quirks: Add quirk for the 1Netbook OneXPlayer Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 21/41] net: sched: Clarify error message when qdisc kind is unknown Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 22/41] powerpc/fixmap: Fix VM debug warning on unmap Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 23/41] scsi: target: iscsi: Make sure the np under each tpg is unique Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 24/41] scsi: ufs: ufshcd-pltfrm: Check the return value of devm_kstrdup() Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 25/41] scsi: qedf: Add stag_work to all the vports Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 26/41] scsi: qedf: Fix refcount issue when LOGO is received during TMF Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 27/41] scsi: qedf: Change context reset messages to ratelimited Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 28/41] scsi: pm8001: Fix bogus FW crash for maxcpus=1 Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 29/41] scsi: ufs: Use generic error code in ufshcd_set_dev_pwr_mode() Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 30/41] scsi: ufs: Treat link loss as fatal error Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 31/41] scsi: myrs: Fix crash in error case Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 32/41] net: stmmac: reduce unnecessary wakeups from eee sw timer Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 33/41] PM: wakeup: simplify the output logic of pm_show_wakelocks() Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 34/41] PM: hibernate: Remove register_nosave_region_late() Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 35/41] drm/amd/display: Correct MPC split policy for DCN301 Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 36/41] usb: dwc2: gadget: don't try to disable ep0 in dwc2_hsotg_suspend Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 37/41] perf: Always wake the parent event Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 38/41] nvme-pci: add the IGNORE_DEV_SUBNQN quirk for Intel P4500/P4600 SSDs Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 39/41] MIPS: Fix build error due to PTR used in more places Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 40/41] net: stmmac: dwmac-sun8i: use return val of readl_poll_timeout() Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 41/41] block: add bio_start_io_acct_time() to control start_time Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220203203245.3007-13-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=Anna.Schumaker@Netapp.com \
--cc=chuck.lever@oracle.com \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=trond.myklebust@hammerspace.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox