From: Sasha Levin <Alexander.Levin@microsoft.com>
To: "stable@vger.kernel.org" <stable@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Cc: WANG Cong <xiyou.wangcong@gmail.com>,
Jamal Hadi Salim <jhs@mojatatu.com>,
"David S . Miller" <davem@davemloft.net>,
Sasha Levin <Alexander.Levin@microsoft.com>
Subject: [PATCH AUTOSEL for 3.18 030/101] net_sched: move tcf_lock down after gen_replace_estimator()
Date: Mon, 9 Apr 2018 00:35:39 +0000 [thread overview]
Message-ID: <20180409003505.164715-30-alexander.levin@microsoft.com> (raw)
In-Reply-To: <20180409003505.164715-1-alexander.levin@microsoft.com>
From: WANG Cong <xiyou.wangcong@gmail.com>
[ Upstream commit 74030603dfd9f76c0f279f19f1dd1ee3028fee7a ]
Laura reported a sleep-in-atomic kernel warning inside
tcf_act_police_init() which calls gen_replace_estimator() with
spinlock protection.
It is not necessary in this case, we already have RTNL lock here
so it is enough to protect concurrent writers. For the reader,
i.e. tcf_act_police(), it needs to make decision based on this
rate estimator, in the worst case we drop more/less packets than
necessary while changing the rate in parallel, it is still acceptable.
Reported-by: Laura Abbott <labbott@redhat.com>
Reported-by: Nick Huber <nicholashuber@gmail.com>
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
---
net/sched/act_police.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/net/sched/act_police.c b/net/sched/act_police.c
index 69791ca77a05..1a25d25b9a56 100644
--- a/net/sched/act_police.c
+++ b/net/sched/act_police.c
@@ -176,21 +176,21 @@ override:
}
}
- spin_lock_bh(&police->tcf_lock);
if (est) {
err = gen_replace_estimator(&police->tcf_bstats, NULL,
&police->tcf_rate_est,
&police->tcf_lock, est);
if (err)
- goto failure_unlock;
+ goto failure;
} else if (tb[TCA_POLICE_AVRATE] &&
(ret == ACT_P_CREATED ||
!gen_estimator_active(&police->tcf_bstats,
&police->tcf_rate_est))) {
err = -EINVAL;
- goto failure_unlock;
+ goto failure;
}
+ spin_lock_bh(&police->tcf_lock);
/* No failure allowed after this point */
police->tcfp_mtu = parm->mtu;
if (police->tcfp_mtu == 0) {
@@ -242,8 +242,6 @@ override:
a->priv = police;
return ret;
-failure_unlock:
- spin_unlock_bh(&police->tcf_lock);
failure:
qdisc_put_rtab(P_tab);
qdisc_put_rtab(R_tab);
--
2.15.1
next prev parent reply other threads:[~2018-04-09 0:35 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-09 0:35 [PATCH AUTOSEL for 3.18 001/101] ALSA: timer: Wrap with spinlock for queue access Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 002/101] e1000e: Undo e1000e_pm_freeze if __e1000_shutdown fails Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 003/101] perf/core: Correct event creation with PERF_FORMAT_GROUP Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 004/101] MIPS: mm: fixed mappings: correct initialisation Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 005/101] MIPS: kprobes: flush_insn_slot should flush only if probe initialised Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 006/101] net: emac: fix reset timeout with AR8035 phy Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 007/101] perf tests: Decompress kernel module before objdump Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 008/101] xen: avoid type warning in xchg_xen_ulong Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 009/101] KEYS: put keyring if install_session_keyring_to_cred() fails Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 010/101] bnx2x: Allow vfs to disable txvlan offload Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 011/101] sctp: fix recursive locking warning in sctp_do_peeloff Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 012/101] sparc64: ldc abort during vds iso boot Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 013/101] iio: magnetometer: st_magn_spi: fix spi_device_id table Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 014/101] Bluetooth: Send HCI Set Event Mask Page 2 command only when needed Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 015/101] ACPICA: Events: Add runtime stub support for event APIs Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 016/101] ACPICA: Disassembler: Abort on an invalid/unknown AML opcode Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 017/101] s390/dasd: Display read-only attribute correctly Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 018/101] vxlan: dont migrate permanent fdb entries during learn Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 019/101] scsi: csiostor: Avoid content leaks and casts Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 020/101] scsi: megaraid: Fix a sleep-in-atomic bug Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 021/101] scsi: lpfc: Fix return value of board_mode store routine in case of online failure Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 022/101] usb: usbip tool: Check the return of get_nports() Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 023/101] usb: usbip tool: Fix refresh_imported_device_list() Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 024/101] PCI: Correct PCI_STD_RESOURCE_END usage Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 025/101] PCI: Add domain number check to find_smbios_instance_string() Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 026/101] mtd: handle partitioning on devices with 0 erasesize Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 027/101] platform/x86: acer-wmi: Detect RF Button capability Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 028/101] caif: Add sockaddr length check before accessing sa_family in connect handler Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 029/101] ixgbe: avoid permanent lock of *_PTP_TX_IN_PROGRESS Sasha Levin
2018-04-09 0:35 ` Sasha Levin [this message]
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 031/101] PCI: Protect pci_error_handlers->reset_notify() usage with device_lock() Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 032/101] firmware: dmi_scan: Check DMI structure length Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 033/101] i2c: ismt: fix wrong device address when unmap the data buffer Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 034/101] drm/mgag200: Fix to always set HiPri for G200e4 V2 Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 035/101] r8152: add byte_enable for ocp_read_word function Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 036/101] Btrfs: skip commit transaction if we don't have enough pinned bytes Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 037/101] scsi: lpfc: Fix crash after firmware flash when IO is running Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 038/101] mmc: sdhci-esdhc: Add SDHCI_QUIRK_32BIT_DMA_ADDR Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 039/101] x86/nmi: Fix timeout test in test_nmi_ipi() Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 040/101] arm64: pass machine size to sparse Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 041/101] fib_rules: Resolve goto rules target on delete Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 042/101] dccp: call inet_add_protocol after register_pernet_subsys in dccp_v4_init Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 043/101] arm64: ptrace: Fix VFP register dumping in compat coredumps Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 044/101] veth: Be more robust on network device creation when no attributes Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 045/101] macvlan: Do not return error when setting the same mac address Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 046/101] sctp: adjust ssthresh when transport is idle Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 047/101] arm64: pass endianness info to sparse Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 048/101] scsi: bnx2i: missing error code in bnx2i_ep_connect() Sasha Levin
2018-04-09 0:35 ` [PATCH AUTOSEL for 3.18 049/101] powerpc: Fix /proc/cpuinfo revision for POWER9 DD2 Sasha Levin
2018-04-09 0:36 ` [PATCH AUTOSEL for 3.18 050/101] ACPI: EC: Fix EC command visibility for dynamic debug Sasha Levin
2018-04-09 0:36 ` [PATCH AUTOSEL for 3.18 051/101] scsi: sun_esp: fix device reference leaks Sasha Levin
2018-04-09 0:41 ` [PATCH AUTOSEL for 3.18 052/101] powerpc/fadump: avoid duplicates in crash memory ranges 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=20180409003505.164715-30-alexander.levin@microsoft.com \
--to=alexander.levin@microsoft.com \
--cc=davem@davemloft.net \
--cc=jhs@mojatatu.com \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=xiyou.wangcong@gmail.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;
as well as URLs for NNTP newsgroup(s).