From: Sasha Levin Date: Thu, 5 Aug 2021 01:38:18 +0000 (-0400) Subject: Fixes for 4.4 X-Git-Tag: v4.4.279~26 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=741ba5fa6f0a73f9e6b479e82d3568770046fc34;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 4.4 Signed-off-by: Sasha Levin --- diff --git a/queue-4.4/net-fix-zero-copy-head-len-calculation.patch b/queue-4.4/net-fix-zero-copy-head-len-calculation.patch new file mode 100644 index 00000000000..b057ffccdef --- /dev/null +++ b/queue-4.4/net-fix-zero-copy-head-len-calculation.patch @@ -0,0 +1,79 @@ +From c696b97d4034fa4feb6f8012acea56d6f391eef1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 15 Jul 2021 16:59:00 -0700 +Subject: net: Fix zero-copy head len calculation. + +From: Pravin B Shelar + +[ Upstream commit a17ad0961706244dce48ec941f7e476a38c0e727 ] + +In some cases skb head could be locked and entire header +data is pulled from skb. When skb_zerocopy() called in such cases, +following BUG is triggered. This patch fixes it by copying entire +skb in such cases. +This could be optimized incase this is performance bottleneck. + +---8<--- +kernel BUG at net/core/skbuff.c:2961! +invalid opcode: 0000 [#1] SMP PTI +CPU: 2 PID: 0 Comm: swapper/2 Tainted: G OE 5.4.0-77-generic #86-Ubuntu +Hardware name: OpenStack Foundation OpenStack Nova, BIOS 1.13.0-1ubuntu1.1 04/01/2014 +RIP: 0010:skb_zerocopy+0x37a/0x3a0 +RSP: 0018:ffffbcc70013ca38 EFLAGS: 00010246 +Call Trace: + + queue_userspace_packet+0x2af/0x5e0 [openvswitch] + ovs_dp_upcall+0x3d/0x60 [openvswitch] + ovs_dp_process_packet+0x125/0x150 [openvswitch] + ovs_vport_receive+0x77/0xd0 [openvswitch] + netdev_port_receive+0x87/0x130 [openvswitch] + netdev_frame_hook+0x4b/0x60 [openvswitch] + __netif_receive_skb_core+0x2b4/0xc90 + __netif_receive_skb_one_core+0x3f/0xa0 + __netif_receive_skb+0x18/0x60 + process_backlog+0xa9/0x160 + net_rx_action+0x142/0x390 + __do_softirq+0xe1/0x2d6 + irq_exit+0xae/0xb0 + do_IRQ+0x5a/0xf0 + common_interrupt+0xf/0xf + +Code that triggered BUG: +int +skb_zerocopy(struct sk_buff *to, struct sk_buff *from, int len, int hlen) +{ + int i, j = 0; + int plen = 0; /* length of skb->head fragment */ + int ret; + struct page *page; + unsigned int offset; + + BUG_ON(!from->head_frag && !hlen); + +Signed-off-by: Pravin B Shelar +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + net/core/skbuff.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/net/core/skbuff.c b/net/core/skbuff.c +index 7665154c85c2..58989a5ba362 100644 +--- a/net/core/skbuff.c ++++ b/net/core/skbuff.c +@@ -2243,8 +2243,11 @@ skb_zerocopy_headlen(const struct sk_buff *from) + + if (!from->head_frag || + skb_headlen(from) < L1_CACHE_BYTES || +- skb_shinfo(from)->nr_frags >= MAX_SKB_FRAGS) ++ skb_shinfo(from)->nr_frags >= MAX_SKB_FRAGS) { + hlen = skb_headlen(from); ++ if (!hlen) ++ hlen = from->len; ++ } + + if (skb_has_frag_list(from)) + hlen = from->len; +-- +2.30.2 + diff --git a/queue-4.4/r8152-fix-potential-pm-refcount-imbalance.patch b/queue-4.4/r8152-fix-potential-pm-refcount-imbalance.patch new file mode 100644 index 00000000000..c7bb1ae9000 --- /dev/null +++ b/queue-4.4/r8152-fix-potential-pm-refcount-imbalance.patch @@ -0,0 +1,40 @@ +From 4bbb83b7cad52529c2a2b83c1af041669717bceb Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 14 Jul 2021 19:00:21 +0200 +Subject: r8152: Fix potential PM refcount imbalance + +From: Takashi Iwai + +[ Upstream commit 9c23aa51477a37f8b56c3c40192248db0663c196 ] + +rtl8152_close() takes the refcount via usb_autopm_get_interface() but +it doesn't release when RTL8152_UNPLUG test hits. This may lead to +the imbalance of PM refcount. This patch addresses it. + +Link: https://bugzilla.suse.com/show_bug.cgi?id=1186194 +Signed-off-by: Takashi Iwai +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/usb/r8152.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c +index 5baaa8291624..ebf6d4cf09ea 100644 +--- a/drivers/net/usb/r8152.c ++++ b/drivers/net/usb/r8152.c +@@ -3159,9 +3159,10 @@ static int rtl8152_close(struct net_device *netdev) + tp->rtl_ops.down(tp); + + mutex_unlock(&tp->control); ++ } + ++ if (!res) + usb_autopm_put_interface(tp->intf); +- } + + free_all_mem(tp); + +-- +2.30.2 + diff --git a/queue-4.4/regulator-rt5033-fix-n_voltages-settings-for-buck-an.patch b/queue-4.4/regulator-rt5033-fix-n_voltages-settings-for-buck-an.patch new file mode 100644 index 00000000000..82dfb0ebaf9 --- /dev/null +++ b/queue-4.4/regulator-rt5033-fix-n_voltages-settings-for-buck-an.patch @@ -0,0 +1,48 @@ +From b933f859e354f0f4774192d336d801f246197883 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 27 Jun 2021 16:04:18 +0800 +Subject: regulator: rt5033: Fix n_voltages settings for BUCK and LDO + +From: Axel Lin + +[ Upstream commit 6549c46af8551b346bcc0b9043f93848319acd5c ] + +For linear regulators, the n_voltages should be (max - min) / step + 1. + +Buck voltage from 1v to 3V, per step 100mV, and vout mask is 0x1f. +If value is from 20 to 31, the voltage will all be fixed to 3V. +And LDO also, just vout range is different from 1.2v to 3v, step is the +same. If value is from 18 to 31, the voltage will also be fixed to 3v. + +Signed-off-by: Axel Lin +Reviewed-by: ChiYuan Huang +Link: https://lore.kernel.org/r/20210627080418.1718127-1-axel.lin@ingics.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + include/linux/mfd/rt5033-private.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/linux/mfd/rt5033-private.h b/include/linux/mfd/rt5033-private.h +index 1b63fc2f42d1..52d53d134f72 100644 +--- a/include/linux/mfd/rt5033-private.h ++++ b/include/linux/mfd/rt5033-private.h +@@ -203,13 +203,13 @@ enum rt5033_reg { + #define RT5033_REGULATOR_BUCK_VOLTAGE_MIN 1000000U + #define RT5033_REGULATOR_BUCK_VOLTAGE_MAX 3000000U + #define RT5033_REGULATOR_BUCK_VOLTAGE_STEP 100000U +-#define RT5033_REGULATOR_BUCK_VOLTAGE_STEP_NUM 32 ++#define RT5033_REGULATOR_BUCK_VOLTAGE_STEP_NUM 21 + + /* RT5033 regulator LDO output voltage uV */ + #define RT5033_REGULATOR_LDO_VOLTAGE_MIN 1200000U + #define RT5033_REGULATOR_LDO_VOLTAGE_MAX 3000000U + #define RT5033_REGULATOR_LDO_VOLTAGE_STEP 100000U +-#define RT5033_REGULATOR_LDO_VOLTAGE_STEP_NUM 32 ++#define RT5033_REGULATOR_LDO_VOLTAGE_STEP_NUM 19 + + /* RT5033 regulator SAFE LDO output voltage uV */ + #define RT5033_REGULATOR_SAFE_LDO_VOLTAGE 4900000U +-- +2.30.2 + diff --git a/queue-4.4/series b/queue-4.4/series index 5373ff710bc..1240d07b65b 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -1 +1,4 @@ btrfs-mark-compressed-range-uptodate-only-if-all-bio.patch +regulator-rt5033-fix-n_voltages-settings-for-buck-an.patch +r8152-fix-potential-pm-refcount-imbalance.patch +net-fix-zero-copy-head-len-calculation.patch