[5.12,161/363] SUNRPC: Remove trace_xprt_transmit_queued

Message ID	20210517140308.047694788@linuxfoundation.org
State	New
Headers	show Return-Path: <stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Chuck Lever <chuck.lever@oracle.com>, Trond Myklebust <trond.myklebust@hammerspace.com>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 5.12 161/363] SUNRPC: Remove trace_xprt_transmit_queued Date: Mon, 17 May 2021 16:00:27 +0200 Message-Id: <20210517140308.047694788@linuxfoundation.org> In-Reply-To: <20210517140302.508966430@linuxfoundation.org> References: <20210517140302.508966430@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [5.12,002/363] tpm: fix error return code in tpm2_get_cc_attrs_tbl() [5.12,003/363] tpm, tpm_tis: Extend locality handling to TPM2 in tpm_tis_gen_interrupt() [5.12,005/363] btrfs: fix unmountable seed device after fstrim [5.12,006/363] KVM: SVM: Make sure GHCB is mapped before updating [5.12,009/363] PM: runtime: Fix unpaired parent child_count for force_resume [5.12,010/363] cpufreq: intel_pstate: Use HWP if enabled by platform firmware [5.12,012/363] ath11k: fix thermal temperature read [5.12,014/363] fs: dlm: fix debugfs dump [5.12,015/363] fs: dlm: fix mark setting deadlock [5.12,017/363] fs: dlm: add check if dlm is currently running [5.12,020/363] fs: dlm: flush swork on shutdown [5.12,022/363] tipc: convert dest nodes address to network order [5.12,025/363] net: stmmac: Set FIFO sizes for ipq806x [5.12,026/363] ASoC: rsnd: core: Check convert rate in rsnd_hw_params [5.12,030/363] ALSA: hdspm: dont disable if not enabled [5.12,032/363] ALSA: bebob: enable to deliver MIDI messages for multiple ports [5.12,033/363] Bluetooth: Set CONF_NOT_COMPLETE as l2cap_chan default [5.12,035/363] net/sched: cls_flower: use ntohs for struct flow_dissector_key_ports [5.12,038/363] selftests/powerpc: Fix L1D flushing tests for Power10 [5.12,040/363] powerpc/32: Statically initialise first emergency context [5.12,042/363] net: hns3: add handling for xmit skb with recursive fraglist [5.12,043/363] ip6_vti: proper dev_{hold\|put} in ndo_[un]init methods [5.12,045/363] iommu/arm-smmu-v3: Add a check to avoid invalid iotlb sync [5.12,047/363] ice: handle increasing Tx or Rx ring sizes [5.12,048/363] Bluetooth: btusb: Enable quirk boolean flag for Mediatek Chip. [5.12,050/363] selftests: mptcp: launch mptcp_connect with timeout [5.12,053/363] MIPS: Loongson64: Use _CACHE_UNCACHED instead of _CACHE_UNCACHED_ACCELERATED [5.12,054/363] coresight: Do not scan for graph if none is present [5.12,055/363] IB/hfi1: Correct oversized ring allocation [5.12,058/363] ASoC: soc-compress: lock pcm_mutex to resolve lockdep error [5.12,060/363] net: fec: use mac-managed PHY PM [5.12,061/363] pinctrl: samsung: use int for register masks in Exynos [5.12,068/363] mt76: mt7915: fix key set/delete issue [5.12,069/363] mt76: mt7915: fix txpower init for TSSI off chips [5.12,072/363] i2c: imx: Fix PM reference leak in i2c_imx_reg_slave() [5.12,075/363] cuse: prevent clone [5.12,076/363] iwlwifi: pcie: make cfg vs. trans_cfg more robust [5.12,078/363] iwlwifi: trans/pcie: defer transport initialisation [5.12,080/363] ASoC: rsnd: call rsnd_ssi_master_clk_start() from rsnd_ssi_init() [5.12,082/363] Revert "iommu/amd: Fix performance counter initialization" [5.12,083/363] iommu/amd: Remove performance counter pre-initialization test [5.12,085/363] selftests: Set CC to clang in lib.mk if LLVM is set [5.12,088/363] ASoC: Intel: sof_sdw: add quirk for new ADL-P Rvp [5.12,090/363] i2c: i801: Add support for Intel Alder Lake PCH-M [5.12,091/363] sctp: Fix out-of-bounds warning in sctp_process_asconf_param() [5.12,093/363] powerpc/xive: Use the "ibm, chip-id" property only under PowerNV [5.12,094/363] powerpc/smp: Set numa node before updating mask [5.12,096/363] mac80211: properly drop the connection in case of invalid CSA IE [5.12,099/363] net: sched: tapr: prevent cycle_time == 0 in parse_taprio_schedule [5.12,100/363] samples/bpf: Fix broken tracex1 due to kprobe argument change [5.12,101/363] powerpc/pseries: Stop calling printk in rtas_stop_self() [5.12,102/363] drm/amd/display: fixed divide by zero kernel crash during dsc enablement [5.12,106/363] crypto: ccp: Free SEV device if SEV init fails [5.12,107/363] wl3501_cs: Fix out-of-bounds warnings in wl3501_send_pkt [5.12,109/363] qtnfmac: Fix possible buffer overflow in qtnf_event_handle_external_auth [5.12,112/363] net: ethernet: mtk_eth_soc: fix RX VLAN offload [5.12,115/363] kbuild: generate Module.symvers only when vmlinux exists [5.12,116/363] bnxt_en: Add PCI IDs for Hyper-V VF devices. [5.12,118/363] watchdog: rename __touch_watchdog() to a better descriptive name [5.12,120/363] watchdog/softlockup: report the overall time of softlockups [5.12,121/363] watchdog/softlockup: remove logic that tried to prevent repeated reports [5.12,123/363] watchdog: cleanup handling of false positives [5.12,125/363] leds: lgm: fix gpiolib dependency [5.12,126/363] thermal: thermal_of: Fix error return code of thermal_of_populate_bind_params() [5.12,127/363] PCI/RCEC: Fix RCiEP device to RCEC association [5.12,131/363] rtc: tps65910: include linux/property.h [5.12,132/363] remoteproc: qcom_q6v5_mss: Validate p_filesz in ELF loader [5.12,133/363] PCI: iproc: Fix return value of iproc_msi_irq_domain_alloc() [5.12,135/363] PCI: Release OF node in pci_scan_device()s error path [5.12,136/363] ARM: 9064/1: hw_breakpoint: Do not directly check the events overflow_handler hook [5.12,138/363] f2fs: fix to update last i_size if fallocate partially succeeds [5.12,139/363] PCI: endpoint: Fix NULL pointer dereference for ->get_features() [5.12,140/363] f2fs: fix to avoid touching checkpointed data in get_victim() [5.12,142/363] fs: 9p: fix v9fs_file_open writeback fid error check [5.12,144/363] f2fs: Fix a hungtask problem in atomic write [5.12,146/363] NFS: Fix handling of cookie verifier in uncached_readdir() [5.12,150/363] NFS: nfs4_bitmask_adjust() must not change the server global bitmasks [5.12,152/363] NFSv4.2: Always flush out writes in nfs42_proc_fallocate() [5.12,153/363] NFS: Deal correctly with attribute generation counter overflow [5.12,155/363] remoteproc: pru: Fixup interrupt-parent logic for fw events [5.12,160/363] SUNRPC: Move fault injection call sites [5.12,161/363] SUNRPC: Remove trace_xprt_transmit_queued [5.12,162/363] SUNRPC: Handle major timeout in xprt_adjust_timeout() [5.12,165/363] NFSv4.x: Dont return NFS4ERR_NOMATCHING_LAYOUT if were unmounting [5.12,166/363] nfsd: ensure new clients break delegations [5.12,167/363] rtc: fsl-ftm-alarm: add MODULE_TABLE() [5.12,168/363] dmaengine: idxd: Fix potential null dereference on pointer status [5.12,170/363] dmaengine: idxd: cleanup pci interrupt vector allocation management [5.12,172/363] dmaengine: idxd: use ida for device instance enumeration [5.12,176/363] dmaengine: idxd: fix group conf_dev lifetime [5.12,178/363] SUNRPC: fix ternary sign expansion bug in tracing [5.12,180/363] pwm: atmel: Fix duty cycle calculation in .get_state() [5.12,184/363] riscv: Select HAVE_DYNAMIC_FTRACE when -fpatchable-function-entry is available [5.12,185/363] swiotlb: Fix the type of index [5.12,187/363] scsi: qla2xxx: Prevent PRLI in target mode [5.12,188/363] scsi: ufs: core: Do not put UFS power into LPM if link is broken [5.12,189/363] scsi: ufs: core: Cancel rpm_dev_flush_recheck_work during system suspend [5.12,192/363] net: hns3: fix incorrect configuration for igu_egu_hw_err [5.12,194/363] net: hns3: add check for HNS3_NIC_STATE_INITED in hns3_reset_notify_up_enet() [5.12,195/363] arm64: stacktrace: restore terminal records [5.12,197/363] net: hns3: use netif_tx_disable to stop the transmit queue [5.12,199/363] sctp: do asoc update earlier in sctp_sf_do_dupcook_a [5.12,201/363] sunrpc: Fix misplaced barrier in call_decode [5.12,203/363] block/rnbd-clt: Change queue_depth type in rnbd_clt_session to size_t [5.12,205/363] ata: ahci_brcm: Fix use of BCM7216 reset controller [5.12,206/363] PCI: brcmstb: Use reset/rearm instead of deassert/assert [5.12,207/363] ethernet:enic: Fix a use after free bug in enic_hard_start_xmit [5.12,208/363] sctp: fix a SCTP_MIB_CURRESTAB leak in sctp_sf_do_dupcook_b [5.12,211/363] powerpc/powernv/memtrace: Fix dcache flushing [5.12,212/363] net: stmmac: Clear receive all(RA) bit when promiscuous mode is off [5.12,217/363] khugepaged: fix wrong result value for trace_mm_collapse_huge_page_isolate() [5.12,218/363] mm/hugeltb: handle the error case in hugetlb_fix_reserve_counts() [5.12,219/363] mm/migrate.c: fix potential indeterminate pte entry in migrate_vma_insert_page() [5.12,222/363] mm/gup: return an error on migration failure [5.12,223/363] mm/gup: check for isolation errors [5.12,226/363] net: fix nla_strcmp to handle more then one trailing null character [5.12,227/363] smc: disallow TCP_ULP in smc_setsockopt() [5.12,230/363] can: mcp251xfd: mcp251xfd_probe(): fix an error pointer dereference in probe [5.12,231/363] can: mcp251xfd: mcp251xfd_probe(): add missing can_rx_offload_del() in error path [5.12,233/363] can: m_can: m_can_tx_work_queue(): fix tx_skb race condition [5.12,236/363] net: ipa: fix inter-EE IRQ register definitions [5.12,239/363] kernel/resource: make walk_system_ram_res() find all busy IORESOURCE_SYSTEM_RAM re... [5.12,240/363] kernel/resource: make walk_mem_res() find all busy IORESOURCE_MEM resources [5.12,243/363] i40e: Fix use-after-free in i40e_client_subtask() [5.12,245/363] i40e: Fix PHY type identifiers for 2.5G and 5G adapters [5.12,247/363] mptcp: fix splat when closing unaccepted socket [5.12,249/363] ARC: mm: PAE: use 40-bit physical page mask [5.12,250/363] ARC: mm: Use max_high_pfn as a HIGHMEM zone border [5.12,251/363] sh: Remove unused variable [5.12,252/363] powerpc/64s: Fix crashes when toggling stf barrier [5.12,256/363] userfaultfd: release page in error path to avoid BUG_ON [5.12,259/363] mm/hugetlb: fix cow where page writtable in child [5.12,260/363] blk-iocost: fix weight updates of inner active iocgs [5.12,261/363] x86, sched: Fix the AMD CPPC maximum performance value on certain AMD Ryzen genera... [5.12,262/363] arm64: mte: initialize RGSR_EL1.SEED in __cpu_setup [5.12,263/363] arm64: Fix race condition on PG_dcache_clean in __sync_icache_dcache() [5.12,264/363] btrfs: fix deadlock when cloning inline extents and using qgroups [5.12,265/363] btrfs: zoned: fix silent data loss after failure splitting ordered extent [5.12,266/363] btrfs: fix race leading to unpersisted data and metadata on fsync [5.12,267/363] btrfs: initialize return variable in cleanup_free_space_cache_v1 [5.12,268/363] btrfs: zoned: sanity check zone type [5.12,275/363] KVM: LAPIC: Accurately guarantee busy wait for timer to expire when using hv_timer [5.12,278/363] KVM: x86: Prevent deadlock against tk_core.seq [5.12,280/363] dax: Add an enum for specifying dax wakup mode [5.12,282/363] dax: Wake up all waiters after invalidating dax entry [5.12,283/363] xen/unpopulated-alloc: fix error return code in fill_list() [5.12,286/363] iio: light: gp2ap002: Fix rumtime PM imbalance on error [5.12,287/363] iio: proximity: pulsedlight: Fix rumtime PM imbalance on error [5.12,291/363] hwmon: (occ) Fix poll rate limiting [5.12,292/363] usb: typec: tcpm: Fix wrong handling for Not_Supported in VDM AMS [5.12,294/363] hwmon: (ltc2992) Put fwnode in error case during ->probe() [5.12,298/363] nvmet: fix inline bio check for passthru [5.12,301/363] f2fs: compress: fix race condition of overwrite vs truncate [5.12,303/363] sched/fair: Fix clearing of has_idle_cores flag in select_idle_cpu() [5.12,304/363] nbd: Fix NULL pointer in flush_workqueue [5.12,305/363] powerpc/64s: Make NMI record implicitly soft-masked code as irqs disabled [5.12,309/363] usb: dwc3: pci: Enable usb2-gadget-lpm-disable for Intel Merrifield [5.12,310/363] usb: xhci: Increase timeout for HC halt [5.12,313/363] usb: dwc3: imx8mp: fix error return code in dwc3_imx8mp_probe() [5.12,316/363] usb: typec: tcpm: Fix wrong handling in GET_SINK_CAP [5.12,317/363] usb: typec: ucsi: Retrieve all the PDOs instead of just the first 4 [5.12,320/363] xhci: Fix giving back cancelled URBs even if halted endpoint cant reset [5.12,321/363] xhci: Do not use GFP_KERNEL in (potentially) atomic context [5.12,322/363] xhci: Add reset resume quirk for AMD xhci controller. [5.12,323/363] iio: core: fix ioctl handlers removal [5.12,326/363] cdc-wdm: untangle a circular dependency between callback and softint [5.12,327/363] alarmtimer: Check RTC features instead of ops [5.12,329/363] KVM: x86: Emulate RDPID only if RDTSCP is supported [5.12,330/363] KVM: x86: Move RDPID emulation intercept to its own enum [5.12,332/363] KVM: nVMX: Always make an attempt to map eVMCS after migration [5.12,333/363] KVM: VMX: Do not advertise RDPID if ENABLE_RDTSCP control is unsupported [5.12,335/363] mm: fix struct page layout on 32-bit systems [5.12,340/363] clocksource/drivers/timer-ti-dm: Handle dra7 timer wrap errata i940 [5.12,343/363] drm/i915/gt: Fix a double free in gen8_preallocate_top_level_pdp [5.12,345/363] drm/i915: Read C0DRB3/C1DRB3 as 16 bits again [5.12,346/363] drm/i915/overlay: Fix active retire callback alignment [5.12,347/363] drm/i915: Fix crash in auto_retire [5.12,355/363] dt-bindings: thermal: rcar-gen3-thermal: Support five TSC nodes on r8a779a0 [5.12,356/363] arm64: dts: renesas: falcon: Move console config to CPU board DTS [5.12,357/363] dt-bindings: phy: qcom,qmp-usb3-dp-phy: move usb3 compatibles back to qcom,qmp-phy... [5.12,358/363] dt-bindings: serial: 8250: Remove duplicated compatible strings [5.12,360/363] debugfs: Make debugfs_allow RO after init [5.12,361/363] ext4: fix debug format string warning

Message ID

20210517140308.047694788@linuxfoundation.org

State

New

Headers

From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	stable@vger.kernel.org, Chuck Lever <chuck.lever@oracle.com>,
	Trond Myklebust <trond.myklebust@hammerspace.com>,
	Sasha Levin <sashal@kernel.org>
Subject: [PATCH 5.12 161/363] SUNRPC: Remove trace_xprt_transmit_queued
Date: Mon, 17 May 2021 16:00:27 +0200
Message-Id: <20210517140308.047694788@linuxfoundation.org>
In-Reply-To: <20210517140302.508966430@linuxfoundation.org>
References: <20210517140302.508966430@linuxfoundation.org>
User-Agent: quilt/0.66
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

None | expand

Commit Message

Greg Kroah-Hartman May 17, 2021, 2 p.m. UTC

From: Chuck Lever <chuck.lever@oracle.com>

[ Upstream commit 6cf23783f750634e10daeede48b0f5f5d64ebf3a ]

This tracepoint can crash when dereferencing snd_task because
when some transports connect, they put a cookie in that field
instead of a pointer to an rpc_task.

BUG: KASAN: use-after-free in trace_event_raw_event_xprt_writelock_event+0x141/0x18e [sunrpc]
Read of size 2 at addr ffff8881a83bd3a0 by task git/331872

CPU: 11 PID: 331872 Comm: git Tainted: G S                5.12.0-rc2-00007-g3ab6e585a7f9 #1453
Hardware name: Supermicro SYS-6028R-T/X10DRi, BIOS 1.1a 10/16/2015
Call Trace:
 dump_stack+0x9c/0xcf
 print_address_description.constprop.0+0x18/0x239
 kasan_report+0x174/0x1b0
 trace_event_raw_event_xprt_writelock_event+0x141/0x18e [sunrpc]
 xprt_prepare_transmit+0x8e/0xc1 [sunrpc]
 call_transmit+0x4d/0xc6 [sunrpc]

Fixes: 9ce07ae5eb1d ("SUNRPC: Replace dprintk() call site in xprt_prepare_transmit")
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 include/trace/events/sunrpc.h | 1 -
 net/sunrpc/xprt.c             | 2 --
 2 files changed, 3 deletions(-)

diff --git a/include/trace/events/sunrpc.h b/include/trace/events/sunrpc.h
index 036eb1f5c133..2f01314de73a 100644
--- a/include/trace/events/sunrpc.h
+++ b/include/trace/events/sunrpc.h
@@ -1141,7 +1141,6 @@  DECLARE_EVENT_CLASS(xprt_writelock_event,
 
 DEFINE_WRITELOCK_EVENT(reserve_xprt);
 DEFINE_WRITELOCK_EVENT(release_xprt);
-DEFINE_WRITELOCK_EVENT(transmit_queued);
 
 DECLARE_EVENT_CLASS(xprt_cong_event,
 	TP_PROTO(
diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
index d616b93751d8..11ebe8a127b8 100644
--- a/net/sunrpc/xprt.c
+++ b/net/sunrpc/xprt.c
@@ -1469,8 +1469,6 @@  bool xprt_prepare_transmit(struct rpc_task *task)
 	struct rpc_xprt	*xprt = req->rq_xprt;
 
 	if (!xprt_lock_write(xprt, task)) {
-		trace_xprt_transmit_queued(xprt, task);
-
 		/* Race breaker: someone may have transmitted us */
 		if (!test_bit(RPC_TASK_NEED_XMIT, &task->tk_runstate))
 			rpc_wake_up_queued_task_set_status(&xprt->sending,

[5.12,161/363] SUNRPC: Remove trace_xprt_transmit_queued

Commit Message

Patch