5.15.135-rc1 review
Subsystems (6)
Greg Kroah-Hartman
maintainercover 5.15.135-rc1 review
This is the start of the stable review cycle for the 5.15.135 release. There are 75 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 11 Oct 2023 13:00:55 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.135-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.15.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.15.135-rc1
John David Anglin <[email protected]>
parisc: Restore __ldcw_align for PA-RISC 2.0 processors
luosili <[email protected]>
ksmbd: fix uaf in smb20_oplock_break_ack
Shay Drory <[email protected]>
RDMA/mlx5: Fix NULL string error
Bernard Metzler <[email protected]>
RDMA/siw: Fix connection failure handling
Konstantin Meskhidze <[email protected]>
RDMA/uverbs: Fix typo of sizeof argument
Leon Romanovsky <[email protected]>
RDMA/cma: Fix truncation compilation warning in make_cma_ports
Mark Zhang <[email protected]>
RDMA/cma: Initialize ib_sa_multicast structure to 0 when join
Duje Mihanović <[email protected]>
gpio: pxa: disable pinctrl calls for MMP_GPIO
Bartosz Golaszewski <[email protected]>
gpio: aspeed: fix the GPIO number passed to pinctrl_gpio_set_config()
Christophe JAILLET <[email protected]>
IB/mlx4: Fix the size of a buffer in add_port_entries()
Dan Carpenter <[email protected]>
of: dynamic: Fix potential memory leak in of_changeset_action()
Leon Romanovsky <[email protected]>
RDMA/core: Require admin capabilities to set system parameters
Fedor Pchelkin <[email protected]>
dm zoned: free dmz->ddev array in dmz_put_zoned_devices
Srinivas Pandruvada <[email protected]>
HID: intel-ish-hid: ipc: Disable and reenable ACPI GPE bit
Jiri Kosina <[email protected]>
HID: sony: remove duplicate NULL check before calling usb_free_urb()
Xin Long <[email protected]>
sctp: update hb timer immediately after users change hb_interval
Xin Long <[email protected]>
sctp: update transport state when processing a dupcook packet
Neal Cardwell <[email protected]>
tcp: fix delayed ACKs for MSS boundary condition
Neal Cardwell <[email protected]>
tcp: fix quick-ack counting to count actual ACKs of new data
Chengfeng Ye <[email protected]>
tipc: fix a potential deadlock on &tx->lock
Ben Wolsieffer <[email protected]>
net: stmmac: dwmac-stm32: fix resume on STM32 MCU
Benjamin Poirier <[email protected]>
ipv4: Set offload_failed flag in fibmatch results
Florian Westphal <[email protected]>
netfilter: nf_tables: nft_set_rbtree: fix spurious insertion failure
Xin Long <[email protected]>
netfilter: handle the connecting collision properly in nf_conntrack_proto_sctp
David Wilder <[email protected]>
ibmveth: Remove condition to recompute TCP header checksum.
Dan Carpenter <[email protected]>
net: ethernet: ti: am65-cpsw: Fix error code in am65_cpsw_nuss_init_tx_chns()
Jeremy Cline <[email protected]>
net: nfc: llcp: Add lock when modifying device list
Shigeru Yoshida <[email protected]>
net: usb: smsc75xx: Fix uninit-value access in __smsc75xx_read_reg
Fabio Estevam <[email protected]>
net: dsa: mv88e6xxx: Avoid EEPROM timeout when EEPROM is absent
Dinghao Liu <[email protected]>
ptp: ocp: Fix error handling in ptp_ocp_device_init
David Howells <[email protected]>
ipv4, ipv6: Fix handling of transhdrlen in __ip{,6}_append_data()
Eric Dumazet <[email protected]>
net: fix possible store tearing in neigh_periodic_work()
Mauricio Faria de Oliveira <[email protected]>
modpost: add missing else to the "of" check
Jakub Sitnicki <[email protected]>
bpf, sockmap: Reject sk_msg egress redirects to non-TCP sockets
Trond Myklebust <[email protected]>
NFSv4: Fix a nfs4_state_manager() race
Arnd Bergmann <[email protected]>
ima: rework CONFIG_IMA dependency block
Junxiao Bi <[email protected]>
scsi: target: core: Fix deadlock due to recursive locking
Oleksandr Tymoshenko <[email protected]>
ima: Finish deprecation of IMA_TRUSTED_KEYRING Kconfig
Richard Fitzgerald <[email protected]>
regmap: rbtree: Fix wrong register marked as in-cache when creating new node
Felix Fietkau <[email protected]>
wifi: mt76: mt76x02: fix MT76x0 external LNA gain handling
Alexandra Diupina <[email protected]>
drivers/net: process the result of hdlc_open() and add call of hdlc_close() in uhdlc_close()
Leon Hwang <[email protected]>
bpf: Fix tr dereferencing
Pin-yen Lin <[email protected]>
wifi: mwifiex: Fix oob check condition in mwifiex_process_rx_packet
Christophe JAILLET <[email protected]>
wifi: iwlwifi: mvm: Fix a memory corruption issue
Johannes Berg <[email protected]>
iwlwifi: avoid void pointer arithmetic
Arnd Bergmann <[email protected]>
wifi: iwlwifi: dbg_ini: fix structure packing
Zhihao Cheng <[email protected]>
ubi: Refuse attaching if mtd's erasesize is 0
Christophe JAILLET <[email protected]>
HID: sony: Fix a potential memory leak in sony_probe()
Rob Herring <[email protected]>
arm64: Add Cortex-A520 CPU part definition
Mario Limonciello <[email protected]>
drm/amd: Fix detection of _PR3 on the PCIe root port
Jordan Rife <[email protected]>
net: prevent rewrite of msg_name in sock_sendmsg()
Qu Wenruo <[email protected]>
btrfs: reject unknown mount options early
Jordan Rife <[email protected]>
net: replace calls to sock->ops->connect() with kernel_connect()
Gustavo A. R. Silva <[email protected]>
wifi: mwifiex: Fix tlv_buf_left calculation
Gustavo A. R. Silva <[email protected]>
qed/red_ll2: Fix undefined behavior bug in struct qed_ll2_info
Stefano Garzarella <[email protected]>
vringh: don't use vringh_kiov_advance() in vringh_iov_xfer()
Dinghao Liu <[email protected]>
scsi: zfcp: Fix a double put in zfcp_port_enqueue()
Greg Kroah-Hartman <[email protected]>
Revert "clk: imx: pll14xx: dynamically configure PLL for 393216000/361267200Hz"
Ming Lei <[email protected]>
block: fix use-after-free of q->q_usage_counter
Ilya Dryomov <[email protected]>
rbd: take header_rwsem in rbd_dev_refresh() only when updating
Ilya Dryomov <[email protected]>
rbd: decouple parent info read-in from updating rbd_dev
Ilya Dryomov <[email protected]>
rbd: decouple header read-in from updating rbd_dev->header
Ilya Dryomov <[email protected]>
rbd: move rbd_dev_refresh() definition
Robin Murphy <[email protected]>
iommu/arm-smmu-v3: Avoid constructing invalid range commands
Robin Murphy <[email protected]>
iommu/arm-smmu-v3: Set TTL invalidation hint better
Gabriel Krisman Bertazi <[email protected]>
arm64: Avoid repeated AA64MMFR1_EL1 register read on pagefault path
Zheng Yejian <[email protected]>
ring-buffer: Fix bytes info in per_cpu buffer stats
Vlastimil Babka <[email protected]>
ring-buffer: remove obsolete comment for free_buffer_page()
Trond Myklebust <[email protected]>
NFSv4: Fix a state manager thread deadlock regression
Benjamin Coddington <[email protected]>
NFS: rename nfs_client_kset to nfs_kset
Benjamin Coddington <[email protected]>
NFS: Cleanup unused rpc_clnt variable
Sameer Pujar <[email protected]>
ASoC: tegra: Fix redundant PLLA and PLLA_OUT0 updates
Sameer Pujar <[email protected]>
ASoC: soc-utils: Export snd_soc_dai_is_dummy() symbol
Johan Hovold <[email protected]>
spi: zynqmp-gqspi: fix clock imbalance on probe failure
Uwe Kleine-König <[email protected]>
spi: zynqmp-gqspi: Convert to platform remove callback returning void
-------------
Diffstat:
Makefile | 4 +- arch/arm64/include/asm/cpufeature.h | 6 +- arch/arm64/include/asm/cputype.h | 2 + arch/parisc/include/asm/ldcw.h | 36 +- arch/parisc/include/asm/spinlock_types.h | 5 - block/blk-core.c | 2 - block/blk-sysfs.c | 2 + drivers/base/regmap/regcache-rbtree.c | 3 +- drivers/block/rbd.c | 412 +++++++++++---------- drivers/clk/imx/clk-pll14xx.c | 2 + drivers/gpio/gpio-aspeed.c | 2 +- drivers/gpio/gpio-pxa.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +- drivers/hid/hid-sony.c | 2 + drivers/hid/intel-ish-hid/ipc/pci-ish.c | 8 + drivers/infiniband/core/cma.c | 2 +- drivers/infiniband/core/cma_configfs.c | 2 +- drivers/infiniband/core/nldev.c | 1 + drivers/infiniband/core/uverbs_main.c | 2 +- drivers/infiniband/hw/mlx4/sysfs.c | 2 +- drivers/infiniband/hw/mlx5/main.c | 2 +- drivers/infiniband/sw/siw/siw_cm.c | 16 +- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 18 +- drivers/md/dm-zoned-target.c | 15 +- drivers/mtd/ubi/build.c | 7 + drivers/net/dsa/mv88e6xxx/chip.c | 6 +- drivers/net/dsa/mv88e6xxx/global1.c | 31 -- drivers/net/dsa/mv88e6xxx/global1.h | 1 - drivers/net/dsa/mv88e6xxx/global2.c | 2 +- drivers/net/dsa/mv88e6xxx/global2.h | 1 + drivers/net/ethernet/ibm/ibmveth.c | 25 +- drivers/net/ethernet/qlogic/qed/qed_ll2.h | 2 +- drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c | 7 +- drivers/net/ethernet/ti/am65-cpsw-nuss.c | 1 + drivers/net/usb/smsc75xx.c | 4 +- drivers/net/wan/fsl_ucc_hdlc.c | 12 +- drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 2 +- drivers/net/wireless/intel/iwlwifi/fw/error-dump.h | 6 +- drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 4 +- drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 4 +- drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 2 +- drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 2 +- drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 2 +- drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 2 +- drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 2 +- drivers/net/wireless/intel/iwlwifi/queue/tx.c | 6 +- drivers/net/wireless/intel/iwlwifi/queue/tx.h | 2 +- .../net/wireless/marvell/mwifiex/11n_rxreorder.c | 4 +- drivers/net/wireless/marvell/mwifiex/sta_rx.c | 16 +- .../net/wireless/mediatek/mt76/mt76x02_eeprom.c | 7 - drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.c | 13 +- drivers/of/dynamic.c | 6 +- drivers/ptp/ptp_ocp.c | 1 - drivers/s390/scsi/zfcp_aux.c | 9 +- drivers/spi/spi-zynqmp-gqspi.c | 18 +- drivers/target/target_core_device.c | 11 +- drivers/vhost/vringh.c | 12 +- fs/btrfs/super.c | 4 + fs/ksmbd/smb2pdu.c | 4 +- fs/nfs/nfs4proc.c | 4 +- fs/nfs/nfs4state.c | 47 ++- fs/nfs/sysfs.c | 16 +- include/linux/bpf.h | 2 +- include/linux/netfilter/nf_conntrack_sctp.h | 1 + include/net/tcp.h | 6 +- kernel/trace/ring_buffer.c | 32 +- net/core/neighbour.c | 4 +- net/core/sock_map.c | 4 + net/ipv4/route.c | 2 + net/ipv4/tcp_input.c | 13 + net/ipv4/tcp_output.c | 7 +- net/l2tp/l2tp_ip6.c | 2 +- net/netfilter/ipvs/ip_vs_sync.c | 4 +- net/netfilter/nf_conntrack_proto_sctp.c | 43 ++- net/netfilter/nft_set_rbtree.c | 46 ++- net/nfc/llcp_core.c | 2 + net/rds/tcp_connect.c | 2 +- net/sctp/associola.c | 3 +- net/sctp/socket.c | 1 + net/socket.c | 29 +- net/tipc/crypto.c | 4 +- scripts/mod/file2alias.c | 2 +- security/integrity/ima/Kconfig | 22 +- sound/soc/soc-utils.c | 1 + sound/soc/tegra/tegra_audio_graph_card.c | 30 +- 88 files changed, 649 insertions(+), 473 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/75 spi: zynqmp-gqspi: Convert to platform remove callback returning void
5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Uwe Kleine-König <[email protected]>
[ Upstream commit 3ffefa1d9c9eba60c7f8b4a9ce2df3e4c7f4a88e ]
The .remove() callback for a platform driver returns an int which makes many driver authors wrongly assume it's possible to do error handling by returning an error code. However the value returned is (mostly) ignored and this typically results in resource leaks. To improve here there is a quest to make the remove callback return void. In the first step of this quest all drivers are converted to .remove_new() which already returns void.
Trivially convert this driver from always returning zero in the remove callback to the void returning variant.
Stable-dep-of: 1527b076ae2c ("spi: zynqmp-gqspi: fix clock imbalance on probe failure")
--- drivers/spi/spi-zynqmp-gqspi.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/spi/spi-zynqmp-gqspi.c +2 -4
@@ -1221,7 +1221,7 @@ static int zynqmp_qspi_probe(struct platform_device *pdev)* * Return: 0 Always */ -static int zynqmp_qspi_remove (struct platform_device *pdev) +static void zynqmp_qspi_remove (struct platform_device *pdev) {struct zynqmp_qspi *xqspi =platform_get_drvdata (pdev);
@@ -1230,8 +1230,6 @@ static int zynqmp_qspi_remove(struct platform_device *pdev)clk_disable_unprepare (xqspi->pclk);pm_runtime_set_suspended (&pdev->dev);pm_runtime_disable (&pdev->dev); - -return 0 ; }static const struct of_device_id zynqmp_qspi_of_match[] = {
@@ -1243,7 +1241,7 @@ MODULE_DEVICE_TABLE(of, zynqmp_qspi_of_match);static struct platform_driver zynqmp_qspi_driver = { .probe = zynqmp_qspi_probe, - .remove = zynqmp_qspi_remove, + .remove_new = zynqmp_qspi_remove, .driver = { .name ="zynqmp-qspi" , .of_match_table = zynqmp_qspi_of_match,
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 2/75 spi: zynqmp-gqspi: fix clock imbalance on probe failure
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
[ Upstream commit 1527b076ae2cb6a9c590a02725ed39399fcad1cf ]
Make sure that the device is not runtime suspended before explicitly disabling the clocks on probe failure and on driver unbind to avoid a clock enable-count imbalance.
--- drivers/spi/spi-zynqmp-gqspi.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/spi/spi-zynqmp-gqspi.c +8 -4
@@ -1199,9 +1199,9 @@ static int zynqmp_qspi_probe(struct platform_device *pdev)return 0 ; clk_dis_all: -pm_runtime_put_sync (&pdev->dev); -pm_runtime_set_suspended (&pdev->dev);pm_runtime_disable (&pdev->dev); +pm_runtime_put_noidle (&pdev->dev); +pm_runtime_set_suspended (&pdev->dev);clk_disable_unprepare (xqspi->refclk); clk_dis_pclk:clk_disable_unprepare (xqspi->pclk);
@@ -1225,11 +1225,15 @@ static void zynqmp_qspi_remove(struct platform_device *pdev) {struct zynqmp_qspi *xqspi =platform_get_drvdata (pdev); +pm_runtime_get_sync (&pdev->dev); +zynqmp_gqspi_write (xqspi,GQSPI_EN_OFST ,0x0 ); + +pm_runtime_disable (&pdev->dev); +pm_runtime_put_noidle (&pdev->dev); +pm_runtime_set_suspended (&pdev->dev);clk_disable_unprepare (xqspi->refclk);clk_disable_unprepare (xqspi->pclk); -pm_runtime_set_suspended (&pdev->dev); -pm_runtime_disable (&pdev->dev); }static const struct of_device_id zynqmp_qspi_of_match[] = {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 3/75 ASoC: soc-utils: Export snd_soc_dai_is_dummy() symbol
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sameer Pujar <[email protected]>
[ Upstream commit f101583fa9f8c3f372d4feb61d67da0ccbf4d9a5 ]
Export symbol snd_soc_dai_is_dummy() for usage outside core driver modules. This is required by Tegra ASoC machine driver.
--- sound/soc/soc-utils.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/soc-utils.c +1 -0
@@ -159,6 +159,7 @@ int snd_soc_dai_is_dummy(struct snd_soc_dai *dai)return 1 ;return 0 ; } +EXPORT_SYMBOL_GPL (snd_soc_dai_is_dummy);int snd_soc_component_is_dummy (struct snd_soc_component *component) {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 4/75 ASoC: tegra: Fix redundant PLLA and PLLA_OUT0 updates
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sameer Pujar <[email protected]>
[ Upstream commit e765886249c533e1bb5cbc3cd741bad677417312 ]
Tegra audio graph card has many DAI links which connects internal AHUB modules and external audio codecs. Since these are DPCM links, hw_params() call in the machine driver happens for each connected BE link and PLLA is updated every time. This is not really needed for all links as only I/O link DAIs derive respective clocks from PLLA_OUT0 and thus from PLLA. Hence add checks to limit the clock updates to DAIs over I/O links.
This found to be fixing a DMIC clock discrepancy which is suspected to happen because of back to back quick PLLA and PLLA_OUT0 rate updates. This was observed on Jetson TX2 platform where DMIC clock ended up with unexpected value.
--- sound/soc/tegra/tegra_audio_graph_card.c | 30 ++++++++++++++---------- 1 file changed, 17 insertions(+), 13 deletions(-)
sound/soc/tegra/tegra_audio_graph_card.c +17 -13
@@ -10,6 +10,7 @@#include <linux/platform_device.h> #include <sound/graph_card.h> #include <sound/pcm_params.h> +#include <sound/soc-dai.h> #define MAX_PLLA_OUT0_DIV 128
@@ -44,6 +45,21 @@ struct tegra_audio_cdata {unsigned int plla_out0_rates[NUM_RATE_TYPE ]; }; +static bool need_clk_update (struct snd_soc_dai *dai) +{ +if (snd_soc_dai_is_dummy (dai) || + !dai->driver->ops || + !dai->driver->name) +return false; + +if (strstr (dai->driver->name,"I2S" ) || +strstr (dai->driver->name,"DMIC" ) || +strstr (dai->driver->name,"DSPK" )) +return true; + +return false; +} +/* Setup PLL clock as per the given sample rate */ static int tegra_audio_graph_update_pll (struct snd_pcm_substream *substream,struct snd_pcm_hw_params *params)
@@ -140,19 +156,7 @@ static int tegra_audio_graph_hw_params(struct snd_pcm_substream *substream,struct snd_soc_dai *cpu_dai =asoc_rtd_to_cpu (rtd,0 );int err; -/* -* This gets called for each DAI link (FE or BE) when DPCM is used. -* We may not want to update PLLA rate for each call. So PLLA update -* must be restricted to external I/O links (I2S, DMIC or DSPK) since -* they actually depend on it. I/O modules update their clocks in -* hw_param() of their respective component driver and PLLA rate -* update here helps them to derive appropriate rates. -* -* TODO: When more HW accelerators get added (like sample rate -* converter, volume gain controller etc., which don't really -* depend on PLLA) we need a better way to filter here. -*/ -if (cpu_dai->driver->ops && rtd->dai_link->no_pcm) { +if (need_clk_update (cpu_dai)) { err =tegra_audio_graph_update_pll (substream, params);if (err)return err;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 5/75 NFS: Cleanup unused rpc_clnt variable
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Benjamin Coddington <[email protected]>
[ Upstream commit e025f0a73f6acb920d86549b2177a5883535421d ]
The root rpc_clnt is not used here, clean it up.
Stable-dep-of: 956fd46f97d2 ("NFSv4: Fix a state manager thread deadlock regression")
--- fs/nfs/nfs4state.c | 4 ---- 1 file changed, 4 deletions(-)
fs/nfs/nfs4state.c +0 -4
@@ -1213,10 +1213,6 @@ void nfs4_schedule_state_manager(struct nfs_client *clp) {struct task_struct *task;char buf[INET6_ADDRSTRLEN +sizeof ("-manager" ) +1 ]; -struct rpc_clnt *cl = clp->cl_rpcclient; - -while (cl != cl->cl_parent) - cl = cl->cl_parent;set_bit (NFS4CLNT_RUN_MANAGER , &clp->cl_state);if (test_and_set_bit (NFS4CLNT_MANAGER_AVAILABLE , &clp->cl_state) !=0 ) {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 6/75 NFS: rename nfs_client_kset to nfs_kset
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Benjamin Coddington <[email protected]>
[ Upstream commit 8b18a2edecc0741b0eecf8b18fdb356a0f8682de ]
Be brief and match the subsystem name. There's no need to distinguish this kset variable from the server.
Stable-dep-of: 956fd46f97d2 ("NFSv4: Fix a state manager thread deadlock regression")
--- fs/nfs/sysfs.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
fs/nfs/sysfs.c +8 -8
@@ -18,7 +18,7 @@#include "sysfs.h" struct kobject *nfs_client_kobj; -static struct kset *nfs_client_kset; +static struct kset *nfs_kset;static void nfs_netns_object_release (struct kobject *kobj) {
@@ -55,13 +55,13 @@ static struct kobject *nfs_netns_object_alloc(const char *name,int nfs_sysfs_init (void ) { - nfs_client_kset =kset_create_and_add ("nfs" ,NULL , fs_kobj); -if (!nfs_client_kset) + nfs_kset =kset_create_and_add ("nfs" ,NULL , fs_kobj); +if (!nfs_kset)return -ENOMEM ; - nfs_client_kobj =nfs_netns_object_alloc ("net" , nfs_client_kset,NULL ); + nfs_client_kobj =nfs_netns_object_alloc ("net" , nfs_kset,NULL );if (!nfs_client_kobj) { -kset_unregister (nfs_client_kset); - nfs_client_kset =NULL ; +kset_unregister (nfs_kset); + nfs_kset =NULL ;return -ENOMEM ; }return 0 ;
@@ -70,7 +70,7 @@ int nfs_sysfs_init(void)void nfs_sysfs_exit (void ) {kobject_put (nfs_client_kobj); -kset_unregister (nfs_client_kset); +kset_unregister (nfs_kset); } static ssize_t nfs_netns_identifier_show(struct kobject *kobj,
@@ -158,7 +158,7 @@ static struct nfs_netns_client *nfs_netns_client_alloc(struct kobject *parent, p =kzalloc (sizeof (*p),GFP_KERNEL );if (p) { p->net = net; - p->kobject.kset = nfs_client_kset; + p->kobject.kset = nfs_kset;if (kobject_init_and_add (&p->kobject, &nfs_netns_client_type, parent,"nfs_client" ) ==0 )return p;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 7/75 NFSv4: Fix a state manager thread deadlock regression
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Trond Myklebust <[email protected]>
[ Upstream commit 956fd46f97d238032cb5fa4771cdaccc6e760f9a ]
Commit 4dc73c679114 reintroduces the deadlock that was fixed by commit aeabb3c96186 ("NFSv4: Fix a NFSv4 state manager deadlock") because it prevents the setup of new threads to handle reboot recovery, while the older recovery thread is stuck returning delegations.
--- fs/nfs/nfs4proc.c | 4 +++- fs/nfs/nfs4state.c | 36 +++++++++++++++++++++++++----------- 2 files changed, 28 insertions(+), 12 deletions(-)
fs/nfs/nfs4proc.c +3 -1
@@ -10557,7 +10557,9 @@ static void nfs4_disable_swap(struct inode *inode)*/ struct nfs_client *clp =NFS_SERVER (inode)->nfs_client; -nfs4_schedule_state_manager (clp); +set_bit (NFS4CLNT_RUN_MANAGER , &clp->cl_state); +clear_bit (NFS4CLNT_MANAGER_AVAILABLE , &clp->cl_state); +wake_up_var (&clp->cl_state); }static const struct inode_operations nfs4_dir_inode_operations = {
fs/nfs/nfs4state.c +25 -11
@@ -1213,13 +1213,23 @@ void nfs4_schedule_state_manager(struct nfs_client *clp) {struct task_struct *task;char buf[INET6_ADDRSTRLEN +sizeof ("-manager" ) +1 ]; +struct rpc_clnt *clnt = clp->cl_rpcclient; +bool swapon = false;set_bit (NFS4CLNT_RUN_MANAGER , &clp->cl_state); -if (test_and_set_bit (NFS4CLNT_MANAGER_AVAILABLE , &clp->cl_state) !=0 ) { -wake_up_var (&clp->cl_state); -return ; + +if (atomic_read (&clnt->cl_swapper)) { + swapon = !test_and_set_bit (NFS4CLNT_MANAGER_AVAILABLE , + &clp->cl_state); +if (!swapon) { +wake_up_var (&clp->cl_state); +return ; + } } -set_bit (NFS4CLNT_MANAGER_RUNNING , &clp->cl_state); + +if (test_and_set_bit (NFS4CLNT_MANAGER_RUNNING , &clp->cl_state) !=0 ) +return ; +__module_get (THIS_MODULE );refcount_inc (&clp->cl_count);
@@ -1236,8 +1246,9 @@ void nfs4_schedule_state_manager(struct nfs_client *clp) __func__, PTR_ERR(task));if (!nfs_client_init_is_complete (clp))nfs_mark_client_ready (clp,PTR_ERR (task)); +if (swapon) +clear_bit (NFS4CLNT_MANAGER_AVAILABLE , &clp->cl_state);nfs4_clear_state_manager_bit (clp); -clear_bit (NFS4CLNT_MANAGER_AVAILABLE , &clp->cl_state);nfs_put_client (clp);module_put (THIS_MODULE ); }
@@ -2726,22 +2737,25 @@ static int nfs4_run_state_manager(void *ptr)allow_signal (SIGKILL ); again: -set_bit (NFS4CLNT_MANAGER_RUNNING , &clp->cl_state);nfs4_state_manager (clp); -if (atomic_read (&cl->cl_swapper)) { + +if (test_bit (NFS4CLNT_MANAGER_AVAILABLE , &clp->cl_state) && + !test_bit (NFS4CLNT_MANAGER_RUNNING , &clp->cl_state)) {wait_var_event_interruptible (&clp->cl_state,test_bit (NFS4CLNT_RUN_MANAGER , &clp->cl_state)); -if (atomic_read (&cl->cl_swapper) && -test_bit (NFS4CLNT_RUN_MANAGER , &clp->cl_state)) +if (!atomic_read (&cl->cl_swapper)) +clear_bit (NFS4CLNT_MANAGER_AVAILABLE , &clp->cl_state); +if (refcount_read (&clp->cl_count) >1 && !signalled () && + !test_and_set_bit (NFS4CLNT_MANAGER_RUNNING , &clp->cl_state)) goto again;/* Either no longer a swapper, or were signalled */ +clear_bit (NFS4CLNT_MANAGER_AVAILABLE , &clp->cl_state); } -clear_bit (NFS4CLNT_MANAGER_AVAILABLE , &clp->cl_state);if (refcount_read (&clp->cl_count) >1 && !signalled () &&test_bit (NFS4CLNT_RUN_MANAGER , &clp->cl_state) && - !test_and_set_bit (NFS4CLNT_MANAGER_AVAILABLE , &clp->cl_state)) + !test_and_set_bit (NFS4CLNT_MANAGER_RUNNING , &clp->cl_state)) goto again;nfs_put_client (clp);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 8/75 ring-buffer: remove obsolete comment for free_buffer_page()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vlastimil Babka <[email protected]>
[ Upstream commit a98151ad53b53f010ee364ec2fd06445b328578b ]
The comment refers to mm/slob.c which is being removed. It comes from commit ed56829cb319 ("ring_buffer: reset buffer page when freeing") and according to Steven the borrowed code was a page mapcount and mapping reset, which was later removed by commit e4c2ce82ca27 ("ring_buffer:
allocate buffer page pointer"). Thus the comment is not accurate anyway, remove it.
Stable-dep-of: 45d99ea451d0 ("ring-buffer: Fix bytes info in per_cpu buffer stats")
--- kernel/trace/ring_buffer.c | 4 ---- 1 file changed, 4 deletions(-)
kernel/trace/ring_buffer.c +0 -4
@@ -346,10 +346,6 @@ static void rb_init_page(struct buffer_data_page *bpage)local_set (&bpage->commit,0 ); } -/* -* Also stolen from mm/slob.c. Thanks to Mathieu Desnoyers for pointing -* this issue out. -*/ static void free_buffer_page (struct buffer_page *bpage) {free_page ((unsigned long )bpage->page);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 9/75 ring-buffer: Fix bytes info in per_cpu buffer stats
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zheng Yejian <[email protected]>
[ Upstream commit 45d99ea451d0c30bfd4864f0fe485d7dac014902 ]
The 'bytes' info in file 'per_cpu/cpu<X>/stats' means the number of bytes in cpu buffer that have not been consumed. However, currently after consuming data by reading file 'trace_pipe', the 'bytes' info was not changed as expected.
# cat per_cpu/cpu0/stats entries: 0 overrun: 0 commit overrun: 0 bytes: 568 <--- 'bytes' is problematical !!! oldest event ts: 8651.371479 now ts: 8653.912224 dropped events: 0 read events: 8
The root cause is incorrect stat on cpu_buffer->read_bytes. To fix it:
1. When stat 'read_bytes', account consumed event in rb_advance_reader();
2. When stat 'entries_bytes', exclude the discarded padding event which is smaller than minimum size because it is invisible to reader. Then use rb_page_commit() instead of BUF_PAGE_SIZE at where accounting for page-based read/remove/overrun.
Also correct the comments of ring_buffer_bytes_cpu() in this patch.
--- kernel/trace/ring_buffer.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-)
kernel/trace/ring_buffer.c +15 -13
@@ -346,6 +346,11 @@ static void rb_init_page(struct buffer_data_page *bpage)local_set (&bpage->commit,0 ); } +static __always_inline unsigned int rb_page_commit(struct buffer_page *bpage) +{ +return local_read (&bpage->page->commit); +} +static void free_buffer_page (struct buffer_page *bpage) {free_page ((unsigned long )bpage->page);
@@ -1984,7 +1989,7 @@ rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned long nr_pages)* Increment overrun to account for the lost events. */ local_add (page_entries, &cpu_buffer->overrun); -local_sub (BUF_PAGE_SIZE , &cpu_buffer->entries_bytes); +local_sub (rb_page_commit (to_remove_page), &cpu_buffer->entries_bytes);local_inc (&cpu_buffer->pages_lost); }
@@ -2328,11 +2333,6 @@ rb_reader_event(struct ring_buffer_per_cpu *cpu_buffer) cpu_buffer->reader_page->read); } -static __always_inline unsigned rb_page_commit (struct buffer_page *bpage) -{ -return local_read (&bpage->page->commit); -} -static struct ring_buffer_event *rb_iter_head_event (struct ring_buffer_iter *iter) {
@@ -2478,7 +2478,7 @@ rb_handle_head_page(struct ring_buffer_per_cpu *cpu_buffer,* the counters. */ local_add (entries, &cpu_buffer->overrun); -local_sub (BUF_PAGE_SIZE , &cpu_buffer->entries_bytes); +local_sub (rb_page_commit (next_page), &cpu_buffer->entries_bytes);local_inc (&cpu_buffer->pages_lost);/*
@@ -2621,9 +2621,6 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer, event =__rb_page_index (tail_page, tail); -/* account for padding bytes */ -local_add (BUF_PAGE_SIZE - tail, &cpu_buffer->entries_bytes); -/* * Save the original length to the meta data. * This will be used by the reader to add lost event
@@ -2637,7 +2634,8 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,* write counter enough to allow another writer to slip * in on this page. * We put in a discarded commit instead, to make sure -* that this space is not used again. +* that this space is not used again, and this space will +* not be accounted into 'entries_bytes'. * * If we are less than the minimum size, we don't need to * worry about it.
@@ -2662,6 +2660,9 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,/* time delta must be non zero */ event->time_delta =1 ; +/* account for padding bytes */ +local_add (BUF_PAGE_SIZE - tail, &cpu_buffer->entries_bytes); +/* Make sure the padding is visible before the tail_page->write update */ smp_wmb ();
@@ -4177,7 +4178,7 @@ u64 ring_buffer_oldest_event_ts(struct trace_buffer *buffer, int cpu)EXPORT_SYMBOL_GPL (ring_buffer_oldest_event_ts);/** -* ring_buffer_bytes_cpu - get the number of bytes consumed in a cpu buffer +* ring_buffer_bytes_cpu - get the number of bytes unconsumed in a cpu buffer * @buffer: The ring buffer * @cpu: The per CPU buffer to read from. */
@@ -4685,6 +4686,7 @@ static void rb_advance_reader(struct ring_buffer_per_cpu *cpu_buffer) length =rb_event_length (event); cpu_buffer->reader_page->read += length; + cpu_buffer->read_bytes += length; }static void rb_advance_iter (struct ring_buffer_iter *iter)
@@ -5778,7 +5780,7 @@ int ring_buffer_read_page(struct trace_buffer *buffer, }else {/* update the entry counter */ cpu_buffer->read +=rb_page_entries (reader); - cpu_buffer->read_bytes +=BUF_PAGE_SIZE ; + cpu_buffer->read_bytes +=rb_page_commit (reader);/* swap the pages */ rb_init_page (bpage);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 10/75 arm64: Avoid repeated AA64MMFR1_EL1 register read on pagefault path
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gabriel Krisman Bertazi <[email protected]>
[ Upstream commit a89c6bcdac22bec1bfbe6e64060b4cf5838d4f47 ]
Accessing AA64MMFR1_EL1 is expensive in KVM guests, since it is emulated in the hypervisor. In fact, ARM documentation mentions some feature registers are not supposed to be accessed frequently by the OS, and therefore should be emulated for guests [1].
Commit 0388f9c74330 ("arm64: mm: Implement arch_wants_old_prefaulted_pte()") introduced a read of this register in the page fault path. But, even when the feature of setting faultaround pages with the old flag is disabled for a given cpu, we are still paying the cost of checking the register on every pagefault. This results in an explosion of vmexit events in KVM guests, which directly impacts the performance of virtualized workloads. For instance, running kernbench yields a 15% increase in system time solely due to the increased vmexit cycles.
This patch avoids the extra cost by using the sanitized cached value. It should be safe to do so, since this register mustn't change for a given cpu.
--- arch/arm64/include/asm/cpufeature.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
arch/arm64/include/asm/cpufeature.h +5 -1
@@ -839,7 +839,11 @@ static inline bool cpu_has_hw_af(void)if (!IS_ENABLED (CONFIG_ARM64_HW_AFDBM ))return false; - mmfr1 =read_cpuid (ID_AA64MMFR1_EL1 ); +/* +* Use cached version to avoid emulated msr operation on KVM +* guests. +*/ + mmfr1 =read_sanitised_ftr_reg (SYS_ID_AA64MMFR1_EL1 );return cpuid_feature_extract_unsigned_field (mmfr1,ID_AA64MMFR1_HADBS_SHIFT ); }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 11/75 iommu/arm-smmu-v3: Set TTL invalidation hint better
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Robin Murphy <[email protected]>
[ Upstream commit 6833b8f2e19945a41e4d5efd8c6d9f4cae9a5b7d ]
When io-pgtable unmaps a whole table, rather than waste time walking it to find the leaf entries to invalidate exactly, it simply expects .tlb_flush_walk with nominal last-level granularity to invalidate any leaf entries at higher intermediate levels as well. This works fine with page-based invalidation, but with range commands we need to be careful with the TTL hint - unconditionally setting it based on the given level 3 granule means that an invalidation for a level 1 table would strictly not be required to affect level 2 block entries. It's easy to comply with the expected behaviour by simply not setting the TTL hint for non-leaf invalidations, so let's do that.
--- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +7 -2
@@ -1884,8 +1884,13 @@ static void __arm_smmu_tlb_inv_range(struct arm_smmu_cmdq_ent *cmd,/* Convert page size of 12,14,16 (log2) to 1,2,3 */ cmd->tlbi.tg = (tg -10 ) /2 ; -/* Determine what level the granule is at */ - cmd->tlbi.ttl =4 - ((ilog2 (granule) -3 ) / (tg -3 )); +/* +* Determine what level the granule is at. For non-leaf, io-pgtable +* assumes .tlb_flush_walk can invalidate multiple levels at once, +* so ignore the nominal last-level granule and leave TTL=0. +*/ +if (cmd->tlbi.leaf) + cmd->tlbi.ttl =4 - ((ilog2 (granule) -3 ) / (tg -3 )); num_pages = size >> tg; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 12/75 iommu/arm-smmu-v3: Avoid constructing invalid range commands
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Robin Murphy <[email protected]>
[ Upstream commit eb6c97647be227822c7ce23655482b05e348fba5 ]
Although io-pgtable's non-leaf invalidations are always for full tables, I missed that SVA also uses non-leaf invalidations, while being at the mercy of whatever range the MMU notifier throws at it. This means it definitely wants the previous TTL fix as well, since it also doesn't know exactly which leaf level(s) may need invalidating, but it can also give us less-aligned ranges wherein certain corners may lead to building an invalid command where TTL, Num and Scale are all 0. It should be fine to handle this by over-invalidating an extra page, since falling back to a non-range command opens up a whole can of errata-flavoured worms.
--- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +10 -5
@@ -1881,18 +1881,23 @@ static void __arm_smmu_tlb_inv_range(struct arm_smmu_cmdq_ent *cmd,/* Get the leaf page size */ tg =__ffs (smmu_domain->domain.pgsize_bitmap); + num_pages = size >> tg; +/* Convert page size of 12,14,16 (log2) to 1,2,3 */ cmd->tlbi.tg = (tg -10 ) /2 ;/* -* Determine what level the granule is at. For non-leaf, io-pgtable -* assumes .tlb_flush_walk can invalidate multiple levels at once, -* so ignore the nominal last-level granule and leave TTL=0. +* Determine what level the granule is at. For non-leaf, both +* io-pgtable and SVA pass a nominal last-level granule because +* they don't know what level(s) actually apply, so ignore that +* and leave TTL=0. However for various errata reasons we still +* want to use a range command, so avoid the SVA corner case +* where both scale and num could be 0 as well. */ if (cmd->tlbi.leaf) cmd->tlbi.ttl =4 - ((ilog2 (granule) -3 ) / (tg -3 )); - - num_pages = size >> tg; +else if ((num_pages &CMDQ_TLBI_RANGE_NUM_MAX ) ==1 ) + num_pages++; } cmds.num =0 ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 13/75 rbd: move rbd_dev_refresh() definition
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilya Dryomov <[email protected]>
commit 0b035401c57021fc6c300272cbb1c5a889d4fe45 upstream.
Move rbd_dev_refresh() definition further down to avoid having to move struct parent_image_info definition in the next commit. This spares some forward declarations too.
--- drivers/block/rbd.c | 68 ++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 35 deletions(-)
drivers/block/rbd.c +33 -35
@@ -633,8 +633,6 @@ static void rbd_dev_remove_parent(struct rbd_device *rbd_dev);static int rbd_dev_refresh (struct rbd_device *rbd_dev);static int rbd_dev_v2_header_onetime (struct rbd_device *rbd_dev); -static int rbd_dev_header_info (struct rbd_device *rbd_dev); -static int rbd_dev_v2_parent_info (struct rbd_device *rbd_dev);static const char *rbd_dev_v2_snap_name (struct rbd_device *rbd_dev,u64 snap_id); static int _rbd_dev_v2_snap_size(struct rbd_device *rbd_dev, u64 snap_id,
@@ -4933,39 +4931,6 @@ static void rbd_dev_update_size(struct rbd_device *rbd_dev) } } -static int rbd_dev_refresh (struct rbd_device *rbd_dev) -{ -u64 mapping_size; -int ret; - -down_write (&rbd_dev->header_rwsem); - mapping_size = rbd_dev->mapping.size; - - ret =rbd_dev_header_info (rbd_dev); -if (ret) - goto out; - -/* -* If there is a parent, see if it has disappeared due to the -* mapped image getting flattened. -*/ -if (rbd_dev->parent) { - ret =rbd_dev_v2_parent_info (rbd_dev); -if (ret) - goto out; - } - -rbd_assert (!rbd_is_snap (rbd_dev)); - rbd_dev->mapping.size = rbd_dev->header.image_size; - -out: -up_write (&rbd_dev->header_rwsem); -if (!ret && mapping_size != rbd_dev->mapping.size) -rbd_dev_update_size (rbd_dev); - -return ret; -} -static const struct blk_mq_ops rbd_mq_ops = { .queue_rq = rbd_queue_rq, };
@@ -7047,6 +7012,39 @@ static int rbd_dev_image_probe(struct rbd_device *rbd_dev, int depth)return ret; } +static int rbd_dev_refresh (struct rbd_device *rbd_dev) +{ +u64 mapping_size; +int ret; + +down_write (&rbd_dev->header_rwsem); + mapping_size = rbd_dev->mapping.size; + + ret =rbd_dev_header_info (rbd_dev); +if (ret) + goto out; + +/* +* If there is a parent, see if it has disappeared due to the +* mapped image getting flattened. +*/ +if (rbd_dev->parent) { + ret =rbd_dev_v2_parent_info (rbd_dev); +if (ret) + goto out; + } + +rbd_assert (!rbd_is_snap (rbd_dev)); + rbd_dev->mapping.size = rbd_dev->header.image_size; + +out: +up_write (&rbd_dev->header_rwsem); +if (!ret && mapping_size != rbd_dev->mapping.size) +rbd_dev_update_size (rbd_dev); + +return ret; +} +static ssize_t do_rbd_add (struct bus_type *bus,const char *buf,size_t count)
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 14/75 rbd: decouple header read-in from updating rbd_dev->header
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilya Dryomov <[email protected]>
commit 510a7330c82a7754d5df0117a8589e8a539067c7 upstream.
Make rbd_dev_header_info() populate a passed struct rbd_image_header instead of rbd_dev->header and introduce rbd_dev_update_header() for updating mutable fields in rbd_dev->header upon refresh. The initial read-in of both mutable and immutable fields in rbd_dev_image_probe() passes in rbd_dev->header so no update step is required there.
rbd_init_layout() is now called directly from rbd_dev_image_probe() instead of individually in format 1 and format 2 implementations.
--- drivers/block/rbd.c | 206 ++++++++++++++++++++++++-------------------- 1 file changed, 114 insertions(+), 92 deletions(-)
drivers/block/rbd.c +114 -92
@@ -632,7 +632,8 @@ void rbd_warn(struct rbd_device *rbd_dev, const char *fmt, ...)static void rbd_dev_remove_parent (struct rbd_device *rbd_dev);static int rbd_dev_refresh (struct rbd_device *rbd_dev); -static int rbd_dev_v2_header_onetime (struct rbd_device *rbd_dev); +static int rbd_dev_v2_header_onetime (struct rbd_device *rbd_dev, +struct rbd_image_header *header);static const char *rbd_dev_v2_snap_name (struct rbd_device *rbd_dev,u64 snap_id); static int _rbd_dev_v2_snap_size(struct rbd_device *rbd_dev, u64 snap_id,
@@ -994,15 +995,24 @@ static void rbd_init_layout(struct rbd_device *rbd_dev)RCU_INIT_POINTER (rbd_dev->layout.pool_ns,NULL ); } +static void rbd_image_header_cleanup (struct rbd_image_header *header) +{ +kfree (header->object_prefix); +ceph_put_snap_context (header->snapc); +kfree (header->snap_sizes); +kfree (header->snap_names); + +memset (header,0 ,sizeof (*header)); +} +/* * Fill an rbd image header with information from the given format 1 * on-disk header. */ -static int rbd_header_from_disk (struct rbd_device *rbd_dev, -struct rbd_image_header_ondisk *ondisk) +static int rbd_header_from_disk (struct rbd_image_header *header, +struct rbd_image_header_ondisk *ondisk, +bool first_time) { -struct rbd_image_header *header = &rbd_dev->header; -bool first_time = header->object_prefix ==NULL ;struct ceph_snap_context *snapc;char *object_prefix =NULL ;char *snap_names =NULL ;
@@ -1069,11 +1079,6 @@ static int rbd_header_from_disk(struct rbd_device *rbd_dev,if (first_time) { header->object_prefix = object_prefix; header->obj_order = ondisk->options.order; -rbd_init_layout (rbd_dev); - }else { -ceph_put_snap_context (header->snapc); -kfree (header->snap_names); -kfree (header->snap_sizes); }/* The remaining fields always get updated (when we refresh) */
@@ -4859,7 +4864,9 @@ static int rbd_obj_read_sync(struct rbd_device *rbd_dev,* return, the rbd_dev->header field will contain up-to-date * information about the image. */ -static int rbd_dev_v1_header_info (struct rbd_device *rbd_dev) +static int rbd_dev_v1_header_info (struct rbd_device *rbd_dev, +struct rbd_image_header *header, +bool first_time) {struct rbd_image_header_ondisk *ondisk =NULL ;u32 snap_count =0 ;
@@ -4907,7 +4914,7 @@ static int rbd_dev_v1_header_info(struct rbd_device *rbd_dev) snap_count =le32_to_cpu (ondisk->snap_count); }while (snap_count != want_count); - ret =rbd_header_from_disk (rbd_dev, ondisk); + ret =rbd_header_from_disk (header, ondisk, first_time); out:kfree (ondisk);
@@ -5473,17 +5480,12 @@ static int _rbd_dev_v2_snap_size(struct rbd_device *rbd_dev, u64 snap_id,return 0 ; } -static int rbd_dev_v2_image_size (struct rbd_device *rbd_dev) -{ -return _rbd_dev_v2_snap_size (rbd_dev,CEPH_NOSNAP , - &rbd_dev->header.obj_order, - &rbd_dev->header.image_size); -} - -static int rbd_dev_v2_object_prefix (struct rbd_device *rbd_dev) +static int rbd_dev_v2_object_prefix (struct rbd_device *rbd_dev, +char **pobject_prefix) {size_t size;void *reply_buf; +char *object_prefix;int ret;void *p;
@@ -5501,16 +5503,16 @@ static int rbd_dev_v2_object_prefix(struct rbd_device *rbd_dev) goto out; p = reply_buf; - rbd_dev->header.object_prefix =ceph_extract_encoded_string (&p, - p + ret,NULL ,GFP_NOIO ); + object_prefix =ceph_extract_encoded_string (&p, p + ret,NULL , +GFP_NOIO ); +if (IS_ERR (object_prefix)) { + ret =PTR_ERR (object_prefix); + goto out; + } ret =0 ; -if (IS_ERR (rbd_dev->header.object_prefix)) { - ret =PTR_ERR (rbd_dev->header.object_prefix); - rbd_dev->header.object_prefix =NULL ; - }else { -dout (" object_prefix = %s\n" , rbd_dev->header.object_prefix); - } + *pobject_prefix = object_prefix; +dout (" object_prefix = %s\n" , object_prefix); out:kfree (reply_buf);
@@ -5561,13 +5563,6 @@ static int _rbd_dev_v2_snap_features(struct rbd_device *rbd_dev, u64 snap_id,return 0 ; } -static int rbd_dev_v2_features (struct rbd_device *rbd_dev) -{ -return _rbd_dev_v2_snap_features (rbd_dev,CEPH_NOSNAP , -rbd_is_ro (rbd_dev), - &rbd_dev->header.features); -} -/* * These are generic image flags, but since they are used only for * object map, store them in rbd_dev->object_map_flags.
@@ -5842,14 +5837,14 @@ static int rbd_dev_v2_parent_info(struct rbd_device *rbd_dev)return ret; } -static int rbd_dev_v2_striping_info (struct rbd_device *rbd_dev) +static int rbd_dev_v2_striping_info (struct rbd_device *rbd_dev, +u64 *stripe_unit,u64 *stripe_count) {struct {__le64 stripe_unit;__le64 stripe_count; } __attribute__ ((packed)) striping_info_buf = {0 };size_t size =sizeof (striping_info_buf); -void *p;int ret; ret = rbd_obj_method_sync(rbd_dev, &rbd_dev->header_oid,
@@ -5861,27 +5856,33 @@ static int rbd_dev_v2_striping_info(struct rbd_device *rbd_dev)if (ret < size)return -ERANGE ; - p = &striping_info_buf; - rbd_dev->header.stripe_unit =ceph_decode_64 (&p); - rbd_dev->header.stripe_count =ceph_decode_64 (&p); + *stripe_unit =le64_to_cpu (striping_info_buf.stripe_unit); + *stripe_count =le64_to_cpu (striping_info_buf.stripe_count); +dout (" stripe_unit = %llu stripe_count = %llu\n" , *stripe_unit, + *stripe_count); +return 0 ; } -static int rbd_dev_v2_data_pool (struct rbd_device *rbd_dev) +static int rbd_dev_v2_data_pool (struct rbd_device *rbd_dev,s64 *data_pool_id) { -__le64 data_pool_id; +__le64 data_pool_buf;int ret; ret =rbd_obj_method_sync (rbd_dev, &rbd_dev->header_oid, &rbd_dev->header_oloc,"get_data_pool" , -NULL ,0 , &data_pool_id,sizeof (data_pool_id)); +NULL ,0 , &data_pool_buf, +sizeof (data_pool_buf)); +dout ("%s: rbd_obj_method_sync returned %d\n" , __func__, ret);if (ret <0 )return ret; -if (ret <sizeof (data_pool_id)) +if (ret <sizeof (data_pool_buf))return -EBADMSG ; - rbd_dev->header.data_pool_id =le64_to_cpu (data_pool_id); -WARN_ON (rbd_dev->header.data_pool_id ==CEPH_NOPOOL ); + *data_pool_id =le64_to_cpu (data_pool_buf); +dout (" data_pool_id = %lld\n" , *data_pool_id); +WARN_ON (*data_pool_id ==CEPH_NOPOOL ); +return 0 ; }
@@ -6073,7 +6074,8 @@ static int rbd_spec_fill_names(struct rbd_device *rbd_dev)return ret; } -static int rbd_dev_v2_snap_context (struct rbd_device *rbd_dev) +static int rbd_dev_v2_snap_context (struct rbd_device *rbd_dev, +struct ceph_snap_context **psnapc) {size_t size;int ret;
@@ -6134,9 +6136,7 @@ static int rbd_dev_v2_snap_context(struct rbd_device *rbd_dev)for (i =0 ; i < snap_count; i++) snapc->snaps[i] =ceph_decode_64 (&p); -ceph_put_snap_context (rbd_dev->header.snapc); - rbd_dev->header.snapc = snapc; - + *psnapc = snapc;dout (" snap context seq = %llu, snap_count = %u\n" , (unsigned long long )seq, (unsigned int )snap_count); out:
@@ -6185,38 +6185,42 @@ static const char *rbd_dev_v2_snap_name(struct rbd_device *rbd_dev,return snap_name; } -static int rbd_dev_v2_header_info (struct rbd_device *rbd_dev) +static int rbd_dev_v2_header_info (struct rbd_device *rbd_dev, +struct rbd_image_header *header, +bool first_time) { -bool first_time = rbd_dev->header.object_prefix ==NULL ;int ret; - ret =rbd_dev_v2_image_size (rbd_dev); + ret =_rbd_dev_v2_snap_size (rbd_dev,CEPH_NOSNAP , + first_time ? &header->obj_order :NULL , + &header->image_size);if (ret)return ret;if (first_time) { - ret =rbd_dev_v2_header_onetime (rbd_dev); + ret =rbd_dev_v2_header_onetime (rbd_dev, header);if (ret)return ret; } - ret =rbd_dev_v2_snap_context (rbd_dev); -if (ret && first_time) { -kfree (rbd_dev->header.object_prefix); - rbd_dev->header.object_prefix =NULL ; - } + ret =rbd_dev_v2_snap_context (rbd_dev, &header->snapc); +if (ret) +return ret; -return ret; +return 0 ; } -static int rbd_dev_header_info (struct rbd_device *rbd_dev) +static int rbd_dev_header_info (struct rbd_device *rbd_dev, +struct rbd_image_header *header, +bool first_time) {rbd_assert (rbd_image_format_valid (rbd_dev->image_format)); +rbd_assert (!header->object_prefix && !header->snapc);if (rbd_dev->image_format ==1 ) -return rbd_dev_v1_header_info (rbd_dev); +return rbd_dev_v1_header_info (rbd_dev, header, first_time); -return rbd_dev_v2_header_info (rbd_dev); +return rbd_dev_v2_header_info (rbd_dev, header, first_time); }/*
@@ -6703,60 +6707,49 @@ static int rbd_dev_image_id(struct rbd_device *rbd_dev)*/ static void rbd_dev_unprobe (struct rbd_device *rbd_dev) { -struct rbd_image_header *header; -rbd_dev_parent_put (rbd_dev);rbd_object_map_free (rbd_dev);rbd_dev_mapping_clear (rbd_dev);/* Free dynamic fields from the header, then zero it out */ - header = &rbd_dev->header; -ceph_put_snap_context (header->snapc); -kfree (header->snap_sizes); -kfree (header->snap_names); -kfree (header->object_prefix); -memset (header,0 ,sizeof (*header)); +rbd_image_header_cleanup (&rbd_dev->header); } -static int rbd_dev_v2_header_onetime (struct rbd_device *rbd_dev) +static int rbd_dev_v2_header_onetime (struct rbd_device *rbd_dev, +struct rbd_image_header *header) {int ret; - ret =rbd_dev_v2_object_prefix (rbd_dev); + ret =rbd_dev_v2_object_prefix (rbd_dev, &header->object_prefix);if (ret) - goto out_err; +return ret;/* * Get the and check features for the image. Currently the * features are assumed to never change. */ - ret =rbd_dev_v2_features (rbd_dev); + ret =_rbd_dev_v2_snap_features (rbd_dev,CEPH_NOSNAP , +rbd_is_ro (rbd_dev), &header->features);if (ret) - goto out_err; +return ret;/* If the image supports fancy striping, get its parameters */ -if (rbd_dev->header.features &RBD_FEATURE_STRIPINGV2 ) { - ret =rbd_dev_v2_striping_info (rbd_dev); -if (ret <0 ) - goto out_err; +if (header->features &RBD_FEATURE_STRIPINGV2 ) { + ret =rbd_dev_v2_striping_info (rbd_dev, &header->stripe_unit, + &header->stripe_count); +if (ret) +return ret; } -if (rbd_dev->header.features &RBD_FEATURE_DATA_POOL ) { - ret =rbd_dev_v2_data_pool (rbd_dev); +if (header->features &RBD_FEATURE_DATA_POOL ) { + ret =rbd_dev_v2_data_pool (rbd_dev, &header->data_pool_id);if (ret) - goto out_err; +return ret; } -rbd_init_layout (rbd_dev);return 0 ; - -out_err: - rbd_dev->header.features =0 ; -kfree (rbd_dev->header.object_prefix); - rbd_dev->header.object_prefix =NULL ; -return ret; }/*
@@ -6951,13 +6944,15 @@ static int rbd_dev_image_probe(struct rbd_device *rbd_dev, int depth)if (!depth)down_write (&rbd_dev->header_rwsem); - ret =rbd_dev_header_info (rbd_dev); + ret =rbd_dev_header_info (rbd_dev, &rbd_dev->header, true);if (ret) {if (ret == -ENOENT && !need_watch)rbd_print_dne (rbd_dev, false); goto err_out_probe; } +rbd_init_layout (rbd_dev); +/* * If this image is the one being mapped, we have pool name and * id, image name and id, and snap name - need to fill snap id.
@@ -7012,15 +7007,39 @@ static int rbd_dev_image_probe(struct rbd_device *rbd_dev, int depth)return ret; } +static void rbd_dev_update_header (struct rbd_device *rbd_dev, +struct rbd_image_header *header) +{ +rbd_assert (rbd_image_format_valid (rbd_dev->image_format)); +rbd_assert (rbd_dev->header.object_prefix);/* !first_time */ + + rbd_dev->header.image_size = header->image_size; + +ceph_put_snap_context (rbd_dev->header.snapc); + rbd_dev->header.snapc = header->snapc; + header->snapc =NULL ; + +if (rbd_dev->image_format ==1 ) { +kfree (rbd_dev->header.snap_names); + rbd_dev->header.snap_names = header->snap_names; + header->snap_names =NULL ; + +kfree (rbd_dev->header.snap_sizes); + rbd_dev->header.snap_sizes = header->snap_sizes; + header->snap_sizes =NULL ; + } +} +static int rbd_dev_refresh (struct rbd_device *rbd_dev) { +struct rbd_image_header header = {0 };u64 mapping_size;int ret;down_write (&rbd_dev->header_rwsem); mapping_size = rbd_dev->mapping.size; - ret =rbd_dev_header_info (rbd_dev); + ret =rbd_dev_header_info (rbd_dev, &header, false);if (ret) goto out;
@@ -7034,6 +7053,8 @@ static int rbd_dev_refresh(struct rbd_device *rbd_dev) goto out; } +rbd_dev_update_header (rbd_dev, &header); +rbd_assert (!rbd_is_snap (rbd_dev)); rbd_dev->mapping.size = rbd_dev->header.image_size;
@@ -7042,6 +7063,7 @@ static int rbd_dev_refresh(struct rbd_device *rbd_dev)if (!ret && mapping_size != rbd_dev->mapping.size)rbd_dev_update_size (rbd_dev); +rbd_image_header_cleanup (&header);return ret; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 15/75 rbd: decouple parent info read-in from updating rbd_dev
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilya Dryomov <[email protected]>
commit c10311776f0a8ddea2276df96e255625b07045a8 upstream.
Unlike header read-in, parent info read-in is already decoupled in get_parent_info(), but it's buried in rbd_dev_v2_parent_info() along with the processing logic.
Separate the initial read-in and update read-in logic into rbd_dev_setup_parent() and rbd_dev_update_parent() respectively and have rbd_dev_v2_parent_info() just populate struct parent_image_info (i.e. what get_parent_info() did). Some existing QoI issues, like flatten of a standalone clone being disregarded on refresh, remain.
--- drivers/block/rbd.c | 142 +++++++++++++++++++++++++------------------- 1 file changed, 80 insertions(+), 62 deletions(-)
drivers/block/rbd.c +80 -62
@@ -5599,6 +5599,14 @@ struct parent_image_info {u64 overlap; }; +static void rbd_parent_info_cleanup (struct parent_image_info *pii) +{ +kfree (pii->pool_ns); +kfree (pii->image_id); + +memset (pii,0 ,sizeof (*pii)); +} +/* * The caller is responsible for @pii. */
@@ -5668,6 +5676,9 @@ static int __get_parent_info(struct rbd_device *rbd_dev,if (pii->has_overlap)ceph_decode_64_safe (&p, end, pii->overlap, e_inval); +dout ("%s pool_id %llu pool_ns %s image_id %s snap_id %llu has_overlap %d overlap %llu\n" , + __func__, pii->pool_id, pii->pool_ns, pii->image_id, pii->snap_id, + pii->has_overlap, pii->overlap);return 0 ; e_inval:
@@ -5706,14 +5717,17 @@ static int __get_parent_info_legacy(struct rbd_device *rbd_dev, pii->has_overlap = true;ceph_decode_64_safe (&p, end, pii->overlap, e_inval); +dout ("%s pool_id %llu pool_ns %s image_id %s snap_id %llu has_overlap %d overlap %llu\n" , + __func__, pii->pool_id, pii->pool_ns, pii->image_id, pii->snap_id, + pii->has_overlap, pii->overlap);return 0 ; e_inval:return -EINVAL ; } -static int get_parent_info (struct rbd_device *rbd_dev, -struct parent_image_info *pii) +static int rbd_dev_v2_parent_info (struct rbd_device *rbd_dev, +struct parent_image_info *pii) {struct page *req_page, *reply_page;void *p;
@@ -5741,7 +5755,7 @@ static int get_parent_info(struct rbd_device *rbd_dev,return ret; } -static int rbd_dev_v2_parent_info (struct rbd_device *rbd_dev) +static int rbd_dev_setup_parent (struct rbd_device *rbd_dev) {struct rbd_spec *parent_spec;struct parent_image_info pii = {0 };
@@ -5751,37 +5765,12 @@ static int rbd_dev_v2_parent_info(struct rbd_device *rbd_dev)if (!parent_spec)return -ENOMEM ; - ret =get_parent_info (rbd_dev, &pii); + ret =rbd_dev_v2_parent_info (rbd_dev, &pii);if (ret) goto out_err; -dout ("%s pool_id %llu pool_ns %s image_id %s snap_id %llu has_overlap %d overlap %llu\n" , - __func__, pii.pool_id, pii.pool_ns, pii.image_id, pii.snap_id, - pii.has_overlap, pii.overlap); - -if (pii.pool_id ==CEPH_NOPOOL || !pii.has_overlap) { -/* -* Either the parent never existed, or we have -* record of it but the image got flattened so it no -* longer has a parent. When the parent of a -* layered image disappears we immediately set the -* overlap to 0. The effect of this is that all new -* requests will be treated as if the image had no -* parent. -* -* If !pii.has_overlap, the parent image spec is not -* applicable. It's there to avoid duplication in each -* snapshot record. -*/ -if (rbd_dev->parent_overlap) { - rbd_dev->parent_overlap =0 ; -rbd_dev_parent_put (rbd_dev); -pr_info ("%s: clone image has been flattened\n" , - rbd_dev->disk->disk_name); - } - +if (pii.pool_id ==CEPH_NOPOOL || !pii.has_overlap) goto out;/* No parent? No problem. */ - }/* The ceph file layout needs to fit pool id in 32 bits */
@@ -5793,46 +5782,34 @@ static int rbd_dev_v2_parent_info(struct rbd_device *rbd_dev) }/* -* The parent won't change (except when the clone is -* flattened, already handled that). So we only need to -* record the parent spec we have not already done so. +* The parent won't change except when the clone is flattened, +* so we only need to record the parent image spec once. */ -if (!rbd_dev->parent_spec) { - parent_spec->pool_id = pii.pool_id; -if (pii.pool_ns && *pii.pool_ns) { - parent_spec->pool_ns = pii.pool_ns; - pii.pool_ns =NULL ; - } - parent_spec->image_id = pii.image_id; - pii.image_id =NULL ; - parent_spec->snap_id = pii.snap_id; - - rbd_dev->parent_spec = parent_spec; - parent_spec =NULL ;/* rbd_dev now owns this */ + parent_spec->pool_id = pii.pool_id; +if (pii.pool_ns && *pii.pool_ns) { + parent_spec->pool_ns = pii.pool_ns; + pii.pool_ns =NULL ; } + parent_spec->image_id = pii.image_id; + pii.image_id =NULL ; + parent_spec->snap_id = pii.snap_id; + +rbd_assert (!rbd_dev->parent_spec); + rbd_dev->parent_spec = parent_spec; + parent_spec =NULL ;/* rbd_dev now owns this */ /* -* We always update the parent overlap. If it's zero we issue -* a warning, as we will proceed as if there was no parent. +* Record the parent overlap. If it's zero, issue a warning as +* we will proceed as if there is no parent. */ -if (!pii.overlap) { -if (parent_spec) { -/* refresh, careful to warn just once */ -if (rbd_dev->parent_overlap) -rbd_warn (rbd_dev, -"clone now standalone (overlap became 0)" ); - }else { -/* initial probe */ -rbd_warn (rbd_dev,"clone is standalone (overlap 0)" ); - } - } +if (!pii.overlap) +rbd_warn (rbd_dev,"clone is standalone (overlap 0)" ); rbd_dev->parent_overlap = pii.overlap; out: ret =0 ; out_err: -kfree (pii.pool_ns); -kfree (pii.image_id); +rbd_parent_info_cleanup (&pii);rbd_spec_put (parent_spec);return ret; }
@@ -6981,7 +6958,7 @@ static int rbd_dev_image_probe(struct rbd_device *rbd_dev, int depth) }if (rbd_dev->header.features &RBD_FEATURE_LAYERING ) { - ret =rbd_dev_v2_parent_info (rbd_dev); + ret =rbd_dev_setup_parent (rbd_dev);if (ret) goto err_out_probe; }
@@ -7030,9 +7007,47 @@ static void rbd_dev_update_header(struct rbd_device *rbd_dev, } } +static void rbd_dev_update_parent (struct rbd_device *rbd_dev, +struct parent_image_info *pii) +{ +if (pii->pool_id ==CEPH_NOPOOL || !pii->has_overlap) { +/* +* Either the parent never existed, or we have +* record of it but the image got flattened so it no +* longer has a parent. When the parent of a +* layered image disappears we immediately set the +* overlap to 0. The effect of this is that all new +* requests will be treated as if the image had no +* parent. +* +* If !pii.has_overlap, the parent image spec is not +* applicable. It's there to avoid duplication in each +* snapshot record. +*/ +if (rbd_dev->parent_overlap) { + rbd_dev->parent_overlap =0 ; +rbd_dev_parent_put (rbd_dev); +pr_info ("%s: clone has been flattened\n" , + rbd_dev->disk->disk_name); + } + }else { +rbd_assert (rbd_dev->parent_spec); + +/* +* Update the parent overlap. If it became zero, issue +* a warning as we will proceed as if there is no parent. +*/ +if (!pii->overlap && rbd_dev->parent_overlap) +rbd_warn (rbd_dev, +"clone has become standalone (overlap 0)" ); + rbd_dev->parent_overlap = pii->overlap; + } +} +static int rbd_dev_refresh (struct rbd_device *rbd_dev) {struct rbd_image_header header = {0 }; +struct parent_image_info pii = {0 };u64 mapping_size;int ret;
@@ -7048,12 +7063,14 @@ static int rbd_dev_refresh(struct rbd_device *rbd_dev)* mapped image getting flattened. */ if (rbd_dev->parent) { - ret =rbd_dev_v2_parent_info (rbd_dev); + ret =rbd_dev_v2_parent_info (rbd_dev, &pii);if (ret) goto out; }rbd_dev_update_header (rbd_dev, &header); +if (rbd_dev->parent) +rbd_dev_update_parent (rbd_dev, &pii);rbd_assert (!rbd_is_snap (rbd_dev)); rbd_dev->mapping.size = rbd_dev->header.image_size;
@@ -7063,6 +7080,7 @@ static int rbd_dev_refresh(struct rbd_device *rbd_dev)if (!ret && mapping_size != rbd_dev->mapping.size)rbd_dev_update_size (rbd_dev); +rbd_parent_info_cleanup (&pii);rbd_image_header_cleanup (&header);return ret; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 16/75 rbd: take header_rwsem in rbd_dev_refresh() only when updating
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilya Dryomov <[email protected]>
commit 0b207d02bd9ab8dcc31b262ca9f60dbc1822500d upstream.
rbd_dev_refresh() has been holding header_rwsem across header and parent info read-in unnecessarily for ages. With commit 870611e4877e ("rbd: get snapshot context after exclusive lock is ensured to be held"), the potential for deadlocks became much more real owning to
a) header_rwsem now nesting inside lock_rwsem and b) rw_semaphores not allowing new readers after a writer is registered.
For example, assuming that I/O request 1, I/O request 2 and header read-in request all target the same OSD:
1. I/O request 1 comes in and gets submitted
2. watch error occurs
3. rbd_watch_errcb() takes lock_rwsem for write, clears owner_cid and releases lock_rwsem
4. after reestablishing the watch, rbd_reregister_watch() calls rbd_dev_refresh() which takes header_rwsem for write and submits a header read-in request
5. I/O request 2 comes in: after taking lock_rwsem for read in __rbd_img_handle_request(), it blocks trying to take header_rwsem for read in rbd_img_object_requests()
6. another watch error occurs
7. rbd_watch_errcb() blocks trying to take lock_rwsem for write
8. I/O request 1 completion is received by the messenger but can't be processed because lock_rwsem won't be granted anymore
9. header read-in request completion can't be received, let alone processed, because the messenger is stranded
Change rbd_dev_refresh() to take header_rwsem only for actually updating rbd_dev->header. Header and parent info read-in don't need any locking.
--- drivers/block/rbd.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
drivers/block/rbd.c +11 -11
@@ -6990,7 +6990,14 @@ static void rbd_dev_update_header(struct rbd_device *rbd_dev,rbd_assert (rbd_image_format_valid (rbd_dev->image_format));rbd_assert (rbd_dev->header.object_prefix);/* !first_time */ - rbd_dev->header.image_size = header->image_size; +if (rbd_dev->header.image_size != header->image_size) { + rbd_dev->header.image_size = header->image_size; + +if (!rbd_is_snap (rbd_dev)) { + rbd_dev->mapping.size = header->image_size; +rbd_dev_update_size (rbd_dev); + } + }ceph_put_snap_context (rbd_dev->header.snapc); rbd_dev->header.snapc = header->snapc;
@@ -7048,11 +7055,9 @@ static int rbd_dev_refresh(struct rbd_device *rbd_dev) {struct rbd_image_header header = {0 };struct parent_image_info pii = {0 }; -u64 mapping_size;int ret; -down_write (&rbd_dev->header_rwsem); - mapping_size = rbd_dev->mapping.size; +dout ("%s rbd_dev %p\n" , __func__, rbd_dev); ret =rbd_dev_header_info (rbd_dev, &header, false);if (ret)
@@ -7068,18 +7073,13 @@ static int rbd_dev_refresh(struct rbd_device *rbd_dev) goto out; } +down_write (&rbd_dev->header_rwsem);rbd_dev_update_header (rbd_dev, &header);if (rbd_dev->parent)rbd_dev_update_parent (rbd_dev, &pii); - -rbd_assert (!rbd_is_snap (rbd_dev)); - rbd_dev->mapping.size = rbd_dev->header.image_size; - -out:up_write (&rbd_dev->header_rwsem); -if (!ret && mapping_size != rbd_dev->mapping.size) -rbd_dev_update_size (rbd_dev); +out:rbd_parent_info_cleanup (&pii);rbd_image_header_cleanup (&header);return ret;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 17/75 block: fix use-after-free of q->q_usage_counter
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ming Lei <[email protected]>
commit d36a9ea5e7766961e753ee38d4c331bbe6ef659b upstream.
For blk-mq, queue release handler is usually called after blk_mq_freeze_queue_wait() returns. However, the q_usage_counter->release() handler may not be run yet at that time, so this can cause a use-after-free.
Fix the issue by moving percpu_ref_exit() into blk_free_queue_rcu(). Since ->release() is called with rcu read lock held, it is agreed that the race should be covered in caller per discussion from the two links.
--- block/blk-core.c | 2 -- block/blk-sysfs.c | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-)
block/blk-core.c +0 -2
@@ -405,8 +405,6 @@ void blk_cleanup_queue(struct request_qublk_mq_sched_free_requests (q);mutex_unlock (&q->sysfs_lock); -percpu_ref_exit (&q->q_usage_counter); -/* @q is and will stay empty, shutdown and put */ blk_put_queue (q); }
block/blk-sysfs.c +2 -0
@@ -748,6 +748,8 @@ static void blk_free_queue_rcu(struct rc { struct request_queue *q = container_of(rcu_head, struct request_queue, rcu_head); + +percpu_ref_exit (&q->q_usage_counter);kmem_cache_free (blk_requestq_cachep, q); }
Greg Kroah-Hartman
maintainerPATCH 18/75 Revert "clk: imx: pll14xx: dynamically configure PLL for 393216000/361267200Hz"
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
This reverts commit a8474506c9127048c058fdfe466ccbadf7524048 which is commit 72d00e560d10665e6139c9431956a87ded6e9880 upstream.
Marek writes:
The commit message states 'Cc: [email protected] # v5.18+' and the commit should only be applied to Linux 5.18.y and newer, on anything older it breaks PLL configuration due to missing prerequisite patches.
--- drivers/clk/imx/clk-pll14xx.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/clk/imx/clk-pll14xx.c +2 -0
@@ -60,6 +60,8 @@ static const struct imx_pll14xx_rate_tabPLL_1443X_RATE (650000000U ,325 ,3 ,2 ,0 ),PLL_1443X_RATE (594000000U ,198 ,2 ,2 ,0 ),PLL_1443X_RATE (519750000U ,173 ,2 ,2 ,16384 ), +PLL_1443X_RATE (393216000U ,262 ,2 ,3 ,9437 ), + PLL_1443X_RATE(361267200U, 361, 3, 3, 17511), }; struct imx_pll14xx_clk imx_1443x_pll = {
Greg Kroah-Hartman
maintainerPATCH 19/75 scsi: zfcp: Fix a double put in zfcp_port_enqueue()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dinghao Liu <[email protected]>
commit b481f644d9174670b385c3a699617052cd2a79d3 upstream.
When device_register() fails, zfcp_port_release() will be called after put_device(). As a result, zfcp_ccw_adapter_put() will be called twice: one in zfcp_port_release() and one in the error path after device_register(). So the reference on the adapter object is doubly put, which may lead to a premature free. Fix this by adjusting the error tag after device_register().
--- drivers/s390/scsi/zfcp_aux.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/s390/scsi/zfcp_aux.c +5 -4
@@ -518,12 +518,12 @@ struct zfcp_port *zfcp_port_enqueue(struif (port) {put_device (&port->dev); retval = -EEXIST ; - goto err_out; + goto err_put; } port =kzalloc (sizeof (struct zfcp_port ),GFP_KERNEL );if (!port) - goto err_out; + goto err_put;rwlock_init (&port->unit_list_lock);INIT_LIST_HEAD (&port->unit_list);
@@ -546,7 +546,7 @@ struct zfcp_port *zfcp_port_enqueue(struif (dev_set_name (&port->dev,"0x%016llx" , (unsigned long long )wwpn)) {kfree (port); - goto err_out; + goto err_put; } retval = -EINVAL ;
@@ -563,7 +563,8 @@ struct zfcp_port *zfcp_port_enqueue(strureturn port; -err_out: +err_put:zfcp_ccw_adapter_put (adapter); +err_out:return ERR_PTR (retval); }
Greg Kroah-Hartman
maintainerPATCH 20/75 vringh: dont use vringh_kiov_advance() in vringh_iov_xfer()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stefano Garzarella <[email protected]>
commit 7aed44babc7f97e82b38e9a68515e699692cc100 upstream.
In the while loop of vringh_iov_xfer(), partlen could be 0 if one of the iov has 0 lenght.
In this case, we should skip the iov and go to the next one. But calling vringh_kiov_advance() with 0 lenght does not cause the advancement, since it returns immediately if asked to advance by 0 bytes.
Let's restore the code that was there before commit b8c06ad4d67d ("vringh: implement vringh_kiov_advance()"), avoiding using vringh_kiov_advance().
--- drivers/vhost/vringh.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
drivers/vhost/vringh.c +11 -1
@@ -123,8 +123,18 @@ static inline ssize_t vringh_iov_xfer(st done += partlen; len -= partlen; ptr += partlen; + iov->consumed += partlen; + iov->iov[iov->i].iov_len -= partlen; + iov->iov[iov->i].iov_base += partlen; -vringh_kiov_advance (iov, partlen); +if (!iov->iov[iov->i].iov_len) { +/* Fix up old iov element then increment. */ + iov->iov[iov->i].iov_len = iov->consumed; + iov->iov[iov->i].iov_base -= iov->consumed; + + iov->consumed =0 ; + iov->i++; + } }return done; }
Greg Kroah-Hartman
maintainerPATCH 21/75 qed/red_ll2: Fix undefined behavior bug in struct qed_ll2_info
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gustavo A. R. Silva <[email protected]>
commit eea03d18af9c44235865a4bc9bec4d780ef6cf21 upstream.
The flexible structure (a structure that contains a flexible-array member at the end) qed_ll2_tx_packet is nested within the second layer of struct qed_ll2_info:
struct qed_ll2_tx_packet {
...
/* Flexible Array of bds_set determined by max_bds_per_packet */
struct {
struct core_tx_bd *txq_bd;
dma_addr_t tx_frag;
u16 frag_len;
} bds_set[];
};struct qed_ll2_tx_queue {
...
struct qed_ll2_tx_packet cur_completing_packet;
};struct qed_ll2_info {
...
struct qed_ll2_tx_queue tx_queue;
struct qed_ll2_cbs cbs;
};The problem is that member cbs in struct qed_ll2_info is placed just after an object of type struct qed_ll2_tx_queue, which is in itself an implicit flexible structure, which by definition ends in a flexible array member, in this case bds_set. This causes an undefined behavior bug at run-time when dynamic memory is allocated for bds_set, which could lead to a serious issue if cbs in struct qed_ll2_info is overwritten by the contents of bds_set. Notice that the type of cbs is a structure full of function pointers (and a cookie :) ):
include/linux/qed/qed_ll2_if.h:
107 typedef
108 void (*qed_ll2_complete_rx_packet_cb)(void *cxt,
109 struct qed_ll2_comp_rx_data *data);
110
111 typedef
112 void (*qed_ll2_release_rx_packet_cb)(void *cxt,
113 u8 connection_handle, 114 void *cookie, 115 dma_addr_t rx_buf_addr, 116 bool b_last_packet); 117 118 typedef 119 void (*qed_ll2_complete_tx_packet_cb)(void *cxt, 120 u8 connection_handle, 121 void *cookie, 122 dma_addr_t first_frag_addr, 123 bool b_last_fragment, 124 bool b_last_packet); 125 126 typedef 127 void (*qed_ll2_release_tx_packet_cb)(void *cxt, 128 u8 connection_handle, 129 void *cookie, 130 dma_addr_t first_frag_addr, 131 bool b_last_fragment, bool b_last_packet);
132
133 typedef
134 void (*qed_ll2_slowpath_cb)(void *cxt, u8 connection_handle,
135 u32 opaque_data_0, u32 opaque_data_1);
136
137 struct qed_ll2_cbs {
138 qed_ll2_complete_rx_packet_cb rx_comp_cb; 139 qed_ll2_release_rx_packet_cb rx_release_cb; 140 qed_ll2_complete_tx_packet_cb tx_comp_cb; 141 qed_ll2_release_tx_packet_cb tx_release_cb; 142 qed_ll2_slowpath_cb slowpath_cb; 143 void *cookie;
144 };
Fix this by moving the declaration of cbs to the middle of its containing structure qed_ll2_info, preventing it from being overwritten by the contents of bds_set at run-time.
This bug was introduced in 2017, when bds_set was converted to a one-element array, and started to be used as a Variable Length Object (VLO) at run-time.
--- drivers/net/ethernet/qlogic/qed/qed_ll2.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/qlogic/qed/qed_ll2.h +1 -1
@@ -111,9 +111,9 @@ struct qed_ll2_info {enum core_tx_dest tx_dest;u8 tx_stats_en;bool main_func_queue; +struct qed_ll2_cbs cbs;struct qed_ll2_rx_queue rx_queue;struct qed_ll2_tx_queue tx_queue; -struct qed_ll2_cbs cbs; };extern const struct qed_ll2_ops qed_ll2_ops_pass;
Greg Kroah-Hartman
maintainerPATCH 22/75 wifi: mwifiex: Fix tlv_buf_left calculation
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gustavo A. R. Silva <[email protected]>
commit eec679e4ac5f47507774956fb3479c206e761af7 upstream.
In a TLV encoding scheme, the Length part represents the length after the header containing the values for type and length. In this case, tlv_len should be:
tlv_len == (sizeof(*tlv_rxba) - 1) - sizeof(tlv_rxba->header) + tlv_bitmap_len
Notice that the - 1 accounts for the one-element array bitmap, which 1-byte size is already included in sizeof(*tlv_rxba).
So, if the above is correct, there is a double-counting of some members in struct mwifiex_ie_types_rxba_sync, when tlv_buf_left and tmp are calculated:
968 tlv_buf_left -= (sizeof(*tlv_rxba) + tlv_len);
969 tmp = (u8 *)tlv_rxba + tlv_len + sizeof(*tlv_rxba);
in specific, members:
drivers/net/wireless/marvell/mwifiex/fw.h:777
777 u8 mac[ETH_ALEN]; 778 u8 tid; 779 u8 reserved; 780 __le16 seq_num; 781 __le16 bitmap_len;
This is clearly wrong, and affects the subsequent decoding of data in event_buf through tlv_rxba:
970 tlv_rxba = (struct mwifiex_ie_types_rxba_sync *)tmp;
Fix this by using sizeof(tlv_rxba->header) instead of sizeof(*tlv_rxba) in the calculation of tlv_buf_left and tmp.
This results in the following binary differences before/after changes:
| drivers/net/wireless/marvell/mwifiex/11n_rxreorder.o | @@ -4698,11 +4698,11 @@ | drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c:968 | tlv_buf_left -= (sizeof(tlv_rxba->header) + tlv_len); | - 1da7: lea -0x11(%rbx),%edx | + 1da7: lea -0x4(%rbx),%edx | 1daa: movzwl %bp,%eax | drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c:969 | tmp = (u8 *)tlv_rxba + sizeof(tlv_rxba->header) + tlv_len; | - 1dad: lea 0x11(%r15,%rbp,1),%r15 | + 1dad: lea 0x4(%r15,%rbp,1),%r15
The above reflects the desired change: avoid counting 13 too many bytes; which is the total size of the double-counted members in struct mwifiex_ie_types_rxba_sync:
$ pahole -C mwifiex_ie_types_rxba_sync drivers/net/wireless/marvell/mwifiex/11n_rxreorder.o
struct mwifiex_ie_types_rxba_sync {
struct mwifiex_ie_types_header header; /* 0 4 */ |-----------------------------------------------------------------------
| u8 mac[6]; /* 4 6 */ |
| u8 tid; /* 10 1 */ |
| u8 reserved; /* 11 1 */ |
| __le16 seq_num; /* 12 2 */ |
| __le16 bitmap_len; /* 14 2 */ |
| u8 bitmap[1]; /* 16 1 */ |
|----------------------------------------------------------------------|
| 13 bytes|
-----------
/* size: 17, cachelines: 1, members: 7 */
/* last cacheline: 17 bytes */
} __attribute__((__packed__));--- drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c +2 -2
@@ -977,8 +977,8 @@ void mwifiex_11n_rxba_sync_event(struct } } - tlv_buf_left -= (sizeof (*tlv_rxba) + tlv_len); - tmp = (u8 *)tlv_rxba + tlv_len +sizeof (*tlv_rxba); + tlv_buf_left -= (sizeof (tlv_rxba->header) + tlv_len); + tmp = (u8 *)tlv_rxba +sizeof (tlv_rxba->header) + tlv_len; tlv_rxba = (struct mwifiex_ie_types_rxba_sync *)tmp; } }
Greg Kroah-Hartman
maintainerPATCH 23/75 net: replace calls to sock->ops->connect() with kernel_connect()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jordan Rife <[email protected]>
commit 26297b4ce1ce4ea40bc9a48ec99f45da3f64d2e2 upstream.
commit 0bdf399342c5 ("net: Avoid address overwrite in kernel_connect") ensured that kernel_connect() will not overwrite the address parameter in cases where BPF connect hooks perform an address rewrite. This change replaces direct calls to sock->ops->connect() in net with kernel_connect() to make these call safe.
--- net/netfilter/ipvs/ip_vs_sync.c | 4 ++-- net/rds/tcp_connect.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
net/netfilter/ipvs/ip_vs_sync.c +2 -2
@@ -1507,8 +1507,8 @@ static int make_send_sock(struct netns_i }get_mcast_sockaddr (&mcast_addr, &salen, &ipvs->mcfg, id); - result = sock->ops->connect (sock, (struct sockaddr *) &mcast_addr, - salen,0 ); + result =kernel_connect (sock, (struct sockaddr *)&mcast_addr, + salen,0 );if (result <0 ) {pr_err ("Error connecting to the multicast addr\n" ); goto error;
net/rds/tcp_connect.c +1 -1
@@ -170,7 +170,7 @@ int rds_tcp_conn_path_connect(struct rds* own the socket */ rds_tcp_set_callbacks (sock, cp); - ret = sock->ops->connect (sock, addr, addrlen,O_NONBLOCK ); + ret =kernel_connect (sock, addr, addrlen,O_NONBLOCK );rdsdebug ("connect to address %pI6c returned %d\n" , &conn->c_faddr, ret);if (ret == -EINPROGRESS )
Greg Kroah-Hartman
maintainerPATCH 24/75 btrfs: reject unknown mount options early
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qu Wenruo <[email protected]>
commit 5f521494cc73520ffac18ede0758883b9aedd018 upstream.
[BUG]
The following script would allow invalid mount options to be specified (although such invalid options would just be ignored):
# mkfs.btrfs -f $dev # mount $dev $mnt1 <<< Successful mount expected # mount $dev $mnt2 -o junk <<< Failed mount expected # echo $? 0
[CAUSE]
For the 2nd mount, since the fs is already mounted, we won't go through open_ctree() thus no btrfs_parse_options(), but only through btrfs_parse_subvol_options().
However we do not treat unrecognized options from valid but irrelevant options, thus those invalid options would just be ignored by btrfs_parse_subvol_options().
[FIX]
Add the handling for Opt_err to handle invalid options and error out, while still ignore other valid options inside btrfs_parse_subvol_options().
--- fs/btrfs/super.c | 4 ++++ 1 file changed, 4 insertions(+)
fs/btrfs/super.c +4 -0
@@ -1182,6 +1182,10 @@ static int btrfs_parse_subvol_options(co *subvol_objectid = subvolid;break ; +case Opt_err: +btrfs_err (NULL ,"unrecognized mount option '%s'" , p); + error = -EINVAL ; + goto out;default :break ; }
Greg Kroah-Hartman
maintainerPATCH 25/75 net: prevent rewrite of msg_name in sock_sendmsg()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jordan Rife <[email protected]>
commit 86a7e0b69bd5b812e48a20c66c2161744f3caa16 upstream.
Callers of sock_sendmsg(), and similarly kernel_sendmsg(), in kernel space may observe their value of msg_name change in cases where BPF sendmsg hooks rewrite the send address. This has been confirmed to break NFS mounts running in UDP mode and has the potential to break other systems.
This patch:
1) Creates a new function called __sock_sendmsg() with same logic as the old sock_sendmsg() function.
2) Replaces calls to sock_sendmsg() made by __sys_sendto() and __sys_sendmsg() with __sock_sendmsg() to avoid an unnecessary copy, as these system calls are already protected.
3) Modifies sock_sendmsg() so that it makes a copy of msg_name if present before passing it down the stack to insulate callers from changes to the send address.
--- net/socket.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-)
net/socket.c +23 -6
@@ -708,6 +708,14 @@ static inline int sock_sendmsg_nosec(strreturn ret; } +static int __sock_sendmsg (struct socket *sock,struct msghdr *msg) +{ +int err =security_socket_sendmsg (sock, msg, +msg_data_left (msg)); + +return err ?:sock_sendmsg_nosec (sock, msg); +} +/** * sock_sendmsg - send a message through @sock * @sock: socket
@@ -718,10 +726,19 @@ static inline int sock_sendmsg_nosec(str*/ int sock_sendmsg (struct socket *sock,struct msghdr *msg) { -int err =security_socket_sendmsg (sock, msg, -msg_data_left (msg)); +struct sockaddr_storage *save_addr = (struct sockaddr_storage *)msg->msg_name; +struct sockaddr_storage address; +int ret; -return err ?:sock_sendmsg_nosec (sock, msg); +if (msg->msg_name) { +memcpy (&address, msg->msg_name, msg->msg_namelen); + msg->msg_name = &address; + } + + ret =__sock_sendmsg (sock, msg); + msg->msg_name = save_addr; + +return ret; }EXPORT_SYMBOL (sock_sendmsg);
@@ -1057,7 +1074,7 @@ static ssize_t sock_write_iter(struct kiif (sock->type ==SOCK_SEQPACKET ) msg.msg_flags |=MSG_EOR ; - res =sock_sendmsg (sock, &msg); + res =__sock_sendmsg (sock, &msg); *from = msg.msg_iter;return res; }
@@ -2036,7 +2053,7 @@ int __sys_sendto(int fd, void __user *buif (sock->file->f_flags &O_NONBLOCK ) flags |=MSG_DONTWAIT ; msg.msg_flags = flags; - err =sock_sendmsg (sock, &msg); + err =__sock_sendmsg (sock, &msg); out_put:fput_light (sock->file, fput_needed);
@@ -2409,7 +2426,7 @@ static int ____sys_sendmsg(struct socket err =sock_sendmsg_nosec (sock, msg_sys); goto out_freectl; } - err =sock_sendmsg (sock, msg_sys); + err =__sock_sendmsg (sock, msg_sys);/* * If this is sendmmsg() and sending to current destination address was * successful, remember it.
Greg Kroah-Hartman
maintainerPATCH 26/75 drm/amd: Fix detection of _PR3 on the PCIe root port
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mario Limonciello <[email protected]>
commit 134b8c5d8674e7cde380f82e9aedfd46dcdd16f7 upstream.
On some systems with Navi3x dGPU will attempt to use BACO for runtime PM but fails to resume properly. This is because on these systems the root port goes into D3cold which is incompatible with BACO.
This happens because in this case dGPU is connected to a bridge between root port which causes BOCO detection logic to fail. Fix the intent of the logic by looking at root port, not the immediate upstream bridge for _PR3.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1 -1
@@ -2225,7 +2225,7 @@ static int amdgpu_device_ip_early_init(s adev->flags |=AMD_IS_PX ;if (!(adev->flags &AMD_IS_APU )) { - parent =pci_upstream_bridge (adev->pdev); + parent =pcie_find_root_port (adev->pdev); adev->has_pr3 = parent ?pci_pr3_present (parent) : false; }
Greg Kroah-Hartman
maintainerPATCH 27/75 arm64: Add Cortex-A520 CPU part definition
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rob Herring <[email protected]>
commit a654a69b9f9c06b2e56387d0b99f0e3e6b0ff4ef upstream.
Add the CPU Part number for the new Arm design.
--- arch/arm64/include/asm/cputype.h | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/include/asm/cputype.h +2 -0
@@ -79,6 +79,7 @@#define ARM_CPU_PART_CORTEX_A78AE 0xD42#define ARM_CPU_PART_CORTEX_X1 0xD44#define ARM_CPU_PART_CORTEX_A510 0xD46 +#define ARM_CPU_PART_CORTEX_A520 0xD80#define ARM_CPU_PART_CORTEX_A710 0xD47#define ARM_CPU_PART_CORTEX_X2 0xD48#define ARM_CPU_PART_NEOVERSE_N2 0xD49
@@ -130,6 +131,7 @@#define MIDR_CORTEX_A78AE MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A78AE)#define MIDR_CORTEX_X1 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_X1)#define MIDR_CORTEX_A510 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A510) +#define MIDR_CORTEX_A520 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A520)#define MIDR_CORTEX_A710 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A710)#define MIDR_CORTEX_X2 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_X2)#define MIDR_NEOVERSE_N2 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_NEOVERSE_N2)
Greg Kroah-Hartman
maintainerPATCH 28/75 HID: sony: Fix a potential memory leak in sony_probe()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christophe JAILLET <[email protected]>
[ Upstream commit e1cd4004cde7c9b694bbdd8def0e02288ee58c74 ]
If an error occurs after a successful usb_alloc_urb() call, usb_free_urb() should be called.
--- drivers/hid/hid-sony.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/hid/hid-sony.c +3 -0
@@ -3074,6 +3074,9 @@ static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id)return ret; err: +if (sc->ghl_urb) +usb_free_urb (sc->ghl_urb); +hid_hw_stop (hdev);return ret; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 29/75 ubi: Refuse attaching if mtds erasesize is 0
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhihao Cheng <[email protected]>
[ Upstream commit 017c73a34a661a861712f7cc1393a123e5b2208c ]
There exists mtd devices with zero erasesize, which will trigger a divide-by-zero exception while attaching ubi device. Fix it by refusing attaching if mtd's erasesize is 0.
--- drivers/mtd/ubi/build.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/mtd/ubi/build.c +7 -0
@@ -888,6 +888,13 @@ int ubi_attach_mtd_dev(struct mtd_info *mtd, int ubi_num,return -EINVAL ; } +/* UBI cannot work on flashes with zero erasesize. */ +if (!mtd->erasesize) { +pr_err ("ubi: refuse attaching mtd%d - zero erasesize flash is not supported\n" , + mtd->index); +return -EINVAL ; + } +if (ubi_num ==UBI_DEV_NUM_AUTO ) {/* Search for an empty slot in the @ubi_devices array */ for (ubi_num =0 ; ubi_num <UBI_MAX_DEVICES ; ubi_num++)
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 30/75 wifi: iwlwifi: dbg_ini: fix structure packing
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
[ Upstream commit 424c82e8ad56756bb98b08268ffcf68d12d183eb ]
The iwl_fw_ini_error_dump_range structure has conflicting alignment requirements for the inner union and the outer struct:
In file included from drivers/net/wireless/intel/iwlwifi/fw/dbg.c:9:drivers/net/wireless/intel/iwlwifi/fw/error-dump.h:312:2: error: field within 'struct iwl_fw_ini_error_dump_range' is less aligned than 'union iwl_fw_ini_error_dump_range::(anonymous at drivers/net/wireless/intel/iwlwifi/fw/error-dump.h:312:2)' and is usually due to 'struct iwl_fw_ini_error_dump_range' being packed, which can lead to unaligned accesses [-Werror,-Wunaligned-access]
union {As the original intention was apparently to make the entire structure unaligned, mark the innermost members the same way so the union becomes packed as well.
--- drivers/net/wireless/intel/iwlwifi/fw/error-dump.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireless/intel/iwlwifi/fw/error-dump.h +3 -3
@@ -277,9 +277,9 @@ struct iwl_fw_ini_fifo_hdr {struct iwl_fw_ini_error_dump_range {__le32 range_data_size;union { -__le32 internal_base_addr; -__le64 dram_base_addr; -__le32 page_num; + __le32 internal_base_addr __packed; + __le64 dram_base_addr __packed; + __le32 page_num __packed;struct iwl_fw_ini_fifo_hdr fifo_hdr;struct iwl_cmd_header fw_pkt_hdr; };
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 31/75 iwlwifi: avoid void pointer arithmetic
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
[ Upstream commit 3827cb59b3b8ce4b1687385d35034dadcd90d7ce ]
Avoid void pointer arithmetic since it's technically undefined and causes warnings in some places that use our code.
Stable-dep-of: 8ba438ef3cac ("wifi: iwlwifi: mvm: Fix a memory corruption issue")
--- drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 4 ++-- drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 4 ++-- drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 2 +- drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 2 +- drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 2 +- drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 2 +- drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 2 +- drivers/net/wireless/intel/iwlwifi/queue/tx.c | 6 +++--- drivers/net/wireless/intel/iwlwifi/queue/tx.h | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-)
drivers/net/wireless/intel/iwlwifi/fw/dbg.c +1 -1
@@ -1960,7 +1960,7 @@ static u32 iwl_dump_ini_mem(struct iwl_fw_runtime *fwrt, struct list_head *list,struct iwl_fw_ini_error_dump_header *header;u32 type =le32_to_cpu (reg->type), id =le32_to_cpu (reg->id);u32 num_of_ranges, i, size; -void *range; +u8 *range;/* * The higher part of the ID in version 2 is irrelevant for
drivers/net/wireless/intel/iwlwifi/mvm/d3.c +1 -1
@@ -1090,7 +1090,7 @@ static int iwl_mvm_wowlan_config_key_params(struct iwl_mvm *mvm,sizeof (struct iwl_wowlan_kek_kck_material_cmd_v2 );/* skip the sta_id at the beginning */ _kek_kck_cmd = (void *) - ((u8 *)_kek_kck_cmd) +sizeof (kek_kck_cmd.sta_id); + ((u8 *)_kek_kck_cmd +sizeof (kek_kck_cmd.sta_id)); } IWL_DEBUG_WOWLAN(mvm, "setting akm %d\n",
drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c +1 -1
@@ -1950,7 +1950,7 @@ static ssize_t iwl_dbgfs_mem_read(struct file *file, char __user *user_buf, goto out; } - ret = len -copy_to_user (user_buf, (void *)rsp->data + delta, len); + ret = len -copy_to_user (user_buf, (u8 *)rsp->data + delta, len); *ppos += ret; out:
drivers/net/wireless/intel/iwlwifi/mvm/fw.c +1 -1
@@ -686,7 +686,7 @@ int iwl_run_init_mvm_ucode(struct iwl_mvm *mvm) mvm->nvm_data->bands[0 ].n_channels =1 ; mvm->nvm_data->bands[0 ].n_bitrates =1 ; mvm->nvm_data->bands[0 ].bitrates = - (void *)mvm->nvm_data->channels +1 ; + (void *)((u8 *)mvm->nvm_data->channels +1 ); mvm->nvm_data->bands[0 ].bitrates->hw_value =10 ; }
drivers/net/wireless/intel/iwlwifi/mvm/rx.c +2 -2
@@ -83,8 +83,8 @@ static void iwl_mvm_pass_packet_to_mac80211(struct iwl_mvm *mvm, fraglen = len - hdrlen;if (fraglen) { -int offset = (void *)hdr + hdrlen - -rxb_addr (rxb) +rxb_offset (rxb); +int offset = (u8 *)hdr + hdrlen - + (u8 *)rxb_addr (rxb) +rxb_offset (rxb);skb_add_rx_frag (skb,0 ,rxb_steal_page (rxb), offset, fraglen, rxb->truesize);
drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c +2 -2
@@ -220,8 +220,8 @@ static int iwl_mvm_create_skb(struct iwl_mvm *mvm, struct sk_buff *skb, fraglen = len - headlen;if (fraglen) { -int offset = (void *)hdr + headlen + pad_len - -rxb_addr (rxb) +rxb_offset (rxb); +int offset = (u8 *)hdr + headlen + pad_len - + (u8 *)rxb_addr (rxb) +rxb_offset (rxb);skb_add_rx_frag (skb,0 ,rxb_steal_page (rxb), offset, fraglen, rxb->truesize);
drivers/net/wireless/intel/iwlwifi/mvm/scan.c +1 -1
@@ -2150,7 +2150,7 @@ static int iwl_mvm_scan_umac(struct iwl_mvm *mvm, struct ieee80211_vif *vif,struct iwl_scan_req_umac *cmd = mvm->scan_cmd;struct iwl_scan_umac_chan_param *chan_param;void *cmd_data =iwl_mvm_get_scan_req_umac_data (mvm); -void *sec_part = cmd_data +sizeof (struct iwl_scan_channel_cfg_umac ) * +void *sec_part = (u8 *)cmd_data +sizeof (struct iwl_scan_channel_cfg_umac ) * mvm->fw->ucode_capa.n_scan_channels;struct iwl_scan_req_umac_tail_v2 *tail_v2 = (struct iwl_scan_req_umac_tail_v2 *)sec_part;
drivers/net/wireless/intel/iwlwifi/pcie/internal.h +1 -1
@@ -363,7 +363,7 @@ struct iwl_trans_pcie {/* PCI bus related data */ struct pci_dev *pci_dev; -void __iomem *hw_base; +u8 __iomem *hw_base;bool ucode_write_complete;bool sx_complete;
drivers/net/wireless/intel/iwlwifi/pcie/rx.c +1 -1
@@ -727,7 +727,7 @@ static int iwl_pcie_alloc_rxq_dma(struct iwl_trans *trans, goto err; } - rxq->rb_stts = trans_pcie->base_rb_stts + rxq->id * rb_stts_size; + rxq->rb_stts = (u8 *)trans_pcie->base_rb_stts + rxq->id * rb_stts_size; rxq->rb_stts_dma = trans_pcie->base_rb_stts_dma + rxq->id * rb_stts_size;
drivers/net/wireless/intel/iwlwifi/pcie/trans.c +1 -1
@@ -2798,7 +2798,7 @@ static ssize_t iwl_dbgfs_monitor_data_read(struct file *file, {struct iwl_trans *trans = file->private_data;struct iwl_trans_pcie *trans_pcie =IWL_TRANS_GET_PCIE_TRANS (trans); -void *cpu_addr = (void *)trans->dbg.fw_mon.block, *curr_buf; +u8 *cpu_addr = (void *)trans->dbg.fw_mon.block, *curr_buf;struct cont_rec *data = &trans_pcie->fw_mon_data;u32 write_ptr_addr, wrap_cnt_addr, write_ptr, wrap_cnt;ssize_t size, bytes_copied =0 ;
drivers/net/wireless/intel/iwlwifi/pcie/tx.c +1 -1
@@ -154,7 +154,7 @@ static int iwl_pcie_txq_build_tfd(struct iwl_trans *trans, struct iwl_txq *txq,void *tfd;u32 num_tbs; - tfd = txq->tfds + trans->txqs.tfd.size * txq->write_ptr; + tfd = (u8 *)txq->tfds + trans->txqs.tfd.size * txq->write_ptr;if (reset)memset (tfd,0 , trans->txqs.tfd.size);
drivers/net/wireless/intel/iwlwifi/queue/tx.c +3 -3
@@ -189,7 +189,7 @@ static struct page *get_workaround_page(struct iwl_trans *trans,return NULL ;/* set the chaining pointer to the previous page if there */ - *(void **)(page_address (ret) +PAGE_SIZE -sizeof (void *)) = *page_ptr; + *(void **)((u8 *)page_address (ret) +PAGE_SIZE -sizeof (void *)) = *page_ptr; *page_ptr = ret;return ret;
@@ -314,7 +314,7 @@ struct iwl_tso_hdr_page *get_page_hdr(struct iwl_trans *trans, size_t len,return NULL ; p->pos =page_address (p->page);/* set the chaining pointer to NULL */ - *(void **)(page_address (p->page) +PAGE_SIZE -sizeof (void *)) =NULL ; + *(void **)((u8 *)page_address (p->page) +PAGE_SIZE -sizeof (void *)) =NULL ; out: *page_ptr = p->page;get_page (p->page);
@@ -963,7 +963,7 @@ void iwl_txq_free_tso_page(struct iwl_trans *trans, struct sk_buff *skb)while (next) {struct page *tmp = next; - next = *(void **)(page_address (next) +PAGE_SIZE - + next = *(void **)((u8 *)page_address (next) +PAGE_SIZE -sizeof (void *));__free_page (tmp); }
drivers/net/wireless/intel/iwlwifi/queue/tx.h +1 -1
@@ -41,7 +41,7 @@ static inline void *iwl_txq_get_tfd(struct iwl_trans *trans,if (trans->trans_cfg->use_tfh) idx =iwl_txq_get_cmd_index (txq, idx); -return txq->tfds + trans->txqs.tfd.size * idx; +return (u8 *)txq->tfds + trans->txqs.tfd.size * idx; } int iwl_txq_alloc(struct iwl_trans *trans, struct iwl_txq *txq, int slots_num,
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 32/75 wifi: iwlwifi: mvm: Fix a memory corruption issue
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christophe JAILLET <[email protected]>
[ Upstream commit 8ba438ef3cacc4808a63ed0ce24d4f0942cfe55d ]
A few lines above, space is kzalloc()'ed for:
sizeof(struct iwl_nvm_data) + sizeof(struct ieee80211_channel) + sizeof(struct ieee80211_rate)
'mvm->nvm_data' is a 'struct iwl_nvm_data', so it is fine.
At the end of this structure, there is the 'channels' flex array. Each element is of type 'struct ieee80211_channel'.
So only 1 element is allocated in this array.
When doing:
mvm->nvm_data->bands[0].channels = mvm->nvm_data->channels;
We point at the first element of the 'channels' flex array. So this is fine.
However, when doing:
mvm->nvm_data->bands[0].bitrates =
(void *)((u8 *)mvm->nvm_data->channels + 1);
because of the "(u8 *)" cast, we add only 1 to the address of the beginning of the flex array.
It is likely that we want point at the 'struct ieee80211_rate' allocated just after.
Remove the spurious casting so that the pointer arithmetic works as expected.
--- drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/mvm/fw.c +1 -1
@@ -686,7 +686,7 @@ int iwl_run_init_mvm_ucode(struct iwl_mvm *mvm) mvm->nvm_data->bands[0 ].n_channels =1 ; mvm->nvm_data->bands[0 ].n_bitrates =1 ; mvm->nvm_data->bands[0 ].bitrates = - (void *)((u8 *)mvm->nvm_data->channels +1 ); + (void *)(mvm->nvm_data->channels +1 ); mvm->nvm_data->bands[0 ].bitrates->hw_value =10 ; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 33/75 wifi: mwifiex: Fix oob check condition in mwifiex_process_rx_packet
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pin-yen Lin <[email protected]>
[ Upstream commit aef7a0300047e7b4707ea0411dc9597cba108fc8 ]
Only skip the code path trying to access the rfc1042 headers when the buffer is too small, so the driver can still process packets without rfc1042 headers.
--- drivers/net/wireless/marvell/mwifiex/sta_rx.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
drivers/net/wireless/marvell/mwifiex/sta_rx.c +9 -7
@@ -98,7 +98,8 @@ int mwifiex_process_rx_packet(struct mwifiex_private *priv, rx_pkt_len =le16_to_cpu (local_rx_pd->rx_pkt_length); rx_pkt_hdr = (void *)local_rx_pd + rx_pkt_off; -if (sizeof (*rx_pkt_hdr) + rx_pkt_off > skb->len) { +if (sizeof (rx_pkt_hdr->eth803_hdr) +sizeof (rfc1042_header) + + rx_pkt_off > skb->len) {mwifiex_dbg (priv->adapter,ERROR ,"wrong rx packet offset: len=%d, rx_pkt_off=%d\n" , skb->len, rx_pkt_off);
@@ -107,12 +108,13 @@ int mwifiex_process_rx_packet(struct mwifiex_private *priv,return -1 ; } -if ((!memcmp (&rx_pkt_hdr->rfc1042_hdr, bridge_tunnel_header, -sizeof (bridge_tunnel_header))) || - (!memcmp (&rx_pkt_hdr->rfc1042_hdr, rfc1042_header, -sizeof (rfc1042_header)) && -ntohs (rx_pkt_hdr->rfc1042_hdr.snap_type) !=ETH_P_AARP && -ntohs (rx_pkt_hdr->rfc1042_hdr.snap_type) !=ETH_P_IPX )) { +if (sizeof (*rx_pkt_hdr) + rx_pkt_off <= skb->len && + ((!memcmp (&rx_pkt_hdr->rfc1042_hdr, bridge_tunnel_header, +sizeof (bridge_tunnel_header))) || + (!memcmp (&rx_pkt_hdr->rfc1042_hdr, rfc1042_header, +sizeof (rfc1042_header)) && +ntohs (rx_pkt_hdr->rfc1042_hdr.snap_type) !=ETH_P_AARP && +ntohs (rx_pkt_hdr->rfc1042_hdr.snap_type) !=ETH_P_IPX ))) {/* * Replace the 803 header and rfc1042 header (llc/snap) with an * EthernetII header, keep the src/dst and snap_type
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 34/75 bpf: Fix tr dereferencing
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Leon Hwang <[email protected]>
[ Upstream commit b724a6418f1f853bcb39c8923bf14a50c7bdbd07 ]
Fix 'tr' dereferencing bug when CONFIG_BPF_JIT is turned off.
When CONFIG_BPF_JIT is turned off, 'bpf_trampoline_get()' returns NULL, which is same as the cases when CONFIG_BPF_JIT is turned on.
--- include/linux/bpf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/bpf.h +1 -1
@@ -840,7 +840,7 @@ static inline int bpf_trampoline_unlink_prog(struct bpf_prog *prog,static inline struct bpf_trampoline *bpf_trampoline_get (u64 key,struct bpf_attach_target_info *tgt_info) { -return ERR_PTR (-EOPNOTSUPP ); +return NULL ; }static inline void bpf_trampoline_put (struct bpf_trampoline *tr) {}#define DEFINE_BPF_DISPATCHER (name)
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 35/75 drivers/net: process the result of hdlc_open() and add call of hdlc_close() in uhdlc_close()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexandra Diupina <[email protected]>
[ Upstream commit a59addacf899b1b21a7b7449a1c52c98704c2472 ]
Process the result of hdlc_open() and call uhdlc_close() in case of an error. It is necessary to pass the error code up the control flow, similar to a possible error in request_irq().
Also add a hdlc_close() call to the uhdlc_close() because the comment to hdlc_close() says it must be called by the hardware driver when the HDLC device is being closed
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/net/wan/fsl_ucc_hdlc.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/net/wan/fsl_ucc_hdlc.c +10 -2
@@ -34,6 +34,8 @@#define TDM_PPPOHT_SLIC_MAXIN #define RX_BD_ERRORS (R_CD_S | R_OV_S | R_CR_S | R_AB_S | R_NO_S | R_LG_S) +static int uhdlc_close (struct net_device *dev); +static struct ucc_tdm_info utdm_primary_info = { .uf_info = { .tsa =0 ,
@@ -705,6 +707,7 @@ static int uhdlc_open(struct net_device *dev)hdlc_device *hdlc =dev_to_hdlc (dev);struct ucc_hdlc_private *priv = hdlc->priv;struct ucc_tdm *utdm = priv->utdm; +int rc =0 ;if (priv->hdlc_busy !=1 ) { if (request_irq(priv->ut_info->uf_info.irq,
@@ -728,10 +731,13 @@ static int uhdlc_open(struct net_device *dev)napi_enable (&priv->napi);netdev_reset_queue (dev);netif_start_queue (dev); -hdlc_open (dev); + + rc =hdlc_open (dev); +if (rc) +uhdlc_close (dev); } -return 0 ; +return rc; }static void uhdlc_memclean (struct ucc_hdlc_private *priv)
@@ -821,6 +827,8 @@ static int uhdlc_close(struct net_device *dev)netdev_reset_queue (dev); priv->hdlc_busy =0 ; +hdlc_close (dev); +return 0 ; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 36/75 wifi: mt76: mt76x02: fix MT76x0 external LNA gain handling
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Felix Fietkau <[email protected]>
[ Upstream commit 684e45e120b82deccaf8b85633905304a3bbf56d ]
On MT76x0, LNA gain should be applied for both external and internal LNA. On MT76x2, LNA gain should be treated as 0 for external LNA. Move the LNA type based logic to mt76x2 in order to fix mt76x0.
--- drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.c | 7 ------- drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.c | 13 +++++++++++-- 2 files changed, 11 insertions(+), 9 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.c +0 -7
@@ -131,15 +131,8 @@ u8 mt76x02_get_lna_gain(struct mt76x02_dev *dev, s8 *lna_2g, s8 *lna_5g, struct ieee80211_channel *chan) { -u16 val;u8 lna; - val =mt76x02_eeprom_get (dev,MT_EE_NIC_CONF_1 ); -if (val &MT_EE_NIC_CONF_1_LNA_EXT_2G ) - *lna_2g =0 ; -if (val &MT_EE_NIC_CONF_1_LNA_EXT_5G ) -memset (lna_5g,0 ,sizeof (s8) *3 ); -if (chan->band ==NL80211_BAND_2GHZ ) lna = *lna_2g;else if (chan->hw_value <=64 )
drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.c +11 -2
@@ -256,7 +256,8 @@ void mt76x2_read_rx_gain(struct mt76x02_dev *dev)struct ieee80211_channel *chan = dev->mphy.chandef.chan;int channel = chan->hw_value;s8 lna_5g[3 ], lna_2g; -u8 lna; +bool use_lna; +u8 lna =0 ;u16 val;if (chan->band ==NL80211_BAND_2GHZ )
@@ -275,7 +276,15 @@ void mt76x2_read_rx_gain(struct mt76x02_dev *dev) dev->cal.rx.mcu_gain |= (lna_5g[1 ] &0xff ) <<16 ; dev->cal.rx.mcu_gain |= (lna_5g[2 ] &0xff ) <<24 ; - lna =mt76x02_get_lna_gain (dev, &lna_2g, lna_5g, chan); + val =mt76x02_eeprom_get (dev,MT_EE_NIC_CONF_1 ); +if (chan->band ==NL80211_BAND_2GHZ ) + use_lna = !(val &MT_EE_NIC_CONF_1_LNA_EXT_2G ); +else + use_lna = !(val &MT_EE_NIC_CONF_1_LNA_EXT_5G ); + +if (use_lna) + lna =mt76x02_get_lna_gain (dev, &lna_2g, lna_5g, chan); + dev->cal.rx.lna_gain =mt76x02_sign_extend (lna,8 ); }EXPORT_SYMBOL_GPL (mt76x2_read_rx_gain);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 37/75 regmap: rbtree: Fix wrong register marked as in-cache when creating new node
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Richard Fitzgerald <[email protected]>
[ Upstream commit 7a795ac8d49e2433e1b97caf5e99129daf8e1b08 ]
When regcache_rbtree_write() creates a new rbtree_node it was passing the wrong bit number to regcache_rbtree_set_register(). The bit number is the offset __in number of registers__, but in the case of creating a new block regcache_rbtree_write() was not dividing by the address stride to get the number of registers.
Fix this by dividing by map->reg_stride.
Compare with regcache_rbtree_read() where the bit is checked.
This bug meant that the wrong register was marked as present. The register that was written to the cache could not be read from the cache because it was not marked as cached. But a nearby register could be marked as having a cached value even if it was never written to the cache.
--- drivers/base/regmap/regcache-rbtree.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/base/regmap/regcache-rbtree.c +2 -1
@@ -453,7 +453,8 @@ static int regcache_rbtree_write(struct regmap *map, unsigned int reg,if (!rbnode)return -ENOMEM ;regcache_rbtree_set_register (map, rbnode, - reg - rbnode->base_reg, value); + (reg - rbnode->base_reg) / map->reg_stride, + value);regcache_rbtree_insert (map, &rbtree_ctx->root, rbnode); rbtree_ctx->cached_rbnode = rbnode; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 38/75 ima: Finish deprecation of IMA_TRUSTED_KEYRING Kconfig
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oleksandr Tymoshenko <[email protected]>
[ Upstream commit be210c6d3597faf330cb9af33b9f1591d7b2a983 ]
The removal of IMA_TRUSTED_KEYRING made IMA_LOAD_X509 and IMA_BLACKLIST_KEYRING unavailable because the latter two depend on the former. Since IMA_TRUSTED_KEYRING was deprecated in favor of INTEGRITY_TRUSTED_KEYRING use it as a dependency for the two Kconfigs affected by the deprecation.
--- security/integrity/ima/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
security/integrity/ima/Kconfig +2 -2
@@ -268,7 +268,7 @@ config IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY config IMA_BLACKLIST_KEYRING bool "Create IMA machine owner blacklist keyrings (EXPERIMENTAL)" depends on SYSTEM_TRUSTED_KEYRING - depends on IMA_TRUSTED_KEYRING + depends on INTEGRITY_TRUSTED_KEYRING default n help This option creates an IMA blacklist keyring, which contains all
@@ -278,7 +278,7 @@ config IMA_BLACKLIST_KEYRING config IMA_LOAD_X509 bool "Load X509 certificate onto the '.ima' trusted keyring" - depends on IMA_TRUSTED_KEYRING + depends on INTEGRITY_TRUSTED_KEYRING default n help File signature verification is based on the public keys
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 39/75 scsi: target: core: Fix deadlock due to recursive locking
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Junxiao Bi <[email protected]>
[ Upstream commit a154f5f643c6ecddd44847217a7a3845b4350003 ]
The following call trace shows a deadlock issue due to recursive locking of mutex "device_mutex". First lock acquire is in target_for_each_device() and second in target_free_device().
PID: 148266 TASK: ffff8be21ffb5d00 CPU: 10 COMMAND: "iscsi_ttx"
#0 [ffffa2bfc9ec3b18] __schedule at ffffffffa8060e7f
#1 [ffffa2bfc9ec3ba0] schedule at ffffffffa8061224
#2 [ffffa2bfc9ec3bb8] schedule_preempt_disabled at ffffffffa80615ee
#3 [ffffa2bfc9ec3bc8] __mutex_lock at ffffffffa8062fd7
#4 [ffffa2bfc9ec3c40] __mutex_lock_slowpath at ffffffffa80631d3
#5 [ffffa2bfc9ec3c50] mutex_lock at ffffffffa806320c
#6 [ffffa2bfc9ec3c68] target_free_device at ffffffffc0935998 [target_core_mod]
#7 [ffffa2bfc9ec3c90] target_core_dev_release at ffffffffc092f975 [target_core_mod] #8 [ffffa2bfc9ec3ca0] config_item_put at ffffffffa79d250f
#9 [ffffa2bfc9ec3cd0] config_item_put at ffffffffa79d2583
#10 [ffffa2bfc9ec3ce0] target_devices_idr_iter at ffffffffc0933f3a [target_core_mod] #11 [ffffa2bfc9ec3d00] idr_for_each at ffffffffa803f6fc
#12 [ffffa2bfc9ec3d60] target_for_each_device at ffffffffc0935670 [target_core_mod] #13 [ffffa2bfc9ec3d98] transport_deregister_session at ffffffffc0946408 [target_core_mod] #14 [ffffa2bfc9ec3dc8] iscsit_close_session at ffffffffc09a44a6 [iscsi_target_mod] #15 [ffffa2bfc9ec3df0] iscsit_close_connection at ffffffffc09a4a88 [iscsi_target_mod] #16 [ffffa2bfc9ec3df8] finish_task_switch at ffffffffa76e5d07
#17 [ffffa2bfc9ec3e78] iscsit_take_action_for_connection_exit at ffffffffc0991c23 [iscsi_target_mod] #18 [ffffa2bfc9ec3ea0] iscsi_target_tx_thread at ffffffffc09a403b [iscsi_target_mod] #19 [ffffa2bfc9ec3f08] kthread at ffffffffa76d8080
#20 [ffffa2bfc9ec3f50] ret_from_fork at ffffffffa8200364
--- drivers/target/target_core_device.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
drivers/target/target_core_device.c +4 -7
@@ -875,7 +875,6 @@ sector_t target_to_linux_sector(struct se_device *dev, sector_t lb)EXPORT_SYMBOL (target_to_linux_sector);struct devices_idr_iter { -struct config_item *prev_item;int (*fn)(struct se_device *dev,void *data);void *data; };
@@ -885,11 +884,9 @@ static int target_devices_idr_iter(int id, void *p, void *data) {struct devices_idr_iter *iter = data;struct se_device *dev = p; +struct config_item *item;int ret; -config_item_put (iter->prev_item); - iter->prev_item =NULL ; -/* * We add the device early to the idr, so it can be used * by backend modules during configuration. We do not want
@@ -899,12 +896,13 @@ static int target_devices_idr_iter(int id, void *p, void *data)if (!target_dev_configured (dev))return 0 ; - iter->prev_item =config_item_get_unless_zero (&dev->dev_group.cg_item); -if (!iter->prev_item) + item =config_item_get_unless_zero (&dev->dev_group.cg_item); +if (!item)return 0 ;mutex_unlock (&device_mutex); ret = iter->fn (dev, iter->data); +config_item_put (item);mutex_lock (&device_mutex);return ret;
@@ -927,7 +925,6 @@ int target_for_each_device(int (*fn)(struct se_device *dev, void *data),mutex_lock (&device_mutex); ret =idr_for_each (&devices_idr, target_devices_idr_iter, &iter);mutex_unlock (&device_mutex); -config_item_put (iter.prev_item);return ret; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 40/75 ima: rework CONFIG_IMA dependency block
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
[ Upstream commit 91e326563ee34509c35267808a4b1b3ea3db62a8 ]
Changing the direct dependencies of IMA_BLACKLIST_KEYRING and IMA_LOAD_X509 caused them to no longer depend on IMA, but a a configuration without IMA results in link failures:
arm-linux-gnueabi-ld: security/integrity/iint.o: in function `integrity_load_keys':
iint.c:(.init.text+0xd8): undefined reference to `ima_load_x509'
aarch64-linux-ld: security/integrity/digsig_asymmetric.o: in function `asymmetric_verify':
digsig_asymmetric.c:(.text+0x104): undefined reference to `ima_blacklist_keyring'
Adding explicit dependencies on IMA would fix this, but a more reliable way to do this is to enclose the entire Kconfig file in an 'if IMA' block. This also allows removing the existing direct dependencies.
--- security/integrity/ima/Kconfig | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-)
security/integrity/ima/Kconfig +6 -12
@@ -29,9 +29,11 @@ config IMA to learn more about IMA. If unsure, say N. +if IMA + config IMA_KEXEC bool "Enable carrying the IMA measurement list across a soft boot" - depends on IMA && TCG_TPM && HAVE_IMA_KEXEC + depends on TCG_TPM && HAVE_IMA_KEXEC default n help TPM PCRs are only reset on a hard reboot. In order to validate
@@ -43,7 +45,6 @@ config IMA_KEXEC config IMA_MEASURE_PCR_IDX int - depends on IMA range 8 14 default 10 help
@@ -53,7 +54,7 @@ config IMA_MEASURE_PCR_IDX config IMA_LSM_RULES bool - depends on IMA && AUDIT && (SECURITY_SELINUX || SECURITY_SMACK || SECURITY_APPARMOR) + depends on AUDIT && (SECURITY_SELINUX || SECURITY_SMACK || SECURITY_APPARMOR) default y help Disabling this option will disregard LSM based policy rules.
@@ -61,7 +62,6 @@ config IMA_LSM_RULES choice prompt "Default template" default IMA_NG_TEMPLATE - depends on IMA help Select the default IMA measurement template.
@@ -80,14 +80,12 @@ endchoice config IMA_DEFAULT_TEMPLATE string - depends on IMA default "ima-ng" if IMA_NG_TEMPLATE default "ima-sig" if IMA_SIG_TEMPLATE choice prompt "Default integrity hash algorithm" default IMA_DEFAULT_HASH_SHA1 - depends on IMA help Select the default hash algorithm used for the measurement list, integrity appraisal and audit log. The compiled default
@@ -117,7 +115,6 @@ endchoice config IMA_DEFAULT_HASH string - depends on IMA default "sha1" if IMA_DEFAULT_HASH_SHA1 default "sha256" if IMA_DEFAULT_HASH_SHA256 default "sha512" if IMA_DEFAULT_HASH_SHA512
@@ -126,7 +123,6 @@ config IMA_DEFAULT_HASH config IMA_WRITE_POLICY bool "Enable multiple writes to the IMA policy" - depends on IMA default n help IMA policy can now be updated multiple times. The new rules get
@@ -137,7 +133,6 @@ config IMA_WRITE_POLICY config IMA_READ_POLICY bool "Enable reading back the current IMA policy" - depends on IMA default y if IMA_WRITE_POLICY default n if !IMA_WRITE_POLICY help
@@ -147,7 +142,6 @@ config IMA_READ_POLICY config IMA_APPRAISE bool "Appraise integrity measurements" - depends on IMA default n help This option enables local measurement integrity appraisal.
@@ -303,7 +297,6 @@ config IMA_APPRAISE_SIGNED_INIT config IMA_MEASURE_ASYMMETRIC_KEYS bool - depends on IMA depends on ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y default y
@@ -322,7 +315,8 @@ config IMA_SECURE_AND_OR_TRUSTED_BOOT config IMA_DISABLE_HTABLE bool "Disable htable to allow measurement of duplicate records" - depends on IMA default n help This option disables htable to allow measurement of duplicate records. + +endif
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 41/75 NFSv4: Fix a nfs4_state_manager() race
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Trond Myklebust <[email protected]>
[ Upstream commit ed1cc05aa1f7fe8197d300e914afc28ab9818f89 ]
If the NFS4CLNT_RUN_MANAGER flag got set just before we cleared NFS4CLNT_MANAGER_RUNNING, then we might have won the race against nfs4_schedule_state_manager(), and are responsible for handling the recovery situation.
--- fs/nfs/nfs4state.c | 7 +++++++ 1 file changed, 7 insertions(+)
fs/nfs/nfs4state.c +7 -0
@@ -2699,6 +2699,13 @@ static void nfs4_state_manager(struct nfs_client *clp)nfs4_end_drain_session (clp);nfs4_clear_state_manager_bit (clp); +if (test_bit (NFS4CLNT_RUN_MANAGER , &clp->cl_state) && + !test_and_set_bit (NFS4CLNT_MANAGER_RUNNING , + &clp->cl_state)) { + memflags =memalloc_nofs_save (); +continue ; + } +if (!test_and_set_bit (NFS4CLNT_RECALL_RUNNING , &clp->cl_state)) {if (test_and_clear_bit (NFS4CLNT_DELEGRETURN , &clp->cl_state)) {nfs_client_return_marked_delegations (clp);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 42/75 bpf, sockmap: Reject sk_msg egress redirects to non-TCP sockets
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Sitnicki <[email protected]>
[ Upstream commit b80e31baa43614e086a9d29dc1151932b1bd7fc5 ]
With a SOCKMAP/SOCKHASH map and an sk_msg program user can steer messages sent from one TCP socket (s1) to actually egress from another TCP socket (s2):
tcp_bpf_sendmsg(s1) // = sk_prot->sendmsg
tcp_bpf_send_verdict(s1) // __SK_REDIRECT case
tcp_bpf_sendmsg_redir(s2)
tcp_bpf_push_locked(s2)
tcp_bpf_push(s2)
tcp_rate_check_app_limited(s2) // expects tcp_sock
tcp_sendmsg_locked(s2) // ditto
There is a hard-coded assumption in the call-chain, that the egress socket (s2) is a TCP socket.
However in commit 122e6c79efe1 ("sock_map: Update sock type checks for UDP") we have enabled redirects to non-TCP sockets. This was done for the sake of BPF sk_skb programs. There was no indention to support sk_msg send-to-egress use case.
As a result, attempts to send-to-egress through a non-TCP socket lead to a crash due to invalid downcast from sock to tcp_sock:
BUG: kernel NULL pointer dereference, address: 000000000000002f ... Call Trace: <TASK> ? show_regs+0x60/0x70 ? __die+0x1f/0x70 ? page_fault_oops+0x80/0x160 ? do_user_addr_fault+0x2d7/0x800 ? rcu_is_watching+0x11/0x50 ? exc_page_fault+0x70/0x1c0 ? asm_exc_page_fault+0x27/0x30 ? tcp_tso_segs+0x14/0xa0 tcp_write_xmit+0x67/0xce0 __tcp_push_pending_frames+0x32/0xf0 tcp_push+0x107/0x140 tcp_sendmsg_locked+0x99f/0xbb0 tcp_bpf_push+0x19d/0x3a0 tcp_bpf_sendmsg_redir+0x55/0xd0 tcp_bpf_send_verdict+0x407/0x550 tcp_bpf_sendmsg+0x1a1/0x390 inet_sendmsg+0x6a/0x70 sock_sendmsg+0x9d/0xc0 ? sockfd_lookup_light+0x12/0x80 __sys_sendto+0x10e/0x160 ? syscall_enter_from_user_mode+0x20/0x60 ? __this_cpu_preempt_check+0x13/0x20 ? lockdep_hardirqs_on+0x82/0x110 __x64_sys_sendto+0x1f/0x30 do_syscall_64+0x38/0x90 entry_SYSCALL_64_after_hwframe+0x63/0xcd
Reject selecting a non-TCP sockets as redirect target from a BPF sk_msg program to prevent the crash. When attempted, user will receive an EACCES error from send/sendto/sendmsg() syscall.
--- net/core/sock_map.c | 4 ++++ 1 file changed, 4 insertions(+)
net/core/sock_map.c +4 -0
@@ -676,6 +676,8 @@ BPF_CALL_4(bpf_msg_redirect_map, struct sk_msg *, msg, sk =__sock_map_lookup_elem (map, key);if (unlikely (!sk || !sock_map_redirect_allowed (sk)))return SK_DROP ; +if (!(flags &BPF_F_INGRESS ) && !sk_is_tcp (sk)) +return SK_DROP ; msg->flags = flags; msg->sk_redir = sk;
@@ -1269,6 +1271,8 @@ BPF_CALL_4(bpf_msg_redirect_hash, struct sk_msg *, msg, sk =__sock_hash_lookup_elem (map, key);if (unlikely (!sk || !sock_map_redirect_allowed (sk)))return SK_DROP ; +if (!(flags &BPF_F_INGRESS ) && !sk_is_tcp (sk)) +return SK_DROP ; msg->flags = flags; msg->sk_redir = sk;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 43/75 modpost: add missing else to the "of" check
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mauricio Faria de Oliveira <[email protected]>
[ Upstream commit cbc3d00cf88fda95dbcafee3b38655b7a8f2650a ]
Without this 'else' statement, an "usb" name goes into two handlers:
the first/previous 'if' statement _AND_ the for-loop over 'devtable', but the latter is useless as it has no 'usb' device_id entry anyway.
Tested with allmodconfig before/after patch; no changes to *.mod.c:
git checkout v6.6-rc3
make -j$(nproc) allmodconfig
make -j$(nproc) olddefconfig
make -j$(nproc)
find . -name '*.mod.c' | cpio -pd /tmp/before
# apply patch
make -j$(nproc)
find . -name '*.mod.c' | cpio -pd /tmp/after
diff -r /tmp/before/ /tmp/after/
# no difference
--- scripts/mod/file2alias.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/mod/file2alias.c +1 -1
@@ -1547,7 +1547,7 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,/* First handle the "special" cases */ if (sym_is (name, namelen,"usb" ))do_usb_table (symval, sym->st_size, mod); -if (sym_is (name, namelen,"of" )) +else if (sym_is (name, namelen,"of" ))do_of_table (symval, sym->st_size, mod);else if (sym_is (name, namelen,"pnp" ))do_pnp_device_entry (symval, sym->st_size, mod);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 44/75 net: fix possible store tearing in neigh_periodic_work()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 25563b581ba3a1f263a00e8c9a97f5e7363be6fd ]
While looking at a related syzbot report involving neigh_periodic_work(), I found that I forgot to add an annotation when deleting an RCU protected item from a list.
Readers use rcu_deference(*np), we need to use either rcu_assign_pointer() or WRITE_ONCE() on writer side to prevent store tearing.
I use rcu_assign_pointer() to have lockdep support, this was the choice made in neigh_flush_dev().
--- net/core/neighbour.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/core/neighbour.c +3 -1
@@ -930,7 +930,9 @@ static void neigh_periodic_work(struct work_struct *work) (state == NUD_FAILED || !time_in_range_open(jiffies, n->used, n->used + NEIGH_VAR(n->parms, GC_STALETIME)))) { - *np = n->next; +rcu_assign_pointer (*np, +rcu_dereference_protected (n->next, +lockdep_is_held (&tbl->lock)));neigh_mark_dead (n);write_unlock (&n->lock);neigh_cleanup_and_release (n);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 45/75 ipv4, ipv6: Fix handling of transhdrlen in __ip{,6}_append_data()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Howells <[email protected]>
[ Upstream commit 9d4c75800f61e5d75c1659ba201b6c0c7ead3070 ]
Including the transhdrlen in length is a problem when the packet is partially filled (e.g. something like send(MSG_MORE) happened previously) when appending to an IPv4 or IPv6 packet as we don't want to repeat the transport header or account for it twice. This can happen under some circumstances, such as splicing into an L2TP socket.
The symptom observed is a warning in __ip6_append_data():
WARNING: CPU: 1 PID: 5042 at net/ipv6/ip6_output.c:1800 __ip6_append_data.isra.0+0x1be8/0x47f0 net/ipv6/ip6_output.c:1800
that occurs when MSG_SPLICE_PAGES is used to append more data to an already partially occupied skbuff. The warning occurs when 'copy' is larger than the amount of data in the message iterator. This is because the requested length includes the transport header length when it shouldn't. This can be triggered by, for example:
sfd = socket(AF_INET6, SOCK_DGRAM, IPPROTO_L2TP);
bind(sfd, ...); // ::1
connect(sfd, ...); // ::1 port 7
send(sfd, buffer, 4100, MSG_MORE);
sendfile(sfd, dfd, NULL, 1024);Fix this by only adding transhdrlen into the length if the write queue is empty in l2tp_ip6_sendmsg(), analogously to how UDP does things.
l2tp_ip_sendmsg() looks like it won't suffer from this problem as it builds the UDP packet itself.
--- net/l2tp/l2tp_ip6.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/l2tp/l2tp_ip6.c +1 -1
@@ -508,7 +508,6 @@ static int l2tp_ip6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)*/ if (len >INT_MAX - transhdrlen)return -EMSGSIZE ; - ulen = len + transhdrlen;/* Mirror BSD error message compatibility */ if (msg->msg_flags &MSG_OOB )
@@ -629,6 +628,7 @@ static int l2tp_ip6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) back_from_confirm:lock_sock (sk); + ulen = len +skb_queue_empty (&sk->sk_write_queue) ? transhdrlen :0 ; err = ip6_append_data(sk, ip_generic_getfrag, msg, ulen, transhdrlen, &ipc6, &fl6, (struct rt6_info *)dst,
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 46/75 ptp: ocp: Fix error handling in ptp_ocp_device_init
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dinghao Liu <[email protected]>
[ Upstream commit caa0578c1d487d39e4bb947a1b4965417053b409 ]
When device_add() fails, ptp_ocp_dev_release() will be called after put_device(). Therefore, it seems that the ptp_ocp_dev_release() before put_device() is redundant.
--- drivers/ptp/ptp_ocp.c | 1 - 1 file changed, 1 deletion(-)
drivers/ptp/ptp_ocp.c +0 -1
@@ -1292,7 +1292,6 @@ ptp_ocp_device_init(struct ptp_ocp *bp, struct pci_dev *pdev)return 0 ; out: -ptp_ocp_dev_release (&bp->dev);put_device (&bp->dev);return err; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 47/75 net: dsa: mv88e6xxx: Avoid EEPROM timeout when EEPROM is absent
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fabio Estevam <[email protected]>
[ Upstream commit 6ccf50d4d4741e064ba35511a95402c63bbe21a8 ]
Since commit 23d775f12dcd ("net: dsa: mv88e6xxx: Wait for EEPROM done before HW reset") the following error is seen on a imx8mn board with a 88E6320 switch:
mv88e6085 30be0000.ethernet-1:00: Timeout waiting for EEPROM done
This board does not have an EEPROM attached to the switch though.
This problem is well explained by Andrew Lunn:
"If there is an EEPROM, and the EEPROM contains a lot of data, it could be that when we perform a hardware reset towards the end of probe, it interrupts an I2C bus transaction, leaving the I2C bus in a bad state, and future reads of the EEPROM do not work.
The work around for this was to poll the EEInt status and wait for it to go true before performing the hardware reset.
However, we have discovered that for some boards which do not have an EEPROM, EEInt never indicates complete. As a result, mv88e6xxx_g1_wait_eeprom_done() spins for a second and then prints a warning.
We probably need a different solution than calling mv88e6xxx_g1_wait_eeprom_done(). The datasheet for 6352 documents the EEPROM Command register:
bit 15 is:
EEPROM Unit Busy. This bit must be set to a one to start an EEPROM operation (see EEOp below). Only one EEPROM operation can be executing at one time so this bit must be zero before setting it to a one. When the requested EEPROM operation completes this bit will automatically be cleared to a zero. The transition of this bit from a one to a zero can be used to generate an interrupt (the EEInt in Global 1, offset 0x00).
and more interesting is bit 11:
Register Loader Running. This bit is set to one whenever the register loader is busy executing instructions contained in the EEPROM."
Change to using mv88e6xxx_g2_eeprom_wait() to fix the timeout error when the EEPROM chip is not present.
--- drivers/net/dsa/mv88e6xxx/chip.c | 6 ++++-- drivers/net/dsa/mv88e6xxx/global1.c | 31 ----------------------------- drivers/net/dsa/mv88e6xxx/global1.h | 1 - drivers/net/dsa/mv88e6xxx/global2.c | 2 +- drivers/net/dsa/mv88e6xxx/global2.h | 1 + 5 files changed, 6 insertions(+), 35 deletions(-)
drivers/net/dsa/mv88e6xxx/chip.c +4 -2
@@ -2594,14 +2594,16 @@ static void mv88e6xxx_hardware_reset(struct mv88e6xxx_chip *chip)* from the wrong location resulting in the switch booting * to wrong mode and inoperable. */ -mv88e6xxx_g1_wait_eeprom_done (chip); +if (chip->info->ops->get_eeprom) +mv88e6xxx_g2_eeprom_wait (chip);gpiod_set_value_cansleep (gpiod,1 );usleep_range (10000 ,20000 );gpiod_set_value_cansleep (gpiod,0 );usleep_range (10000 ,20000 ); -mv88e6xxx_g1_wait_eeprom_done (chip); +if (chip->info->ops->get_eeprom) +mv88e6xxx_g2_eeprom_wait (chip); } }
drivers/net/dsa/mv88e6xxx/global1.c +0 -31
@@ -75,37 +75,6 @@ static int mv88e6xxx_g1_wait_init_ready(struct mv88e6xxx_chip *chip)return mv88e6xxx_g1_wait_bit (chip,MV88E6XXX_G1_STS , bit,1 ); } -void mv88e6xxx_g1_wait_eeprom_done (struct mv88e6xxx_chip *chip) -{ -const unsigned long timeout = jiffies +1 *HZ ; -u16 val; -int err; - -/* Wait up to 1 second for the switch to finish reading the -* EEPROM. -*/ -while (time_before (jiffies, timeout)) { - err =mv88e6xxx_g1_read (chip,MV88E6XXX_G1_STS , &val); -if (err) { -dev_err (chip->dev,"Error reading status" ); -return ; - } - -/* If the switch is still resetting, it may not -* respond on the bus, and so MDIO read returns -* 0xffff. Differentiate between that, and waiting for -* the EEPROM to be done by bit 0 being set. -*/ -if (val !=0xffff && - val &BIT (MV88E6XXX_G1_STS_IRQ_EEPROM_DONE )) -return ; - -usleep_range (1000 ,2000 ); - } - -dev_err (chip->dev,"Timeout waiting for EEPROM done" ); -} -/* Offset 0x01: Switch MAC Address Register Bytes 0 & 1 * Offset 0x02: Switch MAC Address Register Bytes 2 & 3 * Offset 0x03: Switch MAC Address Register Bytes 4 & 5
drivers/net/dsa/mv88e6xxx/global1.h +0 -1
@@ -280,7 +280,6 @@ int mv88e6xxx_g1_set_switch_mac(struct mv88e6xxx_chip *chip, u8 *addr);int mv88e6185_g1_reset (struct mv88e6xxx_chip *chip);int mv88e6352_g1_reset (struct mv88e6xxx_chip *chip);int mv88e6250_g1_reset (struct mv88e6xxx_chip *chip); -void mv88e6xxx_g1_wait_eeprom_done (struct mv88e6xxx_chip *chip);int mv88e6185_g1_ppu_enable (struct mv88e6xxx_chip *chip);int mv88e6185_g1_ppu_disable (struct mv88e6xxx_chip *chip);
drivers/net/dsa/mv88e6xxx/global2.c +1 -1
@@ -340,7 +340,7 @@ int mv88e6xxx_g2_pot_clear(struct mv88e6xxx_chip *chip)* Offset 0x15: EEPROM Addr (for 8-bit data access) */ -static int mv88e6xxx_g2_eeprom_wait (struct mv88e6xxx_chip *chip) +int mv88e6xxx_g2_eeprom_wait (struct mv88e6xxx_chip *chip) {int bit =__bf_shf (MV88E6XXX_G2_EEPROM_CMD_BUSY );int err;
drivers/net/dsa/mv88e6xxx/global2.h +1 -0
@@ -357,6 +357,7 @@ int mv88e6xxx_g2_trunk_clear(struct mv88e6xxx_chip *chip);int mv88e6xxx_g2_device_mapping_write (struct mv88e6xxx_chip *chip,int target,int port); +int mv88e6xxx_g2_eeprom_wait (struct mv88e6xxx_chip *chip);extern const struct mv88e6xxx_irq_ops mv88e6097_watchdog_ops;extern const struct mv88e6xxx_irq_ops mv88e6250_watchdog_ops;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 48/75 net: usb: smsc75xx: Fix uninit-value access in __smsc75xx_read_reg
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shigeru Yoshida <[email protected]>
[ Upstream commit e9c65989920f7c28775ec4e0c11b483910fb67b8 ]
syzbot reported the following uninit-value access issue:
=====================================================
BUG: KMSAN: uninit-value in smsc75xx_wait_ready drivers/net/usb/smsc75xx.c:975 [inline] BUG: KMSAN: uninit-value in smsc75xx_bind+0x5c9/0x11e0 drivers/net/usb/smsc75xx.c:1482 CPU: 0 PID: 8696 Comm: kworker/0:3 Not tainted 5.8.0-rc5-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Workqueue: usb_hub_wq hub_event Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0x21c/0x280 lib/dump_stack.c:118 kmsan_report+0xf7/0x1e0 mm/kmsan/kmsan_report.c:121 __msan_warning+0x58/0xa0 mm/kmsan/kmsan_instr.c:215 smsc75xx_wait_ready drivers/net/usb/smsc75xx.c:975 [inline] smsc75xx_bind+0x5c9/0x11e0 drivers/net/usb/smsc75xx.c:1482 usbnet_probe+0x1152/0x3f90 drivers/net/usb/usbnet.c:1737 usb_probe_interface+0xece/0x1550 drivers/usb/core/driver.c:374 really_probe+0xf20/0x20b0 drivers/base/dd.c:529 driver_probe_device+0x293/0x390 drivers/base/dd.c:701 __device_attach_driver+0x63f/0x830 drivers/base/dd.c:807 bus_for_each_drv+0x2ca/0x3f0 drivers/base/bus.c:431 __device_attach+0x4e2/0x7f0 drivers/base/dd.c:873 device_initial_probe+0x4a/0x60 drivers/base/dd.c:920 bus_probe_device+0x177/0x3d0 drivers/base/bus.c:491 device_add+0x3b0e/0x40d0 drivers/base/core.c:2680 usb_set_configuration+0x380f/0x3f10 drivers/usb/core/message.c:2032 usb_generic_driver_probe+0x138/0x300 drivers/usb/core/generic.c:241 usb_probe_device+0x311/0x490 drivers/usb/core/driver.c:272 really_probe+0xf20/0x20b0 drivers/base/dd.c:529 driver_probe_device+0x293/0x390 drivers/base/dd.c:701 __device_attach_driver+0x63f/0x830 drivers/base/dd.c:807 bus_for_each_drv+0x2ca/0x3f0 drivers/base/bus.c:431 __device_attach+0x4e2/0x7f0 drivers/base/dd.c:873 device_initial_probe+0x4a/0x60 drivers/base/dd.c:920 bus_probe_device+0x177/0x3d0 drivers/base/bus.c:491 device_add+0x3b0e/0x40d0 drivers/base/core.c:2680 usb_new_device+0x1bd4/0x2a30 drivers/usb/core/hub.c:2554 hub_port_connect drivers/usb/core/hub.c:5208 [inline] hub_port_connect_change drivers/usb/core/hub.c:5348 [inline] port_event drivers/usb/core/hub.c:5494 [inline] hub_event+0x5e7b/0x8a70 drivers/usb/core/hub.c:5576 process_one_work+0x1688/0x2140 kernel/workqueue.c:2269 worker_thread+0x10bc/0x2730 kernel/workqueue.c:2415 kthread+0x551/0x590 kernel/kthread.c:292 ret_from_fork+0x1f/0x30 arch/x86/entry/entry_64.S:293
Local variable ----buf.i87@smsc75xx_bind created at:
__smsc75xx_read_reg drivers/net/usb/smsc75xx.c:83 [inline] smsc75xx_wait_ready drivers/net/usb/smsc75xx.c:968 [inline] smsc75xx_bind+0x485/0x11e0 drivers/net/usb/smsc75xx.c:1482 __smsc75xx_read_reg drivers/net/usb/smsc75xx.c:83 [inline] smsc75xx_wait_ready drivers/net/usb/smsc75xx.c:968 [inline] smsc75xx_bind+0x485/0x11e0 drivers/net/usb/smsc75xx.c:1482
This issue is caused because usbnet_read_cmd() reads less bytes than requested (zero byte in the reproducer). In this case, 'buf' is not properly filled.
This patch fixes the issue by returning -ENODATA if usbnet_read_cmd() reads less bytes than requested.
--- drivers/net/usb/smsc75xx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/usb/smsc75xx.c +3 -1
@@ -90,7 +90,9 @@ static int __must_check __smsc75xx_read_reg(struct usbnet *dev, u32 index, ret =fn (dev,USB_VENDOR_REQUEST_READ_REGISTER ,USB_DIR_IN |USB_TYPE_VENDOR |USB_RECIP_DEVICE ,0 , index, &buf,4 ); -if (unlikely (ret <0 )) { +if (unlikely (ret <4 )) { + ret = ret <0 ? ret : -ENODATA ; +netdev_warn (dev->net,"Failed to read reg index 0x%08x: %d\n" , index, ret);return ret;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 49/75 net: nfc: llcp: Add lock when modifying device list
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jeremy Cline <[email protected]>
[ Upstream commit dfc7f7a988dad34c3bf4c053124fb26aa6c5f916 ]
The device list needs its associated lock held when modifying it, or the list could become corrupted, as syzbot discovered.
--- net/nfc/llcp_core.c | 2 ++ 1 file changed, 2 insertions(+)
net/nfc/llcp_core.c +2 -0
@@ -1646,7 +1646,9 @@ int nfc_llcp_register_device(struct nfc_dev *ndev)timer_setup (&local->sdreq_timer, nfc_llcp_sdreq_timer,0 );INIT_WORK (&local->sdreq_timeout_work, nfc_llcp_sdreq_timeout_work); +spin_lock (&llcp_devices_lock);list_add (&local->list, &llcp_devices); +spin_unlock (&llcp_devices_lock);return 0 ; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 50/75 net: ethernet: ti: am65-cpsw: Fix error code in am65_cpsw_nuss_init_tx_chns()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit 37d4f55567982e445f86dc0ff4ecfa72921abfe8 ]
This accidentally returns success, but it should return a negative error code.
--- drivers/net/ethernet/ti/am65-cpsw-nuss.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/ti/am65-cpsw-nuss.c +1 -0
@@ -1619,6 +1619,7 @@ static int am65_cpsw_nuss_init_tx_chns(struct am65_cpsw_common *common)if (tx_chn->irq <=0 ) {dev_err (dev,"Failed to get tx dma irq %d\n" , tx_chn->irq); + ret = tx_chn->irq ?: -ENXIO ; goto err; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 51/75 ibmveth: Remove condition to recompute TCP header checksum.
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Wilder <[email protected]>
[ Upstream commit 51e7a66666e0ca9642c59464ef8359f0ac604d41 ]
In some OVS environments the TCP pseudo header checksum may need to be recomputed. Currently this is only done when the interface instance is configured for "Trunk Mode". We found the issue also occurs in some Kubernetes environments, these environments do not use "Trunk Mode", therefor the condition is removed.
Performance tests with this change show only a fractional decrease in throughput (< 0.2%).
--- drivers/net/ethernet/ibm/ibmveth.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-)
drivers/net/ethernet/ibm/ibmveth.c +12 -13
@@ -1297,24 +1297,23 @@ static void ibmveth_rx_csum_helper(struct sk_buff *skb,* the user space for finding a flow. During this process, OVS computes * checksum on the first packet when CHECKSUM_PARTIAL flag is set. * -* So, re-compute TCP pseudo header checksum when configured for -* trunk mode. +* So, re-compute TCP pseudo header checksum. */ +if (iph_proto ==IPPROTO_TCP ) {struct tcphdr *tcph = (struct tcphdr *)(skb->data + iphlen); +if (tcph->check ==0x0000 ) {/* Recompute TCP pseudo header checksum */ -if (adapter->is_active_trunk) { - tcphdrlen = skb->len - iphlen; -if (skb_proto ==ETH_P_IP ) - tcph->check = - ~csum_tcpudp_magic (iph->saddr, - iph->daddr, tcphdrlen, iph_proto,0 ); -else if (skb_proto ==ETH_P_IPV6 ) - tcph->check = - ~csum_ipv6_magic (&iph6->saddr, - &iph6->daddr, tcphdrlen, iph_proto,0 ); - } + tcphdrlen = skb->len - iphlen; +if (skb_proto ==ETH_P_IP ) + tcph->check = + ~csum_tcpudp_magic (iph->saddr, + iph->daddr, tcphdrlen, iph_proto,0 ); +else if (skb_proto ==ETH_P_IPV6 ) + tcph->check = + ~csum_ipv6_magic (&iph6->saddr, + &iph6->daddr, tcphdrlen, iph_proto,0 );/* Setup SKB fields for checksum offload */ skb_partial_csum_set (skb, iphlen, offsetof(struct tcphdr , check));
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 52/75 netfilter: handle the connecting collision properly in nf_conntrack_proto_sctp
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xin Long <[email protected]>
[ Upstream commit 8e56b063c86569e51eed1c5681ce6361fa97fc7a ]
In Scenario A and B below, as the delayed INIT_ACK always changes the peer vtag, SCTP ct with the incorrect vtag may cause packet loss.
Scenario A: INIT_ACK is delayed until the peer receives its own INIT_ACK
192.168.1.2 > 192.168.1.1: [INIT] [init tag: 1328086772]
192.168.1.1 > 192.168.1.2: [INIT] [init tag: 1414468151]
192.168.1.2 > 192.168.1.1: [INIT ACK] [init tag: 1328086772]
192.168.1.1 > 192.168.1.2: [INIT ACK] [init tag: 1650211246] *
192.168.1.2 > 192.168.1.1: [COOKIE ECHO]
192.168.1.1 > 192.168.1.2: [COOKIE ECHO]
192.168.1.2 > 192.168.1.1: [COOKIE ACK]Scenario B: INIT_ACK is delayed until the peer completes its own handshake
192.168.1.2 > 192.168.1.1: sctp (1) [INIT] [init tag: 3922216408]
192.168.1.1 > 192.168.1.2: sctp (1) [INIT] [init tag: 144230885]
192.168.1.2 > 192.168.1.1: sctp (1) [INIT ACK] [init tag: 3922216408]
192.168.1.1 > 192.168.1.2: sctp (1) [COOKIE ECHO]
192.168.1.2 > 192.168.1.1: sctp (1) [COOKIE ACK]192.168.1.1 > 192.168.1.2: sctp (1) [INIT ACK] [init tag: 3914796021] *
This patch fixes it as below:
In SCTP_CID_INIT processing:
- clear ct->proto.sctp.init[!dir] if ct->proto.sctp.init[dir] && ct->proto.sctp.init[!dir]. (Scenario E)
- set ct->proto.sctp.init[dir].
In SCTP_CID_INIT_ACK processing:
- drop it if !ct->proto.sctp.init[!dir] && ct->proto.sctp.vtag[!dir] && ct->proto.sctp.vtag[!dir] != ih->init_tag. (Scenario B, Scenario C)
- drop it if ct->proto.sctp.init[dir] && ct->proto.sctp.init[!dir] && ct->proto.sctp.vtag[!dir] != ih->init_tag. (Scenario A)
In SCTP_CID_COOKIE_ACK processing:
- clear ct->proto.sctp.init[dir] and ct->proto.sctp.init[!dir]. (Scenario D)
Also, it's important to allow the ct state to move forward with cookie_echo and cookie_ack from the opposite dir for the collision scenarios.
There are also other Scenarios where it should allow the packet through, addressed by the processing above:
Scenario C: new CT is created by INIT_ACK.
Scenario D: start INIT on the existing ESTABLISHED ct.
Scenario E: start INIT after the old collision on the existing ESTABLISHED ct.
192.168.1.2 > 192.168.1.1: sctp (1) [INIT] [init tag: 3922216408] 192.168.1.1 > 192.168.1.2: sctp (1) [INIT] [init tag: 144230885] (both side are stopped, then start new connection again in hours) 192.168.1.2 > 192.168.1.1: sctp (1) [INIT] [init tag: 242308742]
--- include/linux/netfilter/nf_conntrack_sctp.h | 1 + net/netfilter/nf_conntrack_proto_sctp.c | 43 ++++++++++++++++----- 2 files changed, 34 insertions(+), 10 deletions(-)
include/linux/netfilter/nf_conntrack_sctp.h +1 -0
@@ -9,6 +9,7 @@ struct ip_ct_sctp {enum sctp_conntrack state;__be32 vtag[IP_CT_DIR_MAX ]; +u8 init[IP_CT_DIR_MAX ];u8 last_dir;u8 flags; };
net/netfilter/nf_conntrack_proto_sctp.c +33 -10
75 lines not on this page · raw message
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 53/75 netfilter: nf_tables: nft_set_rbtree: fix spurious insertion failure
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Florian Westphal <[email protected]>
[ Upstream commit 087388278e0f301f4c61ddffb1911d3a180f84b8 ]
nft_rbtree_gc_elem() walks back and removes the end interval element that comes before the expired element.
There is a small chance that we've cached this element as 'rbe_ge'. If this happens, we hold and test a pointer that has been queued for freeing.
It also causes spurious insertion failures:
$ cat test-testcases-sets-0044interval_overlap_0.1/testout.log
Error: Could not process rule: File exists
add element t s { 0 - 2 }
^^^^^^
Failed to insert 0 - 2 given:
table ip t {
set s {
type inet_service
flags interval,timeout
timeout 2s
gc-interval 2s
}
}The set (rbtree) is empty. The 'failure' doesn't happen on next attempt.
Reason is that when we try to insert, the tree may hold an expired element that collides with the range we're adding. While we do evict/erase this element, we can trip over this check:
if (rbe_ge && nft_rbtree_interval_end(rbe_ge) && nft_rbtree_interval_end(new))
return -ENOTEMPTY;
rbe_ge was erased by the synchronous gc, we should not have done this check. Next attempt won't find it, so retry results in successful insertion.
Restart in-kernel to avoid such spurious errors.
Such restart are rare, unless userspace intentionally adds very large numbers of elements with very short timeouts while setting a huge gc interval.
Even in this case, this cannot loop forever, on each retry an existing element has been removed.
As the caller is holding the transaction mutex, its impossible for a second entity to add more expiring elements to the tree.
After this it also becomes feasible to remove the async gc worker and perform all garbage collection from the commit path.
--- net/netfilter/nft_set_rbtree.c | 46 +++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 17 deletions(-)
net/netfilter/nft_set_rbtree.c +29 -17
@@ -233,10 +233,9 @@ static void nft_rbtree_gc_remove(struct net *net, struct nft_set *set,rb_erase (&rbe->node, &priv->root); } -static int nft_rbtree_gc_elem (const struct nft_set *__set, -struct nft_rbtree *priv, -struct nft_rbtree_elem *rbe, -u8 genmask) +static const struct nft_rbtree_elem * +nft_rbtree_gc_elem (const struct nft_set *__set,struct nft_rbtree *priv, +struct nft_rbtree_elem *rbe,u8 genmask) {struct nft_set *set = (struct nft_set *)__set;struct rb_node *prev =rb_prev (&rbe->node);
@@ -246,7 +245,7 @@ static int nft_rbtree_gc_elem(const struct nft_set *__set, gc =nft_trans_gc_alloc (set,0 ,GFP_ATOMIC );if (!gc) -return -ENOMEM ; +return ERR_PTR (-ENOMEM );/* search for end interval coming before this element. * end intervals don't carry a timeout extension, they
@@ -261,6 +260,7 @@ static int nft_rbtree_gc_elem(const struct nft_set *__set, prev =rb_prev (prev); } + rbe_prev =NULL ;if (prev) { rbe_prev = rb_entry(prev, struct nft_rbtree_elem, node);nft_rbtree_gc_remove (net, set, priv, rbe_prev);
@@ -272,7 +272,7 @@ static int nft_rbtree_gc_elem(const struct nft_set *__set,*/ gc =nft_trans_gc_queue_sync (gc,GFP_ATOMIC );if (WARN_ON_ONCE (!gc)) -return -ENOMEM ; +return ERR_PTR (-ENOMEM );nft_trans_gc_elem_add (gc, rbe_prev); }
@@ -280,13 +280,13 @@ static int nft_rbtree_gc_elem(const struct nft_set *__set,nft_rbtree_gc_remove (net, set, priv, rbe); gc =nft_trans_gc_queue_sync (gc,GFP_ATOMIC );if (WARN_ON_ONCE (!gc)) -return -ENOMEM ; +return ERR_PTR (-ENOMEM );nft_trans_gc_elem_add (gc, rbe);nft_trans_gc_queue_sync_done (gc); -return 0 ; +return rbe_prev; } static bool nft_rbtree_update_first(const struct nft_set *set,
@@ -314,7 +314,7 @@ static int __nft_rbtree_insert(const struct net *net, const struct nft_set *set,struct nft_rbtree *priv =nft_set_priv (set);u8 cur_genmask =nft_genmask_cur (net);u8 genmask =nft_genmask_next (net); -int d, err; +int d;/* Descend the tree to search for an existing element greater than the * key value to insert that is greater than the new element. This is the
@@ -363,9 +363,14 @@ static int __nft_rbtree_insert(const struct net *net, const struct nft_set *set,*/ if (nft_set_elem_expired (&rbe->ext) &&nft_set_elem_active (&rbe->ext, cur_genmask)) { - err =nft_rbtree_gc_elem (set, priv, rbe, genmask); -if (err <0 ) -return err; +const struct nft_rbtree_elem *removed_end; + + removed_end =nft_rbtree_gc_elem (set, priv, rbe, genmask); +if (IS_ERR (removed_end)) +return PTR_ERR (removed_end); + +if (removed_end == rbe_le || removed_end == rbe_ge) +return -EAGAIN ;continue ; }
@@ -486,11 +491,18 @@ static int nft_rbtree_insert(const struct net *net, const struct nft_set *set,struct nft_rbtree_elem *rbe = elem->priv;int err; -write_lock_bh (&priv->lock); -write_seqcount_begin (&priv->count); - err =__nft_rbtree_insert (net, set, rbe, ext); -write_seqcount_end (&priv->count); -write_unlock_bh (&priv->lock); +do { +if (fatal_signal_pending (current)) +return -EINTR ; + +cond_resched (); + +write_lock_bh (&priv->lock); +write_seqcount_begin (&priv->count); + err =__nft_rbtree_insert (net, set, rbe, ext); +write_seqcount_end (&priv->count); +write_unlock_bh (&priv->lock); + }while (err == -EAGAIN );return err; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 54/75 ipv4: Set offload_failed flag in fibmatch results
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Benjamin Poirier <[email protected]>
[ Upstream commit 0add5c597f3253a9c6108a0a81d57f44ab0d9d30 ]
Due to a small omission, the offload_failed flag is missing from ipv4 fibmatch results. Make sure it is set correctly.
The issue can be witnessed using the following commands:
echo "1 1" > /sys/bus/netdevsim/new_device
ip link add dummy1 up type dummy
ip route add 192.0.2.0/24 dev dummy1
echo 1 > /sys/kernel/debug/netdevsim/netdevsim1/fib/fail_route_offload ip route add 198.51.100.0/24 dev dummy1
ip route
# 192.168.15.0/24 has rt_trap # 198.51.100.0/24 has rt_offload_failed
ip route get 192.168.15.1 fibmatch
# Result has rt_trap
ip route get 198.51.100.1 fibmatch
# Result differs from the route shown by ip route, it is missing # rt_offload_failed
ip link del dev dummy1
echo 1 > /sys/bus/netdevsim/del_device
--- net/ipv4/route.c | 2 ++ 1 file changed, 2 insertions(+)
net/ipv4/route.c +2 -0
@@ -3430,6 +3430,8 @@ static int inet_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh, fa->fa_type == fri.type) { fri.offload =READ_ONCE (fa->offload); fri.trap =READ_ONCE (fa->trap); + fri.offload_failed = +READ_ONCE (fa->offload_failed);break ; } }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 55/75 net: stmmac: dwmac-stm32: fix resume on STM32 MCU
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ben Wolsieffer <[email protected]>
[ Upstream commit 6f195d6b0da3b689922ba9e302af2f49592fa9fc ]
The STM32MP1 keeps clk_rx enabled during suspend, and therefore the driver does not enable the clock in stm32_dwmac_init() if the device was suspended. The problem is that this same code runs on STM32 MCUs, which do disable clk_rx during suspend, causing the clock to never be re-enabled on resume.
This patch adds a variant flag to indicate that clk_rx remains enabled during suspend, and uses this to decide whether to enable the clock in stm32_dwmac_init() if the device was suspended.
This approach fixes this specific bug with limited opportunity for unintended side-effects, but I have a follow up patch that will refactor the clock configuration and hopefully make it less error prone.
--- drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c +5 -2
@@ -105,6 +105,7 @@ struct stm32_ops {int (*parse_data)(struct stm32_dwmac *dwmac,struct device *dev);u32 syscfg_eth_mask; +bool clk_rx_enable_in_suspend; };static int stm32_dwmac_init (struct plat_stmmacenet_data *plat_dat)
@@ -122,7 +123,8 @@ static int stm32_dwmac_init(struct plat_stmmacenet_data *plat_dat)if (ret)return ret; -if (!dwmac->dev->power.is_suspended) { +if (!dwmac->ops->clk_rx_enable_in_suspend || + !dwmac->dev->power.is_suspended) { ret =clk_prepare_enable (dwmac->clk_rx);if (ret) {clk_disable_unprepare (dwmac->clk_tx);
@@ -515,7 +517,8 @@ static struct stm32_ops stm32mp1_dwmac_data = { .suspend = stm32mp1_suspend, .resume = stm32mp1_resume, .parse_data = stm32mp1_parse_data, - .syscfg_eth_mask = SYSCFG_MP1_ETH_MASK + .syscfg_eth_mask = SYSCFG_MP1_ETH_MASK, + .clk_rx_enable_in_suspend = true };static const struct of_device_id stm32_dwmac_match[] = {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 56/75 tipc: fix a potential deadlock on &tx->lock
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chengfeng Ye <[email protected]>
[ Upstream commit 08e50cf071847323414df0835109b6f3560d44f5 ]
It seems that tipc_crypto_key_revoke() could be be invoked by wokequeue tipc_crypto_work_rx() under process context and timer/rx callback under softirq context, thus the lock acquisition on &tx->lock seems better use spin_lock_bh() to prevent possible deadlock.
This flaw was found by an experimental static analysis tool I am developing for irq-related deadlock.
tipc_crypto_work_rx() <workqueue>
--> tipc_crypto_key_distr()
--> tipc_bcast_xmit()
--> tipc_bcbase_xmit()
--> tipc_bearer_bc_xmit()
--> tipc_crypto_xmit()
--> tipc_ehdr_build()
--> tipc_crypto_key_revoke()
--> spin_lock(&tx->lock)
<timer interrupt>
--> tipc_disc_timeout()
--> tipc_bearer_xmit_skb()
--> tipc_crypto_xmit()
--> tipc_ehdr_build()
--> tipc_crypto_key_revoke()
--> spin_lock(&tx->lock) <deadlock here>
--- net/tipc/crypto.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/tipc/crypto.c +2 -2
@@ -1452,14 +1452,14 @@ static int tipc_crypto_key_revoke(struct net *net, u8 tx_key)struct tipc_crypto *tx =tipc_net (net)->crypto_tx;struct tipc_key key; -spin_lock (&tx->lock); +spin_lock_bh (&tx->lock); key = tx->key;WARN_ON (!key.active || tx_key != key.active);/* Free the active key */ tipc_crypto_key_set_state (tx, key.passive,0 , key.pending);tipc_crypto_key_detach (tx->aead[key.active], &tx->lock); -spin_unlock (&tx->lock); +spin_unlock_bh (&tx->lock);pr_warn ("%s: key is revoked\n" , tx->name);return -EKEYREVOKED ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 57/75 tcp: fix quick-ack counting to count actual ACKs of new data
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Neal Cardwell <[email protected]>
[ Upstream commit 059217c18be6757b95bfd77ba53fb50b48b8a816 ]
This commit fixes quick-ack counting so that it only considers that a quick-ack has been provided if we are sending an ACK that newly acknowledges data.
The code was erroneously using the number of data segments in outgoing skbs when deciding how many quick-ack credits to remove. This logic does not make sense, and could cause poor performance in request-response workloads, like RPC traffic, where requests or responses can be multi-segment skbs.
When a TCP connection decides to send N quick-acks, that is to accelerate the cwnd growth of the congestion control module controlling the remote endpoint of the TCP connection. That quick-ack decision is purely about the incoming data and outgoing ACKs. It has nothing to do with the outgoing data or the size of outgoing data.
And in particular, an ACK only serves the intended purpose of allowing the remote congestion control to grow the congestion window quickly if the ACK is ACKing or SACKing new data.
The fix is simple: only count packets as serving the goal of the quickack mechanism if they are ACKing/SACKing new data. We can tell whether this is the case by checking inet_csk_ack_scheduled(), since we schedule an ACK exactly when we are ACKing/SACKing new data.
--- include/net/tcp.h | 6 ++++-- net/ipv4/tcp_output.c | 7 +++---- 2 files changed, 7 insertions(+), 6 deletions(-)
include/net/tcp.h +4 -2
@@ -340,12 +340,14 @@ ssize_t tcp_splice_read(struct socket *sk, loff_t *ppos, struct pipe_inode_info *pipe, size_t len, unsigned int flags); -static inline void tcp_dec_quickack_mode (struct sock *sk, -const unsigned int pkts) +static inline void tcp_dec_quickack_mode (struct sock *sk) {struct inet_connection_sock *icsk =inet_csk (sk);if (icsk->icsk_ack.quick) { +/* How many ACKs S/ACKing new data have we sent? */ +const unsigned int pkts =inet_csk_ack_scheduled (sk) ?1 :0 ; +if (pkts >= icsk->icsk_ack.quick) { icsk->icsk_ack.quick =0 ;/* Leaving quickack mode we deflate ATO. */
net/ipv4/tcp_output.c +3 -4
@@ -177,8 +177,7 @@ static void tcp_event_data_sent(struct tcp_sock *tp, }/* Account for an ACK we sent. */ -static inline void tcp_event_ack_sent (struct sock *sk,unsigned int pkts, -u32 rcv_nxt) +static inline void tcp_event_ack_sent (struct sock *sk,u32 rcv_nxt) {struct tcp_sock *tp =tcp_sk (sk);
@@ -192,7 +191,7 @@ static inline void tcp_event_ack_sent(struct sock *sk, unsigned int pkts,if (unlikely (rcv_nxt != tp->rcv_nxt))return ;/* Special ACK sent by DCTCP to reflect ECN */ -tcp_dec_quickack_mode (sk, pkts); +tcp_dec_quickack_mode (sk);inet_csk_clear_xmit_timer (sk,ICSK_TIME_DACK ); }
@@ -1374,7 +1373,7 @@ static int __tcp_transmit_skb(struct sock *sk, struct sk_buff *skb, sk, skb);if (likely (tcb->tcp_flags &TCPHDR_ACK )) -tcp_event_ack_sent (sk,tcp_skb_pcount (skb), rcv_nxt); +tcp_event_ack_sent (sk, rcv_nxt);if (skb->len != tcp_header_size) {tcp_event_data_sent (tp, sk);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 58/75 tcp: fix delayed ACKs for MSS boundary condition
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Neal Cardwell <[email protected]>
[ Upstream commit 4720852ed9afb1c5ab84e96135cb5b73d5afde6f ]
This commit fixes poor delayed ACK behavior that can cause poor TCP latency in a particular boundary condition: when an application makes a TCP socket write that is an exact multiple of the MSS size.
The problem is that there is painful boundary discontinuity in the current delayed ACK behavior. With the current delayed ACK behavior, we have:
(1) If an app reads data when > 1*MSS is unacknowledged, then tcp_cleanup_rbuf() ACKs immediately because of:
tp->rcv_nxt - tp->rcv_wup > icsk->icsk_ack.rcv_mss ||
(2) If an app reads all received data, and the packets were < 1*MSS,
and either (a) the app is not ping-pong or (b) we received two
packets < 1*MSS, then tcp_cleanup_rbuf() ACKs immediately beecause
of:
((icsk->icsk_ack.pending & ICSK_ACK_PUSHED2) ||
((icsk->icsk_ack.pending & ICSK_ACK_PUSHED) &&
!inet_csk_in_pingpong_mode(sk))) &&(3) *However*: if an app reads exactly 1*MSS of data, tcp_cleanup_rbuf() does not send an immediate ACK. This is true even if the app is not ping-pong and the 1*MSS of data had the PSH bit set, suggesting the sending application completed an application write.
Thus if the app is not ping-pong, we have this painful case where
Quoted 1 line
1*MSS gets an immediate ACK, and <1*MSS gets an immediate ACK, but a
write whose last skb is an exact multiple of 1*MSS can get a 40ms delayed ACK. This means that any app that transfers data in one direction and takes care to align write size or packet size with MSS can suffer this problem. With receive zero copy making 4KB MSS values more common, it is becoming more common to have application writes naturally align with MSS, and more applications are likely to encounter this delayed ACK problem.
The fix in this commit is to refine the delayed ACK heuristics with a simple check: immediately ACK a received 1*MSS skb with PSH bit set if the app reads all data. Why? If an skb has a len of exactly 1*MSS and has the PSH bit set then it is likely the end of an application write. So more data may not be arriving soon, and yet the data sender may be waiting for an ACK if cwnd-bound or using TX zero copy. Thus we set ICSK_ACK_PUSHED in this case so that tcp_cleanup_rbuf() will send an ACK immediately if the app reads all of the data and is not ping-pong. Note that this logic is also executed for the case where len > MSS, but in that case this logic does not matter (and does not hurt) because tcp_cleanup_rbuf() will always ACK immediately if the app reads data and there is more than an MSS of unACKed data.
--- net/ipv4/tcp_input.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
net/ipv4/tcp_input.c +13 -0
@@ -243,6 +243,19 @@ static void tcp_measure_rcv_mss(struct sock *sk, const struct sk_buff *skb)if (unlikely (len > icsk->icsk_ack.rcv_mss +MAX_TCP_OPTION_SPACE ))tcp_gro_dev_warn (sk, skb, len); +/* If the skb has a len of exactly 1*MSS and has the PSH bit +* set then it is likely the end of an application write. So +* more data may not be arriving soon, and yet the data sender +* may be waiting for an ACK if cwnd-bound or using TX zero +* copy. So we set ICSK_ACK_PUSHED here so that +* tcp_cleanup_rbuf() will send an ACK immediately if the app +* reads all of the data and is not ping-pong. If len > MSS +* then this logic does not matter (and does not hurt) because +* tcp_cleanup_rbuf() will always ACK immediately if the app +* reads data and there is more than an MSS of unACKed data. +*/ +if (TCP_SKB_CB (skb)->tcp_flags &TCPHDR_PSH ) + icsk->icsk_ack.pending |=ICSK_ACK_PUSHED ; }else {/* Otherwise, we make more careful check taking into account, * that SACKs block is variable.
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 59/75 sctp: update transport state when processing a dupcook packet
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xin Long <[email protected]>
[ Upstream commit 2222a78075f0c19ca18db53fd6623afb4aff602d ]
During the 4-way handshake, the transport's state is set to ACTIVE in sctp_process_init() when processing INIT_ACK chunk on client or COOKIE_ECHO chunk on server.
In the collision scenario below:
192.168.1.2 > 192.168.1.1: sctp (1) [INIT] [init tag: 3922216408]
192.168.1.1 > 192.168.1.2: sctp (1) [INIT] [init tag: 144230885]
192.168.1.2 > 192.168.1.1: sctp (1) [INIT ACK] [init tag: 3922216408]
192.168.1.1 > 192.168.1.2: sctp (1) [COOKIE ECHO]
192.168.1.2 > 192.168.1.1: sctp (1) [COOKIE ACK]192.168.1.1 > 192.168.1.2: sctp (1) [INIT ACK] [init tag: 3914796021]
when processing COOKIE_ECHO on 192.168.1.2, as it's in COOKIE_WAIT state, sctp_sf_do_dupcook_b() is called by sctp_sf_do_5_2_4_dupcook() where it creates a new association and sets its transport to ACTIVE then updates to the old association in sctp_assoc_update().
However, in sctp_assoc_update(), it will skip the transport update if it finds a transport with the same ipaddr already existing in the old asoc, and this causes the old asoc's transport state not to move to ACTIVE after the handshake.
This means if DATA retransmission happens at this moment, it won't be able to enter PF state because of the check 'transport->state == SCTP_ACTIVE' in sctp_do_8_2_transport_strike().
This patch fixes it by updating the transport in sctp_assoc_update() with sctp_assoc_add_peer() where it updates the transport state if there is already a transport with the same ipaddr exists in the old asoc.
--- net/sctp/associola.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
net/sctp/associola.c +1 -2
@@ -1161,8 +1161,7 @@ int sctp_assoc_update(struct sctp_association *asoc,/* Add any peer addresses from the new association. */ list_for_each_entry (trans, &new->peer.transport_addr_list, transports) -if (!sctp_assoc_lookup_paddr (asoc, &trans->ipaddr) && - !sctp_assoc_add_peer (asoc, &trans->ipaddr, +if (!sctp_assoc_add_peer (asoc, &trans->ipaddr,GFP_ATOMIC , trans->state))return -ENOMEM ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 60/75 sctp: update hb timer immediately after users change hb_interval
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xin Long <[email protected]>
[ Upstream commit 1f4e803cd9c9166eb8b6c8b0b8e4124f7499fc07 ]
Currently, when hb_interval is changed by users, it won't take effect until the next expiry of hb timer. As the default value is 30s, users have to wait up to 30s to wait its hb_interval update to work.
This becomes pretty bad in containers where a much smaller value is usually set on hb_interval. This patch improves it by resetting the hb timer immediately once the value of hb_interval is updated by users.
Note that we don't address the already existing 'problem' when sending a heartbeat 'on demand' if one hb has just been sent(from the timer) mentioned in:
https://www.mail-archive.com/[email protected]/msg590224.html
--- net/sctp/socket.c | 1 + 1 file changed, 1 insertion(+)
net/sctp/socket.c +1 -0
@@ -2452,6 +2452,7 @@ static int sctp_apply_peer_addr_params(struct sctp_paddrparams *params,if (trans) { trans->hbinterval =msecs_to_jiffies (params->spp_hbinterval); +sctp_transport_reset_hb_timer (trans); }else if (asoc) { asoc->hbinterval =msecs_to_jiffies (params->spp_hbinterval);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 61/75 HID: sony: remove duplicate NULL check before calling usb_free_urb()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiri Kosina <[email protected]>
[ Upstream commit b328dd02e19cb9d3b35de4322f5363516a20ac8c ]
usb_free_urb() does the NULL check itself, so there is no need to duplicate it prior to calling.
--- drivers/hid/hid-sony.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/hid/hid-sony.c +1 -2
@@ -3074,8 +3074,7 @@ static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id)return ret; err: -if (sc->ghl_urb) -usb_free_urb (sc->ghl_urb); +usb_free_urb (sc->ghl_urb);hid_hw_stop (hdev);return ret;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 62/75 HID: intel-ish-hid: ipc: Disable and reenable ACPI GPE bit
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Srinivas Pandruvada <[email protected]>
[ Upstream commit 8f02139ad9a7e6e5c05712f8c1501eebed8eacfd ]
The EHL (Elkhart Lake) based platforms provide a OOB (Out of band) service, which allows to wakup device when the system is in S5 (Soft-Off state). This OOB service can be enabled/disabled from BIOS settings. When enabled, the ISH device gets PME wake capability. To enable PME wakeup, driver also needs to enable ACPI GPE bit.
On resume, BIOS will clear the wakeup bit. So driver need to re-enable it in resume function to keep the next wakeup capability. But this BIOS clearing of wakeup bit doesn't decrement internal OS GPE reference count, so this reenabling on every resume will cause reference count to overflow.
So first disable and reenable ACPI GPE bit using acpi_disable_gpe().
--- drivers/hid/intel-ish-hid/ipc/pci-ish.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/hid/intel-ish-hid/ipc/pci-ish.c +8 -0
@@ -129,6 +129,14 @@ static int enable_gpe(struct device *dev) } wakeup = &adev->wakeup; +/* +* Call acpi_disable_gpe(), so that reference count +* gpe_event_info->runtime_count doesn't overflow. +* When gpe_event_info->runtime_count = 0, the call +* to acpi_disable_gpe() simply return. +*/ +acpi_disable_gpe (wakeup->gpe_device, wakeup->gpe_number); + acpi_sts =acpi_enable_gpe (wakeup->gpe_device, wakeup->gpe_number);if (ACPI_FAILURE (acpi_sts)) {dev_err (dev,"enable ose_gpe failed\n" );
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 63/75 dm zoned: free dmz->ddev array in dmz_put_zoned_devices
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fedor Pchelkin <[email protected]>
commit 9850ccd5dd88075b2b7fd28d96299d5535f58cc5 upstream.
Commit 4dba12881f88 ("dm zoned: support arbitrary number of devices") made the pointers to additional zoned devices to be stored in a dynamically allocated dmz->ddev array. However, this array is not freed.
Rename dmz_put_zoned_device to dmz_put_zoned_devices and fix it to free the dmz->ddev array when cleaning up zoned device information. Remove NULL assignment for all dmz->ddev elements and just free the dmz->ddev array instead.
Found by Linux Verification Center (linuxtesting.org).
--- drivers/md/dm-zoned-target.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
drivers/md/dm-zoned-target.c +7 -8
@@ -750,17 +750,16 @@ err:/* * Cleanup zoned device information. */ -static void dmz_put_zoned_device (struct dm_target *ti) +static void dmz_put_zoned_devices (struct dm_target *ti) {struct dmz_target *dmz = ti->private;int i; -for (i =0 ; i < dmz->nr_ddevs; i++) { -if (dmz->ddev[i]) { +for (i =0 ; i < dmz->nr_ddevs; i++) +if (dmz->ddev[i])dm_put_device (ti, dmz->ddev[i]); - dmz->ddev[i] =NULL ; - } - } + +kfree (dmz->ddev); }static int dmz_fixup_devices (struct dm_target *ti)
@@ -951,7 +950,7 @@ err_bio: err_meta:dmz_dtr_metadata (dmz->metadata); err_dev: -dmz_put_zoned_device (ti); +dmz_put_zoned_devices (ti); err:kfree (dmz->dev);kfree (dmz);
@@ -982,7 +981,7 @@ static void dmz_dtr(struct dm_target *tibioset_exit (&dmz->bio_set); -dmz_put_zoned_device (ti); +dmz_put_zoned_devices (ti);mutex_destroy (&dmz->chunk_lock);
Greg Kroah-Hartman
maintainerPATCH 64/75 RDMA/core: Require admin capabilities to set system parameters
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Leon Romanovsky <[email protected]>
commit c38d23a54445f9a8aa6831fafc9af0496ba02f9e upstream.
Like any other set command, require admin permissions to do it.
--- drivers/infiniband/core/nldev.c | 1 + 1 file changed, 1 insertion(+)
drivers/infiniband/core/nldev.c +1 -0
@@ -2316,6 +2316,7 @@ static const struct rdma_nl_cbs nldev_cb }, [RDMA_NLDEV_CMD_SYS_SET] = { .doit = nldev_set_sys_set_doit, + .flags = RDMA_NL_ADMIN_PERM, }, [RDMA_NLDEV_CMD_STAT_SET] = { .doit = nldev_stat_set_doit,
Greg Kroah-Hartman
maintainerPATCH 65/75 of: dynamic: Fix potential memory leak in of_changeset_action()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
commit 55e95bfccf6db8d26a66c46e1de50d53c59a6774 upstream.
Smatch complains that the error path where "action" is invalid leaks the "ce" allocation:
drivers/of/dynamic.c:935 of_changeset_action()
warn: possible memory leak of 'ce'
Fix this by doing the validation before the allocation.
Note that there is not any actual problem with upstream kernels. All callers of of_changeset_action() are static inlines with fixed action values.
--- drivers/of/dynamic.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/of/dynamic.c +3 -3
@@ -901,13 +901,13 @@ int of_changeset_action(struct of_change {struct of_changeset_entry *ce; +if (WARN_ON (action >=ARRAY_SIZE (action_names))) +return -EINVAL ; + ce =kzalloc (sizeof (*ce),GFP_KERNEL );if (!ce)return -ENOMEM ; -if (WARN_ON (action >=ARRAY_SIZE (action_names))) -return -EINVAL ; -/* get a reference to the node */ ce->action = action; ce->np =of_node_get (np);
Greg Kroah-Hartman
maintainerPATCH 66/75 IB/mlx4: Fix the size of a buffer in add_port_entries()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christophe JAILLET <[email protected]>
commit d7f393430a17c2bfcdf805462a5aa80be4285b27 upstream.
In order to be sure that 'buff' is never truncated, its size should be 12, not 11.
When building with W=1, this fixes the following warnings:
drivers/infiniband/hw/mlx4/sysfs.c: In function ‘add_port_entries’:
drivers/infiniband/hw/mlx4/sysfs.c:268:34: error: ‘sprintf’ may write a terminating nul past the end of the destination [-Werror=format-overflow=]
268 | sprintf(buff, "%d", i);
| ^
drivers/infiniband/hw/mlx4/sysfs.c:268:17: note: ‘sprintf’ output between 2 and 12 bytes into a destination of size 11
268 | sprintf(buff, "%d", i);
| ^~~~~~~~~~~~~~~~~~~~~~
drivers/infiniband/hw/mlx4/sysfs.c:286:34: error: ‘sprintf’ may write a terminating nul past the end of the destination [-Werror=format-overflow=]
286 | sprintf(buff, "%d", i);
| ^
drivers/infiniband/hw/mlx4/sysfs.c:286:17: note: ‘sprintf’ output between 2 and 12 bytes into a destination of size 11
286 | sprintf(buff, "%d", i);
| ^~~~~~~~~~~~~~~~~~~~~~--- drivers/infiniband/hw/mlx4/sysfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/hw/mlx4/sysfs.c +1 -1
@@ -223,7 +223,7 @@ void del_sysfs_port_mcg_attr(struct mlx4static int add_port_entries (struct mlx4_ib_dev *device,int port_num) {int i; -char buff[11 ]; +char buff[12 ];struct mlx4_ib_iov_port *port =NULL ;int ret =0 ;struct ib_port_attr attr;
Greg Kroah-Hartman
maintainerPATCH 67/75 gpio: aspeed: fix the GPIO number passed to pinctrl_gpio_set_config()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bartosz Golaszewski <[email protected]>
commit f9315f17bf778cb8079a29639419fcc8a41a3c84 upstream.
pinctrl_gpio_set_config() expects the GPIO number from the global GPIO numberspace, not the controller-relative offset, which needs to be added to the chip base.
--- drivers/gpio/gpio-aspeed.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpio/gpio-aspeed.c +1 -1
@@ -963,7 +963,7 @@ static int aspeed_gpio_set_config(structelse if (param ==PIN_CONFIG_BIAS_DISABLE || param ==PIN_CONFIG_BIAS_PULL_DOWN || param ==PIN_CONFIG_DRIVE_STRENGTH ) -return pinctrl_gpio_set_config (offset, config); +return pinctrl_gpio_set_config (chip->base + offset, config);else if (param ==PIN_CONFIG_DRIVE_OPEN_DRAIN || param ==PIN_CONFIG_DRIVE_OPEN_SOURCE )/* Return -ENOTSUPP to trigger emulation, as per datasheet */
Greg Kroah-Hartman
maintainerPATCH 68/75 gpio: pxa: disable pinctrl calls for MMP_GPIO
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Duje Mihanović <[email protected]>
commit f0575116507b981e6a810e78ce3c9040395b958b upstream.
Similarly to PXA3xx and MMP2, pinctrl-single isn't capable of setting pin direction on MMP either.
--- drivers/gpio/gpio-pxa.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpio/gpio-pxa.c +1 -0
@@ -243,6 +243,7 @@ static bool pxa_gpio_has_pinctrl(void)switch (gpio_type) {case PXA3XX_GPIO :case MMP2_GPIO : +case MMP_GPIO :return false;default :
Greg Kroah-Hartman
maintainerPATCH 69/75 RDMA/cma: Initialize ib_sa_multicast structure to 0 when join
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mark Zhang <[email protected]>
commit e0fe97efdb00f0f32b038a4836406a82886aec9c upstream.
Initialize the structure to 0 so that it's fields won't have random values. For example fields like rec.traffic_class (as well as rec.flow_label and rec.sl) is used to generate the user AH through:
cma_iboe_join_multicast
cma_make_mc_event
ib_init_ah_from_mcmember
And a random traffic_class causes a random IP DSCP in RoCEv2.
--- drivers/infiniband/core/cma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/core/cma.c +1 -1
@@ -4751,7 +4751,7 @@ static int cma_iboe_join_multicast(strucint err =0 ;struct sockaddr *addr = (struct sockaddr *)&mc->addr;struct net_device *ndev =NULL ; -struct ib_sa_multicast ib; +struct ib_sa_multicast ib = {};enum ib_gid_type gid_type;bool send_only;
Greg Kroah-Hartman
maintainerPATCH 70/75 RDMA/cma: Fix truncation compilation warning in make_cma_ports
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Leon Romanovsky <[email protected]>
commit 18126c767658ae8a831257c6cb7776c5ba5e7249 upstream.
The following compilation error is false alarm as RDMA devices don't have such large amount of ports to actually cause to format truncation.
drivers/infiniband/core/cma_configfs.c: In function ‘make_cma_ports’:drivers/infiniband/core/cma_configfs.c:223:57: error: ‘snprintf’ output may be truncated before the last format character [-Werror=format-truncation=]
223 | snprintf(port_str, sizeof(port_str), "%u", i + 1);
| ^drivers/infiniband/core/cma_configfs.c:223:17: note: ‘snprintf’ output between 2 and 11 bytes into a destination of size 10
223 | snprintf(port_str, sizeof(port_str), "%u", i + 1);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~cc1: all warnings being treated as errors
make[5]: *** [scripts/Makefile.build:243: drivers/infiniband/core/cma_configfs.o] Error 1
--- drivers/infiniband/core/cma_configfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/core/cma_configfs.c +1 -1
@@ -218,7 +218,7 @@ static int make_cma_ports(struct cma_devreturn -ENOMEM ;for (i =0 ; i < ports_num; i++) { -char port_str[10 ]; +char port_str[11 ]; ports[i].port_num = i +1 ;snprintf (port_str,sizeof (port_str),"%u" , i +1 );
Greg Kroah-Hartman
maintainerPATCH 71/75 RDMA/uverbs: Fix typo of sizeof argument
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konstantin Meskhidze <[email protected]>
commit c489800e0d48097fc6afebd862c6afa039110a36 upstream.
Since size of 'hdr' pointer and '*hdr' structure is equal on 64-bit machines issue probably didn't cause any wrong behavior. But anyway, fixing of typo is required.
--- drivers/infiniband/core/uverbs_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/core/uverbs_main.c +1 -1
@@ -535,7 +535,7 @@ static ssize_t verify_hdr(struct ib_uverif (hdr->in_words *4 != count)return -EINVAL ; -if (count < method_elm->req_size +sizeof (hdr)) { +if (count < method_elm->req_size +sizeof (*hdr)) {/* * rdma-core v18 and v19 have a bug where they send DESTROY_CQ * with a 16 byte write instead of 24. Old kernels didn't
Greg Kroah-Hartman
maintainerPATCH 72/75 RDMA/siw: Fix connection failure handling
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bernard Metzler <[email protected]>
commit 53a3f777049771496f791504e7dc8ef017cba590 upstream.
In case immediate MPA request processing fails, the newly created endpoint unlinks the listening endpoint and is ready to be dropped. This special case was not handled correctly by the code handling the later TCP socket close, causing a NULL dereference crash in siw_cm_work_handler() when dereferencing a NULL listener. We now also cancel the useless MPA timeout, if immediate MPA request processing fails.
This patch furthermore simplifies MPA processing in general:
Scheduling a useless TCP socket read in sk_data_ready() upcall is now surpressed, if the socket is already moved out of TCP_ESTABLISHED state.
--- drivers/infiniband/sw/siw/siw_cm.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
drivers/infiniband/sw/siw/siw_cm.c +12 -4
@@ -973,6 +973,7 @@ static void siw_accept_newconn(struct sisiw_cep_put (cep); new_cep->listen_cep =NULL ;if (rv) { +siw_cancel_mpatimer (new_cep);siw_cep_set_free (new_cep); goto error; }
@@ -1097,9 +1098,12 @@ static void siw_cm_work_handler(struct w/* * Socket close before MPA request received. */ -siw_dbg_cep (cep,"no mpareq: drop listener\n" ); -siw_cep_put (cep->listen_cep); - cep->listen_cep =NULL ; +if (cep->listen_cep) { +siw_dbg_cep (cep, +"no mpareq: drop listener\n" ); +siw_cep_put (cep->listen_cep); + cep->listen_cep =NULL ; + } } } release_cep =1 ;
@@ -1222,7 +1226,11 @@ static void siw_cm_llp_data_ready(structif (!cep) goto out; -siw_dbg_cep (cep,"state: %d\n" , cep->state); +siw_dbg_cep (cep,"cep state: %d, socket state %d\n" , + cep->state, sk->sk_state); + +if (sk->sk_state !=TCP_ESTABLISHED ) + goto out;switch (cep->state) {case SIW_EPSTATE_RDMA_MODE :
Greg Kroah-Hartman
maintainerPATCH 73/75 RDMA/mlx5: Fix NULL string error
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shay Drory <[email protected]>
commit dab994bcc609a172bfdab15a0d4cb7e50e8b5458 upstream.
checkpath is complaining about NULL string, change it to 'Unknown'.
--- drivers/infiniband/hw/mlx5/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/hw/mlx5/main.c +1 -1
@@ -2095,7 +2095,7 @@ static inline char *mmap_cmd2str(enum mlcase MLX5_IB_MMAP_DEVICE_MEM :return "Device Memory" ;default : -return NULL ; +return "Unknown" ; } }
Greg Kroah-Hartman
maintainerPATCH 74/75 ksmbd: fix uaf in smb20_oplock_break_ack
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: luosili <[email protected]>
commit c69813471a1ec081a0b9bf0c6bd7e8afd818afce upstream.
drop reference after use opinfo.
--- fs/ksmbd/smb2pdu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/ksmbd/smb2pdu.c +2 -2
@@ -8058,10 +8058,10 @@ static void smb20_oplock_break_ack(struc goto err_out; } -opinfo_put (opinfo); -ksmbd_fd_put (work, fp); opinfo->op_state =OPLOCK_STATE_NONE ;wake_up_interruptible_all (&opinfo->oplock_q); +opinfo_put (opinfo); +ksmbd_fd_put (work, fp); rsp->StructureSize =cpu_to_le16 (24 ); rsp->OplockLevel = rsp_oplevel;
Greg Kroah-Hartman
maintainerPATCH 75/75 parisc: Restore __ldcw_align for PA-RISC 2.0 processors
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: John David Anglin <[email protected]>
commit 914988e099fc658436fbd7b8f240160c352b6552 upstream.
Back in 2005, Kyle McMartin removed the 16-byte alignment for ldcw semaphores on PA 2.0 machines (CONFIG_PA20). This broke spinlocks on pre PA8800 processors. The main symptom was random faults in mmap'd memory (e.g., gcc compilations, etc).
Unfortunately, the errata for this ldcw change is lost.
The issue is the 16-byte alignment required for ldcw semaphore instructions can only be reduced to natural alignment when the ldcw operation can be handled coherently in cache. Only PA8800 and PA8900 processors actually support doing the operation in cache.
Aligning the spinlock dynamically adds two integer instructions to each spinlock.
Tested on rp3440, c8000 and a500.
--- arch/parisc/include/asm/ldcw.h | 36 +++++++++++++++++-------------- arch/parisc/include/asm/spinlock_types.h | 5 ---- 2 files changed, 20 insertions(+), 21 deletions(-)
arch/parisc/include/asm/ldcw.h +20 -16
@@ -2,14 +2,28 @@#ifndef __PARISC_LDCW_H#define __PARISC_LDCW_H -#ifndef CONFIG_PA20 /* Because kmalloc only guarantees 8-byte alignment for kmalloc'd data, and GCC only guarantees 8-byte alignment for stack locals, we can't be assured of 16-byte alignment for atomic lock data even if we specify "__attribute ((aligned(16)))" in the type declaration. So, we use a struct containing an array of four ints for the atomic lock type and dynamically select the 16-byte aligned int from the array -for the semaphore. */ +for the semaphore. */ + +/* From: "Jim Hull" <jim.hull of hp.com> +I've attached a summary of the change, but basically, for PA 2.0, as +long as the ",CO" (coherent operation) completer is implemented, then the +16-byte alignment requirement for ldcw and ldcd is relaxed, and instead +they only require "natural" alignment (4-byte for ldcw, 8-byte for +ldcd). + +Although the cache control hint is accepted by all PA 2.0 processors, +it is only implemented on PA8800/PA8900 CPUs. Prior PA8X00 CPUs still +require 16-byte alignment. If the address is unaligned, the operation +of the instruction is undefined. The ldcw instruction does not generate +unaligned data reference traps so misaligned accesses are not detected. +This hid the problem for years. So, restore the 16-byte alignment dropped +by Kyle McMartin in "Remove __ldcw_align for PA-RISC 2.0 processors". */ #define __PA_LDCW_ALIGNMENT 16#define __PA_LDCW_ALIGN_ORDER 4
@@ -19,22 +33,12 @@ & ~(__PA_LDCW_ALIGNMENT -1 ); \ (volatile unsigned int *) __ret; \ }) -#define __LDCW "ldcw" -#else /*CONFIG_PA20*/ -/* From: "Jim Hull" <jim.hull of hp.com> -I've attached a summary of the change, but basically, for PA 2.0, as -long as the ",CO" (coherent operation) completer is specified, then the -16-byte alignment requirement for ldcw and ldcd is relaxed, and instead -they only require "natural" alignment (4-byte for ldcw, 8-byte for -ldcd). */ - -#define __PA_LDCW_ALIGNMENT 4 -#define __PA_LDCW_ALIGN_ORDER 2 -#define __ldcw_align (a) (&(a)->slock) +#ifdef CONFIG_PA20 #define __LDCW "ldcw,co" - -#endif /*!CONFIG_PA20*/ +#else +#define __LDCW "ldcw" +#endif /* LDCW, the only atomic read-write operation PA-RISC has. *sigh*. We don't explicitly expose that "*a" may be written as reload
arch/parisc/include/asm/spinlock_types.h +0 -5
@@ -3,13 +3,8 @@#define __ASM_SPINLOCK_TYPES_Htypedef struct { -#ifdef CONFIG_PA20 -volatile unsigned int slock; -# define __ARCH_SPIN_LOCK_UNLOCKED { 1 } -#else volatile unsigned int lock[4 ];# define __ARCH_SPIN_LOCK_UNLOCKED { { 1, 1, 1, 1 } } -#endif }arch_spinlock_t ;
Quoted 8 lines · On Mon, 9 Oct 2023 15:01:22 +0200 Greg Kroah-Hartman…
This is the start of the stable review cycle for the 5.15.135 release. There are 75 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 11 Oct 2023 13:00:55 +0000. Anything received after that time might be too late.
Quoted 7 lines
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.135-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.15.y
and the diffstat can be found below.thanks,
This rc kernel passes DAMON functionality test[1] on my test machine. Attaching the test results summary below. Please note that I retrieved the kernel from linux-stable-rc tree[2].
[1] https://github.com/awslabs/damon-tests/tree/next/corr
[2] 6b29ebf84608 ("Linux 5.15.135-rc1")
Thanks,
SJ
[...]
---
ok 1 selftests: damon: debugfs_attrs.sh
ok 1 selftests: damon-tests: kunit.sh
ok 2 selftests: damon-tests: huge_count_read_write.sh
ok 3 selftests: damon-tests: buffer_overflow.sh
ok 4 selftests: damon-tests: rm_contexts.sh
ok 5 selftests: damon-tests: record_null_deref.sh
ok 6 selftests: damon-tests: dbgfs_target_ids_read_before_terminate_race.sh ok 7 selftests: damon-tests: dbgfs_target_ids_pid_leak.sh
ok 8 selftests: damon-tests: damo_tests.sh
ok 9 selftests: damon-tests: masim-record.sh
ok 10 selftests: damon-tests: build_i386.sh
ok 11 selftests: damon-tests: build_arm64.sh
ok 12 selftests: damon-tests: build_i386_idle_flag.sh
ok 13 selftests: damon-tests: build_i386_highpte.sh
ok 14 selftests: damon-tests: build_nomemcg.sh
[33m
[92mPASS [39m_remote_run_corr.sh SUCCESS
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.135 release. There are 75 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 11 Oct 2023 13:00:55 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.135-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.15.y
and the diffstat can be found below.thanks,
greg k-h
On ARCH_BRCMSTB using 32-bit and 64-bit ARM kernels, build tested on BMIPS_GENERIC:
Signature · 1 line
Florian
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.135 release. There are 75 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 11 Oct 2023 13:00:55 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.135-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.15.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.135 release. There are 75 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 11 Oct 2023 13:00:55 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.135-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.15.y
and the diffstat can be found below.thanks,
greg k-h
All tests passing for Tegra ...
Test results for stable-v5.15:
10 builds: 10 pass, 0 fail
26 boots: 26 pass, 0 fail
102 tests: 102 pass, 0 failLinux version: 5.15.135-rc1-gb5c772cb0884
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,
tegra194-p2972-0000, tegra194-p3509-0000+p3668-0000,
tegra20-ventana, tegra210-p2371-2180,
tegra210-p3450-0000, tegra30-cardhu-a04Jon
Hi Greg,
Quoted 5 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.135 release. There are 75 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Quoted 9 lines
Responses should be made by Wed, 11 Oct 2023 13:00:55 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.135-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.15.y
and the diffstat can be found below.
No problems seen on x86_64 and aarch64 with our testing.
Thanks,
Harshit
Quoted 4 lines
thanks,
greg k-h
Quoted 9 lines
This is the start of the stable review cycle for the 5.15.135 release. There are 75 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 11 Oct 2023 13:00:55 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.135-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.15.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my x86_64 and ARM64 test systems. No errors or regressions.
Thanks.
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.135 release. There are 75 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 11 Oct 2023 13:00:55 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.135-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.15.y
and the diffstat can be found below.thanks,
greg k-h
Results from Linaro’s test farm.
No regressions on arm64, arm, x86_64, and i386.
NOTE:
Following kernel warning noticed on qemu-arm64 with stable-rc 5.15.135-rc1. This is hard to reproduce.
Same issue was reported on 6.4.5-rc1 and discussed in the thread,
- https://lore.kernel.org/lkml/CA+G9fYvgy22wiY=c3wLOrCM6o33636abhtEynXhJkqxJh4ca0A@mail.gmail.com/
Warning log:
<4>[ 14.987937] ------------[ cut here ]------------ <4>[ 14.990732] WARNING: CPU: 1 PID: 195 at mm/kfence/core.c:936 __kfence_free+0x84/0xb4 <4>[ 14.993264] Modules linked in: ip_tables x_tables <4>[ 14.995667] CPU: 1 PID: 195 Comm: mount Not tainted 5.15.135-rc1 #1 <4>[ 14.996447] Hardware name: linux,dummy-virt (DT) <4>[ 14.997262] pstate: 80400009 (Nzcv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) <4>[ 14.998008] pc : __kfence_free+0x84/0xb4 <4>[ 14.998410] lr : __slab_free+0x468/0x4a0
Configs enabled:CONFIG_HAVE_ARCH_KFENCE=yCONFIG_KFENCE=yCONFIG_KFENCE_SAMPLE_INTERVAL=100CONFIG_KFENCE_NUM_OBJECTS=255CONFIG_KFENCE_STRESS_TEST_FAULTS=0
Links:
- https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-5.15.y/build/v5.15.134-76-g6b29ebf84608/testrun/20386601/suite/log-parser-boot/test/check-kernel-exception/log
- https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-5.15.y/build/v5.15.134-76-g6b29ebf84608/testrun/20386601/suite/log-parser-boot/tests/
- https://storage.tuxsuite.com/public/linaro/lkft/builds/2WWqfe5nx37NjiVzCXq7ZjKeOtF/config
## Build
* kernel: 5.15.135-rc1
* git: https://gitlab.com/Linaro/lkft/mirrors/stable/linux-stable-rc
* git branch: linux-5.15.y
* git commit: 6b29ebf8460817018f98911286d0f8b8191d9c9c
* git describe: v5.15.134-76-g6b29ebf84608
* test details:
https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-5.15.y/build/v5.15.134-76-g6b29ebf84608
## Test Regressions (compared to v5.15.134)
## Metric Regressions (compared to v5.15.134)
## Test Fixes (compared to v5.15.134)
## Metric Fixes (compared to v5.15.134)
## Test result summary
total: 89616, pass: 71074, fail: 2530, skip: 15928, xfail: 84
## Build Summary
* arc: 5 total, 5 passed, 0 failed
* arm: 116 total, 116 passed, 0 failed
* arm64: 44 total, 44 passed, 0 failed
* i386: 35 total, 34 passed, 1 failed
* mips: 26 total, 25 passed, 1 failed
* parisc: 4 total, 4 passed, 0 failed
* powerpc: 26 total, 25 passed, 1 failed
* riscv: 11 total, 11 passed, 0 failed
* s390: 12 total, 11 passed, 1 failed
* sh: 14 total, 12 passed, 2 failed
* sparc: 7 total, 7 passed, 0 failed
* x86_64: 37 total, 37 passed, 0 failed
## Test suites summary
* boot
* kselftest-android
* kselftest-arm64
* kselftest-breakpoints
* kselftest-capabilities
* kselftest-cgroup
* kselftest-clone3
* kselftest-core
* kselftest-cpu-hotplug
* kselftest-cpufreq
* kselftest-drivers-dma-buf
* kselftest-efivarfs
* kselftest-exec
* kselftest-filesystems
* kselftest-filesystems-binderfs
* kselftest-filesystems-epoll
* kselftest-firmware
* kselftest-fpu
* kselftest-ftrace
* kselftest-futex
* kselftest-gpio
* kselftest-intel_pstate
* kselftest-ipc
* kselftest-ir
* kselftest-kcmp
* kselftest-kexec
* kselftest-kvm
* kselftest-lib
* kselftest-membarrier
* kselftest-memfd
* kselftest-memory-hotplug
* kselftest-mincore
* kselftest-mount
* kselftest-mqueue
* kselftest-net
* kselftest-net-forwarding
* kselftest-net-mptcp
* kselftest-netfilter
* kselftest-nsfs
* kselftest-openat2
* kselftest-pid_namespace
* kselftest-pidfd
* kselftest-proc
* kselftest-pstore
* kselftest-ptrace
* kselftest-rseq
* kselftest-rtc
* kselftest-seccomp
* kselftest-sigaltstack
* kselftest-size
* kselftest-splice
* kselftest-static_keys
* kselftest-sync
* kselftest-sysctl
* kselftest-tc-testing
* kselftest-timens
* kselftest-timers
* kselftest-tmpfs
* kselftest-tpm2
* kselftest-user
* kselftest-user_events
* kselftest-vDSO
* kselftest-vm
* kselftest-watchdog
* kselftest-x86
* kselftest-zram
* kunit
* kvm-unit-tests
* libgpiod
* log-parser-boot
* log-parser-test
* ltp-cap_bounds
* ltp-commands
* ltp-containers
* ltp-controllers
* ltp-cpuhotplug
* ltp-crypto
* ltp-cve
* ltp-dio
* ltp-fcntl-locktests
* ltp-filecaps
* ltp-fs
* ltp-fs_bind
* ltp-fs_perms_simple
* ltp-fsx
* ltp-hugetlb
* ltp-io
* ltp-ipc
* ltp-math
* ltp-mm
* ltp-nptl
* ltp-pty
* ltp-sched
* ltp-securebits
* ltp-smoke
* ltp-syscalls
* ltp-tracing
* perf
* rcutorture
--
Linaro LKFT
https://lkft.linaro.org
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.135 release. There are 75 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 11 Oct 2023 13:00:55 +0000. Anything received after that time might be too late.
Build results:
total: 160 pass: 160 fail: 0 Qemu test results: total: 509 pass: 509 fail: 0
Guenter