5.15.118-rc1 review
Subsystems (3)
Greg Kroah-Hartman
maintainercover 5.15.118-rc1 review
This is the start of the stable review cycle for the 5.15.118 release. There are 107 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, 21 Jun 2023 10:21:12 +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.118-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.118-rc1
Ryusuke Konishi <[email protected]>
nilfs2: reject devices with insufficient block count
Christian Loehle <[email protected]>
mmc: block: ensure error propagation for non-blk
Frank Rowand <[email protected]>
of: overlay: add entry to of_overlay_action_name[]
Leon Romanovsky <[email protected]>
neighbour: delete neigh_lookup_nodev as not used
Guillaume Nault <[email protected]>
net: Remove DECnet leftovers from flow.h.
Gaosheng Cui <[email protected]>
net: Remove unused inline function dst_hold_and_use()
Gaosheng Cui <[email protected]>
neighbour: Remove unused inline function neigh_key_eq16()
Ziwei Dai <[email protected]>
rcu/kvfree: Avoid freeing new kfree_rcu() memory after old grace period
John Sperbeck <[email protected]>
cgroup: always put cset in cgroup_css_set_put_fork
David Howells <[email protected]>
afs: Fix vlserver probe RTT handling
Alex Maftei <[email protected]>
selftests/ptp: Fix timestamp printf format for PTP_SYS_OFFSET
Lin Ma <[email protected]>
net: tipc: resize nlattr array to correct size
Li Lingfeng <[email protected]>
dm: don't lock fs when the map is NULL during suspend or resume
Eric Dumazet <[email protected]>
net: lapbether: only support ethernet devices
Vlad Buslov <[email protected]>
net/sched: cls_api: Fix lockup on flushing explicitly created chain
Fabio M. De Francesco <[email protected]>
ext4: drop the call to ext4_error() from ext4_get_group_info()
Steve French <[email protected]>
cifs: fix lease break oops in xfstest generic/098
Natalia Petrova <[email protected]>
drm/nouveau: add nv_encoder pointer check for NULL
Natalia Petrova <[email protected]>
drm/nouveau/dp: check for NULL nv_connector->native_mode
Ratchanan Srirattanamet <[email protected]>
drm/nouveau: don't detect DSM for non-NVIDIA device
Aleksandr Loktionov <[email protected]>
igb: fix nvm.ops.read() error handling
Muhammad Husaini Zulkifli <[email protected]>
igc: Clean the TX buffer and TX descriptor ring
Dan Carpenter <[email protected]>
sctp: fix an error code in sctp_sf_eat_auth()
Hangbin Liu <[email protected]>
ipvlan: fix bound dev checking for IPv6 l3s mode
Jakub Kicinski <[email protected]>
net: ethtool: correct MAX attribute value for stats
Saravanan Vajravel <[email protected]>
IB/isert: Fix incorrect release of isert connection
Saravanan Vajravel <[email protected]>
IB/isert: Fix possible list corruption in CMA handler
Saravanan Vajravel <[email protected]>
IB/isert: Fix dead lock in ib_isert
Yishai Hadas <[email protected]>
IB/uverbs: Fix to consider event queue closing also upon non-blocking mode
Mark Zhang <[email protected]>
RDMA/cma: Always set static rate to 0 for RoCE
Maher Sanalla <[email protected]>
RDMA/mlx5: Initiate dropless RQ for RAW Ethernet functions
Nithin Dabilpuram <[email protected]>
octeontx2-af: fix lbk link credits on cn10k
Satha Rao <[email protected]>
octeontx2-af: fixed resource availability check
Ahmed Zaki <[email protected]>
iavf: remove mask from iavf_irq_enable_queues()
Zhu Yanjun <[email protected]>
RDMA/rxe: Fix the use-before-initialization error of resp_pkts
Bob Pearson <[email protected]>
RDMA/rxe: Removed unused name from rxe_task struct
Zhu Yanjun <[email protected]>
RDMA/rxe: Remove the unused variable obj
Lee Jones <[email protected]>
net/sched: cls_u32: Fix reference counter leak leading to overflow
Max Tottenham <[email protected]>
net/sched: act_pedit: Parse L3 Header for L4 offset
Pedro Tammela <[email protected]>
net/sched: act_pedit: remove extra check for key type
Pedro Tammela <[email protected]>
net/sched: simplify tcf_pedit_act
Guillaume Nault <[email protected]>
ping6: Fix send to link-local addresses with VRF.
Wei Fang <[email protected]>
net: enetc: correct the indexes of highest and 2nd highest TCs
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: incorrect error path handling with NFT_MSG_NEWRULE
Pablo Neira Ayuso <[email protected]>
netfilter: nfnetlink: skip error delivery on batch in case of ENOMEM
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: integrate pipapo into commit protocol
Vladimir Oltean <[email protected]>
spi: fsl-dspi: avoid SCK glitches with continuous transfers
Bob Pearson <[email protected]>
RDMA/rxe: Fix packet length checks
Li Zhijian <[email protected]>
RDMA/rtrs: Fix rxe_dealloc_pd warning
Li Zhijian <[email protected]>
RDMA/rtrs: Fix the last iu->buf leak in err path
Elson Roy Serrao <[email protected]>
usb: dwc3: gadget: Reset num TRBs before giving back the request
Bernhard Seibold <[email protected]>
serial: lantiq: add missing interrupt ack
Jerry Meng <[email protected]>
USB: serial: option: add Quectel EM061KGL series
Mika Westerberg <[email protected]>
thunderbolt: Mask ring interrupt on Intel hardware as well
Mika Westerberg <[email protected]>
thunderbolt: dma_test: Use correct value for absent rings when creating paths
Stephen Hemminger <[email protected]>
Remove DECnet support from kernel
Edson Juliano Drosdeck <[email protected]>
ALSA: hda/realtek: Add a quirk for Compaq N14JP6
Alex Deucher <[email protected]>
drm/amdgpu: add missing radeon secondary PCI ID
Hersen Wu <[email protected]>
drm/amd/display: edp do not add non-edid timings
Wes Huang <[email protected]>
net: usb: qmi_wwan: add support for Compal RXM-G1
Edward Srouji <[email protected]>
RDMA/uverbs: Restrict usage of privileged QKEYs
Dave Airlie <[email protected]>
nouveau: fix client work fence deletion race
Li Lingfeng <[email protected]>
dm thin metadata: check fail_io before using data_sm
Lukasz Tyl <[email protected]>
ALSA: usb-audio: Add quirk flag for HEM devices to enable native DSD playback
Ricardo Ribalda <[email protected]>
powerpc/purgatory: remove PGO flags
Ricardo Ribalda <[email protected]>
x86/purgatory: remove PGO flags
Ricardo Ribalda <[email protected]>
kexec: support purgatories with .text.hot sections
Ryusuke Konishi <[email protected]>
nilfs2: fix possible out-of-bounds segment allocation in resize ioctl
Ryusuke Konishi <[email protected]>
nilfs2: fix incomplete buffer cleanup in nilfs_btnode_abort_change_key()
Janne Grunau <[email protected]>
nios2: dts: Fix tse_mac "max-frame-size" property
Luís Henriques <[email protected]>
ocfs2: check new file size on fallocate call
Luís Henriques <[email protected]>
ocfs2: fix use-after-free when unmounting read-only filesystem
Benjamin Segall <[email protected]>
epoll: ep_autoremove_wake_function should use list_del_init_careful
Dan Carpenter <[email protected]>
wifi: cfg80211: fix double lock bug in reg_wdev_chan_valid()
Johannes Berg <[email protected]>
wifi: cfg80211: fix locking in regulatory disconnect
Jens Axboe <[email protected]>
io_uring: hold uring mutex around poll removal
Marc Zyngier <[email protected]>
irqchip/gic: Correctly validate OF quirk descriptors
Tatsuki Sugiura <[email protected]>
NVMe: Add MAXIO 1602 to bogus nid list.
Sukrut Bellary <[email protected]>
drm:amd:amdgpu: Fix missing buffer object unlock in failure path
Ross Lagerwall <[email protected]>
xen/blkfront: Only check REQ_FUA for writes
Maxim Kochetkov <[email protected]>
ASoC: dwc: move DMA init to snd_soc_dai_driver probe()
Liviu Dudau <[email protected]>
mips: Move initrd_start check after initrd address sanitisation.
Manuel Lauss <[email protected]>
MIPS: Alchemy: fix dbdma2
Manuel Lauss <[email protected]>
MIPS: unhide PATA_PLATFORM
Helge Deller <[email protected]>
parisc: Flush gatt writes and adjust gatt mask in parisc_agp_mask_memory()
Helge Deller <[email protected]>
parisc: Improve cache flushing for PCXL in arch_sync_dma_for_cpu()
Ranjani Sridharan <[email protected]>
ASoC: soc-pcm: test if a BE can be prepared
Johannes Thumshirn <[email protected]>
btrfs: handle memory allocation failure in btrfs_csum_one_bio
Qu Wenruo <[email protected]>
btrfs: scrub: try harder to mark RAID56 block groups read-only
Mario Limonciello <[email protected]>
power: supply: Fix logic checking if system is running from battery
Douglas Anderson <[email protected]>
irqchip/gic-v3: Disable pseudo NMIs on Mediatek devices w/ firmware issues
Osama Muhammad <[email protected]>
regulator: Fix error checking for debugfs_create_dir
Alexandru Sorodoc <[email protected]>
platform/x86: asus-wmi: Ignore WMI events with codes 0x7B, 0xC0
Marek Vasut <[email protected]>
power: supply: Ratelimit no data debug output
Milo Spadacini <[email protected]>
tools: gpio: fix debounce_period_us output of lsgpio
Krzysztof Kozlowski <[email protected]>
ARM: dts: vexpress: add missing cache properties
Hans de Goede <[email protected]>
power: supply: bq27xxx: Use mod_delayed_work() instead of cancel() + schedule()
Hans de Goede <[email protected]>
power: supply: sc27xx: Fix external_power_changed race
Hans de Goede <[email protected]>
power: supply: ab8500: Fix external_power_changed race
Kunihiko Hayashi <[email protected]>
of: overlay: Fix missing of_node_put() in error case of init_overlay_changeset()
Frank Rowand <[email protected]>
of: overlay: rework overlay apply and remove kfree()s
Frank Rowand <[email protected]>
of: overlay: rename variables to be consistent
Horatio Zhang <[email protected]>
drm/amdgpu: fix Null pointer dereference error in amdgpu_device_recover_vram
Kuan-Ting Chen <[email protected]>
ksmbd: fix slab-out-of-bounds read in smb2_handle_negotiate
Mirsad Goran Todorovac <[email protected]>
test_firmware: fix a memory leak with reqs buffer
Mirsad Goran Todorovac <[email protected]>
test_firmware: prevent race conditions by a correct implementation of locking
Christophe JAILLET <[email protected]>
test_firmware: Use kstrtobool() instead of strtobool()
-------------
Diffstat:
Documentation/admin-guide/kernel-parameters.txt | 4 - Documentation/admin-guide/sysctl/net.rst | 15 +- Documentation/devicetree/overlay-notes.rst | 30 +- Documentation/networking/decnet.rst | 243 -- Documentation/networking/index.rst | 1 - Documentation/userspace-api/ioctl/ioctl-number.rst | 1 - MAINTAINERS | 7 - Makefile | 4 +- arch/arm/boot/dts/vexpress-v2p-ca5s.dts | 1 + arch/mips/Kconfig | 1 + arch/mips/alchemy/common/dbdma.c | 27 +- arch/mips/configs/decstation_64_defconfig | 2 - arch/mips/configs/decstation_defconfig | 2 - arch/mips/configs/decstation_r4k_defconfig | 2 - arch/mips/configs/gpr_defconfig | 2 - arch/mips/configs/mtx1_defconfig | 2 - arch/mips/configs/nlm_xlp_defconfig | 2 - arch/mips/configs/nlm_xlr_defconfig | 2 - arch/mips/configs/rm200_defconfig | 2 - arch/mips/kernel/setup.c | 9 +- arch/nios2/boot/dts/10m50_devboard.dts | 2 +- arch/nios2/boot/dts/3c120_devboard.dts | 2 +- arch/parisc/kernel/pci-dma.c | 18 +- arch/powerpc/configs/ppc6xx_defconfig | 2 - arch/powerpc/purgatory/Makefile | 5 + arch/x86/purgatory/Makefile | 5 + drivers/block/xen-blkfront.c | 3 +- drivers/char/agp/parisc-agp.c | 15 +- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 1 - drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 4 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 8 +- drivers/gpu/drm/nouveau/nouveau_acpi.c | 3 + drivers/gpu/drm/nouveau/nouveau_connector.c | 7 +- drivers/gpu/drm/nouveau/nouveau_drm.c | 14 +- drivers/infiniband/core/cma.c | 4 +- drivers/infiniband/core/uverbs_cmd.c | 7 +- drivers/infiniband/core/uverbs_main.c | 12 +- drivers/infiniband/hw/mlx5/main.c | 3 + drivers/infiniband/sw/rxe/rxe_net.c | 6 + drivers/infiniband/sw/rxe/rxe_qp.c | 16 +- drivers/infiniband/sw/rxe/rxe_task.c | 5 +- drivers/infiniband/sw/rxe/rxe_task.h | 5 +- drivers/infiniband/ulp/isert/ib_isert.c | 16 +- drivers/infiniband/ulp/rtrs/rtrs-clt.c | 55 +- drivers/infiniband/ulp/rtrs/rtrs.c | 4 +- drivers/irqchip/irq-gic-common.c | 10 +- drivers/irqchip/irq-gic-common.h | 1 + drivers/irqchip/irq-gic-v3.c | 20 + drivers/md/dm-ioctl.c | 5 +- drivers/md/dm-thin-metadata.c | 20 +- drivers/md/dm.c | 4 + drivers/mmc/core/block.c | 5 + drivers/net/ethernet/freescale/enetc/enetc_qos.c | 4 +- drivers/net/ethernet/intel/iavf/iavf.h | 2 +- drivers/net/ethernet/intel/iavf/iavf_main.c | 15 +- drivers/net/ethernet/intel/iavf/iavf_register.h | 2 +- drivers/net/ethernet/intel/igb/igb_ethtool.c | 3 + drivers/net/ethernet/intel/igc/igc_main.c | 9 +- .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 7 +- drivers/net/ipvlan/ipvlan_l3s.c | 4 + drivers/net/usb/qmi_wwan.c | 2 + drivers/net/wan/lapbether.c | 3 + drivers/nvme/host/pci.c | 2 + drivers/of/overlay.c | 311 ++- drivers/platform/x86/asus-nb-wmi.c | 2 + drivers/power/supply/ab8500_btemp.c | 6 +- drivers/power/supply/ab8500_fg.c | 6 +- drivers/power/supply/bq27xxx_battery.c | 6 +- drivers/power/supply/power_supply_core.c | 8 +- drivers/power/supply/power_supply_sysfs.c | 3 +- drivers/power/supply/sc27xx_fuel_gauge.c | 9 +- drivers/regulator/core.c | 4 +- drivers/spi/spi-fsl-dspi.c | 15 + drivers/thunderbolt/dma_test.c | 8 +- drivers/thunderbolt/nhi.c | 11 +- drivers/tty/serial/lantiq.c | 1 + drivers/usb/dwc3/gadget.c | 1 + drivers/usb/serial/option.c | 16 + fs/afs/vl_probe.c | 4 +- fs/btrfs/block-group.c | 14 +- fs/btrfs/file-item.c | 4 +- fs/btrfs/scrub.c | 9 +- fs/cifs/file.c | 8 +- fs/eventpoll.c | 6 +- fs/ext4/balloc.c | 20 +- fs/ksmbd/smb2pdu.c | 10 +- fs/nilfs2/btnode.c | 12 +- fs/nilfs2/sufile.c | 9 + fs/nilfs2/the_nilfs.c | 44 +- fs/ocfs2/file.c | 8 +- fs/ocfs2/super.c | 6 +- include/linux/netdevice.h | 4 - include/linux/netfilter.h | 5 - include/linux/netfilter_defs.h | 8 - include/linux/of.h | 16 +- include/net/dn.h | 231 -- include/net/dn_dev.h | 199 -- include/net/dn_fib.h | 167 -- include/net/dn_neigh.h | 30 - include/net/dn_nsp.h | 195 -- include/net/dn_route.h | 115 - include/net/dst.h | 6 - include/net/flow.h | 26 - include/net/neighbour.h | 7 - include/net/netfilter/nf_tables.h | 4 +- include/net/netns/netfilter.h | 3 - include/rdma/ib_addr.h | 23 - include/sound/soc-dpcm.h | 4 + include/uapi/linux/dn.h | 149 -- include/uapi/linux/ethtool_netlink.h | 2 +- include/uapi/linux/netfilter_decnet.h | 72 - include/uapi/linux/netlink.h | 2 +- io_uring/io_uring.c | 3 + kernel/cgroup/cgroup.c | 17 +- kernel/kexec_file.c | 14 +- kernel/rcu/tree.c | 39 +- lib/test_firmware.c | 65 +- net/Kconfig | 2 - net/Makefile | 1 - net/core/dev.c | 4 +- net/core/neighbour.c | 34 - net/decnet/Kconfig | 43 - net/decnet/Makefile | 10 - net/decnet/README | 8 - net/decnet/af_decnet.c | 2400 -------------------- net/decnet/dn_dev.c | 1433 ------------ net/decnet/dn_fib.c | 798 ------- net/decnet/dn_neigh.c | 605 ----- net/decnet/dn_nsp_in.c | 906 -------- net/decnet/dn_nsp_out.c | 695 ------ net/decnet/dn_route.c | 1922 ---------------- net/decnet/dn_rules.c | 258 --- net/decnet/dn_table.c | 929 -------- net/decnet/dn_timer.c | 104 - net/decnet/netfilter/Kconfig | 17 - net/decnet/netfilter/Makefile | 6 - net/decnet/netfilter/dn_rtmsg.c | 158 -- net/decnet/sysctl_net_decnet.c | 362 --- net/ipv6/ping.c | 3 +- net/netfilter/core.c | 10 - net/netfilter/nf_tables_api.c | 59 +- net/netfilter/nfnetlink.c | 3 +- net/netfilter/nfnetlink_hook.c | 7 - net/netfilter/nft_set_pipapo.c | 55 +- net/sched/act_pedit.c | 176 +- net/sched/cls_api.c | 12 +- net/sched/cls_u32.c | 18 +- net/sctp/sm_statefuns.c | 2 +- net/tipc/bearer.c | 4 +- net/wireless/reg.c | 6 +- sound/pci/hda/patch_realtek.c | 1 + sound/soc/dwc/dwc-i2s.c | 41 +- sound/soc/soc-pcm.c | 20 + sound/usb/quirks.c | 2 + tools/gpio/lsgpio.c | 2 +- tools/testing/selftests/ptp/testptp.c | 6 +- 159 files changed, 1004 insertions(+), 12795 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/107 test_firmware: Use kstrtobool() instead of strtobool()
From: Christophe JAILLET <[email protected]>
[ Upstream commit f7d85515bd21902b218370a1a6301f76e4e636ff ]
strtobool() is the same as kstrtobool(). However, the latter is more used within the kernel.
In order to remove strtobool() and slightly simplify kstrtox.h, switch to the other function name.
While at it, include the corresponding header file (<linux/kstrtox.h>)
Stable-dep-of: 4acfe3dfde68 ("test_firmware: prevent race conditions by a correct implementation of locking")
--- lib/test_firmware.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
lib/test_firmware.c +2 -1
@@ -22,6 +22,7 @@#include <linux/slab.h> #include <linux/uaccess.h> #include <linux/delay.h> +#include <linux/kstrtox.h> #include <linux/kthread.h> #include <linux/vmalloc.h> #include <linux/efi_embedded_fw.h>
@@ -326,7 +327,7 @@ static int test_dev_config_update_bool(const char *buf, size_t size,int ret;mutex_lock (&test_fw_mutex); -if (strtobool (buf, cfg) <0 ) +if (kstrtobool (buf, cfg) <0 ) ret = -EINVAL ;else ret = size;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 2/107 test_firmware: prevent race conditions by a correct implementation of locking
In reply to Greg Kroah-HartmanFrom: Mirsad Goran Todorovac <[email protected]>
[ Upstream commit 4acfe3dfde685a5a9eaec5555351918e2d7266a1 ]
Dan Carpenter spotted a race condition in a couple of situations like these in the test_firmware driver:
static int test_dev_config_update_u8(const char *buf, size_t size, u8 *cfg)
{
u8 val;
int ret;
ret = kstrtou8(buf, 10, &val);
if (ret)
return ret;
mutex_lock(&test_fw_mutex);
*(u8 *)cfg = val;
mutex_unlock(&test_fw_mutex);
/* Always return full write size even if we didn't consume all */
return size;
}static ssize_t config_num_requests_store(struct device *dev,
struct device_attribute *attr, const char *buf, size_t count)
{
int rc;
mutex_lock(&test_fw_mutex);
if (test_fw_config->reqs) {
pr_err("Must call release_all_firmware prior to changing config\n");
rc = -EINVAL;
mutex_unlock(&test_fw_mutex);
goto out;
}
mutex_unlock(&test_fw_mutex);
rc = test_dev_config_update_u8(buf, count,
&test_fw_config->num_requests);out:
return rc; }
static ssize_t config_read_fw_idx_store(struct device *dev,
struct device_attribute *attr, const char *buf, size_t count)
{
return test_dev_config_update_u8(buf, count,
&test_fw_config->read_fw_idx);
}
The function test_dev_config_update_u8() is called from both the locked and the unlocked context, function config_num_requests_store() and config_read_fw_idx_store() which can both be called asynchronously as they are driver's methods, while test_dev_config_update_u8() and siblings change their argument pointed to by u8 *cfg or similar pointer.
To avoid deadlock on test_fw_mutex, the lock is dropped before calling test_dev_config_update_u8() and re-acquired within test_dev_config_update_u8() itself, but alas this creates a race condition.
Having two locks wouldn't assure a race-proof mutual exclusion.
This situation is best avoided by the introduction of a new, unlocked function __test_dev_config_update_u8() which can be called from the locked context and reducing test_dev_config_update_u8() to:
static int test_dev_config_update_u8(const char *buf, size_t size, u8 *cfg)
{
int ret;
mutex_lock(&test_fw_mutex);
ret = __test_dev_config_update_u8(buf, size, cfg);
mutex_unlock(&test_fw_mutex);
return ret;
}doing the locking and calling the unlocked primitive, which enables both locked and unlocked versions without duplication of code.
The similar approach was applied to all functions called from the locked and the unlocked context, which safely mitigates both deadlocks and race conditions in the driver.
__test_dev_config_update_bool(), __test_dev_config_update_u8() and __test_dev_config_update_size_t() unlocked versions of the functions were introduced to be called from the locked contexts as a workaround without releasing the main driver's lock and thereof causing a race condition.
The test_dev_config_update_bool(), test_dev_config_update_u8() and test_dev_config_update_size_t() locked versions of the functions are being called from driver methods without the unnecessary multiplying of the locking and unlocking code for each method, and complicating the code with saving of the return value across lock.
--- lib/test_firmware.c | 52 ++++++++++++++++++++++++++++++--------------- 1 file changed, 35 insertions(+), 17 deletions(-)
lib/test_firmware.c +35 -17
@@ -321,16 +321,26 @@ static ssize_t config_test_show_str(char *dst,return len; } -static int test_dev_config_update_bool (const char *buf,size_t size, +static inline int __test_dev_config_update_bool (const char *buf,size_t size,bool *cfg) {int ret; -mutex_lock (&test_fw_mutex);if (kstrtobool (buf, cfg) <0 ) ret = -EINVAL ;else ret = size; + +return ret; +} + +static int test_dev_config_update_bool (const char *buf,size_t size, +bool *cfg) +{ +int ret; + +mutex_lock (&test_fw_mutex); + ret =__test_dev_config_update_bool (buf, size, cfg);mutex_unlock (&test_fw_mutex);return ret;
@@ -341,7 +351,8 @@ static ssize_t test_dev_config_show_bool(char *buf, bool val)return snprintf (buf,PAGE_SIZE ,"%d\n" , val); } -static int test_dev_config_update_size_t (const char *buf, +static int __test_dev_config_update_size_t ( +const char *buf,size_t size,size_t *cfg) {
@@ -352,9 +363,7 @@ static int test_dev_config_update_size_t(const char *buf,if (ret)return ret; -mutex_lock (&test_fw_mutex); *(size_t *)cfg = new; -mutex_unlock (&test_fw_mutex);/* Always return full write size even if we didn't consume all */ return size;
@@ -370,7 +379,7 @@ static ssize_t test_dev_config_show_int(char *buf, int val)return snprintf (buf,PAGE_SIZE ,"%d\n" , val); } -static int test_dev_config_update_u8 (const char *buf,size_t size,u8 *cfg) +static int __test_dev_config_update_u8 (const char *buf,size_t size,u8 *cfg) {u8 val;int ret;
@@ -379,14 +388,23 @@ static int test_dev_config_update_u8(const char *buf, size_t size, u8 *cfg)if (ret)return ret; -mutex_lock (&test_fw_mutex); *(u8 *)cfg = val; -mutex_unlock (&test_fw_mutex);/* Always return full write size even if we didn't consume all */ return size; } +static int test_dev_config_update_u8 (const char *buf,size_t size,u8 *cfg) +{ +int ret; + +mutex_lock (&test_fw_mutex); + ret =__test_dev_config_update_u8 (buf, size, cfg); +mutex_unlock (&test_fw_mutex); + +return ret; +} +static ssize_t test_dev_config_show_u8 (char *buf,u8 val) {return snprintf (buf,PAGE_SIZE ,"%u\n" , val);
@@ -413,10 +431,10 @@ static ssize_t config_num_requests_store(struct device *dev,mutex_unlock (&test_fw_mutex); goto out; } -mutex_unlock (&test_fw_mutex); - rc =test_dev_config_update_u8 (buf, count, - &test_fw_config->num_requests); + rc =__test_dev_config_update_u8 (buf, count, + &test_fw_config->num_requests); +mutex_unlock (&test_fw_mutex); out:return rc;
@@ -460,10 +478,10 @@ static ssize_t config_buf_size_store(struct device *dev,mutex_unlock (&test_fw_mutex); goto out; } -mutex_unlock (&test_fw_mutex); - rc =test_dev_config_update_size_t (buf, count, - &test_fw_config->buf_size); + rc =__test_dev_config_update_size_t (buf, count, + &test_fw_config->buf_size); +mutex_unlock (&test_fw_mutex); out:return rc;
@@ -490,10 +508,10 @@ static ssize_t config_file_offset_store(struct device *dev,mutex_unlock (&test_fw_mutex); goto out; } -mutex_unlock (&test_fw_mutex); - rc =test_dev_config_update_size_t (buf, count, - &test_fw_config->file_offset); + rc =__test_dev_config_update_size_t (buf, count, + &test_fw_config->file_offset); +mutex_unlock (&test_fw_mutex); out:return rc;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 3/107 test_firmware: fix a memory leak with reqs buffer
In reply to Greg Kroah-HartmanFrom: Mirsad Goran Todorovac <[email protected]>
[ Upstream commit be37bed754ed90b2655382f93f9724b3c1aae847 ]
Dan Carpenter spotted that test_fw_config->reqs will be leaked if trigger_batched_requests_store() is called two or more times. The same appears with trigger_batched_requests_async_store().
This bug wasn't trigger by the tests, but observed by Dan's visual inspection of the code.
The recommended workaround was to return -EBUSY if test_fw_config->reqs is already allocated.
--- lib/test_firmware.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
lib/test_firmware.c +10 -0
@@ -863,6 +863,11 @@ static ssize_t trigger_batched_requests_store(struct device *dev,mutex_lock (&test_fw_mutex); +if (test_fw_config->reqs) { + rc = -EBUSY ; + goto out_bail; + } + test_fw_config->reqs =vzalloc (array3_size (sizeof (struct test_batched_req ), test_fw_config->num_requests,2 ));
@@ -962,6 +967,11 @@ ssize_t trigger_batched_requests_async_store(struct device *dev,mutex_lock (&test_fw_mutex); +if (test_fw_config->reqs) { + rc = -EBUSY ; + goto out_bail; + } + test_fw_config->reqs =vzalloc (array3_size (sizeof (struct test_batched_req ), test_fw_config->num_requests,2 ));
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 4/107 ksmbd: fix slab-out-of-bounds read in smb2_handle_negotiate
In reply to Greg Kroah-HartmanFrom: Kuan-Ting Chen <[email protected]>
[ Upstream commit d738950f112c8f40f0515fe967db998e8235a175 ]
Check request_buf length first to avoid out-of-bounds read by req->DialectCount.
[ 3350.990282] BUG: KASAN: slab-out-of-bounds in smb2_handle_negotiate+0x35d7/0x3e60 [ 3350.990282] Read of size 2 at addr ffff88810ad61346 by task kworker/5:0/276 [ 3351.000406] Workqueue: ksmbd-io handle_ksmbd_work [ 3351.003499] Call Trace: [ 3351.006473] <TASK> [ 3351.006473] dump_stack_lvl+0x8d/0xe0 [ 3351.006473] print_report+0xcc/0x620 [ 3351.006473] kasan_report+0x92/0xc0 [ 3351.006473] smb2_handle_negotiate+0x35d7/0x3e60 [ 3351.014760] ksmbd_smb_negotiate_common+0x7a7/0xf00 [ 3351.014760] handle_ksmbd_work+0x3f7/0x12d0 [ 3351.014760] process_one_work+0xa85/0x1780
--- fs/ksmbd/smb2pdu.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
fs/ksmbd/smb2pdu.c +5 -5
@@ -1083,16 +1083,16 @@ int smb2_handle_negotiate(struct ksmbd_work *work)return rc; } -if (req->DialectCount ==0 ) { -pr_err ("malformed packet\n" ); + smb2_buf_len =get_rfc1002_len (work->request_buf); + smb2_neg_size = offsetof(struct smb2_negotiate_req , Dialects) -4 ; +if (smb2_neg_size > smb2_buf_len) { rsp->hdr.Status =STATUS_INVALID_PARAMETER ; rc = -EINVAL ; goto err_out; } - smb2_buf_len =get_rfc1002_len (work->request_buf); - smb2_neg_size = offsetof(struct smb2_negotiate_req , Dialects) -4 ; -if (smb2_neg_size > smb2_buf_len) { +if (req->DialectCount ==0 ) { +pr_err ("malformed packet\n" ); rsp->hdr.Status =STATUS_INVALID_PARAMETER ; rc = -EINVAL ; goto err_out;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 5/107 drm/amdgpu: fix Null pointer dereference error in amdgpu_device_recover_vram
In reply to Greg Kroah-HartmanFrom: Horatio Zhang <[email protected]>
[ Upstream commit 2a1eb1a343208ce7d6839b73d62aece343e693ff ]
Use the function of amdgpu_bo_vm_destroy to handle the resource release of shadow bo. During the amdgpu_mes_self_test, shadow bo released, but vmbo->shadow_list was not, which caused a null pointer reference error in amdgpu_device_recover_vram when GPU reset.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 6 ++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 1 - 2 files changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +4 -2
@@ -78,9 +78,10 @@ static void amdgpu_bo_user_destroy(struct ttm_buffer_object *tbo)static void amdgpu_bo_vm_destroy (struct ttm_buffer_object *tbo) {struct amdgpu_device *adev =amdgpu_ttm_adev (tbo->bdev); -struct amdgpu_bo *bo =ttm_to_amdgpu_bo (tbo); +struct amdgpu_bo *shadow_bo =ttm_to_amdgpu_bo (tbo), *bo;struct amdgpu_bo_vm *vmbo; + bo = shadow_bo->parent; vmbo =to_amdgpu_bo_vm (bo);/* in case amdgpu_device_recover_vram got NULL of bo->parent */ if (!list_empty (&vmbo->shadow_list)) {
@@ -690,7 +691,6 @@ int amdgpu_bo_create_vm(struct amdgpu_device *adev,return r; *vmbo_ptr =to_amdgpu_bo_vm (bo_ptr); -INIT_LIST_HEAD (&(*vmbo_ptr)->shadow_list);return r; }
@@ -741,6 +741,8 @@ void amdgpu_bo_add_to_shadow_list(struct amdgpu_bo_vm *vmbo)mutex_lock (&adev->shadow_list_lock);list_add_tail (&vmbo->shadow_list, &adev->shadow_list); + vmbo->shadow->parent =amdgpu_bo_ref (&vmbo->bo); + vmbo->shadow->tbo.destroy = &amdgpu_bo_vm_destroy;mutex_unlock (&adev->shadow_list_lock); }
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +0 -1
@@ -983,7 +983,6 @@ static int amdgpu_vm_pt_create(struct amdgpu_device *adev,return r; } - (*vmbo)->shadow->parent =amdgpu_bo_ref (bo);amdgpu_bo_add_to_shadow_list (*vmbo);return 0 ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 6/107 of: overlay: rename variables to be consistent
In reply to Greg Kroah-HartmanFrom: Frank Rowand <[email protected]>
[ Upstream commit 1e4089667c7c732dd1b92c4c6bc7bd240ca30213 ]
Variables change name across function calls when there is not a good reason to do so. Fix by changing "fdt" to "new_fdt" and "tree" to "overlay_root".
The name disparity was confusing when creating the following commit. The name changes are in this separate commit to make review of the following commmit less complex.
Stable-dep-of: 39affd1fdf65 ("of: overlay: Fix missing of_node_put() in error case of init_overlay_changeset()")
--- drivers/of/overlay.c | 94 ++++++++++++++++++++++---------------------- 1 file changed, 47 insertions(+), 47 deletions(-)
drivers/of/overlay.c +47 -47
@@ -57,8 +57,8 @@ struct fragment {* struct overlay_changeset * @id: changeset identifier * @ovcs_list: list on which we are located -* @fdt: base of memory allocated to hold aligned FDT that was unflattened to create @overlay_tree -* @overlay_tree: expanded device tree that contains the fragment nodes +* @new_fdt: Memory allocated to hold unflattened aligned FDT +* @overlay_root: expanded device tree that contains the fragment nodes * @count: count of fragment structures * @fragments: fragment nodes in the overlay expanded device tree * @symbols_fragment: last element of @fragments[] is the __symbols__ node
@@ -67,8 +67,8 @@ struct fragment {struct overlay_changeset {int id;struct list_head ovcs_list; -const void *fdt; -struct device_node *overlay_tree; +const void *new_fdt; +struct device_node *overlay_root;int count;struct fragment *fragments;bool symbols_fragment;
@@ -183,7 +183,7 @@ static int overlay_notify(struct overlay_changeset *ovcs,/* * The values of properties in the "/__symbols__" node are paths in -* the ovcs->overlay_tree. When duplicating the properties, the paths +* the ovcs->overlay_root. When duplicating the properties, the paths * need to be adjusted to be the correct path for the live device tree. * * The paths refer to a node in the subtree of a fragment node's "__overlay__"
@@ -219,7 +219,7 @@ static struct property *dup_and_fixup_symbol_prop(if (path_len <1 )return NULL ; - fragment_node =__of_find_node_by_path (ovcs->overlay_tree, path +1 ); + fragment_node =__of_find_node_by_path (ovcs->overlay_root, path +1 ); overlay_node =__of_find_node_by_path (fragment_node,"__overlay__/" );of_node_put (fragment_node);of_node_put (overlay_node);
@@ -716,19 +716,20 @@ static struct device_node *find_target(struct device_node *info_node)/** * init_overlay_changeset() - initialize overlay changeset from overlay tree -* @ovcs: Overlay changeset to build -* @fdt: base of memory allocated to hold aligned FDT that was unflattened to create @tree -* @tree: Contains the overlay fragments and overlay fixup nodes +* @ovcs: Overlay changeset to build +* @new_fdt: Memory allocated to hold unflattened aligned FDT +* @overlay_root: Contains the overlay fragments and overlay fixup nodes * * Initialize @ovcs. Populate @ovcs->fragments with node information from -* the top level of @tree. The relevant top level nodes are the fragment -* nodes and the __symbols__ node. Any other top level node will be ignored. +* the top level of @overlay_root. The relevant top level nodes are the +* fragment nodes and the __symbols__ node. Any other top level node will +* be ignored. * * Return: 0 on success, -ENOMEM if memory allocation failure, -EINVAL if error -* detected in @tree, or -ENOSPC if idr_alloc() error. +* detected in @overlay_root, or -ENOSPC if idr_alloc() error. */ static int init_overlay_changeset (struct overlay_changeset *ovcs, -const void *fdt,struct device_node *tree) +const void *new_fdt,struct device_node *overlay_root) {struct device_node *node, *overlay_node;struct fragment *fragment;
@@ -739,17 +740,17 @@ static int init_overlay_changeset(struct overlay_changeset *ovcs,* Warn for some issues. Can not return -EINVAL for these until * of_unittest_apply_overlay() is fixed to pass these checks. */ -if (!of_node_check_flag (tree,OF_DYNAMIC )) -pr_debug ("%s() tree is not dynamic\n" , __func__); +if (!of_node_check_flag (overlay_root,OF_DYNAMIC )) +pr_debug ("%s() overlay_root is not dynamic\n" , __func__); -if (!of_node_check_flag (tree,OF_DETACHED )) -pr_debug ("%s() tree is not detached\n" , __func__); +if (!of_node_check_flag (overlay_root,OF_DETACHED )) +pr_debug ("%s() overlay_root is not detached\n" , __func__); -if (!of_node_is_root (tree)) -pr_debug ("%s() tree is not root\n" , __func__); +if (!of_node_is_root (overlay_root)) +pr_debug ("%s() overlay_root is not root\n" , __func__); - ovcs->overlay_tree = tree; - ovcs->fdt = fdt; + ovcs->overlay_root = overlay_root; + ovcs->new_fdt = new_fdt;INIT_LIST_HEAD (&ovcs->ovcs_list);
@@ -762,7 +763,7 @@ static int init_overlay_changeset(struct overlay_changeset *ovcs, cnt =0 ;/* fragment nodes */ -for_each_child_of_node (tree, node) { +for_each_child_of_node (overlay_root, node) { overlay_node =of_get_child_by_name (node,"__overlay__" );if (overlay_node) { cnt++;
@@ -770,7 +771,7 @@ static int init_overlay_changeset(struct overlay_changeset *ovcs, } } - node =of_get_child_by_name (tree,"__symbols__" ); + node =of_get_child_by_name (overlay_root,"__symbols__" );if (node) { cnt++;of_node_put (node);
@@ -783,7 +784,7 @@ static int init_overlay_changeset(struct overlay_changeset *ovcs, } cnt =0 ; -for_each_child_of_node (tree, node) { +for_each_child_of_node (overlay_root, node) { overlay_node =of_get_child_by_name (node,"__overlay__" );if (!overlay_node)continue ;
@@ -805,7 +806,7 @@ static int init_overlay_changeset(struct overlay_changeset *ovcs,* if there is a symbols fragment in ovcs->fragments[i] it is * the final element in the array */ - node =of_get_child_by_name (tree,"__symbols__" ); + node =of_get_child_by_name (overlay_root,"__symbols__" );if (node) { ovcs->symbols_fragment =1 ; fragment = &fragments[cnt];
@@ -859,12 +860,12 @@ static void free_overlay_changeset(struct overlay_changeset *ovcs) }kfree (ovcs->fragments);/* -* There should be no live pointers into ovcs->overlay_tree and -* ovcs->fdt due to the policy that overlay notifiers are not allowed -* to retain pointers into the overlay devicetree. +* There should be no live pointers into ovcs->overlay_root and +* ovcs->new_fdt due to the policy that overlay notifiers are not +* allowed to retain pointers into the overlay devicetree. */ -kfree (ovcs->overlay_tree); -kfree (ovcs->fdt); +kfree (ovcs->overlay_root); +kfree (ovcs->new_fdt);kfree (ovcs); }
@@ -872,16 +873,15 @@ static void free_overlay_changeset(struct overlay_changeset *ovcs)* internal documentation * * of_overlay_apply() - Create and apply an overlay changeset -* @fdt: base of memory allocated to hold the aligned FDT -* @tree: Expanded overlay device tree -* @ovcs_id: Pointer to overlay changeset id +* @new_fdt: Memory allocated to hold the aligned FDT +* @overlay_root: Expanded overlay device tree +* @ovcs_id: Pointer to overlay changeset id * * Creates and applies an overlay changeset. * * If an error occurs in a pre-apply notifier, then no changes are made * to the device tree. * -* A non-zero return value will not have created the changeset if error is from: * - parameter checks * - building the changeset
@@ -911,8 +911,8 @@ static void free_overlay_changeset(struct overlay_changeset *ovcs)* id is returned to *ovcs_id. */ -static int of_overlay_apply (const void *fdt,struct device_node *tree, -int *ovcs_id) +static int of_overlay_apply (const void *new_fdt, +struct device_node *overlay_root,int *ovcs_id) {struct overlay_changeset *ovcs;int ret =0 , ret_revert, ret_tmp;
@@ -924,16 +924,16 @@ static int of_overlay_apply(const void *fdt, struct device_node *tree,if (devicetree_corrupt ()) {pr_err ("devicetree state suspect, refuse to apply overlay\n" ); -kfree (fdt); -kfree (tree); +kfree (new_fdt); +kfree (overlay_root); ret = -EBUSY ; goto out; } ovcs =kzalloc (sizeof (*ovcs),GFP_KERNEL );if (!ovcs) { -kfree (fdt); -kfree (tree); +kfree (new_fdt); +kfree (overlay_root); ret = -ENOMEM ; goto out; }
@@ -941,20 +941,20 @@ static int of_overlay_apply(const void *fdt, struct device_node *tree,of_overlay_mutex_lock ();mutex_lock (&of_mutex); - ret =of_resolve_phandles (tree); + ret =of_resolve_phandles (overlay_root);if (ret) goto err_free_tree; - ret =init_overlay_changeset (ovcs, fdt, tree); + ret =init_overlay_changeset (ovcs, new_fdt, overlay_root);if (ret) goto err_free_tree;/* -* after overlay_notify(), ovcs->overlay_tree related pointers may have +* After overlay_notify(), ovcs->overlay_root related pointers may have * leaked to drivers, so can not kfree() tree, aka ovcs->overlay_tree; * and can not free memory containing aligned fdt. The aligned fdt -* is contained within the memory at ovcs->fdt, possibly at an offset -* from ovcs->fdt. +* is contained within the memory at ovcs->new_fdt, possibly at an +* offset from ovcs->new_fdt. */ ret =overlay_notify (ovcs,OF_OVERLAY_PRE_APPLY );if (ret) {
@@ -996,8 +996,8 @@ static int of_overlay_apply(const void *fdt, struct device_node *tree, goto out_unlock; err_free_tree: -kfree (fdt); -kfree (tree); +kfree (new_fdt); +kfree (overlay_root); err_free_overlay_changeset:free_overlay_changeset (ovcs);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 7/107 of: overlay: rework overlay apply and remove kfree()s
In reply to Greg Kroah-HartmanFrom: Frank Rowand <[email protected]>
[ Upstream commit 067c098766c6af667a9002d4e33cf1f3c998abbe ]
Fix various kfree() issues related to of_overlay_apply().
- Double kfree() of fdt and tree when init_overlay_changeset() returns an error.
- free_overlay_changeset() free the root of the unflattened overlay (variable tree) instead of the memory that contains the unflattened overlay.
- For the case of a failure during applying an overlay, move kfree() of new_fdt and overlay_mem into free_overlay_changeset(), which is called by the function that allocated them.
- For the case of removing an overlay, the kfree() of new_fdt and overlay_mem remains in free_overlay_changeset().
- Check return value of of_fdt_unflatten_tree() for error instead of checking the returned value of overlay_root.
- When storing pointers to allocated objects in ovcs, do so as near to the allocation as possible instead of in deeply layered function.
More clearly document policy related to lifetime of pointers into overlay memory.
Double kfree()
Stable-dep-of: 39affd1fdf65 ("of: overlay: Fix missing of_node_put() in error case of init_overlay_changeset()")
--- Documentation/devicetree/overlay-notes.rst | 30 ++- drivers/of/overlay.c | 263 ++++++++++----------- include/linux/of.h | 3 +- 3 files changed, 153 insertions(+), 143 deletions(-)
Documentation/devicetree/overlay-notes.rst +26 -4
@@ -119,10 +119,32 @@ Finally, if you need to remove all overlays in one-go, just call of_overlay_remove_all() which will remove every single one in the correct order. -In addition, there is the option to register notifiers that get called on +There is the option to register notifiers that get called on overlay operations. See of_overlay_notifier_register/unregister and enum of_overlay_notify_action for details. -Note that a notifier callback is not supposed to store pointers to a device -tree node or its content beyond OF_OVERLAY_POST_REMOVE corresponding to the -respective node it received. +A notifier callback for OF_OVERLAY_PRE_APPLY, OF_OVERLAY_POST_APPLY, or +OF_OVERLAY_PRE_REMOVE may store pointers to a device tree node in the overlay +or its content but these pointers must not persist past the notifier callback +for OF_OVERLAY_POST_REMOVE. The memory containing the overlay will be +kfree()ed after OF_OVERLAY_POST_REMOVE notifiers are called. Note that the +memory will be kfree()ed even if the notifier for OF_OVERLAY_POST_REMOVE +returns an error. + +The changeset notifiers in drivers/of/dynamic.c are a second type of notifier +that could be triggered by applying or removing an overlay. These notifiers +are not allowed to store pointers to a device tree node in the overlay +or its content. The overlay code does not protect against such pointers +remaining active when the memory containing the overlay is freed as a result +of removing the overlay. + +Any other code that retains a pointer to the overlay nodes or data is +considered to be a bug because after removing the overlay the pointer +will refer to freed memory. + +Users of overlays must be especially aware of the overall operations that +occur on the system to ensure that other kernel code does not retain any +pointers to the overlay nodes or data. Any example of an inadvertent use +of such pointers is if a driver or subsystem module is loaded after an +overlay has been applied, and the driver or subsystem scans the entire +devicetree or a large portion of it, including the overlay nodes.
drivers/of/overlay.c +125 -138
508 lines not on this page · raw message
include/linux/of.h +2 -1
@@ -1486,7 +1486,8 @@ static inline bool of_device_is_system_power_controller(const struct device_node*/ enum of_overlay_notify_action { -OF_OVERLAY_PRE_APPLY =0 , +OF_OVERLAY_INIT =0 ,/* kzalloc() of ovcs sets this value */ +OF_OVERLAY_PRE_APPLY ,OF_OVERLAY_POST_APPLY ,OF_OVERLAY_PRE_REMOVE ,OF_OVERLAY_POST_REMOVE ,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 8/107 of: overlay: Fix missing of_node_put() in error case of init_overlay_changeset()
In reply to Greg Kroah-HartmanFrom: Kunihiko Hayashi <[email protected]>
[ Upstream commit 39affd1fdf65983904fafc07cf607cff737eaf30 ]
In init_overlay_changeset(), the variable "node" is from of_get_child_by_name(), and the "node" should be discarded in error case.
--- drivers/of/overlay.c | 1 + 1 file changed, 1 insertion(+)
drivers/of/overlay.c +1 -0
@@ -818,6 +818,7 @@ static int init_overlay_changeset(struct overlay_changeset *ovcs)if (!fragment->target) {pr_err ("symbols in overlay, but not in live tree\n" ); ret = -EINVAL ; +of_node_put (node); goto err_out; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 9/107 power: supply: ab8500: Fix external_power_changed race
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
[ Upstream commit a5299ce4e96f3e8930e9c051b28d8093ada87b08 ]
ab8500_btemp_external_power_changed() dereferences di->btemp_psy, which gets sets in ab8500_btemp_probe() like this:
di->btemp_psy = devm_power_supply_register(dev, &ab8500_btemp_desc,
&psy_cfg);As soon as devm_power_supply_register() has called device_add() the external_power_changed callback can get called. So there is a window where ab8500_btemp_external_power_changed() may get called while di->btemp_psy has not been set yet leading to a NULL pointer dereference.
Fixing this is easy. The external_power_changed callback gets passed the power_supply which will eventually get stored in di->btemp_psy, so ab8500_btemp_external_power_changed() can simply directly use the passed in psy argument which is always valid.
And the same applies to ab8500_fg_external_power_changed().
--- drivers/power/supply/ab8500_btemp.c | 6 ++---- drivers/power/supply/ab8500_fg.c | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-)
drivers/power/supply/ab8500_btemp.c +2 -4
@@ -902,10 +902,8 @@ static int ab8500_btemp_get_ext_psy_data(struct device *dev, void *data)*/ static void ab8500_btemp_external_power_changed (struct power_supply *psy) { -struct ab8500_btemp *di =power_supply_get_drvdata (psy); - -class_for_each_device (power_supply_class,NULL , - di->btemp_psy, ab8500_btemp_get_ext_psy_data); +class_for_each_device (power_supply_class,NULL , psy, + ab8500_btemp_get_ext_psy_data); }/* ab8500 btemp driver interrupts and their respective isr */
drivers/power/supply/ab8500_fg.c +2 -4
@@ -2384,10 +2384,8 @@ static int ab8500_fg_init_hw_registers(struct ab8500_fg *di)*/ static void ab8500_fg_external_power_changed (struct power_supply *psy) { -struct ab8500_fg *di =power_supply_get_drvdata (psy); - -class_for_each_device (power_supply_class,NULL , - di->fg_psy, ab8500_fg_get_ext_psy_data); +class_for_each_device (power_supply_class,NULL , psy, + ab8500_fg_get_ext_psy_data); }/**
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 10/107 power: supply: sc27xx: Fix external_power_changed race
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
[ Upstream commit 4d5c129d6c8993fe96e9ae712141eedcb9ca68c2 ]
sc27xx_fgu_external_power_changed() dereferences data->battery, which gets sets in ab8500_btemp_probe() like this:
data->battery = devm_power_supply_register(dev, &sc27xx_fgu_desc,
&fgu_cfg);As soon as devm_power_supply_register() has called device_add() the external_power_changed callback can get called. So there is a window where sc27xx_fgu_external_power_changed() may get called while data->battery has not been set yet leading to a NULL pointer dereference.
Fixing this is easy. The external_power_changed callback gets passed the power_supply which will eventually get stored in data->battery, so sc27xx_fgu_external_power_changed() can simply directly use the passed in psy argument which is always valid.
After this change sc27xx_fgu_external_power_changed() is reduced to just "power_supply_changed(psy);" and it has the same prototype. While at it simply replace it with making the external_power_changed callback directly point to power_supply_changed.
--- drivers/power/supply/sc27xx_fuel_gauge.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
drivers/power/supply/sc27xx_fuel_gauge.c +1 -8
@@ -733,13 +733,6 @@ static int sc27xx_fgu_set_property(struct power_supply *psy,return ret; } -static void sc27xx_fgu_external_power_changed (struct power_supply *psy) -{ -struct sc27xx_fgu_data *data =power_supply_get_drvdata (psy); - -power_supply_changed (data->battery); -} -static int sc27xx_fgu_property_is_writeable (struct power_supply *psy,enum power_supply_property psp) {
@@ -774,7 +767,7 @@ static const struct power_supply_desc sc27xx_fgu_desc = { .num_properties = ARRAY_SIZE(sc27xx_fgu_props), .get_property = sc27xx_fgu_get_property, .set_property = sc27xx_fgu_set_property, - .external_power_changed = sc27xx_fgu_external_power_changed, + .external_power_changed = power_supply_changed, .property_is_writeable = sc27xx_fgu_property_is_writeable, .no_thermal = true, };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 11/107 power: supply: bq27xxx: Use mod_delayed_work() instead of cancel() + schedule()
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
[ Upstream commit 59dddea9879713423c7b2ade43c423bb71e0d216 ]
Use mod_delayed_work() instead of separate cancel_delayed_work_sync() + schedule_delayed_work() calls.
--- drivers/power/supply/bq27xxx_battery.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/power/supply/bq27xxx_battery.c +2 -4
@@ -1083,10 +1083,8 @@ static int poll_interval_param_set(const char *val, const struct kernel_param *kreturn ret;mutex_lock (&bq27xxx_list_lock); -list_for_each_entry (di, &bq27xxx_battery_devices, list) { -cancel_delayed_work_sync (&di->work); -schedule_delayed_work (&di->work,0 ); - } +list_for_each_entry (di, &bq27xxx_battery_devices, list) +mod_delayed_work (system_wq, &di->work,0 );mutex_unlock (&bq27xxx_list_lock);return ret;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 12/107 ARM: dts: vexpress: add missing cache properties
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 328acc5657c6197753238d7ce0a6924ead829347 ]
As all level 2 and level 3 caches are unified, add required cache-unified property to fix warnings like:
vexpress-v2p-ca5s.dtb: cache-controller@2c0f0000: 'cache-unified' is a required property
--- arch/arm/boot/dts/vexpress-v2p-ca5s.dts | 1 + 1 file changed, 1 insertion(+)
arch/arm/boot/dts/vexpress-v2p-ca5s.dts +1 -0
@@ -132,6 +132,7 @@ L2: cache-controller@2c0f0000 { reg = <0x2c0f0000 0x1000>; interrupts = <0 84 4>; cache-level = <2>; + cache-unified; }; pmu {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 13/107 tools: gpio: fix debounce_period_us output of lsgpio
In reply to Greg Kroah-HartmanFrom: Milo Spadacini <[email protected]>
[ Upstream commit eb4b8eca1bad98f4b8574558a74f041f9acb5a54 ]
Fix incorrect output that could occur when more attributes are used and GPIO_V2_LINE_ATTR_ID_DEBOUNCE is not the first one.
--- tools/gpio/lsgpio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/gpio/lsgpio.c +1 -1
@@ -94,7 +94,7 @@ static void print_attributes(struct gpio_v2_line_info *info)for (i =0 ; i < info->num_attrs; i++) {if (info->attrs[i].id ==GPIO_V2_LINE_ATTR_ID_DEBOUNCE )fprintf (stdout,", debounce_period=%dusec" , - info->attrs[0 ].debounce_period_us); + info->attrs[i].debounce_period_us); } }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 14/107 power: supply: Ratelimit no data debug output
In reply to Greg Kroah-HartmanFrom: Marek Vasut <[email protected]>
[ Upstream commit 155c45a25679f571c2ae57d10db843a9dfc63430 ]
Reduce the amount of output this dev_dbg() statement emits into logs, otherwise if system software polls the sysfs entry for data and keeps getting -ENODATA, it could end up filling the logs up.
This does in fact make systemd journald choke, since during boot the sysfs power supply entries are polled and if journald starts at the same time, the journal is just being repeatedly filled up, and the system stops on trying to start journald without booting any further.
--- drivers/power/supply/power_supply_sysfs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/power/supply/power_supply_sysfs.c +2 -1
@@ -276,7 +276,8 @@ static ssize_t power_supply_show_property(struct device *dev,if (ret <0 ) {if (ret == -ENODATA ) -dev_dbg (dev,"driver has no data for `%s' property\n" , +dev_dbg_ratelimited (dev, +"driver has no data for `%s' property\n" , attr->attr.name);else if (ret != -ENODEV && ret != -EAGAIN ) dev_err_ratelimited(dev,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 15/107 platform/x86: asus-wmi: Ignore WMI events with codes 0x7B, 0xC0
In reply to Greg Kroah-HartmanFrom: Alexandru Sorodoc <[email protected]>
[ Upstream commit 362c1f2ec82cb65940e1c73e15a395a7a891fc6f ]
On ASUS GU604V the key 0x7B is issued when the charger is connected or disconnected, and key 0xC0 is issued when an external display is connected or disconnected.
This commit maps them to KE_IGNORE to slience kernel messages about unknown keys, such as:
kernel: asus_wmi: Unknown key code 0x7b
--- drivers/platform/x86/asus-nb-wmi.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/platform/x86/asus-nb-wmi.c +2 -0
@@ -550,6 +550,7 @@ static const struct key_entry asus_nb_wmi_keymap[] = { { KE_KEY, 0x71, { KEY_F13 } }, /* General-purpose button */ { KE_IGNORE, 0x79, }, /* Charger type dectection notification */ { KE_KEY, 0x7a, { KEY_ALS_TOGGLE } }, /* Ambient Light Sensor Toggle */ + { KE_IGNORE, 0x7B, }, /* Charger connect/disconnect notification */ { KE_KEY, 0x7c, { KEY_MICMUTE } }, { KE_KEY, 0x7D, { KEY_BLUETOOTH } }, /* Bluetooth Enable */ { KE_KEY, 0x7E, { KEY_BLUETOOTH } }, /* Bluetooth Disable */
@@ -575,6 +576,7 @@ static const struct key_entry asus_nb_wmi_keymap[] = { { KE_KEY, 0xA6, { KEY_SWITCHVIDEOMODE } }, /* SDSP CRT + TV + HDMI */ { KE_KEY, 0xA7, { KEY_SWITCHVIDEOMODE } }, /* SDSP LCD + CRT + TV + HDMI */ { KE_KEY, 0xB5, { KEY_CALC } }, + { KE_IGNORE, 0xC0, }, /* External display connect/disconnect notification */ { KE_KEY, 0xC4, { KEY_KBDILLUMUP } }, { KE_KEY, 0xC5, { KEY_KBDILLUMDOWN } }, { KE_IGNORE, 0xC6, }, /* Ambient Light Sensor notification */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 16/107 regulator: Fix error checking for debugfs_create_dir
In reply to Greg Kroah-HartmanFrom: Osama Muhammad <[email protected]>
[ Upstream commit 2bf1c45be3b8f3a3f898d0756c1282f09719debd ]
This patch fixes the error checking in core.c in debugfs_create_dir. The correct way to check if an error occurred is 'IS_ERR' inline function.
--- drivers/regulator/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/regulator/core.c +2 -2
@@ -5193,7 +5193,7 @@ static void rdev_init_debugfs(struct regulator_dev *rdev) } rdev->debugfs =debugfs_create_dir (rname, debugfs_root); -if (!rdev->debugfs) { +if (IS_ERR (rdev->debugfs)) {rdev_warn (rdev,"Failed to create debugfs directory\n" );return ; }
@@ -6103,7 +6103,7 @@ static int __init regulator_init(void) ret =class_register (®ulator_class); debugfs_root =debugfs_create_dir ("regulator" ,NULL ); -if (!debugfs_root) +if (IS_ERR (debugfs_root))pr_warn ("regulator: Failed to create debugfs directory\n" );#ifdef CONFIG_DEBUG_FS
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 17/107 irqchip/gic-v3: Disable pseudo NMIs on Mediatek devices w/ firmware issues
In reply to Greg Kroah-HartmanFrom: Douglas Anderson <[email protected]>
[ Upstream commit 44bd78dd2b8897f59b7e3963f088caadb7e4f047 ]
Some Chromebooks with Mediatek SoCs have a problem where the firmware doesn't properly save/restore certain GICR registers. Newer Chromebooks should fix this issue and we may be able to do firmware updates for old Chromebooks. At the moment, the only known issue with these Chromebooks is that we can't enable "pseudo NMIs" since the priority register can be lost. Enabling "pseudo NMIs" on Chromebooks with the problematic firmware causes crashes and freezes.
Let's detect devices with this problem and then disable "pseudo NMIs" on them. We'll detect the problem by looking for the presence of the "mediatek,broken-save-restore-fw" property in the GIC device tree node. Any devices with fixed firmware will not have this property.
Our detection plan works because we never bake a Chromebook's device tree into firmware. Instead, device trees are always bundled with the kernel. We'll update the device trees of all affected Chromebooks and then we'll never enable "pseudo NMI" on a kernel that is bundled with old device trees. When a firmware update is shipped that fixes this issue it will know to patch the device tree to remove the property.
In order to make this work, the quick detection mechanism of the GICv3 code is extended to be able to look for properties in addition to looking at "compatible".
--- drivers/irqchip/irq-gic-common.c | 8 ++++++-- drivers/irqchip/irq-gic-common.h | 1 + drivers/irqchip/irq-gic-v3.c | 20 ++++++++++++++++++++ 3 files changed, 27 insertions(+), 2 deletions(-)
drivers/irqchip/irq-gic-common.c +6 -2
@@ -16,7 +16,11 @@ void gic_enable_of_quirks(const struct device_node *np, const struct gic_quirk *quirks, void *data) {for (; quirks->desc; quirks++) { -if (!of_device_is_compatible (np, quirks->compatible)) +if (quirks->compatible && + !of_device_is_compatible (np, quirks->compatible)) +continue ; +if (quirks->property && + !of_property_read_bool (np, quirks->property))continue ;if (quirks->init (data)) pr_info("GIC: enabling workaround for %s\n",
@@ -28,7 +32,7 @@ void gic_enable_quirks(u32 iidr, const struct gic_quirk *quirks, void *data) {for (; quirks->desc; quirks++) { -if (quirks->compatible) +if (quirks->compatible || quirks->property)continue ;if (quirks->iidr != (quirks->mask & iidr))continue ;
drivers/irqchip/irq-gic-common.h +1 -0
@@ -13,6 +13,7 @@struct gic_quirk {const char *desc;const char *compatible; +const char *property;bool (*init)(void *data);u32 iidr;u32 mask;
drivers/irqchip/irq-gic-v3.c +20 -0
@@ -35,6 +35,7 @@#define FLAGS_WORKAROUND_GICR_WAKER_MSM8996 (1ULL << 0)#define FLAGS_WORKAROUND_CAVIUM_ERRATUM_38539 (1ULL << 1) +#define FLAGS_WORKAROUND_MTK_GICR_SAVE (1ULL << 2)#define GIC_IRQ_TYPE_PARTITION (GIC_IRQ_TYPE_LPI + 1)
@@ -1646,6 +1647,15 @@ static bool gic_enable_quirk_msm8996(void *data)return true; } +static bool gic_enable_quirk_mtk_gicr (void *data) +{ +struct gic_chip_data *d = data; + + d->flags |=FLAGS_WORKAROUND_MTK_GICR_SAVE ; + +return true; +} +static bool gic_enable_quirk_cavium_38539 (void *data) {struct gic_chip_data *d = data;
@@ -1681,6 +1691,11 @@ static const struct gic_quirk gic_quirks[] = { .compatible = "qcom,msm8996-gic-v3", .init = gic_enable_quirk_msm8996, }, + { + .desc = "GICv3: Mediatek Chromebook GICR save problem", + .property = "mediatek,broken-save-restore-fw", + .init = gic_enable_quirk_mtk_gicr, + }, { .desc = "GICv3: HIP06 erratum 161010803", .iidr = 0x0204043b,
@@ -1717,6 +1732,11 @@ static void gic_enable_nmi_support(void)if (!gic_prio_masking_enabled ())return ; +if (gic_data.flags &FLAGS_WORKAROUND_MTK_GICR_SAVE ) { +pr_warn ("Skipping NMI enable due to firmware issues\n" ); +return ; + } + ppi_nmi_refs =kcalloc (gic_data.ppi_nr,sizeof (*ppi_nmi_refs),GFP_KERNEL );if (!ppi_nmi_refs)return ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 18/107 power: supply: Fix logic checking if system is running from battery
In reply to Greg Kroah-HartmanFrom: Mario Limonciello <[email protected]>
[ Upstream commit 95339f40a8b652b5b1773def31e63fc53c26378a ]
The logic used for power_supply_is_system_supplied() counts all power supplies and assumes that the system is running from AC if there is either a non-battery power-supply reporting to be online or if no power-supplies exist at all.
The second rule is for desktop systems, that don't have any battery/charger devices. These systems will incorrectly report to be powered from battery once a device scope power-supply is registered (e.g. a HID device), since these power-supplies increase the counter.
Apart from HID devices, recent dGPUs provide UCSI power supplies on a desktop systems. The dGPU by default doesn't have anything plugged in so it's 'offline'. This makes power_supply_is_system_supplied() return 0 with a count of 1 meaning all drivers that use this get a wrong judgement.
To fix this case adjust the logic to also examine the scope of the power supply. If the power supply is deemed a device power supply, then don't count it.
--- drivers/power/supply/power_supply_core.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/power/supply/power_supply_core.c +6 -2
@@ -347,6 +347,10 @@ static int __power_supply_is_system_supplied(struct device *dev, void *data)struct power_supply *psy =dev_get_drvdata (dev);unsigned int *count = data; +if (!psy->desc->get_property (psy,POWER_SUPPLY_PROP_SCOPE , &ret)) +if (ret.intval ==POWER_SUPPLY_SCOPE_DEVICE ) +return 0 ; + (*count)++;if (psy->desc->type !=POWER_SUPPLY_TYPE_BATTERY ) if (!psy->desc->get_property(psy, POWER_SUPPLY_PROP_ONLINE,
@@ -365,8 +369,8 @@ int power_supply_is_system_supplied(void) __power_supply_is_system_supplied);/* -* If no power class device was found at all, most probably we are -* running on a desktop system, so assume we are on mains power. +* If no system scope power class device was found at all, most probably we +* are running on a desktop system, so assume we are on mains power. */ if (count ==0 )return 1 ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 19/107 btrfs: scrub: try harder to mark RAID56 block groups read-only
In reply to Greg Kroah-HartmanFrom: Qu Wenruo <[email protected]>
[ Upstream commit 7561551e7ba870b9659083b95feb520fb2dacce3 ]
Currently we allow a block group not to be marked read-only for scrub.
But for RAID56 block groups if we require the block group to be read-only, then we're allowed to use cached content from scrub stripe to reduce unnecessary RAID56 reads.
So this patch would:
- Make btrfs_inc_block_group_ro() try harder
During my tests, for cases like btrfs/061 and btrfs/064, we can hit ENOSPC from btrfs_inc_block_group_ro() calls during scrub.
The reason is if we only have one single data chunk, and trying to scrub it, we won't have any space left for any newer data writes.
But this check should be done by the caller, especially for scrub cases we only temporarily mark the chunk read-only.
And newer data writes would always try to allocate a new data chunk when needed.
- Return error for scrub if we failed to mark a RAID56 chunk read-only
--- fs/btrfs/block-group.c | 14 ++++++++++++-- fs/btrfs/scrub.c | 9 ++++++++- 2 files changed, 20 insertions(+), 3 deletions(-)
fs/btrfs/block-group.c +12 -2
@@ -2576,10 +2576,20 @@ int btrfs_inc_block_group_ro(struct btrfs_block_group *cache, } ret =inc_block_group_ro (cache,0 ); -if (!do_chunk_alloc || ret == -ETXTBSY ) - goto unlock_out;if (!ret) goto out; +if (ret == -ETXTBSY ) + goto unlock_out; + +/* +* Skip chunk alloction if the bg is SYSTEM, this is to avoid system +* chunk allocation storm to exhaust the system chunk array. Otherwise +* we still want to try our best to mark the block group read-only. +*/ +if (!do_chunk_alloc && ret == -ENOSPC && + (cache->flags &BTRFS_BLOCK_GROUP_SYSTEM )) + goto unlock_out; + alloc_flags =btrfs_get_alloc_profile (fs_info, cache->space_info->flags); ret =btrfs_chunk_alloc (trans, alloc_flags,CHUNK_ALLOC_FORCE );if (ret <0 )
fs/btrfs/scrub.c +8 -1
@@ -3812,13 +3812,20 @@ int scrub_enumerate_chunks(struct scrub_ctx *sctx,if (ret ==0 ) { ro_set =1 ; - }else if (ret == -ENOSPC && !sctx->is_dev_replace) { + }else if (ret == -ENOSPC && !sctx->is_dev_replace && + !(cache->flags &BTRFS_BLOCK_GROUP_RAID56_MASK )) {/* * btrfs_inc_block_group_ro return -ENOSPC when it * failed in creating new chunk for metadata. * It is not a problem for scrub, because * metadata are always cowed, and our scrub paused * commit_transactions. +* +* For RAID56 chunks, we have to mark them read-only +* for scrub, as later we would use our own cache +* out of RAID56 realm. +* Thus we want the RAID56 bg to be marked RO to +* prevent RMW from screwing up out cache. */ ro_set =0 ; }else if (ret == -ETXTBSY ) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 20/107 btrfs: handle memory allocation failure in btrfs_csum_one_bio
In reply to Greg Kroah-HartmanFrom: Johannes Thumshirn <[email protected]>
[ Upstream commit 806570c0bb7b4847828c22c4934fcf2dc8fc572f ]
Since f8a53bb58ec7 ("btrfs: handle checksum generation in the storage layer") the failures of btrfs_csum_one_bio() are handled via bio_end_io().
This means, we can return BLK_STS_RESOURCE from btrfs_csum_one_bio() in case the allocation of the ordered sums fails.
This also fixes a syzkaller report, where injecting a failure into the kvzalloc() call results in a BUG_ON().
--- fs/btrfs/file-item.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/btrfs/file-item.c +3 -1
@@ -700,7 +700,9 @@ blk_status_t btrfs_csum_one_bio(struct btrfs_inode *inode, struct bio *bio, sums =kvzalloc (btrfs_ordered_sum_size (fs_info, bytes_left),GFP_KERNEL );memalloc_nofs_restore (nofs_flag); -BUG_ON (!sums);/* -ENOMEM */ +if (!sums) +return BLK_STS_RESOURCE ; + sums->len = bytes_left; ordered =btrfs_lookup_ordered_extent (inode, offset);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 21/107 ASoC: soc-pcm: test if a BE can be prepared
In reply to Greg Kroah-HartmanFrom: Ranjani Sridharan <[email protected]>
[ Upstream commit e123036be377ddf628226a7c6d4f9af5efd113d3 ]
In the BE hw_params configuration, the existing code checks if any of the existing FEs are prepared, running, paused or suspended - and skips the configuration in those cases. This allows multiple calls of hw_params which the ALSA state machine supports.
This check is not handled for the prepare stage, which can lead to the same BE being prepared multiple times. This patch adds a check similar to that of the hw_params, with the main difference being that the suspended state is allowed: the ALSA state machine allows a transition from suspended to prepared with hw_params skipped.
This problem was detected on Intel IPC4/SoundWire devices, where the BE dailink .prepare stage is used to configure the SoundWire stream with a bank switch. Multiple .prepare calls lead to conflicts with the .trigger operation with IPC4 configurations. This problem was not detected earlier on Intel devices, HDaudio BE dailinks detect that the link is already prepared and skip the configuration, and for IPC3 devices there is no BE trigger.
--- include/sound/soc-dpcm.h | 4 ++++ sound/soc/soc-pcm.c | 20 ++++++++++++++++++++ 2 files changed, 24 insertions(+)
include/sound/soc-dpcm.h +4 -0
@@ -123,6 +123,10 @@ int snd_soc_dpcm_can_be_free_stop(struct snd_soc_pcm_runtime *fe,int snd_soc_dpcm_can_be_params (struct snd_soc_pcm_runtime *fe,struct snd_soc_pcm_runtime *be,int stream); +/* can this BE perform prepare */ +int snd_soc_dpcm_can_be_prepared (struct snd_soc_pcm_runtime *fe, +struct snd_soc_pcm_runtime *be,int stream); +/* is the current PCM operation for this FE ? */ int snd_soc_dpcm_fe_can_update (struct snd_soc_pcm_runtime *fe,int stream);
sound/soc/soc-pcm.c +20 -0
@@ -2398,6 +2398,9 @@ int dpcm_be_dai_prepare(struct snd_soc_pcm_runtime *fe, int stream)if (!snd_soc_dpcm_be_can_update (fe, be, stream))continue ; +if (!snd_soc_dpcm_can_be_prepared (fe, be, stream)) +continue ; + if ((be->dpcm[stream].state != SND_SOC_DPCM_STATE_HW_PARAMS) && (be->dpcm[stream].state != SND_SOC_DPCM_STATE_STOP) && (be->dpcm[stream].state != SND_SOC_DPCM_STATE_SUSPEND) &&
@@ -3047,3 +3050,20 @@ int snd_soc_dpcm_can_be_params(struct snd_soc_pcm_runtime *fe,return snd_soc_dpcm_check_state (fe, be, stream, state,ARRAY_SIZE (state)); }EXPORT_SYMBOL_GPL (snd_soc_dpcm_can_be_params); + +/* +* We can only prepare a BE DAI if any of it's FE are not prepared, +* running or paused for the specified stream direction. +*/ +int snd_soc_dpcm_can_be_prepared (struct snd_soc_pcm_runtime *fe, +struct snd_soc_pcm_runtime *be,int stream) +{ +const enum snd_soc_dpcm_state state[] = { +SND_SOC_DPCM_STATE_START , +SND_SOC_DPCM_STATE_PAUSED , +SND_SOC_DPCM_STATE_PREPARE , + }; + +return snd_soc_dpcm_check_state (fe, be, stream, state,ARRAY_SIZE (state)); +} +EXPORT_SYMBOL_GPL (snd_soc_dpcm_can_be_prepared);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 22/107 parisc: Improve cache flushing for PCXL in arch_sync_dma_for_cpu()
In reply to Greg Kroah-HartmanFrom: Helge Deller <[email protected]>
[ Upstream commit 59fa12646d9f56c842b4d5b6418ed77af625c588 ]
Add comment in arch_sync_dma_for_device() and handle the direction flag in arch_sync_dma_for_cpu().
When receiving data from the device (DMA_FROM_DEVICE) unconditionally purge the data cache in arch_sync_dma_for_cpu().
--- arch/parisc/kernel/pci-dma.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)
arch/parisc/kernel/pci-dma.c +17 -1
@@ -446,11 +446,27 @@ void arch_dma_free(struct device *dev, size_t size, void *vaddr,void arch_sync_dma_for_device (phys_addr_t paddr,size_t size,enum dma_data_direction dir) { +/* +* fdc: The data cache line is written back to memory, if and only if +* it is dirty, and then invalidated from the data cache. +*/ flush_kernel_dcache_range ((unsigned long )phys_to_virt (paddr), size); }void arch_sync_dma_for_cpu (phys_addr_t paddr,size_t size,enum dma_data_direction dir) { -flush_kernel_dcache_range ((unsigned long )phys_to_virt (paddr), size); +unsigned long addr = (unsigned long )phys_to_virt (paddr); + +switch (dir) { +case DMA_TO_DEVICE : +case DMA_BIDIRECTIONAL : +flush_kernel_dcache_range (addr, size); +return ; +case DMA_FROM_DEVICE : +purge_kernel_dcache_range_asm (addr, addr + size); +return ; +default : +BUG (); + } }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 23/107 parisc: Flush gatt writes and adjust gatt mask in parisc_agp_mask_memory()
In reply to Greg Kroah-HartmanFrom: Helge Deller <[email protected]>
[ Upstream commit d703797380c540bbeac03f104ebcfc364eaf47cc ]
Flush caches after changing gatt entries and calculate entry according to SBA requirements.
--- drivers/char/agp/parisc-agp.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
drivers/char/agp/parisc-agp.c +14 -1
@@ -90,6 +90,9 @@ parisc_agp_tlbflush(struct agp_memory *mem) {struct _parisc_agp_info *info = &parisc_agp_info; +/* force fdc ops to be visible to IOMMU */ +asm_io_sync (); +writeq (info->gart_base |ilog2 (info->gart_size), info->ioc_regs+IOC_PCOM );readq (info->ioc_regs+IOC_PCOM );/* flush */ }
@@ -158,6 +161,7 @@ parisc_agp_insert_memory(struct agp_memory *mem, off_t pg_start, int type) info->gatt[j] =parisc_agp_mask_memory (agp_bridge, paddr, type); +asm_io_fdc (&info->gatt[j]); } }
@@ -191,7 +195,16 @@ static unsigned long parisc_agp_mask_memory(struct agp_bridge_data *bridge, dma_addr_t addr, int type) { - return SBA_PDIR_VALID_BIT | addr; + unsigned ci; /* coherent index */ +dma_addr_t pa; + + pa = addr &IOVP_MASK ; + asm("lci 0(%1), %0" :"=r" (ci) :"r" (phys_to_virt (pa))); + + pa |= (ci >>PAGE_SHIFT ) &0xff ;/* move CI (8 bits) into lowest byte */ + pa |=SBA_PDIR_VALID_BIT ;/* set "valid" bit */ + +return cpu_to_le64 (pa); } static void
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 24/107 MIPS: unhide PATA_PLATFORM
In reply to Greg Kroah-HartmanFrom: Manuel Lauss <[email protected]>
[ Upstream commit 75b18aac6fa39a1720677970cfcb52ecea1eb44c ]
Alchemy DB1200/DB1300 boards can use the pata_platform driver. Unhide the config entry in all of MIPS.
--- arch/mips/Kconfig | 1 + 1 file changed, 1 insertion(+)
arch/mips/Kconfig +1 -0
@@ -81,6 +81,7 @@ config MIPS select HAVE_LD_DEAD_CODE_DATA_ELIMINATION select HAVE_MOD_ARCH_SPECIFIC select HAVE_NMI + select HAVE_PATA_PLATFORM select HAVE_PERF_EVENTS select HAVE_PERF_REGS select HAVE_PERF_USER_STACK_DUMP
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 25/107 MIPS: Alchemy: fix dbdma2
In reply to Greg Kroah-HartmanFrom: Manuel Lauss <[email protected]>
[ Upstream commit 2d645604f69f3a772d58ead702f9a8e84ab2b342 ]
Various fixes for the Au1200/Au1550/Au1300 DBDMA2 code:
- skip cache invalidation if chip has working coherency circuitry.
- invalidate KSEG0-portion of the (physical) data address.
- force the dma channel doorbell write out to bus immediately with a sync.
--- arch/mips/alchemy/common/dbdma.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-)
arch/mips/alchemy/common/dbdma.c +15 -12
@@ -30,6 +30,7 @@* */ +#include <linux/dma-map-ops.h> /* for dma_default_coherent */ #include <linux/init.h> #include <linux/kernel.h> #include <linux/slab.h>
@@ -623,17 +624,18 @@ u32 au1xxx_dbdma_put_source(u32 chanid, dma_addr_t buf, int nbytes, u32 flags) dp->dscr_cmd0 &= ~DSCR_CMD0_IE ;/* -* There is an errata on the Au1200/Au1550 parts that could result -* in "stale" data being DMA'ed. It has to do with the snoop logic on -* the cache eviction buffer. DMA_NONCOHERENT is on by default for -* these parts. If it is fixed in the future, these dma_cache_inv will -* just be nothing more than empty macros. See io.h. +* There is an erratum on certain Au1200/Au1550 revisions that could +* result in "stale" data being DMA'ed. It has to do with the snoop +* logic on the cache eviction buffer. dma_default_coherent is set +* to false on these parts. */ -dma_cache_wback_inv ((unsigned long )buf, nbytes); +if (!dma_default_coherent) +dma_cache_wback_inv (KSEG0ADDR (buf), nbytes); dp->dscr_cmd0 |=DSCR_CMD0_V ;/* Let it rip */ wmb ();/* drain writebuffer */ dma_cache_wback_inv ((unsigned long )dp,sizeof (*dp)); ctp->chan_ptr->ddma_dbell =0 ; +wmb ();/* force doorbell write out to dma engine */ /* Get next descriptor pointer. */ ctp->put_ptr =phys_to_virt (DSCR_GET_NXTPTR (dp->dscr_nxtptr));
@@ -685,17 +687,18 @@ u32 au1xxx_dbdma_put_dest(u32 chanid, dma_addr_t buf, int nbytes, u32 flags) dp->dscr_source1, dp->dscr_dest0, dp->dscr_dest1);#endif /* -* There is an errata on the Au1200/Au1550 parts that could result in -* "stale" data being DMA'ed. It has to do with the snoop logic on the -* cache eviction buffer. DMA_NONCOHERENT is on by default for these -* parts. If it is fixed in the future, these dma_cache_inv will just -* be nothing more than empty macros. See io.h. +* There is an erratum on certain Au1200/Au1550 revisions that could +* result in "stale" data being DMA'ed. It has to do with the snoop +* logic on the cache eviction buffer. dma_default_coherent is set +* to false on these parts. */ -dma_cache_inv ((unsigned long )buf, nbytes); +if (!dma_default_coherent) +dma_cache_inv (KSEG0ADDR (buf), nbytes); dp->dscr_cmd0 |=DSCR_CMD0_V ;/* Let it rip */ wmb ();/* drain writebuffer */ dma_cache_wback_inv ((unsigned long )dp,sizeof (*dp)); ctp->chan_ptr->ddma_dbell =0 ; +wmb ();/* force doorbell write out to dma engine */ /* Get next descriptor pointer. */ ctp->put_ptr =phys_to_virt (DSCR_GET_NXTPTR (dp->dscr_nxtptr));
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 26/107 mips: Move initrd_start check after initrd address sanitisation.
In reply to Greg Kroah-HartmanFrom: Liviu Dudau <[email protected]>
[ Upstream commit 4897a898a216058dec55e5e5902534e6e224fcdf ]
PAGE_OFFSET is technically a virtual address so when checking the value of initrd_start against it we should make sure that it has been sanitised from the values passed by the bootloader. Without this change, even with a bootloader that passes correct addresses for an initrd, we are failing to load it on MT7621 boards, for example.
--- arch/mips/kernel/setup.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
arch/mips/kernel/setup.c +5 -4
@@ -156,10 +156,6 @@ static unsigned long __init init_initrd(void)pr_err ("initrd start must be page aligned\n" ); goto disable; } -if (initrd_start <PAGE_OFFSET ) { -pr_err ("initrd start < PAGE_OFFSET\n" ); - goto disable; - }/* * Sanitize initrd addresses. For example firmware
@@ -172,6 +168,11 @@ static unsigned long __init init_initrd(void) initrd_end = (unsigned long )__va (end); initrd_start = (unsigned long )__va (__pa (initrd_start)); +if (initrd_start <PAGE_OFFSET ) { +pr_err ("initrd start < PAGE_OFFSET\n" ); + goto disable; + } +ROOT_DEV = Root_RAM0;return PFN_UP (end); disable:
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 27/107 ASoC: dwc: move DMA init to snd_soc_dai_driver probe()
In reply to Greg Kroah-HartmanFrom: Maxim Kochetkov <[email protected]>
[ Upstream commit 011a8719d6105dcb48077ea7a6a88ac019d4aa50 ]
When using DMA mode we are facing with Oops:
[ 396.458157] Unable to handle kernel access to user memory without uaccess routines at virtual address 000000000000000c [ 396.469374] Oops [#1] [ 396.471839] Modules linked in: [ 396.475144] CPU: 0 PID: 114 Comm: arecord Not tainted 6.0.0-00164-g9a8eccdaf2be-dirty #68 [ 396.483619] Hardware name: YMP ELCT FPGA (DT) [ 396.488156] epc : dmaengine_pcm_open+0x1d2/0x342 [ 396.493227] ra : dmaengine_pcm_open+0x1d2/0x342 [ 396.498140] epc : ffffffff807fe346 ra : ffffffff807fe346 sp : ffffffc804e138f0 [ 396.505602] gp : ffffffff817bf730 tp : ffffffd8042c8ac0 t0 : 6500000000000000 [ 396.513045] t1 : 0000000000000064 t2 : 656e69676e65616d s0 : ffffffc804e13990 [ 396.520477] s1 : ffffffd801b86a18 a0 : 0000000000000026 a1 : ffffffff816920f8 [ 396.527897] a2 : 0000000000000010 a3 : fffffffffffffffe a4 : 0000000000000000 [ 396.535319] a5 : 0000000000000000 a6 : ffffffd801b87040 a7 : 0000000000000038 [ 396.542740] s2 : ffffffd801b94a00 s3 : 0000000000000000 s4 : ffffffd80427f5e8 [ 396.550153] s5 : ffffffd80427f5e8 s6 : ffffffd801b44410 s7 : fffffffffffffff5 [ 396.557569] s8 : 0000000000000800 s9 : 0000000000000001 s10: ffffffff8066d254 [ 396.564978] s11: ffffffd8059cf768 t3 : ffffffff817d5577 t4 : ffffffff817d5577 [ 396.572391] t5 : ffffffff817d5578 t6 : ffffffc804e136e8 [ 396.577876] status: 0000000200000120 badaddr: 000000000000000c cause: 000000000000000d [ 396.586007] [<ffffffff806839f4>] snd_soc_component_open+0x1a/0x68 [ 396.592439] [<ffffffff807fdd62>] __soc_pcm_open+0xf0/0x502 [ 396.598217] [<ffffffff80685d86>] soc_pcm_open+0x2e/0x4e [ 396.603741] [<ffffffff8066cea4>] snd_pcm_open_substream+0x442/0x68e [ 396.610313] [<ffffffff8066d1ea>] snd_pcm_open+0xfa/0x212 [ 396.615868] [<ffffffff8066d39c>] snd_pcm_capture_open+0x3a/0x60 [ 396.622048] [<ffffffff8065b35a>] snd_open+0xa8/0x17a [ 396.627421] [<ffffffff801ae036>] chrdev_open+0xa0/0x218 [ 396.632893] [<ffffffff801a5a28>] do_dentry_open+0x17c/0x2a6 [ 396.638713] [<ffffffff801a6d9a>] vfs_open+0x1e/0x26 [ 396.643850] [<ffffffff801b8544>] path_openat+0x96e/0xc96 [ 396.649518] [<ffffffff801b9390>] do_filp_open+0x7c/0xf6 [ 396.655034] [<ffffffff801a6ff2>] do_sys_openat2+0x8a/0x11e [ 396.660765] [<ffffffff801a735a>] sys_openat+0x50/0x7c [ 396.666068] [<ffffffff80003aca>] ret_from_syscall+0x0/0x2 [ 396.674964] ---[ end trace 0000000000000000 ]---
It happens because of play_dma_data/capture_dma_data pointers are NULL. Current implementation assigns these pointers at snd_soc_dai_driver startup() callback and reset them back to NULL at shutdown(). But soc_pcm_open() sequence uses DMA pointers in dmaengine_pcm_open() before snd_soc_dai_driver startup().
Most generic DMA capable I2S drivers use snd_soc_dai_driver probe() callback to init DMA pointers only once at probe. So move DMA init to dw_i2s_dai_probe and drop shutdown() and startup() callbacks.
--- sound/soc/dwc/dwc-i2s.c | 41 +++++++++-------------------------------- 1 file changed, 9 insertions(+), 32 deletions(-)
sound/soc/dwc/dwc-i2s.c +9 -32
@@ -183,30 +183,6 @@ static void i2s_stop(struct dw_i2s_dev *dev, } } -static int dw_i2s_startup (struct snd_pcm_substream *substream, -struct snd_soc_dai *cpu_dai) -{ -struct dw_i2s_dev *dev =snd_soc_dai_get_drvdata (cpu_dai); -union dw_i2s_snd_dma_data *dma_data =NULL ; - -if (!(dev->capability &DWC_I2S_RECORD ) && - (substream->stream ==SNDRV_PCM_STREAM_CAPTURE )) -return -EINVAL ; - -if (!(dev->capability &DWC_I2S_PLAY ) && - (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK )) -return -EINVAL ; - -if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) - dma_data = &dev->play_dma_data; -else if (substream->stream ==SNDRV_PCM_STREAM_CAPTURE ) - dma_data = &dev->capture_dma_data; - -snd_soc_dai_set_dma_data (cpu_dai, substream, (void *)dma_data); - -return 0 ; -} -static void dw_i2s_config (struct dw_i2s_dev *dev,int stream) {u32 ch_reg;
@@ -305,12 +281,6 @@ static int dw_i2s_hw_params(struct snd_pcm_substream *substream,return 0 ; } -static void dw_i2s_shutdown (struct snd_pcm_substream *substream, -struct snd_soc_dai *dai) -{ -snd_soc_dai_set_dma_data (dai, substream,NULL ); -} -static int dw_i2s_prepare (struct snd_pcm_substream *substream,struct snd_soc_dai *dai) {
@@ -382,8 +352,6 @@ static int dw_i2s_set_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt) }static const struct snd_soc_dai_ops dw_i2s_dai_ops = { - .startup = dw_i2s_startup, - .shutdown = dw_i2s_shutdown, .hw_params = dw_i2s_hw_params, .prepare = dw_i2s_prepare, .trigger = dw_i2s_trigger,
@@ -624,6 +592,14 @@ static int dw_configure_dai_by_dt(struct dw_i2s_dev *dev, } +static int dw_i2s_dai_probe (struct snd_soc_dai *dai) +{ +struct dw_i2s_dev *dev =snd_soc_dai_get_drvdata (dai); + +snd_soc_dai_init_dma_data (dai, &dev->play_dma_data, &dev->capture_dma_data); +return 0 ; +} +static int dw_i2s_probe (struct platform_device *pdev) {const struct i2s_platform_data *pdata = pdev->dev.platform_data;
@@ -642,6 +618,7 @@ static int dw_i2s_probe(struct platform_device *pdev)return -ENOMEM ; dw_i2s_dai->ops = &dw_i2s_dai_ops; + dw_i2s_dai->probe = dw_i2s_dai_probe; dev->i2s_base =devm_platform_get_and_ioremap_resource (pdev,0 , &res);if (IS_ERR (dev->i2s_base))
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 28/107 xen/blkfront: Only check REQ_FUA for writes
In reply to Greg Kroah-HartmanFrom: Ross Lagerwall <[email protected]>
[ Upstream commit b6ebaa8100090092aa602530d7e8316816d0c98d ]
The existing code silently converts read operations with the REQ_FUA bit set into write-barrier operations. This results in data loss as the backend scribbles zeroes over the data instead of returning it.
While the REQ_FUA bit doesn't make sense on a read operation, at least one well-known out-of-tree kernel module does set it and since it results in data loss, let's be safe here and only look at REQ_FUA for writes.
--- drivers/block/xen-blkfront.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/block/xen-blkfront.c +2 -1
@@ -780,7 +780,8 @@ static int blkif_queue_rw_req(struct request *req, struct blkfront_ring_info *ri ring_req->u.rw.handle = info->handle; ring_req->operation =rq_data_dir (req) ?BLKIF_OP_WRITE :BLKIF_OP_READ ; -if (req_op (req) ==REQ_OP_FLUSH || req->cmd_flags &REQ_FUA ) { +if (req_op (req) ==REQ_OP_FLUSH || + (req_op (req) ==REQ_OP_WRITE && (req->cmd_flags &REQ_FUA ))) {/* * Ideally we can do an unordered flush-to-disk. * In case the backend onlysupports barriers, use that.
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 29/107 drm:amd:amdgpu: Fix missing buffer object unlock in failure path
In reply to Greg Kroah-HartmanFrom: Sukrut Bellary <[email protected]>
[ Upstream commit 60ecaaf54886b0642d5c4744f7fbf1ff0d6b3e42 ]
smatch warning -
1) drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c:3615 gfx_v9_0_kiq_resume()
warn: inconsistent returns 'ring->mqd_obj->tbo.base.resv'.
2) drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c:6901 gfx_v10_0_kiq_resume()
warn: inconsistent returns 'ring->mqd_obj->tbo.base.resv'.
--- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 4 +++- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +3 -1
@@ -7197,8 +7197,10 @@ static int gfx_v10_0_kiq_resume(struct amdgpu_device *adev)return r; r =amdgpu_bo_kmap (ring->mqd_obj, (void **)&ring->mqd_ptr); -if (unlikely (r !=0 )) +if (unlikely (r !=0 )) { +amdgpu_bo_unreserve (ring->mqd_obj);return r; + }gfx_v10_0_kiq_init_queue (ring);amdgpu_bo_kunmap (ring->mqd_obj);
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +3 -1
@@ -3871,8 +3871,10 @@ static int gfx_v9_0_kiq_resume(struct amdgpu_device *adev)return r; r =amdgpu_bo_kmap (ring->mqd_obj, (void **)&ring->mqd_ptr); -if (unlikely (r !=0 )) +if (unlikely (r !=0 )) { +amdgpu_bo_unreserve (ring->mqd_obj);return r; + }gfx_v9_0_kiq_init_queue (ring);amdgpu_bo_kunmap (ring->mqd_obj);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 30/107 NVMe: Add MAXIO 1602 to bogus nid list.
In reply to Greg Kroah-HartmanFrom: Tatsuki Sugiura <[email protected]>
[ Upstream commit a3a9d63dcd15535e7fdf4c7c1b32bfaed762973a ]
HIKSEMI FUTURE M.2 SSD uses the same dummy nguid and eui64. I confirmed it with my two devices.
This patch marks the controller as NVME_QUIRK_BOGUS_NID.
---------------------------------------------------------
sugi@tempest:~% sudo nvme id-ctrl /dev/nvme0
NVME Identify Controller:
vid : 0x1e4b
ssvid : 0x1e4b
sn : 30096022612
mn : HS-SSD-FUTURE 2048G
fr : SN10542
rab : 0
ieee : 000000
cmic : 0
mdts : 7
cntlid : 0
ver : 0x10400
rtd3r : 0x7a120
rtd3e : 0x1e8480
oaes : 0x200
ctratt : 0x2
rrls : 0
cntrltype : 1
fguid : 00000000-0000-0000-0000-000000000000
<snip...>
---------------------------------------------------------
---------------------------------------------------------
sugi@tempest:~% sudo nvme id-ns /dev/nvme0n1
NVME Identify Namespace 1:
<snip...>
nguid : 00000000000000000000000000000000
eui64 : 0000000000000002
lbaf 0 : ms:0 lbads:9 rp:0 (in use)
---------------------------------------------------------
--- drivers/nvme/host/pci.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/nvme/host/pci.c +2 -0
@@ -3390,6 +3390,8 @@ static const struct pci_device_id nvme_id_table[] = { .driver_data = NVME_QUIRK_BOGUS_NID, }, { PCI_DEVICE(0x1e4B, 0x1202), /* MAXIO MAP1202 */ .driver_data = NVME_QUIRK_BOGUS_NID, }, + { PCI_DEVICE(0x1e4B, 0x1602), /* MAXIO MAP1602 */ + .driver_data = NVME_QUIRK_BOGUS_NID, }, { PCI_DEVICE(0x1cc1, 0x5350), /* ADATA XPG GAMMIX S50 */ .driver_data = NVME_QUIRK_BOGUS_NID, }, { PCI_DEVICE(0x1e49, 0x0021), /* ZHITAI TiPro5000 NVMe SSD */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 31/107 irqchip/gic: Correctly validate OF quirk descriptors
In reply to Greg Kroah-HartmanFrom: Marc Zyngier <[email protected]>
[ Upstream commit 91539341a3b6e9c868024a4292455dae36e6f58c ]
When checking for OF quirks, make sure either 'compatible' or 'property' is set, and give up otherwise.
This avoids non-OF quirks being randomly applied as they don't have any of the OF data that need checking.
--- drivers/irqchip/irq-gic-common.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/irqchip/irq-gic-common.c +2 -0
@@ -16,6 +16,8 @@ void gic_enable_of_quirks(const struct device_node *np, const struct gic_quirk *quirks, void *data) {for (; quirks->desc; quirks++) { +if (!quirks->compatible && !quirks->property) +continue ;if (quirks->compatible && !of_device_is_compatible (np, quirks->compatible))continue ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 32/107 io_uring: hold uring mutex around poll removal
In reply to Greg Kroah-HartmanFrom: Jens Axboe <[email protected]>
Snipped from commit 9ca9fb24d5febccea354089c41f96a8ad0d853f8 upstream.
While reworking the poll hashing in the v6.0 kernel, we ended up grabbing the ctx->uring_lock in poll update/removal. This also fixed a bug with linked timeouts racing with timeout expiry and poll removal.
Bring back just the locking fix for that.
--- io_uring/io_uring.c | 3 +++ 1 file changed, 3 insertions(+)
io_uring/io_uring.c +3 -0
@@ -6111,6 +6111,8 @@ static int io_poll_update(struct io_kiocstruct io_kiocb *preq;int ret2, ret =0 ; +io_ring_submit_lock (ctx, !(issue_flags &IO_URING_F_NONBLOCK )); +spin_lock (&ctx->completion_lock); preq =io_poll_find (ctx, req->poll_update.old_user_data, true);if (!preq || !io_poll_disarm (preq)) {
@@ -6142,6 +6144,7 @@ out:req_set_fail (req);/* complete update request, we're done with it */ io_req_complete (req, ret); +io_ring_submit_unlock (ctx, !(issue_flags &IO_URING_F_NONBLOCK ));return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 33/107 wifi: cfg80211: fix locking in regulatory disconnect
In reply to Greg Kroah-HartmanFrom: Johannes Berg <[email protected]>
commit f7e60032c6618dfd643c7210d5cba2789e2de2e2 upstream.
This should use wiphy_lock() now instead of requiring the RTNL, since __cfg80211_leave() via cfg80211_leave() is now requiring that lock to be held.
--- net/wireless/reg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/wireless/reg.c +2 -2
@@ -2423,11 +2423,11 @@ static void reg_leave_invalid_chans(strustruct wireless_dev *wdev;struct cfg80211_registered_device *rdev =wiphy_to_rdev (wiphy); -ASSERT_RTNL (); - +wiphy_lock (wiphy);list_for_each_entry (wdev, &rdev->wiphy.wdev_list, list)if (!reg_wdev_chan_valid (wiphy, wdev))cfg80211_leave (rdev, wdev); +wiphy_unlock (wiphy); }static void reg_check_chans_work (struct work_struct *work)
Greg Kroah-Hartman
maintainerPATCH 34/107 wifi: cfg80211: fix double lock bug in reg_wdev_chan_valid()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
commit 996c3117dae4c02b38a3cb68e5c2aec9d907ec15 upstream.
The locking was changed recently so now the caller holds the wiphy_lock() lock. Taking the lock inside the reg_wdev_chan_valid() function will lead to a deadlock.
--- net/wireless/reg.c | 2 -- 1 file changed, 2 deletions(-)
net/wireless/reg.c +0 -2
@@ -2398,9 +2398,7 @@ static bool reg_wdev_chan_valid(struct wcase NL80211_IFTYPE_AP :case NL80211_IFTYPE_P2P_GO :case NL80211_IFTYPE_ADHOC : -wiphy_lock (wiphy); ret =cfg80211_reg_can_beacon_relax (wiphy, &chandef, iftype); -wiphy_unlock (wiphy);return ret;case NL80211_IFTYPE_STATION :
Greg Kroah-Hartman
maintainerPATCH 35/107 epoll: ep_autoremove_wake_function should use list_del_init_careful
In reply to Greg Kroah-HartmanFrom: Benjamin Segall <[email protected]>
commit 2192bba03d80f829233bfa34506b428f71e531e7 upstream.
autoremove_wake_function uses list_del_init_careful, so should epoll's more aggressive variant. It only doesn't because it was copied from an older wait.c rather than the most recent.
--- fs/eventpoll.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
fs/eventpoll.c +5 -1
@@ -1753,7 +1753,11 @@ static int ep_autoremove_wake_function(s {int ret =default_wake_function (wq_entry, mode, sync, key); -list_del_init (&wq_entry->entry); +/* +* Pairs with list_empty_careful in ep_poll, and ensures future loop +* iterations see the cause of this wakeup. +*/ +list_del_init_careful (&wq_entry->entry);return ret; }
Greg Kroah-Hartman
maintainerPATCH 36/107 ocfs2: fix use-after-free when unmounting read-only filesystem
In reply to Greg Kroah-HartmanFrom: Luís Henriques <[email protected]>
commit 50d927880e0f90d5cb25e897e9d03e5edacc79a8 upstream.
It's trivial to trigger a use-after-free bug in the ocfs2 quotas code using fstest generic/452. After a read-only remount, quotas are suspended and ocfs2_mem_dqinfo is freed through ->ocfs2_local_free_info(). When unmounting the filesystem, an UAF access to the oinfo will eventually cause a crash.
BUG: KASAN: slab-use-after-free in timer_delete+0x54/0xc0 Read of size 8 at addr ffff8880389a8208 by task umount/669 ... Call Trace: <TASK> ... timer_delete+0x54/0xc0 try_to_grab_pending+0x31/0x230 __cancel_work_timer+0x6c/0x270 ocfs2_disable_quotas.isra.0+0x3e/0xf0 [ocfs2] ocfs2_dismount_volume+0xdd/0x450 [ocfs2] generic_shutdown_super+0xaa/0x280 kill_block_super+0x46/0x70 deactivate_locked_super+0x4d/0xb0 cleanup_mnt+0x135/0x1f0 ... </TASK> Allocated by task 632: kasan_save_stack+0x1c/0x40 kasan_set_track+0x21/0x30 __kasan_kmalloc+0x8b/0x90 ocfs2_local_read_info+0xe3/0x9a0 [ocfs2] dquot_load_quota_sb+0x34b/0x680 dquot_load_quota_inode+0xfe/0x1a0 ocfs2_enable_quotas+0x190/0x2f0 [ocfs2] ocfs2_fill_super+0x14ef/0x2120 [ocfs2] mount_bdev+0x1be/0x200 legacy_get_tree+0x6c/0xb0 vfs_get_tree+0x3e/0x110 path_mount+0xa90/0xe10 __x64_sys_mount+0x16f/0x1a0 do_syscall_64+0x43/0x90 entry_SYSCALL_64_after_hwframe+0x72/0xdc Freed by task 650: kasan_save_stack+0x1c/0x40 kasan_set_track+0x21/0x30 kasan_save_free_info+0x2a/0x50 __kasan_slab_free+0xf9/0x150 __kmem_cache_free+0x89/0x180 ocfs2_local_free_info+0x2ba/0x3f0 [ocfs2] dquot_disable+0x35f/0xa70 ocfs2_susp_quotas.isra.0+0x159/0x1a0 [ocfs2] ocfs2_remount+0x150/0x580 [ocfs2] reconfigure_super+0x1a5/0x3a0 path_mount+0xc8a/0xe10 __x64_sys_mount+0x16f/0x1a0 do_syscall_64+0x43/0x90 entry_SYSCALL_64_after_hwframe+0x72/0xdc
--- fs/ocfs2/super.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
fs/ocfs2/super.c +4 -2
@@ -953,8 +953,10 @@ static void ocfs2_disable_quotas(structfor (type =0 ; type <OCFS2_MAXQUOTAS ; type++) {if (!sb_has_quota_loaded (sb, type))continue ; - oinfo =sb_dqinfo (sb, type)->dqi_priv; -cancel_delayed_work_sync (&oinfo->dqi_sync_work); +if (!sb_has_quota_suspended (sb, type)) { + oinfo =sb_dqinfo (sb, type)->dqi_priv; +cancel_delayed_work_sync (&oinfo->dqi_sync_work); + } inode =igrab (sb->s_dquot.files[type]);/* Turn off quotas. This will remove all dquot structures from * memory and so they will be automatically synced to global
Greg Kroah-Hartman
maintainerPATCH 37/107 ocfs2: check new file size on fallocate call
In reply to Greg Kroah-HartmanFrom: Luís Henriques <[email protected]>
commit 26a6ffff7de5dd369cdb12e38ba11db682f1dec0 upstream.
When changing a file size with fallocate() the new size isn't being checked. In particular, the FSIZE ulimit isn't being checked, which makes fstest generic/228 fail. Simply adding a call to inode_newsize_ok() fixes this issue.
--- fs/ocfs2/file.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
fs/ocfs2/file.c +7 -1
@@ -2103,14 +2103,20 @@ static long ocfs2_fallocate(struct filestruct ocfs2_space_resv sr;int change_size =1 ;int cmd =OCFS2_IOC_RESVSP64 ; +int ret =0 ;if (mode & ~(FALLOC_FL_KEEP_SIZE |FALLOC_FL_PUNCH_HOLE ))return -EOPNOTSUPP ;if (!ocfs2_writes_unwritten_extents (osb))return -EOPNOTSUPP ; -if (mode &FALLOC_FL_KEEP_SIZE ) +if (mode &FALLOC_FL_KEEP_SIZE ) { change_size =0 ; + }else { + ret =inode_newsize_ok (inode, offset + len); +if (ret) +return ret; + }if (mode &FALLOC_FL_PUNCH_HOLE ) cmd =OCFS2_IOC_UNRESVSP64 ;
Greg Kroah-Hartman
maintainerPATCH 38/107 nios2: dts: Fix tse_mac "max-frame-size" property
In reply to Greg Kroah-HartmanFrom: Janne Grunau <[email protected]>
commit 85041e12418fd0c08ff972b7729f7971afb361f8 upstream.
The given value of 1518 seems to refer to the layer 2 ethernet frame size without 802.1Q tag. Actual use of the "max-frame-size" including in the consumer of the "altr,tse-1.0" compatible is the MTU.
--- arch/nios2/boot/dts/10m50_devboard.dts | 2 +- arch/nios2/boot/dts/3c120_devboard.dts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/nios2/boot/dts/10m50_devboard.dts +1 -1
@@ -97,7 +97,7 @@ rx-fifo-depth = <8192>; tx-fifo-depth = <8192>; address-bits = <48>; - max-frame-size = <1518>; + max-frame-size = <1500>; local-mac-address = [00 00 00 00 00 00]; altr,has-supplementary-unicast; altr,enable-sup-addr = <1>;
arch/nios2/boot/dts/3c120_devboard.dts +1 -1
@@ -106,7 +106,7 @@ interrupt-names = "rx_irq", "tx_irq"; rx-fifo-depth = <8192>; tx-fifo-depth = <8192>; - max-frame-size = <1518>; + max-frame-size = <1500>; local-mac-address = [ 00 00 00 00 00 00 ]; phy-mode = "rgmii-id"; phy-handle = <&phy0>;
Greg Kroah-Hartman
maintainerPATCH 39/107 nilfs2: fix incomplete buffer cleanup in nilfs_btnode_abort_change_key()
In reply to Greg Kroah-HartmanFrom: Ryusuke Konishi <[email protected]>
commit 2f012f2baca140c488e43d27a374029c1e59098d upstream.
A syzbot fault injection test reported that nilfs_btnode_create_block, a helper function that allocates a new node block for b-trees, causes a kernel BUG for disk images where the file system block size is smaller than the page size.
This was due to unexpected flags on the newly allocated buffer head, and it turned out to be because the buffer flags were not cleared by nilfs_btnode_abort_change_key() after an error occurred during a b-tree update operation and the buffer was later reused in that state.
Fix this issue by using nilfs_btnode_delete() to abandon the unused preallocated buffer in nilfs_btnode_abort_change_key().
--- fs/nilfs2/btnode.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
fs/nilfs2/btnode.c +10 -2
@@ -285,6 +285,14 @@ void nilfs_btnode_abort_change_key(strucif (nbh ==NULL ) {/* blocksize == pagesize */ xa_erase_irq (&btnc->i_pages, newkey);unlock_page (ctxt->bh->b_page); - }else -brelse (nbh); + }else { +/* +* When canceling a buffer that a prepare operation has +* allocated to copy a node block to another location, use +* nilfs_btnode_delete() to initialize and release the buffer +* so that the buffer flags will not be in an inconsistent +* state when it is reallocated. +*/ +nilfs_btnode_delete (nbh); + } }
Greg Kroah-Hartman
maintainerPATCH 40/107 nilfs2: fix possible out-of-bounds segment allocation in resize ioctl
In reply to Greg Kroah-HartmanFrom: Ryusuke Konishi <[email protected]>
commit fee5eaecca86afa544355569b831c1f90f334b85 upstream.
Syzbot reports that in its stress test for resize ioctl, the log writing function nilfs_segctor_do_construct hits a WARN_ON in nilfs_segctor_truncate_segments().
It turned out that there is a problem with the current implementation of the resize ioctl, which changes the writable range on the device (the range of allocatable segments) at the end of the resize process.
This order is necessary for file system expansion to avoid corrupting the superblock at trailing edge. However, in the case of a file system shrink, if log writes occur after truncating out-of-bounds trailing segments and before the resize is complete, segments may be allocated from the truncated space.
The userspace resize tool was fine as it limits the range of allocatable segments before performing the resize, but it can run into this issue if the resize ioctl is called alone.
Fix this issue by changing nilfs_sufile_resize() to update the range of allocatable segments immediately after successful truncation of segment space in case of file system shrink.
--- fs/nilfs2/sufile.c | 9 +++++++++ 1 file changed, 9 insertions(+)
fs/nilfs2/sufile.c +9 -0
@@ -779,6 +779,15 @@ int nilfs_sufile_resize(struct inode *su goto out_header; sui->ncleansegs -= nsegs - newnsegs; + +/* +* If the sufile is successfully truncated, immediately adjust +* the segment allocation space while locking the semaphore +* "mi_sem" so that nilfs_sufile_alloc() never allocates +* segments in the truncated space. +*/ + sui->allocmax = newnsegs -1 ; + sui->allocmin =0 ; } kaddr =kmap_atomic (header_bh->b_page);
Greg Kroah-Hartman
maintainerPATCH 41/107 kexec: support purgatories with .text.hot sections
In reply to Greg Kroah-HartmanFrom: Ricardo Ribalda <[email protected]>
commit 8652d44f466ad5772e7d1756e9457046189b0dfc upstream.
Patch series "kexec: Fix kexec_file_load for llvm16 with PGO", v7.
When upreving llvm I realised that kexec stopped working on my test platform.
The reason seems to be that due to PGO there are multiple .text sections on the purgatory, and kexec does not supports that.
This patch (of 4):
Clang16 links the purgatory text in two sections when PGO is in use:
[ 1] .text PROGBITS 0000000000000000 00000040
00000000000011a1 0000000000000000 AX 0 0 16
[ 2] .rela.text RELA 0000000000000000 00003498
0000000000000648 0000000000000018 I 24 1 8
...
[17] .text.hot. PROGBITS 0000000000000000 00003220
000000000000020b 0000000000000000 AX 0 0 1
[18] .rela.text.hot. RELA 0000000000000000 00004428
0000000000000078 0000000000000018 I 24 17 8And both of them have their range [sh_addr ... sh_addr+sh_size] on the area pointed by e_entry.
This causes that image->start is calculated twice, once for .text and another time for .text.hot. The second calculation leaves image->start in a random location.
Because of this, the system crashes immediately after:
kexec_core: Starting new kernel
--- kernel/kexec_file.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
kernel/kexec_file.c +13 -1
@@ -910,10 +910,22 @@ static int kexec_purgatory_setup_sechdrs } offset =ALIGN (offset, align); + +/* +* Check if the segment contains the entry point, if so, +* calculate the value of image->start based on it. +* If the compiler has produced more than one .text section +* (Eg: .text.hot), they are generally after the main .text +* section, and they shall not be used to calculate +* image->start. So do not re-calculate image->start if it +* is not set to the initial value, and warn the user so they +* have a chance to fix their purgatory's linker script. +*/ if (sechdrs[i].sh_flags &SHF_EXECINSTR && pi->ehdr->e_entry >= sechdrs[i].sh_addr && pi->ehdr->e_entry < (sechdrs[i].sh_addr - + sechdrs[i].sh_size)) { + + sechdrs[i].sh_size) && + !WARN_ON (kbuf->image->start != pi->ehdr->e_entry)) { kbuf->image->start -= sechdrs[i].sh_addr; kbuf->image->start += kbuf->mem + offset; }
Greg Kroah-Hartman
maintainerPATCH 42/107 x86/purgatory: remove PGO flags
In reply to Greg Kroah-HartmanFrom: Ricardo Ribalda <[email protected]>
commit 97b6b9cbba40a21c1d9a344d5c1991f8cfbf136e upstream.
If profile-guided optimization is enabled, the purgatory ends up with multiple .text sections. This is not supported by kexec and crashes the system.
--- arch/x86/purgatory/Makefile | 5 +++++ 1 file changed, 5 insertions(+)
arch/x86/purgatory/Makefile +5 -0
@@ -14,6 +14,11 @@ $(obj)/sha256.o: $(srctree)/lib/crypto/s CFLAGS_sha256.o := -D__DISABLE_EXPORTS +# When profile-guided optimization is enabled, llvm emits two different +# overlapping text sections, which is not supported by kexec. Remove profile +# optimization flags. +KBUILD_CFLAGS := $(filter-out -fprofile-sample-use=% -fprofile-use=%,$(KBUILD_CFLAGS)) + # When linking purgatory.ro with -r unresolved symbols are not checked, # also link a purgatory.chk binary without -r to check for unresolved symbols. PURGATORY_LDFLAGS := -e purgatory_start -nostdlib -z nodefaultlib
Greg Kroah-Hartman
maintainerPATCH 43/107 powerpc/purgatory: remove PGO flags
In reply to Greg Kroah-HartmanFrom: Ricardo Ribalda <[email protected]>
commit 20188baceb7a1463dc0bcb0c8678b69c2f447df6 upstream.
If profile-guided optimization is enabled, the purgatory ends up with multiple .text sections. This is not supported by kexec and crashes the system.
--- arch/powerpc/purgatory/Makefile | 5 +++++ 1 file changed, 5 insertions(+)
arch/powerpc/purgatory/Makefile +5 -0
@@ -4,6 +4,11 @@ KASAN_SANITIZE := n targets += trampoline_$(BITS).o purgatory.ro kexec-purgatory.c +# When profile-guided optimization is enabled, llvm emits two different +# overlapping text sections, which is not supported by kexec. Remove profile +# optimization flags. +KBUILD_CFLAGS := $(filter-out -fprofile-sample-use=% -fprofile-use=%,$(KBUILD_CFLAGS)) + LDFLAGS_purgatory.ro := -e purgatory_start -r --no-undefined $(obj)/purgatory.ro: $(obj)/trampoline_$(BITS).o FORCE
Greg Kroah-Hartman
maintainerPATCH 44/107 ALSA: usb-audio: Add quirk flag for HEM devices to enable native DSD playback
In reply to Greg Kroah-HartmanFrom: Lukasz Tyl <[email protected]>
commit 122e2cb7e1a30438cc0e8bf70d4279db245d7d5b upstream.
This commit adds new DEVICE_FLG with QUIRK_FLAG_DSD_RAW and Vendor Id for HEM devices which supports native DSD. Prior to this change Linux kernel was not enabling native DSD playback for HEM devices, and as a result, DSD audio was being converted to PCM "on the fly". HEM devices, when connected to the system, would only play audio in PCM format, even if the source material was in DSD format. With the addition of new VENDOR_FLG in the quircks.c file, the devices are now correctly recognized, and raw DSD data is transmitted to the device, allowing for native DSD playback.
--- sound/usb/quirks.c | 2 ++ 1 file changed, 2 insertions(+)
sound/usb/quirks.c +2 -0
@@ -1921,6 +1921,8 @@ static const struct usb_audio_quirk_flag QUIRK_FLAG_DSD_RAW),VENDOR_FLG (0x2ab6 ,/* T+A devices */ QUIRK_FLAG_DSD_RAW ), +VENDOR_FLG (0x3336 ,/* HEM devices */ +QUIRK_FLAG_DSD_RAW ),VENDOR_FLG (0x3353 ,/* Khadas devices */ QUIRK_FLAG_DSD_RAW ), VENDOR_FLG(0x3842, /* EVGA */
Greg Kroah-Hartman
maintainerPATCH 45/107 dm thin metadata: check fail_io before using data_sm
In reply to Greg Kroah-HartmanFrom: Li Lingfeng <[email protected]>
commit cb65b282c9640c27d3129e2e04b711ce1b352838 upstream.
Must check pmd->fail_io before using pmd->data_sm since pmd->data_sm may be destroyed by other processes.
P1(kworker) P2(message)do_worker
process_prepared
process_prepared_discard_passdown_pt2
dm_pool_dec_data_range
pool_message
commit
dm_pool_commit_metadata
↓
// commit failed
metadata_operation_failed
abort_transaction
dm_pool_abort_metadata
__open_or_format_metadata
↓
dm_sm_disk_open
↓
// open failed
// pmd->data_sm is NULL
dm_sm_dec_blocks
↓
// try to access pmd->data_sm --> UAFAs shown above, if dm_pool_commit_metadata() and dm_pool_abort_metadata() fail in pool_message process, kworker may trigger UAF.
--- drivers/md/dm-thin-metadata.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)
drivers/md/dm-thin-metadata.c +12 -8
@@ -1778,13 +1778,15 @@ int dm_thin_remove_range(struct dm_thin_int dm_pool_block_is_shared (struct dm_pool_metadata *pmd,dm_block_t b,bool *result) { -int r; +int r = -EINVAL ;uint32_t ref_count;down_read (&pmd->root_lock); - r =dm_sm_get_count (pmd->data_sm, b, &ref_count); -if (!r) - *result = (ref_count >1 ); +if (!pmd->fail_io) { + r =dm_sm_get_count (pmd->data_sm, b, &ref_count); +if (!r) + *result = (ref_count >1 ); + }up_read (&pmd->root_lock);return r;
@@ -1792,10 +1794,11 @@ int dm_pool_block_is_shared(struct dm_point dm_pool_inc_data_range (struct dm_pool_metadata *pmd,dm_block_t b,dm_block_t e) { -int r =0 ; +int r = -EINVAL ;pmd_write_lock (pmd); - r =dm_sm_inc_blocks (pmd->data_sm, b, e); +if (!pmd->fail_io) + r =dm_sm_inc_blocks (pmd->data_sm, b, e);pmd_write_unlock (pmd);return r;
@@ -1803,10 +1806,11 @@ int dm_pool_inc_data_range(struct dm_pooint dm_pool_dec_data_range (struct dm_pool_metadata *pmd,dm_block_t b,dm_block_t e) { -int r =0 ; +int r = -EINVAL ;pmd_write_lock (pmd); - r =dm_sm_dec_blocks (pmd->data_sm, b, e); +if (!pmd->fail_io) + r =dm_sm_dec_blocks (pmd->data_sm, b, e);pmd_write_unlock (pmd);return r;
Greg Kroah-Hartman
maintainerPATCH 46/107 nouveau: fix client work fence deletion race
In reply to Greg Kroah-HartmanFrom: Dave Airlie <[email protected]>
commit c8a5d5ea3ba6a18958f8d76430e4cd68eea33943 upstream.
This seems to have existed for ever but is now more apparant after commit 9bff18d13473 ("drm/ttm: use per BO cleanup workers")
My analysis: two threads are running, one in the irq signalling the fence, in dma_fence_signal_timestamp_locked, it has done the DMA_FENCE_FLAG_SIGNALLED_BIT setting, but hasn't yet reached the callbacks.
The second thread in nouveau_cli_work_ready, where it sees the fence is signalled, so then puts the fence, cleanups the object and frees the work item, which contains the callback.
Thread one goes again and tries to call the callback and causes the use-after-free.
Proposed fix: lock the fence signalled check in nouveau_cli_work_ready, so either the callbacks are done or the memory is freed.
--- drivers/gpu/drm/nouveau/nouveau_drm.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
drivers/gpu/drm/nouveau/nouveau_drm.c +10 -4
@@ -126,10 +126,16 @@ nouveau_name(struct drm_device *dev)static inline bool nouveau_cli_work_ready (struct dma_fence *fence) { -if (!dma_fence_is_signaled (fence)) -return false; -dma_fence_put (fence); -return true; +bool ret = true; + +spin_lock_irq (fence->lock); +if (!dma_fence_is_signaled_locked (fence)) + ret = false; +spin_unlock_irq (fence->lock); + +if (ret == true) +dma_fence_put (fence); +return ret; } static void
Greg Kroah-Hartman
maintainerPATCH 47/107 RDMA/uverbs: Restrict usage of privileged QKEYs
In reply to Greg Kroah-HartmanFrom: Edward Srouji <[email protected]>
commit 0cadb4db79e1d9eea66711c4031e435c2191907e upstream.
According to the IB specification rel-1.6, section 3.5.3:
"QKEYs with the most significant bit set are considered controlled QKEYs, and a HCA does not allow a consumer to arbitrarily specify a controlled QKEY."
Thus, block non-privileged users from setting such a QKEY.
--- drivers/infiniband/core/uverbs_cmd.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/infiniband/core/uverbs_cmd.c +6 -1
@@ -1851,8 +1851,13 @@ static int modify_qp(struct uverbs_attr_ attr->path_mtu = cmd->base.path_mtu;if (cmd->base.attr_mask &IB_QP_PATH_MIG_STATE ) attr->path_mig_state = cmd->base.path_mig_state; -if (cmd->base.attr_mask &IB_QP_QKEY ) +if (cmd->base.attr_mask &IB_QP_QKEY ) { +if (cmd->base.qkey &IB_QP_SET_QKEY && !capable (CAP_NET_RAW )) { + ret = -EPERM ; + goto release_qp; + } attr->qkey = cmd->base.qkey; + }if (cmd->base.attr_mask &IB_QP_RQ_PSN ) attr->rq_psn = cmd->base.rq_psn;if (cmd->base.attr_mask &IB_QP_SQ_PSN )
Greg Kroah-Hartman
maintainerPATCH 48/107 net: usb: qmi_wwan: add support for Compal RXM-G1
In reply to Greg Kroah-HartmanFrom: Wes Huang <[email protected]>
commit 863199199713908afaa47ba09332b87621c12496 upstream.
Add support for Compal RXM-G1 which is based on Qualcomm SDX55 chip. This patch adds support for two compositions:
0x9091: DIAG + MODEM + QMI_RMNET + ADB 0x90db: DIAG + DUN + RMNET + DPL + QDSS(Trace) + ADB
T: Bus=03 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 2 Spd=5000 MxCh= 0 D: Ver= 3.20 Cls=00(>ifc ) Sub=00 Prot=00 MxPS= 9 #Cfgs= 1 P: Vendor=05c6 ProdID=9091 Rev= 4.14 S: Manufacturer=QCOM S: Product=SDXPRAIRIE-MTP _SN:719AB680 S: SerialNumber=719ab680 C:* #Ifs= 4 Cfg#= 1 Atr=80 MxPwr=896mA I:* If#= 0 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=30 Driver=(none) E: Ad=81(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms E: Ad=01(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms I:* If#= 1 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=(none) E: Ad=83(I) Atr=03(Int.) MxPS= 10 Ivl=32ms E: Ad=82(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms E: Ad=02(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms I:* If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=qmi_wwan E: Ad=84(I) Atr=03(Int.) MxPS= 8 Ivl=32ms E: Ad=8e(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms E: Ad=0f(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms I:* If#= 3 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=42 Prot=01 Driver=(none) E: Ad=03(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms E: Ad=85(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms
T: Bus=03 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 2 Spd=5000 MxCh= 0 D: Ver= 3.20 Cls=00(>ifc ) Sub=00 Prot=00 MxPS= 9 #Cfgs= 1 P: Vendor=05c6 ProdID=90db Rev= 4.14 S: Manufacturer=QCOM S: Product=SDXPRAIRIE-MTP _SN:719AB680 S: SerialNumber=719ab680 C:* #Ifs= 6 Cfg#= 1 Atr=80 MxPwr=896mA I:* If#= 0 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=30 Driver=(none) E: Ad=81(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms E: Ad=01(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms I:* If#= 1 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=(none) E: Ad=83(I) Atr=03(Int.) MxPS= 10 Ivl=32ms E: Ad=82(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms E: Ad=02(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms I:* If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=qmi_wwan E: Ad=84(I) Atr=03(Int.) MxPS= 8 Ivl=32ms E: Ad=8e(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms E: Ad=0f(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms
I:* If#= 3 Alt= 0 #EPs= 1 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
E: Ad=8f(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms
I:* If#= 4 Alt= 0 #EPs= 1 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
E: Ad=85(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms
I:* If#= 5 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=42 Prot=01 Driver=(none)
E: Ad=03(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms E: Ad=86(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms
--- drivers/net/usb/qmi_wwan.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/usb/qmi_wwan.c +2 -0
@@ -1217,7 +1217,9 @@ static const struct usb_device_id produc {QMI_FIXED_INTF(0x05c6, 0x9080, 8)}, {QMI_FIXED_INTF(0x05c6, 0x9083, 3)}, {QMI_FIXED_INTF(0x05c6, 0x9084, 4)}, + {QMI_QUIRK_SET_DTR(0x05c6, 0x9091, 2)}, /* Compal RXM-G1 */ {QMI_FIXED_INTF(0x05c6, 0x90b2, 3)}, /* ublox R410M */ + {QMI_QUIRK_SET_DTR(0x05c6, 0x90db, 2)}, /* Compal RXM-G1 */ {QMI_FIXED_INTF(0x05c6, 0x920d, 0)}, {QMI_FIXED_INTF(0x05c6, 0x920d, 5)}, {QMI_QUIRK_SET_DTR(0x05c6, 0x9625, 4)}, /* YUGA CLM920-NC5 */
Greg Kroah-Hartman
maintainerPATCH 49/107 drm/amd/display: edp do not add non-edid timings
In reply to Greg Kroah-HartmanFrom: Hersen Wu <[email protected]>
commit e749dd10e5f292061ad63d2b030194bf7d7d452c upstream.
[Why] most edp support only timings from edid. applying non-edid timings, especially those timings out of edp bandwidth, may damage edp.
[How] do not add non-edid timings for edp.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +7 -1
@@ -8177,7 +8177,13 @@ static int amdgpu_dm_connector_get_modesdrm_add_modes_noedid (connector,640 ,480 ); }else {amdgpu_dm_connector_ddc_get_modes (connector, edid); -amdgpu_dm_connector_add_common_modes (encoder, connector); +/* most eDP supports only timings from its edid, +* usually only detailed timings are available +* from eDP edid. timings which are not from edid +* may damage eDP +*/ +if (connector->connector_type != DRM_MODE_CONNECTOR_eDP) +amdgpu_dm_connector_add_common_modes (encoder, connector);amdgpu_dm_connector_add_freesync_modes (connector, edid); }amdgpu_dm_fbc_init (connector);
Greg Kroah-Hartman
maintainerPATCH 50/107 drm/amdgpu: add missing radeon secondary PCI ID
In reply to Greg Kroah-HartmanFrom: Alex Deucher <[email protected]>
commit e61f67749b351c19455ce3085af2ae9af80023bc upstream.
0x5b70 is a missing RV370 secondary id. Add it so we don't try and probe it with amdgpu.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +1 -0
@@ -1557,6 +1557,7 @@ static const u16 amdgpu_unsupported_pcii0x5874 ,0x5940 ,0x5941 , +0x5b70 ,0x5b72 ,0x5b73 , 0x5b74,
Greg Kroah-Hartman
maintainerPATCH 51/107 ALSA: hda/realtek: Add a quirk for Compaq N14JP6
In reply to Greg Kroah-HartmanFrom: Edson Juliano Drosdeck <[email protected]>
commit a2a871483161014f1bcc4e9a04354b01aa77cedb upstream.
Add a quirk for Compaq N14JP6 to fixup ALC897 headset MIC no sound.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -11287,6 +11287,7 @@ static const struct snd_pci_quirk alc662SND_PCI_QUIRK (0x1b0a ,0x01b8 ,"ACER Veriton" ,ALC662_FIXUP_ACER_VERITON ),SND_PCI_QUIRK (0x1b35 ,0x1234 ,"CZC ET26" ,ALC662_FIXUP_CZC_ET26 ),SND_PCI_QUIRK (0x1b35 ,0x2206 ,"CZC P10T" ,ALC662_FIXUP_CZC_P10T ), +SND_PCI_QUIRK (0x1c6c ,0x1239 ,"Compaq N14JP6-V2" ,ALC897_FIXUP_HP_HSMIC_VERB ), #if 0/* Below is a quirk table taken from the old code.
Greg Kroah-Hartman
maintainerPATCH 52/107 Remove DECnet support from kernel
In reply to Greg Kroah-HartmanFrom: Stephen Hemminger <[email protected]>
commit 1202cdd665315c525b5237e96e0bedc76d7e754f upstream.
DECnet is an obsolete network protocol that receives more attention from kernel janitors than users. It belongs in computer protocol history museum not in Linux kernel.
It has been "Orphaned" in kernel since 2010. The iproute2 support for DECnet was dropped in 5.0 release. The documentation link on Sourceforge says it is abandoned there as well.
Leave the UAPI alone to keep userspace programs compiling. This means that there is still an empty neighbour table for AF_DECNET.
The table of /proc/sys/net entries was updated to match current directories and reformatted to be alphabetical.
--- Documentation/admin-guide/kernel-parameters.txt | 4 Documentation/admin-guide/sysctl/net.rst | 15 Documentation/networking/decnet.rst | 243 -- Documentation/networking/index.rst | 1 Documentation/userspace-api/ioctl/ioctl-number.rst | 1 MAINTAINERS | 7 arch/mips/configs/decstation_64_defconfig | 2 arch/mips/configs/decstation_defconfig | 2 arch/mips/configs/decstation_r4k_defconfig | 2 arch/mips/configs/gpr_defconfig | 2 arch/mips/configs/mtx1_defconfig | 2 arch/mips/configs/nlm_xlp_defconfig | 2 arch/mips/configs/nlm_xlr_defconfig | 2 arch/mips/configs/rm200_defconfig | 2 arch/powerpc/configs/ppc6xx_defconfig | 2 include/linux/netdevice.h | 4 include/linux/netfilter.h | 5 include/linux/netfilter_defs.h | 8 include/net/dn.h | 231 -- include/net/dn_dev.h | 199 - include/net/dn_fib.h | 167 - include/net/dn_neigh.h | 30 include/net/dn_nsp.h | 195 - include/net/dn_route.h | 115 - include/net/netns/netfilter.h | 3 include/uapi/linux/dn.h | 149 - include/uapi/linux/netfilter_decnet.h | 72 include/uapi/linux/netlink.h | 2 net/Kconfig | 2 net/Makefile | 1 net/core/dev.c | 4 net/core/neighbour.c | 3 net/decnet/Kconfig | 43 net/decnet/Makefile | 10 net/decnet/README | 8 net/decnet/af_decnet.c | 2400 --------------------- net/decnet/dn_dev.c | 1433 ------------ net/decnet/dn_fib.c | 798 ------ net/decnet/dn_neigh.c | 605 ----- net/decnet/dn_nsp_in.c | 906 ------- net/decnet/dn_nsp_out.c | 695 ------ net/decnet/dn_route.c | 1922 ---------------- net/decnet/dn_rules.c | 258 -- net/decnet/dn_table.c | 929 -------- net/decnet/dn_timer.c | 104 net/decnet/netfilter/Kconfig | 17 net/decnet/netfilter/Makefile | 6 net/decnet/netfilter/dn_rtmsg.c | 158 - net/decnet/sysctl_net_decnet.c | 362 --- net/netfilter/core.c | 10 net/netfilter/nfnetlink_hook.c | 7 51 files changed, 10 insertions(+), 12140 deletions(-)
Documentation/admin-guide/kernel-parameters.txt +0 -4
@@ -916,10 +916,6 @@ debugpat [X86] Enable PAT debugging - decnet.addr= [HW,NET] - Format: <area>[,<node>] - See also Documentation/networking/decnet.rst. - default_hugepagesz= [HW] The size of the default HugeTLB page. This is the size represented by the legacy /proc/ hugepages
Documentation/admin-guide/sysctl/net.rst +8 -7
@@ -34,13 +34,14 @@ Table : Subdirectories in /proc/sys/net ========= =================== = ========== ================== Directory Content Directory Content ========= =================== = ========== ================== - core General parameter appletalk Appletalk protocol - unix Unix domain sockets netrom NET/ROM - 802 E802 protocol ax25 AX25 - ethernet Ethernet protocol rose X.25 PLP layer - ipv4 IP version 4 x25 X.25 protocol - bridge Bridging decnet DEC net - ipv6 IP version 6 tipc TIPC + 802 E802 protocol mptcp Multipath TCP + appletalk Appletalk protocol netfilter Network Filter + ax25 AX25 netrom NET/ROM + bridge Bridging rose X.25 PLP layer + core General parameter tipc TIPC + ethernet Ethernet protocol unix Unix domain sockets + ipv4 IP version 4 x25 X.25 protocol + ipv6 IP version 6 ========= =================== = ========== ================== 1. /proc/sys/net/core - Network core options
Documentation/networking/decnet.rst deleted +0 -243
243 lines not on this page · raw message
Documentation/networking/index.rst +0 -1
@@ -46,7 +46,6 @@ Contents: cdc_mbim dccp dctcp - decnet dns_resolver driver eql
Documentation/userspace-api/ioctl/ioctl-number.rst +0 -1
@@ -304,7 +304,6 @@ Code Seq# Include File 0x89 00-06 arch/x86/include/asm/sockios.h 0x89 0B-DF linux/sockios.h 0x89 E0-EF linux/sockios.h SIOCPROTOPRIVATE range -0x89 E0-EF linux/dn.h PROTOPRIVATE range 0x89 F0-FF linux/sockios.h SIOCDEVPRIVATE range 0x8B all linux/wireless.h 0x8C 00-3F WiNRADiO driver
MAINTAINERS +0 -7
@@ -5205,13 +5205,6 @@ F: include/linux/tfrc.h F: include/uapi/linux/dccp.h F: net/dccp/ -DECnet NETWORK LAYER -L: [email protected] -S: Orphan -W: http://linux-decnet.sourceforge.net -F: Documentation/networking/decnet.rst -F: net/decnet/ - DECSTATION PLATFORM SUPPORT M: "Maciej W. Rozycki" <[email protected]> L: [email protected]
arch/mips/configs/decstation_64_defconfig +0 -2
@@ -53,8 +53,6 @@ CONFIG_IPV6_SUBTREES=y CONFIG_NETWORK_SECMARK=y CONFIG_IP_SCTP=m CONFIG_VLAN_8021Q=m -CONFIG_DECNET=m -CONFIG_DECNET_ROUTER=y # CONFIG_WIRELESS is not set # CONFIG_UEVENT_HELPER is not set # CONFIG_FW_LOADER is not set
arch/mips/configs/decstation_defconfig +0 -2
@@ -49,8 +49,6 @@ CONFIG_IPV6_SUBTREES=y CONFIG_NETWORK_SECMARK=y CONFIG_IP_SCTP=m CONFIG_VLAN_8021Q=m -CONFIG_DECNET=m -CONFIG_DECNET_ROUTER=y # CONFIG_WIRELESS is not set # CONFIG_UEVENT_HELPER is not set # CONFIG_FW_LOADER is not set
arch/mips/configs/decstation_r4k_defconfig +0 -2
@@ -48,8 +48,6 @@ CONFIG_IPV6_SUBTREES=y CONFIG_NETWORK_SECMARK=y CONFIG_IP_SCTP=m CONFIG_VLAN_8021Q=m -CONFIG_DECNET=m -CONFIG_DECNET_ROUTER=y # CONFIG_WIRELESS is not set # CONFIG_UEVENT_HELPER is not set # CONFIG_FW_LOADER is not set
arch/mips/configs/gpr_defconfig +0 -2
@@ -69,7 +69,6 @@ CONFIG_IP_NF_RAW=m CONFIG_IP_NF_ARPTABLES=m CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARP_MANGLE=m -CONFIG_DECNET_NF_GRABULATOR=m CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -99,7 +98,6 @@ CONFIG_ATM_MPOA=m CONFIG_ATM_BR2684=m CONFIG_BRIDGE=m CONFIG_VLAN_8021Q=m -CONFIG_DECNET=m CONFIG_LLC2=m CONFIG_ATALK=m CONFIG_DEV_APPLETALK=m
arch/mips/configs/mtx1_defconfig +0 -2
@@ -116,7 +116,6 @@ CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_MANGLE=m CONFIG_IP6_NF_RAW=m -CONFIG_DECNET_NF_GRABULATOR=m CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -146,7 +145,6 @@ CONFIG_ATM_MPOA=m CONFIG_ATM_BR2684=m CONFIG_BRIDGE=m CONFIG_VLAN_8021Q=m -CONFIG_DECNET=m CONFIG_LLC2=m CONFIG_ATALK=m CONFIG_DEV_APPLETALK=m
arch/mips/configs/nlm_xlp_defconfig +0 -2
@@ -200,7 +200,6 @@ CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_MANGLE=m CONFIG_IP6_NF_RAW=m CONFIG_IP6_NF_SECURITY=m -CONFIG_DECNET_NF_GRABULATOR=m CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -234,7 +233,6 @@ CONFIG_ATM_BR2684=m CONFIG_BRIDGE=m CONFIG_VLAN_8021Q=m CONFIG_VLAN_8021Q_GVRP=y -CONFIG_DECNET=m CONFIG_LLC2=m CONFIG_ATALK=m CONFIG_DEV_APPLETALK=m
arch/mips/configs/nlm_xlr_defconfig +0 -2
@@ -198,7 +198,6 @@ CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_MANGLE=m CONFIG_IP6_NF_RAW=m CONFIG_IP6_NF_SECURITY=m -CONFIG_DECNET_NF_GRABULATOR=m CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -232,7 +231,6 @@ CONFIG_ATM_BR2684=m CONFIG_BRIDGE=m CONFIG_VLAN_8021Q=m CONFIG_VLAN_8021Q_GVRP=y -CONFIG_DECNET=m CONFIG_LLC2=m CONFIG_ATALK=m CONFIG_DEV_APPLETALK=m
arch/mips/configs/rm200_defconfig +0 -2
@@ -116,7 +116,6 @@ CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_MANGLE=m CONFIG_IP6_NF_RAW=m -CONFIG_DECNET_NF_GRABULATOR=m CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -137,7 +136,6 @@ CONFIG_BRIDGE_EBT_REDIRECT=m CONFIG_BRIDGE_EBT_SNAT=m CONFIG_BRIDGE_EBT_LOG=m CONFIG_BRIDGE=m -CONFIG_DECNET=m CONFIG_NET_SCHED=y CONFIG_NET_SCH_CBQ=m CONFIG_NET_SCH_HTB=m
arch/powerpc/configs/ppc6xx_defconfig +0 -2
@@ -243,8 +243,6 @@ CONFIG_ATM_LANE=m CONFIG_ATM_BR2684=m CONFIG_BRIDGE=m CONFIG_VLAN_8021Q=m -CONFIG_DECNET=m -CONFIG_DECNET_ROUTER=y CONFIG_ATALK=m CONFIG_DEV_APPLETALK=m CONFIG_IPDDP=m
include/linux/netdevice.h +0 -4
@@ -1840,7 +1840,6 @@ enum netdev_ml_priv_type {* @tipc_ptr: TIPC specific data * @atalk_ptr: AppleTalk link * @ip_ptr: IPv4 specific data -* @dn_ptr: DECnet specific data * @ip6_ptr: IPv6 specific data * @ax25_ptr: AX.25 specific data * @ieee80211_ptr: IEEE 802.11 specific data, assign before registering
@@ -2123,9 +2122,6 @@ struct net_device {void *atalk_ptr;#endif struct in_device __rcu *ip_ptr; -#if IS_ENABLED (CONFIG_DECNET ) -struct dn_dev __rcu *dn_ptr; -#endif struct inet6_dev __rcu *ip6_ptr;#if IS_ENABLED (CONFIG_AX25 )void *ax25_ptr;
include/linux/netfilter.h +0 -5
@@ -243,11 +243,6 @@ static inline int nf_hook(u_int8_t pf, u hook_head =rcu_dereference (net->nf.hooks_bridge[hook]);#endif break ; -#if IS_ENABLED (CONFIG_DECNET ) -case NFPROTO_DECNET : - hook_head =rcu_dereference (net->nf.hooks_decnet[hook]); -break ; -#endif default :WARN_ON_ONCE (1 );break ;
include/linux/netfilter_defs.h +0 -8
@@ -7,14 +7,6 @@/* in/out/forward only */ #define NF_ARP_NUMHOOKS 3 -/* max hook is NF_DN_ROUTE (6), also see uapi/linux/netfilter_decnet.h */ -#define NF_DN_NUMHOOKS 7 - -#if IS_ENABLED (CONFIG_DECNET ) -/* Largest hook number + 1, see uapi/linux/netfilter_decnet.h */ -#define NF_MAX_HOOKS NF_DN_NUMHOOKS -#else #define NF_MAX_HOOKS NF_INET_NUMHOOKS -#endif #endif
include/net/dn.h deleted +0 -231
231 lines not on this page · raw message
include/net/dn_dev.h deleted +0 -199
199 lines not on this page · raw message
include/net/dn_fib.h deleted +0 -167
167 lines not on this page · raw message
include/net/dn_neigh.h deleted +0 -30
@@ -1,30 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _NET_DN_NEIGH_H -#define _NET_DN_NEIGH_H - -/* -* The position of the first two fields of -* this structure are critical - SJW -*/ -struct dn_neigh { -struct neighbour n; -__le16 addr; -unsigned long flags; -#define DN_NDFLAG_R1 0x0001/* Router L1 */ -#define DN_NDFLAG_R2 0x0002/* Router L2 */ -#define DN_NDFLAG_P3 0x0004/* Phase III Node */ -unsigned long blksize; -__u8 priority; -}; - -void dn_neigh_init (void ); -void dn_neigh_cleanup (void ); -int dn_neigh_router_hello (struct net *net,struct sock *sk,struct sk_buff *skb); -int dn_neigh_endnode_hello (struct net *net,struct sock *sk,struct sk_buff *skb); -void dn_neigh_pointopoint_hello (struct sk_buff *skb); -int dn_neigh_elist (struct net_device *dev,unsigned char *ptr,int n); -int dn_to_neigh_output (struct net *net,struct sock *sk,struct sk_buff *skb); - -extern struct neigh_table dn_neigh_table; - -#endif /* _NET_DN_NEIGH_H */
include/net/dn_nsp.h deleted +0 -195
195 lines not on this page · raw message
include/net/dn_route.h deleted +0 -115
115 lines not on this page · raw message
include/net/netns/netfilter.h +0 -3
@@ -24,9 +24,6 @@ struct netns_nf {#ifdef CONFIG_NETFILTER_FAMILY_BRIDGE struct nf_hook_entries __rcu *hooks_bridge[NF_INET_NUMHOOKS ];#endif -#if IS_ENABLED (CONFIG_DECNET ) -struct nf_hook_entries __rcu *hooks_decnet[NF_DN_NUMHOOKS ]; -#endif #if IS_ENABLED (CONFIG_NF_DEFRAG_IPV4 )unsigned int defrag_ipv4_users;#endif
include/uapi/linux/dn.h deleted +0 -149
149 lines not on this page · raw message
include/uapi/linux/netfilter_decnet.h deleted +0 -72
72 lines not on this page · raw message
include/uapi/linux/netlink.h +1 -1
@@ -20,7 +20,7 @@#define NETLINK_CONNECTOR 11#define NETLINK_NETFILTER 12/* netfilter subsystem */ #define NETLINK_IP6_FW 13 -#define NETLINK_DNRTMSG 14/* DECnet routing messages */ +#define NETLINK_DNRTMSG 14/* DECnet routing messages (obsolete) */ #define NETLINK_KOBJECT_UEVENT 15/* Kernel messages to userspace */ #define NETLINK_GENERIC 16/* leave room for NETLINK_DM (DM Events) */
net/Kconfig +0 -2
@@ -204,7 +204,6 @@ config BRIDGE_NETFILTER source "net/netfilter/Kconfig" source "net/ipv4/netfilter/Kconfig" source "net/ipv6/netfilter/Kconfig" -source "net/decnet/netfilter/Kconfig" source "net/bridge/netfilter/Kconfig" endif
@@ -221,7 +220,6 @@ source "net/802/Kconfig" source "net/bridge/Kconfig" source "net/dsa/Kconfig" source "net/8021q/Kconfig" -source "net/decnet/Kconfig" source "net/llc/Kconfig" source "drivers/net/appletalk/Kconfig" source "net/x25/Kconfig"
net/Makefile +0 -1
@@ -38,7 +38,6 @@ obj-$(CONFIG_AF_KCM) += kcm/ obj-$(CONFIG_STREAM_PARSER) += strparser/ obj-$(CONFIG_ATM) += atm/ obj-$(CONFIG_L2TP) += l2tp/ -obj-$(CONFIG_DECNET) += decnet/ obj-$(CONFIG_PHONET) += phonet/ ifneq ($(CONFIG_VLAN_8021Q),) obj-y += 8021q/
net/core/dev.c +1 -3
@@ -10619,9 +10619,7 @@ void netdev_run_todo(void)BUG_ON (!list_empty (&dev->ptype_specific));WARN_ON (rcu_access_pointer (dev->ip_ptr));WARN_ON (rcu_access_pointer (dev->ip6_ptr)); -#if IS_ENABLED (CONFIG_DECNET ) -WARN_ON (dev->dn_ptr); -#endif +if (dev->priv_destructor) dev->priv_destructor (dev);if (dev->needs_free_netdev)
net/core/neighbour.c +0 -3
@@ -1794,9 +1794,6 @@ static struct neigh_table *neigh_find_tacase AF_INET6 : tbl = neigh_tables[NEIGH_ND_TABLE ];break ; -case AF_DECnet: - tbl = neigh_tables[NEIGH_DN_TABLE ]; -break ; }return tbl;
net/decnet/Kconfig deleted +0 -43
43 lines not on this page · raw message
net/decnet/Makefile deleted +0 -10
@@ -1,10 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 - -obj-$(CONFIG_DECNET) += decnet.o - -decnet-y := af_decnet.o dn_nsp_in.o dn_nsp_out.o \ - dn_route.o dn_dev.o dn_neigh.o dn_timer.o -decnet-$(CONFIG_DECNET_ROUTER) += dn_fib.o dn_rules.o dn_table.o -decnet-y += sysctl_net_decnet.o - -obj-$(CONFIG_NETFILTER) += netfilter/
net/decnet/README deleted +0 -8
@@ -1,8 +0,0 @@ - Linux DECnet Project - ====================== - -The documentation for this kernel subsystem is available in the -Documentation/networking subdirectory of this distribution and also -on line at http://www.chygwyn.com/DECnet/ - -Steve Whitehouse <[email protected]>
net/decnet/af_decnet.c deleted +0 -2400
1,280 lines not on this page · raw message
net/decnet/dn_dev.c deleted +0 -1433
1,433 lines not on this page · raw message
net/decnet/dn_fib.c deleted +0 -798
798 lines not on this page · raw message
net/decnet/dn_neigh.c deleted +0 -605
605 lines not on this page · raw message
net/decnet/dn_nsp_in.c deleted +0 -906
906 lines not on this page · raw message
net/decnet/dn_nsp_out.c deleted +0 -695
695 lines not on this page · raw message
net/decnet/dn_route.c deleted +0 -1922
1,922 lines not on this page · raw message
net/decnet/dn_rules.c deleted +0 -258
258 lines not on this page · raw message
net/decnet/dn_table.c deleted +0 -929
929 lines not on this page · raw message
net/decnet/dn_timer.c deleted +0 -104
104 lines not on this page · raw message
net/decnet/netfilter/Kconfig deleted +0 -17
Lines of this file are not shown. View the raw message.
net/decnet/netfilter/Makefile deleted +0 -6
Lines of this file are not shown. View the raw message.
net/decnet/netfilter/dn_rtmsg.c deleted +0 -158
158 lines not on this page · raw message
net/decnet/sysctl_net_decnet.c deleted +0 -362
362 lines not on this page · raw message
net/netfilter/core.c +0 -10
Lines of this file are not shown. View the raw message.
net/netfilter/nfnetlink_hook.c +0 -7
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.
Re: [PATCH 5.15 052/107] Remove DECnet support from kernel
Quoted 7 lines · Greg Kroah-Hartman
From: Stephen Hemminger <[email protected]>
commit
1202cdd665315c525b5237e96e0bedc76d7e754fupstream.DECnet is an obsolete network protocol that receives more attention from kernel janitors than users. It belongs in computer protocol history museum not in Linux kernel.
[...]
May I ask, how and why this patch made it into the stable kernels?
Did this patch "fix a real bug that bothers people?", is Documentation/process/stable-kernel-rules.rs obsolete or something else? I apologize, if I overlooked something obvious.
Background:
No, we don't use DECNET since 25 years or so. But still any change of kconfig patterns bothers us.
We automatically build each released kernel and our config evolves automatically following a cp config-mpi .config && make olddefconfig && make savedefconfig && cp defconfig config-mpi && git commit -m"Update for new kernel version" config-mpi pattern.
Historically, the changes of savedefconfig in a stable series were zero most of the time. Only when we start a new series with a -rc1 kernel, we had to fix things because, for example, we lost one config because of reorganization of dependencies or a module went from tristate to binary as CONFIG_UNIX did or an option was renamed as CONFIG_AUTOFS4_FS was. But we only needed to care for that seldomly and in expected moments, when we actually want to move our fleet to a new series and manually compare and test the config.
These changes complicate continuous upgrades and add distractions during reviews and investigations of unintended config changes. And of course, they increase the risk that you lose a feature you depend on during a upgrade from one release of a stable series to another. That's fine, if the changes are really justified by real world problems and maybe these are. But I failed to find the explicit reasoning here.
Another example of such a change in stable for 5.15 might be the addition of CONFIG_MICROCODE_LATE_LOADING with default=y [1] which removed the feature by default, which had to be detected and undone.
I just wanted to note, that backporting "Cleanup"-Patches to stable has cost for the users, too, even if it was true, that nobody needs the removed feature and that there are no unforeseen side effects or other bugs in the patches. It produces manual workload. So I hope, the "only real bug fixes"-policy is not generally obsoleted?
Best
Donald
[1]: https://lore.kernel.org/stable/[email protected]/
Signature · 3 lines
Donald Buczek [email protected] Tel: +49 30 8413 1433
Greg Kroah-Hartman
maintainerRe: [PATCH 5.15 052/107] Remove DECnet support from kernel
Quoted 5 lines · Donald Buczek
Quoted 4 lines · Greg Kroah-Hartman
From: Stephen Hemminger <[email protected]>
commit
1202cdd665315c525b5237e96e0bedc76d7e754fupstream.
Quoted 8 lines
Quoted 3 lines
DECnet is an obsolete network protocol that receives more attention from kernel janitors than users. It belongs in computer protocol history museum not in Linux kernel.
[...]
May I ask, how and why this patch made it into the stable kernels?
Did this patch "fix a real bug that bothers people?"
Yes.
Quoted 1 line
No, we don't use DECNET since 25 years or so. But still any change of kconfig patterns bothers us.
We have never guaranteed that Kconfig options will never change in stable kernel releases, sorry. This happens all the time with things being removed, and fixes happening to add new ones for various reasons as you have seen.
Quoted 1 line
We automatically build each released kernel and our config evolves automatically following a
cp config-mpi .config && make olddefconfig && make savedefconfig && cp defconfig config-mpi && git commit -m"Update for new kernel version" config-mpipattern.
You might want to manually check this as well, because as you have seen, sometimes things are added that you need to keep things working properly (like the spectre/meltdown-like fixes.)
thanks,
greg k-h
Re: [PATCH 5.15 052/107] Remove DECnet support from kernel
Quoted 9 lines · Greg Kroah-Hartman
Quoted 8 lines · Donald Buczek
Quoted 7 lines · Greg Kroah-Hartman
From: Stephen Hemminger <[email protected]>
commit
1202cdd665315c525b5237e96e0bedc76d7e754fupstream.DECnet is an obsolete network protocol that receives more attention from kernel janitors than users. It belongs in computer protocol history museum not in Linux kernel.
Quoted 7 lines
Quoted 5 lines
[...]
May I ask, how and why this patch made it into the stable kernels?
Did this patch "fix a real bug that bothers people?"
Yes.
That's a rather short answer.
I can see there might be good reasons, for example some required global/api/coccinelle/tooling change and nobody sees the need and has the time to resolve conflicts in dead code. But that's just guessing. A pointer to or a few words about the need for this specific change might have helped me to understand this example better.
Quoted 4 lines
Quoted 1 line
No, we don't use DECNET since 25 years or so. But still any change of kconfig patterns bothers us.
We have never guaranteed that
Kconfigoptions will never change in stable kernel releases, sorry.
I didn't want to imply that and I don't expect it.
It's just _if_ stable really gradually opens up to anything (like code removals, backports of new features, heuristically or AI selected patches, performance patches) it IMO loses its function and we could as well follow mainline, which, I think, is what you are recommending anyway.
We've had bad surprises with more or less every mainline releases while updates in a stable series could be trusted to go 99% without thinking. Keeping productions systems on some latest stable gave us the time to identifying and fix problems with newer series before making it the designated series for all systems. This worked well.
If the policy of stable gradually changes, that's tough luck for us. I wouldn't complain but it would be good to know. And maybe Documentation/process/stable-kernel-rules.rs should be reviewed.
If, on the other hand, my impression is just plain wrong or the changes are exceptional because of current challenges like the cpu hardware related problems and the indent is to stick to the strict policy, it would be good to know, too.
Best
Donald
Quoted 13 lines
This happens all the time with things
being removed, and fixes happening to add new ones for various reasons as you have seen.Quoted 1 line
We automatically build each released kernel and our config evolves automatically following a
cp config-mpi .config && make olddefconfig && make savedefconfig && cp defconfig config-mpi && git commit -m"Update for new kernel version" config-mpipattern.You might want to manually check this as well, because as you have seen, sometimes things are added that you need to keep things working properly (like the spectre/meltdown-like fixes.)
thanks,
greg k-h
Signature · 3 lines
Donald Buczek [email protected] Tel: +49 30 8413 1433
Greg Kroah-Hartman
maintainerRe: [PATCH 5.15 052/107] Remove DECnet support from kernel
Quoted 11 lines · Donald Buczek
Quoted 2 lines · Greg Kroah-Hartman
We have never guaranteed that
Kconfigoptions will never change in stable kernel releases, sorry.I didn't want to imply that and I don't expect it.
It's just _if_ stable really gradually opens up to anything (like code removals, backports of new features, heuristically or AI selected patches, performance patches) it IMO loses its function and we could as well follow mainline, which, I think, is what you are recommending anyway.
When code is removed from stable kernel versions, it is usually for very good reasons, like what happened here. Sorry I can't go into details, but you really wanted this out of your kernel, this was a bugfix :)
Quoted 9 lines
We've had bad surprises with more or less every mainline releases while updates in a stable series could be trusted to go 99% without thinking. Keeping productions systems on some latest stable gave us the time to identifying and fix problems with newer series before making it the designated series for all systems. This worked well.
If the policy of stable gradually changes, that's tough luck for us. I wouldn't complain but it would be good to know. And maybe
Documentation/process/stable-kernel-rules.rsshould be reviewed.
If the policy changes, we will change that document, but for now, we are backporting only bugfixes that are found through explicit tagging, developer requests, manual patch review, and "compare this commit to past commits that were accepted" matching which then gets manual review.
thanks,
greg k-h
Re: [PATCH 5.15 052/107] Remove DECnet support from kernel
Quoted 13 lines · Greg Kroah-Hartman
Quoted 11 lines · Donald Buczek
Quoted 2 lines · Greg Kroah-Hartman
We have never guaranteed that
Kconfigoptions will never change in stable kernel releases, sorry.I didn't want to imply that and I don't expect it.
It's just _if_ stable really gradually opens up to anything (like code removals, backports of new features, heuristically or AI selected patches, performance patches) it IMO loses its function and we could as well follow mainline, which, I think, is what you are recommending anyway.
Quoted 3 lines
When code is removed from stable kernel versions, it is usually for very good reasons, like what happened here. Sorry I can't go into details, but you really wanted this out of your kernel, this was a bugfix :)
Thanks. I understand that this topic can not be discussed and take your word.
Quoted 6 lines
Quoted 6 lines
We've had bad surprises with more or less every mainline releases while updates in a stable series could be trusted to go 99% without thinking. Keeping productions systems on some latest stable gave us the time to identifying and fix problems with newer series before making it the designated series for all systems. This worked well.
Quoted 8 lines
Quoted 3 lines
If the policy of stable gradually changes, that's tough luck for us. I wouldn't complain but it would be good to know. And maybe
Documentation/process/stable-kernel-rules.rsshould be reviewed.If the policy changes, we will change that document, but for now, we are backporting only bugfixes that are found through explicit tagging, developer requests, manual patch review, and "compare this commit to past commits that were accepted" matching which then gets manual review.
Hmmmm, okay. For an apparent counter-example, just yesterday we had to learn about 4921792e04f2125b ("drm/amdgpu: install stub fence into potential unused fence pointers") [1] the hard way [2].
[1]: https://lore.kernel.org/stable/[email protected]/t/#u
[2]: https://gitlab.freedesktop.org/drm/amd/-/issues/2820#note_2080918
Does "compare this commit to past commits that were accepted" include anything AUTOSELected?
Best
Donald
Quoted 5 lines
thanks,
greg k-h
Signature · 3 lines
Donald Buczek [email protected] Tel: +49 30 8413 1433
Greg Kroah-Hartman
maintainerRe: [PATCH 5.15 052/107] Remove DECnet support from kernel
Quoted 35 lines · Donald Buczek
Quoted 13 lines · Greg Kroah-Hartman
Quoted 11 lines · Donald Buczek
Quoted 2 lines · Greg Kroah-Hartman
We have never guaranteed that
Kconfigoptions will never change in stable kernel releases, sorry.I didn't want to imply that and I don't expect it.
It's just _if_ stable really gradually opens up to anything (like code removals, backports of new features, heuristically or AI selected patches, performance patches) it IMO loses its function and we could as well follow mainline, which, I think, is what you are recommending anyway.
Quoted 3 lines
When code is removed from stable kernel versions, it is usually for very good reasons, like what happened here. Sorry I can't go into details, but you really wanted this out of your kernel, this was a bugfix :)
Thanks. I understand that this topic can not be discussed and take your word.
Quoted 6 lines
Quoted 6 lines
We've had bad surprises with more or less every mainline releases while updates in a stable series could be trusted to go 99% without thinking. Keeping productions systems on some latest stable gave us the time to identifying and fix problems with newer series before making it the designated series for all systems. This worked well.
Quoted 8 lines
Quoted 3 lines
If the policy of stable gradually changes, that's tough luck for us. I wouldn't complain but it would be good to know. And maybe
Documentation/process/stable-kernel-rules.rsshould be reviewed.If the policy changes, we will change that document, but for now, we are backporting only bugfixes that are found through explicit tagging, developer requests, manual patch review, and "compare this commit to past commits that were accepted" matching which then gets manual review.
Quoted 4 lines
Hmmmm, okay. For an apparent counter-example, just yesterday we had to learn about
4921792e04f2125b("drm/amdgpu: install stub fence into potential unused fence pointers") [1] the hard way [2].[1]: https://lore.kernel.org/stable/[email protected]/t/#u
[2]: https://gitlab.freedesktop.org/drm/amd/-/issues/2820#note_2080918
Bugs happen, testing is best, we are just human and we can never claim nothing will ever break at any point in time.
All we can do is fix things as quick as possible, which is what we try to do.
Quoted 1 line
Does "compare this commit to past commits that were accepted" include anything AUTOSELected?
That is what the AUTOSEL patches are, that marking is to show this is how they were chosen. There's a bunch of papers and presentations on how that process works over many years if you are curious about the details.
thanks,
greg k-h
Re: [PATCH 5.15 052/107] Remove DECnet support from kernelail
In reply to Greg Kroah-HartmanQuoted 11 lines · On Tue, 12 Sep 2023 10:15:18 +0200 Greg Kroah-Hartman…
Quoted 6 lines
It's just _if_ stable really gradually opens up to anything (like code removals, backports of new features, heuristically or AI selected patches, performance patches) it IMO loses its function and we could as well follow mainline, which, I think, is what you are recommending anyway.
When code is removed from stable kernel versions, it is usually for very good reasons, like what happened here. Sorry I can't go into details, but you really wanted this out of your kernel, this was a bugfix :)
I don't remember the details, but look at netdev mailing archives for the discussion. It was something along the lines of the zero day bot found some pre-existing old bug in DECnet, and the consensus was the fixing a corpse was not worth doing.
Greg Kroah-Hartman
maintainerPATCH 53/107 thunderbolt: dma_test: Use correct value for absent rings when creating paths
In reply to Greg Kroah-HartmanFrom: Mika Westerberg <[email protected]>
commit 70c2e03e9aaf17496c63f6e42333c012f5ae5307 upstream.
Both tb_xdomain_enable_paths() and tb_xdomain_disable_paths() expect -1, not 0, if the corresponding ring is not needed. For this reason change the driver to use correct value for the rings that are not needed.
--- drivers/thunderbolt/dma_test.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/thunderbolt/dma_test.c +4 -4
@@ -192,9 +192,9 @@ static int dma_test_start_rings(struct d } ret =tb_xdomain_enable_paths (dt->xd, dt->tx_hopid, - dt->tx_ring ? dt->tx_ring->hop :0 , + dt->tx_ring ? dt->tx_ring->hop :-1 , dt->rx_hopid, - dt->rx_ring ? dt->rx_ring->hop :0 ); + dt->rx_ring ? dt->rx_ring->hop :-1 );if (ret) {dma_test_free_rings (dt);return ret;
@@ -218,9 +218,9 @@ static void dma_test_stop_rings(struct dtb_ring_stop (dt->tx_ring); ret =tb_xdomain_disable_paths (dt->xd, dt->tx_hopid, - dt->tx_ring ? dt->tx_ring->hop :0 , + dt->tx_ring ? dt->tx_ring->hop :-1 , dt->rx_hopid, - dt->rx_ring ? dt->rx_ring->hop :0 ); + dt->rx_ring ? dt->rx_ring->hop :-1 );if (ret)dev_warn (&dt->svc->dev,"failed to disable DMA paths\n" );
Greg Kroah-Hartman
maintainerPATCH 54/107 thunderbolt: Mask ring interrupt on Intel hardware as well
In reply to Greg Kroah-HartmanFrom: Mika Westerberg <[email protected]>
commit 9f9666e65359d5047089aef97ac87c50f624ecb0 upstream.
When resuming from system sleep states the driver issues following warning on Intel hardware:
thunderbolt 0000:07:00.0: interrupt for TX ring 0 is already enabled
The reason for this is that the commit in question did not mask the ring interrupt on Intel hardware leaving the interrupt active. Fix this by masking it also in Intel hardware.
--- drivers/thunderbolt/nhi.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/thunderbolt/nhi.c +8 -3
@@ -53,9 +53,14 @@ static int ring_interrupt_index(const ststatic void nhi_mask_interrupt (struct tb_nhi *nhi,int mask,int ring) { -if (nhi->quirks &QUIRK_AUTO_CLEAR_INT ) -return ; -iowrite32 (mask, nhi->iobase +REG_RING_INTERRUPT_MASK_CLEAR_BASE + ring); +if (nhi->quirks &QUIRK_AUTO_CLEAR_INT ) { +u32 val; + + val =ioread32 (nhi->iobase +REG_RING_INTERRUPT_BASE + ring); +iowrite32 (val & ~mask, nhi->iobase +REG_RING_INTERRUPT_BASE + ring); + }else { +iowrite32 (mask, nhi->iobase +REG_RING_INTERRUPT_MASK_CLEAR_BASE + ring); + } }static void nhi_clear_interrupt (struct tb_nhi *nhi,int ring)
Greg Kroah-Hartman
maintainerPATCH 55/107 USB: serial: option: add Quectel EM061KGL series
In reply to Greg Kroah-HartmanFrom: Jerry Meng <[email protected]>
commit f1832e2b5e498e258b090af3b065b85cf8cc5161 upstream.
Add support for Quectel EM061KGL series which are based on Qualcomm SDX12 chip:
EM061KGL_LTA(0x2c7c / 0x0123): MBIM + GNSS + DIAG + NMEA + AT + QDSS + DPL EM061KGL_LMS(0x2c7c / 0x0124): MBIM + GNSS + DIAG + NMEA + AT + QDSS + DPL EM061KGL_LWW(0x2c7c / 0x6008): MBIM + GNSS + DIAG + NMEA + AT + QDSS + DPL EM061KGL_LCN(0x2c7c / 0x6009): MBIM + GNSS + DIAG + NMEA + AT + QDSS + DPL
Above products use the exact same interface layout and option driver is for interfaces DIAG, NMEA and AT.
T: Bus=03 Lev=01 Prnt=01 Port=01 Cnt=02 Dev#= 5 Spd=480 MxCh= 0 D: Ver= 2.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1 P: Vendor=2c7c ProdID=6008 Rev= 5.04 S: Manufacturer=Quectel S: Product=Quectel EM061K-GL S: SerialNumber=f6fa08b6 C:* #Ifs= 8 Cfg#= 1 Atr=a0 MxPwr=500mA A: FirstIf#= 0 IfCount= 2 Cls=02(comm.) Sub=0e Prot=00 I:* If#= 0 Alt= 0 #EPs= 1 Cls=02(comm.) Sub=0e Prot=00 Driver=cdc_mbim E: Ad=81(I) Atr=03(Int.) MxPS= 64 Ivl=32ms I: If#= 1 Alt= 0 #EPs= 0 Cls=0a(data ) Sub=00 Prot=02 Driver=cdc_mbim I:* If#= 1 Alt= 1 #EPs= 2 Cls=0a(data ) Sub=00 Prot=02 Driver=cdc_mbim E: Ad=8e(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=0f(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 2 Alt= 0 #EPs= 1 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none) E: Ad=82(I) Atr=03(Int.) MxPS= 64 Ivl=32ms I:* If#= 3 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=30 Driver=option E: Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=83(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=40 Driver=option E: Ad=85(I) Atr=03(Int.) MxPS= 10 Ivl=32ms E: Ad=84(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 5 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=40 Driver=option E: Ad=87(I) Atr=03(Int.) MxPS= 10 Ivl=32ms E: Ad=86(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=03(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
I:* If#= 6 Alt= 0 #EPs= 1 Cls=ff(vend.) Sub=ff Prot=70 Driver=(none)
E: Ad=88(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
I:* If#= 7 Alt= 0 #EPs= 1 Cls=ff(vend.) Sub=ff Prot=80 Driver=(none)
E: Ad=8f(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
--- drivers/usb/serial/option.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
drivers/usb/serial/option.c +16 -0
@@ -248,6 +248,8 @@ static void option_instat_callback(struc#define QUECTEL_VENDOR_ID 0x2c7c/* These Quectel products use Quectel's vendor ID */ #define QUECTEL_PRODUCT_EC21 0x0121 +#define QUECTEL_PRODUCT_EM061K_LTA 0x0123 +#define QUECTEL_PRODUCT_EM061K_LMS 0x0124#define QUECTEL_PRODUCT_EC25 0x0125#define QUECTEL_PRODUCT_EG91 0x0191#define QUECTEL_PRODUCT_EG95 0x0195
@@ -266,6 +268,8 @@ static void option_instat_callback(struc#define QUECTEL_PRODUCT_RM520N 0x0801#define QUECTEL_PRODUCT_EC200U 0x0901#define QUECTEL_PRODUCT_EC200S_CN 0x6002 +#define QUECTEL_PRODUCT_EM061K_LWW 0x6008 +#define QUECTEL_PRODUCT_EM061K_LCN 0x6009#define QUECTEL_PRODUCT_EC200T 0x6026#define QUECTEL_PRODUCT_RM500K 0x7001
@@ -1189,6 +1193,18 @@ static const struct usb_device_id option { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM060K, 0xff, 0x00, 0x40) }, { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM060K, 0xff, 0xff, 0x30) }, { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM060K, 0xff, 0xff, 0x40) }, + { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM061K_LCN, 0xff, 0xff, 0x30) }, + { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM061K_LCN, 0xff, 0x00, 0x40) }, + { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM061K_LCN, 0xff, 0xff, 0x40) }, + { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM061K_LMS, 0xff, 0xff, 0x30) }, + { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM061K_LMS, 0xff, 0x00, 0x40) }, + { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM061K_LMS, 0xff, 0xff, 0x40) }, + { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM061K_LTA, 0xff, 0xff, 0x30) }, + { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM061K_LTA, 0xff, 0x00, 0x40) }, + { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM061K_LTA, 0xff, 0xff, 0x40) }, + { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM061K_LWW, 0xff, 0xff, 0x30) }, + { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM061K_LWW, 0xff, 0x00, 0x40) }, + { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM061K_LWW, 0xff, 0xff, 0x40) }, { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM12, 0xff, 0xff, 0xff), .driver_info = RSVD(1) | RSVD(2) | RSVD(3) | RSVD(4) | NUMEP2 }, { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM12, 0xff, 0, 0) },
Greg Kroah-Hartman
maintainerPATCH 56/107 serial: lantiq: add missing interrupt ack
In reply to Greg Kroah-HartmanFrom: Bernhard Seibold <[email protected]>
commit 306320034e8fbe7ee1cc4f5269c55658b4612048 upstream.
Currently, the error interrupt is never acknowledged, so once active it will stay active indefinitely, causing the handler to be called in an infinite loop.
Message-ID: <[email protected]>
--- drivers/tty/serial/lantiq.c | 1 + 1 file changed, 1 insertion(+)
drivers/tty/serial/lantiq.c +1 -0
@@ -274,6 +274,7 @@ lqasc_err_int(int irq, void *_port)struct ltq_uart_port *ltq_port =to_ltq_uart_port (port);spin_lock_irqsave (<q_port->lock, flags); +__raw_writel (ASC_IRNCR_EIR , port->membase +LTQ_ASC_IRNCR );/* clear any pending interrupts */ asc_update_bits (0 ,ASCWHBSTATE_CLRPE |ASCWHBSTATE_CLRFE |ASCWHBSTATE_CLRROE , port->membase +LTQ_ASC_WHBSTATE );
Greg Kroah-Hartman
maintainerPATCH 57/107 usb: dwc3: gadget: Reset num TRBs before giving back the request
In reply to Greg Kroah-HartmanFrom: Elson Roy Serrao <[email protected]>
commit 00f8205ffcf112dcef14f8151d78075d38d22c08 upstream.
Consider a scenario where cable disconnect happens when there is an active usb reqest queued to the UDC. As part of the disconnect we would issue an end transfer with no interrupt-on-completion before giving back this request. Since we are giving back the request without skipping TRBs the num_trbs field of dwc3_request still holds the stale value previously used. Function drivers re-use same request for a given bind-unbind session and hence their dwc3_request context gets preserved across cable disconnect/connect. When such a request gets re-queued after cable connect, we would increase the num_trbs field on top of the previous stale value thus incorrectly representing the number of TRBs used. Fix this by resetting num_trbs field before giving back the request.
Message-ID: <[email protected]>
--- drivers/usb/dwc3/gadget.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/dwc3/gadget.c +1 -0
@@ -180,6 +180,7 @@ static void dwc3_gadget_del_and_unmap_relist_del (&req->list); req->remaining =0 ; req->needs_extra_trb = false; + req->num_trbs =0 ;if (req->request.status == -EINPROGRESS ) req->request.status = status;
Greg Kroah-Hartman
maintainerPATCH 58/107 RDMA/rtrs: Fix the last iu->buf leak in err path
In reply to Greg Kroah-HartmanFrom: Li Zhijian <[email protected]>
[ Upstream commit 3bf3a7c6985c625f64e73baefdaa36f1c2045a29 ]
The last iu->buf will leak if ib_dma_mapping_error() fails.
--- drivers/infiniband/ulp/rtrs/rtrs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/infiniband/ulp/rtrs/rtrs.c +3 -1
@@ -37,8 +37,10 @@ struct rtrs_iu *rtrs_iu_alloc(u32 iu_num, size_t size, gfp_t gfp_mask, goto err; iu->dma_addr =ib_dma_map_single (dma_dev, iu->buf, size, dir); -if (ib_dma_mapping_error (dma_dev, iu->dma_addr)) +if (ib_dma_mapping_error (dma_dev, iu->dma_addr)) { +kfree (iu->buf); goto err; + } iu->cqe.done = done; iu->size = size;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 59/107 RDMA/rtrs: Fix rxe_dealloc_pd warning
In reply to Greg Kroah-HartmanFrom: Li Zhijian <[email protected]>
[ Upstream commit 9c29c8c7df0688f358d2df5ddd16c97c2f7292b4 ]
In current design:
1. PD and clt_path->s.dev are shared among connections.
2. every con[n]'s cleanup phase will call destroy_con_cq_qp()
3. clt_path->s.dev will be always decreased in destroy_con_cq_qp(), and when clt_path->s.dev become zero, it will destroy PD.
4. when con[1] failed to create, con[1] will not take clt_path->s.dev, but it try to decreased clt_path->s.dev
So, in case create_cm(con[0]) succeeds but create_cm(con[1]) fails, destroy_con_cq_qp(con[1]) will be called first which will destroy the PD while this PD is still taken by con[0].
Here, we refactor the error path of create_cm() and init_conns(), so that we do the cleanup in the order they are created.
The warning occurs when destroying RXE PD whose reference count is not zero.
rnbd_client L597: Mapping device /dev/nvme0n1 on session client, (access_mode: rw, nr_poll_queues: 0)
------------[ cut here ]------------ WARNING: CPU: 0 PID: 26407 at drivers/infiniband/sw/rxe/rxe_pool.c:256 __rxe_cleanup+0x13a/0x170 [rdma_rxe] Modules linked in: rpcrdma rdma_ucm ib_iser rnbd_client libiscsi rtrs_client scsi_transport_iscsi rtrs_core rdma_cm iw_cm ib_cm crc32_generic rdma_rxe udp_tunnel ib_uverbs ib_core kmem device_dax nd_pmem dax_pmem nd_vme crc32c_intel fuse nvme_core nfit libnvdimm dm_multipath scsi_dh_rdac scsi_dh_emc scsi_dh_alua dm_mirror dm_region_hash dm_log dm_mod CPU: 0 PID: 26407 Comm: rnbd-client.sh Kdump: loaded Not tainted 6.2.0-rc6-roce-flush+ #53 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.16.0-0-gd239552ce722-prebuilt.qemu.org 04/01/2014 RIP: 0010:__rxe_cleanup+0x13a/0x170 [rdma_rxe] Code: 45 84 e4 0f 84 5a ff ff ff 48 89 ef e8 5f 18 71 f9 84 c0 75 90 be c8 00 00 00 48 89 ef e8 be 89 1f fa 85 c0 0f 85 7b ff ff ff <0f> 0b 41 bc ea ff ff ff e9 71 ff ff ff e8 84 7f 1f fa e9 d0 fe ff RSP: 0018:ffffb09880b6f5f0 EFLAGS: 00010246 RAX: 0000000000000000 RBX: ffff99401f15d6a8 RCX: 0000000000000000 RDX: 0000000000000001 RSI: ffffffffbac8234b RDI: 00000000ffffffff RBP: ffff99401f15d6d0 R08: 0000000000000001 R09: 0000000000000001 R10: 0000000000002d82 R11: 0000000000000000 R12: 0000000000000001 R13: ffff994101eff208 R14: ffffb09880b6f6a0 R15: 00000000fffffe00 FS: 00007fe113904740(0000) GS:ffff99413bc00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007ff6cde656c8 CR3: 000000001f108004 CR4: 00000000001706f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <TASK> rxe_dealloc_pd+0x16/0x20 [rdma_rxe] ib_dealloc_pd_user+0x4b/0x80 [ib_core] rtrs_ib_dev_put+0x79/0xd0 [rtrs_core] destroy_con_cq_qp+0x8a/0xa0 [rtrs_client] init_path+0x1e7/0x9a0 [rtrs_client] ? __pfx_autoremove_wake_function+0x10/0x10 ? lock_is_held_type+0xd7/0x130 ? rcu_read_lock_sched_held+0x43/0x80 ? pcpu_alloc+0x3dd/0x7d0 ? rtrs_clt_init_stats+0x18/0x40 [rtrs_client] rtrs_clt_open+0x24f/0x5a0 [rtrs_client] ? __pfx_rnbd_clt_link_ev+0x10/0x10 [rnbd_client] rnbd_clt_map_device+0x6a5/0xe10 [rnbd_client]
--- drivers/infiniband/ulp/rtrs/rtrs-clt.c | 55 +++++++++++--------------- 1 file changed, 23 insertions(+), 32 deletions(-)
drivers/infiniband/ulp/rtrs/rtrs-clt.c +23 -32
@@ -2028,6 +2028,7 @@ static int rtrs_clt_rdma_cm_handler(struct rdma_cm_id *cm_id,return 0 ; } +/* The caller should do the cleanup in case of error */ static int create_cm (struct rtrs_clt_con *con) {struct rtrs_path *s = con->c.path;
@@ -2050,14 +2051,14 @@ static int create_cm(struct rtrs_clt_con *con) err =rdma_set_reuseaddr (cm_id,1 );if (err !=0 ) {rtrs_err (s,"Set address reuse failed, err: %d\n" , err); - goto destroy_cm; +return err; } err =rdma_resolve_addr (cm_id, (struct sockaddr *)&clt_path->s.src_addr, (struct sockaddr *)&clt_path->s.dst_addr,RTRS_CONNECT_TIMEOUT_MS );if (err) {rtrs_err (s,"Failed to resolve address, err: %d\n" , err); - goto destroy_cm; +return err; }/* * Combine connection status and session events. This is needed
@@ -2072,29 +2073,15 @@ static int create_cm(struct rtrs_clt_con *con)if (err ==0 ) err = -ETIMEDOUT ;/* Timedout or interrupted */ - goto errr; - } -if (con->cm_err <0 ) { - err = con->cm_err; - goto errr; +return err; } -if (READ_ONCE (clt_path->state) !=RTRS_CLT_CONNECTING ) { +if (con->cm_err <0 ) +return con->cm_err; +if (READ_ONCE (clt_path->state) !=RTRS_CLT_CONNECTING )/* Device removal */ - err = -ECONNABORTED ; - goto errr; - } +return -ECONNABORTED ;return 0 ; - -errr: -stop_cm (con); -mutex_lock (&con->con_mutex); -destroy_con_cq_qp (con); -mutex_unlock (&con->con_mutex); -destroy_cm: -destroy_cm (con); - -return err; }static void rtrs_clt_path_up (struct rtrs_clt_path *clt_path)
@@ -2331,7 +2318,7 @@ static void rtrs_clt_close_work(struct work_struct *work)static int init_conns (struct rtrs_clt_path *clt_path) {unsigned int cid; -int err; +int err, i;/* * On every new session connections increase reconnect counter
@@ -2347,10 +2334,8 @@ static int init_conns(struct rtrs_clt_path *clt_path) goto destroy; err =create_cm (to_clt_con (clt_path->s.con[cid])); -if (err) { -destroy_con (to_clt_con (clt_path->s.con[cid])); +if (err) goto destroy; - } } err =alloc_path_reqs (clt_path);if (err)
@@ -2361,15 +2346,21 @@ static int init_conns(struct rtrs_clt_path *clt_path)return 0 ; destroy: -while (cid--) { -struct rtrs_clt_con *con =to_clt_con (clt_path->s.con[cid]); +/* Make sure we do the cleanup in the order they are created */ +for (i =0 ; i <= cid; i++) { +struct rtrs_clt_con *con; -stop_cm (con); +if (!clt_path->s.con[i]) +break ; -mutex_lock (&con->con_mutex); -destroy_con_cq_qp (con); -mutex_unlock (&con->con_mutex); -destroy_cm (con); + con =to_clt_con (clt_path->s.con[i]); +if (con->c.cm_id) { +stop_cm (con); +mutex_lock (&con->con_mutex); +destroy_con_cq_qp (con); +mutex_unlock (&con->con_mutex); +destroy_cm (con); + }destroy_con (con); }/*
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 60/107 RDMA/rxe: Fix packet length checks
In reply to Greg Kroah-HartmanFrom: Bob Pearson <[email protected]>
[ Upstream commit 9a3763e87379c97a78b7c6c6f40720b1e877174f ]
In rxe_net.c a received packet, from udp or loopback, is passed to rxe_rcv() in rxe_recv.c as a udp packet. I.e. skb->data is pointing at the udp header. But rxe_rcv() makes length checks to verify the packet is long enough to hold the roce headers as if it were a roce
packet. I.e. skb->data pointing at the bth header. A runt packet would appear to have 8 more bytes than it actually does which may lead to incorrect behavior.
This patch calls skb_pull() to adjust the skb to point at the bth header before calling rxe_rcv() which fixes this error.
--- drivers/infiniband/sw/rxe/rxe_net.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/infiniband/sw/rxe/rxe_net.c +6 -0
@@ -179,6 +179,9 @@ static int rxe_udp_encap_recv(struct sock *sk, struct sk_buff *skb) pkt->mask =RXE_GRH_MASK ; pkt->paylen =be16_to_cpu (udph->len) -sizeof (*udph); +/* remove udp header */ +skb_pull (skb,sizeof (struct udphdr )); +rxe_rcv (skb);return 0 ;
@@ -419,6 +422,9 @@ static int rxe_loopback(struct sk_buff *skb, struct rxe_pkt_info *pkt)return -EIO ; } +/* remove udp header */ +skb_pull (skb,sizeof (struct udphdr )); +rxe_rcv (skb);return 0 ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 61/107 spi: fsl-dspi: avoid SCK glitches with continuous transfers
In reply to Greg Kroah-HartmanFrom: Vladimir Oltean <[email protected]>
[ Upstream commit c5c31fb71f16ba75bad4ade208abbae225305b65 ]
The DSPI controller has configurable timing for
(a) tCSC: the interval between the assertion of the chip select and the first clock edge
(b) tASC: the interval between the last clock edge and the deassertion of the chip select
What is a bit surprising, but is documented in the figure "Example of continuous transfer (CPHA=1, CONT=1)" in the datasheet, is that when the chip select stays asserted between multiple TX FIFO writes, the tCSC and tASC times still apply. With CONT=1, chip select remains asserted, but SCK takes a break and goes to the idle state for tASC + tCSC ns.
In other words, the default values (of 0 and 0 ns) result in SCK glitches where the SCK transition to the idle state, as well as the SCK transition from the idle state, will have no delay in between, and it may appear that a SCK cycle has simply gone missing. The resulting timing violation might cause data corruption in many peripherals, as their chip select is asserted.
The driver has device tree bindings for tCSC ("fsl,spi-cs-sck-delay") and tASC ("fsl,spi-sck-cs-delay"), but these are only specified to apply when the chip select toggles in the first place, and this timing characteristic depends on each peripheral. Many peripherals do not have explicit timing requirements, so many device trees do not have these properties present at all.
Nonetheless, the lack of SCK glitches is a common sense requirement, and since the SCK stays in the idle state during transfers for tCSC+tASC ns, and that in itself should look like half a cycle, then let's ensure that tCSC and tASC are at least a quarter of a SCK period, such that their sum is at least half of one.
--- drivers/spi/spi-fsl-dspi.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
drivers/spi/spi-fsl-dspi.c +15 -0
@@ -975,7 +975,9 @@ static int dspi_transfer_one_message(struct spi_controller *ctlr,static int dspi_setup (struct spi_device *spi) {struct fsl_dspi *dspi =spi_controller_get_devdata (spi->controller); +u32 period_ns =DIV_ROUND_UP (NSEC_PER_SEC , spi->max_speed_hz);unsigned char br =0 , pbr =0 , pcssck =0 , cssck =0 ; +u32 quarter_period_ns =DIV_ROUND_UP (period_ns,4 );u32 cs_sck_delay =0 , sck_cs_delay =0 ;struct fsl_dspi_platform_data *pdata;unsigned char pasc =0 , asc =0 ;
@@ -1003,6 +1005,19 @@ static int dspi_setup(struct spi_device *spi) sck_cs_delay = pdata->sck_cs_delay; } +/* Since tCSC and tASC apply to continuous transfers too, avoid SCK +* glitches of half a cycle by never allowing tCSC + tASC to go below +* half a SCK period. +*/ +if (cs_sck_delay < quarter_period_ns) + cs_sck_delay = quarter_period_ns; +if (sck_cs_delay < quarter_period_ns) + sck_cs_delay = quarter_period_ns; + +dev_dbg (&spi->dev, +"DSPI controller timing params: CS-to-SCK delay %u ns, SCK-to-CS delay %u ns\n" , + cs_sck_delay, sck_cs_delay); + clkrate =clk_get_rate (dspi->clk);hz_to_spi_baud (&pbr, &br, spi->max_speed_hz, clkrate);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 62/107 netfilter: nf_tables: integrate pipapo into commit protocol
In reply to Greg Kroah-HartmanFrom: Pablo Neira Ayuso <[email protected]>
[ Upstream commit 212ed75dc5fb9d1423b3942c8f872a868cda3466 ]
The pipapo set backend follows copy-on-update approach, maintaining one clone of the existing datastructure that is being updated. The clone and current datastructures are swapped via rcu from the commit step.
The existing integration with the commit protocol is flawed because there is no operation to clean up the clone if the transaction is aborted. Moreover, the datastructure swap happens on set element activation.
This patch adds two new operations for sets: commit and abort, these new operations are invoked from the commit and abort steps, after the transactions have been digested, and it updates the pipapo set backend to use it.
This patch adds a new ->pending_update field to sets to maintain a list of sets that require this new commit and abort operations.
--- include/net/netfilter/nf_tables.h | 4 ++- net/netfilter/nf_tables_api.c | 56 +++++++++++++++++++++++++++++++ net/netfilter/nft_set_pipapo.c | 55 +++++++++++++++++++++--------- 3 files changed, 99 insertions(+), 16 deletions(-)
include/net/netfilter/nf_tables.h +3 -1
@@ -427,7 +427,8 @@ struct nft_set_ops {const struct nft_set *set, const struct nft_set_elem *elem, unsigned int flags); - +void (*commit)(const struct nft_set *set); +void (*abort)(const struct nft_set *set);u64 (*privsize)(const struct nlattr *const nla[],const struct nft_set_desc *desc); bool (*estimate)(const struct nft_set_desc *desc,
@@ -522,6 +523,7 @@ struct nft_set {u16 policy;u16 udlen;unsigned char *udata; +struct list_head pending_update;/* runtime data below here */ const struct nft_set_ops *ops____cacheline_aligned ; u16 flags:14,
net/netfilter/nf_tables_api.c +56 -0
118 lines not on this page · raw message
net/netfilter/nft_set_pipapo.c +40 -15
112 lines not on this page · raw message
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 63/107 netfilter: nfnetlink: skip error delivery on batch in case of ENOMEM
In reply to Greg Kroah-HartmanFrom: Pablo Neira Ayuso <[email protected]>
[ Upstream commit a1a64a151dae8ac3581c1cbde44b672045cb658b ]
If caller reports ENOMEM, then stop iterating over the batch and send a single netlink message to userspace to report OOM.
--- net/netfilter/nfnetlink.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/netfilter/nfnetlink.c +2 -1
@@ -528,7 +528,8 @@ static void nfnetlink_rcv_batch(struct sk_buff *skb, struct nlmsghdr *nlh,* processed, this avoids that the same error is * reported several times when replaying the batch. */ -if (nfnl_err_add (&err_list, nlh, err, &extack) <0 ) { +if (err == -ENOMEM || +nfnl_err_add (&err_list, nlh, err, &extack) <0 ) {/* We failed to enqueue an error, reset the * list of errors and send OOM to userspace * pointing to the batch header.
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 64/107 netfilter: nf_tables: incorrect error path handling with NFT_MSG_NEWRULE
In reply to Greg Kroah-HartmanFrom: Pablo Neira Ayuso <[email protected]>
[ Upstream commit 1240eb93f0616b21c675416516ff3d74798fdc97 ]
In case of error when adding a new rule that refers to an anonymous set, deactivate expressions via NFT_TRANS_PREPARE state, not NFT_TRANS_RELEASE. Thus, the lookup expression marks anonymous sets as inactive in the next generation to ensure it is not reachable in this transaction anymore and decrement the set refcount as introduced by c1592a89942e ("netfilter:nf_tables: deactivate anonymous set from preparation phase"). The abort step takes care of undoing the anonymous set.
This is also consistent with rule deletion, where NFT_TRANS_PREPARE is used. Note that this error path is exercised in the preparation step of the commit protocol. This patch replaces nf_tables_rule_release() by the deactivate and destroy calls, this time with NFT_TRANS_PREPARE.
Due to this incorrect error handling, it is possible to access a dangling pointer to the anonymous set that remains in the transaction list.
[1009.379054] BUG: KASAN: use-after-free in nft_set_lookup_global+0x147/0x1a0 [nf_tables] [1009.379106] Read of size 8 at addr ffff88816c4c8020 by task nft-rule-add/137110 [1009.379116] CPU: 7 PID: 137110 Comm: nft-rule-add Not tainted 6.4.0-rc4+ #256 [1009.379128] Call Trace: [1009.379132] <TASK> [1009.379135] dump_stack_lvl+0x33/0x50 [1009.379146] ? nft_set_lookup_global+0x147/0x1a0 [nf_tables] [1009.379191] print_address_description.constprop.0+0x27/0x300 [1009.379201] kasan_report+0x107/0x120 [1009.379210] ? nft_set_lookup_global+0x147/0x1a0 [nf_tables] [1009.379255] nft_set_lookup_global+0x147/0x1a0 [nf_tables] [1009.379302] nft_lookup_init+0xa5/0x270 [nf_tables] [1009.379350] nf_tables_newrule+0x698/0xe50 [nf_tables] [1009.379397] ? nf_tables_rule_release+0xe0/0xe0 [nf_tables] [1009.379441] ? kasan_unpoison+0x23/0x50 [1009.379450] nfnetlink_rcv_batch+0x97c/0xd90 [nfnetlink] [1009.379470] ? nfnetlink_rcv_msg+0x480/0x480 [nfnetlink] [1009.379485] ? __alloc_skb+0xb8/0x1e0 [1009.379493] ? __alloc_skb+0xb8/0x1e0 [1009.379502] ? entry_SYSCALL_64_after_hwframe+0x46/0xb0 [1009.379509] ? unwind_get_return_address+0x2a/0x40 [1009.379517] ? write_profile+0xc0/0xc0 [1009.379524] ? avc_lookup+0x8f/0xc0 [1009.379532] ? __rcu_read_unlock+0x43/0x60
--- net/netfilter/nf_tables_api.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/netfilter/nf_tables_api.c +2 -1
@@ -3572,7 +3572,8 @@ static int nf_tables_newrule(struct sk_buff *skb, const struct nfnl_info *info,if (flow)nft_flow_rule_destroy (flow); err_release_rule: -nf_tables_rule_release (&ctx, rule); +nft_rule_expr_deactivate (&ctx, rule,NFT_TRANS_PREPARE ); +nf_tables_rule_destroy (&ctx, rule); err_release_expr:for (i =0 ; i < n; i++) {if (expr_info[i].ops) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 65/107 net: enetc: correct the indexes of highest and 2nd highest TCs
In reply to Greg Kroah-HartmanFrom: Wei Fang <[email protected]>
[ Upstream commit 21225873be1472b7c59ed3650396af0e40578112 ]
For ENETC hardware, the TCs are numbered from 0 to N-1, where N is the number of TCs. Numerically higher TC has higher priority. It's obvious that the highest priority TC index should be N-1 and the 2nd highest priority TC index should be N-2.
However, the previous logic uses netdev_get_prio_tc_map() to get the indexes of highest priority and 2nd highest priority TCs, it does not make sense and is incorrect to give a "tc" argument to netdev_get_prio_tc_map(). So the driver may get the wrong indexes of the two highest priotiry TCs which would lead to failed to set the CBS for the two highest priotiry TCs.
e.g.
$ tc qdisc add dev eno0 parent root handle 100: mqprio num_tc 6 \ map 0 0 1 1 2 3 4 5 queues 1@0 1@1 1@2 1@3 2@4 2@6 hw 1 $ tc qdisc replace dev eno0 parent 100:6 cbs idleslope 100000 \ sendslope -900000 hicredit 12 locredit -113 offload 1 $ Error: Specified device failed to setup cbs hardware offload. ^^^^^
In this example, the previous logic deems the indexes of the two highest priotiry TCs should be 3 and 2. Actually, the indexes are 5 and 4, because the number of TCs is 6. So it would be failed to configure the CBS for the two highest priority TCs.
--- drivers/net/ethernet/freescale/enetc/enetc_qos.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/freescale/enetc/enetc_qos.c +2 -2
@@ -197,8 +197,8 @@ int enetc_setup_tc_cbs(struct net_device *ndev, void *type_data)int bw_sum =0 ;u8 bw; - prio_top =netdev_get_prio_tc_map (ndev, tc_nums -1 ); - prio_next =netdev_get_prio_tc_map (ndev, tc_nums -2 ); + prio_top = tc_nums -1 ; + prio_next = tc_nums -2 ;/* Support highest prio and second prio tc in cbs mode */ if (tc != prio_top && tc != prio_next)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 66/107 ping6: Fix send to link-local addresses with VRF.
In reply to Greg Kroah-HartmanFrom: Guillaume Nault <[email protected]>
[ Upstream commit 91ffd1bae1dafbb9e34b46813f5b058581d9144d ]
Ping sockets can't send packets when they're bound to a VRF master device and the output interface is set to a slave device.
For example, when net.ipv4.ping_group_range is properly set, so that ping6 can use ping sockets, the following kind of commands fails:
$ ip vrf exec red ping6 fe80::854:e7ff:fe88:4bf1%eth1
What happens is that sk->sk_bound_dev_if is set to the VRF master device, but 'oif' is set to the real output device. Since both are set but different, ping_v6_sendmsg() sees their value as inconsistent and fails.
Fix this by allowing 'oif' to be a slave device of ->sk_bound_dev_if.
This fixes the following kselftest failure:
$ ./fcnal-test.sh -t ipv6_ping [...] TEST: ping out, vrf device+address bind - ns-B IPv6 LLA [FAIL]
--- net/ipv6/ping.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/ipv6/ping.c +2 -1
@@ -96,7 +96,8 @@ static int ping_v6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) addr_type =ipv6_addr_type (daddr);if ((__ipv6_addr_needs_scope_id (addr_type) && !oif) || (addr_type &IPV6_ADDR_MAPPED ) || - (oif && sk->sk_bound_dev_if && oif != sk->sk_bound_dev_if)) + (oif && sk->sk_bound_dev_if && oif != sk->sk_bound_dev_if && +l3mdev_master_ifindex_by_index (sock_net (sk), oif) != sk->sk_bound_dev_if))return -EINVAL ;/* TODO: use ip6_datagram_send_ctl to get options from cmsg */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 67/107 net/sched: simplify tcf_pedit_act
In reply to Greg Kroah-HartmanFrom: Pedro Tammela <[email protected]>
[ Upstream commit 95b069382351826c0ae37938070aa82dbeaf288d ]
Remove the check for a negative number of keys as
this cannot ever happen
Stable-dep-of: 6c02568fd1ae ("net/sched: act_pedit: Parse L3 Header for L4 offset")
--- net/sched/act_pedit.c | 137 +++++++++++++++++++++--------------------- 1 file changed, 67 insertions(+), 70 deletions(-)
net/sched/act_pedit.c +67 -70
@@ -349,8 +349,12 @@ static int pedit_skb_hdr_offset(struct sk_buff *skb,static int tcf_pedit_act (struct sk_buff *skb,const struct tc_action *a,struct tcf_result *res) { +enum pedit_header_type htype =TCA_PEDIT_KEY_EX_HDR_TYPE_NETWORK ; +enum pedit_cmd cmd =TCA_PEDIT_KEY_EX_CMD_SET ;struct tcf_pedit *p =to_pedit (a); +struct tcf_pedit_key_ex *tkey_ex;struct tcf_pedit_parms *parms; +struct tc_pedit_key *tkey;u32 max_offset;int i;
@@ -366,88 +370,81 @@ static int tcf_pedit_act(struct sk_buff *skb, const struct tc_action *a,tcf_lastuse_update (&p->tcf_tm);tcf_action_update_bstats (&p->common, skb); -if (parms->tcfp_nkeys >0 ) { -struct tc_pedit_key *tkey = parms->tcfp_keys; -struct tcf_pedit_key_ex *tkey_ex = parms->tcfp_keys_ex; -enum pedit_header_type htype = -TCA_PEDIT_KEY_EX_HDR_TYPE_NETWORK ; -enum pedit_cmd cmd =TCA_PEDIT_KEY_EX_CMD_SET ; - -for (i = parms->tcfp_nkeys; i >0 ; i--, tkey++) { -u32 *ptr, hdata; -int offset = tkey->off; -int hoffset; -u32 val; -int rc; - -if (tkey_ex) { - htype = tkey_ex->htype; - cmd = tkey_ex->cmd; - - tkey_ex++; - } + tkey = parms->tcfp_keys; + tkey_ex = parms->tcfp_keys_ex; - rc =pedit_skb_hdr_offset (skb, htype, &hoffset); -if (rc) { -pr_info ("tc action pedit bad header type specified (0x%x)\n" , - htype); - goto bad; - } +for (i = parms->tcfp_nkeys; i >0 ; i--, tkey++) { +int offset = tkey->off; +u32 *ptr, hdata; +int hoffset; +u32 val; +int rc; -if (tkey->offmask) { -u8 *d, _d; - -if (!offset_valid (skb, hoffset + tkey->at)) { -pr_info ("tc action pedit 'at' offset %d out of bounds\n" , - hoffset + tkey->at); - goto bad; - } - d =skb_header_pointer (skb, hoffset + tkey->at, -sizeof (_d), &_d); -if (!d) - goto bad; - offset += (*d & tkey->offmask) >> tkey->shift; - } +if (tkey_ex) { + htype = tkey_ex->htype; + cmd = tkey_ex->cmd; -if (offset %4 ) { -pr_info ("tc action pedit offset must be on 32 bit boundaries\n" ); - goto bad; - } + tkey_ex++; + } -if (!offset_valid (skb, hoffset + offset)) { -pr_info ("tc action pedit offset %d out of bounds\n" , - hoffset + offset); - goto bad; - } + rc =pedit_skb_hdr_offset (skb, htype, &hoffset); +if (rc) { +pr_info ("tc action pedit bad header type specified (0x%x)\n" , + htype); + goto bad; + } - ptr =skb_header_pointer (skb, hoffset + offset, -sizeof (hdata), &hdata); -if (!ptr) - goto bad; -/* just do it, baby */ -switch (cmd) { -case TCA_PEDIT_KEY_EX_CMD_SET : - val = tkey->val; -break ; -case TCA_PEDIT_KEY_EX_CMD_ADD : - val = (*ptr + tkey->val) & ~tkey->mask; -break ; -default : -pr_info ("tc action pedit bad command (%d)\n" , - cmd); +if (tkey->offmask) { +u8 *d, _d; + +if (!offset_valid (skb, hoffset + tkey->at)) { +pr_info ("tc action pedit 'at' offset %d out of bounds\n" , + hoffset + tkey->at); goto bad; } + d =skb_header_pointer (skb, hoffset + tkey->at, +sizeof (_d), &_d); +if (!d) + goto bad; + offset += (*d & tkey->offmask) >> tkey->shift; + } - *ptr = ((*ptr & tkey->mask) ^ val); -if (ptr == &hdata) -skb_store_bits (skb, hoffset + offset, ptr,4 ); +if (offset %4 ) { +pr_info ("tc action pedit offset must be on 32 bit boundaries\n" ); + goto bad; } - goto done; - }else { -WARN (1 ,"pedit BUG: index %d\n" , p->tcf_index); +if (!offset_valid (skb, hoffset + offset)) { +pr_info ("tc action pedit offset %d out of bounds\n" , + hoffset + offset); + goto bad; + } + + ptr =skb_header_pointer (skb, hoffset + offset, +sizeof (hdata), &hdata); +if (!ptr) + goto bad; +/* just do it, baby */ +switch (cmd) { +case TCA_PEDIT_KEY_EX_CMD_SET : + val = tkey->val; +break ; +case TCA_PEDIT_KEY_EX_CMD_ADD : + val = (*ptr + tkey->val) & ~tkey->mask; +break ; +default : +pr_info ("tc action pedit bad command (%d)\n" , + cmd); + goto bad; + } + + *ptr = ((*ptr & tkey->mask) ^ val); +if (ptr == &hdata) +skb_store_bits (skb, hoffset + offset, ptr,4 ); } + goto done; + bad:spin_lock (&p->tcf_lock); p->tcf_qstats.overlimits++;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 68/107 net/sched: act_pedit: remove extra check for key type
In reply to Greg Kroah-HartmanFrom: Pedro Tammela <[email protected]>
[ Upstream commit 577140180ba28d0d37bc898c7bd6702c83aa106f ]
The netlink parsing already validates the key 'htype'. Remove the datapath check as it's redundant.
Stable-dep-of: 6c02568fd1ae ("net/sched: act_pedit: Parse L3 Header for L4 offset")
--- net/sched/act_pedit.c | 29 +++++++---------------------- 1 file changed, 7 insertions(+), 22 deletions(-)
net/sched/act_pedit.c +7 -22
@@ -313,37 +313,28 @@ static bool offset_valid(struct sk_buff *skb, int offset)return true; } -static int pedit_skb_hdr_offset (struct sk_buff *skb, -enum pedit_header_type htype,int *hoffset) +static void pedit_skb_hdr_offset (struct sk_buff *skb, +enum pedit_header_type htype,int *hoffset) { -int ret = -EINVAL ; - +/* 'htype' is validated in the netlink parsing */ switch (htype) {case TCA_PEDIT_KEY_EX_HDR_TYPE_ETH : -if (skb_mac_header_was_set (skb)) { +if (skb_mac_header_was_set (skb)) *hoffset =skb_mac_offset (skb); - ret =0 ; - }break ;case TCA_PEDIT_KEY_EX_HDR_TYPE_NETWORK :case TCA_PEDIT_KEY_EX_HDR_TYPE_IP4 :case TCA_PEDIT_KEY_EX_HDR_TYPE_IP6 : *hoffset =skb_network_offset (skb); - ret =0 ;break ;case TCA_PEDIT_KEY_EX_HDR_TYPE_TCP :case TCA_PEDIT_KEY_EX_HDR_TYPE_UDP : -if (skb_transport_header_was_set (skb)) { +if (skb_transport_header_was_set (skb)) *hoffset =skb_transport_offset (skb); - ret =0 ; - }break ;default : - ret = -EINVAL ;break ; } - -return ret; } static int tcf_pedit_act(struct sk_buff *skb, const struct tc_action *a,
@@ -375,10 +366,9 @@ static int tcf_pedit_act(struct sk_buff *skb, const struct tc_action *a,for (i = parms->tcfp_nkeys; i >0 ; i--, tkey++) {int offset = tkey->off; +int hoffset =0 ;u32 *ptr, hdata; -int hoffset;u32 val; -int rc;if (tkey_ex) { htype = tkey_ex->htype;
@@ -387,12 +377,7 @@ static int tcf_pedit_act(struct sk_buff *skb, const struct tc_action *a, tkey_ex++; } - rc =pedit_skb_hdr_offset (skb, htype, &hoffset); -if (rc) { -pr_info ("tc action pedit bad header type specified (0x%x)\n" , - htype); - goto bad; - } +pedit_skb_hdr_offset (skb, htype, &hoffset);if (tkey->offmask) {u8 *d, _d;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 69/107 net/sched: act_pedit: Parse L3 Header for L4 offset
In reply to Greg Kroah-HartmanFrom: Max Tottenham <[email protected]>
[ Upstream commit 6c02568fd1ae53099b4ab86365c5be1ff15f586b ]
Instead of relying on skb->transport_header being set correctly, opt instead to parse the L3 header length out of the L3 headers for both IPv4/IPv6 when the Extended Layer Op for tcp/udp is used. This fixes a bug if GRO is disabled, when GRO is disabled skb->transport_header is set by __netif_receive_skb_core() to point to the L3 header, it's later fixed by the upper protocol layers, but act_pedit will receive the SKB before the fixups are completed. The existing behavior causes the following to edit the L3 header if GRO is disabled instead of the UDP header:
tc filter add dev eth0 ingress protocol ip flower ip_proto udp \
dst_ip 192.168.1.3 action pedit ex munge udp set dport 18053
Also re-introduce a rate-limited warning if we were unable to extract the header offset when using the 'ex' interface.
the conventional network headers")
--- net/sched/act_pedit.c | 48 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 43 insertions(+), 5 deletions(-)
net/sched/act_pedit.c +43 -5
@@ -13,7 +13,10 @@#include <linux/rtnetlink.h> #include <linux/module.h> #include <linux/init.h> +#include <linux/ip.h> +#include <linux/ipv6.h> #include <linux/slab.h> +#include <net/ipv6.h> #include <net/netlink.h> #include <net/pkt_sched.h> #include <linux/tc_act/tc_pedit.h>
@@ -313,28 +316,58 @@ static bool offset_valid(struct sk_buff *skb, int offset)return true; } -static void pedit_skb_hdr_offset (struct sk_buff *skb, +static int pedit_l4_skb_offset (struct sk_buff *skb,int *hoffset,const int header_type) +{ +const int noff =skb_network_offset (skb); +int ret = -EINVAL ; +struct iphdr _iph; + +switch (skb->protocol) { +case htons (ETH_P_IP ): { +const struct iphdr *iph =skb_header_pointer (skb, noff,sizeof (_iph), &_iph); + +if (!iph) + goto out; + *hoffset = noff + iph->ihl *4 ; + ret =0 ; +break ; + } +case htons (ETH_P_IPV6 ): + ret =ipv6_find_hdr (skb, hoffset, header_type,NULL ,NULL ) == header_type ?0 : -EINVAL ; +break ; + } +out: +return ret; +} + +static int pedit_skb_hdr_offset (struct sk_buff *skb,enum pedit_header_type htype,int *hoffset) { +int ret = -EINVAL ;/* 'htype' is validated in the netlink parsing */ switch (htype) {case TCA_PEDIT_KEY_EX_HDR_TYPE_ETH : -if (skb_mac_header_was_set (skb)) +if (skb_mac_header_was_set (skb)) { *hoffset =skb_mac_offset (skb); + ret =0 ; + }break ;case TCA_PEDIT_KEY_EX_HDR_TYPE_NETWORK :case TCA_PEDIT_KEY_EX_HDR_TYPE_IP4 :case TCA_PEDIT_KEY_EX_HDR_TYPE_IP6 : *hoffset =skb_network_offset (skb); + ret =0 ;break ;case TCA_PEDIT_KEY_EX_HDR_TYPE_TCP : + ret =pedit_l4_skb_offset (skb, hoffset,IPPROTO_TCP ); +break ;case TCA_PEDIT_KEY_EX_HDR_TYPE_UDP : -if (skb_transport_header_was_set (skb)) - *hoffset =skb_transport_offset (skb); + ret =pedit_l4_skb_offset (skb, hoffset,IPPROTO_UDP );break ;default :break ; } +return ret; } static int tcf_pedit_act(struct sk_buff *skb, const struct tc_action *a,
@@ -369,6 +402,7 @@ static int tcf_pedit_act(struct sk_buff *skb, const struct tc_action *a,int hoffset =0 ;u32 *ptr, hdata;u32 val; +int rc;if (tkey_ex) { htype = tkey_ex->htype;
@@ -377,7 +411,11 @@ static int tcf_pedit_act(struct sk_buff *skb, const struct tc_action *a, tkey_ex++; } -pedit_skb_hdr_offset (skb, htype, &hoffset); + rc =pedit_skb_hdr_offset (skb, htype, &hoffset); +if (rc) { +pr_info_ratelimited ("tc action pedit unable to extract header offset for header type (0x%x)\n" , htype); + goto bad; + }if (tkey->offmask) {u8 *d, _d;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 70/107 net/sched: cls_u32: Fix reference counter leak leading to overflow
In reply to Greg Kroah-HartmanFrom: Lee Jones <[email protected]>
[ Upstream commit 04c55383fa5689357bcdd2c8036725a55ed632bc ]
In the event of a failure in tcf_change_indev(), u32_set_parms() will immediately return without decrementing the recently incremented reference counter. If this happens enough times, the counter will rollover and the reference freed, leading to a double free which can be used to do 'bad things'.
In order to prevent this, move the point of possible failure above the point where the reference counter is incremented. Also save any meaningful return values to be applied to the return data at the appropriate point in time.
This issue was caught with KASAN.
--- net/sched/cls_u32.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)
net/sched/cls_u32.c +10 -8
@@ -716,12 +716,18 @@ static int u32_set_parms(struct net *net, struct tcf_proto *tp, struct nlattr *est, u32 flags, struct netlink_ext_ack *extack) { - int err; + int err, ifindex = -1; err =tcf_exts_validate (net, tp, tb, est, &n->exts, flags, extack);if (err <0 )return err; +if (tb[TCA_U32_INDEV ]) { + ifindex =tcf_change_indev (net, tb[TCA_U32_INDEV ], extack); +if (ifindex <0 ) +return -EINVAL ; + } +if (tb[TCA_U32_LINK ]) {u32 handle =nla_get_u32 (tb[TCA_U32_LINK ]);struct tc_u_hnode *ht_down =NULL , *ht_old;
@@ -756,13 +762,9 @@ static int u32_set_parms(struct net *net, struct tcf_proto *tp,tcf_bind_filter (tp, &n->res, base); } -if (tb[TCA_U32_INDEV ]) { -int ret; - ret =tcf_change_indev (net, tb[TCA_U32_INDEV ], extack); -if (ret <0 ) -return -EINVAL ; - n->ifindex = ret; - } +if (ifindex >=0 ) + n->ifindex = ifindex; +return 0 ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 71/107 RDMA/rxe: Remove the unused variable obj
In reply to Greg Kroah-HartmanFrom: Zhu Yanjun <[email protected]>
[ Upstream commit f07853582d1f6ed282f8d9a0b1209a87dd761f58 ]
The member variable obj in struct rxe_task is not needed. So remove it to save memory.
Stable-dep-of: 2a62b6210ce8 ("RDMA/rxe: Fix the use-before-initialization error of resp_pkts")
--- drivers/infiniband/sw/rxe/rxe_qp.c | 6 +++--- drivers/infiniband/sw/rxe/rxe_task.c | 3 +-- drivers/infiniband/sw/rxe/rxe_task.h | 3 +-- 3 files changed, 5 insertions(+), 7 deletions(-)
drivers/infiniband/sw/rxe/rxe_qp.c +3 -3
@@ -265,9 +265,9 @@ static int rxe_qp_init_req(struct rxe_dev *rxe, struct rxe_qp *qp,skb_queue_head_init (&qp->req_pkts); -rxe_init_task (rxe, &qp->req.task, qp, +rxe_init_task (&qp->req.task, qp, rxe_requester,"req" ); -rxe_init_task (rxe, &qp->comp.task, qp, +rxe_init_task (&qp->comp.task, qp, rxe_completer,"comp" ); qp->qp_timeout_jiffies =0 ;/* Can't be set for UD/UC in modify_qp */
@@ -315,7 +315,7 @@ static int rxe_qp_init_resp(struct rxe_dev *rxe, struct rxe_qp *qp,skb_queue_head_init (&qp->resp_pkts); -rxe_init_task (rxe, &qp->resp.task, qp, +rxe_init_task (&qp->resp.task, qp, rxe_responder,"resp" ); qp->resp.opcode =OPCODE_NONE ;
drivers/infiniband/sw/rxe/rxe_task.c +1 -2
@@ -95,10 +95,9 @@ void rxe_do_task(struct tasklet_struct *t) task->ret = ret; } -int rxe_init_task (void *obj,struct rxe_task *task, +int rxe_init_task (struct rxe_task *task,void *arg,int (*func)(void *),char *name) { - task->obj = obj; task->arg = arg; task->func = func;snprintf (task->name,sizeof (task->name),"%s" , name);
drivers/infiniband/sw/rxe/rxe_task.h +1 -2
@@ -19,7 +19,6 @@ enum {* called again. */ struct rxe_task { -void *obj;struct tasklet_struct tasklet;int state;spinlock_t state_lock;/* spinlock for task state */
@@ -35,7 +34,7 @@ struct rxe_task {* arg => parameter to pass to fcn * func => function to call until it returns != 0 */ -int rxe_init_task (void *obj,struct rxe_task *task, +int rxe_init_task (struct rxe_task *task,void *arg,int (*func)(void *),char *name);/* cleanup task */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 72/107 RDMA/rxe: Removed unused name from rxe_task struct
In reply to Greg Kroah-HartmanFrom: Bob Pearson <[email protected]>
[ Upstream commit de669ae8af49ceed0eed44f5b3d51dc62affc5e4 ]
The name field in struct rxe_task is never used. This patch removes it.
Stable-dep-of: 2a62b6210ce8 ("RDMA/rxe: Fix the use-before-initialization error of resp_pkts")
--- drivers/infiniband/sw/rxe/rxe_qp.c | 9 +++------ drivers/infiniband/sw/rxe/rxe_task.c | 4 +--- drivers/infiniband/sw/rxe/rxe_task.h | 4 +--- 3 files changed, 5 insertions(+), 12 deletions(-)
drivers/infiniband/sw/rxe/rxe_qp.c +3 -6
@@ -265,10 +265,8 @@ static int rxe_qp_init_req(struct rxe_dev *rxe, struct rxe_qp *qp,skb_queue_head_init (&qp->req_pkts); -rxe_init_task (&qp->req.task, qp, - rxe_requester,"req" ); -rxe_init_task (&qp->comp.task, qp, - rxe_completer,"comp" ); +rxe_init_task (&qp->req.task, qp, rxe_requester); +rxe_init_task (&qp->comp.task, qp, rxe_completer); qp->qp_timeout_jiffies =0 ;/* Can't be set for UD/UC in modify_qp */ if (init->qp_type ==IB_QPT_RC ) {
@@ -315,8 +313,7 @@ static int rxe_qp_init_resp(struct rxe_dev *rxe, struct rxe_qp *qp,skb_queue_head_init (&qp->resp_pkts); -rxe_init_task (&qp->resp.task, qp, - rxe_responder,"resp" ); +rxe_init_task (&qp->resp.task, qp, rxe_responder); qp->resp.opcode =OPCODE_NONE ; qp->resp.msn =0 ;
drivers/infiniband/sw/rxe/rxe_task.c +1 -3
@@ -95,12 +95,10 @@ void rxe_do_task(struct tasklet_struct *t) task->ret = ret; } -int rxe_init_task (struct rxe_task *task, -void *arg,int (*func)(void *),char *name) +int rxe_init_task (struct rxe_task *task,void *arg,int (*func)(void *)) { task->arg = arg; task->func = func; -snprintf (task->name,sizeof (task->name),"%s" , name); task->destroyed = false;tasklet_setup (&task->tasklet, rxe_do_task);
drivers/infiniband/sw/rxe/rxe_task.h +1 -3
@@ -25,7 +25,6 @@ struct rxe_task {void *arg;int (*func)(void *arg);int ret; -char name[16 ];bool destroyed; };
@@ -34,8 +33,7 @@ struct rxe_task {* arg => parameter to pass to fcn * func => function to call until it returns != 0 */ -int rxe_init_task (struct rxe_task *task, -void *arg,int (*func)(void *),char *name); +int rxe_init_task (struct rxe_task *task,void *arg,int (*func)(void *));/* cleanup task */ void rxe_cleanup_task (struct rxe_task *task);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 73/107 RDMA/rxe: Fix the use-before-initialization error of resp_pkts
In reply to Greg Kroah-HartmanFrom: Zhu Yanjun <[email protected]>
[ Upstream commit 2a62b6210ce876c596086ab8fd4c8a0c3d10611a ]
In the following:
Call Trace: <TASK> __dump_stack lib/dump_stack.c:88 [inline] dump_stack_lvl+0xd9/0x150 lib/dump_stack.c:106 assign_lock_key kernel/locking/lockdep.c:982 [inline] register_lock_class+0xdb6/0x1120 kernel/locking/lockdep.c:1295 __lock_acquire+0x10a/0x5df0 kernel/locking/lockdep.c:4951 lock_acquire kernel/locking/lockdep.c:5691 [inline] lock_acquire+0x1b1/0x520 kernel/locking/lockdep.c:5656 __raw_spin_lock_irqsave include/linux/spinlock_api_smp.h:110 [inline] _raw_spin_lock_irqsave+0x3d/0x60 kernel/locking/spinlock.c:162 skb_dequeue+0x20/0x180 net/core/skbuff.c:3639 drain_resp_pkts drivers/infiniband/sw/rxe/rxe_comp.c:555 [inline] rxe_completer+0x250d/0x3cc0 drivers/infiniband/sw/rxe/rxe_comp.c:652 rxe_qp_do_cleanup+0x1be/0x820 drivers/infiniband/sw/rxe/rxe_qp.c:761 execute_in_process_context+0x3b/0x150 kernel/workqueue.c:3473 __rxe_cleanup+0x21e/0x370 drivers/infiniband/sw/rxe/rxe_pool.c:233 rxe_create_qp+0x3f6/0x5f0 drivers/infiniband/sw/rxe/rxe_verbs.c:583
This is a use-before-initialization problem.
It happens because rxe_qp_do_cleanup is called during error unwind before the struct has been fully initialized.
Move the initialization of the skb earlier.
--- drivers/infiniband/sw/rxe/rxe_qp.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/infiniband/sw/rxe/rxe_qp.c +3 -4
@@ -203,6 +203,9 @@ static void rxe_qp_init_misc(struct rxe_dev *rxe, struct rxe_qp *qp,spin_lock_init (&qp->rq.producer_lock);spin_lock_init (&qp->rq.consumer_lock); +skb_queue_head_init (&qp->req_pkts); +skb_queue_head_init (&qp->resp_pkts); +atomic_set (&qp->ssn,0 );atomic_set (&qp->skb_out,0 ); }
@@ -263,8 +266,6 @@ static int rxe_qp_init_req(struct rxe_dev *rxe, struct rxe_qp *qp, qp->req.opcode =-1 ; qp->comp.opcode =-1 ; -skb_queue_head_init (&qp->req_pkts); -rxe_init_task (&qp->req.task, qp, rxe_requester);rxe_init_task (&qp->comp.task, qp, rxe_completer);
@@ -311,8 +312,6 @@ static int rxe_qp_init_resp(struct rxe_dev *rxe, struct rxe_qp *qp, } } -skb_queue_head_init (&qp->resp_pkts); -rxe_init_task (&qp->resp.task, qp, rxe_responder); qp->resp.opcode =OPCODE_NONE ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 74/107 iavf: remove mask from iavf_irq_enable_queues()
In reply to Greg Kroah-HartmanFrom: Ahmed Zaki <[email protected]>
[ Upstream commit c37cf54c12cfaa51e7aaf88708167b0d3259e64e ]
Enable more than 32 IRQs by removing the u32 bit mask in iavf_irq_enable_queues(). There is no need for the mask as there are no callers that select individual IRQs through the bitmask. Also, if the PF allocates more than 32 IRQs, this mask will prevent us from using all of them.
Modify the comment in iavf_register.h to show that the maximum number allowed for the IRQ index is 63 as per the iAVF standard 1.0 [1].
--- drivers/net/ethernet/intel/iavf/iavf.h | 2 +- drivers/net/ethernet/intel/iavf/iavf_main.c | 15 ++++++--------- drivers/net/ethernet/intel/iavf/iavf_register.h | 2 +- 3 files changed, 8 insertions(+), 11 deletions(-)
drivers/net/ethernet/intel/iavf/iavf.h +1 -1
@@ -461,7 +461,7 @@ void iavf_set_ethtool_ops(struct net_device *netdev);void iavf_update_stats (struct iavf_adapter *adapter);void iavf_reset_interrupt_capability (struct iavf_adapter *adapter);int iavf_init_interrupt_scheme (struct iavf_adapter *adapter); -void iavf_irq_enable_queues (struct iavf_adapter *adapter,u32 mask); +void iavf_irq_enable_queues (struct iavf_adapter *adapter);void iavf_free_all_tx_resources (struct iavf_adapter *adapter);void iavf_free_all_rx_resources (struct iavf_adapter *adapter);
drivers/net/ethernet/intel/iavf/iavf_main.c +6 -9
@@ -253,21 +253,18 @@ static void iavf_irq_disable(struct iavf_adapter *adapter) }/** -* iavf_irq_enable_queues - Enable interrupt for specified queues +* iavf_irq_enable_queues - Enable interrupt for all queues * @adapter: board private structure -* @mask: bitmap of queues to enable **/ -void iavf_irq_enable_queues (struct iavf_adapter *adapter,u32 mask) +void iavf_irq_enable_queues (struct iavf_adapter *adapter) {struct iavf_hw *hw = &adapter->hw;int i;for (i =1 ; i < adapter->num_msix_vectors; i++) { -if (mask &BIT (i -1 )) { -wr32 (hw,IAVF_VFINT_DYN_CTLN1 (i -1 ), -IAVF_VFINT_DYN_CTLN1_INTENA_MASK | -IAVF_VFINT_DYN_CTLN1_ITR_INDX_MASK ); - } +wr32 (hw,IAVF_VFINT_DYN_CTLN1 (i -1 ), +IAVF_VFINT_DYN_CTLN1_INTENA_MASK | +IAVF_VFINT_DYN_CTLN1_ITR_INDX_MASK ); } }
@@ -281,7 +278,7 @@ void iavf_irq_enable(struct iavf_adapter *adapter, bool flush)struct iavf_hw *hw = &adapter->hw;iavf_misc_irq_enable (adapter); -iavf_irq_enable_queues (adapter, ~0 ); +iavf_irq_enable_queues (adapter);if (flush)iavf_flush (hw);
drivers/net/ethernet/intel/iavf/iavf_register.h +1 -1
@@ -40,7 +40,7 @@#define IAVF_VFINT_DYN_CTL01_INTENA_MASK IAVF_MASK(0x1, IAVF_VFINT_DYN_CTL01_INTENA_SHIFT)#define IAVF_VFINT_DYN_CTL01_ITR_INDX_SHIFT 3#define IAVF_VFINT_DYN_CTL01_ITR_INDX_MASK IAVF_MASK(0x3, IAVF_VFINT_DYN_CTL01_ITR_INDX_SHIFT) -#define IAVF_VFINT_DYN_CTLN1 (_INTVF) (0x00003800 + ((_INTVF) * 4))/* _i=0...15 */ /* Reset: VFR */ +#define IAVF_VFINT_DYN_CTLN1 (_INTVF) (0x00003800 + ((_INTVF) * 4))/* _i=0...63 */ /* Reset: VFR */ #define IAVF_VFINT_DYN_CTLN1_INTENA_SHIFT 0#define IAVF_VFINT_DYN_CTLN1_INTENA_MASK IAVF_MASK(0x1, IAVF_VFINT_DYN_CTLN1_INTENA_SHIFT)#define IAVF_VFINT_DYN_CTLN1_SWINT_TRIG_SHIFT 2
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 75/107 octeontx2-af: fixed resource availability check
In reply to Greg Kroah-HartmanFrom: Satha Rao <[email protected]>
[ Upstream commit 4e635f9d86165e47f5440196f2ebdb258efb8341 ]
txschq_alloc response have two different arrays to store continuous and non-continuous schedulers of each level. Requested count should be checked for each array separately.
--- drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c +2 -1
@@ -1885,7 +1885,8 @@ static int nix_check_txschq_alloc_req(struct rvu *rvu, int lvl, u16 pcifunc, free_cnt =rvu_rsrc_free_count (&txsch->schq); } -if (free_cnt < req_schq || req_schq >MAX_TXSCHQ_PER_FUNC ) +if (free_cnt < req_schq || req->schq[lvl] >MAX_TXSCHQ_PER_FUNC || + req->schq_contig[lvl] >MAX_TXSCHQ_PER_FUNC )return NIX_AF_ERR_TLX_ALLOC_FAIL ;/* If contiguous queues are needed, check for availability */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 76/107 octeontx2-af: fix lbk link credits on cn10k
In reply to Greg Kroah-HartmanFrom: Nithin Dabilpuram <[email protected]>
[ Upstream commit 87e12a17eef476bbf768dc3a74419ad461f36fbc ]
Fix LBK link credits on CN10K to be same as CN9K i.e 16 * MAX_LBK_DATA_RATE instead of current scheme of calculation based on LBK buf length / FIFO size.
--- drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c +0 -4
@@ -4067,10 +4067,6 @@ int rvu_mbox_handler_nix_set_rx_cfg(struct rvu *rvu, struct nix_rx_cfg *req,static u64 rvu_get_lbk_link_credits (struct rvu *rvu,u16 lbk_max_frs) { -/* CN10k supports 72KB FIFO size and max packet size of 64k */ -if (rvu->hw->lbk_bufsize ==0x12000 ) -return (rvu->hw->lbk_bufsize - lbk_max_frs) /16 ; -return 1600 ;/* 16 * max LBK datarate = 16 * 100Gbps */ }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 77/107 RDMA/mlx5: Initiate dropless RQ for RAW Ethernet functions
In reply to Greg Kroah-HartmanFrom: Maher Sanalla <[email protected]>
[ Upstream commit ee4d269eccfea6c17b18281bef482700d898e86f ]
Delay drop data is initiated for PFs that have the capability of rq_delay_drop and are in roce profile.
However, PFs with RAW ethernet profile do not initiate delay drop data on function load, causing kernel panic if delay drop struct members are accessed later on in case a dropless RQ is created.
Thus, stage the delay drop initialization as part of RAW ethernet PF loading process.
--- drivers/infiniband/hw/mlx5/main.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/infiniband/hw/mlx5/main.c +3 -0
@@ -4376,6 +4376,9 @@ const struct mlx5_ib_profile raw_eth_profile = {STAGE_CREATE (MLX5_IB_STAGE_POST_IB_REG_UMR , mlx5_ib_stage_post_ib_reg_umr_init,NULL ), +STAGE_CREATE (MLX5_IB_STAGE_DELAY_DROP , + mlx5_ib_stage_delay_drop_init, + mlx5_ib_stage_delay_drop_cleanup),STAGE_CREATE (MLX5_IB_STAGE_RESTRACK , mlx5_ib_restrack_init, NULL),
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 78/107 RDMA/cma: Always set static rate to 0 for RoCE
In reply to Greg Kroah-HartmanFrom: Mark Zhang <[email protected]>
[ Upstream commit 58030c76cce473b6cfd630bbecb97215def0dff8 ]
Set static rate to 0 as it should be discovered by path query and has no meaning for RoCE.
This also avoid of using the rtnl lock and ethtool API, which is a bottleneck when try to setup many rdma-cm connections at the same time, especially with multiple processes.
--- drivers/infiniband/core/cma.c | 4 ++-- include/rdma/ib_addr.h | 23 ----------------------- 2 files changed, 2 insertions(+), 25 deletions(-)
drivers/infiniband/core/cma.c +2 -2
@@ -3113,7 +3113,7 @@ static int cma_resolve_iboe_route(struct rdma_id_private *id_priv) route->path_rec->traffic_class = tos; route->path_rec->mtu =iboe_get_mtu (ndev->mtu); route->path_rec->rate_selector =IB_SA_EQ ; - route->path_rec->rate =iboe_get_rate (ndev); + route->path_rec->rate =IB_RATE_PORT_CURRENT ;dev_put (ndev); route->path_rec->packet_life_time_selector =IB_SA_EQ ;/* In case ACK timeout is set, use this value to calculate
@@ -4770,7 +4770,7 @@ static int cma_iboe_join_multicast(struct rdma_id_private *id_priv,if (!ndev)return -ENODEV ; - ib.rec.rate =iboe_get_rate (ndev); + ib.rec.rate =IB_RATE_PORT_CURRENT ; ib.rec.hop_limit =1 ; ib.rec.mtu =iboe_get_mtu (ndev->mtu);
include/rdma/ib_addr.h +0 -23
@@ -194,29 +194,6 @@ static inline enum ib_mtu iboe_get_mtu(int mtu)return 0 ; } -static inline int iboe_get_rate (struct net_device *dev) -{ -struct ethtool_link_ksettings cmd; -int err; - -rtnl_lock (); - err =__ethtool_get_link_ksettings (dev, &cmd); -rtnl_unlock (); -if (err) -return IB_RATE_PORT_CURRENT ; - -if (cmd.base.speed >=40000 ) -return IB_RATE_40_GBPS ; -else if (cmd.base.speed >=30000 ) -return IB_RATE_30_GBPS ; -else if (cmd.base.speed >=20000 ) -return IB_RATE_20_GBPS ; -else if (cmd.base.speed >=10000 ) -return IB_RATE_10_GBPS ; -else -return IB_RATE_PORT_CURRENT ; -} -static inline int rdma_link_local_addr (struct in6_addr *addr) { if (addr->s6_addr32[0] == htonl(0xfe800000) &&
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 79/107 IB/uverbs: Fix to consider event queue closing also upon non-blocking mode
In reply to Greg Kroah-HartmanFrom: Yishai Hadas <[email protected]>
[ Upstream commit 62fab312fa1683e812e605db20d4f22de3e3fb2f ]
Fix ib_uverbs_event_read() to consider event queue closing also upon non-blocking mode.
Once the queue is closed (e.g. hot-plug flow) all the existing events are cleaned-up as part of ib_uverbs_free_event_queue().
An application that uses the non-blocking FD mode should get -EIO in that case to let it knows that the device was removed already.
Otherwise, it can loose the indication that the device was removed and won't recover.
As part of that, refactor the code to have a single flow with regards to 'is_closed' for both blocking and non-blocking modes.
--- drivers/infiniband/core/uverbs_main.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
drivers/infiniband/core/uverbs_main.c +5 -7
@@ -222,8 +222,12 @@ static ssize_t ib_uverbs_event_read(struct ib_uverbs_event_queue *ev_queue,spin_lock_irq (&ev_queue->lock);while (list_empty (&ev_queue->event_list)) { -spin_unlock_irq (&ev_queue->lock); +if (ev_queue->is_closed) { +spin_unlock_irq (&ev_queue->lock); +return -EIO ; + } +spin_unlock_irq (&ev_queue->lock);if (filp->f_flags &O_NONBLOCK )return -EAGAIN ;
@@ -233,12 +237,6 @@ static ssize_t ib_uverbs_event_read(struct ib_uverbs_event_queue *ev_queue,return -ERESTARTSYS ;spin_lock_irq (&ev_queue->lock); - -/* If device was disassociated and no event exists set an error */ -if (list_empty (&ev_queue->event_list) && ev_queue->is_closed) { -spin_unlock_irq (&ev_queue->lock); -return -EIO ; - } } event = list_entry(ev_queue->event_list.next, struct ib_uverbs_event, list);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 80/107 IB/isert: Fix dead lock in ib_isert
In reply to Greg Kroah-HartmanFrom: Saravanan Vajravel <[email protected]>
[ Upstream commit 691b0480933f0ce88a81ed1d1a0aff340ff6293a ]
- When a iSER session is released, ib_isert module is taking a mutex lock and releasing all pending connections. As part of this, ib_isert is destroying rdma cm_id. To destroy cm_id, rdma_cm module is sending CM events to CMA handler of ib_isert. This handler is taking same mutex lock. Hence it leads to deadlock between ib_isert & rdma_cm modules.
- For fix, created local list of pending connections and release the connection outside of mutex lock.
Calltrace:
---------
[ 1229.791410] INFO: task kworker/10:1:642 blocked for more than 120 seconds. [ 1229.791416] Tainted: G OE --------- - - 4.18.0-372.9.1.el8.x86_64 #1 [ 1229.791418] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. [ 1229.791419] task:kworker/10:1 state:D stack: 0 pid: 642 ppid: 2 flags:0x80004000 [ 1229.791424] Workqueue: ib_cm cm_work_handler [ib_cm] [ 1229.791436] Call Trace: [ 1229.791438] __schedule+0x2d1/0x830 [ 1229.791445] ? select_idle_sibling+0x23/0x6f0 [ 1229.791449] schedule+0x35/0xa0 [ 1229.791451] schedule_preempt_disabled+0xa/0x10 [ 1229.791453] __mutex_lock.isra.7+0x310/0x420 [ 1229.791456] ? select_task_rq_fair+0x351/0x990 [ 1229.791459] isert_cma_handler+0x224/0x330 [ib_isert] [ 1229.791463] ? ttwu_queue_wakelist+0x159/0x170 [ 1229.791466] cma_cm_event_handler+0x25/0xd0 [rdma_cm] [ 1229.791474] cma_ib_handler+0xa7/0x2e0 [rdma_cm] [ 1229.791478] cm_process_work+0x22/0xf0 [ib_cm] [ 1229.791483] cm_work_handler+0xf4/0xf30 [ib_cm] [ 1229.791487] ? move_linked_works+0x6e/0xa0 [ 1229.791490] process_one_work+0x1a7/0x360 [ 1229.791491] ? create_worker+0x1a0/0x1a0 [ 1229.791493] worker_thread+0x30/0x390 [ 1229.791494] ? create_worker+0x1a0/0x1a0 [ 1229.791495] kthread+0x10a/0x120 [ 1229.791497] ? set_kthread_struct+0x40/0x40 [ 1229.791499] ret_from_fork+0x1f/0x40
[ 1229.791739] INFO: task targetcli:28666 blocked for more than 120 seconds. [ 1229.791740] Tainted: G OE --------- - - 4.18.0-372.9.1.el8.x86_64 #1 [ 1229.791741] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. [ 1229.791742] task:targetcli state:D stack: 0 pid:28666 ppid: 5510 flags:0x00004080 [ 1229.791743] Call Trace: [ 1229.791744] __schedule+0x2d1/0x830 [ 1229.791746] schedule+0x35/0xa0 [ 1229.791748] schedule_preempt_disabled+0xa/0x10 [ 1229.791749] __mutex_lock.isra.7+0x310/0x420 [ 1229.791751] rdma_destroy_id+0x15/0x20 [rdma_cm] [ 1229.791755] isert_connect_release+0x115/0x130 [ib_isert] [ 1229.791757] isert_free_np+0x87/0x140 [ib_isert] [ 1229.791761] iscsit_del_np+0x74/0x120 [iscsi_target_mod] [ 1229.791776] lio_target_np_driver_store+0xe9/0x140 [iscsi_target_mod] [ 1229.791784] configfs_write_file+0xb2/0x110 [ 1229.791788] vfs_write+0xa5/0x1a0 [ 1229.791792] ksys_write+0x4f/0xb0 [ 1229.791794] do_syscall_64+0x5b/0x1a0 [ 1229.791798] entry_SYSCALL_64_after_hwframe+0x65/0xca
--- drivers/infiniband/ulp/isert/ib_isert.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/infiniband/ulp/isert/ib_isert.c +8 -2
@@ -2431,6 +2431,7 @@ isert_free_np(struct iscsi_np *np) {struct isert_np *isert_np = np->np_context;struct isert_conn *isert_conn, *n; +LIST_HEAD (drop_conn_list);if (isert_np->cm_id)rdma_destroy_id (isert_np->cm_id);
@@ -2450,7 +2451,7 @@ isert_free_np(struct iscsi_np *np) node) {isert_info ("cleaning isert_conn %p state (%d)\n" , isert_conn, isert_conn->state); -isert_connect_release (isert_conn); +list_move_tail (&isert_conn->node, &drop_conn_list); } }
@@ -2461,11 +2462,16 @@ isert_free_np(struct iscsi_np *np) node) {isert_info ("cleaning isert_conn %p state (%d)\n" , isert_conn, isert_conn->state); -isert_connect_release (isert_conn); +list_move_tail (&isert_conn->node, &drop_conn_list); } }mutex_unlock (&isert_np->mutex); +list_for_each_entry_safe (isert_conn, n, &drop_conn_list, node) { +list_del_init (&isert_conn->node); +isert_connect_release (isert_conn); + } + np->np_context =NULL ;kfree (isert_np); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 81/107 IB/isert: Fix possible list corruption in CMA handler
In reply to Greg Kroah-HartmanFrom: Saravanan Vajravel <[email protected]>
[ Upstream commit 7651e2d6c5b359a28c2d4c904fec6608d1021ca8 ]
When ib_isert module receives connection error event, it is releasing the isert session and removes corresponding list node but it doesn't take appropriate mutex lock to remove the list node. This can lead to linked list corruption
--- drivers/infiniband/ulp/isert/ib_isert.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/infiniband/ulp/isert/ib_isert.c +4 -0
@@ -656,9 +656,13 @@ static int isert_connect_error(struct rdma_cm_id *cma_id) {struct isert_conn *isert_conn = cma_id->qp->qp_context; +struct isert_np *isert_np = cma_id->context;ib_drain_qp (isert_conn->qp); + +mutex_lock (&isert_np->mutex);list_del_init (&isert_conn->node); +mutex_unlock (&isert_np->mutex); isert_conn->cm_id =NULL ;isert_put_conn (isert_conn);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 82/107 IB/isert: Fix incorrect release of isert connection
In reply to Greg Kroah-HartmanFrom: Saravanan Vajravel <[email protected]>
[ Upstream commit 699826f4e30ab76a62c238c86fbef7e826639c8d ]
The ib_isert module is releasing the isert connection both in isert_wait_conn() handler as well as isert_free_conn() handler. In isert_wait_conn() handler, it is expected to wait for iSCSI session logout operation to complete. It should free the isert connection only in isert_free_conn() handler.
When a bunch of iSER target is cleared, this issue can lead to use-after-free memory issue as isert conn is twice released
--- drivers/infiniband/ulp/isert/ib_isert.c | 2 -- 1 file changed, 2 deletions(-)
drivers/infiniband/ulp/isert/ib_isert.c +0 -2
@@ -2570,8 +2570,6 @@ static void isert_wait_conn(struct iscsi_conn *conn)isert_put_unsol_pending_cmds (conn);isert_wait4cmds (conn);isert_wait4logout (isert_conn); - -queue_work (isert_release_wq, &isert_conn->release_work); }static void isert_free_conn (struct iscsi_conn *conn)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 83/107 net: ethtool: correct MAX attribute value for stats
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit 52f79609c0c5b25fddb88e85f25ce08aa7e3fb42 ]
When compiling YNL generated code compiler complains about array-initializer-out-of-bounds. Turns out the MAX value for STATS_GRP uses the value for STATS.
This may lead to random corruptions in user space (kernel itself doesn't use this value as it never parses stats).
--- include/uapi/linux/ethtool_netlink.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/uapi/linux/ethtool_netlink.h +1 -1
@@ -743,7 +743,7 @@ enum {/* add new constants above here */ __ETHTOOL_A_STATS_GRP_CNT, -ETHTOOL_A_STATS_GRP_MAX = (__ETHTOOL_A_STATS_CNT -1 ) +ETHTOOL_A_STATS_GRP_MAX = (__ETHTOOL_A_STATS_GRP_CNT -1 ) }; enum {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 84/107 ipvlan: fix bound dev checking for IPv6 l3s mode
In reply to Greg Kroah-HartmanFrom: Hangbin Liu <[email protected]>
[ Upstream commit ce57adc222aba32431c42632b396e9213d0eb0b8 ]
The commit 59a0b022aa24 ("ipvlan: Make skb->skb_iif track skb->dev for l3s mode") fixed ipvlan bonded dev checking by updating skb skb_iif. This fix works for IPv4, as in raw_v4_input() the dif is from inet_iif(skb), which is skb->skb_iif when there is no route.
But for IPv6, the fix is not enough, because in ipv6_raw_deliver() -> raw_v6_match(), the dif is inet6_iif(skb), which is returns IP6CB(skb)->iif instead of skb->skb_iif if it's not a l3_slave. To fix the IPv6 part issue. Let's set IP6CB(skb)->iif to correct ifindex.
BTW, ipvlan handles NS/NA specifically. Since it works fine, I will not reset IP6CB(skb)->iif when addr->atype is IPVL_ICMPV6.
--- drivers/net/ipvlan/ipvlan_l3s.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/ipvlan/ipvlan_l3s.c +4 -0
@@ -102,6 +102,10 @@ static unsigned int ipvlan_nf_input(void *priv, struct sk_buff *skb, skb->dev = addr->master->dev; skb->skb_iif = skb->dev->ifindex; +#if IS_ENABLED (CONFIG_IPV6 ) +if (addr->atype ==IPVL_IPV6 ) +IP6CB (skb)->iif = skb->dev->ifindex; +#endif len = skb->len +ETH_HLEN ;ipvlan_count_rx (addr->master, len, true, false); out:
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 85/107 sctp: fix an error code in sctp_sf_eat_auth()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 75e6def3b26736e7ff80639810098c9074229737 ]
The sctp_sf_eat_auth() function is supposed to enum sctp_disposition values and returning a kernel error code will cause issues in the caller. Change -ENOMEM to SCTP_DISPOSITION_NOMEM.
--- net/sctp/sm_statefuns.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/sctp/sm_statefuns.c +1 -1
@@ -4478,7 +4478,7 @@ enum sctp_disposition sctp_sf_eat_auth(struct net *net, SCTP_AUTH_NEW_KEY, GFP_ATOMIC);if (!ev) -return -ENOMEM ; +return SCTP_DISPOSITION_NOMEM ;sctp_add_cmd_sf (commands,SCTP_CMD_EVENT_ULP ,SCTP_ULPEVENT (ev));
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 86/107 igc: Clean the TX buffer and TX descriptor ring
In reply to Greg Kroah-HartmanFrom: Muhammad Husaini Zulkifli <[email protected]>
[ Upstream commit e43516f5978d11d36511ce63d31d1da4db916510 ]
There could be a race condition during link down where interrupt being generated and igc_clean_tx_irq() been called to perform the TX completion. Properly clear the TX buffer/descriptor ring and disable the TX Queue ring in igc_free_tx_resources() to avoid that.
Kernel trace:
[ 108.237177] Hardware name: Intel Corporation Tiger Lake Client Platform/TigerLake U DDR4 SODIMM RVP, BIOS TGLIFUI1.R00.4204.A00.2105270302 05/27/2021 [ 108.237178] RIP: 0010:refcount_warn_saturate+0x55/0x110 [ 108.242143] RSP: 0018:ffff9e7980003db0 EFLAGS: 00010286 [ 108.245555] Code: 84 bc 00 00 00 c3 cc cc cc cc 85 f6 74 46 80 3d 20 8c 4d 01 00 75 ee 48 c7 c7 88 f4 03 ab c6 05 10 8c 4d 01 01 e8 0b 10 96 ff <0f> 0b c3 cc cc cc cc 80 3d fc 8b 4d 01 00 75 cb 48 c7 c7 b0 f4 03 [ 108.250434] [ 108.250434] RSP: 0018:ffff9e798125f910 EFLAGS: 00010286 [ 108.254358] RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000000 [ 108.259325] [ 108.259325] RAX: 0000000000000000 RBX: ffff8ddb935b8000 RCX: 0000000000000027 [ 108.261868] RDX: ffff8de250a28800 RSI: ffff8de250a1c580 RDI: ffff8de250a1c580 [ 108.265538] RDX: 0000000000000027 RSI: 0000000000000002 RDI: ffff8de250a9c588 [ 108.265539] RBP: ffff8ddb935b8000 R08: ffffffffab2655a0 R09: ffff9e798125f898 [ 108.267914] RBP: ffff8ddb8a5b8d80 R08: 0000005648eba354 R09: 0000000000000000 [ 108.270196] R10: 0000000000000001 R11: 000000002d2d2d2d R12: ffff9e798125f948 [ 108.270197] R13: ffff9e798125fa1c R14: ffff8ddb8a5b8d80 R15: 7fffffffffffffff [ 108.273001] R10: 000000002d2d2d2d R11: 000000002d2d2d2d R12: ffff8ddb8a5b8ed4 [ 108.276410] FS: 00007f605851b740(0000) GS:ffff8de250a80000(0000) knlGS:0000000000000000 [ 108.280597] R13: 00000000000002ac R14: 00000000ffffff99 R15: ffff8ddb92561b80 [ 108.282966] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 108.282967] CR2: 00007f053c039248 CR3: 0000000185850003 CR4: 0000000000f70ee0 [ 108.286206] FS: 0000000000000000(0000) GS:ffff8de250a00000(0000) knlGS:0000000000000000 [ 108.289701] PKRU: 55555554 [ 108.289702] Call Trace: [ 108.289704] <TASK> [ 108.293977] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 108.297562] sock_alloc_send_pskb+0x20c/0x240 [ 108.301494] CR2: 00007f053c03a168 CR3: 0000000184394002 CR4: 0000000000f70ef0 [ 108.301495] PKRU: 55555554 [ 108.306464] __ip_append_data.isra.0+0x96f/0x1040 [ 108.309441] Call Trace: [ 108.309443] ? __pfx_ip_generic_getfrag+0x10/0x10 [ 108.314927] <IRQ> [ 108.314928] sock_wfree+0x1c7/0x1d0 [ 108.318078] ? __pfx_ip_generic_getfrag+0x10/0x10 [ 108.320276] skb_release_head_state+0x32/0x90 [ 108.324812] ip_make_skb+0xf6/0x130 [ 108.327188] skb_release_all+0x16/0x40 [ 108.330775] ? udp_sendmsg+0x9f3/0xcb0 [ 108.332626] napi_consume_skb+0x48/0xf0 [ 108.334134] ? xfrm_lookup_route+0x23/0xb0 [ 108.344285] igc_poll+0x787/0x1620 [igc] [ 108.346659] udp_sendmsg+0x9f3/0xcb0 [ 108.360010] ? ttwu_do_activate+0x40/0x220 [ 108.365237] ? __pfx_ip_generic_getfrag+0x10/0x10 [ 108.366744] ? try_to_wake_up+0x289/0x5e0 [ 108.376987] ? sock_sendmsg+0x81/0x90 [ 108.395698] ? __pfx_process_timeout+0x10/0x10 [ 108.395701] sock_sendmsg+0x81/0x90 [ 108.409052] __napi_poll+0x29/0x1c0 [ 108.414279] ____sys_sendmsg+0x284/0x310 [ 108.419507] net_rx_action+0x257/0x2d0 [ 108.438216] ___sys_sendmsg+0x7c/0xc0 [ 108.439723] __do_softirq+0xc1/0x2a8 [ 108.444950] ? finish_task_switch+0xb4/0x2f0 [ 108.452077] irq_exit_rcu+0xa9/0xd0 [ 108.453584] ? __schedule+0x372/0xd00 [ 108.460713] common_interrupt+0x84/0xa0 [ 108.467840] ? clockevents_program_event+0x95/0x100 [ 108.474968] </IRQ> [ 108.482096] ? do_nanosleep+0x88/0x130 [ 108.489224] <TASK> [ 108.489225] asm_common_interrupt+0x26/0x40 [ 108.496353] ? __rseq_handle_notify_resume+0xa9/0x4f0 [ 108.503478] RIP: 0010:cpu_idle_poll+0x2c/0x100 [ 108.510607] __sys_sendmsg+0x5d/0xb0 [ 108.518687] Code: 05 e1 d9 c8 00 65 8b 15 de 64 85 55 85 c0 7f 57 e8 b9 ef ff ff fb 65 48 8b 1c 25 00 cc 02 00 48 8b 03 a8 08 74 0b eb 1c f3 90 <48> 8b 03 a8 08 75 13 8b 05 77 63 cd 00 85 c0 75 ed e8 ce ec ff ff [ 108.525817] do_syscall_64+0x44/0xa0 [ 108.531563] RSP: 0018:ffffffffab203e70 EFLAGS: 00000202 [ 108.538693] entry_SYSCALL_64_after_hwframe+0x72/0xdc [ 108.546775] [ 108.546777] RIP: 0033:0x7f605862b7f7 [ 108.549495] RAX: 0000000000000001 RBX: ffffffffab20c940 RCX: 000000000000003b [ 108.551955] Code: 0e 00 f7 d8 64 89 02 48 c7 c0 ff ff ff ff eb b9 0f 1f 00 f3 0f 1e fa 64 8b 04 25 18 00 00 00 85 c0 75 10 b8 2e 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 51 c3 48 83 ec 28 89 54 24 1c 48 89 74 24 10 [ 108.554068] RDX: 4000000000000000 RSI: 000000002da97f6a RDI: 00000000002b8ff4 [ 108.559816] RSP: 002b:00007ffc99264058 EFLAGS: 00000246 [ 108.564178] RBP: 0000000000000000 R08: 00000000002b8ff4 R09: ffff8ddb01554c80 [ 108.571302] ORIG_RAX: 000000000000002e [ 108.571303] RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007f605862b7f7 [ 108.574023] R10: 000000000000015b R11: 000000000000000f R12: ffffffffab20c940 [ 108.574024] R13: 0000000000000000 R14: ffff8de26fbeef40 R15: ffffffffab20c940 [ 108.578727] RDX: 0000000000000000 RSI: 00007ffc992640a0 RDI: 0000000000000003 [ 108.578728] RBP: 00007ffc99264110 R08: 0000000000000000 R09: 175f48ad1c3a9c00 [ 108.581187] do_idle+0x62/0x230 [ 108.585890] R10: 0000000000000000 R11: 0000000000000246 R12: 00007ffc992642d8 [ 108.585891] R13: 00005577814ab2ba R14: 00005577814addf0 R15: 00007f605876d000 [ 108.587920] cpu_startup_entry+0x1d/0x20 [ 108.591422] </TASK> [ 108.596127] rest_init+0xc5/0xd0 [ 108.600490] ---[ end trace 0000000000000000 ]---
Test Setup:
DUT:
- Change mac address on DUT Side. Ensure NIC not having same MAC Address
- Running udp_tai on DUT side. Let udp_tai running throughout the test
Example:
./udp_tai -i enp170s0 -P 100000 -p 90 -c 1 -t 0 -u 30004
Host:
- Perform link up/down every 5 second.
Result:
Kernel panic will happen on DUT Side.
--- drivers/net/ethernet/intel/igc/igc_main.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/igc/igc_main.c +8 -1
@@ -254,6 +254,13 @@ static void igc_clean_tx_ring(struct igc_ring *tx_ring)/* reset BQL for queue */ netdev_tx_reset_queue (txring_txq (tx_ring)); +/* Zero out the buffer ring */ +memset (tx_ring->tx_buffer_info,0 , +sizeof (*tx_ring->tx_buffer_info) * tx_ring->count); + +/* Zero out the descriptor ring */ +memset (tx_ring->desc,0 , tx_ring->size); +/* reset next_to_use and next_to_clean */ tx_ring->next_to_use =0 ; tx_ring->next_to_clean =0 ;
@@ -267,7 +274,7 @@ static void igc_clean_tx_ring(struct igc_ring *tx_ring)*/ void igc_free_tx_resources (struct igc_ring *tx_ring) { -igc_clean_tx_ring (tx_ring); +igc_disable_tx_ring (tx_ring);vfree (tx_ring->tx_buffer_info); tx_ring->tx_buffer_info =NULL ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 87/107 igb: fix nvm.ops.read() error handling
In reply to Greg Kroah-HartmanFrom: Aleksandr Loktionov <[email protected]>
[ Upstream commit 48a821fd58837800750ec1b3962f0f799630a844 ]
Add error handling into igb_set_eeprom() function, in case nvm.ops.read() fails just quit with error code asap.
--- drivers/net/ethernet/intel/igb/igb_ethtool.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/ethernet/intel/igb/igb_ethtool.c +3 -0
@@ -822,6 +822,8 @@ static int igb_set_eeprom(struct net_device *netdev,*/ ret_val = hw->nvm.ops.read (hw, last_word,1 , &eeprom_buff[last_word - first_word]); +if (ret_val) + goto out; }/* Device's eeprom is always little-endian, word addressable */
@@ -841,6 +843,7 @@ static int igb_set_eeprom(struct net_device *netdev, hw->nvm.ops.update (hw);igb_set_fw_version (adapter); +out:kfree (eeprom_buff);return ret_val; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 88/107 drm/nouveau: dont detect DSM for non-NVIDIA device
In reply to Greg Kroah-HartmanFrom: Ratchanan Srirattanamet <[email protected]>
[ Upstream commit 11d24327c2d7ad7f24fcc44fb00e1fa91ebf6525 ]
The call site of nouveau_dsm_pci_probe() uses single set of output variables for all invocations. So, we must not write anything to them unless it's an NVIDIA device. Otherwise, if we are called with another device after the NVIDIA device, we'll clober the result of the NVIDIA device.
For example, if the other device doesn't have _PR3 resources, the detection later would miss the presence of power resource support, and the rest of the code will keep using Optimus DSM, breaking power management for that machine.
Also, because we're detecting NVIDIA's DSM, it doesn't make sense to run this detection on a non-NVIDIA device anyway. Thus, check at the beginning of the detection code if this is an NVIDIA card, and just return if it isn't.
This, together with commit d22915d22ded ("drm/nouveau/devinit/tu102-:
wait for GFW_BOOT_PROGRESS == COMPLETED") developed independently and landed earlier, fixes runtime power management of the NVIDIA card in Lenovo Legion 5-15ARH05. Without this patch, the GPU resumption code will "timeout", sometimes hanging userspace.
As a bonus, we'll also stop preventing _PR3 usage from the bridge for unrelated devices, which is always nice, I guess.
--- drivers/gpu/drm/nouveau/nouveau_acpi.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/nouveau/nouveau_acpi.c +3 -0
@@ -220,6 +220,9 @@ static void nouveau_dsm_pci_probe(struct pci_dev *pdev, acpi_handle *dhandle_outint optimus_funcs;struct pci_dev *parent_pdev; +if (pdev->vendor !=PCI_VENDOR_ID_NVIDIA ) +return ; + *has_pr3 = false; parent_pdev =pci_upstream_bridge (pdev);if (parent_pdev) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 89/107 drm/nouveau/dp: check for NULL nv_connector->native_mode
In reply to Greg Kroah-HartmanFrom: Natalia Petrova <[email protected]>
[ Upstream commit 20a2ce87fbaf81e4c3dcb631d738e423959eb320 ]
Add checking for NULL before calling nouveau_connector_detect_depth() in nouveau_connector_get_modes() function because nv_connector->native_mode could be dereferenced there since connector pointer passed to nouveau_connector_detect_depth() and the same value of nv_connector->native_mode is used there.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/gpu/drm/nouveau/nouveau_connector.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/nouveau/nouveau_connector.c +2 -2
@@ -965,7 +965,7 @@ nouveau_connector_get_modes(struct drm_connector *connector)/* Determine display colour depth for everything except LVDS now, * DP requires this before mode_valid() is called. */ -if (connector->connector_type !=DRM_MODE_CONNECTOR_LVDS ) +if (connector->connector_type !=DRM_MODE_CONNECTOR_LVDS && nv_connector->native_mode)nouveau_connector_detect_depth (connector);/* Find the native mode if this is a digital panel, if we didn't
@@ -986,7 +986,7 @@ nouveau_connector_get_modes(struct drm_connector *connector)* "native" mode as some VBIOS tables require us to use the * pixel clock as part of the lookup... */ -if (connector->connector_type ==DRM_MODE_CONNECTOR_LVDS ) +if (connector->connector_type ==DRM_MODE_CONNECTOR_LVDS && nv_connector->native_mode)nouveau_connector_detect_depth (connector);if (nv_encoder->dcb->type ==DCB_OUTPUT_TV )
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 90/107 drm/nouveau: add nv_encoder pointer check for NULL
In reply to Greg Kroah-HartmanFrom: Natalia Petrova <[email protected]>
[ Upstream commit 55b94bb8c42464bad3d2217f6874aa1a85664eac ]
Pointer nv_encoder could be dereferenced at nouveau_connector.c in case it's equal to NULL by jumping to goto label. This patch adds a NULL-check to avoid it.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/gpu/drm/nouveau/nouveau_connector.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/nouveau/nouveau_connector.c +2 -1
@@ -729,7 +729,8 @@ nouveau_connector_detect_lvds(struct drm_connector *connector, bool force)#endif nouveau_connector_set_edid (nv_connector, edid); -nouveau_connector_set_encoder (connector, nv_encoder); +if (nv_encoder) +nouveau_connector_set_encoder (connector, nv_encoder);return status; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 91/107 cifs: fix lease break oops in xfstest generic/098
In reply to Greg Kroah-HartmanFrom: Steve French <[email protected]>
[ Upstream commit c774e6779f38bf36f0cce65e30793704bab4b0d7 ]
umount can race with lease break so need to check if tcon->ses->server is still valid to send the lease break response.
--- fs/cifs/file.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
fs/cifs/file.c +6 -2
@@ -4929,9 +4929,13 @@ void cifs_oplock_break(struct work_struct *work)* disconnected since oplock already released by the server */ if (!oplock_break_cancelled) { - rc = tcon->ses->server->ops->oplock_response (tcon, persistent_fid, +/* check for server null since can race with kill_sb calling tree disconnect */ +if (tcon->ses && tcon->ses->server) { + rc = tcon->ses->server->ops->oplock_response (tcon, persistent_fid, volatile_fid, net_fid, cinode); -cifs_dbg (FYI ,"Oplock release rc = %d\n" , rc); +cifs_dbg (FYI ,"Oplock release rc = %d\n" , rc); + }else +pr_warn_once ("lease break not sent for unmounted share\n" ); }cifs_done_oplock_break (cinode);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 92/107 ext4: drop the call to ext4_error() from ext4_get_group_info()
In reply to Greg Kroah-HartmanFrom: Fabio M. De Francesco <[email protected]>
[ Upstream commit f451fd97dd2b78f286379203a47d9d295c467255 ]
A recent patch added a call to ext4_error() which is problematic since some callers of the ext4_get_group_info() function may be holding a spinlock, whereas ext4_error() must never be called in atomic context.
This triggered a report from Syzbot: "BUG: sleeping function called from invalid context in ext4_update_super" (see the link below).
Therefore, drop the call to ext4_error() from ext4_get_group_info(). In the meantime use eight characters tabs instead of nine characters ones.
--- fs/ext4/balloc.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-)
fs/ext4/balloc.c +9 -11
@@ -322,17 +322,15 @@ static ext4_fsblk_t ext4_valid_block_bitmap_padding(struct super_block *sb,struct ext4_group_info *ext4_get_group_info (struct super_block *sb,ext4_group_t group) { -struct ext4_group_info **grp_info; -long indexv, indexh; - -if (unlikely (group >=EXT4_SB (sb)->s_groups_count)) { -ext4_error (sb,"invalid group %u" , group); -return NULL ; - } - indexv = group >> (EXT4_DESC_PER_BLOCK_BITS (sb)); - indexh = group & ((EXT4_DESC_PER_BLOCK (sb)) -1 ); - grp_info =sbi_array_rcu_deref (EXT4_SB (sb), s_group_info, indexv); -return grp_info[indexh]; +struct ext4_group_info **grp_info; +long indexv, indexh; + +if (unlikely (group >=EXT4_SB (sb)->s_groups_count)) +return NULL ; + indexv = group >> (EXT4_DESC_PER_BLOCK_BITS (sb)); + indexh = group & ((EXT4_DESC_PER_BLOCK (sb)) -1 ); + grp_info =sbi_array_rcu_deref (EXT4_SB (sb), s_group_info, indexv); +return grp_info[indexh]; }/*
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 93/107 net/sched: cls_api: Fix lockup on flushing explicitly created chain
In reply to Greg Kroah-HartmanFrom: Vlad Buslov <[email protected]>
[ Upstream commit c9a82bec02c339cdda99b37c5e62b3b71fc4209c ]
Mingshuai Ren reports:
When a new chain is added by using tc, one soft lockup alarm will be
generated after delete the prio 0 filter of the chain. To reproduce the problem, perform the following steps:
(1) tc qdisc add dev eth0 root handle 1: htb default 1
(2) tc chain add dev eth0
(3) tc filter del dev eth0 chain 0 parent 1: prio 0
(4) tc filter add dev eth0 chain 0 parent 1:
Fix the issue by accounting for additional reference to chains that are explicitly created by RTM_NEWCHAIN message as opposed to implicitly by RTM_NEWTFILTER message.
--- net/sched/cls_api.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
net/sched/cls_api.c +7 -5
@@ -533,8 +533,8 @@ static void __tcf_chain_put(struct tcf_chain *chain, bool by_act, {struct tcf_block *block = chain->block;const struct tcf_proto_ops *tmplt_ops; +unsigned int refcnt, non_act_refcnt;bool free_block = false; -unsigned int refcnt;void *tmplt_priv;mutex_lock (&block->lock);
@@ -554,13 +554,15 @@ static void __tcf_chain_put(struct tcf_chain *chain, bool by_act,* save these to temporary variables. */ refcnt = --chain->refcnt; + non_act_refcnt = refcnt - chain->action_refcnt; tmplt_ops = chain->tmplt_ops; tmplt_priv = chain->tmplt_priv; -/* The last dropped non-action reference will trigger notification. */ -if (refcnt - chain->action_refcnt ==0 && !by_act) { -tc_chain_notify_delete (tmplt_ops, tmplt_priv, chain->index, - block,NULL ,0 ,0 , false); +if (non_act_refcnt == chain->explicitly_created && !by_act) { +if (non_act_refcnt ==0 ) +tc_chain_notify_delete (tmplt_ops, tmplt_priv, + chain->index, block,NULL ,0 ,0 , + false);/* Last reference to chain, no need to lock. */ chain->flushing = false; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 94/107 net: lapbether: only support ethernet devices
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 9eed321cde22fc1afd76eac563ce19d899e0d6b2 ]
It probbaly makes no sense to support arbitrary network devices for lapbether.
syzbot reported:
skbuff: skb_under_panic: text:ffff80008934c100 len:44 put:40 head:ffff0000d18dd200 data:ffff0000d18dd1ea tail:0x16 end:0x140 dev:bond1 kernel BUG at net/core/skbuff.c:200 !
Internal error: Oops - BUG: 00000000f2000800 [#1] PREEMPT SMP Modules linked in: CPU: 0 PID: 5643 Comm: dhcpcd Not tainted 6.4.0-rc5-syzkaller-g4641cff8e810 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 05/25/2023 pstate: 60400005 (nZCv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) pc : skb_panic net/core/skbuff.c:196 [inline] pc : skb_under_panic+0x13c/0x140 net/core/skbuff.c:210 lr : skb_panic net/core/skbuff.c:196 [inline] lr : skb_under_panic+0x13c/0x140 net/core/skbuff.c:210
sp : ffff8000973b7260
x29: ffff8000973b7270 x28: ffff8000973b7360 x27: dfff800000000000
x26: ffff0000d85d8150 x25: 0000000000000016 x24: ffff0000d18dd1ea
x23: ffff0000d18dd200 x22: 000000000000002c x21: 0000000000000140
x20: 0000000000000028 x19: ffff80008934c100 x18: ffff8000973b68a0
x17: 0000000000000000 x16: ffff80008a43bfbc x15: 0000000000000202
x14: 0000000000000000 x13: 0000000000000001 x12: 0000000000000001
x11: 0000000000000201 x10: 0000000000000000 x9 : f22f7eb937cced00 x8 : f22f7eb937cced00 x7 : 0000000000000001 x6 : 0000000000000001 x5 : ffff8000973b6b78 x4 : ffff80008df9ee80 x3 : ffff8000805974f4 x2 : 0000000000000001 x1 : 0000000100000201 x0 : 0000000000000086
Call trace: skb_panic net/core/skbuff.c:196 [inline] skb_under_panic+0x13c/0x140 net/core/skbuff.c:210 skb_push+0xf0/0x108 net/core/skbuff.c:2409 ip6gre_header+0xbc/0x738 net/ipv6/ip6_gre.c:1383 dev_hard_header include/linux/netdevice.h:3137 [inline] lapbeth_data_transmit+0x1c4/0x298 drivers/net/wan/lapbether.c:257 lapb_data_transmit+0x8c/0xb0 net/lapb/lapb_iface.c:447 lapb_transmit_buffer+0x178/0x204 net/lapb/lapb_out.c:149 lapb_send_control+0x220/0x320 net/lapb/lapb_subr.c:251 lapb_establish_data_link+0x94/0xec lapb_device_event+0x348/0x4e0 notifier_call_chain+0x1a4/0x510 kernel/notifier.c:93 raw_notifier_call_chain+0x3c/0x50 kernel/notifier.c:461 __dev_notify_flags+0x2bc/0x544 dev_change_flags+0xd0/0x15c net/core/dev.c:8643 devinet_ioctl+0x858/0x17e4 net/ipv4/devinet.c:1150 inet_ioctl+0x2ac/0x4d8 net/ipv4/af_inet.c:979 sock_do_ioctl+0x134/0x2dc net/socket.c:1201 sock_ioctl+0x4ec/0x858 net/socket.c:1318 vfs_ioctl fs/ioctl.c:51 [inline] __do_sys_ioctl fs/ioctl.c:870 [inline] __se_sys_ioctl fs/ioctl.c:856 [inline] __arm64_sys_ioctl+0x14c/0x1c8 fs/ioctl.c:856 __invoke_syscall arch/arm64/kernel/syscall.c:38 [inline] invoke_syscall+0x98/0x2c0 arch/arm64/kernel/syscall.c:52 el0_svc_common+0x138/0x244 arch/arm64/kernel/syscall.c:142 do_el0_svc+0x64/0x198 arch/arm64/kernel/syscall.c:191 el0_svc+0x4c/0x160 arch/arm64/kernel/entry-common.c:647 el0t_64_sync_handler+0x84/0xfc arch/arm64/kernel/entry-common.c:665 el0t_64_sync+0x190/0x194 arch/arm64/kernel/entry.S:591 Code: aa1803e6 aa1903e7 a90023f5 947730f5 (d4210000)
--- drivers/net/wan/lapbether.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/wan/lapbether.c +3 -0
@@ -384,6 +384,9 @@ static int lapbeth_new_device(struct net_device *dev)ASSERT_RTNL (); +if (dev->type !=ARPHRD_ETHER ) +return -EINVAL ; + ndev =alloc_netdev (sizeof (*lapbeth),"lapb%d" ,NET_NAME_UNKNOWN , lapbeth_setup);if (!ndev)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 95/107 dm: dont lock fs when the map is NULL during suspend or resume
In reply to Greg Kroah-HartmanFrom: Li Lingfeng <[email protected]>
[ Upstream commit 2760904d895279f87196f0fa9ec570c79fe6a2e4 ]
As described in commit 38d11da522aa ("dm: don't lock fs when the map is NULL in process of resume"), a deadlock may be triggered between do_resume() and do_mount().
This commit preserves the fix from commit 38d11da522aa but moves it to where it also serves to fix a similar deadlock between do_suspend() and do_mount(). It does so, if the active map is NULL, by clearing DM_SUSPEND_LOCKFS_FLAG in dm_suspend() which is called by both do_suspend() and do_resume().
--- drivers/md/dm-ioctl.c | 5 +---- drivers/md/dm.c | 4 ++++ 2 files changed, 5 insertions(+), 4 deletions(-)
drivers/md/dm-ioctl.c +1 -4
@@ -1145,13 +1145,10 @@ static int do_resume(struct dm_ioctl *param)/* Do we need to load a new map ? */ if (new_map) {sector_t old_size, new_size; -int srcu_idx;/* Suspend if it isn't already suspended */ - old_map =dm_get_live_table (md, &srcu_idx); -if ((param->flags &DM_SKIP_LOCKFS_FLAG ) || !old_map) +if (param->flags &DM_SKIP_LOCKFS_FLAG ) suspend_flags &= ~DM_SUSPEND_LOCKFS_FLAG ; -dm_put_live_table (md, srcu_idx);if (param->flags &DM_NOFLUSH_FLAG ) suspend_flags |=DM_SUSPEND_NOFLUSH_FLAG ;if (!dm_suspended_md (md))
drivers/md/dm.c +4 -0
@@ -2526,6 +2526,10 @@ int dm_suspend(struct mapped_device *md, unsigned suspend_flags) } map =rcu_dereference_protected (md->map,lockdep_is_held (&md->suspend_lock)); +if (!map) { +/* avoid deadlock with fs/namespace.c:do_mount() */ + suspend_flags &= ~DM_SUSPEND_LOCKFS_FLAG ; + } r =__dm_suspend (md, map, suspend_flags,TASK_INTERRUPTIBLE ,DMF_SUSPENDED );if (r)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 96/107 net: tipc: resize nlattr array to correct size
In reply to Greg Kroah-HartmanFrom: Lin Ma <[email protected]>
[ Upstream commit 44194cb1b6045dea33ae9a0d54fb7e7cd93a2e09 ]
According to nla_parse_nested_deprecated(), the tb[] is supposed to the destination array with maxtype+1 elements. In current tipc_nl_media_get() and __tipc_nl_media_set(), a larger array is used which is unnecessary. This patch resize them to a proper size.
--- net/tipc/bearer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/tipc/bearer.c +2 -2
@@ -1258,7 +1258,7 @@ int tipc_nl_media_get(struct sk_buff *skb, struct genl_info *info)struct tipc_nl_msg msg;struct tipc_media *media;struct sk_buff *rep; -struct nlattr *attrs[TIPC_NLA_BEARER_MAX +1 ]; +struct nlattr *attrs[TIPC_NLA_MEDIA_MAX +1 ];if (!info->attrs[TIPC_NLA_MEDIA ])return -EINVAL ;
@@ -1307,7 +1307,7 @@ int __tipc_nl_media_set(struct sk_buff *skb, struct genl_info *info)int err;char *name;struct tipc_media *m; -struct nlattr *attrs[TIPC_NLA_BEARER_MAX +1 ]; +struct nlattr *attrs[TIPC_NLA_MEDIA_MAX +1 ];if (!info->attrs[TIPC_NLA_MEDIA ])return -EINVAL ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 97/107 selftests/ptp: Fix timestamp printf format for PTP_SYS_OFFSET
In reply to Greg Kroah-HartmanFrom: Alex Maftei <[email protected]>
[ Upstream commit 76a4c8b82938bc5020b67663db41f451684bf327 ]
Previously, timestamps were printed using "%lld.%u" which is incorrect for nanosecond values lower than 100,000,000 as they're fractional digits, therefore leading zeros are meaningful.
This patch changes the format strings to "%lld.%09u" in order to add leading zeros to the nanosecond value.
--- tools/testing/selftests/ptp/testptp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
tools/testing/selftests/ptp/testptp.c +3 -3
@@ -492,11 +492,11 @@ int main(int argc, char *argv[]) interval = t2 - t1; offset = (t2 + t1) /2 - tp; -printf ("system time: %lld.%u\n" , +printf ("system time: %lld.%09u\n" , (pct+2 *i)->sec, (pct+2 *i)->nsec); -printf ("phc time: %lld.%u\n" , +printf ("phc time: %lld.%09u\n" , (pct+2 *i+1 )->sec, (pct+2 *i+1 )->nsec); -printf ("system time: %lld.%u\n" , +printf ("system time: %lld.%09u\n" , (pct+2 *i+2 )->sec, (pct+2 *i+2 )->nsec); printf("system/phc clock time offset is %" PRId64 " ns\n" "system clock time delay is %" PRId64 " ns\n",
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 98/107 afs: Fix vlserver probe RTT handling
In reply to Greg Kroah-HartmanFrom: David Howells <[email protected]>
[ Upstream commit ba00b190670809c1a89326d80de96d714f6004f2 ]
In the same spirit as commit ca57f02295f1 ("afs: Fix fileserver probe RTT handling"), don't rule out using a vlserver just because there haven't been enough packets yet to calculate a real rtt. Always set the server's probe rtt from the estimate provided by rxrpc_kernel_get_srtt, which is capped at 1 second.
This could lead to EDESTADDRREQ errors when accessing a cell for the first time, even though the vl servers are known and have responded to a probe.
--- fs/afs/vl_probe.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/afs/vl_probe.c +2 -2
@@ -115,8 +115,8 @@ void afs_vlserver_probe_result(struct afs_call *call) } } -if (rxrpc_kernel_get_srtt (call->net->socket, call->rxcall, &rtt_us) && - rtt_us < server->probe.rtt) { +rxrpc_kernel_get_srtt (call->net->socket, call->rxcall, &rtt_us); +if (rtt_us < server->probe.rtt) { server->probe.rtt = rtt_us; server->rtt = rtt_us; alist->preferred = index;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 99/107 cgroup: always put cset in cgroup_css_set_put_fork
In reply to Greg Kroah-HartmanFrom: John Sperbeck <[email protected]>
commit 2bd110339288c18823dcace602b63b0d8627e520 upstream.
A successful call to cgroup_css_set_fork() will always have taken a ref on kargs->cset (regardless of CLONE_INTO_CGROUP), so always do a corresponding put in cgroup_css_set_put_fork().
Without this, a cset and its contained css structures will be leaked for some fork failures. The following script reproduces the leak for a fork failure due to exceeding pids.max in the pids controller. A similar thing can happen if we jump to the bad_fork_cancel_cgroup label in copy_process().
[ -z "$1" ] && echo "Usage $0 pids-root" && exit 1 PID_ROOT=$1
CGROUP=$PID_ROOT/foo
[ -e $CGROUP ] && rmdir -f $CGROUP
mkdir $CGROUP
echo 5 > $CGROUP/pids.max
echo $$ > $CGROUP/cgroup.procs
fork_bomb()
{
set -e
for i in $(seq 10); do
/bin/sleep 3600 &
done
}(fork_bomb) &
wait
echo $$ > $PID_ROOT/cgroup.procs
kill $(cat $CGROUP/cgroup.procs)
rmdir $CGROUP
--- kernel/cgroup/cgroup.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)
kernel/cgroup/cgroup.c +8 -9
@@ -6259,19 +6259,18 @@ err:static void cgroup_css_set_put_fork (struct kernel_clone_args *kargs) __releases(&cgroup_threadgroup_rwsem) __releases(&cgroup_mutex) { +struct cgroup *cgrp = kargs->cgrp; +struct css_set *cset = kargs->cset; +cgroup_threadgroup_change_end (current); -if (kargs->flags &CLONE_INTO_CGROUP ) { -struct cgroup *cgrp = kargs->cgrp; -struct css_set *cset = kargs->cset; +if (cset) { +put_css_set (cset); + kargs->cset =NULL ; + } +if (kargs->flags &CLONE_INTO_CGROUP ) {mutex_unlock (&cgroup_mutex); - -if (cset) { -put_css_set (cset); - kargs->cset =NULL ; - } -if (cgrp) {cgroup_put (cgrp); kargs->cgrp =NULL ;
Greg Kroah-Hartman
maintainerPATCH 100/107 rcu/kvfree: Avoid freeing new kfree_rcu() memory after old grace period
In reply to Greg Kroah-HartmanFrom: Ziwei Dai <[email protected]>
commit 5da7cb193db32da783a3f3e77d8b639989321d48 upstream.
Memory passed to kvfree_rcu() that is to be freed is tracked by a per-CPU kfree_rcu_cpu structure, which in turn contains pointers to kvfree_rcu_bulk_data structures that contain pointers to memory that has not yet been handed to RCU, along with an kfree_rcu_cpu_work structure that tracks the memory that has already been handed to RCU. These structures track three categories of memory: (1) Memory for kfree(), (2) Memory for kvfree(), and (3) Memory for both that arrived during an OOM episode. The first two categories are tracked in a cache-friendly manner involving a dynamically allocated page of pointers (the aforementioned kvfree_rcu_bulk_data structures), while the third uses a simple (but decidedly cache-unfriendly) linked list through the rcu_head structures in each block of memory.
On a given CPU, these three categories are handled as a unit, with that CPU's kfree_rcu_cpu_work structure having one pointer for each of the three categories. Clearly, new memory for a given category cannot be placed in the corresponding kfree_rcu_cpu_work structure until any old memory has had its grace period elapse and thus has been removed. And the kfree_rcu_monitor() function does in fact check for this.
Except that the kfree_rcu_monitor() function checks these pointers one at a time. This means that if the previous kfree_rcu() memory passed to RCU had only category 1 and the current one has only category 2, the kfree_rcu_monitor() function will send that current category-2 memory along immediately. This can result in memory being freed too soon, that is, out from under unsuspecting RCU readers.
To see this, consider the following sequence of events, in which:
o Task A on CPU 0 calls rcu_read_lock(), then uses "from_cset",
then is preempted.
o CPU 1 calls kfree_rcu(cset, rcu_head) in order to free "from_cset"
after a later grace period. Except that "from_cset" is freed right after the previous grace period ended, so that "from_cset" is immediately freed. Task A resumes and references "from_cset"'s member, after which nothing good happens.
In full detail:
CPU 0 CPU 1
---------------------- ----------------------count_memcg_event_mm()
|rcu_read_lock() <---
|mem_cgroup_from_task()
|// css_set_ptr is the "from_cset" mentioned on CPU 1 |css_set_ptr = rcu_dereference((task)->cgroups) |// Hard irq comes, current task is scheduled out.
cgroup_attach_task() |cgroup_migrate() |cgroup_migrate_execute() |css_set_move_task(task, from_cset, to_cset, true) |cgroup_move_task(task, to_cset) |rcu_assign_pointer(.., to_cset) |... |cgroup_migrate_finish() |put_css_set_locked(from_cset) |from_cset->refcount return 0 |kfree_rcu(cset, rcu_head) // free from_cset after new gp |add_ptr_to_bulk_krc_lock() |schedule_delayed_work(&krcp->monitor_work, ..) kfree_rcu_monitor() |krcp->bulk_head[0]'s work attached to krwp->bulk_head_free[] |queue_rcu_work(system_wq, &krwp->rcu_work) |if rwork->rcu.work is not in WORK_STRUCT_PENDING_BIT state, |call_rcu(&rwork->rcu, rcu_work_rcufn) <--- request new gp // There is a perious call_rcu(.., rcu_work_rcufn) // gp end, rcu_work_rcufn() is called. rcu_work_rcufn() |__queue_work(.., rwork->wq, &rwork->work); |kfree_rcu_work() |krwp->bulk_head_free[0] bulk is freed before new gp end!!! |The "from_cset" is freed before new gp end.
// the task resumes some time later.
|css_set_ptr->subsys[(subsys_id) <--- Caused kernel crash, because css_set_ptr is freed.
This commit therefore causes kfree_rcu_monitor() to refrain from moving kfree_rcu() memory to the kfree_rcu_cpu_work structure until the RCU grace period has completed for all three categories.
v2: Use helper function instead of inserted code block at kfree_rcu_monitor().
--- kernel/rcu/tree.c | 39 +++++++++++++++++++++++++++++++-------- 1 file changed, 31 insertions(+), 8 deletions(-)
kernel/rcu/tree.c +31 -8
@@ -3328,6 +3328,30 @@ static void kfree_rcu_work(struct work_s } } +static bool +need_offload_krc (struct kfree_rcu_cpu *krcp) +{ +int i; + +for (i =0 ; i <FREE_N_CHANNELS ; i++) +if (krcp->bkvhead[i]) +return true; + +return !!krcp->head; +} + +static bool +need_wait_for_krwp_work (struct kfree_rcu_cpu_work *krwp) +{ +int i; + +for (i =0 ; i <FREE_N_CHANNELS ; i++) +if (krwp->bkvhead_free[i]) +return true; + +return !!krwp->head_free; +} +/* * This function is invoked after the KFREE_DRAIN_JIFFIES timeout. */
@@ -3344,14 +3368,13 @@ static void kfree_rcu_monitor(struct worfor (i =0 ; i <KFREE_N_BATCHES ; i++) {struct kfree_rcu_cpu_work *krwp = &(krcp->krw_arr[i]); -// Try to detach bkvhead or head and attach it over any -// available corresponding free channel. It can be that -// a previous RCU batch is in progress, it means that -// immediately to queue another one is not possible so -// in that case the monitor work is rearmed. -if ((krcp->bkvhead[0 ] && !krwp->bkvhead_free[0 ]) || - (krcp->bkvhead[1 ] && !krwp->bkvhead_free[1 ]) || - (krcp->head && !krwp->head_free)) { +// Try to detach bulk_head or head and attach it, only when +// all channels are free. Any channel is not free means at krwp +// there is on-going rcu work to handle krwp's free business. +if (need_wait_for_krwp_work (krwp)) +continue ; + +if (need_offload_krc (krcp)) {// Channel 1 corresponds to the SLAB-pointer bulk path. // Channel 2 corresponds to vmalloc-pointer bulk path. for (j =0 ; j <FREE_N_CHANNELS ; j++) {
Greg Kroah-Hartman
maintainerPATCH 101/107 neighbour: Remove unused inline function neigh_key_eq16()
In reply to Greg Kroah-HartmanFrom: Gaosheng Cui <[email protected]>
commit c8f01a4a54473f88f8cc0d9046ec9eb5a99815d5 upstream.
All uses of neigh_key_eq16() have
been removed since commit 1202cdd66531 ("Remove DECnet support from kernel"), so remove it.
--- include/net/neighbour.h | 5 ----- 1 file changed, 5 deletions(-)
include/net/neighbour.h +0 -5
@@ -260,11 +260,6 @@ static inline void *neighbour_priv(constextern const struct nla_policy nda_policy[]; -static inline bool neigh_key_eq16 (const struct neighbour *n,const void *pkey) -{ -return *(const u16 *)n->primary_key == *(const u16 *)pkey; -} -static inline bool neigh_key_eq32 (const struct neighbour *n,const void *pkey) {return *(const u32 *)n->primary_key == *(const u32 *)pkey;
Greg Kroah-Hartman
maintainerPATCH 102/107 net: Remove unused inline function dst_hold_and_use()
In reply to Greg Kroah-HartmanFrom: Gaosheng Cui <[email protected]>
commit 0b81882ddf8ac2743f657afb001beec7fc3929af upstream.
All uses of dst_hold_and_use() have
been removed since commit 1202cdd66531 ("Remove DECnet support from kernel"), so remove it.
--- include/net/dst.h | 6 ------ 1 file changed, 6 deletions(-)
include/net/dst.h +0 -6
@@ -238,12 +238,6 @@ static inline void dst_use_noref(struct } } -static inline void dst_hold_and_use (struct dst_entry *dst,unsigned long time) -{ -dst_hold (dst); -dst_use_noref (dst, time); -} -static inline struct dst_entry *dst_clone (struct dst_entry *dst) {if (dst)
Greg Kroah-Hartman
maintainerPATCH 103/107 net: Remove DECnet leftovers from flow.h.
In reply to Greg Kroah-HartmanFrom: Guillaume Nault <[email protected]>
commit 9bc61c04ff6cce6a3756b86e6b34914f7b39d734 upstream.
DECnet was removed by commit 1202cdd66531 ("Remove DECnet support from kernel"). Let's also revome its flow structure.
Compile-tested only (allmodconfig).
--- include/net/flow.h | 26 -------------------------- 1 file changed, 26 deletions(-)
include/net/flow.h +0 -26
@@ -54,11 +54,6 @@ union flowi_uli {__u8 code; } icmpt; -struct { -__le16 dport; -__le16 sport; - } dnports; -__be32 gre_key;struct {
@@ -153,27 +148,11 @@ struct flowi6 {__u32 mp_hash; } __attribute__((__aligned__(BITS_PER_LONG/8))); -struct flowidn { -struct flowi_common __fl_common; -#define flowidn_oif __fl_common.flowic_oif -#define flowidn_iif __fl_common.flowic_iif -#define flowidn_mark __fl_common.flowic_mark -#define flowidn_scope __fl_common.flowic_scope -#define flowidn_proto __fl_common.flowic_proto -#define flowidn_flags __fl_common.flowic_flags -__le16 daddr; -__le16 saddr; -union flowi_uli uli; -#define fld_sport uli.ports.sport -#define fld_dport uli.ports.dport -} __attribute__((__aligned__ (BITS_PER_LONG /8 ))); -struct flowi {union {struct flowi_common __fl_common;struct flowi4 ip4;struct flowi6 ip6; -struct flowidn dn; } u;#define flowi_oif u.__fl_common.flowic_oif#define flowi_iif u.__fl_common.flowic_iif
@@ -207,11 +186,6 @@ static inline struct flowi_common *flowi return &(fl6->__fl_common); } -static inline struct flowi *flowidn_to_flowi (struct flowidn *fldn) -{ - return container_of(fldn, struct flowi, u.dn); -} -__u32 __get_hash_from_flowi6 (const struct flowi6 *fl6,struct flow_keys *keys);#endif
Greg Kroah-Hartman
maintainerPATCH 104/107 neighbour: delete neigh_lookup_nodev as not used
In reply to Greg Kroah-HartmanFrom: Leon Romanovsky <[email protected]>
commit 76b9bf965c98c9b53ef7420b3b11438dbd764f92 upstream.
neigh_lookup_nodev isn't used in the kernel after removal of DECnet. So let's remove it.
--- include/net/neighbour.h | 2 -- net/core/neighbour.c | 31 ------------------------------- 2 files changed, 33 deletions(-)
include/net/neighbour.h +0 -2
@@ -309,8 +309,6 @@ void neigh_table_init(int index, structint neigh_table_clear (int index,struct neigh_table *tbl);struct neighbour *neigh_lookup (struct neigh_table *tbl,const void *pkey,struct net_device *dev); -struct neighbour *neigh_lookup_nodev (struct neigh_table *tbl,struct net *net, -const void *pkey);struct neighbour *__neigh_create (struct neigh_table *tbl,const void *pkey,struct net_device *dev,bool want_ref); static inline struct neighbour *neigh_create(struct neigh_table *tbl,
net/core/neighbour.c +0 -31
@@ -570,37 +570,6 @@ struct neighbour *neigh_lookup(struct ne }EXPORT_SYMBOL (neigh_lookup); -struct neighbour *neigh_lookup_nodev (struct neigh_table *tbl,struct net *net, -const void *pkey) -{ -struct neighbour *n; -unsigned int key_len = tbl->key_len; -u32 hash_val; -struct neigh_hash_table *nht; - -NEIGH_CACHE_STAT_INC (tbl, lookups); - -rcu_read_lock_bh (); - nht =rcu_dereference_bh (tbl->nht); - hash_val = tbl->hash (pkey,NULL , nht->hash_rnd) >> (32 - nht->hash_shift); - -for (n =rcu_dereference_bh (nht->hash_buckets[hash_val]); - n !=NULL ; - n =rcu_dereference_bh (n->next)) { -if (!memcmp (n->primary_key, pkey, key_len) && -net_eq (dev_net (n->dev), net)) { -if (!refcount_inc_not_zero (&n->refcnt)) - n =NULL ; -NEIGH_CACHE_STAT_INC (tbl, hits); -break ; - } - } - -rcu_read_unlock_bh (); -return n; -} -EXPORT_SYMBOL (neigh_lookup_nodev); -static struct neighbour * ___neigh_create(struct neigh_table *tbl, const void *pkey, struct net_device *dev, u8 flags,
Greg Kroah-Hartman
maintainerPATCH 105/107 of: overlay: add entry to of_overlay_action_name[]
In reply to Greg Kroah-HartmanFrom: Frank Rowand <[email protected]>
commit 1ac17586c950a2c129393f8a92901a2b357acf24 upstream.
The values of enum of_overlay_notify_action are used to index into array of_overlay_action_name. Add an entry to of_overlay_action_name for the value recently added to of_overlay_notify_action.
Array of_overlay_action_name[] is moved into include/linux/of.h adjacent to enum of_overlay_notify_action to make the connection between the two more obvious if either is modified in the future.
The only use of of_overlay_action_name is for error reporting in overlay_notify(). All callers of overlay_notify() report the same error, but with fewer details. Remove the redundant error reports in the callers.
--- drivers/of/overlay.c | 27 +++++---------------------- include/linux/of.h | 13 +++++++++++++ 2 files changed, 18 insertions(+), 22 deletions(-)
drivers/of/overlay.c +5 -22
@@ -152,13 +152,6 @@ int of_overlay_notifier_unregister(struc }EXPORT_SYMBOL_GPL (of_overlay_notifier_unregister); -static char *of_overlay_action_name[] = { -"pre-apply" , -"post-apply" , -"pre-remove" , -"post-remove" , -}; -static int overlay_notify (struct overlay_changeset *ovcs,enum of_overlay_notify_action action) {
@@ -178,7 +171,7 @@ static int overlay_notify(struct overlayif (notifier_to_errno (ret)) { ret =notifier_to_errno (ret);pr_err ("overlay changeset %s notifier error %d, target: %pOF\n" , - of_overlay_action_name[action], ret, nd.target); +of_overlay_action_name (action), ret, nd.target);return ret; } }
@@ -926,10 +919,8 @@ static int of_overlay_apply(struct overl goto out; ret =overlay_notify (ovcs,OF_OVERLAY_PRE_APPLY ); -if (ret) { -pr_err ("overlay changeset pre-apply notify error %d\n" , ret); +if (ret) goto out; - } ret =build_changeset (ovcs);if (ret)
@@ -952,12 +943,9 @@ static int of_overlay_apply(struct overl/* notify failure is not fatal, continue */ ret_tmp =overlay_notify (ovcs,OF_OVERLAY_POST_APPLY ); -if (ret_tmp) { -pr_err ("overlay changeset post-apply notify error %d\n" , - ret_tmp); +if (ret_tmp)if (!ret) ret = ret_tmp; - } out:pr_debug ("%s() err=%d\n" , __func__, ret);
@@ -1193,10 +1181,8 @@ int of_overlay_remove(int *ovcs_id) } ret =overlay_notify (ovcs,OF_OVERLAY_PRE_REMOVE ); -if (ret) { -pr_err ("overlay changeset pre-remove notify error %d\n" , ret); +if (ret) goto err_unlock; - } ret_apply =0 ; ret =__of_changeset_revert_entries (&ovcs->cset, &ret_apply);
@@ -1219,12 +1205,9 @@ int of_overlay_remove(int *ovcs_id)* OF_OVERLAY_POST_REMOVE returns an error. */ ret_tmp =overlay_notify (ovcs,OF_OVERLAY_POST_REMOVE ); -if (ret_tmp) { -pr_err ("overlay changeset post-remove notify error %d\n" , - ret_tmp); +if (ret_tmp)if (!ret) ret = ret_tmp; - }free_overlay_changeset (ovcs);
include/linux/of.h +13 -0
@@ -1493,6 +1493,19 @@ enum of_overlay_notify_action { OF_OVERLAY_POST_REMOVE, }; +static inline char *of_overlay_action_name (enum of_overlay_notify_action action) +{ +static char *of_overlay_action_name[] = { +"init" , +"pre-apply" , +"post-apply" , +"pre-remove" , +"post-remove" , + }; + +return of_overlay_action_name[action]; +} +struct of_overlay_notify_data {struct device_node *overlay;struct device_node *target;
Greg Kroah-Hartman
maintainerPATCH 106/107 mmc: block: ensure error propagation for non-blk
In reply to Greg Kroah-HartmanFrom: Christian Loehle <[email protected]>
commit 003fb0a51162d940f25fc35e70b0996a12c9e08a upstream.
Requests to the mmc layer usually come through a block device IO. The exceptions are the ioctl interface, RPMB chardev ioctl and debugfs, which issue their own blk_mq requests through blk_execute_rq and do not query the BLK_STS error but the mmcblk-internal drv_op_result. This patch ensures that drv_op_result defaults to an error and has to be overwritten by the operation to be considered successful.
The behavior leads to a bug where the request never propagates the error, e.g. by directly erroring out at mmc_blk_mq_issue_rq if mmc_blk_part_switch fails. The ioctl caller of the rpmb chardev then can never see an error (BLK_STS_IOERR, but drv_op_result is unchanged) and thus may assume that their call executed successfully when it did not.
While always checking the blk_execute_rq return value would be advised, let's eliminate the error by always setting drv_op_result as -EIO to be overwritten on success (or other error)
--- drivers/mmc/core/block.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/mmc/core/block.c +5 -0
@@ -265,6 +265,7 @@ static ssize_t power_ro_lock_store(struc goto out_put; }req_to_mmc_queue_req (req)->drv_op =MMC_DRV_OP_BOOT_WP ; +req_to_mmc_queue_req (req)->drv_op_result = -EIO ;blk_execute_rq (NULL , req,0 ); ret =req_to_mmc_queue_req (req)->drv_op_result;blk_put_request (req);
@@ -656,6 +657,7 @@ static int mmc_blk_ioctl_cmd(struct mmc_ idatas[0 ] = idata;req_to_mmc_queue_req (req)->drv_op = rpmb ?MMC_DRV_OP_IOCTL_RPMB :MMC_DRV_OP_IOCTL ; +req_to_mmc_queue_req (req)->drv_op_result = -EIO ;req_to_mmc_queue_req (req)->drv_op_data = idatas;req_to_mmc_queue_req (req)->ioc_count =1 ;blk_execute_rq (NULL , req,0 );
@@ -725,6 +727,7 @@ static int mmc_blk_ioctl_multi_cmd(struc }req_to_mmc_queue_req (req)->drv_op = rpmb ?MMC_DRV_OP_IOCTL_RPMB :MMC_DRV_OP_IOCTL ; +req_to_mmc_queue_req (req)->drv_op_result = -EIO ;req_to_mmc_queue_req (req)->drv_op_data = idata;req_to_mmc_queue_req (req)->ioc_count = num_of_cmds;blk_execute_rq (NULL , req,0 );
@@ -2784,6 +2787,7 @@ static int mmc_dbg_card_status_get(voidif (IS_ERR (req))return PTR_ERR (req);req_to_mmc_queue_req (req)->drv_op =MMC_DRV_OP_GET_CARD_STATUS ; +req_to_mmc_queue_req (req)->drv_op_result = -EIO ;blk_execute_rq (NULL , req,0 ); ret =req_to_mmc_queue_req (req)->drv_op_result;if (ret >=0 ) {
@@ -2822,6 +2826,7 @@ static int mmc_ext_csd_open(struct inode goto out_free; }req_to_mmc_queue_req (req)->drv_op =MMC_DRV_OP_GET_EXT_CSD ; +req_to_mmc_queue_req (req)->drv_op_result = -EIO ;req_to_mmc_queue_req (req)->drv_op_data = &ext_csd;blk_execute_rq (NULL , req,0 ); err =req_to_mmc_queue_req (req)->drv_op_result;
Greg Kroah-Hartman
maintainerPATCH 107/107 nilfs2: reject devices with insufficient block count
In reply to Greg Kroah-HartmanFrom: Ryusuke Konishi <[email protected]>
commit 92c5d1b860e9581d64baca76779576c0ab0d943d upstream.
The current sanity check for nilfs2 geometry information lacks checks for the number of segments stored in superblocks, so even for device images that have been destructively truncated or have an unusually high number of segments, the mount operation may succeed.
This causes out-of-bounds block I/O on file system block reads or log writes to the segments, the latter in particular causing "a_ops->writepages" to repeatedly fail, resulting in sync_inodes_sb() to hang.
Fix this issue by checking the number of segments stored in the superblock and avoiding mounting devices that can cause out-of-bounds accesses. To eliminate the possibility of overflow when calculating the number of blocks required for the device from the number of segments, this also adds a helper function to calculate the upper bound on the number of segments and inserts a check using it.
--- fs/nilfs2/the_nilfs.c | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-)
fs/nilfs2/the_nilfs.c +43 -1
@@ -405,6 +405,18 @@ unsigned long nilfs_nrsvsegs(struct the_ 100)); } +/** +* nilfs_max_segment_count - calculate the maximum number of segments +* @nilfs: nilfs object +*/ +static u64 nilfs_max_segment_count (struct the_nilfs *nilfs) +{ +u64 max_count =U64_MAX ; + +do_div (max_count, nilfs->ns_blocks_per_segment); +return min_t (u64, max_count,ULONG_MAX ); +} +void nilfs_set_nsegments (struct the_nilfs *nilfs,unsigned long nsegs) { nilfs->ns_nsegments = nsegs;
@@ -414,6 +426,8 @@ void nilfs_set_nsegments(struct the_nilfstatic int nilfs_store_disk_layout (struct the_nilfs *nilfs,struct nilfs_super_block *sbp) { +u64 nsegments, nblocks; +if (le32_to_cpu (sbp->s_rev_level) <NILFS_MIN_SUPP_REV ) { nilfs_err(nilfs->ns_sb, "unsupported revision (superblock rev.=%d.%d, current rev.=%d.%d). Please check the version of mkfs.nilfs(2).",
@@ -457,7 +471,35 @@ static int nilfs_store_disk_layout(strucreturn -EINVAL ; } -nilfs_set_nsegments (nilfs,le64_to_cpu (sbp->s_nsegments)); + nsegments =le64_to_cpu (sbp->s_nsegments); +if (nsegments >nilfs_max_segment_count (nilfs)) { +nilfs_err (nilfs->ns_sb, +"segment count %llu exceeds upper limit (%llu segments)" , + (unsigned long long )nsegments, + (unsigned long long )nilfs_max_segment_count (nilfs)); +return -EINVAL ; + } + + nblocks = (u64 )i_size_read (nilfs->ns_sb->s_bdev->bd_inode) >> + nilfs->ns_sb->s_blocksize_bits; +if (nblocks) { +u64 min_block_count = nsegments * nilfs->ns_blocks_per_segment; +/* +* To avoid failing to mount early device images without a +* second superblock, exclude that block count from the +* "min_block_count" calculation. +*/ + +if (nblocks < min_block_count) { +nilfs_err (nilfs->ns_sb, +"total number of segment blocks %llu exceeds device size (%llu blocks)" , + (unsigned long long )min_block_count, + (unsigned long long )nblocks); +return -EINVAL ; + } + } + +nilfs_set_nsegments (nilfs, nsegments); nilfs->ns_crc_seed =le32_to_cpu (sbp->s_crc_seed);return 0 ; }
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.118 release. There are 107 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, 21 Jun 2023 10:21:12 +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.118-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
Hello Greg,
Quoted 10 lines
From: Greg Kroah-Hartman <[email protected]>
Sent: Monday, June 19, 2023 11:30 AMThis is the start of the stable review cycle for the 5.15.118 release. There are 107 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, 21 Jun 2023 10:21:12 +0000. Anything received after that time might be too late.
Thank you for the release!
CIP configurations built and booted okay with Linux 5.15.118-rc1 (71c980089d73):
https://gitlab.com/cip-project/cip-testing/linux-stable-rc-ci/-/pipelines/904359527
https://gitlab.com/cip-project/cip-testing/linux-stable-rc-ci/-/commits/linux-5.15.y
Kind regards, Chris
Hi Greg,
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.118 release. There are 107 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, 21 Jun 2023 10:21:12 +0000. Anything received after that time might be too late.
No problems seen on x86_64 and aarch64.
Thanks,
Harshit
Quoted 10 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.118-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
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.118 release. There are 107 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, 21 Jun 2023 10:21:12 +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.118-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:
11 builds: 11 pass, 0 fail
28 boots: 28 pass, 0 fail
114 tests: 114 pass, 0 failLinux version: 5.15.118-rc1-g71c980089d73
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 4 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.118 release. There are 107 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.
Build test (gcc version 12.2.1 20230511):
mips: 62 configs -> no failure
arm: 99 configs -> no failure
arm64: 3 configs -> no failurex86_64: 4 configs -> no failure
alpha allmodconfig -> no failure
csky allmodconfig -> no failure
powerpc allmodconfig -> no failure
riscv allmodconfig -> no failure
s390 allmodconfig -> no failure
xtensa allmodconfig -> no failure
Boot test:x86_64: Booted on my test laptop. No regression.x86_64: Booted on qemu. No regression. [1]
arm64: Booted on rpi4b (4GB model). No regression. [2]
mips: Booted on ci20 board. No regression. [3]
[1]. https://openqa.qa.codethink.co.uk/tests/4074
[2]. https://openqa.qa.codethink.co.uk/tests/4072
[3]. https://openqa.qa.codethink.co.uk/tests/4070
Signature · 2 lines
Regards Sudip
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.118 release. There are 107 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, 21 Jun 2023 10:21:12 +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.118-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.
## Build
* kernel: 5.15.118-rc1
* git: https://gitlab.com/Linaro/lkft/mirrors/stable/linux-stable-rc
* git branch: linux-5.15.y
* git commit: 71c980089d7356d54f2dc0be100c29d8c4534602
* git describe: v5.15.117-108-g71c980089d73
* test details:
https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-5.15.y/build/v5.15.117-108-g71c980089d73
## Test Regressions (compared to v5.15.116)
## Metric Regressions (compared to v5.15.116)
## Test Fixes (compared to v5.15.116)
## Metric Fixes (compared to v5.15.116)
## Test result summary
total: 133496, pass: 108841, fail: 3835, skip: 20716, xfail: 104
## Build Summary
* arc: 5 total, 5 passed, 0 failed
* arm: 117 total, 116 passed, 1 failed
* arm64: 45 total, 43 passed, 2 failed
* i386: 35 total, 32 passed, 3 failed
* mips: 27 total, 26 passed, 1 failed
* parisc: 4 total, 4 passed, 0 failed
* powerpc: 27 total, 26 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: 8 total, 8 passed, 0 failed
* x86_64: 38 total, 36 passed, 2 failed
## Test suites summary
* boot
* fwts
* igt-gpu-tools
* 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-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-livepatch
* 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-watchdog
* kselftest-x86
* kselftest-zram
* kunit
* kvm-unit-tests
* libgpiod
* libhugetlbfs
* 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
* network-basic-tests
* perf
* rcutorture
* v4l2-compliance
* vdso
--
Linaro LKFT
https://lkft.linaro.org
Quoted 9 lines
This is the start of the stable review cycle for the 5.15.118 release. There are 107 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, 21 Jun 2023 10:21:12 +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.118-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.
Shuah Khan
maintainerQuoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.118 release. There are 107 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, 21 Jun 2023 10:21:12 +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.118-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 boots, but doesn't get to login prompt. Keeps running into NMIs and watchdog detects had lockups.
I am starting bisect and will keep you updated.
thanks,
-- Shuah
Greg Kroah-Hartman
maintainerQuoted 17 lines · Shuah Khan
Quoted 16 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.118 release. There are 107 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, 21 Jun 2023 10:21:12 +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.118-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,
Quoted 7 lines
Quoted 2 lines
greg k-h
Compiled and boots, but doesn't get to login prompt. Keeps running into NMIs and watchdog detects had lockups.
I am starting bisect and will keep you updated.
Very odd, let me know what you find, thanks!
greg k-h
Shuah Khan
maintainerQuoted 21 lines · Greg Kroah-Hartman
Quoted 20 lines · Shuah Khan
Quoted 18 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.118 release. There are 107 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, 21 Jun 2023 10:21:12 +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.118-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
Quoted 8 lines
Quoted 4 lines
Compiled and boots, but doesn't get to login prompt. Keeps running into NMIs and watchdog detects had lockups.
I am starting bisect and will keep you updated.
Very odd, let me know what you find, thanks!
greg k-h
Bisect flagged the following commit and I don't think this commit could be the cause on an AMD system
# first bad commit: [17627e3f8f0cca041becbec376c07724968c1bf5] of: overlay: rename variables to be consistent
Please go ahead with the release. I will keep debugging.
thanks,
-- Shuah
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.118 release. There are 107 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, 21 Jun 2023 10:21:12 +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.118-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
Built and booted successfully on RISC-V RV64 (HiFive Unmatched).
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.118 release. There are 107 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, 21 Jun 2023 10:21:12 +0000. Anything received after that time might be too late.
Build results:
total: 155 pass: 155 fail: 0 Qemu test results: total: 499 pass: 499 fail: 0
Guenter