[5.10,35/96] net: mvvp2: fix short frame size on s390

Message ID	20210816125436.122511505@linuxfoundation.org
State	New
Headers	show Return-Path: <stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Sven Auhagen <sven.auhagen@voleatech.de>, Matteo Croce <mcroce@microsoft.com>, "David S. Miller" <davem@davemloft.net>, John Hubbard <jhubbard@nvidia.com>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 5.10 35/96] net: mvvp2: fix short frame size on s390 Date: Mon, 16 Aug 2021 15:01:45 +0200 Message-Id: <20210816125436.122511505@linuxfoundation.org> In-Reply-To: <20210816125434.948010115@linuxfoundation.org> References: <20210816125434.948010115@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [5.10,02/96] iio: adis: set GPIO reset pin direction [5.10,03/96] iio: humidity: hdc100x: Add margin to the conversion time [5.10,04/96] iio: adc: Fix incorrect exit of for-loop [5.10,05/96] ASoC: amd: Fix reference to PCM buffer address [5.10,06/96] ASoC: xilinx: Fix reference to PCM buffer address [5.10,07/96] ASoC: uniphier: Fix reference to PCM buffer address [5.10,08/96] ASoC: tlv320aic31xx: Fix jack detection after suspend [5.10,09/96] ASoC: intel: atom: Fix reference to PCM buffer address [5.10,10/96] i2c: dev: zero out array used for i2c reads from userspace [5.10,11/96] cifs: create sd context must be a multiple of 8 [5.10,12/96] scsi: lpfc: Move initialization of phba->poll_list earlier to avoid crash [5.10,13/96] seccomp: Fix setting loaded filter count during TSYNC [5.10,14/96] net: ethernet: ti: cpsw: fix min eth packet size for non-switch use-cases [5.10,15/96] ARC: fp: set FPU_STATUS.FWE to enable FPU_STATUS update on context switch [5.10,16/96] ceph: reduce contention in ceph_check_delayed_caps() [5.10,17/96] ACPI: NFIT: Fix support for virtual SPA ranges [5.10,18/96] libnvdimm/region: Fix label activation vs errors [5.10,19/96] drm/amd/display: Remove invalid assert for ODM + MPC case [5.10,20/96] drm/amd/display: use GFP_ATOMIC in amdgpu_dm_irq_schedule_work [5.10,21/96] drm/amdgpu: dont enable baco on boco platforms in runpm [5.10,22/96] ieee802154: hwsim: fix GPF in hwsim_set_edge_lqi [5.10,23/96] ieee802154: hwsim: fix GPF in hwsim_new_edge_nl [5.10,24/96] pinctrl: mediatek: Fix fallback behavior for bias_set_combo [5.10,25/96] ASoC: cs42l42: Correct definition of ADC Volume control [5.10,26/96] ASoC: cs42l42: Dont allow SND_SOC_DAIFMT_LEFT_J [5.10,27/96] interconnect: qcom: icc-rpmh: Add BCMs to commit list in pre_aggregate [5.10,28/96] ASoC: SOF: Intel: hda-ipc: fix reply size checking [5.10,29/96] ASoC: cs42l42: Fix inversion of ADC Notch Switch control [5.10,30/96] ASoC: cs42l42: Remove duplicate control for WNF filter frequency [5.10,31/96] netfilter: nf_conntrack_bridge: Fix memory leak when error [5.10,32/96] pinctrl: tigerlake: Fix GPIO mapping for newer version of software [5.10,33/96] ASoC: cs42l42: Fix LRCLK frame start edge [5.10,34/96] net: dsa: mt7530: add the missing RxUnicast MIB counter [5.10,35/96] net: mvvp2: fix short frame size on s390 [5.10,36/96] platform/x86: pcengines-apuv2: Add missing terminating entries to gpio-lookup tables [5.10,37/96] libbpf: Fix probe for BPF_PROG_TYPE_CGROUP_SOCKOPT [5.10,38/96] bpf: Fix integer overflow involving bucket_size [5.10,39/96] net: phy: micrel: Fix link detection on ksz87xx switch" [5.10,40/96] ppp: Fix generating ifname when empty IFLA_IFNAME is specified [5.10,41/96] net/smc: fix wait on already cleared link [5.10,42/96] net: sched: act_mirred: Reset ct info when mirror/redirect skb [5.10,43/96] ice: Prevent probing virtual functions [5.10,44/96] ice: dont remove netdev->dev_addr from uc sync list [5.10,45/96] iavf: Set RSS LUT and key in reset handle path [5.10,46/96] psample: Add a fwd declaration for skbuff [5.10,47/96] bareudp: Fix invalid read beyond skbs linear data [5.10,48/96] net/mlx5: Synchronize correct IRQ when destroying CQ [5.10,49/96] net/mlx5: Fix return value from tracer initialization [5.10,50/96] drm/meson: fix colour distortion from HDR set during vendor u-boot [5.10,51/96] net: dsa: microchip: Fix ksz_read64() [5.10,52/96] net: dsa: microchip: ksz8795: Fix VLAN filtering [5.10,53/96] net: Fix memory leak in ieee802154_raw_deliver [5.10,54/96] net: igmp: fix data-race in igmp_ifc_timer_expire() [5.10,55/96] net: dsa: lan9303: fix broken backpressure in .port_fdb_dump [5.10,56/96] net: dsa: lantiq: fix broken backpressure in .port_fdb_dump [5.10,57/96] net: dsa: sja1105: fix broken backpressure in .port_fdb_dump [5.10,58/96] net: bridge: validate the NUD_PERMANENT bit when adding an extern_learn FDB entry [5.10,59/96] net: bridge: fix flags interpretation for extern learn fdb entries [5.10,60/96] net: bridge: fix memleak in br_add_if() [5.10,61/96] net: linkwatch: fix failure to restore device state across suspend/resume [5.10,62/96] tcp_bbr: fix u32 wrap bug in round logic if bbr_init() called after 2B packets [5.10,63/96] net: igmp: increase size of mr_ifc_count [5.10,64/96] drm/i915: Only access SFC_DONE when media domain is not fused off [5.10,65/96] xen/events: Fix race in set_evtchn_to_irq [5.10,66/96] vsock/virtio: avoid potential deadlock when vsock device remove [5.10,67/96] nbd: Aovid double completion of a request [5.10,68/96] arm64: efi: kaslr: Fix occasional random alloc (and boot) failure [5.10,69/96] efi/libstub: arm64: Force Image reallocation if BSS was not reserved [5.10,70/96] efi/libstub: arm64: Relax 2M alignment again for relocatable kernels [5.10,71/96] powerpc/kprobes: Fix kprobe Oops happens in booke [5.10,72/96] x86/tools: Fix objdump version check again [5.10,73/96] genirq: Provide IRQCHIP_AFFINITY_PRE_STARTUP [5.10,74/96] x86/msi: Force affinity setup before startup [5.10,75/96] x86/ioapic: Force affinity setup before startup [5.10,76/96] x86/resctrl: Fix default monitoring groups reporting [5.10,77/96] genirq/msi: Ensure deactivation on teardown [5.10,78/96] genirq/timings: Prevent potential array overflow in __irq_timings_store() [5.10,79/96] PCI/MSI: Enable and mask MSI-X early [5.10,80/96] PCI/MSI: Mask all unused MSI-X entries [5.10,81/96] PCI/MSI: Enforce that MSI-X table entry is masked for update [5.10,82/96] PCI/MSI: Enforce MSI[X] entry updates to be visible [5.10,83/96] PCI/MSI: Do not set invalid bits in MSI mask [5.10,84/96] PCI/MSI: Correct misleading comments [5.10,85/96] PCI/MSI: Use msi_mask_irq() in pci_msi_shutdown() [5.10,86/96] PCI/MSI: Protect msi_desc::masked for multi-MSI [5.10,87/96] powerpc/smp: Fix OOPS in topology_init() [5.10,88/96] efi/libstub: arm64: Double check image alignment at entry [5.10,89/96] KVM: VMX: Use current VMCS to query WAITPKG support for MSR emulation [5.10,90/96] KVM: nVMX: Use vmx_need_pf_intercept() when deciding if L0 wants a #PF [5.10,91/96] vboxsf: Add vboxsf_[create\|release]_sf_handle() helpers [5.10,92/96] vboxsf: Add support for the atomic_open directory-inode op [5.10,93/96] ceph: add some lockdep assertions around snaprealm handling [5.10,94/96] ceph: clean up locking annotation for ceph_get_snap_realm and __lookup_snap_realm [5.10,95/96] ceph: take snap_empty_lock atomically with snaprealm refcount change [5.10,96/96] vmlinux.lds.h: Handle clangs module.{c,d}tor sections

Message ID

20210816125436.122511505@linuxfoundation.org

State

New

Headers

From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	stable@vger.kernel.org, Sven Auhagen <sven.auhagen@voleatech.de>,
	Matteo Croce <mcroce@microsoft.com>,
	"David S. Miller" <davem@davemloft.net>,
	John Hubbard <jhubbard@nvidia.com>, Sasha Levin <sashal@kernel.org>
Subject: [PATCH 5.10 35/96] net: mvvp2: fix short frame size on s390
Date: Mon, 16 Aug 2021 15:01:45 +0200
Message-Id: <20210816125436.122511505@linuxfoundation.org>
In-Reply-To: <20210816125434.948010115@linuxfoundation.org>
References: <20210816125434.948010115@linuxfoundation.org>
User-Agent: quilt/0.66
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

None | expand

Commit Message

Greg KH Aug. 16, 2021, 1:01 p.m. UTC

From: John Hubbard <jhubbard@nvidia.com>

[ Upstream commit 704e624f7b3e8a4fc1ce43fb564746d1d07b20c0 ]

On s390, the following build warning occurs:

drivers/net/ethernet/marvell/mvpp2/mvpp2.h:844:2: warning: overflow in
conversion from 'long unsigned int' to 'int' changes value from
'18446744073709551584' to '-32' [-Woverflow]
844 |  ((total_size) - MVPP2_SKB_HEADROOM - MVPP2_SKB_SHINFO_SIZE)

This happens because MVPP2_SKB_SHINFO_SIZE, which is 320 bytes (which is
already 64-byte aligned) on some architectures, actually gets ALIGN'd up
to 512 bytes in the s390 case.

So then, when this is invoked:

    MVPP2_RX_MAX_PKT_SIZE(MVPP2_BM_SHORT_FRAME_SIZE)

...that turns into:

     704 - 224 - 512 == -32

...which is not a good frame size to end up with! The warning above is a
bit lucky: it notices a signed/unsigned bad behavior here, which leads
to the real problem of a frame that is too short for its contents.

Increase MVPP2_BM_SHORT_FRAME_SIZE by 32 (from 704 to 736), which is
just exactly big enough. (The other values can't readily be changed
without causing a lot of other problems.)

Fixes: 07dd0a7aae7f ("mvpp2: add basic XDP support")
Cc: Sven Auhagen <sven.auhagen@voleatech.de>
Cc: Matteo Croce <mcroce@microsoft.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: John Hubbard <jhubbard@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/net/ethernet/marvell/mvpp2/mvpp2.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2.h b/drivers/net/ethernet/marvell/mvpp2/mvpp2.h
index a1aefce55e65..d825eb021b22 100644
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2.h
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2.h
@@ -854,7 +854,7 @@  enum mvpp22_ptp_packet_format {
 #define MVPP2_BM_COOKIE_POOL_OFFS	8
 #define MVPP2_BM_COOKIE_CPU_OFFS	24
 
-#define MVPP2_BM_SHORT_FRAME_SIZE	704	/* frame size 128 */
+#define MVPP2_BM_SHORT_FRAME_SIZE	736	/* frame size 128 */
 #define MVPP2_BM_LONG_FRAME_SIZE	2240	/* frame size 1664 */
 #define MVPP2_BM_JUMBO_FRAME_SIZE	10432	/* frame size 9856 */
 /* BM short pool packet size

[5.10,35/96] net: mvvp2: fix short frame size on s390

Commit Message

Patch