5.10.54-rc1 review
Greg Kroah-Hartman
maintainerPATCH 155/167 drm: Return -ENOTTY for non-drm ioctls
In reply to Greg Kroah-HartmanFrom: Charles Baylis <[email protected]>
commit 3abab27c322e0f2acf981595aa8040c9164dc9fb upstream.
drm: Return -ENOTTY for non-drm ioctls
Return -ENOTTY from drm_ioctl() when userspace passes in a cmd number which doesn't relate to the drm subsystem.
Glibc uses the TCGETS ioctl to implement isatty(), and without this change isatty() returns it incorrectly returns true for drm devices.
To test run this command:
$ if [ -t 0 ]; then echo is a tty; fi < /dev/dri/card0 which shows "is a tty" without this patch.
This may also modify memory which the userspace application is not expecting.
--- drivers/gpu/drm/drm_ioctl.c | 3 +++ include/drm/drm_ioctl.h | 1 + 2 files changed, 4 insertions(+)
drivers/gpu/drm/drm_ioctl.c +3 -0
@@ -827,6 +827,9 @@ long drm_ioctl(struct file *filp,if (drm_dev_is_unplugged (dev))return -ENODEV ; +if (DRM_IOCTL_TYPE (cmd) !=DRM_IOCTL_BASE ) +return -ENOTTY ; + is_driver_ioctl = nr >=DRM_COMMAND_BASE && nr <DRM_COMMAND_END ;if (is_driver_ioctl) {
include/drm/drm_ioctl.h +1 -0
@@ -68,6 +68,7 @@ typedef int drm_ioctl_compat_t(struct fi unsigned long arg);#define DRM_IOCTL_NR (n) _IOC_NR(n) +#define DRM_IOCTL_TYPE (n) _IOC_TYPE(n)#define DRM_MAJOR 226/**
Greg Kroah-Hartman
maintainerPATCH 156/167 drm/amdgpu: update golden setting for sienna_cichlid
In reply to Greg Kroah-HartmanFrom: Likun Gao <[email protected]>
commit 3e94b5965e624f7e6d8dd18eb8f3bf2bb99ba30d upstream.
Update GFX golden setting for sienna_cichlid.
--- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +1 -0
@@ -3137,6 +3137,7 @@ static const struct soc15_reg_golden golSOC15_REG_GOLDEN_VALUE (GC ,0 , mmSQ_PERFCOUNTER7_SELECT,0xf0f001ff ,0x00000000 ),SOC15_REG_GOLDEN_VALUE (GC ,0 , mmSQ_PERFCOUNTER8_SELECT,0xf0f001ff ,0x00000000 ),SOC15_REG_GOLDEN_VALUE (GC ,0 , mmSQ_PERFCOUNTER9_SELECT,0xf0f001ff ,0x00000000 ), +SOC15_REG_GOLDEN_VALUE (GC ,0 , mmSX_DEBUG_1,0x00010000 ,0x00010020 ),SOC15_REG_GOLDEN_VALUE (GC ,0 , mmTA_CNTL_AUX,0xfff7ffff ,0x01030000 ), SOC15_REG_GOLDEN_VALUE(GC, 0, mmUTCL1_CTRL, 0xffbfffff, 0x00a00000) };
Greg Kroah-Hartman
maintainerPATCH 157/167 net: dsa: mv88e6xxx: enable SerDes RX stats for Topaz
In reply to Greg Kroah-HartmanFrom: Marek Behún <[email protected]>
commit a03b98d68367b18e5db6d6850e2cc18754fba94a upstream.
Commit 0df952873636a ("mv88e6xxx: Add serdes Rx statistics") added support for RX statistics on SerDes ports for Peridot.
This same implementation is also valid for Topaz, but was not enabled at the time.
We need to use the generic .serdes_get_lane() method instead of the Peridot specific one in the stats methods so that on Topaz the proper one is used.
--- drivers/net/dsa/mv88e6xxx/chip.c | 6 ++++++ drivers/net/dsa/mv88e6xxx/serdes.c | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-)
drivers/net/dsa/mv88e6xxx/chip.c +6 -0
@@ -3433,6 +3433,9 @@ static const struct mv88e6xxx_ops mv88e6 .serdes_irq_enable = mv88e6390_serdes_irq_enable, .serdes_irq_status = mv88e6390_serdes_irq_status, .gpio_ops = &mv88e6352_gpio_ops, + .serdes_get_sset_count = mv88e6390_serdes_get_sset_count, + .serdes_get_strings = mv88e6390_serdes_get_strings, + .serdes_get_stats = mv88e6390_serdes_get_stats, .phylink_validate = mv88e6341_phylink_validate, };
@@ -4205,6 +4208,9 @@ static const struct mv88e6xxx_ops mv88e6 .gpio_ops = &mv88e6352_gpio_ops, .avb_ops = &mv88e6390_avb_ops, .ptp_ops = &mv88e6352_ptp_ops, + .serdes_get_sset_count = mv88e6390_serdes_get_sset_count, + .serdes_get_strings = mv88e6390_serdes_get_strings, + .serdes_get_stats = mv88e6390_serdes_get_stats, .phylink_validate = mv88e6341_phylink_validate, };
drivers/net/dsa/mv88e6xxx/serdes.c +3 -3
@@ -590,7 +590,7 @@ static struct mv88e6390_serdes_hw_stat mint mv88e6390_serdes_get_sset_count (struct mv88e6xxx_chip *chip,int port) { -if (mv88e6390_serdes_get_lane (chip, port) ==0 ) +if (mv88e6xxx_serdes_get_lane (chip, port) ==0 )return 0 ;return ARRAY_SIZE (mv88e6390_serdes_hw_stats);
@@ -602,7 +602,7 @@ int mv88e6390_serdes_get_strings(structstruct mv88e6390_serdes_hw_stat *stat;int i; -if (mv88e6390_serdes_get_lane (chip, port) ==0 ) +if (mv88e6xxx_serdes_get_lane (chip, port) ==0 )return 0 ;for (i =0 ; i <ARRAY_SIZE (mv88e6390_serdes_hw_stats); i++) {
@@ -638,7 +638,7 @@ int mv88e6390_serdes_get_stats(struct mvint lane;int i; - lane =mv88e6390_serdes_get_lane (chip, port); + lane =mv88e6xxx_serdes_get_lane (chip, port);if (lane ==0 )return 0 ;
Greg Kroah-Hartman
maintainerPATCH 158/167 net: dsa: mv88e6xxx: enable SerDes PCS register dump via ethtool -d on Topaz
In reply to Greg Kroah-HartmanFrom: Marek Behún <[email protected]>
commit 953b0dcbe2e3f7bee98cc3bca2ec82c8298e9c16 upstream.
Commit bf3504cea7d7e ("net: dsa: mv88e6xxx: Add 6390 family PCS registers to ethtool -d") added support for dumping SerDes PCS registers via ethtool -d for Peridot.
The same implementation is also valid for Topaz, but was not enabled at the time.
--- drivers/net/dsa/mv88e6xxx/chip.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/dsa/mv88e6xxx/chip.c +4 -0
@@ -3436,6 +3436,8 @@ static const struct mv88e6xxx_ops mv88e6 .serdes_get_sset_count = mv88e6390_serdes_get_sset_count, .serdes_get_strings = mv88e6390_serdes_get_strings, .serdes_get_stats = mv88e6390_serdes_get_stats, + .serdes_get_regs_len = mv88e6390_serdes_get_regs_len, + .serdes_get_regs = mv88e6390_serdes_get_regs, .phylink_validate = mv88e6341_phylink_validate, };
@@ -4211,6 +4213,8 @@ static const struct mv88e6xxx_ops mv88e6 .serdes_get_sset_count = mv88e6390_serdes_get_sset_count, .serdes_get_strings = mv88e6390_serdes_get_strings, .serdes_get_stats = mv88e6390_serdes_get_stats, + .serdes_get_regs_len = mv88e6390_serdes_get_regs_len, + .serdes_get_regs = mv88e6390_serdes_get_regs, .phylink_validate = mv88e6341_phylink_validate, };
Greg Kroah-Hartman
maintainerPATCH 159/167 PCI: Mark AMD Navi14 GPU ATS as broken
In reply to Greg Kroah-HartmanFrom: Evan Quan <[email protected]>
commit e8946a53e2a698c148b3b3ed732f43c7747fbeb6 upstream
Observed unexpected GPU hang during runpm stress test on 0x7341 rev 0x00. Further debugging shows broken ATS is related.
Disable ATS on this part. Similar issues on other devices:
a2da5d8cc0b0 ("PCI: Mark AMD Raven iGPU ATS as broken in some platforms") 45beb31d3afb ("PCI: Mark AMD Navi10 GPU rev 0x00 ATS as broken") 5e89cd303e3a ("PCI: Mark AMD Navi14 GPU rev 0xc5 ATS as broken")
--- drivers/pci/quirks.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/pci/quirks.c +3 -1
@@ -5264,7 +5264,8 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SEstatic void quirk_amd_harvest_no_ats (struct pci_dev *pdev) {if ((pdev->device ==0x7312 && pdev->revision !=0x00 ) || - (pdev->device ==0x7340 && pdev->revision !=0xc5 )) + (pdev->device ==0x7340 && pdev->revision !=0xc5 ) || + (pdev->device ==0x7341 && pdev->revision !=0x00 ))return ;pci_info (pdev,"disabling ATS\n" );
@@ -5279,6 +5280,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATDECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_ATI ,0x7312 , quirk_amd_harvest_no_ats);/* AMD Navi14 dGPU */ DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_ATI ,0x7340 , quirk_amd_harvest_no_ats); +DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_ATI ,0x7341 , quirk_amd_harvest_no_ats);#endif /* CONFIG_PCI_ATS */ /* Freescale PCIe doesn't support MSI in RC mode */
Greg Kroah-Hartman
maintainerPATCH 160/167 bonding: fix build issue
In reply to Greg Kroah-HartmanFrom: Mahesh Bandewar <[email protected]>
commit 5b69874f74cc5707edd95fcdaa757c507ac8af0f upstream.
The commit 9a5605505d9c (" bonding: Add struct bond_ipesc to manage SA") is causing following build error when XFRM is not selected in kernel config.
lld: error: undefined symbol: xfrm_dev_state_flush
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
referenced by bond_main.c:3453 (
drivers/net/bonding/bond_main.c:3453)
net/bonding/bond_main.o:(bond_netdev_event) in archivedrivers/built-in.a
--- drivers/net/bonding/bond_main.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/bonding/bond_main.c +2 -0
@@ -3416,7 +3416,9 @@ static int bond_master_netdev_event(unsireturn bond_event_changename (event_bond);case NETDEV_UNREGISTER :bond_remove_proc_entry (event_bond); +#ifdef CONFIG_XFRM_OFFLOAD xfrm_dev_state_flush (dev_net (bond_dev), bond_dev, true); +#endif /* CONFIG_XFRM_OFFLOAD */ break ;case NETDEV_REGISTER :bond_create_proc_entry (event_bond);
Greg Kroah-Hartman
maintainerPATCH 161/167 skbuff: Release nfct refcount on napi stolen or re-used skbs
In reply to Greg Kroah-HartmanFrom: Paul Blakey <[email protected]>
commit 8550ff8d8c75416e984d9c4b082845e57e560984 upstream.
When multiple SKBs are merged to a new skb under napi GRO, or SKB is re-used by napi, if nfct was set for them in the driver, it will not be released while freeing their stolen head state or on re-use.
Release nfct on napi's stolen or re-used SKBs, and in gro_list_prepare, check conntrack metadata diff.
--- net/core/dev.c | 13 +++++++++++++ net/core/skbuff.c | 1 + 2 files changed, 14 insertions(+)
net/core/dev.c +13 -0
@@ -5870,6 +5870,18 @@ static struct list_head *gro_list_prepar diffs =memcmp (skb_mac_header (p),skb_mac_header (skb), maclen); + + diffs |=skb_get_nfct (p) ^skb_get_nfct (skb); + +if (!diffs) { +struct tc_skb_ext *skb_ext =skb_ext_find (skb,TC_SKB_EXT ); +struct tc_skb_ext *p_ext =skb_ext_find (p,TC_SKB_EXT ); + + diffs |= (!!p_ext) ^ (!!skb_ext); +if (!diffs &&unlikely (skb_ext)) + diffs |= p_ext->chain ^ skb_ext->chain; + } +NAPI_GRO_CB (p)->same_flow = !diffs; }
@@ -6151,6 +6163,7 @@ static void napi_reuse_skb(struct napi_sskb_shinfo (skb)->gso_type =0 ; skb->truesize =SKB_TRUESIZE (skb_end_offset (skb));skb_ext_reset (skb); +nf_reset_ct (skb); napi->skb = skb; }
net/core/skbuff.c +1 -0
@@ -659,6 +659,7 @@ fastpath:void skb_release_head_state (struct sk_buff *skb) { +nf_reset_ct (skb);skb_dst_drop (skb);if (skb->destructor) {WARN_ON (in_irq ());
Greg Kroah-Hartman
maintainerPATCH 162/167 Documentation: Fix intiramfs script name
In reply to Greg Kroah-HartmanFrom: Robert Richter <[email protected]>
commit 5e60f363b38fd40e4d8838b5d6f4d4ecee92c777 upstream.
Documentation was not changed when renaming the script in commit 80e715a06c2d ("initramfs: rename gen_initramfs_list.sh to gen_initramfs.sh"). Fixing this.
Basically does:
$ sed -i -e s/gen_initramfs_list.sh/gen_initramfs.sh/g $(git grep -l gen_initramfs_list.sh)
--- Documentation/driver-api/early-userspace/early_userspace_support.rst | 8 ++++---- Documentation/filesystems/ramfs-rootfs-initramfs.rst | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)
Documentation/driver-api/early-userspace/early_userspace_support.rst +4 -4
@@ -69,17 +69,17 @@ early userspace image can be built by an As a technical note, when directories and files are specified, the entire CONFIG_INITRAMFS_SOURCE is passed to -usr/gen_initramfs_list.sh. This means that CONFIG_INITRAMFS_SOURCE +usr/gen_initramfs.sh. This means that CONFIG_INITRAMFS_SOURCE can really be interpreted as any legal argument to -gen_initramfs_list.sh. If a directory is specified as an argument then +gen_initramfs.sh. If a directory is specified as an argument then the contents are scanned, uid/gid translation is performed, and usr/gen_init_cpio file directives are output. If a directory is -specified as an argument to usr/gen_initramfs_list.sh then the +specified as an argument to usr/gen_initramfs.sh then the contents of the file are simply copied to the output. All of the output directives from directory scanning and file contents copying are processed by usr/gen_init_cpio. -See also 'usr/gen_initramfs_list.sh -h'. +See also 'usr/gen_initramfs.sh -h'. Where's this all leading? =========================
Documentation/filesystems/ramfs-rootfs-initramfs.rst +1 -1
@@ -170,7 +170,7 @@ Documentation/driver-api/early-userspace The kernel does not depend on external cpio tools. If you specify a directory instead of a configuration file, the kernel's build infrastructure creates a configuration file from that directory (usr/Makefile calls -usr/gen_initramfs_list.sh), and proceeds to package up that directory +usr/gen_initramfs.sh), and proceeds to package up that directory using the config file (by feeding it to usr/gen_init_cpio, which is created from usr/gen_init_cpio.c). The kernel's build-time cpio creation code is entirely self-contained, and the kernel's boot-time extractor is also
Greg Kroah-Hartman
maintainerPATCH 163/167 perf inject: Close inject.output on exit
In reply to Greg Kroah-HartmanFrom: Riccardo Mancini <[email protected]>
commit 02e6246f5364d5260a6ea6f92ab6f409058b162f upstream.
ASan reports a memory leak when running:
# perf test "83: Zstd perf.data compression/decompression"
which happens inside 'perf inject'.
The bug is caused by inject.output never being closed.
This patch adds the missing perf_data__close().
--- tools/perf/builtin-inject.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
tools/perf/builtin-inject.c +6 -2
@@ -906,8 +906,10 @@ int cmd_inject(int argc, const char **ar data.path = inject.input_name; inject.session =perf_session__new (&data, inject.output.is_pipe, &inject.tool); -if (IS_ERR (inject.session)) -return PTR_ERR (inject.session); +if (IS_ERR (inject.session)) { + ret =PTR_ERR (inject.session); + goto out_close_output; + }if (zstd_init (&(inject.session->zstd_data),0 ) <0 )pr_warning ("Decompression initialization failed.\n" );
@@ -949,5 +951,7 @@ int cmd_inject(int argc, const char **ar out_delete:zstd_fini (&(inject.session->zstd_data));perf_session__delete (inject.session); +out_close_output: +perf_data__close (&inject.output);return ret; }
Greg Kroah-Hartman
maintainerPATCH 164/167 usb: ehci: Prevent missed ehci interrupts with edge-triggered MSI
In reply to Greg Kroah-HartmanFrom: David Jeffery <[email protected]>
commit 0b60557230adfdeb8164e0b342ac9cd469a75759 upstream.
When MSI is used by the ehci-hcd driver, it can cause lost interrupts which results in EHCI only continuing to work due to a polling fallback. But the reliance of polling drastically reduces performance of any I/O through EHCI.
Interrupts are lost as the EHCI interrupt handler does not safely handle edge-triggered interrupts. It fails to ensure all interrupt status bits are cleared, which works with level-triggered interrupts but not the edge-triggered interrupts typical from using MSI.
To fix this problem, check if the driver may have raced with the hardware setting additional interrupt status bits and clear status until it is in a stable state.
--- drivers/usb/host/ehci-hcd.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)
drivers/usb/host/ehci-hcd.c +14 -4
@@ -703,7 +703,8 @@ EXPORT_SYMBOL_GPL(ehci_setup);static irqreturn_t ehci_irq (struct usb_hcd *hcd) {struct ehci_hcd *ehci =hcd_to_ehci (hcd); -u32 status, masked_status, pcd_status =0 , cmd; +u32 status, current_status, masked_status, pcd_status =0 ; +u32 cmd;int bh;unsigned long flags;
@@ -715,19 +716,22 @@ static irqreturn_t ehci_irq (struct usb_*/ spin_lock_irqsave (&ehci->lock, flags); - status =ehci_readl (ehci, &ehci->regs->status); + status =0 ; + current_status =ehci_readl (ehci, &ehci->regs->status); +restart:/* e.g. cardbus physical eject */ -if (status == ~(u32 )0 ) { +if (current_status == ~(u32 )0 ) {ehci_dbg (ehci,"device removed\n" ); goto dead; } + status |= current_status;/* * We don't use STS_FLR, but some controllers don't like it to * remain on, so mask it out along with the other status bits. */ - masked_status = status & (INTR_MASK |STS_FLR ); + masked_status = current_status & (INTR_MASK |STS_FLR );/* Shared IRQ? */ if (!masked_status ||unlikely (ehci->rh_state ==EHCI_RH_HALTED )) {
@@ -737,6 +741,12 @@ static irqreturn_t ehci_irq (struct usb_/* clear (just) interrupts */ ehci_writel (ehci, masked_status, &ehci->regs->status); + +/* For edge interrupts, don't race with an interrupt bit being raised */ + current_status =ehci_readl (ehci, &ehci->regs->status); +if (current_status &INTR_MASK ) + goto restart; + cmd =ehci_readl (ehci, &ehci->regs->command); bh =0 ;
Greg Kroah-Hartman
maintainerPATCH 165/167 drm/i915/gvt: Clear d3_entered on elsp cmd submission.
In reply to Greg Kroah-HartmanFrom: Colin Xu <[email protected]>
commit c90b4503ccf42d9d367e843c223df44aa550e82a upstream.
d3_entered flag is used to mark for vgpu_reset a previous power transition from D3->D0, typically for VM resume from S3, so that gvt could skip PPGTT invalidation in current vgpu_reset during resuming.
In case S0ix exit, although there is D3->D0, guest driver continue to use vgpu as normal, with d3_entered set, until next shutdown/reboot or power transition.
If a reboot follows a S0ix exit, device power state transite as:D0->D3->D0->D0(reboot), while system power state transites as:S0->S0 (reboot). There is no vgpu_reset until D0(reboot), thus d3_entered won't be cleared, the vgpu_reset will skip PPGTT invalidation however those PPGTT entries are no longer valid. Err appears like:
gvt: vgpu 2: vfio_pin_pages failed for gfn 0xxxxx, ret -22
gvt: vgpu 2: fail: spt xxxx guest entry 0xxxxx type 2
gvt: vgpu 2: fail: shadow page xxxx guest entry 0xxxxx type 2.
Give gvt a chance to clear d3_entered on elsp cmd submission so that the states before & after S0ix enter/exit are consistent.
--- drivers/gpu/drm/i915/gvt/handlers.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
drivers/gpu/drm/i915/gvt/handlers.c +15 -0
@@ -1728,6 +1728,21 @@ static int elsp_mmio_write(struct intel_if (drm_WARN_ON (&i915->drm, !engine))return -EINVAL ; +/* +* Due to d3_entered is used to indicate skipping PPGTT invalidation on +* vGPU reset, it's set on D0->D3 on PCI config write, and cleared after +* vGPU reset if in resuming. +* In S0ix exit, the device power state also transite from D3 to D0 as +* S3 resume, but no vGPU reset (triggered by QEMU devic model). After +* S0ix exit, all engines continue to work. However the d3_entered +* remains set which will break next vGPU reset logic (miss the expected +* PPGTT invalidation). +* Engines can only work in D0. Thus the 1st elsp write gives GVT a +* chance to clear d3_entered. +*/ +if (vgpu->d3_entered) + vgpu->d3_entered = false; + execlist = &vgpu->submission.execlist[engine->id]; execlist->elsp_dwords.data[3 - execlist->elsp_dwords.index] = data;
Greg Kroah-Hartman
maintainerPATCH 166/167 sfc: ensure correct number of XDP queues
In reply to Greg Kroah-HartmanFrom: Íñigo Huguet <[email protected]>
[ Upstream commit 788bc000d4c2f25232db19ab3a0add0ba4e27671 ]
Commit 99ba0ea616aa ("sfc: adjust efx->xdp_tx_queue_count with the real number of initialized queues") intended to fix a problem caused by a round up when calculating the number of XDP channels and queues. However, this was not the real problem. The real problem was that the number of XDP TX queues had been reduced to half in
commit e26ca4b53582 ("sfc: reduce the number of requested xdp ev queues"), but the variable xdp_tx_queue_count had remained the same.
Once the correct number of XDP TX queues is created again in the previous patch of this series, this also can be reverted since the error doesn't actually exist.
Only in the case that there is a bug in the code we can have different values in xdp_queue_number and efx->xdp_tx_queue_count. Because of this, and per Edward Cree's suggestion, I add instead a WARN_ON to catch if it happens again in the future.
Note that the number of allocated queues can be higher than the number of used ones due to the round up, as explained in the existing comment in the code. That's why we also have to stop increasing xdp_queue_number beyond efx->xdp_tx_queue_count.
--- drivers/net/ethernet/sfc/efx_channels.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
drivers/net/ethernet/sfc/efx_channels.c +8 -5
@@ -889,18 +889,20 @@ int efx_set_channels(struct efx_nic *efx)if (efx_channel_is_xdp_tx (channel)) {efx_for_each_channel_tx_queue (tx_queue, channel) { tx_queue->queue = next_queue++; -netif_dbg (efx, drv, efx->net_dev,"Channel %u TXQ %u is XDP %u, HW %u\n" , - channel->channel, tx_queue->label, - xdp_queue_number, tx_queue->queue); +/* We may have a few left-over XDP TX * queues owing to xdp_tx_queue_count * not dividing evenly by EFX_MAX_TXQ_PER_CHANNEL. * We still allocate and probe those * TXQs, but never use them. */ -if (xdp_queue_number < efx->xdp_tx_queue_count) +if (xdp_queue_number < efx->xdp_tx_queue_count) { +netif_dbg (efx, drv, efx->net_dev,"Channel %u TXQ %u is XDP %u, HW %u\n" , + channel->channel, tx_queue->label, + xdp_queue_number, tx_queue->queue); efx->xdp_tx_queues[xdp_queue_number] = tx_queue; - xdp_queue_number++; + xdp_queue_number++; + } } }else {efx_for_each_channel_tx_queue (tx_queue, channel) {
@@ -912,6 +914,7 @@ int efx_set_channels(struct efx_nic *efx) } } } +WARN_ON (xdp_queue_number != efx->xdp_tx_queue_count); rc =netif_set_real_num_tx_queues (efx->net_dev, efx->n_tx_channels);if (rc)
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 167/167 xhci: add xhci_get_virt_ep() helper
In reply to Greg Kroah-HartmanFrom: Mathias Nyman <[email protected]>
[commit b1adc42d440df3233255e313a45ab7e9b2b74096 upstream]
In several event handlers we need to find the right endpoint structure from slot_id and ep_index in the event.
Add a helper for this, check that slot_id and ep_index are valid.
--- drivers/usb/host/xhci-ring.c | 58 +++++++++++++++++++++++++++++++++---------- drivers/usb/host/xhci.h | 3 +- 2 files changed, 47 insertions(+), 14 deletions(-)
drivers/usb/host/xhci-ring.c +45 -13
@@ -446,6 +446,26 @@ void xhci_ring_doorbell_for_active_ringsring_doorbell_for_active_rings (xhci, slot_id, ep_index); } +static struct xhci_virt_ep *xhci_get_virt_ep (struct xhci_hcd *xhci, +unsigned int slot_id, +unsigned int ep_index) +{ +if (slot_id ==0 || slot_id >=MAX_HC_SLOTS ) { +xhci_warn (xhci,"Invalid slot_id %u\n" , slot_id); +return NULL ; + } +if (ep_index >=EP_CTX_PER_DEV ) { +xhci_warn (xhci,"Invalid endpoint index %u\n" , ep_index); +return NULL ; + } +if (!xhci->devs[slot_id]) { +xhci_warn (xhci,"No xhci virt device for slot_id %u\n" , slot_id); +return NULL ; + } + +return &xhci->devs[slot_id]->eps[ep_index]; +} +/* Get the right ring for the given slot_id, ep_index and stream_id. * If the endpoint supports streams, boundary check the URB's stream ID. * If the endpoint doesn't support streams, return the singular endpoint ring.
@@ -456,7 +476,10 @@ struct xhci_ring *xhci_triad_to_transfer {struct xhci_virt_ep *ep; - ep = &xhci->devs[slot_id]->eps[ep_index]; + ep =xhci_get_virt_ep (xhci, slot_id, ep_index); +if (!ep) +return NULL ; +/* Common case: no streams */ if (!(ep->ep_state &EP_HAS_STREAMS ))return ep->ring;
@@ -747,11 +770,14 @@ static void xhci_handle_cmd_stop_ep(strumemset (&deq_state,0 ,sizeof (deq_state)); ep_index =TRB_TO_EP_INDEX (le32_to_cpu (trb->generic.field[3 ])); + ep =xhci_get_virt_ep (xhci, slot_id, ep_index); +if (!ep) +return ; + vdev = xhci->devs[slot_id]; ep_ctx =xhci_get_ep_ctx (xhci, vdev->out_ctx, ep_index);trace_xhci_handle_cmd_stop_ep (ep_ctx); - ep = &xhci->devs[slot_id]->eps[ep_index]; last_unlinked_td =list_last_entry (&ep->cancelled_td_list, struct xhci_td, cancelled_td_list);
@@ -1076,9 +1102,11 @@ static void xhci_handle_cmd_set_deq(stru ep_index =TRB_TO_EP_INDEX (le32_to_cpu (trb->generic.field[3 ])); stream_id =TRB_TO_STREAM_ID (le32_to_cpu (trb->generic.field[2 ])); - dev = xhci->devs[slot_id]; - ep = &dev->eps[ep_index]; + ep =xhci_get_virt_ep (xhci, slot_id, ep_index); +if (!ep) +return ; + dev = xhci->devs[slot_id]; ep_ring =xhci_stream_id_to_ring (dev, ep_index, stream_id);if (!ep_ring) { xhci_warn(xhci, "WARN Set TR deq ptr command for freed stream ID %u\n",
@@ -1151,9 +1179,9 @@ static void xhci_handle_cmd_set_deq(stru } cleanup: - dev->eps[ep_index].ep_state &= ~SET_DEQ_PENDING ; - dev->eps[ep_index].queued_deq_seg =NULL ; - dev->eps[ep_index].queued_deq_ptr =NULL ; + ep->ep_state &= ~SET_DEQ_PENDING ; + ep->queued_deq_seg =NULL ; + ep->queued_deq_ptr =NULL ;/* Restart any rings with pending URBs */ ring_doorbell_for_active_rings (xhci, slot_id, ep_index); }
@@ -1162,10 +1190,15 @@ static void xhci_handle_cmd_reset_ep(str union xhci_trb *trb, u32 cmd_comp_code) {struct xhci_virt_device *vdev; +struct xhci_virt_ep *ep;struct xhci_ep_ctx *ep_ctx;unsigned int ep_index; ep_index =TRB_TO_EP_INDEX (le32_to_cpu (trb->generic.field[3 ])); + ep =xhci_get_virt_ep (xhci, slot_id, ep_index); +if (!ep) +return ; + vdev = xhci->devs[slot_id]; ep_ctx =xhci_get_ep_ctx (xhci, vdev->out_ctx, ep_index);trace_xhci_handle_cmd_reset_ep (ep_ctx);
@@ -1195,7 +1228,7 @@ static void xhci_handle_cmd_reset_ep(strxhci_ring_cmd_db (xhci); }else {/* Clear our internal halted state */ - xhci->devs[slot_id]->eps[ep_index].ep_state &= ~EP_HALTED ; + ep->ep_state &= ~EP_HALTED ; }/* if this was a soft reset, then restart */
@@ -2364,14 +2397,13 @@ static int handle_tx_event(struct xhci_h trb_comp_code =GET_COMP_CODE (le32_to_cpu (event->transfer_len)); ep_trb_dma =le64_to_cpu (event->buffer); - xdev = xhci->devs[slot_id]; -if (!xdev) { -xhci_err (xhci,"ERROR Transfer event pointed to bad slot %u\n" , - slot_id); + ep =xhci_get_virt_ep (xhci, slot_id, ep_index); +if (!ep) { +xhci_err (xhci,"ERROR Invalid Transfer event\n" ); goto err_out; } - ep = &xdev->eps[ep_index]; + xdev = xhci->devs[slot_id]; ep_ring =xhci_dma_to_transfer_ring (ep, ep_trb_dma); ep_ctx =xhci_get_ep_ctx (xhci, xdev->out_ctx, ep_index);
drivers/usb/host/xhci.h +2 -1
@@ -993,6 +993,7 @@ struct xhci_interval_bw_table {unsigned int ss_bw_out; }; +#define EP_CTX_PER_DEV 31struct xhci_virt_device {struct usb_device *udev;
@@ -1007,7 +1008,7 @@ struct xhci_virt_device {struct xhci_container_ctx *out_ctx;/* Used for addressing devices and configuration changes */ struct xhci_container_ctx *in_ctx; -struct xhci_virt_ep eps[31 ]; +struct xhci_virt_ep eps[EP_CTX_PER_DEV ];u8 fake_port;u8 real_port;struct xhci_interval_bw_table *bw_table;
Re: [PATCH 5.10 167/167] xhci: add xhci_get_virt_ep() helper
Hi!
Quoted 3 lines
From: Mathias Nyman <[email protected]>
[commit
b1adc42d440df3233255e313a45ab7e9b2b74096upstream]
This is yet another variation in upstream commit making. So far I was using these:
ma = re.match(".*Upstream commit ([0-9a-f]*) .*", l) if ma:
m.upstream = ma.group(1)
ma = re.match("[Cc]ommit ([0-9a-f]*) upstream[.]*", l) if ma:
m.upstream = ma.group(1)
ma = re.match("[Cc]ommit: ([0-9a-f]*)", l) if ma:
m.upstream = ma.group(1)
I guess I could update second regexp to search anywhere in the line.... but at that point it will also match stuff like "commit 1234 upstream is broken".
Do you have suggestion how to extract upstream sha1 automatically?
Best regards,
Pavel
Signature · 2 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Greg Kroah-Hartman
maintainerRe: [PATCH 5.10 167/167] xhci: add xhci_get_virt_ep() helper
Quoted 19 lines · Pavel Machek
Hi!
Quoted 3 lines
From: Mathias Nyman <[email protected]>
[commit
b1adc42d440df3233255e313a45ab7e9b2b74096upstream]This is yet another variation in upstream commit making. So far I was using these:
ma =
re.match(".*Upstream commit ([0-9a-f]*) .*", l)if ma:
m.upstream =ma.group(1)
ma =re.match("[Cc]ommit ([0-9a-f]*) upstream[.]*", l)if ma:
m.upstream =ma.group(1)
ma =re.match("[Cc]ommit: ([0-9a-f]*)", l)if ma:
m.upstream =ma.group(1)
Quoted 5 lines
I guess I could update second regexp to search anywhere in the line.... but at that point it will also match stuff like "commit 1234 upstream is broken".
Do you have suggestion how to extract upstream sha1 automatically?
I use:
grep -E -o '[0-9a-f]{40}'Hello!
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.54 release. There are 167 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, 28 Jul 2021 15:38: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.10.54-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.10.y
and the diffstat can be found below.thanks,
greg k-h
Build regressions detected across plenty of architectures and configurations:
/builds/linux/net/core/dev.c:5877:51: error: use of undeclared identifier 'TC_SKB_EXT'
struct tc_skb_ext *skb_ext = skb_ext_find(skb, TC_SKB_EXT);
^
/builds/linux/net/core/dev.c:5878:47: error: use of undeclared identifier 'TC_SKB_EXT'
struct tc_skb_ext *p_ext = skb_ext_find(p, TC_SKB_EXT);
^
/builds/linux/net/core/dev.c:5882:19: error: incomplete definition of type 'struct tc_skb_ext'
diffs |= p_ext->chain ^ skb_ext->chain;
~~~~~^
/builds/linux/net/core/dev.c:5877:11: note: forward declaration of 'struct tc_skb_ext'
struct tc_skb_ext *skb_ext = skb_ext_find(skb, TC_SKB_EXT);
^
/builds/linux/net/core/dev.c:5882:36: error: incomplete definition of type 'struct tc_skb_ext'
diffs |= p_ext->chain ^ skb_ext->chain;
~~~~~~~^
/builds/linux/net/core/dev.c:5877:11: note: forward declaration of 'struct tc_skb_ext'
struct tc_skb_ext *skb_ext = skb_ext_find(skb, TC_SKB_EXT);
^ 4 errors generated.
make[3]: *** [/builds/linux/scripts/Makefile.build:280: net/core/dev.o] Error 1 make[3]: Target '__build' not remade because of errors.
make[2]: *** [/builds/linux/scripts/Makefile.build:497: net/core] Error 2
As with 5.13, it failed everywhere for the same reason. Fails on defconfig and bunch others, with GCC/Clang, and across many architectures.
Greetings!
Daniel Díaz
[email protected]
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.54 release. There are 167 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, 28 Jul 2021 15:38: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.10.54-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.10.y
and the diffstat can be found below.thanks,
greg k-h
On ARCH_BRCMSTB using 32-bit and 64-bit ARM kernels:
Signature · 1 line
Florian
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.54 release. There are 167 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, 28 Jul 2021 15:38: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.10.54-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.10.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah