- Linux-stable-mirror - lists.linaro.org

[PATCH net v2] nfp: correct number of MSI vectors requests returned

by Louis Peens

From: Xiaoyu Li <xiaoyu.li(a)corigine.com> Before the referenced commit, if fewer interrupts are supported by hardware than requested, then pci_msix_vec_count() returned the former. However, after the referenced commit, an error is returned for this condition. This causes a regression in the NFP driver preventing probe from completing. This situation may occur because the firmware allows sharing of more than one queue per interrupt vector. And, thus, it is valid for the firmware to advertise the number of queues it does. However, interrupt sharing is not currently implemented by the NFP driver as it seems likely - though not tested - that any gains obtained by having more queues would be mitigated by sharing of interrupts. Address this problem by limiting the number of vectors requested to the number supported by hardware. Also, make correct the max/min_irq types. They were unsigned previously but should be signed. Fixes: bab65e48cb06 ("PCI/MSI: Sanitize MSI-X checks") CC: stable(a)vger.kernel.org Signed-off-by: Xiaoyu Li <xiaoyu.li(a)corigine.com> Acked-by: Simon Horman <simon.horman(a)corigine.com> Signed-off-by: Louis Peens <louis.peens(a)corigine.com> --- Changes: V1-->V2 * Updated the max/min_irq types to be signed instead of unsigned * Fixed formatting of commit message to be better aligned at 72 chars * Also updated the commit message to better explain why this is even possible to happen, in response to the question from V1. drivers/net/ethernet/netronome/nfp/nfp_net.h | 4 ++-- drivers/net/ethernet/netronome/nfp/nfp_net_common.c | 12 +++++++++--- drivers/net/ethernet/netronome/nfp/nfp_net_main.c | 9 +++++---- drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c | 8 ++++---- 4 files changed, 20 insertions(+), 13 deletions(-) diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net.h b/drivers/net/ethernet/netronome/nfp/nfp_net.h index 939cfce15830..960f69325287 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net.h +++ b/drivers/net/ethernet/netronome/nfp/nfp_net.h @@ -971,9 +971,9 @@ int nfp_net_mbox_reconfig_and_unlock(struct nfp_net *nn, u32 mbox_cmd); void nfp_net_mbox_reconfig_post(struct nfp_net *nn, u32 update); int nfp_net_mbox_reconfig_wait_posted(struct nfp_net *nn); -unsigned int +int nfp_net_irqs_alloc(struct pci_dev *pdev, struct msix_entry *irq_entries, - unsigned int min_irqs, unsigned int want_irqs); + int min_irqs, int want_irqs); void nfp_net_irqs_disable(struct pci_dev *pdev); void nfp_net_irqs_assign(struct nfp_net *nn, struct msix_entry *irq_entries, diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c index 62f0bf91d1e1..ae309ea48356 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c @@ -362,14 +362,20 @@ int nfp_net_mbox_reconfig_and_unlock(struct nfp_net *nn, u32 mbox_cmd) * @min_irqs: Minimal acceptable number of interrupts * @wanted_irqs: Target number of interrupts to allocate * - * Return: Number of irqs obtained or 0 on error. + * Return: Number of irqs obtained or an errno. */ -unsigned int +int nfp_net_irqs_alloc(struct pci_dev *pdev, struct msix_entry *irq_entries, - unsigned int min_irqs, unsigned int wanted_irqs) + int min_irqs, int wanted_irqs) { unsigned int i; int got_irqs; + int max_irqs; + + max_irqs = pci_msix_vec_count(pdev); + if (max_irqs < 0) + return max_irqs; + wanted_irqs = min_t(int, max_irqs, wanted_irqs); for (i = 0; i < wanted_irqs; i++) irq_entries[i].entry = i; diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_main.c b/drivers/net/ethernet/netronome/nfp/nfp_net_main.c index cbe4972ba104..c1ac380542b5 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_main.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_main.c @@ -222,7 +222,8 @@ static void nfp_net_pf_clean_vnic(struct nfp_pf *pf, struct nfp_net *nn) static int nfp_net_pf_alloc_irqs(struct nfp_pf *pf) { - unsigned int wanted_irqs, num_irqs, vnics_left, irqs_left; + unsigned int vnics_left, irqs_left; + int wanted_irqs, num_irqs; struct nfp_net *nn; /* Get MSI-X vectors */ @@ -237,10 +238,10 @@ static int nfp_net_pf_alloc_irqs(struct nfp_pf *pf) num_irqs = nfp_net_irqs_alloc(pf->pdev, pf->irq_entries, NFP_NET_MIN_VNIC_IRQS * pf->num_vnics, wanted_irqs); - if (!num_irqs) { - nfp_warn(pf->cpp, "Unable to allocate MSI-X vectors\n"); + if (num_irqs < 0) { + nfp_warn(pf->cpp, "Unable to allocate MSI-X vectors (err=%d)\n", num_irqs); kfree(pf->irq_entries); - return -ENOMEM; + return num_irqs; } /* Distribute IRQs to vNICs */ diff --git a/drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c b/drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c index e19bb0150cb5..5f89c7198606 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c @@ -84,7 +84,7 @@ static int nfp_netvf_pci_probe(struct pci_dev *pdev, u32 tx_bar_sz, rx_bar_sz; int tx_bar_no, rx_bar_no; struct nfp_net_vf *vf; - unsigned int num_irqs; + int num_irqs; u8 __iomem *ctrl_bar; struct nfp_net *nn; u32 startq; @@ -255,9 +255,9 @@ static int nfp_netvf_pci_probe(struct pci_dev *pdev, NFP_NET_MIN_VNIC_IRQS, NFP_NET_NON_Q_VECTORS + nn->dp.num_r_vecs); - if (!num_irqs) { - nn_warn(nn, "Unable to allocate MSI-X Vectors. Exiting\n"); - err = -EIO; + if (num_irqs < 0) { + nn_warn(nn, "Unable to allocate MSI-X Vectors. Exiting (err=%d)\n", num_irqs); + err = num_irqs; goto err_unmap_rx; } nfp_net_irqs_assign(nn, vf->irq_entries, num_irqs); -- 2.34.1

2 years, 8 months

4
3
0 0

[PATCH 5.15 00/87] 5.15.108-rc3 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.15.108 release. There are 87 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 Fri, 21 Apr 2023 09:36:40 +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.108-r… 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 <gregkh(a)linuxfoundation.org> Linux 5.15.108-rc3 Xi Ruoyao <xry111(a)xry111.site> nvme-pci: avoid the deepest sleep state on ZHITAI TiPro5000 SSDs Yanteng Si <siyanteng01(a)gmail.com> counter: Add the necessary colons and indents to the comments of counter_compi Randy Dunlap <rdunlap(a)infradead.org> counter: fix docum. build problems after filename change Valentin Schneider <vschneid(a)redhat.com> panic, kexec: make __crash_kexec() NMI safe Valentin Schneider <vschneid(a)redhat.com> kexec: turn all kexec_mutex acquisitions into trylocks Duy Truong <dory(a)dory.moe> nvme-pci: add NVME_QUIRK_BOGUS_NID for T-FORCE Z330 SSD Juraj Pecigos <kernel(a)juraj.dev> nvme-pci: mark Lexar NM760 as IGNORE_DEV_SUBNQN Abhijit <abhijit(a)abhijittomar.com> nvme-pci: add NVME_QUIRK_BOGUS_NID for Lexar NM760 Shyamin Ayesh <me(a)shyamin.com> nvme-pci: add NVME_QUIRK_BOGUS_NID for Lexar NM610 Tobias Gruetzmacher <tobias-git(a)23.gs> nvme-pci: Crucial P2 has bogus namespace ids Ning Wang <ningwang35(a)outlook.com> nvme-pci: avoid the deepest sleep state on ZHITAI TiPro7000 SSDs Stefan Reiter <stefan(a)pimaker.at> nvme-pci: add NVME_QUIRK_BOGUS_NID for ADATA XPG GAMMIX S50 Alyssa Ross <hi(a)alyssa.is> purgatory: fix disabling debug info Masahiro Yamada <masahiroy(a)kernel.org> kbuild: use more subdir- for visiting subdirectories while cleaning Masahiro Yamada <masahiroy(a)kernel.org> sh: remove meaningless archclean line Gregor Herburger <gregor.herburger(a)tq-group.com> i2c: ocores: generate stop condition after timeout in polling mode Matija Glavinic Pecotic <matija.glavinic-pecotic.ext(a)nokia.com> x86/rtc: Remove __init for runtime functions Vincent Guittot <vincent.guittot(a)linaro.org> sched/fair: Fix imbalance overflow zgpeng <zgpeng.linux(a)gmail.com> sched/fair: Move calculate of avg_load to a better location Aneesh Kumar K.V <aneesh.kumar(a)linux.ibm.com> powerpc/papr_scm: Update the NUMA distance table for the target node ZhaoLong Wang <wangzhaolong1(a)huawei.com> ubi: Fix deadlock caused by recursively holding work_sem Zhihao Cheng <chengzhihao1(a)huawei.com> ubi: Fix failure attaching when vid_hdr offset equals to (sub)page size Paolo Abeni <pabeni(a)redhat.com> mptcp: stricter state check in mptcp_worker Paolo Abeni <pabeni(a)redhat.com> mptcp: use mptcp_schedule_work instead of open-coding it Waiman Long <longman(a)redhat.com> cgroup/cpuset: Wake up cpuset_attach_wq tasks in cpuset_cancel_attach() Basavaraj Natikar <Basavaraj.Natikar(a)amd.com> x86/PCI: Add quirk for AMD XHCI controller that loses MSI-X state in D3hot Jiri Kosina <jkosina(a)suse.cz> scsi: ses: Handle enclosure with just a primary component gracefully Radu Pirea (OSS) <radu-nicolae.pirea(a)oss.nxp.com> net: phy: nxp-c45-tja11xx: fix unsigned long multiplication overflow Radu Pirea (OSS) <radu-nicolae.pirea(a)oss.nxp.com> net: phy: nxp-c45-tja11xx: add remove callback Ivan Bornyakov <i.bornyakov(a)metrotek.ru> net: sfp: initialize sfp->i2c_block_size at sfp allocation Mathis Salmen <mathis.salmen(a)matsal.de> riscv: add icache flush for nommu sigreturn trampoline Min Li <lm0963hack(a)gmail.com> drm/i915: fix race condition UAF in i915_perf_add_config_ioctl Umesh Nerlige Ramappa <umesh.nerlige.ramappa(a)intel.com> i915/perf: Replace DRM_DEBUG with driver specific drm_dbg call Steven Rostedt (Google) <rostedt(a)goodmis.org> tracing: Have tracing_snapshot_instance_cond() write errors to the appropriate instance Steven Rostedt (Google) <rostedt(a)goodmis.org> tracing: Add trace_array_puts() to write into instance William Breathitt Gray <william.gray(a)linaro.org> counter: 104-quad-8: Fix Synapse action reported for Index signals William Breathitt Gray <vilhelm.gray(a)gmail.com> counter: Internalize sysfs interface code William Breathitt Gray <vilhelm.gray(a)gmail.com> counter: stm32-timer-cnt: Provide defines for slave mode selection William Breathitt Gray <vilhelm.gray(a)gmail.com> counter: stm32-lptimer-cnt: Provide defines for clock polarities Aymeric Wibo <obiwac(a)gmail.com> ACPI: resource: Add Medion S17413 to IRQ override quirk Johannes Berg <johannes.berg(a)intel.com> wifi: iwlwifi: mvm: fix mvmtxq->stopped handling Robbie Harwood <rharwood(a)redhat.com> asymmetric_keys: log on fatal failures in PE/pkcs7 Robbie Harwood <rharwood(a)redhat.com> verify_pefile: relax wrapper length check Hans de Goede <hdegoede(a)redhat.com> drm: panel-orientation-quirks: Add quirk for Lenovo Yoga Book X90F Hans de Goede <hdegoede(a)redhat.com> efi: sysfb_efi: Add quirk for Lenovo Yoga Book X91F/L Yicong Yang <yangyicong(a)hisilicon.com> i2c: hisi: Avoid redundant interrupts Alexander Stein <alexander.stein(a)ew.tq-group.com> i2c: imx-lpi2c: clean rx/tx buffers upon new message Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> wifi: mwifiex: mark OF related data as maybe unused Grant Grundler <grundler(a)chromium.org> power: supply: cros_usbpd: reclassify "default case!" as debug Andrew Jeffery <andrew(a)aj.id.au> ARM: 9290/1: uaccess: Fix KASAN false-positives Andrii Nakryiko <andrii(a)kernel.org> libbpf: Fix single-line struct definition output in btf_dump Liang Chen <liangchen.linux(a)gmail.com> skbuff: Fix a race between coalescing and releasing SKBs Roman Gushchin <roman.gushchin(a)linux.dev> net: macb: fix a memory corruption in extended buffer descriptor mode Eric Dumazet <edumazet(a)google.com> udp6: fix potential access to stale information Saravanan Vajravel <saravanan.vajravel(a)broadcom.com> RDMA/core: Fix GID entry ref leak when create_ah fails Xin Long <lucien.xin(a)gmail.com> sctp: fix a potential overflow in sctp_ifwdtsn_skip Ziyang Xuan <william.xuanziyang(a)huawei.com> net: qrtr: Fix an uninit variable access bug in qrtr_tx_resume() Denis Plotnikov <den-plotnikov(a)yandex-team.ru> qlcnic: check pci_reset_function result Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> drm/armada: Fix a potential double free in an error handling path YueHaibing <yuehaibing(a)huawei.com> tcp: restrict net.ipv4.tcp_app_win Harshit Mogalapalli <harshit.m.mogalapalli(a)oracle.com> niu: Fix missing unwind goto in niu_alloc_channels() Zheng Wang <zyytlz.wz(a)163.com> 9p/xen : Fix use after free bug in xen_9pfs_front_remove due to race condition Martin KaFai Lau <martin.lau(a)kernel.org> bpf: tcp: Use sock_gen_put instead of sock_put in bpf_iter_tcp Mark Zhang <markzhang(a)nvidia.com> RDMA/cma: Allow UD qp_type to join multicast only Maher Sanalla <msanalla(a)nvidia.com> IB/mlx5: Add support for 400G_8X lane speed Tatyana Nikolova <tatyana.e.nikolova(a)intel.com> RDMA/irdma: Add ipv4 check to irdma_find_listener() Mustafa Ismail <mustafa.ismail(a)intel.com> RDMA/irdma: Increase iWARP CM default rexmit count Mustafa Ismail <mustafa.ismail(a)intel.com> RDMA/irdma: Fix memory leak of PBLE objects Chunyan Zhang <chunyan.zhang(a)unisoc.com> clk: sprd: set max_register according to mapping range Jani Nikula <jani.nikula(a)intel.com> drm/i915/dsi: fix DSS CTL register offsets for TGL+ Reiji Watanabe <reijiw(a)google.com> KVM: arm64: PMU: Restore the guest's EL0 event counting after migration Christophe Kerello <christophe.kerello(a)foss.st.com> mtd: rawnand: stm32_fmc2: use timings.mode instead of checking tRC_min Christophe Kerello <christophe.kerello(a)foss.st.com> mtd: rawnand: stm32_fmc2: remove unsupported EDO mode Arseniy Krasnov <avkrasnov(a)sberdevices.ru> mtd: rawnand: meson: fix bitmask for length in command word Bang Li <libang.linuxer(a)gmail.com> mtdblock: tolerate corrected bit-flips Daniel Vetter <daniel.vetter(a)ffwll.ch> fbmem: Reject FB_ACTIVATE_KD_TEXT from userspace Christoph Hellwig <hch(a)lst.de> btrfs: fix fast csum implementation detection David Sterba <dsterba(a)suse.com> btrfs: print checksum type and implementation at mount time Min Li <lm0963hack(a)gmail.com> Bluetooth: Fix race condition in hidp_session_thread Luiz Augusto von Dentz <luiz.von.dentz(a)intel.com> Bluetooth: L2CAP: Fix use-after-free in l2cap_disconnect_{req,rsp} Oswald Buddenhagen <oswald.buddenhagen(a)gmx.de> ALSA: hda/sigmatel: fix S/PDIF out on Intel D*45* motherboards Oswald Buddenhagen <oswald.buddenhagen(a)gmx.de> ALSA: emu10k1: don't create old pass-through playback device on Audigy Xu Biang <xubiang(a)hust.edu.cn> ALSA: firewire-tascam: add missing unwind goto in snd_tscm_stream_start_duplex() Oswald Buddenhagen <oswald.buddenhagen(a)gmx.de> ALSA: i2c/cs8427: fix iec958 mixer control deactivation Oswald Buddenhagen <oswald.buddenhagen(a)gmx.de> ALSA: hda/sigmatel: add pin overrides for Intel DP45SG motherboard Oswald Buddenhagen <oswald.buddenhagen(a)gmx.de> ALSA: emu10k1: fix capture interrupt handler unlinking Kornel Dulęba <korneld(a)chromium.org> Revert "pinctrl: amd: Disable and mask interrupts on resume" ------------- Diffstat: Documentation/driver-api/generic-counter.rst | 2 +- Documentation/kbuild/makefiles.rst | 17 +- Documentation/networking/ip-sysctl.rst | 2 + Documentation/sound/hd-audio/models.rst | 2 +- MAINTAINERS | 1 - Makefile | 4 +- arch/alpha/Kbuild | 3 + arch/alpha/Makefile | 3 - arch/arc/Kbuild | 3 + arch/arc/Makefile | 3 - arch/arm/Kbuild | 3 + arch/arm/Makefile | 4 - arch/arm/lib/uaccess_with_memcpy.c | 4 +- arch/arm64/Kbuild | 3 + arch/arm64/Makefile | 7 - arch/arm64/kernel/Makefile | 3 + arch/arm64/kvm/pmu-emul.c | 1 + arch/arm64/kvm/sys_regs.c | 1 - arch/csky/Kbuild | 3 + arch/csky/Makefile | 3 - arch/h8300/Kbuild | 3 + arch/h8300/Makefile | 3 - arch/ia64/Makefile | 2 - arch/m68k/Makefile | 4 +- arch/microblaze/Kbuild | 3 + arch/microblaze/Makefile | 3 - arch/mips/Kbuild | 3 + arch/mips/Makefile | 8 +- arch/mips/boot/Makefile | 3 + arch/nds32/Kbuild | 3 + arch/nds32/Makefile | 3 - arch/nios2/Kbuild | 3 + arch/nios2/Makefile | 6 +- arch/openrisc/Kbuild | 3 + arch/openrisc/Makefile | 7 +- arch/parisc/Kbuild | 3 + arch/parisc/Makefile | 7 +- arch/powerpc/Kbuild | 3 + arch/powerpc/Makefile | 7 +- arch/powerpc/mm/numa.c | 1 + arch/powerpc/platforms/pseries/papr_scm.c | 7 + arch/riscv/Kbuild | 3 + arch/riscv/Makefile | 7 +- arch/riscv/kernel/signal.c | 9 +- arch/s390/Kbuild | 3 + arch/s390/Makefile | 8 +- arch/sh/Kbuild | 3 + arch/sh/Makefile | 4 - arch/sparc/Kbuild | 3 + arch/sparc/Makefile | 3 - arch/x86/Kbuild | 3 + arch/x86/Makefile | 2 - arch/x86/kernel/x86_init.c | 4 +- arch/x86/pci/fixup.c | 21 + arch/x86/purgatory/Makefile | 3 +- arch/xtensa/Makefile | 4 +- crypto/asymmetric_keys/pkcs7_verify.c | 10 +- crypto/asymmetric_keys/verify_pefile.c | 32 +- drivers/acpi/resource.c | 7 + drivers/clk/sprd/common.c | 9 +- drivers/counter/104-quad-8.c | 451 +++---- drivers/counter/Makefile | 1 + drivers/counter/counter-core.c | 142 ++ drivers/counter/counter-sysfs.c | 849 ++++++++++++ drivers/counter/counter-sysfs.h | 13 + drivers/counter/counter.c | 1496 --------------------- drivers/counter/ftm-quaddec.c | 60 +- drivers/counter/intel-qep.c | 146 +- drivers/counter/interrupt-cnt.c | 62 +- drivers/counter/microchip-tcb-capture.c | 91 +- drivers/counter/stm32-lptimer-cnt.c | 212 ++- drivers/counter/stm32-timer-cnt.c | 195 ++- drivers/counter/ti-eqep.c | 180 +-- drivers/firmware/efi/sysfb_efi.c | 8 + drivers/gpu/drm/armada/armada_drv.c | 1 - drivers/gpu/drm/drm_panel_orientation_quirks.c | 13 +- drivers/gpu/drm/i915/display/icl_dsi.c | 20 +- drivers/gpu/drm/i915/i915_perf.c | 155 ++- drivers/i2c/busses/i2c-hisi.c | 7 + drivers/i2c/busses/i2c-imx-lpi2c.c | 2 + drivers/i2c/busses/i2c-ocores.c | 35 +- drivers/infiniband/core/cma.c | 60 +- drivers/infiniband/core/verbs.c | 2 + drivers/infiniband/hw/irdma/cm.c | 16 +- drivers/infiniband/hw/irdma/cm.h | 2 +- drivers/infiniband/hw/irdma/hw.c | 3 + drivers/infiniband/hw/mlx5/main.c | 4 + drivers/mtd/mtdblock.c | 12 +- drivers/mtd/nand/raw/meson_nand.c | 6 +- drivers/mtd/nand/raw/stm32_fmc2_nand.c | 3 + drivers/mtd/ubi/build.c | 21 +- drivers/mtd/ubi/wl.c | 4 +- drivers/net/ethernet/cadence/macb_main.c | 4 + drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c | 8 +- drivers/net/ethernet/sun/niu.c | 2 +- drivers/net/phy/nxp-c45-tja11xx.c | 14 +- drivers/net/phy/sfp.c | 13 +- drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 5 +- drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 4 +- drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 5 +- drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 4 +- drivers/net/wireless/marvell/mwifiex/pcie.c | 2 +- drivers/net/wireless/marvell/mwifiex/sdio.c | 2 +- drivers/nvme/host/pci.c | 15 + drivers/pinctrl/pinctrl-amd.c | 36 +- drivers/power/supply/cros_usbpd-charger.c | 2 +- drivers/scsi/ses.c | 20 +- drivers/video/fbdev/core/fbmem.c | 2 + fs/btrfs/disk-io.c | 17 + fs/btrfs/super.c | 2 - include/linux/counter.h | 658 ++++----- include/linux/counter_enum.h | 45 - include/linux/kexec.h | 2 +- include/linux/mfd/stm32-lptimer.h | 5 + include/linux/mfd/stm32-timers.h | 4 + include/linux/trace.h | 12 + kernel/cgroup/cpuset.c | 6 +- kernel/kexec.c | 11 +- kernel/kexec_core.c | 28 +- kernel/kexec_file.c | 4 +- kernel/kexec_internal.h | 15 +- kernel/ksysfs.c | 7 +- kernel/sched/fair.c | 15 +- kernel/trace/trace.c | 41 +- net/9p/trans_xen.c | 4 + net/bluetooth/hidp/core.c | 2 +- net/bluetooth/l2cap_core.c | 24 +- net/core/skbuff.c | 16 +- net/ipv4/sysctl_net_ipv4.c | 3 + net/ipv4/tcp_ipv4.c | 4 +- net/ipv6/udp.c | 8 +- net/mptcp/options.c | 5 +- net/mptcp/protocol.c | 2 +- net/mptcp/subflow.c | 18 +- net/qrtr/af_qrtr.c | 8 +- net/sctp/stream_interleave.c | 3 +- sound/firewire/tascam/tascam-stream.c | 2 +- sound/i2c/cs8427.c | 7 +- sound/pci/emu10k1/emupcm.c | 14 +- sound/pci/hda/patch_sigmatel.c | 10 + tools/lib/bpf/btf_dump.c | 7 +- 141 files changed, 2652 insertions(+), 3062 deletions(-)

2 years, 8 months

3
3
0 0

[PATCH 5.15 0/5] inet6: Backport complete patchset for inet6_destroy_sock() call modification

by Ziyang Xuan

5.15 LTS has backported commit ca43ccf41224 ("dccp/tcp: Avoid negative sk_forward_alloc by ipv6_pinfo.pktoptions.") and commit 62ec33b44e0f ("net: Remove WARN_ON_ONCE(sk->sk_forward_alloc) from sk_stream_kill_queues()."), but these are incomplete. There are some patches that have not been backported including key pre-patches commit d38afeec26ed ("tcp/udp: Call inet6_destroy_sock() in IPv6 sk->sk_destruct().") and commit b5fc29233d28 ("inet6: Remove inet6_destroy_sock() in sk->sk_prot->destroy()."). Without them, there are some memory leak bugs. Backport complete patchset for inet6_destroy_sock() call modification. Kuniyuki Iwashima (5): udp: Call inet6_destroy_sock() in setsockopt(IPV6_ADDRFORM). tcp/udp: Call inet6_destroy_sock() in IPv6 sk->sk_destruct(). inet6: Remove inet6_destroy_sock() in sk->sk_prot->destroy(). dccp: Call inet6_destroy_sock() via sk->sk_destruct(). sctp: Call inet6_destroy_sock() via sk->sk_destruct(). include/net/ipv6.h | 2 ++ include/net/udp.h | 2 +- include/net/udplite.h | 8 -------- net/dccp/dccp.h | 1 + net/dccp/ipv6.c | 15 ++++++++------- net/dccp/proto.c | 8 +++++++- net/ipv4/udp.c | 9 ++++++--- net/ipv4/udplite.c | 8 ++++++++ net/ipv6/af_inet6.c | 15 ++++++++++++++- net/ipv6/ipv6_sockglue.c | 20 ++++++++------------ net/ipv6/ping.c | 6 ------ net/ipv6/raw.c | 2 -- net/ipv6/tcp_ipv6.c | 8 +------- net/ipv6/udp.c | 17 ++++++++++++++--- net/ipv6/udp_impl.h | 1 + net/ipv6/udplite.c | 9 ++++++++- net/l2tp/l2tp_ip6.c | 2 -- net/mptcp/protocol.c | 7 ------- net/sctp/socket.c | 29 +++++++++++++++++++++-------- 19 files changed, 100 insertions(+), 69 deletions(-) -- 2.25.1

2 years, 8 months

1
5
0 0

[PATCH 5.10 0/5] inet6: Backport complete patchset for inet6_destroy_sock() call modification

by Ziyang Xuan

5.10 LTS has backported commit ca43ccf41224 ("dccp/tcp: Avoid negative sk_forward_alloc by ipv6_pinfo.pktoptions.") and commit 62ec33b44e0f ("net: Remove WARN_ON_ONCE(sk->sk_forward_alloc) from sk_stream_kill_queues()."), but these are incomplete. There are some patches that have not been backported including key pre-patches commit d38afeec26ed ("tcp/udp: Call inet6_destroy_sock() in IPv6 sk->sk_destruct().") and commit b5fc29233d28 ("inet6: Remove inet6_destroy_sock() in sk->sk_prot->destroy()."). Without them, there are some memory leak bugs. Backport complete patchset for inet6_destroy_sock() call modification. Kuniyuki Iwashima (5): udp: Call inet6_destroy_sock() in setsockopt(IPV6_ADDRFORM). tcp/udp: Call inet6_destroy_sock() in IPv6 sk->sk_destruct(). inet6: Remove inet6_destroy_sock() in sk->sk_prot->destroy(). dccp: Call inet6_destroy_sock() via sk->sk_destruct(). sctp: Call inet6_destroy_sock() via sk->sk_destruct(). include/net/ipv6.h | 2 ++ include/net/udp.h | 2 +- include/net/udplite.h | 8 -------- net/dccp/dccp.h | 1 + net/dccp/ipv6.c | 15 ++++++++------- net/dccp/proto.c | 8 +++++++- net/ipv4/udp.c | 9 ++++++--- net/ipv4/udplite.c | 8 ++++++++ net/ipv6/af_inet6.c | 15 ++++++++++++++- net/ipv6/ipv6_sockglue.c | 20 ++++++++------------ net/ipv6/ping.c | 6 ------ net/ipv6/raw.c | 2 -- net/ipv6/tcp_ipv6.c | 8 +------- net/ipv6/udp.c | 17 ++++++++++++++--- net/ipv6/udp_impl.h | 1 + net/ipv6/udplite.c | 9 ++++++++- net/l2tp/l2tp_ip6.c | 2 -- net/mptcp/protocol.c | 7 ------- net/sctp/socket.c | 29 +++++++++++++++++++++-------- 19 files changed, 100 insertions(+), 69 deletions(-) -- 2.25.1

2 years, 8 months

1
5
0 0

[PATCH 5.4 0/5] inet6: Backport complete patchset for inet6_destroy_sock() call modification

by Ziyang Xuan

5.4 LTS has backported commit ca43ccf41224 ("dccp/tcp: Avoid negative sk_forward_alloc by ipv6_pinfo.pktoptions.") and commit 62ec33b44e0f ("net: Remove WARN_ON_ONCE(sk->sk_forward_alloc) from sk_stream_kill_queues()."), but these are incomplete. There are some patches that have not been backported including key pre-patches commit d38afeec26ed ("tcp/udp: Call inet6_destroy_sock() in IPv6 sk->sk_destruct().") and commit b5fc29233d28 ("inet6: Remove inet6_destroy_sock() in sk->sk_prot->destroy()."). Without them, there are some memory leak bugs. Backport complete patchset for inet6_destroy_sock() call modification. Kuniyuki Iwashima (5): udp: Call inet6_destroy_sock() in setsockopt(IPV6_ADDRFORM). tcp/udp: Call inet6_destroy_sock() in IPv6 sk->sk_destruct(). inet6: Remove inet6_destroy_sock() in sk->sk_prot->destroy(). dccp: Call inet6_destroy_sock() via sk->sk_destruct(). sctp: Call inet6_destroy_sock() via sk->sk_destruct(). include/net/ipv6.h | 2 ++ include/net/udp.h | 2 +- include/net/udplite.h | 8 -------- net/dccp/dccp.h | 1 + net/dccp/ipv6.c | 15 ++++++++------- net/dccp/proto.c | 8 +++++++- net/ipv4/udp.c | 9 ++++++--- net/ipv4/udplite.c | 8 ++++++++ net/ipv6/af_inet6.c | 15 ++++++++++++++- net/ipv6/ipv6_sockglue.c | 20 ++++++++------------ net/ipv6/ping.c | 6 ------ net/ipv6/raw.c | 2 -- net/ipv6/tcp_ipv6.c | 8 +------- net/ipv6/udp.c | 17 ++++++++++++++--- net/ipv6/udp_impl.h | 1 + net/ipv6/udplite.c | 9 ++++++++- net/l2tp/l2tp_ip6.c | 2 -- net/sctp/socket.c | 29 +++++++++++++++++++++-------- 18 files changed, 100 insertions(+), 62 deletions(-) -- 2.25.1

2 years, 8 months

1
5
0 0

[PATCH 4.19 0/5] inet6: Backport complete patchset for inet6_destroy_sock() call modification

by Ziyang Xuan

4.19 LTS has backported commit ca43ccf41224 ("dccp/tcp: Avoid negative sk_forward_alloc by ipv6_pinfo.pktoptions.") and commit 62ec33b44e0f ("net: Remove WARN_ON_ONCE(sk->sk_forward_alloc) from sk_stream_kill_queues()."), but these are incomplete. There are some patches that have not been backported including key pre-patches commit d38afeec26ed ("tcp/udp: Call inet6_destroy_sock() in IPv6 sk->sk_destruct().") and commit b5fc29233d28 ("inet6: Remove inet6_destroy_sock() in sk->sk_prot->destroy()."). Without them, there are some memory leak bugs. Backport complete patchset for inet6_destroy_sock() call modification. Kuniyuki Iwashima (5): udp: Call inet6_destroy_sock() in setsockopt(IPV6_ADDRFORM). tcp/udp: Call inet6_destroy_sock() in IPv6 sk->sk_destruct(). inet6: Remove inet6_destroy_sock() in sk->sk_prot->destroy(). dccp: Call inet6_destroy_sock() via sk->sk_destruct(). sctp: Call inet6_destroy_sock() via sk->sk_destruct(). include/net/ipv6.h | 2 ++ include/net/udp.h | 2 +- include/net/udplite.h | 8 -------- net/dccp/dccp.h | 1 + net/dccp/ipv6.c | 15 ++++++++------- net/dccp/proto.c | 8 +++++++- net/ipv4/udp.c | 9 ++++++--- net/ipv4/udplite.c | 8 ++++++++ net/ipv6/af_inet6.c | 15 ++++++++++++++- net/ipv6/ipv6_sockglue.c | 20 ++++++++------------ net/ipv6/ping.c | 6 ------ net/ipv6/raw.c | 2 -- net/ipv6/tcp_ipv6.c | 8 +------- net/ipv6/udp.c | 17 ++++++++++++++--- net/ipv6/udp_impl.h | 1 + net/ipv6/udplite.c | 9 ++++++++- net/l2tp/l2tp_ip6.c | 2 -- net/sctp/socket.c | 29 +++++++++++++++++++++-------- 18 files changed, 100 insertions(+), 62 deletions(-) -- 2.25.1

2 years, 8 months

1
5
0 0

[PATCH 4.14 0/5] inet6: Backport complete patchset for inet6_destroy_sock() call modification

by Ziyang Xuan

4.14 LTS has backported commit ca43ccf41224 ("dccp/tcp: Avoid negative sk_forward_alloc by ipv6_pinfo.pktoptions.") and commit 62ec33b44e0f ("net: Remove WARN_ON_ONCE(sk->sk_forward_alloc) from sk_stream_kill_queues()."), but these are incomplete. There are some patches that have not been backported including key pre-patches commit d38afeec26ed ("tcp/udp: Call inet6_destroy_sock() in IPv6 sk->sk_destruct().") and commit b5fc29233d28 ("inet6: Remove inet6_destroy_sock() in sk->sk_prot->destroy()."). Without them, there are some memory leak bugs. Backport complete patchset for inet6_destroy_sock() call modification. Kuniyuki Iwashima (5): udp: Call inet6_destroy_sock() in setsockopt(IPV6_ADDRFORM). tcp/udp: Call inet6_destroy_sock() in IPv6 sk->sk_destruct(). inet6: Remove inet6_destroy_sock() in sk->sk_prot->destroy(). dccp: Call inet6_destroy_sock() via sk->sk_destruct(). sctp: Call inet6_destroy_sock() via sk->sk_destruct(). include/net/ipv6.h | 2 ++ include/net/udp.h | 2 +- include/net/udplite.h | 8 -------- net/dccp/dccp.h | 1 + net/dccp/ipv6.c | 15 ++++++++------- net/dccp/proto.c | 8 +++++++- net/ipv4/udp.c | 9 ++++++--- net/ipv4/udplite.c | 8 ++++++++ net/ipv6/af_inet6.c | 15 ++++++++++++++- net/ipv6/ipv6_sockglue.c | 20 ++++++++------------ net/ipv6/ping.c | 6 ------ net/ipv6/raw.c | 2 -- net/ipv6/tcp_ipv6.c | 8 +------- net/ipv6/udp.c | 17 ++++++++++++++--- net/ipv6/udp_impl.h | 1 + net/ipv6/udplite.c | 9 ++++++++- net/l2tp/l2tp_ip6.c | 2 -- net/sctp/socket.c | 29 +++++++++++++++++++++-------- 18 files changed, 100 insertions(+), 62 deletions(-) -- 2.25.1

2 years, 8 months

1
5
0 0

Hej solsken

by mk

Hej min kära, Jag är ledsen att jag stör dig och inkräktar på din integritet. Jag är singel, ensam och i behov av en omtänksam, kärleksfull och romantisk följeslagare. Jag är en hemlig beundrare och skulle vilja utforska möjligheten att lära mig mer om varandra. Jag vet att det är konstigt att kontakta dig på det här sättet och jag hoppas att du kan förlåta mig. Jag är en blyg person och det är det enda sättet jag vet att jag kan få din uppmärksamhet. Jag vill bara veta vad du tycker och min avsikt är inte att förolämpa dig. Jag hoppas att vi kan vara vänner om det är vad du vill, även om jag vill vara mer än bara en vän. Jag vet att du har några frågor att ställa och jag hoppas att jag kan tillfredsställa en del av din nyfikenhet med några svar. Jag tror på talesättet att för världen är du bara en person, men för någon speciell är du världen, allt jag vill ha är kärlek, romantisk omsorg och uppmärksamhet från en speciell följeslagare som jag hoppas skulle vara du. Jag hoppas att detta meddelande kommer att bli början på en långsiktig kommunikation mellan oss, skicka bara ett svar på detta meddelande, det kommer att göra mig glad. Puss och kram, Marion.

2 years, 8 months

1
0
0 0

Ciao raggio di sole, come stai?

by MK

Mi dispiace disturbarti e invadere la tua privacy. Sono single, solitario e bisognoso di un compagno premuroso, amorevole e romantico. Sono un ammiratore segreto e vorrei esplorare l'opportunità di farlo saperne di più l'uno sull'altro. So che è strano contattarti in questo modo e spero che tu possa perdonarmi. Sono una persona timida e questo è l'unico modo in cui so di poter attirare la tua attenzione. Voglio semplicemente per sapere cosa ne pensate e la mia intenzione non è di offendervi. Spero che possiamo essere amici se è quello che vuoi, anche se lo vorrei essere più di un semplice amico. So che hai alcune domande da fare chiedi e spero di poter soddisfare alcune delle tue curiosità con alcuni risposte. Credo nel detto che "per il mondo sei solo una persona, ma per qualcuno di speciale tu sei il mondo'. Tutto quello che voglio è amore, cure e attenzioni romantiche da una compagna speciale quale sono io sperando saresti tu. Spero che questo messaggio sia l'inizio di un lungo periodo comunicazione tra di noi, è sufficiente inviare una risposta a questo messaggio, it mi renderà felice. Baci e abbracci, Marion.

2 years, 8 months

1
0
0 0

Re: [PATCH pre-6.4] btrfs: dev-replace: error out if we have unrepaired metadata error during

by Torstein Eide

> This is for pre-6.4 kernels, as scrub code goes through a huge rework. > > [BUG] > Even before the scrub rework, if we have some corrupted metadata failed > to be repaired during replace, we still continue replace and let it > finish just as there is nothing wrong: > > BTRFS info (device dm-4): dev_replace from /dev/mapper/test-scratch1 (devid 1) to /dev/mapper/test-scratch2 started > BTRFS warning (device dm-4): tree block 5578752 mirror 1 has bad csum, has 0x00000000 want 0xade80ca1 > BTRFS warning (device dm-4): tree block 5578752 mirror 0 has bad csum, has 0x00000000 want 0xade80ca1 > BTRFS warning (device dm-4): checksum error at logical 5578752 on dev /dev/mapper/test-scratch1, physical 5578752: metadata leaf (level 0) in tree 5 > BTRFS warning (device dm-4): checksum error at logical 5578752 on dev /dev/mapper/test-scratch1, physical 5578752: metadata leaf (level 0) in tree 5 > BTRFS error (device dm-4): bdev /dev/mapper/test-scratch1 errs: wr 0, rd 0, flush 0, corrupt 1, gen 0 > BTRFS warning (device dm-4): tree block 5578752 mirror 1 has bad bytenr, has 0 want 5578752 > BTRFS error (device dm-4): unable to fixup (regular) error at logical 5578752 on dev /dev/mapper/test-scratch1 > BTRFS info (device dm-4): dev_replace from /dev/mapper/test-scratch1 (devid 1) to /dev/mapper/test-scratch2 finished > > This can lead to unexpected problems for the result fs. > > [CAUSE] > Btrfs reuses scrub code path for dev-replace to iterate all dev extents. > > But unlike scrub, dev-replace doesn't really bother to check the scrub > progress, which records all the errors found during replace. > > And even if we checks the progress, we can not really determine which > errors are minor, which are critical just by the plain numbers. > (remember we don't treat metadata/data checksum error differently). > > This behavior is there from the very beginning. > > [FIX] > Instead of continue the replace, just error out if we hit an unrepaired > metadata sector. > > Now the dev-replace would be rejected with -EIO, to inform the user. > Although it also means, the fs has some metadata error which can not be > repaired, the user would be super upset anyway. If one sector is bad in metadata how much secondary data is damaged? As someone who recently had to remove, and currently replace a disk. it is upsetting, if it stopped if we stopped because 0,01% of data is unrepairable, if we can save the other 99,99%. Can we have it continue, print an error message to standard out, and a way for the user to delete or copy it (with som option like -force-delete or --force-copy) with the error to the new disk? "Metadata at block 5578752 is damaged and unrepaired. Skipping. Read `man btrfs-replace` for more info. " At the end if possible, list files affected by the damaged metadata blocks. In man answer: How can the user know what files are connected to the metadata? How can a user decide what to do with the damaged metadata? At minimum, can there be some useful info to the info to the error output? like "Replace has stopped, due to reading unrepaired metadata block, was working on block 5578752, se `dmesg` for more details. (\s Sorry but you are currently f..k)" > > The new dmesg would look like this: > > BTRFS info (device dm-4): dev_replace from /dev/mapper/test-scratch1 (devid 1) to /dev/mapper/test-scratch2 started > BTRFS warning (device dm-4): tree block 5578752 mirror 1 has bad csum, has 0x00000000 want 0xade80ca1 > BTRFS warning (device dm-4): tree block 5578752 mirror 1 has bad csum, has 0x00000000 want 0xade80ca1 > BTRFS error (device dm-4): unable to fixup (regular) error at logical 5570560 on dev /dev/mapper/test-scratch1 physical 5570560 > BTRFS warning (device dm-4): header error at logical 5570560 on dev /dev/mapper/test-scratch1, physical 5570560: metadata leaf (level 0) in tree 5 > BTRFS warning (device dm-4): header error at logical 5570560 on dev /dev/mapper/test-scratch1, physical 5570560: metadata leaf (level 0) in tree 5 > BTRFS error (device dm-4): stripe 5570560 has unrepaired metadata sector at 5578752 > BTRFS error (device dm-4): btrfs_scrub_dev(/dev/mapper/test-scratch1, 1, /dev/mapper/test-scratch2) failed -5 > > CC: stable(a)vger.kernel.org > Signed-off-by: Qu Wenruo <wqu(a)suse.com> > --- > I'm not sure how should we merge this patch. > > The misc-next is already merging the new scrub code, but the problem is > there for all old kernels thus we need such fixes. > > Maybe we can merge this fix before the scrub rework, then the rework, > and finally the better fix using reworked interface? > --- > fs/btrfs/scrub.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c > index ef4046a2572c..71f64b9bcd9f 100644 > --- a/fs/btrfs/scrub.c > +++ b/fs/btrfs/scrub.c > @@ -195,6 +195,7 @@ struct scrub_ctx { > struct mutex wr_lock; > struct btrfs_device *wr_tgtdev; > bool flush_all_writes; > + bool has_meta_failed; > > /* > * statistics > @@ -1380,6 +1381,8 @@ static int scrub_handle_errored_block(struct scrub_block *sblock_to_check) > btrfs_err_rl_in_rcu(fs_info, > "unable to fixup (regular) error at logical %llu on dev %s", > logical, btrfs_dev_name(dev)); > + if (is_metadata) > + sctx->has_meta_failed = true; > } > > out: > @@ -3838,6 +3841,12 @@ static noinline_for_stack int scrub_stripe(struct scrub_ctx *sctx, > > blk_finish_plug(&plug); > > + /* > + * If we have metadata unable to be repaired, we should error > + * out the dev-replace. > + */ > + if (sctx->is_dev_replace && sctx->has_meta_failed && ret >= 0) > + ret = -EIO; > if (sctx->is_dev_replace && ret >= 0) { > int ret2; > -- Torstein Eide Torsteine(a)gmail.com

2 years, 8 months

2
1
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror