s390/vdso: add missing FORCE to build targets
Subsystems (17)
Sasha Levin
maintainerPATCH 1/59 s390/vdso: add missing FORCE to build targets
From: Vasily Gorbik <[email protected]>
[ Upstream commit b44b136a3773d8a9c7853f8df716bd1483613cbb ]
According to Documentation/kbuild/makefiles.txt all build targets using if_changed should use FORCE as well. Add missing FORCE to make sure vdso targets are rebuild properly when not just immediate prerequisites have changed but also when build command differs.
--- arch/s390/kernel/vdso32/Makefile | 6 +++--- arch/s390/kernel/vdso64/Makefile | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)
arch/s390/kernel/vdso32/Makefile +3 -3
@@ -36,7 +36,7 @@ UBSAN_SANITIZE := n $(obj)/vdso32_wrapper.o : $(obj)/vdso32.so # link rule for the .so file, .lds has to be first -$(obj)/vdso32.so.dbg: $(src)/vdso32.lds $(obj-vdso32) +$(obj)/vdso32.so.dbg: $(src)/vdso32.lds $(obj-vdso32) FORCE $(call if_changed,vdso32ld) # strip rule for the .so file
@@ -45,12 +45,12 @@ $(obj)/%.so: $(obj)/%.so.dbg FORCE $(call if_changed,objcopy) # assembly rules for the .S files -$(obj-vdso32): %.o: %.S +$(obj-vdso32): %.o: %.S FORCE $(call if_changed_dep,vdso32as) # actual build commands quiet_cmd_vdso32ld = VDSO32L $@ - cmd_vdso32ld = $(CC) $(c_flags) -Wl,-T $^ -o $@ + cmd_vdso32ld = $(CC) $(c_flags) -Wl,-T $(filter %.lds %.o,$^) -o $@ quiet_cmd_vdso32as = VDSO32A $@ cmd_vdso32as = $(CC) $(a_flags) -c -o $@ $<
arch/s390/kernel/vdso64/Makefile +3 -3
@@ -36,7 +36,7 @@ UBSAN_SANITIZE := n $(obj)/vdso64_wrapper.o : $(obj)/vdso64.so # link rule for the .so file, .lds has to be first -$(obj)/vdso64.so.dbg: $(src)/vdso64.lds $(obj-vdso64) +$(obj)/vdso64.so.dbg: $(src)/vdso64.lds $(obj-vdso64) FORCE $(call if_changed,vdso64ld) # strip rule for the .so file
@@ -45,12 +45,12 @@ $(obj)/%.so: $(obj)/%.so.dbg FORCE $(call if_changed,objcopy) # assembly rules for the .S files -$(obj-vdso64): %.o: %.S +$(obj-vdso64): %.o: %.S FORCE $(call if_changed_dep,vdso64as) # actual build commands quiet_cmd_vdso64ld = VDSO64L $@ - cmd_vdso64ld = $(CC) $(c_flags) -Wl,-T $^ -o $@ + cmd_vdso64ld = $(CC) $(c_flags) -Wl,-T $(filter %.lds %.o,$^) -o $@ quiet_cmd_vdso64as = VDSO64A $@ cmd_vdso64as = $(CC) $(a_flags) -c -o $@ $<
Signature · 1 line
2.17.1
Sasha Levin
maintainerPATCH 2/59 HID: i2c-hid: Add a small delay after sleep command for Raydium touchpanel
From: Kai-Heng Feng <[email protected]>
[ Upstream commit 00b790ea545b6ef30221adef6e9c3707e03b82b5 ]
Raydium touchpanel (2386:4B33) sometimes does not work in desktop session although it works in display manager.
During user logging, the display manager exits, close the HID device, then the device gets runtime suspended and powered off. The desktop session begins shortly after, opens the HID device, then the device gets runtime resumed and powered on.
If the trasition from display manager to desktop sesesion is fast, the touchpanel cannot switch from powered off to powered on in short timeframe. So add a small delay to workaround the issue.
--- drivers/hid/hid-ids.h | 3 +++ drivers/hid/i2c-hid/i2c-hid.c | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+)
drivers/hid/hid-ids.h +3 -0
@@ -919,6 +919,9 @@#define USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3003 0x3003#define USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3008 0x3008 +#define I2C_VENDOR_ID_RAYDIUM 0x2386 +#define I2C_PRODUCT_ID_RAYDIUM_4B33 0x4b33 +#define USB_VENDOR_ID_RAZER 0x1532#define USB_DEVICE_ID_RAZER_BLADE_14 0x011D
drivers/hid/i2c-hid/i2c-hid.c +19 -0
@@ -48,6 +48,7 @@#define I2C_HID_QUIRK_SET_PWR_WAKEUP_DEV BIT(0)#define I2C_HID_QUIRK_NO_IRQ_AFTER_RESET BIT(1)#define I2C_HID_QUIRK_NO_RUNTIME_PM BIT(2) +#define I2C_HID_QUIRK_DELAY_AFTER_SLEEP BIT(3)/* flags */ #define I2C_HID_STARTED 0
@@ -157,6 +158,8 @@ struct i2c_hid {bool irq_wake_enabled;struct mutex reset_lock; + +unsigned long sleep_delay; }; static const struct i2c_hid_quirks {
@@ -171,6 +174,8 @@ static const struct i2c_hid_quirks { {I2C_VENDOR_ID_HANTICK ,I2C_PRODUCT_ID_HANTICK_5288 ,I2C_HID_QUIRK_NO_IRQ_AFTER_RESET | I2C_HID_QUIRK_NO_RUNTIME_PM }, + { I2C_VENDOR_ID_RAYDIUM, I2C_PRODUCT_ID_RAYDIUM_4B33, + I2C_HID_QUIRK_DELAY_AFTER_SLEEP }, { 0, 0 } };
@@ -386,6 +391,7 @@ static int i2c_hid_set_power(struct i2c_client *client, int power_state) {struct i2c_hid *ihid =i2c_get_clientdata (client);int ret; +unsigned long now, delay;i2c_hid_dbg (ihid,"%s\n" , __func__);
@@ -403,9 +409,22 @@ static int i2c_hid_set_power(struct i2c_client *client, int power_state) goto set_pwr_exit; } +if (ihid->quirks &I2C_HID_QUIRK_DELAY_AFTER_SLEEP && + power_state ==I2C_HID_PWR_ON ) { + now = jiffies; +if (time_after (ihid->sleep_delay, now)) { + delay =jiffies_to_usecs (ihid->sleep_delay - now); +usleep_range (delay, delay +1 ); + } + } + ret =__i2c_hid_command (client, &hid_set_power_cmd, power_state,0 ,NULL ,0 ,NULL ,0 ); +if (ihid->quirks &I2C_HID_QUIRK_DELAY_AFTER_SLEEP && + power_state ==I2C_HID_PWR_SLEEP ) + ihid->sleep_delay = jiffies +msecs_to_jiffies (20 ); +if (ret)dev_err (&client->dev,"failed to change power setting.\n" );
Signature · 1 line
2.17.1
Sasha Levin
maintainerPATCH 3/59 Revert "HID: add NOGET quirk for Eaton Ellipse MAX UPS"
In reply to Sasha LevinFrom: Benjamin Tissoires <[email protected]>
[ Upstream commit 6298944d8f57f40ee2a3e6dcea1253e78d7a9969 ]
This reverts commit 67ddbb3e6568fb1820b2cc45b00c50702b114801.
67ddbb3e656 ("HID: add NOGET quirk for Eaton Ellipse MAX UPS") was reported by Laurent Bigonville. It turns out that a later model Laurent got doesn't need the quirk after all.
My take is that Eaton upgraded their firmwares, so we don't need it anymore.
The old model was from 2012, so better make sure the new line works properly by removing the quirk. This allows upower to actually fetch the current data.
--- drivers/hid/hid-quirks.c | 1 - 1 file changed, 1 deletion(-)
drivers/hid/hid-quirks.c +0 -1
@@ -106,7 +106,6 @@ static const struct hid_device_id hid_quirks[] = { { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOUSE_C05A), HID_QUIRK_ALWAYS_POLL }, { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOUSE_C06A), HID_QUIRK_ALWAYS_POLL }, { HID_USB_DEVICE(USB_VENDOR_ID_MCS, USB_DEVICE_ID_MCS_GAMEPADBLOCK), HID_QUIRK_MULTI_INPUT }, - { HID_USB_DEVICE(USB_VENDOR_ID_MGE, USB_DEVICE_ID_MGE_UPS), HID_QUIRK_NOGET }, { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_POWER_COVER), HID_QUIRK_NO_INIT_REPORTS }, { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_PRO_2), HID_QUIRK_NO_INIT_REPORTS }, { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TOUCH_COVER_2), HID_QUIRK_NO_INIT_REPORTS },
Signature · 1 line
2.17.1
Sasha Levin
maintainerPATCH 4/59 HID: alps: allow incoming reports when only the trackstick is opened
In reply to Sasha LevinFrom: Benjamin Tissoires <[email protected]>
[ Upstream commit 7dd8db68949a7acc5bd528ee0ecb8f8720f49921 ]
If userspace only reads the trackstick node, and no one is listening to the touchpad nor the hidraw node then, the device is not powered on.
Add open/close callbacks to allow users to disable the touchpad in Gnome while keeping the trackstick active.
--- drivers/hid/hid-alps.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
drivers/hid/hid-alps.c +18 -0
@@ -660,6 +660,20 @@ static int T4_init(struct hid_device *hdev, struct alps_dev *pri_data)return ret; } +static int alps_sp_open (struct input_dev *dev) +{ +struct hid_device *hid =input_get_drvdata (dev); + +return hid_hw_open (hid); +} + +static void alps_sp_close (struct input_dev *dev) +{ +struct hid_device *hid =input_get_drvdata (dev); + +hid_hw_close (hid); +} +static int alps_input_configured (struct hid_device *hdev,struct hid_input *hi) {struct alps_dev *data =hid_get_drvdata (hdev);
@@ -733,6 +747,10 @@ static int alps_input_configured(struct hid_device *hdev, struct hid_input *hi) input2->id.version = input->id.version; input2->dev.parent = input->dev.parent; +input_set_drvdata (input2, hdev); + input2->open = alps_sp_open; + input2->close = alps_sp_close; +__set_bit (EV_KEY , input2->evbit); data->sp_btn_cnt = (data->sp_btn_info &0x0F );for (i =0 ; i < data->sp_btn_cnt; i++)
Signature · 1 line
2.17.1
Sasha Levin
maintainerPATCH 5/59 netfilter: ipset: list:set: Decrease refcount synchronously on deletion and replace
In reply to Sasha LevinFrom: Stefano Brivio <[email protected]>
[ Upstream commit 439cd39ea136d2c026805264d58a91f36b6b64ca ]
Commit 45040978c899 ("netfilter: ipset: Fix set:list type crash when flush/dump set in parallel") postponed decreasing set reference counters to the RCU callback.
An 'ipset del' command can terminate before the RCU grace period is elapsed, and if sets are listed before then, the reference counter shown in userspace will be wrong:
# ipset create h hash:ip; ipset create l list:set; ipset add l # ipset del l h; ipset list h Name: h Type: hash:ip Revision: 4 Header: family inet hashsize 1024 maxelem 65536 Size in memory: 88 References: 1 Number of entries: 0 Members: # sleep 1; ipset list h Name: h Type: hash:ip Revision: 4 Header: family inet hashsize 1024 maxelem 65536 Size in memory: 88 References: 0 Number of entries: 0 Members:
Fix this by making the reference count update synchronous again.
As a result, when sets are listed, ip_set_name_byindex() might now fetch a set whose reference count is already zero. Instead of relying on the reference count to protect against concurrent set renaming, grab ip_set_ref_lock as reader and copy the name, while holding the same lock in ip_set_rename() as writer instead.
--- include/linux/netfilter/ipset/ip_set.h | 2 +- net/netfilter/ipset/ip_set_core.c | 23 +++++++++++------------ net/netfilter/ipset/ip_set_list_set.c | 17 +++++++++++------ 3 files changed, 23 insertions(+), 19 deletions(-)
include/linux/netfilter/ipset/ip_set.h +1 -1
@@ -314,7 +314,7 @@ enum {extern ip_set_id_t ip_set_get_byname (struct net *net,const char *name,struct ip_set **set);extern void ip_set_put_byindex (struct net *net,ip_set_id_t index); -extern const char *ip_set_name_byindex (struct net *net,ip_set_id_t index); +extern void ip_set_name_byindex (struct net *net,ip_set_id_t index,char *name);extern ip_set_id_t ip_set_nfnl_get_byindex (struct net *net,ip_set_id_t index);extern void ip_set_nfnl_put (struct net *net,ip_set_id_t index);
net/netfilter/ipset/ip_set_core.c +11 -12
@@ -693,21 +693,20 @@ ip_set_put_byindex(struct net *net, ip_set_id_t index)EXPORT_SYMBOL_GPL (ip_set_put_byindex);/* Get the name of a set behind a set index. -* We assume the set is referenced, so it does exist and -* can't be destroyed. The set cannot be renamed due to -* the referencing either. -* +* Set itself is protected by RCU, but its name isn't: to protect against +* renaming, grab ip_set_ref_lock as reader (see ip_set_rename()) and copy the +* name. */ -const char * -ip_set_name_byindex (struct net *net,ip_set_id_t index) +void +ip_set_name_byindex (struct net *net,ip_set_id_t index,char *name) { -const struct ip_set *set =ip_set_rcu_get (net, index); +struct ip_set *set =ip_set_rcu_get (net, index);BUG_ON (!set); -BUG_ON (set->ref ==0 ); -/* Referenced, so it's safe */ -return set->name; +read_lock_bh (&ip_set_ref_lock); +strncpy (name, set->name,IPSET_MAXNAMELEN ); +read_unlock_bh (&ip_set_ref_lock); }EXPORT_SYMBOL_GPL (ip_set_name_byindex);
@@ -1153,7 +1152,7 @@ static int ip_set_rename(struct net *net, struct sock *ctnl,if (!set)return -ENOENT ; -read_lock_bh (&ip_set_ref_lock); +write_lock_bh (&ip_set_ref_lock);if (set->ref !=0 ) { ret = -IPSET_ERR_REFERENCED ; goto out;
@@ -1170,7 +1169,7 @@ static int ip_set_rename(struct net *net, struct sock *ctnl,strncpy (set->name, name2,IPSET_MAXNAMELEN ); out: -read_unlock_bh (&ip_set_ref_lock); +write_unlock_bh (&ip_set_ref_lock);return ret; }
net/netfilter/ipset/ip_set_list_set.c +11 -6
@@ -148,9 +148,7 @@ __list_set_del_rcu(struct rcu_head * rcu) { struct set_elem *e = container_of(rcu, struct set_elem, rcu);struct ip_set *set = e->set; -struct list_set *map = set->data; -ip_set_put_byindex (map->net, e->id);ip_set_ext_destroy (set, e);kfree (e); }
@@ -158,15 +156,21 @@ __list_set_del_rcu(struct rcu_head * rcu)static inline void list_set_del (struct ip_set *set,struct set_elem *e) { +struct list_set *map = set->data; + set->elements--;list_del_rcu (&e->list); +ip_set_put_byindex (map->net, e->id);call_rcu (&e->rcu, __list_set_del_rcu); }static inline void -list_set_replace (struct set_elem *e,struct set_elem *old) +list_set_replace (struct ip_set *set,struct set_elem *e,struct set_elem *old) { +struct list_set *map = set->data; +list_replace_rcu (&old->list, &e->list); +ip_set_put_byindex (map->net, old->id);call_rcu (&old->rcu, __list_set_del_rcu); }
@@ -298,7 +302,7 @@ list_set_uadd(struct ip_set *set, void *value, const struct ip_set_ext *ext,INIT_LIST_HEAD (&e->list);list_set_init_extensions (set, ext, e);if (n) -list_set_replace (e, n); +list_set_replace (set, e, n);else if (next)list_add_tail_rcu (&e->list, &next->list);else if (prev)
@@ -486,6 +490,7 @@ list_set_list(const struct ip_set *set,const struct list_set *map = set->data;struct nlattr *atd, *nested;u32 i =0 , first = cb->args[IPSET_CB_ARG0 ]; +char name[IPSET_MAXNAMELEN ];struct set_elem *e;int ret =0 ;
@@ -504,8 +509,8 @@ list_set_list(const struct ip_set *set, nested =ipset_nest_start (skb,IPSET_ATTR_DATA );if (!nested) goto nla_put_failure; -if (nla_put_string (skb,IPSET_ATTR_NAME , -ip_set_name_byindex (map->net, e->id))) +ip_set_name_byindex (map->net, e->id, name); +if (nla_put_string (skb,IPSET_ATTR_NAME , name)) goto nla_put_failure;if (ip_set_put_extensions (skb, set, e, true)) goto nla_put_failure;
Signature · 1 line
2.17.1
Sasha Levin
maintainerPATCH 6/59 netfilter: ipset: actually allow allowable CIDR 0 in hash:net,port,net
In reply to Sasha LevinFrom: Eric Westbrook <[email protected]>
[ Upstream commit 886503f34d63e681662057448819edb5b1057a97 ]
Allow /0 as advertised for hash:net,port,net sets.
For "hash:net,port,net", ipset(8) says that "either subnet is permitted to be a /0 should you wish to match port between all destinations."
Make that statement true.
Before:
# ipset create cidrzero hash:net,port,net
# ipset add cidrzero 0.0.0.0/0,12345,0.0.0.0/0
ipset v6.34: The value of the CIDR parameter of the IP address is invalid # ipset create cidrzero6 hash:net,port,net family inet6
# ipset add cidrzero6 ::/0,12345,::/0
ipset v6.34: The value of the CIDR parameter of the IP address is invalidAfter:
# ipset create cidrzero hash:net,port,net
# ipset add cidrzero 0.0.0.0/0,12345,0.0.0.0/0
# ipset test cidrzero 192.168.205.129,12345,172.16.205.129
192.168.205.129,tcp:12345,172.16.205.129 is in set cidrzero. # ipset create cidrzero6 hash:net,port,net family inet6
# ipset add cidrzero6 ::/0,12345,::/0
# ipset test cidrzero6 fe80::1,12345,ff00::1
fe80::1,tcp:12345,ff00::1 is in set cidrzero6.See also:
https://bugzilla.kernel.org/show_bug.cgi?id=200897
https://github.com/ewestbrook/linux/commit/df7ff6efb0934ab6acc11f003ff1a7580d6c1d9c
--- net/netfilter/ipset/ip_set_hash_netportnet.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
net/netfilter/ipset/ip_set_hash_netportnet.c +4 -4
@@ -213,13 +213,13 @@ hash_netportnet4_uadt(struct ip_set *set, struct nlattr *tb[],if (tb[IPSET_ATTR_CIDR ]) { e.cidr[0 ] =nla_get_u8 (tb[IPSET_ATTR_CIDR ]); -if (!e.cidr[0 ] || e.cidr[0 ] >HOST_MASK ) +if (e.cidr[0 ] >HOST_MASK )return -IPSET_ERR_INVALID_CIDR ; }if (tb[IPSET_ATTR_CIDR2 ]) { e.cidr[1 ] =nla_get_u8 (tb[IPSET_ATTR_CIDR2 ]); -if (!e.cidr[1 ] || e.cidr[1 ] >HOST_MASK ) +if (e.cidr[1 ] >HOST_MASK )return -IPSET_ERR_INVALID_CIDR ; }
@@ -493,13 +493,13 @@ hash_netportnet6_uadt(struct ip_set *set, struct nlattr *tb[],if (tb[IPSET_ATTR_CIDR ]) { e.cidr[0 ] =nla_get_u8 (tb[IPSET_ATTR_CIDR ]); -if (!e.cidr[0 ] || e.cidr[0 ] >HOST_MASK ) +if (e.cidr[0 ] >HOST_MASK )return -IPSET_ERR_INVALID_CIDR ; }if (tb[IPSET_ATTR_CIDR2 ]) { e.cidr[1 ] =nla_get_u8 (tb[IPSET_ATTR_CIDR2 ]); -if (!e.cidr[1 ] || e.cidr[1 ] >HOST_MASK ) +if (e.cidr[1 ] >HOST_MASK )return -IPSET_ERR_INVALID_CIDR ; }
Signature · 1 line
2.17.1
Sasha Levin
maintainerPATCH 7/59 netfilter: ipset: fix ip_set_list allocation failure
In reply to Sasha LevinFrom: Andrey Ryabinin <[email protected]>
[ Upstream commit ed956f3947a01ff9875cd908d7c1ef1fe7f47bf0 ]
ip_set_create() and ip_set_net_init() attempt to allocate physically contiguous memory for ip_set_list. If memory is fragmented, the allocations could easily fail:
vzctl: page allocation failure: order:7, mode:0xc0d0
Call Trace:
dump_stack+0x19/0x1b
warn_alloc_failed+0x110/0x180
__alloc_pages_nodemask+0x7bf/0xc60
alloc_pages_current+0x98/0x110
kmalloc_order+0x18/0x40
kmalloc_order_trace+0x26/0xa0
__kmalloc+0x279/0x290
ip_set_net_init+0x4b/0x90 [ip_set]
ops_init+0x3b/0xb0
setup_net+0xbb/0x170
copy_net_ns+0xf1/0x1c0
create_new_namespaces+0xf9/0x180
copy_namespaces+0x8e/0xd0
copy_process+0xb61/0x1a00
do_fork+0x91/0x320Use kvcalloc() to fallback to 0-order allocations if high order page isn't available.
--- net/netfilter/ipset/ip_set_core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
net/netfilter/ipset/ip_set_core.c +4 -4
@@ -960,7 +960,7 @@ static int ip_set_create(struct net *net, struct sock *ctnl,/* Wraparound */ goto cleanup; - list =kcalloc (i,sizeof (struct ip_set *),GFP_KERNEL ); + list =kvcalloc (i,sizeof (struct ip_set *),GFP_KERNEL );if (!list) goto cleanup;/* nfnl mutex is held, both lists are valid */
@@ -972,7 +972,7 @@ static int ip_set_create(struct net *net, struct sock *ctnl,/* Use new list */ index = inst->ip_set_max; inst->ip_set_max = i; -kfree (tmp); +kvfree (tmp); ret =0 ; }else if (ret) { goto cleanup;
@@ -2058,7 +2058,7 @@ ip_set_net_init(struct net *net)if (inst->ip_set_max >=IPSET_INVALID_ID ) inst->ip_set_max =IPSET_INVALID_ID -1 ; - list =kcalloc (inst->ip_set_max,sizeof (struct ip_set *),GFP_KERNEL ); + list =kvcalloc (inst->ip_set_max,sizeof (struct ip_set *),GFP_KERNEL );if (!list)return -ENOMEM ; inst->is_deleted = false;
@@ -2086,7 +2086,7 @@ ip_set_net_exit(struct net *net) } }nfnl_unlock (NFNL_SUBSYS_IPSET ); -kfree (rcu_dereference_protected (inst->ip_set_list,1 )); +kvfree (rcu_dereference_protected (inst->ip_set_list,1 )); }static struct pernet_operations ip_set_net_ops = {
Signature · 1 line
2.17.1
Sasha Levin
maintainerPATCH 8/59 s390/mm: fix mis-accounting of pgtable_bytes
In reply to Sasha LevinFrom: Martin Schwidefsky <[email protected]>
[ Upstream commit e12e4044aede97974f2222eb7f0ed726a5179a32 ]
In case a fork or a clone system fails in copy_process and the error handling does the mmput() at the bad_fork_cleanup_mm label, the following warning messages will appear on the console:
BUG: non-zero pgtables_bytes on freeing mm: 16384
The reason for that is the tricks we play with mm_inc_nr_puds() and mm_inc_nr_pmds() in init_new_context().
A normal 64-bit process has 3 levels of page table, the p4d level and the pud level are folded. On process termination the free_pud_range() function in mm/memory.c will subtract 16KB from pgtable_bytes with a mm_dec_nr_puds() call, but there actually is not really a pud table.
One issue with this is the fact that pgtable_bytes is usually off by a few kilobytes, but the more severe problem is that for a failed fork or clone the free_pgtables() function is not called. In this case there is no mm_dec_nr_puds() or mm_dec_nr_pmds() that go together with the mm_inc_nr_puds() and mm_inc_nr_pmds in init_new_context(). The pgtable_bytes will be off by 16384 or 32768 bytes and we get the BUG message. The message itself is purely cosmetic, but annoying.
To fix this override the mm_pmd_folded, mm_pud_folded and mm_p4d_folded function to check for the true size of the address space.
--- arch/s390/include/asm/mmu_context.h | 5 ----- arch/s390/include/asm/pgalloc.h | 6 +++--- arch/s390/include/asm/pgtable.h | 18 ++++++++++++++++++ arch/s390/include/asm/tlb.h | 6 +++--- arch/s390/mm/pgalloc.c | 1 + 5 files changed, 25 insertions(+), 11 deletions(-)
arch/s390/include/asm/mmu_context.h +0 -5
@@ -44,8 +44,6 @@ static inline int init_new_context(struct task_struct *tsk, mm->context.asce_limit =STACK_TOP_MAX ; mm->context.asce =__pa (mm->pgd) | _ASCE_TABLE_LENGTH | _ASCE_USER_BITS | _ASCE_TYPE_REGION3; -/* pgd_alloc() did not account this pud */ -mm_inc_nr_puds (mm);break ;case -PAGE_SIZE :/* forked 5-level task, set new asce with new_mm->pgd */
@@ -61,9 +59,6 @@ static inline int init_new_context(struct task_struct *tsk,/* forked 2-level compat task, set new asce with new mm->pgd */ mm->context.asce =__pa (mm->pgd) | _ASCE_TABLE_LENGTH | _ASCE_USER_BITS | _ASCE_TYPE_SEGMENT; -/* pgd_alloc() did not account this pmd */ -mm_inc_nr_pmds (mm); -mm_inc_nr_puds (mm); }crst_table_init ((unsigned long *) mm->pgd,pgd_entry_type (mm));return 0 ;
arch/s390/include/asm/pgalloc.h +3 -3
@@ -36,11 +36,11 @@ static inline void crst_table_init(unsigned long *crst, unsigned long entry)static inline unsigned long pgd_entry_type (struct mm_struct *mm) { -if (mm->context.asce_limit <= _REGION3_SIZE) +if (mm_pmd_folded (mm))return _SEGMENT_ENTRY_EMPTY; -if (mm->context.asce_limit <= _REGION2_SIZE) +if (mm_pud_folded (mm))return _REGION3_ENTRY_EMPTY; -if (mm->context.asce_limit <= _REGION1_SIZE) +if (mm_p4d_folded (mm))return _REGION2_ENTRY_EMPTY;return _REGION1_ENTRY_EMPTY; }
arch/s390/include/asm/pgtable.h +18 -0
@@ -483,6 +483,24 @@ static inline int is_module_addr(void *addr) _REGION_ENTRY_PROTECT | \ _REGION_ENTRY_NOEXEC) +static inline bool mm_p4d_folded (struct mm_struct *mm) +{ +return mm->context.asce_limit <= _REGION1_SIZE; +} +#define mm_p4d_folded (mm) mm_p4d_folded(mm) + +static inline bool mm_pud_folded (struct mm_struct *mm) +{ +return mm->context.asce_limit <= _REGION2_SIZE; +} +#define mm_pud_folded (mm) mm_pud_folded(mm) + +static inline bool mm_pmd_folded (struct mm_struct *mm) +{ +return mm->context.asce_limit <= _REGION3_SIZE; +} +#define mm_pmd_folded (mm) mm_pmd_folded(mm) +static inline int mm_has_pgste (struct mm_struct *mm) {#ifdef CONFIG_PGSTE
arch/s390/include/asm/tlb.h +3 -3
@@ -136,7 +136,7 @@ static inline void pte_free_tlb(struct mmu_gather *tlb, pgtable_t pte,static inline void pmd_free_tlb (struct mmu_gather *tlb,pmd_t *pmd,unsigned long address) { -if (tlb->mm->context.asce_limit <= _REGION3_SIZE) +if (mm_pmd_folded (tlb->mm))return ;pgtable_pmd_page_dtor (virt_to_page (pmd));tlb_remove_table (tlb, pmd);
@@ -152,7 +152,7 @@ static inline void pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd,static inline void p4d_free_tlb (struct mmu_gather *tlb,p4d_t *p4d,unsigned long address) { -if (tlb->mm->context.asce_limit <= _REGION1_SIZE) +if (mm_p4d_folded (tlb->mm))return ;tlb_remove_table (tlb, p4d); }
@@ -167,7 +167,7 @@ static inline void p4d_free_tlb(struct mmu_gather *tlb, p4d_t *p4d,static inline void pud_free_tlb (struct mmu_gather *tlb,pud_t *pud,unsigned long address) { -if (tlb->mm->context.asce_limit <= _REGION2_SIZE) +if (mm_pud_folded (tlb->mm))return ;tlb_remove_table (tlb, pud); }
arch/s390/mm/pgalloc.c +1 -0
@@ -101,6 +101,7 @@ int crst_table_upgrade(struct mm_struct *mm, unsigned long end) mm->context.asce_limit = _REGION1_SIZE; mm->context.asce =__pa (mm->pgd) | _ASCE_TABLE_LENGTH | _ASCE_USER_BITS | _ASCE_TYPE_REGION2; +mm_inc_nr_puds (mm); }else {crst_table_init (table, _REGION1_ENTRY_EMPTY);pgd_populate (mm, (pgd_t *) table, (p4d_t *) pgd);
Signature · 1 line
2.17.1
Sasha Levin
maintainerPATCH 9/59 s390/mm: Fix ERROR: "__node_distance" undefined!
In reply to Sasha LevinFrom: "Justin M. Forbes" <[email protected]>
[ Upstream commit a541f0ebcc08ed8bc0cc492eec9a86cb280a9f24 ]
Fixes:
ERROR: "__node_distance" [drivers/nvme/host/nvme-core.ko] undefined! make[1]: *** [scripts/Makefile.modpost:92: __modpost] Error 1
make: *** [Makefile:1275: modules] Error 2
+ exit 1
--- arch/s390/numa/numa.c | 1 + 1 file changed, 1 insertion(+)
arch/s390/numa/numa.c +1 -0
@@ -54,6 +54,7 @@ int __node_distance(int a, int b) {return mode->distance ? mode->distance (a, b) :0 ; } +EXPORT_SYMBOL (__node_distance);int numa_debug_enabled;
Signature · 1 line
2.17.1
Sasha Levin
maintainerPATCH 10/59 bpf: fix bpf_prog_get_info_by_fd to return 0 func_lens for unpriv
In reply to Sasha LevinFrom: Daniel Borkmann <[email protected]>
[ Upstream commit 28c2fae726bf5003cd209b0d5910a642af98316f ]
While dbecd7388476 ("bpf: get kernel symbol addresses via syscall") zeroed info.nr_jited_ksyms in bpf_prog_get_info_by_fd() for queries from unprivileged users, commit 815581c11cc2 ("bpf: get JITed image lengths of functions via syscall") forgot about doing so and therefore returns the #elems of the user set up buffer which is incorrect. It also needs to indicate a info.nr_jited_func_lens of zero.
--- kernel/bpf/syscall.c | 1 + 1 file changed, 1 insertion(+)
kernel/bpf/syscall.c +1 -0
@@ -1896,6 +1896,7 @@ static int bpf_prog_get_info_by_fd(struct bpf_prog *prog, info.jited_prog_len =0 ; info.xlated_prog_len =0 ; info.nr_jited_ksyms =0 ; + info.nr_jited_func_lens =0 ; goto done; }
Signature · 1 line
2.17.1
Sasha Levin
maintainerPATCH 11/59 usbnet: smsc95xx: disable carrier check while suspending
In reply to Sasha LevinFrom: Frieder Schrempf <[email protected]>
[ Upstream commit 7b900ead6cc66b2ee873cb042dfba169aa68b56c ]
We need to make sure, that the carrier check polling is disabled while suspending. Otherwise we can end up with usbnet_read_cmd() being issued when only usbnet_read_cmd_nopm() is allowed. If this happens, read operations lock up.
--- drivers/net/usb/smsc95xx.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/net/usb/smsc95xx.c +7 -0
@@ -1598,6 +1598,8 @@ static int smsc95xx_suspend(struct usb_interface *intf, pm_message_t message)return ret; } +cancel_delayed_work_sync (&pdata->carrier_check); +if (pdata->suspend_flags) {netdev_warn (dev->net,"error during last resume\n" ); pdata->suspend_flags =0 ;
@@ -1840,6 +1842,11 @@ static int smsc95xx_suspend(struct usb_interface *intf, pm_message_t message)*/ if (ret &&PMSG_IS_AUTO (message))usbnet_resume (intf); + +if (ret) +schedule_delayed_work (&pdata->carrier_check, +CARRIER_CHECK_DELAY ); +return ret; }
Sasha Levin
maintainerPATCH 12/59 net: dsa: microchip: initialize mutex before use
In reply to Sasha LevinFrom: Tristram Ha <[email protected]>
[ Upstream commit 284fb78ed7572117846f8e1d1d8e3dbfd16880c2 ]
Initialize mutex before use. Avoid kernel complaint when CONFIG_DEBUG_LOCK_ALLOC is enabled.
--- drivers/net/dsa/microchip/ksz_common.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/net/dsa/microchip/ksz_common.c +5 -5
@@ -1108,11 +1108,6 @@ static int ksz_switch_init(struct ksz_device *dev) {int i; -mutex_init (&dev->reg_mutex); -mutex_init (&dev->stats_mutex); -mutex_init (&dev->alu_mutex); -mutex_init (&dev->vlan_mutex); - dev->ds->ops = &ksz_switch_ops;for (i =0 ; i <ARRAY_SIZE (ksz_switch_chips); i++) {
@@ -1197,6 +1192,11 @@ int ksz_switch_register(struct ksz_device *dev)if (dev->pdata) dev->chip_id = dev->pdata->chip_id; +mutex_init (&dev->reg_mutex); +mutex_init (&dev->stats_mutex); +mutex_init (&dev->alu_mutex); +mutex_init (&dev->vlan_mutex); +if (ksz_switch_detect (dev))return -EINVAL ;
Signature · 1 line
2.17.1
Sasha Levin
maintainerPATCH 13/59 net: bcmgenet: protect stop from timeout
In reply to Sasha LevinFrom: Doug Berger <[email protected]>
[ Upstream commit 09e805d2570a3a94f13dd9c9ad2bcab23da76e09 ]
A timing hazard exists when the network interface is stopped that allows a watchdog timeout to be processed by a separate core in parallel. This creates the potential for the timeout handler to wake the queues while the driver is shutting down, or access registers after their clocks have been removed.
The more common case is that the watchdog timeout will produce a warning message which doesn't lead to a crash. The chances of this are greatly increased by the fact that bcmgenet_netif_stop stops the transmit queues which can easily precipitate a watchdog time- out because of stale trans_start data in the queues.
This commit corrects the behavior by ensuring that the watchdog timeout is disabled before enterring bcmgenet_netif_stop. There are currently only two users of the bcmgenet_netif_stop function:
close and suspend.
The close case already handles the issue by exiting the RUNNING state before invoking the driver close service.
The suspend case now performs the netif_device_detach to exit the PRESENT state before the call to bcmgenet_netif_stop rather than after it.
These behaviors prevent any future scheduling of the driver timeout service during the window. The netif_tx_stop_all_queues function in bcmgenet_netif_stop is replaced with netif_tx_disable to ensure synchronization with any transmit or timeout threads that may already be executing on other cores.
For symmetry, the netif_device_attach call upon resume is moved to after the call to bcmgenet_netif_start. Since it wakes the transmit queues it is not necessary to invoke netif_tx_start_all_queues from bcmgenet_netif_start so it is moved into the driver open service.
--- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/net/ethernet/broadcom/genet/bcmgenet.c +7 -6
@@ -2855,7 +2855,6 @@ static void bcmgenet_netif_start(struct net_device *dev)umac_enable_set (priv,CMD_TX_EN |CMD_RX_EN , true); -netif_tx_start_all_queues (dev);bcmgenet_enable_tx_napi (priv);/* Monitor link interrupts now */
@@ -2937,6 +2936,8 @@ static int bcmgenet_open(struct net_device *dev)bcmgenet_netif_start (dev); +netif_tx_start_all_queues (dev); +return 0 ; err_irq1:
@@ -2958,7 +2959,7 @@ static void bcmgenet_netif_stop(struct net_device *dev)struct bcmgenet_priv *priv =netdev_priv (dev);bcmgenet_disable_tx_napi (priv); -netif_tx_stop_all_queues (dev); +netif_tx_disable (dev);/* Disable MAC receive */ umac_enable_set (priv,CMD_RX_EN , false);
@@ -3620,13 +3621,13 @@ static int bcmgenet_suspend(struct device *d)if (!netif_running (dev))return 0 ; +netif_device_detach (dev); +bcmgenet_netif_stop (dev);if (!device_may_wakeup (d))phy_suspend (dev->phydev); -netif_device_detach (dev); -/* Prepare the device for Wake-on-LAN and switch to the slow clock */ if (device_may_wakeup (d) && priv->wolopts) { ret =bcmgenet_power_down (priv,GENET_POWER_WOL_MAGIC );
@@ -3700,8 +3701,6 @@ static int bcmgenet_resume(struct device *d)/* Always enable ring 16 - descriptor ring */ bcmgenet_enable_dma (priv, dma_ctrl); -netif_device_attach (dev); -if (!device_may_wakeup (d))phy_resume (dev->phydev);
@@ -3710,6 +3709,8 @@ static int bcmgenet_resume(struct device *d)bcmgenet_netif_start (dev); +netif_device_attach (dev); +return 0 ; out_clk_disable:
Signature · 1 line
2.17.1
Sasha Levin
maintainerPATCH 14/59 net: systemport: Protect stop from timeout
In reply to Sasha LevinFrom: Florian Fainelli <[email protected]>
[ Upstream commit 7cb6a2a2c72c1ed8f42fb01f1a661281b568dead ]
A timing hazard exists when the network interface is stopped that allows a watchdog timeout to be processed by a separate core in parallel. This creates the potential for the timeout handler to wake the queues while the driver is shutting down, or access registers after their clocks have been removed.
The more common case is that the watchdog timeout will produce a warning message which doesn't lead to a crash. The chances of this are greatly increased by the fact that bcm_sysport_netif_stop stops the transmit queues which can easily precipitate a watchdog time- out because of stale trans_start data in the queues.
This commit corrects the behavior by ensuring that the watchdog timeout is disabled before enterring bcm_sysport_netif_stop. There are currently only two users of the bcm_sysport_netif_stop function:
close and suspend.
The close case already handles the issue by exiting the RUNNING state before invoking the driver close service.
The suspend case now performs the netif_device_detach to exit the PRESENT state before the call to bcm_sysport_netif_stop rather than after it.
These behaviors prevent any future scheduling of the driver timeout service during the window. The netif_tx_stop_all_queues function in bcm_sysport_netif_stop is replaced with netif_tx_disable to ensure synchronization with any transmit or timeout threads that may already be executing on other cores.
For symmetry, the netif_device_attach call upon resume is moved to after the call to bcm_sysport_netif_start. Since it wakes the transmit queues it is not necessary to invoke netif_tx_start_all_queues from bcm_sysport_netif_start so it is moved into the driver open service.
--- drivers/net/ethernet/broadcom/bcmsysport.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
drivers/net/ethernet/broadcom/bcmsysport.c +7 -8
@@ -1869,9 +1869,6 @@ static void bcm_sysport_netif_start(struct net_device *dev)intrl2_1_mask_clear (priv,0xffffffff ); elseintrl2_0_mask_clear (priv ,INTRL2_0_TDMA_MBDONE_MASK ); - -/* Last call before we start the real business */ -netif_tx_start_all_queues (dev); }static void rbuf_init (struct bcm_sysport_priv *priv)
@@ -2017,6 +2014,8 @@ static int bcm_sysport_open(struct net_device *dev)bcm_sysport_netif_start (dev); +netif_tx_start_all_queues (dev); +return 0 ; out_clear_rx_int:
@@ -2040,7 +2039,7 @@ static void bcm_sysport_netif_stop(struct net_device *dev)struct bcm_sysport_priv *priv =netdev_priv (dev);/* stop all software from updating hardware */ -netif_tx_stop_all_queues (dev); +netif_tx_disable (dev);napi_disable (&priv->napi);cancel_work_sync (&priv->dim.dim.work);phy_stop (dev->phydev);
@@ -2478,12 +2477,12 @@ static int bcm_sysport_suspend(struct device *d)if (!netif_running (dev))return 0 ; +netif_device_detach (dev); +bcm_sysport_netif_stop (dev);phy_suspend (dev->phydev); -netif_device_detach (dev); -/* Disable UniMAC RX */ umac_enable_set (priv,CMD_RX_EN ,0 );
@@ -2567,8 +2566,6 @@ static int bcm_sysport_resume(struct device *d) goto out_free_rx_ring; } -netif_device_attach (dev); -/* RX pipe enable */ topctrl_writel (priv,0 ,RX_FLUSH_CNTL );
@@ -2613,6 +2610,8 @@ static int bcm_sysport_resume(struct device *d)bcm_sysport_netif_start (dev); +netif_device_attach (dev); +return 0 ; out_free_rx_ring:
Signature · 1 line
2.17.1
Sasha Levin
maintainerPATCH 15/59 netfilter: ipset: Correct rcu_dereference() call in ip_set_put_comment()
In reply to Sasha LevinFrom: Jozsef Kadlecsik <[email protected]>
[ Upstream commit 17b8b74c0f8dbf9b9e3301f9ca5b65dd1c079951 ]
The function is called when rcu_read_lock() is held and not when rcu_read_lock_bh() is held.
--- include/linux/netfilter/ipset/ip_set_comment.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/linux/netfilter/ipset/ip_set_comment.h +2 -2
@@ -43,11 +43,11 @@ ip_set_init_comment(struct ip_set *set, struct ip_set_comment *comment,rcu_assign_pointer (comment->c, c); } -/* Used only when dumping a set, protected by rcu_read_lock_bh() */ +/* Used only when dumping a set, protected by rcu_read_lock() */ static inline int ip_set_put_comment (struct sk_buff *skb,const struct ip_set_comment *comment) { -struct ip_set_comment_rcu *c =rcu_dereference_bh (comment->c); +struct ip_set_comment_rcu *c =rcu_dereference (comment->c);if (!c)return 0 ;
Signature · 1 line
2.17.1
Sasha Levin
maintainerPATCH 16/59 netfilter: xt_IDLETIMER: add sysfs filename checking routine
In reply to Sasha LevinFrom: Taehee Yoo <[email protected]>
[ Upstream commit 54451f60c8fa061af9051a53be9786393947367c ]
When IDLETIMER rule is added, sysfs file is created under /sys/class/xt_idletimer/timers/
But some label name shouldn't be used.
".", "..", "power", "uevent", "subsystem", etc... So that sysfs filename checking routine is needed.
test commands:
%iptables -I INPUT -j IDLETIMER --timeout 1 --label "power"
splat looks like:
[95765.423132] sysfs: cannot create duplicate filename '/devices/virtual/xt_idletimer/timers/power' [95765.433418] CPU: 0 PID: 8446 Comm: iptables Not tainted 4.19.0-rc6+ #20 [95765.449755] Call Trace: [95765.449755] dump_stack+0xc9/0x16b [95765.449755] ? show_regs_print_info+0x5/0x5 [95765.449755] sysfs_warn_dup+0x74/0x90 [95765.449755] sysfs_add_file_mode_ns+0x352/0x500 [95765.449755] sysfs_create_file_ns+0x179/0x270 [95765.449755] ? sysfs_add_file_mode_ns+0x500/0x500 [95765.449755] ? idletimer_tg_checkentry+0x3e5/0xb1b [xt_IDLETIMER] [95765.449755] ? rcu_read_lock_sched_held+0x114/0x130 [95765.449755] ? __kmalloc_track_caller+0x211/0x2b0 [95765.449755] ? memcpy+0x34/0x50 [95765.449755] idletimer_tg_checkentry+0x4e2/0xb1b [xt_IDLETIMER]
[ ... ]
--- net/netfilter/xt_IDLETIMER.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
net/netfilter/xt_IDLETIMER.c +20 -0
@@ -116,6 +116,22 @@ static void idletimer_tg_expired(struct timer_list *t)schedule_work (&timer->work); } +static int idletimer_check_sysfs_name (const char *name,unsigned int size) +{ +int ret; + + ret =xt_check_proc_name (name, size); +if (ret <0 ) +return ret; + +if (!strcmp (name,"power" ) || + !strcmp (name,"subsystem" ) || + !strcmp (name,"uevent" )) +return -EINVAL ; + +return 0 ; +} +static int idletimer_tg_create (struct idletimer_tg_info *info) {int ret;
@@ -126,6 +142,10 @@ static int idletimer_tg_create(struct idletimer_tg_info *info) goto out; } + ret =idletimer_check_sysfs_name (info->label,sizeof (info->label)); +if (ret <0 ) + goto out_free_timer; +sysfs_attr_init (&info->timer->attr.attr); info->timer->attr.attr.name =kstrdup (info->label,GFP_KERNEL );if (!info->timer->attr.attr.name) {
Signature · 1 line
2.17.1
Sasha Levin
maintainerPATCH 17/59 netfilter: ipset: Fix calling ip_set() macro at dumping
In reply to Sasha LevinFrom: Jozsef Kadlecsik <[email protected]>
[ Upstream commit 8a02bdd50b2ecb6d62121d2958d3ea186cc88ce7 ]
The ip_set() macro is called when either ip_set_ref_lock held only or no lock/nfnl mutex is held at dumping. Take this into account properly. Also, use Pablo's suggestion to use rcu_dereference_raw(), the ref_netlink protects the set.
--- net/netfilter/ipset/ip_set_core.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
net/netfilter/ipset/ip_set_core.c +8 -4
@@ -55,11 +55,15 @@ MODULE_AUTHOR("Jozsef Kadlecsik <[email protected]>");MODULE_DESCRIPTION ("core IP set support" );MODULE_ALIAS_NFNL_SUBSYS (NFNL_SUBSYS_IPSET ); -/* When the nfnl mutex is held: */ +/* When the nfnl mutex or ip_set_ref_lock is held: */ #define ip_set_dereference (p) \ - rcu_dereference_protected(p, lockdep_nfnl_is_held(NFNL_SUBSYS_IPSET)) + rcu_dereference_protected(p, \ + lockdep_nfnl_is_held(NFNL_SUBSYS_IPSET) || \ + lockdep_is_held(&ip_set_ref_lock))#define ip_set (inst, id) \ ip_set_dereference((inst)->ip_set_list)[id] +#define ip_set_ref_netlink (inst,id) \ + rcu_dereference_raw((inst)->ip_set_list)[id]/* The set types are implemented in modules and registered set types * can be found in ip_set_type_list. Adding/deleting types is
@@ -1251,7 +1255,7 @@ ip_set_dump_done(struct netlink_callback *cb)struct ip_set_net *inst = (struct ip_set_net *)cb->args[IPSET_CB_NET ];ip_set_id_t index = (ip_set_id_t )cb->args[IPSET_CB_INDEX ]; -struct ip_set *set =ip_set (inst, index); +struct ip_set *set =ip_set_ref_netlink (inst, index);if (set->variant->uref) set->variant->uref (set, cb, false);
@@ -1440,7 +1444,7 @@ ip_set_dump_start(struct sk_buff *skb, struct netlink_callback *cb) release_refcount:/* If there was an error or set is done, release set */ if (ret || !cb->args[IPSET_CB_ARG0 ]) { - set =ip_set (inst, index); + set =ip_set_ref_netlink (inst, index);if (set->variant->uref) set->variant->uref (set, cb, false);pr_debug ("release set %s\n" , set->name);
Signature · 1 line
2.17.1
Sasha Levin
maintainerPATCH 18/59 netfilter: nft_compat: ebtables 'nat' table is normal chain type
In reply to Sasha LevinFrom: Florian Westphal <[email protected]>
[ Upstream commit e4844c9c62a0fe47980d6c3d4b7a096a5d755925 ]
Unlike ip(6)tables, the ebtables nat table has no special properties. This bug causes 'ebtables -A' to fail when using a target such as 'snat' (ebt_snat target sets ".table = "nat"'). Targets that have no table restrictions work fine.
--- net/netfilter/nft_compat.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-)
net/netfilter/nft_compat.c +12 -9
@@ -54,9 +54,11 @@ static bool nft_xt_put(struct nft_xt *xt)return false; } -static int nft_compat_chain_validate_dependency (const char *tablename, -const struct nft_chain *chain) +static int nft_compat_chain_validate_dependency (const struct nft_ctx *ctx, +const char *tablename) { +enum nft_chain_types type =NFT_CHAIN_T_DEFAULT ; +const struct nft_chain *chain = ctx->chain;const struct nft_base_chain *basechain; if (!tablename ||
@@ -64,9 +66,12 @@ static int nft_compat_chain_validate_dependency(const char *tablename,return 0 ; basechain =nft_base_chain (chain); -if (strcmp (tablename,"nat" ) ==0 && - basechain->type->type !=NFT_CHAIN_T_NAT ) -return -EINVAL ; +if (strcmp (tablename,"nat" ) ==0 ) { +if (ctx->family !=NFPROTO_BRIDGE ) + type =NFT_CHAIN_T_NAT ; +if (basechain->type->type != type) +return -EINVAL ; + }return 0 ; }
@@ -323,8 +328,7 @@ static int nft_target_validate(const struct nft_ctx *ctx,if (target->hooks && !(hook_mask & target->hooks))return -EINVAL ; - ret =nft_compat_chain_validate_dependency (target->table, - ctx->chain); + ret =nft_compat_chain_validate_dependency (ctx, target->table);if (ret <0 )return ret; }
@@ -570,8 +574,7 @@ static int nft_match_validate(const struct nft_ctx *ctx,if (match->hooks && !(hook_mask & match->hooks))return -EINVAL ; - ret =nft_compat_chain_validate_dependency (match->table, - ctx->chain); + ret =nft_compat_chain_validate_dependency (ctx, match->table);if (ret <0 )return ret; }
Signature · 1 line
2.17.1
Sasha Levin
maintainerPATCH 19/59 s390/qeth: fix HiperSockets sniffer
In reply to Sasha LevinFrom: Julian Wiedmann <[email protected]>
[ Upstream commit bd74a7f9cc033cf4d405788f80292268987dc0c5 ]
Sniffing mode for L3 HiperSockets requires that no IP addresses are registered with the HW. The preferred way to achieve this is for userspace to delete all the IPs on the interface. But qeth is expected to also tolerate a configuration where that is not the case, by skipping the IP registration when in sniffer mode.
Since commit 5f78e29ceebf ("qeth: optimize IP handling in rx_mode callback") reworked the IP registration logic in the L3 subdriver, this no longer works. When the qeth device is set online, qeth_l3_recover_ip() now unconditionally registers all unicast addresses from our internal IP table.
While we could fix this particular problem by skipping qeth_l3_recover_ip() on a sniffer device, the more future-proof change is to skip the IP address registration at the lowest level. This way we
a) catch any future code path that attempts to register an IP address without considering the sniffer scenario, and
b) continue to build up our internal IP table, so that if sniffer mode is switched off later we can operate just like normal.
--- drivers/s390/net/qeth_l3_main.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/s390/net/qeth_l3_main.c +5 -3
@@ -279,9 +279,6 @@ static void qeth_l3_clear_ip_htable(struct qeth_card *card, int recover)QETH_CARD_TEXT (card,4 ,"clearip" ); -if (recover && card->options.sniffer) -return ; -spin_lock_bh (&card->ip_lock);hash_for_each_safe (card->ip_htable, i, tmp, addr, hnode) {
@@ -664,6 +661,8 @@ static int qeth_l3_register_addr_entry(struct qeth_card *card,int rc =0 ;int cnt =3 ; +if (card->options.sniffer) +return 0 ;if (addr->proto ==QETH_PROT_IPV4 ) {QETH_CARD_TEXT (card,2 ,"setaddr4" );
@@ -698,6 +697,9 @@ static int qeth_l3_deregister_addr_entry(struct qeth_card *card, {int rc =0 ; +if (card->options.sniffer) +return 0 ; +if (addr->proto ==QETH_PROT_IPV4 ) {QETH_CARD_TEXT (card,2 ,"deladdr4" );QETH_CARD_HEX (card,3 , &addr->u.a4.addr,sizeof (int ));
Signature · 1 line
2.17.1
Sasha Levin
maintainerPATCH 20/59 net: hns3: Fix for out-of-bounds access when setting pfc back pressure
In reply to Sasha LevinFrom: Yunsheng Lin <[email protected]>
[ Upstream commit e8ccbb7d2f53c62e14b889faaa3f6f809b657278 ]
The vport should be initialized to hdev->vport for each bp group, otherwise it will cause out-of-bounds access and bp setting not correct problem.
[ 35.254124] BUG: KASAN: slab-out-of-bounds in hclge_pause_setup_hw+0x2a0/0x3f8 [hclge] [ 35.254126] Read of size 2 at addr ffff803b6651581a by task kworker/0:1/14
[ 35.254132] CPU: 0 PID: 14 Comm: kworker/0:1 Not tainted 4.19.0-rc7-hulk+ #85 [ 35.254133] Hardware name: Huawei D06/D06, BIOS Hisilicon D06 UEFI RC0 - B052 (V0.52) 09/14/2018 [ 35.254141] Workqueue: events work_for_cpu_fn [ 35.254144] Call trace: [ 35.254147] dump_backtrace+0x0/0x2f0 [ 35.254149] show_stack+0x24/0x30 [ 35.254154] dump_stack+0x110/0x184 [ 35.254157] print_address_description+0x168/0x2b0 [ 35.254160] kasan_report+0x184/0x310 [ 35.254162] __asan_load2+0x7c/0xa0 [ 35.254170] hclge_pause_setup_hw+0x2a0/0x3f8 [hclge] [ 35.254177] hclge_tm_init_hw+0x794/0x9f0 [hclge] [ 35.254184] hclge_tm_schd_init+0x48/0x58 [hclge] [ 35.254191] hclge_init_ae_dev+0x778/0x1168 [hclge] [ 35.254196] hnae3_register_ae_dev+0x14c/0x298 [hnae3] [ 35.254206] hns3_probe+0x88/0xa8 [hns3] [ 35.254210] local_pci_probe+0x7c/0xf0 [ 35.254212] work_for_cpu_fn+0x34/0x50 [ 35.254214] process_one_work+0x4d4/0xa38 [ 35.254216] worker_thread+0x55c/0x8d8 [ 35.254219] kthread+0x1b0/0x1b8 [ 35.254222] ret_from_fork+0x10/0x1c
[ 35.254224] The buggy address belongs to the page: [ 35.254228] page:ffff7e00ed994400 count:1 mapcount:0 mapping:0000000000000000 index:0x0 compound_mapcount: 0 [ 35.273835] flags: 0xfffff8000008000(head) [ 35.282007] raw: 0fffff8000008000 dead000000000100 dead000000000200 0000000000000000 [ 35.282010] raw: 0000000000000000 0000000000000000 00000001ffffffff 0000000000000000 [ 35.282012] page dumped because: kasan: bad access detected
[ 35.282014] Memory state around the buggy address: [ 35.282017] ffff803b66515700: fe fe fe fe fe fe fe fe fe fe fe fe fe fe fe fe [ 35.282019] ffff803b66515780: fe fe fe fe fe fe fe fe fe fe fe fe fe fe fe fe [ 35.282021] >ffff803b66515800: fe fe fe fe fe fe fe fe fe fe fe fe fe fe fe fe [ 35.282022] ^ [ 35.282024] ffff803b66515880: fe fe fe fe fe fe fe fe fe fe fe fe fe fe fe fe [ 35.282026] ffff803b66515900: fe fe fe fe fe fe fe fe fe fe fe fe fe fe fe fe [ 35.282028] ================================================================== [ 35.282029] Disabling lock debugging due to kernel taint [ 35.282747] hclge driver initialization finished.
--- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c +4 -6
@@ -1173,14 +1173,14 @@ static int hclge_pfc_setup_hw(struct hclge_dev *hdev)*/ static int hclge_bp_setup_hw (struct hclge_dev *hdev,u8 tc) { -struct hclge_vport *vport = hdev->vport; -u32 i, k, qs_bitmap; -int ret; +int i;for (i =0 ; i <HCLGE_BP_GRP_NUM ; i++) { - qs_bitmap =0 ; +u32 qs_bitmap =0 ; +int k, ret;for (k =0 ; k < hdev->num_alloc_vport; k++) { +struct hclge_vport *vport = &hdev->vport[k];u16 qs_id = vport->qs_offset + tc;u8 grp, sub_grp;
@@ -1190,8 +1190,6 @@ static int hclge_bp_setup_hw(struct hclge_dev *hdev, u8 tc) HCLGE_BP_SUB_GRP_ID_S);if (i == grp) qs_bitmap |= (1 << sub_grp); - - vport++; } ret =hclge_tm_qs_bp_cfg (hdev, tc, i, qs_bitmap);
Signature · 1 line
2.17.1
Sasha Levin
maintainerPATCH 21/59 mlxsw: spectrum: Fix IP2ME CPU policer configuration
In reply to Sasha LevinFrom: Shalom Toledo <[email protected]>
[ Upstream commit 96801552f846460fe9ac10f1b189602992f004e1 ]
The CPU policer used to police packets being trapped via a local route (IP2ME) was incorrectly configured to police based on bytes per second instead of packets per second.
Change the policer to police based on packets per second and avoid packet loss under certain circumstances.
--- drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 1 - 1 file changed, 1 deletion(-)
drivers/net/ethernet/mellanox/mlxsw/spectrum.c +0 -1
@@ -3429,7 +3429,6 @@ static int mlxsw_sp_cpu_policers_set(struct mlxsw_core *mlxsw_core) burst_size =7 ;break ;case MLXSW_REG_HTGT_TRAP_GROUP_SP_IP2ME : - is_bytes = true; rate =4 *1024 ; burst_size =4 ;break ;
Signature · 1 line
2.17.1
Sasha Levin
maintainerPATCH 22/59 hwmon: (ibmpowernv) Remove bogus __init annotations
In reply to Sasha LevinFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit e3e61f01d755188cb6c2dcf5a244b9c0937c258e ]
If gcc decides not to inline make_sensor_label():
WARNING: vmlinux.o(.text+0x4df549c): Section mismatch in reference from the function .create_device_attrs() to the function .init.text:.make_sensor_label() The function .create_device_attrs() references
the function __init .make_sensor_label().
This is often because .create_device_attrs lacks a __init
annotation or the annotation of .make_sensor_label is wrong.
As .probe() can be called after freeing of __init memory, all __init annotiations in the driver are bogus, and should be removed.
--- drivers/hwmon/ibmpowernv.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/hwmon/ibmpowernv.c +3 -4
@@ -129,7 +129,7 @@ static ssize_t show_label(struct device *dev, struct device_attribute *devattr,return sprintf (buf,"%s\n" , sdata->label); } -static int __init get_logical_cpu (int hwcpu) +static int get_logical_cpu (int hwcpu) {int cpu;
@@ -140,9 +140,8 @@ static int __init get_logical_cpu(int hwcpu)return -ENOENT ; } -static void __init make_sensor_label (struct device_node *np, -struct sensor_data *sdata, -const char *label) +static void make_sensor_label (struct device_node *np, +struct sensor_data *sdata,const char *label) {u32 id;size_t n;
Signature · 1 line
2.17.1
Sasha Levin
maintainerPATCH 23/59 net: phy: realtek: fix RTL8201F sysfs name
In reply to Sasha LevinFrom: Holger Hoffstätte <[email protected]>
[ Upstream commit 0432e833191ad4d17b7fc2364941f91dad51db1a ]
Since 4.19 the following error in sysfs has appeared when using the r8169 NIC driver:
$cd /sys/module/realtek/drivers
$ls -l
ls: cannot access 'mdio_bus:RTL8201F 10/100Mbps Ethernet': No such file or directory [..garbled dir entries follow..]
Apparently the forward slash in "10/100Mbps Ethernet" is interpreted as directory separator that leads nowhere, and was introduced in commit 513588dd44b ("net: phy: realtek: add RTL8201F phy-id and functions").
Fix this by removing the offending slash in the driver name.
Other drivers in net/phy seem to have the same problem, but I cannot test/verify them.
--- drivers/net/phy/realtek.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/phy/realtek.c +1 -1
@@ -168,7 +168,7 @@ static struct phy_driver realtek_drvs[] = { .flags = PHY_HAS_INTERRUPT, }, { .phy_id = 0x001cc816, - .name = "RTL8201F 10/100Mbps Ethernet", + .name = "RTL8201F Fast Ethernet", .phy_id_mask = 0x001fffff, .features = PHY_BASIC_FEATURES, .flags = PHY_HAS_INTERRUPT,
Signature · 1 line
2.17.1
Sasha Levin
maintainerPATCH 24/59 ARM: dts: fsl: Fix improperly quoted stdout-path values
In reply to Sasha LevinFrom: Rob Herring <[email protected]>
[ Upstream commit 1af6ab3bac8458fc2e92ad7bb97b62de4a1fddef ]
A quoted label reference doesn't expand to the node path and is taken as a literal string. Dropping the quotes can fix this unless the baudrate string is appended in which case we have to use the alias.
At least on VF610, the problem was masked by setting the console in bootargs. Use the alias syntax with baudrate parameter so we can drop setting the console in bootargs.
--- arch/arm/boot/dts/imx53-ppd.dts | 2 +- arch/arm/boot/dts/vf610m4-colibri.dts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/imx53-ppd.dts +1 -1
@@ -55,7 +55,7 @@ }; chosen { - stdout-path = "&uart1:115200n8"; + stdout-path = "serial0:115200n8"; }; memory@70000000 {
arch/arm/boot/dts/vf610m4-colibri.dts +2 -2
@@ -50,8 +50,8 @@ compatible = "fsl,vf610m4"; chosen { - bootargs = "console=ttyLP2,115200 clk_ignore_unused init=/linuxrc rw"; - stdout-path = "&uart2"; + bootargs = "clk_ignore_unused init=/linuxrc rw"; + stdout-path = "serial2:115200"; }; memory@8c000000 {
Signature · 1 line
2.17.1
Sasha Levin
maintainerPATCH 25/59 ARM: dts: imx6sx-sdb: Fix enet phy regulator
In reply to Sasha LevinFrom: Leonard Crestez <[email protected]>
[ Upstream commit 1ad9fb750a104f51851c092edd7b3553f0218428 ]
Bindings for "fixed-regulator" only explicitly support "gpio" property, not "gpios". Fix by correcting the property name.
The enet PHYs on imx6sx-sdb needs to be explicitly reset after a power cycle, this can be handled by the phy-reset-gpios property. Sadly this is not handled on suspend: the fec driver turns phy-supply off but doesn't assert phy-reset-gpios again on resume.
Since additional phy-level work is required to support powering off the phy in suspend fix the problem by just marking the regulator as "boot-on" "always-on" so that it's never turned off. This behavior is equivalent to older releases.
Keep the phy-reset-gpios property on fec anyway because it is a correct description of board design.
This issue was exposed by commit efdfeb079cc3 ("regulator: fixed:
Convert to use GPIO descriptor only") which causes the "gpios" property to also be parsed. Before that commit the "gpios" property had no effect, PHY reset was only handled in the the bootloader.
This fixes linux-next boot failures previously reported here:
https://lore.kernel.org/patchwork/patch/982437/#1177900
https://lore.kernel.org/patchwork/patch/994091/#1178304
--- arch/arm/boot/dts/imx6sx-sdb.dtsi | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
arch/arm/boot/dts/imx6sx-sdb.dtsi +6 -1
@@ -115,7 +115,9 @@ regulator-name = "enet_3v3"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; - gpios = <&gpio2 6 GPIO_ACTIVE_LOW>; + gpio = <&gpio2 6 GPIO_ACTIVE_LOW>; + regulator-boot-on; + regulator-always-on; }; reg_pcie_gpio: regulator-pcie-gpio {
@@ -178,6 +180,7 @@ phy-supply = <®_enet_3v3>; phy-mode = "rgmii"; phy-handle = <ðphy1>; + phy-reset-gpios = <&gpio2 7 GPIO_ACTIVE_LOW>; status = "okay"; mdio {
@@ -371,6 +374,8 @@ MX6SX_PAD_RGMII1_RD3__ENET1_RX_DATA_3 0x3081 MX6SX_PAD_RGMII1_RX_CTL__ENET1_RX_EN 0x3081 MX6SX_PAD_ENET2_RX_CLK__ENET2_REF_CLK_25M 0x91 + /* phy reset */ + MX6SX_PAD_ENET2_CRS__GPIO2_IO_7 0x10b0 >; };
Signature · 1 line
2.17.1
Sasha Levin
maintainerPATCH 26/59 Revert "drm/exynos/decon5433: implement frame counter"
In reply to Sasha LevinFrom: Inki Dae <[email protected]>
[ Upstream commit 6ca469e22a30992b4478d2ab88737c70667c1e00 ]
This reverts commit 0586feba322e1de05075700eb4b835c8b683e62b
This patch makes it to need get_vblank_counter callback in crtc to get frame counter from decon driver.
However, drm_dev->max_vblank_count is a member unique to vendor's DRM driver but in case of ARM DRM, some CRTC devices don't provide the frame counter value. As a result, this patch made extension and clone mode not working.
Instead of this patch, we may need separated max_vblank_count which belongs to each CRTC device, or need to implement frame counter emulation for them who don't support HW frame counter.
--- drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 9 --------- drivers/gpu/drm/exynos/exynos_drm_crtc.c | 11 ----------- drivers/gpu/drm/exynos/exynos_drm_drv.h | 1 - 3 files changed, 21 deletions(-)
drivers/gpu/drm/exynos/exynos5433_drm_decon.c +0 -9
@@ -164,13 +164,6 @@ static u32 decon_get_frame_count(struct decon_context *ctx, bool end)return frm; } -static u32 decon_get_vblank_counter (struct exynos_drm_crtc *crtc) -{ -struct decon_context *ctx = crtc->ctx; - -return decon_get_frame_count (ctx, false); -} -static void decon_setup_trigger (struct decon_context *ctx) {if (!ctx->crtc->i80_mode && !(ctx->out_type &I80_HW_TRG ))
@@ -536,7 +529,6 @@ static const struct exynos_drm_crtc_ops decon_crtc_ops = { .disable = decon_disable, .enable_vblank = decon_enable_vblank, .disable_vblank = decon_disable_vblank, - .get_vblank_counter = decon_get_vblank_counter, .atomic_begin = decon_atomic_begin, .update_plane = decon_update_plane, .disable_plane = decon_disable_plane,
@@ -554,7 +546,6 @@ static int decon_bind(struct device *dev, struct device *master, void *data)int ret; ctx->drm_dev = drm_dev; - drm_dev->max_vblank_count =0xffffffff ;for (win = ctx->first_win; win <WINDOWS_NR ; win++) { ctx->configs[win].pixel_formats = decon_formats;
drivers/gpu/drm/exynos/exynos_drm_crtc.c +0 -11
@@ -162,16 +162,6 @@ static void exynos_drm_crtc_disable_vblank(struct drm_crtc *crtc) exynos_crtc->ops->disable_vblank (exynos_crtc); } -static u32 exynos_drm_crtc_get_vblank_counter (struct drm_crtc *crtc) -{ -struct exynos_drm_crtc *exynos_crtc =to_exynos_crtc (crtc); - -if (exynos_crtc->ops->get_vblank_counter) -return exynos_crtc->ops->get_vblank_counter (exynos_crtc); - -return 0 ; -} -static const struct drm_crtc_funcs exynos_crtc_funcs = { .set_config = drm_atomic_helper_set_config, .page_flip = drm_atomic_helper_page_flip,
@@ -181,7 +171,6 @@ static const struct drm_crtc_funcs exynos_crtc_funcs = { .atomic_destroy_state = drm_atomic_helper_crtc_destroy_state, .enable_vblank = exynos_drm_crtc_enable_vblank, .disable_vblank = exynos_drm_crtc_disable_vblank, - .get_vblank_counter = exynos_drm_crtc_get_vblank_counter, }; struct exynos_drm_crtc *exynos_drm_crtc_create(struct drm_device *drm_dev,
drivers/gpu/drm/exynos/exynos_drm_drv.h +0 -1
@@ -133,7 +133,6 @@ struct exynos_drm_crtc_ops {void (*disable)(struct exynos_drm_crtc *crtc);int (*enable_vblank)(struct exynos_drm_crtc *crtc);void (*disable_vblank)(struct exynos_drm_crtc *crtc); -u32 (*get_vblank_counter)(struct exynos_drm_crtc *crtc);enum drm_mode_status (*mode_valid)(struct exynos_drm_crtc *crtc,const struct drm_display_mode *mode); bool (*mode_fixup)(struct exynos_drm_crtc *crtc,
Signature · 1 line
2.17.1
Sasha Levin
maintainerPATCH 27/59 arm64: dts: renesas: r8a7795: add missing dma-names on hscif2
In reply to Sasha LevinFrom: Kuninori Morimoto <[email protected]>
[ Upstream commit aab7a2414ba0d5c3d0571a90031b535adba7146a ]
hscif2 has 4 dmas, but has only 2 dma-names.
This patch add missing dma-names.
of the soc node")
--- arch/arm64/boot/dts/renesas/r8a7795.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/renesas/r8a7795.dtsi +1 -1
@@ -656,7 +656,7 @@ clock-names = "fck", "brg_int", "scif_clk"; dmas = <&dmac1 0x35>, <&dmac1 0x34>, <&dmac2 0x35>, <&dmac2 0x34>; - dma-names = "tx", "rx"; + dma-names = "tx", "rx", "tx", "rx"; power-domains = <&sysc R8A7795_PD_ALWAYS_ON>; resets = <&cpg 518>; status = "disabled";
Signature · 1 line
2.17.1
Sasha Levin
maintainerPATCH 28/59 clk: fixed-factor: fix of_node_get-put imbalance
In reply to Sasha LevinFrom: Ricardo Ribalda Delgado <[email protected]>
[ Upstream commit f98e8a572bddbf27032114127d2fcc78fa5e6a9d ]
When the fixed factor clock is created by devicetree, of_clk_add_provider is called. Add a call to of_clk_del_provider in the remove function to balance it out.
--- drivers/clk/clk-fixed-factor.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/clk-fixed-factor.c +1 -0
@@ -210,6 +210,7 @@ static int of_fixed_factor_clk_remove(struct platform_device *pdev) {struct clk *clk =platform_get_drvdata (pdev); +of_clk_del_provider (pdev->dev.of_node);clk_unregister_fixed_factor (clk);return 0 ;
Signature · 1 line
2.17.1
Sasha Levin
maintainerPATCH 29/59 mtd: nand: Fix nanddev_pos_next_page() kernel-doc header
In reply to Sasha LevinFrom: Boris Brezillon <[email protected]>
[ Upstream commit 98ee3fc7ef8395f8b7a379e6608aee91efc66d48 ]
Function name is wrong in the kernel-doc header.
--- include/linux/mtd/nand.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/mtd/nand.h +1 -1
@@ -569,7 +569,7 @@ static inline void nanddev_pos_next_eraseblock(struct nand_device *nand, }/** -* nanddev_pos_next_eraseblock() - Move a position to the next page +* nanddev_pos_next_page() - Move a position to the next page * @nand: NAND device * @pos: the position to update *
Signature · 1 line
2.17.1
Sasha Levin
maintainerPATCH 30/59 lib/raid6: Fix arm64 test build
In reply to Sasha LevinFrom: Jeremy Linton <[email protected]>
[ Upstream commit 313a06e636808387822af24c507cba92703568b1 ]
The lib/raid6/test fails to build the neon objects on arm64 because the correct machine type is 'aarch64'.
Once this is correctly enabled, the neon recovery objects need to be added to the build.
--- lib/raid6/test/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
lib/raid6/test/Makefile +2 -2
@@ -27,7 +27,7 @@ ifeq ($(ARCH),arm) CFLAGS += -I../../../arch/arm/include -mfpu=neon HAS_NEON = yes endif -ifeq ($(ARCH),arm64) +ifeq ($(ARCH),aarch64) CFLAGS += -I../../../arch/arm64/include HAS_NEON = yes endif
@@ -41,7 +41,7 @@ ifeq ($(IS_X86),yes) gcc -c -x assembler - >&/dev/null && \ rm ./-.o && echo -DCONFIG_AS_AVX512=1) else ifeq ($(HAS_NEON),yes) - OBJS += neon.o neon1.o neon2.o neon4.o neon8.o + OBJS += neon.o neon1.o neon2.o neon4.o neon8.o recov_neon.o recov_neon_inner.o CFLAGS += -DCONFIG_KERNEL_MODE_NEON=1 else HAS_ALTIVEC := $(shell printf '\#include <altivec.h>\nvector int a;\n' |\
Signature · 1 line
2.17.1
Sasha Levin
maintainerPATCH 31/59 drm/amd/display: Stop leaking planes
In reply to Sasha LevinFrom: Harry Wentland <[email protected]>
[ Upstream commit 02680efbb10be0d2c867fe722ae23d588f6bebef ]
[Why]drm_plane_cleanup does not free the plane.
[How]
Call drm_primary_helper_destroy which will also free the plane.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1 -1
@@ -3049,7 +3049,7 @@ void dm_drm_plane_destroy_state(struct drm_plane *plane,static const struct drm_plane_funcs dm_plane_funcs = { .update_plane = drm_atomic_helper_update_plane, .disable_plane = drm_atomic_helper_disable_plane, - .destroy = drm_plane_cleanup, + .destroy = drm_primary_helper_destroy, .reset = dm_drm_plane_reset, .atomic_duplicate_state = dm_drm_plane_duplicate_state, .atomic_destroy_state = dm_drm_plane_destroy_state,
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 32/59 block: Clear kernel memory before copying to user
In reply to Sasha LevinFrom: Keith Busch <[email protected]>
[ Upstream commit f3587d76da05f68098ddb1cb3c98cc6a9e8a402c ]
If the kernel allocates a bounce buffer for user read data, this memory needs to be cleared before copying it to the user, otherwise it may leak kernel memory to user space.
Laurence Oberman <[email protected]>
--- block/bio.c | 1 + 1 file changed, 1 insertion(+)
block/bio.c +1 -0
@@ -1336,6 +1336,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q,if (ret) goto cleanup; }else { +zero_fill_bio (bio);iov_iter_advance (iter, bio->bi_iter.bi_size); }
Signature · 1 line
2.17.1
Sasha Levin
maintainerPATCH 33/59 drm/amd/amdgpu/dm: Fix dm_dp_create_fake_mst_encoder()
In reply to Sasha LevinFrom: Lyude Paul <[email protected]>
[ Upstream commit 63237f8748bdf46dccf79ef8f98f05e9fe799162 ]
[why]
Removing connector reusage from DM to match the rest of the tree ended up revealing an issue that was surprisingly subtle. The original amdgpu code for DC that was submitted appears to have left a chunk in dm_dp_create_fake_mst_encoder() that tries to find a "master encoder", the likes of which isn't actually used or stored anywhere. It does so at the wrong time as well by trying to access parts of the drm_connector from the encoder init before it's actually been initialized. This results in a NULL pointer deref on MST hotplugs:
[ 160.696613] BUG: unable to handle kernel NULL pointer dereference at 0000000000000000 [ 160.697234] PGD 0 P4D 0 [ 160.697814] Oops: 0010 [#1] SMP PTI [ 160.698430] CPU: 2 PID: 64 Comm: kworker/2:1 Kdump: loaded Tainted: G O 4.19.0Lyude-Test+ #2 [ 160.699020] Hardware name: HP HP ZBook 15 G4/8275, BIOS P70 Ver. 01.22 05/17/2018 [ 160.699672] Workqueue: events_long drm_dp_mst_link_probe_work [drm_kms_helper] [ 160.700322] RIP: 0010: (null) [ 160.700920] Code: Bad RIP value. [ 160.701541] RSP: 0018:ffffc9000029fc78 EFLAGS: 00010206 [ 160.702183] RAX: 0000000000000000 RBX: ffff8804440ed468 RCX: ffff8804440e9158 [ 160.702778] RDX: 0000000000000000 RSI: ffff8804556c5700 RDI: ffff8804440ed000 [ 160.703408] RBP: ffff880458e21800 R08: 0000000000000002 R09: 000000005fca0a25 [ 160.704002] R10: ffff88045a077a3d R11: ffff88045a077a3c R12: ffff8804440ed000 [ 160.704614] R13: ffff880458e21800 R14: ffff8804440e9000 R15: ffff8804440e9000 [ 160.705260] FS: 0000000000000000(0000) GS:ffff88045f280000(0000) knlGS:0000000000000000 [ 160.705854] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 160.706478] CR2: ffffffffffffffd6 CR3: 000000000200a001 CR4: 00000000003606e0 [ 160.707124] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 160.707724] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 160.708372] Call Trace: [ 160.708998] ? dm_dp_add_mst_connector+0xed/0x1d0 [amdgpu] [ 160.709625] ? drm_dp_add_port+0x2fa/0x470 [drm_kms_helper] [ 160.710284] ? wake_up_q+0x54/0x70 [ 160.710877] ? __mutex_unlock_slowpath.isra.18+0xb3/0x110 [ 160.711512] ? drm_dp_dpcd_access+0xe7/0x110 [drm_kms_helper] [ 160.712161] ? drm_dp_send_link_address+0x155/0x1e0 [drm_kms_helper] [ 160.712762] ? drm_dp_check_and_send_link_address+0xa3/0xd0 [drm_kms_helper] [ 160.713408] ? drm_dp_mst_link_probe_work+0x4b/0x80 [drm_kms_helper] [ 160.714013] ? process_one_work+0x1a1/0x3a0 [ 160.714667] ? worker_thread+0x30/0x380 [ 160.715326] ? wq_update_unbound_numa+0x10/0x10 [ 160.715939] ? kthread+0x112/0x130 [ 160.716591] ? kthread_create_worker_on_cpu+0x70/0x70 [ 160.717262] ? ret_from_fork+0x35/0x40 [ 160.717886] Modules linked in: amdgpu(O) vfat fat snd_hda_codec_generic joydev i915 chash gpu_sched ttm i2c_algo_bit drm_kms_helper snd_hda_codec_hdmi hp_wmi syscopyarea iTCO_wdt sysfillrect sparse_keymap sysimgblt fb_sys_fops snd_hda_intel usbhid wmi_bmof drm snd_hda_codec btusb snd_hda_core intel_rapl btrtl x86_pkg_temp_thermal btbcm btintel coretemp snd_pcm crc32_pclmul bluetooth psmouse snd_timer snd pcspkr i2c_i801 mei_me i2c_core soundcore mei tpm_tis wmi tpm_tis_core hp_accel ecdh_generic lis3lv02d tpm video rfkill acpi_pad input_polldev hp_wireless pcc_cpufreq crc32c_intel serio_raw tg3 xhci_pci xhci_hcd [last unloaded: amdgpu] [ 160.720141] CR2: 0000000000000000
Somehow the connector reusage DM was using for MST connectors managed to paper over this issue entirely; hence why this was never caught until now.
[how]
Since this code isn't used anywhere and seems useless anyway, we can just drop it entirely. This appears to fix the issue on my HP ZBook with an AMD WX4150.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +0 -5
@@ -295,12 +295,7 @@ dm_dp_create_fake_mst_encoder(struct amdgpu_dm_connector *connector)struct amdgpu_device *adev = dev->dev_private;struct amdgpu_encoder *amdgpu_encoder;struct drm_encoder *encoder; -const struct drm_connector_helper_funcs *connector_funcs = - connector->base.helper_private; -struct drm_encoder *enc_master = - connector_funcs->best_encoder (&connector->base); -DRM_DEBUG_KMS ("enc master is %p\n" , enc_master); amdgpu_encoder =kzalloc (sizeof (*amdgpu_encoder),GFP_KERNEL );if (!amdgpu_encoder)return NULL ;
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 34/59 s390/perf: Change CPUM_CF return code in event init function
In reply to Sasha LevinFrom: Thomas Richter <[email protected]>
[ Upstream commit 0bb2ae1b26e1fb7543ec7474cdd374ac4b88c4da ]
The function perf_init_event() creates a new event and assignes it to a PMU. This a done in a loop over all existing PMUs. For each listed PMU the event init function is called and if this function does return any other error than -ENOENT, the loop is terminated the creation of the event fails.
If the event is invalid, return -ENOENT to try other PMUs.
--- arch/s390/kernel/perf_cpum_cf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/s390/kernel/perf_cpum_cf.c +1 -1
@@ -373,7 +373,7 @@ static int __hw_perf_event_init(struct perf_event *event)return -ENOENT ;if (ev >PERF_CPUM_CF_MAX_CTR ) -return -EINVAL ; +return -ENOENT ;/* Obtain the counter set to which the specified counter belongs */ set =get_counter_set (ev);
Signature · 1 line
2.17.1
Sasha Levin
maintainerPATCH 35/59 ceph: quota: fix null pointer dereference in quota check
In reply to Sasha LevinFrom: Luis Henriques <[email protected]>
[ Upstream commit 71f2cc64d027d712f29bf8d09d3e123302d5f245 ]
This patch fixes a possible null pointer dereference in check_quota_exceeded, detected by the static checker smatch, with the following warning:
fs/ceph/quota.c:240 check_quota_exceeded()
error: we previously assumed 'realm' could be null (see line 188)
--- fs/ceph/quota.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/ceph/quota.c +2 -1
@@ -237,7 +237,8 @@ static bool check_quota_exceeded(struct inode *inode, enum quota_check_op op,ceph_put_snap_realm (mdsc, realm); realm = next; } -ceph_put_snap_realm (mdsc, realm); +if (realm) +ceph_put_snap_realm (mdsc, realm);up_read (&mdsc->snap_rwsem);return exceeded;
Signature · 1 line
2.17.1
Sasha Levin
maintainerPATCH 36/59 clk: meson-gxbb: set fclk_div3 as CLK_IS_CRITICAL
In reply to Sasha LevinFrom: Christian Hewitt <[email protected]>
[ Upstream commit e2576c8bdfd462c34b8a46c0084e7c30b0851bf4 ]
On the Khadas VIM2 (GXM) and LePotato (GXL) board there are problems with reboot; e.g. a ~60 second delay between issuing reboot and the board power cycling (and in some OS configurations reboot will fail and require manual power cycling).
Similar to 'commit c987ac6f1f088663b6dad39281071aeb31d450a8 ("clk:
meson-gxbb: set fclk_div2 as CLK_IS_CRITICAL")' the SCPI Cortex-M4 Co-Processor seems to depend on FCLK_DIV3 being operational.
Until commit 05f814402d6174369b3b29832cbb5eb5ed287059 ("clk:
meson: add fdiv clock gates"), this clock was modeled and left on by the bootloader.
We don't have precise documentation about the SCPI Co-Processor and its clock requirement so we are learning things the hard way.
Marking this clock as critical solves the problem but it should not be viewed as final solution. Ideally, the SCPI driver should claim these clocks. We also depends on some clock hand-off mechanism making its way to CCF, to make sure the clock stays on between its registration and the SCPI driver probe.
--- drivers/clk/meson/gxbb.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/clk/meson/gxbb.c +12 -0
@@ -523,6 +523,18 @@ static struct clk_regmap gxbb_fclk_div3 = { .ops = &clk_regmap_gate_ops, .parent_names = (const char *[]){ "fclk_div3_div" }, .num_parents = 1, +/* +* FIXME: +* This clock, as fdiv2, is used by the SCPI FW and is required +* by the platform to operate correctly. +* Until the following condition are met, we need this clock to +* be marked as critical: +* a) The SCPI generic driver claims and enable all the clocks +* it needs +* b) CCF has a clock hand-off mechanism to make the sure the +* clock stays on until the proper driver comes along +*/ + .flags = CLK_IS_CRITICAL, }, };
Signature · 1 line
2.17.1
Sasha Levin
maintainerPATCH 37/59 clk: meson: axg: mark fdiv2 and fdiv3 as critical
In reply to Sasha LevinFrom: Jerome Brunet <[email protected]>
[ Upstream commit d6ee1e7e9004d3d246cdfa14196989e0a9466c16 ]
Similar to gxbb and gxl platforms, axg SCPI Cortex-M co-processor uses the fdiv2 and fdiv3 to, among other things, provide the cpu clock.
Until clock hand-off mechanism makes its way to CCF and the generic SCPI claims platform specific clocks, these clocks must be marked as critical to make sure they are never disabled when needed by the co-processor.
--- drivers/clk/meson/axg.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
drivers/clk/meson/axg.c +13 -0
@@ -320,6 +320,7 @@ static struct clk_regmap axg_fclk_div2 = { .ops = &clk_regmap_gate_ops, .parent_names = (const char *[]){ "fclk_div2_div" }, .num_parents = 1, + .flags = CLK_IS_CRITICAL, }, };
@@ -344,6 +345,18 @@ static struct clk_regmap axg_fclk_div3 = { .ops = &clk_regmap_gate_ops, .parent_names = (const char *[]){ "fclk_div3_div" }, .num_parents = 1, +/* +* FIXME: +* This clock, as fdiv2, is used by the SCPI FW and is required +* by the platform to operate correctly. +* Until the following condition are met, we need this clock to +* be marked as critical: +* a) The SCPI generic driver claims and enable all the clocks +* it needs +* b) CCF has a clock hand-off mechanism to make the sure the +* clock stays on until the proper driver comes along +*/ + .flags = CLK_IS_CRITICAL, }, };
Signature · 1 line
2.17.1
Sasha Levin
maintainerPATCH 38/59 nvme: make sure ns head inherits underlying device limits
In reply to Sasha LevinFrom: Sagi Grimberg <[email protected]>
[ Upstream commit 8f676b8508c250bbe255096522fdefb73f1ea0b9 ]
Whenever we update ns_head info, we need to make sure it is still compatible with all underlying backing devices because although nvme multipath doesn't have any explicit use of these limits, other devices can still be stacked on top of it which may rely on the underlying limits. Start with unlimited stacking limits, and every info update iterate over siblings and adjust queue limits.
--- drivers/nvme/host/core.c | 4 +++- drivers/nvme/host/multipath.c | 1 + 2 files changed, 4 insertions(+), 1 deletion(-)
drivers/nvme/host/core.c +3 -1
@@ -1501,8 +1501,10 @@ static void __nvme_revalidate_disk(struct gendisk *disk, struct nvme_id_ns *id)if (ns->ndev)nvme_nvm_update_nvm_info (ns);#ifdef CONFIG_NVME_MULTIPATH -if (ns->head->disk) +if (ns->head->disk) {nvme_update_disk_info (ns->head->disk, ns, id); +blk_queue_stack_limits (ns->head->disk->queue, ns->queue); + }#endif }
drivers/nvme/host/multipath.c +1 -0
@@ -197,6 +197,7 @@ int nvme_mpath_alloc_disk(struct nvme_ctrl *ctrl, struct nvme_ns_head *head)blk_queue_flag_set (QUEUE_FLAG_NONROT , q);/* set to a default value for 512 until disk is validated */ blk_queue_logical_block_size (q,512 ); +blk_set_stacking_limits (&q->limits);/* we need to propagate up the VMC settings */ if (ctrl->vwc &NVME_CTRL_VWC_PRESENT )
Signature · 1 line
2.17.1
Sasha Levin
maintainerPATCH 39/59 i2c: omap: Enable for ARCH_K3
In reply to Sasha LevinFrom: Vignesh R <[email protected]>
[ Upstream commit 5b277402deac0691226a947df71c581686bd4020 ]
Allow I2C_OMAP to be built for K3 platforms.
--- drivers/i2c/busses/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/i2c/busses/Kconfig +1 -1
@@ -754,7 +754,7 @@ config I2C_OCORES config I2C_OMAP tristate "OMAP I2C adapter" - depends on ARCH_OMAP + depends on ARCH_OMAP || ARCH_K3 default y if MACH_OMAP_H3 || MACH_OMAP_OSK help If you say yes to this option, support will be included for the
Signature · 1 line
2.17.1
Vignesh R
maintainerRe: [PATCH AUTOSEL 4.18 39/59] i2c: omap: Enable for ARCH_K3
Hi,
Quoted 3 lines · Sasha Levin
From: Vignesh R <[email protected]>
[ Upstream commit
5b277402deac0691226a947df71c581686bd4020]
This patch depends on c77245722fb4 ("arm64: Add support for TI's K3 Multicore SoC architecture") which adds ARCH_K3 Kconfig symbol and merged to mainline in v4.19. Since I don't see c77245722fb4 in stable tree, please drop this commit from stable queues prior to v4.19 (4.18, 4.14, 4.9, 4.4 and 3.18).
Quoted 25 lines
Allow
I2C_OMAPto be built for K3 platforms.Signed-off-by Vignesh R <[email protected]>Reviewed-by Grygorii Strashko <[email protected]>Signed-off-by Wolfram Sang <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- drivers/i2c/busses/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/i2c/busses/Kconfig +1
-1@@ -754,7 +754,7 @@ config I2C_OCORES config I2C_OMAP tristate "OMAP I2C adapter" - depends on ARCH_OMAP + depends on ARCH_OMAP || ARCH_K3 default y if MACH_OMAP_H3 || MACH_OMAP_OSK help If you say yes to this option, support will be included for the
Signature · 2 lines
Regards Vignesh
Sasha Levin
maintainerRe: [PATCH AUTOSEL 4.18 39/59] i2c: omap: Enable for ARCH_K3
Quoted 5 lines · Vignesh R
Hi,
Quoted 2 lines · Sasha Levin
From: Vignesh R <[email protected]>
Quoted 7 lines
Quoted 1 line
[ Upstream commit
5b277402deac0691226a947df71c581686bd4020]This patch depends on
c77245722fb4("arm64: Add support for TI's K3 Multicore SoC architecture") which addsARCH_K3Kconfigsymbol and merged to mainline in v4.19. Since I don't seec77245722fb4in stable tree, please drop this commit from stable queues prior to v4.19 (4.18, 4.14, 4.9, 4.4 and 3.18).
Dropped, thank you!
Sasha Levin
maintainerPATCH 40/59 sched/core: Take the hotplug lock in sched_init_smp()
In reply to Sasha LevinFrom: Valentin Schneider <[email protected]>
[ Upstream commit 40fa3780bac2b654edf23f6b13f4e2dd550aea10 ]
When running on linux-next (8c60c36d0b8c ("Add linux-next specific files for 20181019")) + CONFIG_PROVE_LOCKING=y on a big.LITTLE system (e.g. Juno or HiKey960), we get the following report:
[ 0.748225] Call trace: [ 0.750685] lockdep_assert_cpus_held+0x30/0x40 [ 0.755236] static_key_enable_cpuslocked+0x20/0xc8 [ 0.760137] build_sched_domains+0x1034/0x1108 [ 0.764601] sched_init_domains+0x68/0x90 [ 0.768628] sched_init_smp+0x30/0x80 [ 0.772309] kernel_init_freeable+0x278/0x51c [ 0.776685] kernel_init+0x10/0x108 [ 0.780190] ret_from_fork+0x10/0x18
The static_key in question is 'sched_asym_cpucapacity' introduced by commit:
df054e8445a4 ("sched/topology: Add static_key for asymmetric CPU capacity optimizations")
In this particular case, we enable it because smp_prepare_cpus() will end up fetching the capacity-dmips-mhz entry from the devicetree, so we already have some asymmetry detected when entering sched_init_smp().
This didn't get detected in tip/sched/core because we were missing:
commit cb538267ea1e ("jump_label/lockdep: Assert we hold the hotplug lock for _cpuslocked() operations")
Calls to build_sched_domains() post sched_init_smp() will hold the hotplug lock, it just so happens that this very first call is a special case. As stated by a comment in sched_init_smp(), "There's no userspace yet to cause hotplug operations" so this is a harmless warning.
However, to both respect the semantics of underlying callees and make lockdep happy, take the hotplug lock in sched_init_smp(). This also satisfies the comment atop sched_init_domains() that says "Callers must hold the hotplug lock".
--- kernel/sched/core.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
kernel/sched/core.c +4 -1
@@ -5890,11 +5890,14 @@ void __init sched_init_smp(void)/* * There's no userspace yet to cause hotplug operations; hence all the * CPU masks are stable and all blatant races in the below code cannot -* happen. +* happen. The hotplug lock is nevertheless taken to satisfy lockdep, +* but there won't be any contention on it. */ +cpus_read_lock ();mutex_lock (&sched_domains_mutex);sched_init_domains (cpu_active_mask);mutex_unlock (&sched_domains_mutex); +cpus_read_unlock ();/* Move init over to a non-isolated CPU */ if (set_cpus_allowed_ptr (current,housekeeping_cpumask (HK_FLAG_DOMAIN )) <0 )
Signature · 1 line
2.17.1
Sasha Levin
maintainerPATCH 41/59 perf tools: Fix undefined symbol scnprintf in libperf-jvmti.so
In reply to Sasha LevinFrom: Gustavo Romero <[email protected]>
[ Upstream commit 6ac2226229d931153331a93d90655a3de05b9290 ]
Currently jvmti agent can not be used because function scnprintf is not present in the agent libperf-jvmti.so. As a result the JVM when using such agent to record JITed code profiling information will fail on looking up scnprintf:
java: symbol lookup error: lib/libperf-jvmti.so: undefined symbol: scnprintf
This commit fixes that by reverting to the use of snprintf, that can be looked up, instead of scnprintf, adding a proper check for the returned value in order to print a better error message when the jitdump file pathname is too long. Checking the returned value also helps to comply with some recent gcc versions, like gcc8, which will fail due to truncated writing checks related to the -Werror=format-truncation= flag.
LPU-Reference: [email protected]
--- tools/perf/jvmti/jvmti_agent.c | 49 ++++++++++++++++++++++++++-------- 1 file changed, 38 insertions(+), 11 deletions(-)
tools/perf/jvmti/jvmti_agent.c +38 -11
@@ -125,7 +125,7 @@ perf_get_timestamp(void) }static int -debug_cache_init (void ) +create_jit_cache_dir (void ) {char str[32 ];char *base, *p;
@@ -144,8 +144,13 @@ debug_cache_init(void)strftime (str,sizeof (str),JIT_LANG "-jit-%Y%m%d" , &tm); -snprintf (jit_path,PATH_MAX -1 ,"%s/.debug/" , base); - + ret =snprintf (jit_path,PATH_MAX ,"%s/.debug/" , base); +if (ret >=PATH_MAX ) { +warnx ("jvmti: cannot generate jit cache dir because %s/.debug/" +" is too long, please check the cwd, JITDUMPDIR, and" +" HOME variables" , base); +return -1 ; + } ret =mkdir (jit_path,0755 );if (ret ==-1 ) {if (errno !=EEXIST ) {
@@ -154,20 +159,32 @@ debug_cache_init(void) } } -snprintf (jit_path,PATH_MAX -1 ,"%s/.debug/jit" , base); + ret =snprintf (jit_path,PATH_MAX ,"%s/.debug/jit" , base); +if (ret >=PATH_MAX ) { +warnx ("jvmti: cannot generate jit cache dir because" +" %s/.debug/jit is too long, please check the cwd," +" JITDUMPDIR, and HOME variables" , base); +return -1 ; + } ret =mkdir (jit_path,0755 );if (ret ==-1 ) {if (errno !=EEXIST ) { -warn ("cannot create jit cache dir %s" , jit_path); +warn ("jvmti: cannot create jit cache dir %s" , jit_path);return -1 ; } } -snprintf (jit_path,PATH_MAX -1 ,"%s/.debug/jit/%s.XXXXXXXX" , base, str); - + ret =snprintf (jit_path,PATH_MAX ,"%s/.debug/jit/%s.XXXXXXXX" , base, str); +if (ret >=PATH_MAX ) { +warnx ("jvmti: cannot generate jit cache dir because" +" %s/.debug/jit/%s.XXXXXXXX is too long, please check" +" the cwd, JITDUMPDIR, and HOME variables" , + base, str); +return -1 ; + } p =mkdtemp (jit_path);if (p != jit_path) { -warn ("cannot create jit cache dir %s" , jit_path); +warn ("jvmti: cannot create jit cache dir %s" , jit_path);return -1 ; }
@@ -228,7 +245,7 @@ void *jvmti_open(void) {char dump_path[PATH_MAX ];struct jitheader header; -int fd; +int fd, ret;FILE *fp;init_arch_timestamp ();
@@ -245,12 +262,22 @@ void *jvmti_open(void)memset (&header,0 ,sizeof (header)); -debug_cache_init (); +/* +* jitdump file dir +*/ +if (create_jit_cache_dir () <0 ) +return NULL ;/* * jitdump file name */ -scnprintf (dump_path,PATH_MAX ,"%s/jit-%i.dump" , jit_path,getpid ()); + ret =snprintf (dump_path,PATH_MAX ,"%s/jit-%i.dump" , jit_path,getpid ()); +if (ret >=PATH_MAX ) { +warnx ("jvmti: cannot generate jitdump file full path because" +" %s/jit-%i.dump is too long, please check the cwd," +" JITDUMPDIR, and HOME variables" , jit_path,getpid ()); +return NULL ; + } fd =open (dump_path,O_CREAT |O_TRUNC |O_RDWR ,0666 );if (fd ==-1 )
Signature · 1 line
2.17.1
Sasha Levin
maintainerPATCH 42/59 perf tools: Do not zero sample_id_all for group members
In reply to Sasha LevinFrom: Jiri Olsa <[email protected]>
[ Upstream commit 8e88c29b351ed4e09dd63f825f1c8260b0cb0ab3 ]
Andi reported following malfunction:
# perf record -e '{ref-cycles,cycles}:S' -a sleep 1
# perf script
non matching sample_id_allThat's because we disable sample_id_all bit for non-sampling group members. We can't do that, because it needs to be the same over the whole event list. This patch keeps it untouched again.
--- tools/perf/tests/attr/test-record-group-sampling | 1 - tools/perf/util/evsel.c | 1 - 2 files changed, 2 deletions(-)
tools/perf/tests/attr/test-record-group-sampling +0 -1
@@ -37,4 +37,3 @@ sample_freq=0 sample_period=0 freq=0 write_backward=0 -sample_id_all=0
tools/perf/util/evsel.c +0 -1
@@ -941,7 +941,6 @@ void perf_evsel__config(struct perf_evsel *evsel, struct record_opts *opts, attr->sample_freq =0 ; attr->sample_period =0 ; attr->write_backward =0 ; - attr->sample_id_all =0 ; }if (opts->no_samples)
Signature · 1 line
2.17.1
Sasha Levin
maintainerPATCH 43/59 ice: Fix dead device link issue with flow control
In reply to Sasha LevinFrom: Akeem G Abodunrin <[email protected]>
[ Upstream commit 0f5d4c21a50716f8bd4e220544b82dca7408d113 ]
Setting Rx or Tx pause parameter currently results in link loss on the interface, requiring the platform/host to be cold power cycled. Fix it.
--- drivers/net/ethernet/intel/ice/ice_ethtool.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/ice/ice_ethtool.c +6 -1
@@ -786,10 +786,15 @@ ice_set_pauseparam(struct net_device *netdev, struct ethtool_pauseparam *pause) }if (!test_bit (__ICE_DOWN, pf->state)) { -/* Give it a little more time to try to come back */ +/* Give it a little more time to try to come back. If still +* down, restart autoneg link or reinitialize the interface. +*/ msleep (75 );if (!test_bit (__ICE_DOWN, pf->state))return ice_nway_reset (netdev); + +ice_down (vsi); +ice_up (vsi); }return err;
Signature · 1 line
2.17.1
Sasha Levin
maintainerPATCH 44/59 ice: Fix the bytecount sent to netdev_tx_sent_queue
In reply to Sasha LevinFrom: Brett Creeley <[email protected]>
[ Upstream commit d944b46992f8e99b6bdc721e44b02e5ca294fa2b ]
Currently if the driver does a TSO offload the bytecount sent to netdev_tx_sent_queue will be incorrect. This is because in ice_tso we overwrite the initial value that we set in ice_tx_map. This creates a mismatch between the Tx and Tx clean flow. In the Tx clean flow we calculate the bytecount (called total_bytes) as we clean the descriptors so the value used in the Tx clean path is correct. Fix this by using += in ice_tso instead of =. This fixes the mismatch in bytecount mentioned above.
--- drivers/net/ethernet/intel/ice/ice_txrx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/intel/ice/ice_txrx.c +1 -1
@@ -1519,7 +1519,7 @@ int ice_tso(struct ice_tx_buf *first, struct ice_tx_offload_params *off)/* update gso_segs and bytecount */ first->gso_segs =skb_shinfo (skb)->gso_segs; - first->bytecount = (first->gso_segs -1 ) * off->header_len; + first->bytecount += (first->gso_segs -1 ) * off->header_len; cd_tso_len = skb->len - off->header_len; cd_mss =skb_shinfo (skb)->gso_size;
Signature · 1 line
2.17.1
Sasha Levin
maintainerPATCH 45/59 i40e: restore NETIF_F_GSO_IPXIP[46] to netdev features
In reply to Sasha LevinFrom: Jacob Keller <[email protected]>
[ Upstream commit ba766b8b99c30ad3c55ed8cf224d1185ecff1476 ]
Since commit bacd75cfac8a ("i40e/i40evf: Add capability exchange for outer checksum", 2017-04-06) the i40e driver has not reported support for IP-in-IP offloads. This likely occurred due to a bad rebase, as the commit extracts hw_enc_features into its own variable. As part of this change, it dropped the NETIF_F_FSO_IPXIP flags from the netdev->hw_enc_features. This was unfortunately not caught during code review.
Fix this by adding back the missing feature flags.
For reference, NETIF_F_GSO_IPXIP4 was added in commit 7e13318daa4a ("net: define gso types for IPx over IPv4 and IPv6", 2016-05-20), replacing NETIF_F_GSO_IPIP and NETIF_F_GSO_SIT.
NETIF_F_GSO_IPXIP6 was added in commit bf2d1df39502 ("intel: Add support for IPv6 IP-in-IP offload", 2016-05-20).
--- drivers/net/ethernet/intel/i40e/i40e_main.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/intel/i40e/i40e_main.c +2 -0
@@ -11924,6 +11924,8 @@ static int i40e_config_netdev(struct i40e_vsi *vsi)NETIF_F_GSO_GRE |NETIF_F_GSO_GRE_CSUM |NETIF_F_GSO_PARTIAL | +NETIF_F_GSO_IPXIP4 | +NETIF_F_GSO_IPXIP6 |NETIF_F_GSO_UDP_TUNNEL |NETIF_F_GSO_UDP_TUNNEL_CSUM | NETIF_F_SCTP_CRC |
Signature · 1 line
2.17.1
Sasha Levin
maintainerPATCH 46/59 ibmvnic: fix accelerated VLAN handling
In reply to Sasha LevinFrom: Michał Mirosław <[email protected]>
[ Upstream commit e84b47941e15e6666afb8ee8b21d1c3fc1a013af ]
Don't request tag insertion when it isn't present in outgoing skb.
--- drivers/net/ethernet/ibm/ibmvnic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/ibm/ibmvnic.c +1 -1
@@ -1563,7 +1563,7 @@ static int ibmvnic_xmit(struct sk_buff *skb, struct net_device *netdev) tx_crq.v1.sge_len =cpu_to_be32 (skb->len); tx_crq.v1.ioba =cpu_to_be64 (data_dma_addr); -if (adapter->vlan_header_insertion) { +if (adapter->vlan_header_insertion &&skb_vlan_tag_present (skb)) { tx_crq.v1.flags2 |=IBMVNIC_TX_VLAN_INSERT ; tx_crq.v1.vlan_id =cpu_to_be16 (skb->vlan_tci); }
Signature · 1 line
2.17.1
Sasha Levin
maintainerPATCH 47/59 qed: Fix memory/entry leak in qed_init_sp_request()
In reply to Sasha LevinFrom: Denis Bolotin <[email protected]>
[ Upstream commit 39477551df940ddb1339203817de04f5caaacf7a ]
Free the allocated SPQ entry or return the acquired SPQ entry to the free list in error flows.
--- .../net/ethernet/qlogic/qed/qed_sp_commands.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
drivers/net/ethernet/qlogic/qed/qed_sp_commands.c +14 -2
@@ -80,7 +80,7 @@ int qed_sp_init_request(struct qed_hwfn *p_hwfn,case QED_SPQ_MODE_BLOCK :if (!p_data->p_comp_data) -return -EINVAL ; + goto err; p_ent->comp_cb.cookie = p_data->p_comp_data->cookie;break ;
@@ -95,7 +95,7 @@ int qed_sp_init_request(struct qed_hwfn *p_hwfn,default :DP_NOTICE (p_hwfn,"Unknown SPQE completion mode %d\n" , p_ent->comp_mode); -return -EINVAL ; + goto err; } DP_VERBOSE(p_hwfn, QED_MSG_SPQ,
@@ -109,6 +109,18 @@ int qed_sp_init_request(struct qed_hwfn *p_hwfn,memset (&p_ent->ramrod,0 ,sizeof (p_ent->ramrod));return 0 ; + +err: +/* qed_spq_get_entry() can either get an entry from the free_pool, +* or, if no entries are left, allocate a new entry and add it to +* the unlimited_pending list. +*/ +if (p_ent->queue == &p_hwfn->p_spq->unlimited_pending) +kfree (p_ent); +else +qed_spq_return_entry (p_hwfn, p_ent); + +return -EINVAL ; }static enum tunnel_clss qed_tunn_clss_to_fw_clss (u8 type)
Signature · 1 line
2.17.1
Sasha Levin
maintainerPATCH 48/59 qed: Fix blocking/unlimited SPQ entries leak
In reply to Sasha LevinFrom: Denis Bolotin <[email protected]>
[ Upstream commit 2632f22ebd08da249c2017962a199a0cfb2324bf ]
When there are no SPQ entries left in the free_pool, new entries are allocated and are added to the unlimited list. When an entry in the pool is available, the content is copied from the original entry, and the new entry is sent to the device. qed_spq_post() is not aware of that, so the additional entry is stored in the original entry as p_post_ent, which can later be returned to the pool.
--- drivers/net/ethernet/qlogic/qed/qed_sp.h | 3 ++ drivers/net/ethernet/qlogic/qed/qed_spq.c | 57 ++++++++++++----------- 2 files changed, 33 insertions(+), 27 deletions(-)
drivers/net/ethernet/qlogic/qed/qed_sp.h +3 -0
@@ -167,6 +167,9 @@ struct qed_spq_entry {enum spq_mode comp_mode;struct qed_spq_comp_cb comp_cb;struct qed_spq_comp_done comp_done;/* SPQ_MODE_EBLOCK */ + +/* Posted entry for unlimited list entry in EBLOCK mode */ +struct qed_spq_entry *post_ent; };struct qed_eq {
drivers/net/ethernet/qlogic/qed/qed_spq.c +30 -27
96 lines not on this page · raw message
Signature · 1 line
2.17.1
Sasha Levin
maintainerPATCH 49/59 qed: Fix SPQ entries not returned to pool in error flows
In reply to Sasha LevinFrom: Denis Bolotin <[email protected]>
[ Upstream commit fb5e7438e7a3c8966e04ccb0760170e9e06f3699 ]
qed_sp_destroy_request() API was added for SPQ users that need to free/return the entry they acquired in their error flows.
--- drivers/net/ethernet/qlogic/qed/qed_fcoe.c | 11 +++++++--- drivers/net/ethernet/qlogic/qed/qed_iscsi.c | 1 + drivers/net/ethernet/qlogic/qed/qed_l2.c | 12 ++++++---- drivers/net/ethernet/qlogic/qed/qed_rdma.c | 1 + drivers/net/ethernet/qlogic/qed/qed_roce.c | 1 + drivers/net/ethernet/qlogic/qed/qed_sp.h | 11 ++++++++++ .../net/ethernet/qlogic/qed/qed_sp_commands.c | 22 ++++++++++++------- drivers/net/ethernet/qlogic/qed/qed_sriov.c | 1 + 8 files changed, 45 insertions(+), 15 deletions(-)
drivers/net/ethernet/qlogic/qed/qed_fcoe.c +8 -3
@@ -147,7 +147,8 @@ qed_sp_fcoe_func_start(struct qed_hwfn *p_hwfn,"Cannot satisfy CQ amount. CQs requested %d, CQs available %d. Aborting function start\n" , fcoe_pf_params->num_cqs, p_hwfn->hw_info.feat_num[QED_FCOE_CQ]); -return -EINVAL ; + rc = -EINVAL ; + goto err; } p_data->mtu =cpu_to_le16 (fcoe_pf_params->mtu);
@@ -156,14 +157,14 @@ qed_sp_fcoe_func_start(struct qed_hwfn *p_hwfn, rc =qed_cxt_acquire_cid (p_hwfn,PROTOCOLID_FCOE , &dummy_cid);if (rc) -return rc; + goto err; cxt_info.iid = dummy_cid; rc =qed_cxt_get_cid_info (p_hwfn, &cxt_info);if (rc) {DP_NOTICE (p_hwfn,"Cannot find context info for dummy cid=%d\n" , dummy_cid); -return rc; + goto err; } p_cxt = cxt_info.p_cxt; SET_FIELD(p_cxt->tstorm_ag_context.flags3,
@@ -240,6 +241,10 @@ qed_sp_fcoe_func_start(struct qed_hwfn *p_hwfn, rc =qed_spq_post (p_hwfn, p_ent,NULL );return rc; + +err: +qed_sp_destroy_request (p_hwfn, p_ent); +return rc; } static int
drivers/net/ethernet/qlogic/qed/qed_iscsi.c +1 -0
@@ -200,6 +200,7 @@ qed_sp_iscsi_func_start(struct qed_hwfn *p_hwfn,"Cannot satisfy CQ amount. Queues requested %d, CQs available %d. Aborting function start\n" , p_params->num_queues, p_hwfn->hw_info.feat_num[QED_ISCSI_CQ]); +qed_sp_destroy_request (p_hwfn, p_ent);return -EINVAL ; }
drivers/net/ethernet/qlogic/qed/qed_l2.c +8 -4
@@ -740,8 +740,7 @@ int qed_sp_vport_update(struct qed_hwfn *p_hwfn, rc =qed_sp_vport_update_rss (p_hwfn, p_ramrod, p_rss_params);if (rc) { -/* Return spq entry which is taken in qed_sp_init_request()*/ -qed_spq_return_entry (p_hwfn, p_ent); +qed_sp_destroy_request (p_hwfn, p_ent);return rc; }
@@ -1355,6 +1354,7 @@ qed_filter_ucast_common(struct qed_hwfn *p_hwfn,DP_NOTICE (p_hwfn,"%d is not supported yet\n" , p_filter_cmd->opcode); +qed_sp_destroy_request (p_hwfn, *pp_ent);return -EINVAL ; }
@@ -2056,13 +2056,13 @@ qed_configure_rfs_ntuple_filter(struct qed_hwfn *p_hwfn, }else { rc =qed_fw_vport (p_hwfn, p_params->vport_id, &abs_vport_id);if (rc) -return rc; + goto err;if (p_params->qid !=QED_RFS_NTUPLE_QID_RSS ) { rc =qed_fw_l2_queue (p_hwfn, p_params->qid, &abs_rx_q_id);if (rc) -return rc; + goto err; p_ramrod->rx_qid_valid =1 ; p_ramrod->rx_qid =cpu_to_le16 (abs_rx_q_id);
@@ -2083,6 +2083,10 @@ qed_configure_rfs_ntuple_filter(struct qed_hwfn *p_hwfn, (u64)p_params->addr, p_params->length);return qed_spq_post (p_hwfn, p_ent,NULL ); + +err: +qed_sp_destroy_request (p_hwfn, p_ent); +return rc; } int qed_get_rxq_coalesce(struct qed_hwfn *p_hwfn,
drivers/net/ethernet/qlogic/qed/qed_rdma.c +1 -0
@@ -1514,6 +1514,7 @@ qed_rdma_register_tid(void *rdma_cxt,default : rc = -EINVAL ;DP_VERBOSE (p_hwfn,QED_MSG_RDMA ,"rc = %d\n" , rc); +qed_sp_destroy_request (p_hwfn, p_ent);return rc; } SET_FIELD(p_ramrod->flags1,
drivers/net/ethernet/qlogic/qed/qed_roce.c +1 -0
@@ -723,6 +723,7 @@ static int qed_roce_sp_destroy_qp_responder(struct qed_hwfn *p_hwfn,DP_NOTICE (p_hwfn,"qed destroy responder failed: cannot allocate memory (ramrod). rc = %d\n" , rc); +qed_sp_destroy_request (p_hwfn, p_ent);return rc; }
drivers/net/ethernet/qlogic/qed/qed_sp.h +11 -0
@@ -399,6 +399,17 @@ struct qed_sp_init_data {struct qed_spq_comp_cb *p_comp_data; }; +/** +* @brief Returns a SPQ entry to the pool / frees the entry if allocated. +* Should be called on in error flows after initializing the SPQ entry +* and before posting it. +* +* @param p_hwfn +* @param p_ent +*/ +void qed_sp_destroy_request (struct qed_hwfn *p_hwfn, +struct qed_spq_entry *p_ent); + int qed_sp_init_request(struct qed_hwfn *p_hwfn, struct qed_spq_entry **pp_ent, u8 cmd,
drivers/net/ethernet/qlogic/qed/qed_sp_commands.c +14 -8
@@ -47,6 +47,19 @@#include "qed_sp.h" #include "qed_sriov.h" +void qed_sp_destroy_request (struct qed_hwfn *p_hwfn, +struct qed_spq_entry *p_ent) +{ +/* qed_spq_get_entry() can either get an entry from the free_pool, +* or, if no entries are left, allocate a new entry and add it to +* the unlimited_pending list. +*/ +if (p_ent->queue == &p_hwfn->p_spq->unlimited_pending) +kfree (p_ent); +else +qed_spq_return_entry (p_hwfn, p_ent); +} +int qed_sp_init_request (struct qed_hwfn *p_hwfn,struct qed_spq_entry **pp_ent,u8 cmd,u8 protocol,struct qed_sp_init_data *p_data)
@@ -111,14 +124,7 @@ int qed_sp_init_request(struct qed_hwfn *p_hwfn,return 0 ; err: -/* qed_spq_get_entry() can either get an entry from the free_pool, -* or, if no entries are left, allocate a new entry and add it to -* the unlimited_pending list. -*/ -if (p_ent->queue == &p_hwfn->p_spq->unlimited_pending) -kfree (p_ent); -else -qed_spq_return_entry (p_hwfn, p_ent); +qed_sp_destroy_request (p_hwfn, p_ent);return -EINVAL ; }
drivers/net/ethernet/qlogic/qed/qed_sriov.c +1 -0
@@ -101,6 +101,7 @@ static int qed_sp_vf_start(struct qed_hwfn *p_hwfn, struct qed_vf_info *p_vf)default :DP_NOTICE (p_hwfn,"Unknown VF personality %d\n" , p_hwfn->hw_info.personality); +qed_sp_destroy_request (p_hwfn, p_ent);return -EINVAL ; }
Signature · 1 line
2.17.1
Sasha Levin
maintainerPATCH 50/59 qed: Fix potential memory corruption
In reply to Sasha LevinFrom: Sagiv Ozeri <[email protected]>
[ Upstream commit fa5c448d98f0df660bfcad3dd5facc027ef84cd3 ]
A stuck ramrod should be deleted from the completion_pending list, otherwise it will be added again in the future and corrupt the list.
Return error value to inform that ramrod is stuck and should be deleted.
--- drivers/net/ethernet/qlogic/qed/qed_spq.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
drivers/net/ethernet/qlogic/qed/qed_spq.c +5 -7
@@ -142,6 +142,7 @@ static int qed_spq_block(struct qed_hwfn *p_hwfn,DP_INFO (p_hwfn,"Ramrod is stuck, requesting MCP drain\n" ); rc =qed_mcp_drain (p_hwfn, p_ptt); +qed_ptt_release (p_hwfn, p_ptt);if (rc) {DP_NOTICE (p_hwfn,"MCP drain failed\n" ); goto err;
@@ -150,18 +151,15 @@ static int qed_spq_block(struct qed_hwfn *p_hwfn,/* Retry after drain */ rc =__qed_spq_block (p_hwfn, p_ent, p_fw_ret, true);if (!rc) - goto out; +return 0 ; comp_done = (struct qed_spq_comp_done *)p_ent->comp_cb.cookie; -if (comp_done->done ==1 ) +if (comp_done->done ==1 ) {if (p_fw_ret) *p_fw_ret = comp_done->fw_return_code; -out: -qed_ptt_release (p_hwfn, p_ptt); -return 0 ; - +return 0 ; + } err: -qed_ptt_release (p_hwfn, p_ptt); DP_NOTICE(p_hwfn, "Ramrod is stuck [CID %08x cmd %02x protocol %02x echo %04x]\n", le32_to_cpu(p_ent->elem.hdr.cid),
Signature · 1 line
2.17.1
Sasha Levin
maintainerPATCH 51/59 net: stmmac: Fix RX packet size > 8191
In reply to Sasha LevinFrom: Thor Thayer <[email protected]>
[ Upstream commit 8137b6ef0ce469154e5cf19f8e7fe04d9a72ac5e ]
Ping problems with packets > 8191 as shown:
PING 192.168.1.99 (192.168.1.99) 8150(8178) bytes of data. 8158 bytes from 192.168.1.99: icmp_seq=1 ttl=64 time=0.669 ms wrong data byte 8144 should be 0xd0 but was 0x0
16 10 11 12 13 14 15 16 17 18 19 1a 1b 1c 1d 1e 1f
20 21 22 23 24 25 26 27 28 29 2a 2b 2c 2d 2e 2f
%< ---------------snip-------------------------------------- 8112 b0 b1 b2 b3 b4 b5 b6 b7 b8 b9 ba bb bc bd be bf
c0 c1 c2 c3 c4 c5 c6 c7 c8 c9 ca cb cc cd ce cf
8144 0 0 0 0 d0 d1
^^^^^^^
Notice the 4 bytes of 0 before the expected byte of d0.
Databook notes that the RX buffer must be a multiple of 4/8/16 bytes [1].
Update the DMA Buffer size define to 8188 instead of 8192. Remove the -1 from the RX buffer size allocations and use the new DMA Buffer size directly.
[1] Synopsys DesignWare Cores Ethernet MAC Universal v3.70a
[section 8.4.2 - Table 8-24]
Tested on SoCFPGA Stratix10 with ping sweep from 100 to 8300 byte packets.
--- drivers/net/ethernet/stmicro/stmmac/common.h | 3 ++- drivers/net/ethernet/stmicro/stmmac/descs_com.h | 2 +- drivers/net/ethernet/stmicro/stmmac/enh_desc.c | 2 +- drivers/net/ethernet/stmicro/stmmac/ring_mode.c | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-)
drivers/net/ethernet/stmicro/stmmac/common.h +2 -1
@@ -363,7 +363,8 @@ struct dma_features {/* GMAC TX FIFO is 8K, Rx FIFO is 16K */ #define BUF_SIZE_16KiB 16384 -#define BUF_SIZE_8KiB 8192 +/* RX Buffer size must be < 8191 and multiple of 4/8/16 bytes */ +#define BUF_SIZE_8KiB 8188#define BUF_SIZE_4KiB 4096#define BUF_SIZE_2KiB 2048
drivers/net/ethernet/stmicro/stmmac/descs_com.h +1 -1
@@ -31,7 +31,7 @@/* Enhanced descriptors */ static inline void ehn_desc_rx_set_on_ring (struct dma_desc *p,int end) { - p->des1 |=cpu_to_le32 (((BUF_SIZE_8KiB -1 ) + p->des1 |=cpu_to_le32 ((BUF_SIZE_8KiB <<ERDES1_BUFFER2_SIZE_SHIFT ) &ERDES1_BUFFER2_SIZE_MASK );
drivers/net/ethernet/stmicro/stmmac/enh_desc.c +1 -1
@@ -262,7 +262,7 @@ static void enh_desc_init_rx_desc(struct dma_desc *p, int disable_rx_ic, int mode, int end) { p->des0 |=cpu_to_le32 (RDES0_OWN ); - p->des1 |=cpu_to_le32 ((BUF_SIZE_8KiB -1 ) &ERDES1_BUFFER1_SIZE_MASK ); + p->des1 |=cpu_to_le32 (BUF_SIZE_8KiB &ERDES1_BUFFER1_SIZE_MASK );if (mode ==STMMAC_CHAIN_MODE )ehn_desc_rx_set_on_chain (p);
drivers/net/ethernet/stmicro/stmmac/ring_mode.c +1 -1
@@ -140,7 +140,7 @@ static void clean_desc3(void *priv_ptr, struct dma_desc *p)static int set_16kib_bfsize (int mtu) {int ret =0 ; -if (unlikely (mtu >= BUF_SIZE_8KiB)) +if (unlikely (mtu > BUF_SIZE_8KiB)) ret = BUF_SIZE_16KiB;return ret; }
Signature · 1 line
2.17.1
Sasha Levin
maintainerPATCH 52/59 net: smsc95xx: Fix MTU range
In reply to Sasha LevinFrom: Stefan Wahren <[email protected]>
[ Upstream commit 85b18b0237ce9986a81a1b9534b5e2ee116f5504 ]
The commit f77f0aee4da4 ("net: use core MTU range checking in USB NIC drivers") introduce a common MTU handling for usbnet. But it's missing the necessary changes for smsc95xx. So set the MTU range accordingly.
This patch has been tested on a Raspberry Pi 3.
--- drivers/net/usb/smsc95xx.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/usb/smsc95xx.c +2 -0
@@ -1321,6 +1321,8 @@ static int smsc95xx_bind(struct usbnet *dev, struct usb_interface *intf) dev->net->ethtool_ops = &smsc95xx_ethtool_ops; dev->net->flags |=IFF_MULTICAST ; dev->net->hard_header_len +=SMSC95XX_TX_OVERHEAD_CSUM ; + dev->net->min_mtu =ETH_MIN_MTU ; + dev->net->max_mtu =ETH_DATA_LEN ; dev->hard_mtu = dev->net->mtu + dev->net->hard_header_len; pdata->dev = dev;
Sasha Levin
maintainerPATCH 53/59 ext4: missing !bh check in ext4_xattr_inode_write()
In reply to Sasha LevinFrom: Vasily Averin <[email protected]>
[ Upstream commit eb6984fa4ce2837dcb1f66720a600f31b0bb3739 ]
According to Ted Ts'o ext4_getblk() called in ext4_xattr_inode_write() should not return bh = NULL
The only time that bh could be NULL, then, would be in the case of something really going wrong; a programming error elsewhere (perhaps a wild pointer dereference) or I/O error causing on-disk file system corruption (although that would be highly unlikely given that we had *just* allocated the blocks and so the metadata blocks in question probably would still be in the cache).
--- fs/ext4/xattr.c | 6 ++++++ 1 file changed, 6 insertions(+)
fs/ext4/xattr.c +6 -0
@@ -1388,6 +1388,12 @@ static int ext4_xattr_inode_write(handle_t *handle, struct inode *ea_inode, bh =ext4_getblk (handle, ea_inode, block,0 );if (IS_ERR (bh))return PTR_ERR (bh); +if (!bh) { +WARN_ON_ONCE (1 ); +EXT4_ERROR_INODE (ea_inode, +"ext4_getblk() return bh = NULL" ); +return -EFSCORRUPTED ; + } ret =ext4_journal_get_write_access (handle, bh);if (ret) goto out;
Signature · 1 line
2.17.1
Sasha Levin
maintainerPATCH 54/59 net: aquantia: fix potential IOMMU fault after driver unbind
In reply to Sasha LevinFrom: Dmitry Bogdanov <[email protected]>
[ Upstream commit 7a1bb49461b12b2e6332a4d054256835f45203f3 ]
IOMMU fault may occurr on unbind/bind or if_down/if_up sequence.
Although driver disables the rings on down, this is not enough. Due to internal HW design, during subsequent initialization NIC sometimes may reuse RX descriptors cache and write to the host memory from the descriptor cache.
That's get catched by IOMMU on host.
This patch invalidates the descriptor cache in NIC on interface down to prevent writing to the cached descriptors and to the memory pointed in those descriptors.
--- .../aquantia/atlantic/hw_atl/hw_atl_b0.c | 6 ++++++ .../aquantia/atlantic/hw_atl/hw_atl_llh.c | 8 ++++++++ .../aquantia/atlantic/hw_atl/hw_atl_llh.h | 3 +++ .../atlantic/hw_atl/hw_atl_llh_internal.h | 18 ++++++++++++++++++ 4 files changed, 35 insertions(+)
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c +6 -0
@@ -913,6 +913,12 @@ static int hw_atl_b0_hw_interrupt_moderation_set(struct aq_hw_s *self)static int hw_atl_b0_hw_stop (struct aq_hw_s *self) {hw_atl_b0_hw_irq_disable (self,HW_ATL_B0_INT_MASK ); + +/* Invalidate Descriptor Cache to prevent writing to the cached +* descriptors and to the data pointer of those descriptors +*/ +hw_atl_rdm_rx_dma_desc_cache_init_set (self,1 ); +return aq_hw_err_from_flags (self); }
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c +8 -0
@@ -619,6 +619,14 @@ void hw_atl_rpb_rx_flow_ctl_mode_set(struct aq_hw_s *aq_hw, u32 rx_flow_ctl_mode HW_ATL_RPB_RX_FC_MODE_SHIFT, rx_flow_ctl_mode); } +void hw_atl_rdm_rx_dma_desc_cache_init_set (struct aq_hw_s *aq_hw,u32 init) +{ +aq_hw_write_reg_bit (aq_hw,HW_ATL_RDM_RX_DMA_DESC_CACHE_INIT_ADR , +HW_ATL_RDM_RX_DMA_DESC_CACHE_INIT_MSK , +HW_ATL_RDM_RX_DMA_DESC_CACHE_INIT_SHIFT , + init); +} +void hw_atl_rpb_rx_pkt_buff_size_per_tc_set (struct aq_hw_s *aq_hw,u32 rx_pkt_buff_size_per_tc,u32 buffer) {
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h +3 -0
@@ -325,6 +325,9 @@ void hw_atl_rpb_rx_pkt_buff_size_per_tc_set(struct aq_hw_s *aq_hw,u32 rx_pkt_buff_size_per_tc, u32 buffer); +/* set rdm rx dma descriptor cache init */ +void hw_atl_rdm_rx_dma_desc_cache_init_set (struct aq_hw_s *aq_hw,u32 init); +/* set rx xoff enable (per tc) */ void hw_atl_rpb_rx_xoff_en_per_tc_set (struct aq_hw_s *aq_hw,u32 rx_xoff_en_per_tc,u32 buffer);
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh_internal.h +18 -0
@@ -293,6 +293,24 @@/* default value of bitfield desc{d}_reset */ #define HW_ATL_RDM_DESCDRESET_DEFAULT 0x0 +/* rdm_desc_init_i bitfield definitions +* preprocessor definitions for the bitfield rdm_desc_init_i. +* port="pif_rdm_desc_init_i" +*/ + +/* register address for bitfield rdm_desc_init_i */ +#define HW_ATL_RDM_RX_DMA_DESC_CACHE_INIT_ADR 0x00005a00 +/* bitmask for bitfield rdm_desc_init_i */ +#define HW_ATL_RDM_RX_DMA_DESC_CACHE_INIT_MSK 0xffffffff +/* inverted bitmask for bitfield rdm_desc_init_i */ +#define HW_ATL_RDM_RX_DMA_DESC_CACHE_INIT_MSKN 0x00000000 +/* lower bit position of bitfield rdm_desc_init_i */ +#define HW_ATL_RDM_RX_DMA_DESC_CACHE_INIT_SHIFT 0 +/* width of bitfield rdm_desc_init_i */ +#define HW_ATL_RDM_RX_DMA_DESC_CACHE_INIT_WIDTH 32 +/* default value of bitfield rdm_desc_init_i */ +#define HW_ATL_RDM_RX_DMA_DESC_CACHE_INIT_DEFAULT 0x0 +/* rx int_desc_wrb_en bitfield definitions * preprocessor definitions for the bitfield "int_desc_wrb_en". * port="pif_rdm_int_desc_wrb_en_i"
Signature · 1 line
2.17.1
Sasha Levin
maintainerPATCH 55/59 net: aquantia: fixed enable unicast on 32 macvlan
In reply to Sasha LevinFrom: Igor Russkikh <[email protected]>
[ Upstream commit bfaa9f8553d5c20703781e63f4fc8cb4792f18fd ]
Fixed a condition mistake due to which macvlans unicast item number 32 was not added in the unicast filter.
The consequence is that when exactly 32 macvlans are created on NIC, the last created macvlan receives no traffic because its MAC was not registered in HW.
--- drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/aquantia/atlantic/aq_nic.c +1 -1
@@ -590,7 +590,7 @@ int aq_nic_set_multicast_list(struct aq_nic_s *self, struct net_device *ndev) } } -if (i >0 && i <AQ_HW_MULTICAST_ADDRESS_MAX ) { +if (i >0 && i <=AQ_HW_MULTICAST_ADDRESS_MAX ) { packet_filter |=IFF_MULTICAST ; self->mc_list.count = i; self->aq_hw_ops->hw_multicast_list_set(self->aq_hw,
Signature · 1 line
2.17.1
Sasha Levin
maintainerPATCH 56/59 net: aquantia: invalid checksumm offload implementation
In reply to Sasha LevinFrom: Dmitry Bogdanov <[email protected]>
[ Upstream commit ad703c2b9127f9acdef697ec4755f6da4beaa266 ]
Packets with marked invalid IP/UDP/TCP checksums were considered as good by the driver. The error was in a logic, processing offload bits in RX descriptor.
--- .../net/ethernet/aquantia/atlantic/aq_ring.c | 35 +++++++++++------- .../aquantia/atlantic/hw_atl/hw_atl_b0.c | 36 +++++++++---------- 2 files changed, 41 insertions(+), 30 deletions(-)
drivers/net/ethernet/aquantia/atlantic/aq_ring.c +23 -12
@@ -172,6 +172,27 @@ bool aq_ring_tx_clean(struct aq_ring_s *self)return !!budget; } +static void aq_rx_checksum (struct aq_ring_s *self, +struct aq_ring_buff_s *buff, +struct sk_buff *skb) +{ +if (!(self->aq_nic->ndev->features &NETIF_F_RXCSUM )) +return ; + +if (unlikely (buff->is_cso_err)) { + ++self->stats.rx.errors; + skb->ip_summed =CHECKSUM_NONE ; +return ; + } +if (buff->is_ip_cso) { +__skb_incr_checksum_unnecessary (skb); +if (buff->is_udp_cso || buff->is_tcp_cso) +__skb_incr_checksum_unnecessary (skb); + }else { + skb->ip_summed =CHECKSUM_NONE ; + } +} +#define AQ_SKB_ALIGN SKB_DATA_ALIGN(sizeof(struct skb_shared_info)) int aq_ring_rx_clean(struct aq_ring_s *self, struct napi_struct *napi,
@@ -267,18 +288,8 @@ int aq_ring_rx_clean(struct aq_ring_s *self, } skb->protocol =eth_type_trans (skb, ndev); -if (unlikely (buff->is_cso_err)) { - ++self->stats.rx.errors; - skb->ip_summed =CHECKSUM_NONE ; - }else { -if (buff->is_ip_cso) { -__skb_incr_checksum_unnecessary (skb); -if (buff->is_udp_cso || buff->is_tcp_cso) -__skb_incr_checksum_unnecessary (skb); - }else { - skb->ip_summed =CHECKSUM_NONE ; - } - } + +aq_rx_checksum (self, buff, skb); skb_set_hash(skb, buff->rss_hash, buff->is_hash_l4 ? PKT_HASH_TYPE_L4 :
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c +18 -18
@@ -653,9 +653,9 @@ static int hw_atl_b0_hw_ring_rx_receive(struct aq_hw_s *self,struct hw_atl_rxd_wb_s *rxd_wb = (struct hw_atl_rxd_wb_s *) &ring->dx_ring[ring->hw_head *HW_ATL_B0_RXD_SIZE ]; -unsigned int is_err =1U ;unsigned int is_rx_check_sum_enabled =0U ;unsigned int pkt_type =0U ; +u8 rx_stat =0U ;if (!(rxd_wb->status &0x1U )) {/* RxD is not done */ break ;
@@ -663,35 +663,35 @@ static int hw_atl_b0_hw_ring_rx_receive(struct aq_hw_s *self, buff = &ring->buff_ring[ring->hw_head]; - is_err = (0x0000003CU & rxd_wb->status); + rx_stat = (0x0000003CU & rxd_wb->status) >>2 ; is_rx_check_sum_enabled = (rxd_wb->type) & (0x3U <<19 ); - is_err &= ~0x20U ;/* exclude validity bit */ pkt_type =0xFFU & (rxd_wb->type >>4 ); -if (is_rx_check_sum_enabled) { -if (0x0U == (pkt_type &0x3U )) - buff->is_ip_cso = (is_err &0x08U ) ?0U :1U ; +if (is_rx_check_sum_enabled &BIT (0 ) && + (0x0U == (pkt_type &0x3U ))) + buff->is_ip_cso = (rx_stat &BIT (1 )) ?0U :1U ; +if (is_rx_check_sum_enabled &BIT (1 )) {if (0x4U == (pkt_type &0x1CU )) - buff->is_udp_cso = buff->is_cso_err ?0U :1U ; + buff->is_udp_cso = (rx_stat &BIT (2 )) ?0U : + !!(rx_stat &BIT (3 ));else if (0x0U == (pkt_type &0x1CU )) - buff->is_tcp_cso = buff->is_cso_err ?0U :1U ; - -/* Checksum offload workaround for small packets */ -if (rxd_wb->pkt_len <=60 ) { - buff->is_ip_cso =0U ; - buff->is_cso_err =0U ; - } + buff->is_tcp_cso = (rx_stat &BIT (2 )) ?0U : + !!(rx_stat &BIT (3 )); + } + buff->is_cso_err = !!(rx_stat &0x6 ); +/* Checksum offload workaround for small packets */ +if (unlikely (rxd_wb->pkt_len <=60 )) { + buff->is_ip_cso =0U ; + buff->is_cso_err =0U ; } - - is_err &= ~0x18U ;dma_unmap_page (ndev, buff->pa, buff->len,DMA_FROM_DEVICE ); -if (is_err || rxd_wb->type &0x1000U ) { -/* status error or DMA error */ +if ((rx_stat &BIT (0 )) || rxd_wb->type &0x1000U ) { +/* MAC error or DMA error */ buff->is_error =1U ; }else {if (self->aq_nic_cfg->is_rss) {
Signature · 1 line
2.17.1
Sasha Levin
maintainerPATCH 57/59 net: qualcomm: rmnet: Fix incorrect assignment of real_dev
In reply to Sasha LevinFrom: Subash Abhinov Kasiviswanathan <[email protected]>
[ Upstream commit d02854dc1999ed3e7fd79ec700c64ac23ac0c458 ]
A null dereference was observed when a sysctl was being set from userspace and rmnet was stuck trying to complete some actions in the NETDEV_REGISTER callback. This is because the real_dev is set only after the device registration handler completes.
sysctl call stack -
<6> Unable to handle kernel NULL pointer dereference at
virtual address 00000108 <2> pc : rmnet_vnd_get_iflink+0x1c/0x28 <2> lr : dev_get_iflink+0x2c/0x40 <2> rmnet_vnd_get_iflink+0x1c/0x28 <2> inet6_fill_ifinfo+0x15c/0x234 <2> inet6_ifinfo_notify+0x68/0xd4 <2> ndisc_ifinfo_sysctl_change+0x1b8/0x234 <2> proc_sys_call_handler+0xac/0x100 <2> proc_sys_write+0x3c/0x4c <2> __vfs_write+0x54/0x14c <2> vfs_write+0xcc/0x188 <2> SyS_write+0x60/0xc0 <2> el0_svc_naked+0x34/0x38
device register call stack -
<2> notifier_call_chain+0x84/0xbc <2> raw_notifier_call_chain+0x38/0x48 <2> call_netdevice_notifiers_info+0x40/0x70 <2> call_netdevice_notifiers+0x38/0x60 <2> register_netdevice+0x29c/0x3d8 <2> rmnet_vnd_newlink+0x68/0xe8 <2> rmnet_newlink+0xa0/0x160 <2> rtnl_newlink+0x57c/0x6c8 <2> rtnetlink_rcv_msg+0x1dc/0x328 <2> netlink_rcv_skb+0xac/0x118 <2> rtnetlink_rcv+0x24/0x30 <2> netlink_unicast+0x158/0x1f0 <2> netlink_sendmsg+0x32c/0x338 <2> sock_sendmsg+0x44/0x60 <2> SyS_sendto+0x150/0x1ac <2> el0_svc_naked+0x34/0x38
--- drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c +3 -3
@@ -234,7 +234,7 @@ int rmnet_vnd_newlink(u8 id, struct net_device *rmnet_dev,struct net_device *real_dev, struct rmnet_endpoint *ep) { - struct rmnet_priv *priv; + struct rmnet_priv *priv = netdev_priv(rmnet_dev);int rc;if (ep->egress_dev)
@@ -247,6 +247,8 @@ int rmnet_vnd_newlink(u8 id, struct net_device *rmnet_dev, rmnet_dev->hw_features |=NETIF_F_IP_CSUM |NETIF_F_IPV6_CSUM ; rmnet_dev->hw_features |=NETIF_F_SG ; + priv->real_dev = real_dev; + rc =register_netdevice (rmnet_dev);if (!rc) { ep->egress_dev = rmnet_dev;
@@ -255,9 +257,7 @@ int rmnet_vnd_newlink(u8 id, struct net_device *rmnet_dev, rmnet_dev->rtnl_link_ops = &rmnet_link_ops; - priv =netdev_priv (rmnet_dev); priv->mux_id = id; - priv->real_dev = real_dev;netdev_dbg (rmnet_dev,"rmnet dev created\n" ); }
Signature · 1 line
2.17.1
Sasha Levin
maintainerPATCH 58/59 kbuild: deb-pkg: fix too low build version number
In reply to Sasha LevinFrom: Masahiro Yamada <[email protected]>
[ Upstream commit bbcde0a7241261cd0ca8d8e6b94a4113a4b71443 ]
Since commit b41d920acff8 ("kbuild: deb-pkg: split generating packaging and build"), the build version of the kernel contained in a deb package is too low by 1.
Prior to the bad commit, the kernel was built first, then the number in .version file was read out, and written into the debian control file.
Now, the debian control file is created before the kernel is actually compiled, which is causing the version number mismatch.
Let the mkdebian script pass KBUILD_BUILD_VERSION=${revision} to require the build system to use the specified version number.
--- scripts/package/mkdebian | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
scripts/package/mkdebian +5 -2
@@ -56,6 +56,7 @@ set_debarch() { version=$KERNELRELEASE if [ -n "$KDEB_PKGVERSION" ]; then packageversion=$KDEB_PKGVERSION + revision=${packageversion##*-} else revision=$(cat .version 2>/dev/null||echo 1) packageversion=$version-$revision
@@ -173,10 +174,12 @@ cat <<EOF > debian/rules #!$(command -v $MAKE) -f build: - \$(MAKE) KERNELRELEASE=${version} ARCH=${ARCH} KBUILD_SRC= + \$(MAKE) KERNELRELEASE=${version} ARCH=${ARCH} \ + KBUILD_BUILD_VERSION=${revision} KBUILD_SRC= binary-arch: - \$(MAKE) KERNELRELEASE=${version} ARCH=${ARCH} KBUILD_SRC= intdeb-pkg + \$(MAKE) KERNELRELEASE=${version} ARCH=${ARCH} \ + KBUILD_BUILD_VERSION=${revision} KBUILD_SRC= intdeb-pkg clean: rm -rf debian/*tmp debian/files
Signature · 1 line
2.17.1
Sasha Levin
maintainerPATCH 59/59 net: dsa: mv88e6xxx: Fix clearing of stats counters
In reply to Sasha LevinFrom: Andrew Lunn <[email protected]>
[ Upstream commit a9049ff9214da68df1179a7d5e36b43479abc9b8 ]
The mv88e6161 would sometime fail to probe with a timeout waiting for the switch to complete an operation. This operation is supposed to clear the statistics counters. However, due to a read/modify/write, without the needed mask, the operation actually carried out was more random, with invalid parameters, resulting in the switch not responding. We need to preserve the histogram mode bits, so apply a mask to keep them.
--- drivers/net/dsa/mv88e6xxx/global1.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/dsa/mv88e6xxx/global1.c +2 -0
@@ -567,6 +567,8 @@ int mv88e6xxx_g1_stats_clear(struct mv88e6xxx_chip *chip)if (err)return err; +/* Keep the histogram mode bits */ + val &=MV88E6XXX_G1_STATS_OP_HIST_RX_TX ; val |=MV88E6XXX_G1_STATS_OP_BUSY |MV88E6XXX_G1_STATS_OP_FLUSH_ALL ; err =mv88e6xxx_g1_write (chip,MV88E6XXX_G1_STATS_OP , val);
Signature · 1 line
2.17.1