August 2020 - Linux-stable-mirror

Re: Issue with iwd + Linux 5.8.3 + WPA Enterprise

by Paul Menzel

Dear Caleb, Thank you for the report. Linux has a no regression policy, so the correct forum to report this to is the Linux kernel folks. I am adding the crypto and stable folks to the receiver list. Am 26.08.20 um 07:51 schrieb caljorden(a)hotmail.com: > I wanted to note an issue that I have hit with iwd when I upgraded to > the Linux 5.8.3 stable kernel. My office network uses WPA Enterprise > with EAP-PEAPv0 + MSCHAPv2. When using this office network, > upgrading to Linux 5.8.3 caused my system to refuse to associate > successfully to the network. I get the following in my dmesg logs: > > [ 40.846535] wlan0: authenticate with <redacted>:60 > [ 40.850570] wlan0: send auth to <redacted>:60 (try 1/3) > [ 40.854627] wlan0: authenticated > [ 40.855992] wlan0: associate with <redacted>:60 (try 1/3) > [ 40.860450] wlan0: RX AssocResp from <redacted>:60 (capab=0x411 status=0 aid=11) > [ 40.861620] wlan0: associated > [ 41.886503] wlan0: deauthenticating from <redacted>:60 by local choice (Reason: 23=IEEE8021X_FAILED) > [ 42.360127] wlan0: authenticate with <redacted>:22 > [ 42.364584] wlan0: send auth to <redacted>:22 (try 1/3) > [ 42.370821] wlan0: authenticated > [ 42.372658] wlan0: associate with <redacted>:22 (try 1/3) > [ 42.377426] wlan0: RX AssocResp from <redacted>:22 (capab=0x411 status=0 aid=15) > [ 42.378607] wlan0: associated > [ 43.402009] wlan0: deauthenticating from <redacted>:22 by local choice (Reason: 23=IEEE8021X_FAILED) > [ 43.875921] wlan0: authenticate with <redacted>:60 > [ 43.879988] wlan0: send auth to <redacted>:60 (try 1/3) > [ 43.886244] wlan0: authenticated > [ 43.889273] wlan0: associate with <redacted>:60 (try 1/3) > [ 43.894586] wlan0: RX AssocResp from <redacted>:60 (capab=0x411 status=0 aid=11) > [ 43.896077] wlan0: associated > [ 44.918504] wlan0: deauthenticating from <redacted>:60 by local choice (Reason: 23=IEEE8021X_FAILED) > > This continues as long as I let iwd run. > > I downgraded back to Linux 5.8.2, and verified that everything works > as expected. I also tried using Linux 5.8.3 on a different system at > my home, which uses WPA2-PSK. It worked fine (though it uses an > Atheros wireless card instead of an Intel card - but I assume that is > irrelevant). > > I decided to try to figure out what caused the issue in the changes > for Linux 5.8.3. I assumed that it was something that changed in the > crypto interface, which limited my bisection to a very few commits. > Sure enough, I found that if I revert commit > e91d82703ad0bc68942a7d91c1c3d993e3ad87f0 (crypto: algif_aead - Only > wake up when ctx->more is zero), the problem goes away and I am able > to associate to my WPA Enterprise network successfully, and use it. > I found that in order to revert this commit, I also first had to > revert 465c03e999102bddac9b1e132266c232c5456440 (crypto: af_alg - Fix > regression on empty requests), because the two commits have coupled > changes. > > I normally would have assumed that this should be sent to the kernel > list, but I thought I would first mention it here because of what I > found in some email threads on the Linux-Crypto list about the crypto > interfaces to the kernel being sub-optimal and needing to be fixed. > The changes in these commits look like they are just trying to fix > what could be broken interfaces, so I thought that it would make > sense to see what the iwd team thinks about the situation first. > > The wireless card I was using during this testing is an Intel > Wireless 3165 (rev 81). If there is any additional information I > could help provide, please let me know. It’d be great, if you verified, if the problem occurs with Linus’ master branch too. Kind regards, Paul

4 years, 9 months

5
16
0 0

Linux 5.7.19

by Greg Kroah-Hartman

---------- Note, this is the LAST 5.7.y kernel to be released. This release series is now end-of-life, please move to 5.8.y at this point in time. ------------ I'm announcing the release of the 5.7.19 kernel. All users of the 5.7 kernel series must upgrade. The updated 5.7.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.7.y and can be browsed at the normal kernel.org git web browser: https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Makefile | 2 +- arch/powerpc/kernel/cpu_setup_power.S | 2 +- drivers/net/ethernet/amazon/ena/ena_netdev.c | 5 ++++- fs/binfmt_flat.c | 20 ++++++++++++-------- net/core/skbuff.c | 4 ++-- net/ethtool/features.c | 19 ++++++++++--------- net/ipv4/nexthop.c | 5 ++++- net/ipv6/ip6_tunnel.c | 10 +++++++++- net/qrtr/qrtr.c | 20 +++++++++++--------- net/sched/act_ct.c | 2 +- net/sctp/stream.c | 6 ++++-- net/smc/smc_diag.c | 16 +++++++++------- net/tipc/crypto.c | 2 ++ net/tipc/netlink_compat.c | 12 +++++++++++- 14 files changed, 81 insertions(+), 44 deletions(-) Alaa Hleihel (1): net/sched: act_ct: Fix skb double-free in tcf_ct_handle_fragments() error flow Cong Wang (1): tipc: fix uninit skb->data in tipc_nl_compat_dumpit() David Laight (1): net: sctp: Fix negotiation of the number of data streams. Greg Kroah-Hartman (1): Linux 5.7.19 Mark Tomlinson (1): gre6: Fix reception with IP6_TNL_F_RCV_DSCP_COPY Max Filippov (1): binfmt_flat: revert "binfmt_flat: don't offset the data start" Maxim Mikityanskiy (3): ethtool: Fix preserving of wanted feature bits in netlink interface ethtool: Account for hw_features in netlink interface ethtool: Don't omit the netlink reply if no features were changed Miaohe Lin (1): net: Fix potential wrong skb->protocol in skb_vlan_untag() Michael Ellerman (1): powerpc/64s: Don't init FSCR_DSCR in __init_FSCR() Necip Fazil Yildiran (1): net: qrtr: fix usage of idr in port assignment to socket Nikolay Aleksandrov (1): net: nexthop: don't allow empty NHA_GROUP Peilin Ye (1): net/smc: Prevent kernel-infoleak in __smc_diag_dump() Shay Agroskin (1): net: ena: Make missed_tx stat incremental Xin Long (1): tipc: call rcu_read_lock() in tipc_aead_encrypt_done()

4 years, 9 months

1
1
0 0

Linux 5.8.5

by Greg Kroah-Hartman

I'm announcing the release of the 5.8.5 kernel. All users of the 5.8 kernel series must upgrade. The updated 5.8.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.8.y and can be browsed at the normal kernel.org git web browser: https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Makefile | 2 +- drivers/net/ethernet/amazon/ena/ena_netdev.c | 5 ++++- fs/binfmt_flat.c | 20 ++++++++++++-------- fs/io_uring.c | 3 ++- net/core/skbuff.c | 4 ++-- net/ethtool/features.c | 19 ++++++++++--------- net/ipv4/nexthop.c | 5 ++++- net/ipv6/ip6_tunnel.c | 10 +++++++++- net/netlink/policy.c | 3 +++ net/qrtr/qrtr.c | 20 +++++++++++--------- net/sched/act_ct.c | 2 +- net/sctp/stream.c | 6 ++++-- net/smc/smc_diag.c | 16 +++++++++------- net/tipc/crypto.c | 2 ++ net/tipc/netlink_compat.c | 12 +++++++++++- 15 files changed, 85 insertions(+), 44 deletions(-) Alaa Hleihel (1): net/sched: act_ct: Fix skb double-free in tcf_ct_handle_fragments() error flow Cong Wang (1): tipc: fix uninit skb->data in tipc_nl_compat_dumpit() David Laight (1): net: sctp: Fix negotiation of the number of data streams. Greg Kroah-Hartman (1): Linux 5.8.5 Johannes Berg (1): netlink: fix state reallocation in policy export Mark Tomlinson (1): gre6: Fix reception with IP6_TNL_F_RCV_DSCP_COPY Max Filippov (1): binfmt_flat: revert "binfmt_flat: don't offset the data start" Maxim Mikityanskiy (3): ethtool: Fix preserving of wanted feature bits in netlink interface ethtool: Account for hw_features in netlink interface ethtool: Don't omit the netlink reply if no features were changed Miaohe Lin (1): net: Fix potential wrong skb->protocol in skb_vlan_untag() Necip Fazil Yildiran (1): net: qrtr: fix usage of idr in port assignment to socket Nikolay Aleksandrov (1): net: nexthop: don't allow empty NHA_GROUP Pavel Begunkov (1): io_uring: fix missing ->mm on exit Peilin Ye (1): net/smc: Prevent kernel-infoleak in __smc_diag_dump() Shay Agroskin (1): net: ena: Make missed_tx stat incremental Xin Long (1): tipc: call rcu_read_lock() in tipc_aead_encrypt_done()

4 years, 9 months

1
1
0 0

[PATCH v3] x86/hotplug: Silence APIC only after all irq's are migrated

by Ashok Raj

There is a race when taking a CPU offline. Current code looks like this: native_cpu_disable() { ... apic_soft_disable(); /* * Any existing set bits for pending interrupt to * this CPU are preserved and will be sent via IPI * to another CPU by fixup_irqs(). */ cpu_disable_common(); { .... /* * Race window happens here. Once local APIC has been * disabled any new interrupts from the device to * the old CPU are lost */ fixup_irqs(); // Too late to capture anything in IRR. ... } } The fix is to disable the APIC *after* cpu_disable_common(). Testing was done with a USB NIC that provided a source of frequent interrupts. A script migrated interrupts to a specific CPU and then took that CPU offline. Fixes: 60dcaad5736f ("x86/hotplug: Silence APIC and NMI when CPU is dead") Link: https://lore.kernel.org/lkml/875zdarr4h.fsf@nanos.tec.linutronix.de/ Reported-by: Evan Green <evgreen(a)chromium.org> Tested-by: Mathias Nyman <mathias.nyman(a)linux.intel.com> Tested-by: Evan Green <evgreen(a)chromium.org> Reviewed-by: Evan Green <evgreen(a)chromium.org> Signed-off-by: Ashok Raj <ashok.raj(a)intel.com> --- v3: Fix commit message and comments per Thomas. https://lore.kernel.org/lkml/87mu2iw86q.fsf@nanos.tec.linutronix.de/ v2: - Typos and fixes suggested by Randy Dunlap To: linux-kernel(a)vger.kernel.org To: Thomas Gleixner <tglx(a)linutronix.de> Cc: Sukumar Ghorai <sukumar.ghorai(a)intel.com> Cc: Srikanth Nandamuri <srikanth.nandamuri(a)intel.com> Cc: Evan Green <evgreen(a)chromium.org> Cc: Mathias Nyman <mathias.nyman(a)linux.intel.com> Cc: Bjorn Helgaas <bhelgaas(a)google.com> Cc: x86(a)kernel.org Cc: stable(a)vger.kernel.org --- arch/x86/kernel/smpboot.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 27aa04a95702..f5ef689dd62a 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -1594,14 +1594,28 @@ int native_cpu_disable(void) if (ret) return ret; - /* - * Disable the local APIC. Otherwise IPI broadcasts will reach - * it. It still responds normally to INIT, NMI, SMI, and SIPI - * messages. - */ - apic_soft_disable(); cpu_disable_common(); + /* + * Disable the local APIC. Otherwise IPI broadcasts will reach + * it. It still responds normally to INIT, NMI, SMI, and SIPI + * messages. + * + * Disabling the APIC must happen after cpu_disable_common() + * which invokes fixup_irqs(). + * + * Disabling the APIC preserves already set bits in IRR, but + * an interrupt arriving after disabling the local APIC does not + * set the corresponding IRR bit. + * + * fixup_irqs() scans IRR for set bits so it can raise a not + * yet handled interrupt on the new destination CPU via an IPI + * but obviously it can't do so for IRR bits which are not set. + * IOW, interrupts arriving after disabling the local APIC will + * be lost. + */ + apic_soft_disable(); + return 0; } -- 2.7.4

4 years, 9 months

2
1
0 0

patch "USB: Ignore UAS for JMicron JMS567 ATA/ATAPI Bridge" added to usb-linus

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled USB: Ignore UAS for JMicron JMS567 ATA/ATAPI Bridge to my usb git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git in the usb-linus branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will hopefully also be merged in Linus's tree for the next -rc kernel release. If you have any questions about this process, please let me know. >From 9aa37788e7ebb3f489fb4b71ce07adadd444264a Mon Sep 17 00:00:00 2001 From: Cyril Roelandt <tipecaml(a)gmail.com> Date: Tue, 25 Aug 2020 23:22:31 +0200 Subject: USB: Ignore UAS for JMicron JMS567 ATA/ATAPI Bridge This device does not support UAS properly and a similar entry already exists in drivers/usb/storage/unusual_uas.h. Without this patch, storage_probe() defers the handling of this device to UAS, which cannot handle it either. Tested-by: Brice Goglin <brice.goglin(a)gmail.com> Fixes: bc3bdb12bbb3 ("usb-storage: Disable UAS on JMicron SATA enclosure") Acked-by: Alan Stern <stern(a)rowland.harvard.edu> CC: <stable(a)vger.kernel.org> Signed-off-by: Cyril Roelandt <tipecaml(a)gmail.com> Link: https://lore.kernel.org/r/20200825212231.46309-1-tipecaml@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/usb/storage/unusual_devs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h index 220ae2c356ee..5732e9691f08 100644 --- a/drivers/usb/storage/unusual_devs.h +++ b/drivers/usb/storage/unusual_devs.h @@ -2328,7 +2328,7 @@ UNUSUAL_DEV( 0x357d, 0x7788, 0x0114, 0x0114, "JMicron", "USB to ATA/ATAPI Bridge", USB_SC_DEVICE, USB_PR_DEVICE, NULL, - US_FL_BROKEN_FUA ), + US_FL_BROKEN_FUA | US_FL_IGNORE_UAS ), /* Reported by Andrey Rahmatullin <wrar(a)altlinux.org> */ UNUSUAL_DEV( 0x4102, 0x1020, 0x0100, 0x0100, -- 2.28.0

4 years, 9 months

1
0
0 0

patch "usb: host: ohci-exynos: Fix error handling in exynos_ohci_probe()" added to usb-linus

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled usb: host: ohci-exynos: Fix error handling in exynos_ohci_probe() to my usb git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git in the usb-linus branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will hopefully also be merged in Linus's tree for the next -rc kernel release. If you have any questions about this process, please let me know. >From 1d4169834628d18b2392a2da92b7fbf5e8e2ce89 Mon Sep 17 00:00:00 2001 From: Tang Bin <tangbin(a)cmss.chinamobile.com> Date: Wed, 26 Aug 2020 22:49:31 +0800 Subject: usb: host: ohci-exynos: Fix error handling in exynos_ohci_probe() If the function platform_get_irq() failed, the negative value returned will not be detected here. So fix error handling in exynos_ohci_probe(). And when get irq failed, the function platform_get_irq() logs an error message, so remove redundant message here. Fixes: 62194244cf87 ("USB: Add Samsung Exynos OHCI diver") Signed-off-by: Zhang Shengju <zhangshengju(a)cmss.chinamobile.com> Cc: stable <stable(a)vger.kernel.org> Signed-off-by: Tang Bin <tangbin(a)cmss.chinamobile.com> Reviewed-by: Krzysztof Kozlowski <krzk(a)kernel.org> Link: https://lore.kernel.org/r/20200826144931.1828-1-tangbin@cmss.chinamobile.com Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/usb/host/ohci-exynos.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/usb/host/ohci-exynos.c b/drivers/usb/host/ohci-exynos.c index bd40e597f256..5f5e8a64c8e2 100644 --- a/drivers/usb/host/ohci-exynos.c +++ b/drivers/usb/host/ohci-exynos.c @@ -171,9 +171,8 @@ static int exynos_ohci_probe(struct platform_device *pdev) hcd->rsrc_len = resource_size(res); irq = platform_get_irq(pdev, 0); - if (!irq) { - dev_err(&pdev->dev, "Failed to get IRQ\n"); - err = -ENODEV; + if (irq < 0) { + err = irq; goto fail_io; } -- 2.28.0

4 years, 9 months

1
0
0 0

patch "USB: quirks: Ignore duplicate endpoint on Sound Devices MixPre-D" added to usb-linus

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled USB: quirks: Ignore duplicate endpoint on Sound Devices MixPre-D to my usb git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git in the usb-linus branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will hopefully also be merged in Linus's tree for the next -rc kernel release. If you have any questions about this process, please let me know. >From 068834a2773b6a12805105cfadbb3d4229fc6e0a Mon Sep 17 00:00:00 2001 From: Alan Stern <stern(a)rowland.harvard.edu> Date: Wed, 26 Aug 2020 15:46:24 -0400 Subject: USB: quirks: Ignore duplicate endpoint on Sound Devices MixPre-D The Sound Devices MixPre-D audio card suffers from the same defect as the Sound Devices USBPre2: an endpoint shared between a normal audio interface and a vendor-specific interface, in violation of the USB spec. Since the USB core now treats duplicated endpoints as bugs and ignores them, the audio endpoint isn't available and the card can't be used for audio capture. Along the same lines as commit bdd1b147b802 ("USB: quirks: blacklist duplicate ep on Sound Devices USBPre2"), this patch adds a quirks entry saying to ignore ep5in for interface 1, leaving it available for use with standard audio interface 2. Reported-and-tested-by: Jean-Christophe Barnoud <jcbarnoud(a)gmail.com> Signed-off-by: Alan Stern <stern(a)rowland.harvard.edu> CC: <stable(a)vger.kernel.org> Fixes: 3e4f8e21c4f2 ("USB: core: fix check for duplicate endpoints") Link: https://lore.kernel.org/r/20200826194624.GA412633@rowland.harvard.edu Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/usb/core/quirks.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c index d1f38956b210..f232914de5fd 100644 --- a/drivers/usb/core/quirks.c +++ b/drivers/usb/core/quirks.c @@ -370,6 +370,10 @@ static const struct usb_device_id usb_quirk_list[] = { { USB_DEVICE(0x0926, 0x0202), .driver_info = USB_QUIRK_ENDPOINT_IGNORE }, + /* Sound Devices MixPre-D */ + { USB_DEVICE(0x0926, 0x0208), .driver_info = + USB_QUIRK_ENDPOINT_IGNORE }, + /* Keytouch QWERTY Panel keyboard */ { USB_DEVICE(0x0926, 0x3333), .driver_info = USB_QUIRK_CONFIG_INTF_STRINGS }, @@ -511,6 +515,7 @@ static const struct usb_device_id usb_amd_resume_quirk_list[] = { */ static const struct usb_device_id usb_endpoint_ignore[] = { { USB_DEVICE_INTERFACE_NUMBER(0x0926, 0x0202, 1), .driver_info = 0x85 }, + { USB_DEVICE_INTERFACE_NUMBER(0x0926, 0x0208, 1), .driver_info = 0x85 }, { } }; -- 2.28.0

4 years, 9 months

1
0
0 0

[PATCH net backport 5.6.14-5.8.3 v1] net: openvswitch: introduce common code for flushing flows

by xiangxia.m.yue＠gmail.com

From: Tonghao Zhang <xiangxia.m.yue(a)gmail.com> [ Upstream commit 77b981c82c1df7c7ad32a046f17f007450b46954 ] Backport this commit to 5.6.14 - 5.8.3. To avoid some issues, for example RCU usage warning and double free, we should flush the flows under ovs_lock. This patch refactors table_instance_destroy and introduces table_instance_flow_flush which can be invoked by __dp_destroy or ovs_flow_tbl_flush. Fixes: 50b0e61b32ee ("net: openvswitch: fix possible memleak on destroy flow-table") Reported-by: Johan Knöös <jknoos(a)google.com> Reported-at: https://mail.openvswitch.org/pipermail/ovs-discuss/2020-August/050489.html Signed-off-by: Tonghao Zhang <xiangxia.m.yue(a)gmail.com> Reviewed-by: Cong Wang <xiyou.wangcong(a)gmail.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> --- net/openvswitch/datapath.c | 10 +++++++++- net/openvswitch/flow_table.c | 35 +++++++++++++++-------------------- net/openvswitch/flow_table.h | 3 +++ 3 files changed, 27 insertions(+), 21 deletions(-) diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c index 94b024534987..03b81aa99975 100644 --- a/net/openvswitch/datapath.c +++ b/net/openvswitch/datapath.c @@ -1736,6 +1736,7 @@ static int ovs_dp_cmd_new(struct sk_buff *skb, struct genl_info *info) /* Called with ovs_mutex. */ static void __dp_destroy(struct datapath *dp) { + struct flow_table *table = &dp->table; int i; for (i = 0; i < DP_VPORT_HASH_BUCKETS; i++) { @@ -1754,7 +1755,14 @@ static void __dp_destroy(struct datapath *dp) */ ovs_dp_detach_port(ovs_vport_ovsl(dp, OVSP_LOCAL)); - /* RCU destroy the flow table */ + /* Flush sw_flow in the tables. RCU cb only releases resource + * such as dp, ports and tables. That may avoid some issues + * such as RCU usage warning. + */ + table_instance_flow_flush(table, ovsl_dereference(table->ti), + ovsl_dereference(table->ufid_ti)); + + /* RCU destroy the ports, meters and flow tables. */ call_rcu(&dp->rcu, destroy_dp_rcu); } diff --git a/net/openvswitch/flow_table.c b/net/openvswitch/flow_table.c index 2398d7238300..f198bbb0c517 100644 --- a/net/openvswitch/flow_table.c +++ b/net/openvswitch/flow_table.c @@ -345,19 +345,15 @@ static void table_instance_flow_free(struct flow_table *table, flow_mask_remove(table, flow->mask); } -static void table_instance_destroy(struct flow_table *table, - struct table_instance *ti, - struct table_instance *ufid_ti, - bool deferred) +/* Must be called with OVS mutex held. */ +void table_instance_flow_flush(struct flow_table *table, + struct table_instance *ti, + struct table_instance *ufid_ti) { int i; - if (!ti) - return; - - BUG_ON(!ufid_ti); if (ti->keep_flows) - goto skip_flows; + return; for (i = 0; i < ti->n_buckets; i++) { struct sw_flow *flow; @@ -369,18 +365,16 @@ static void table_instance_destroy(struct flow_table *table, table_instance_flow_free(table, ti, ufid_ti, flow, false); - ovs_flow_free(flow, deferred); + ovs_flow_free(flow, true); } } +} -skip_flows: - if (deferred) { - call_rcu(&ti->rcu, flow_tbl_destroy_rcu_cb); - call_rcu(&ufid_ti->rcu, flow_tbl_destroy_rcu_cb); - } else { - __table_instance_destroy(ti); - __table_instance_destroy(ufid_ti); - } +static void table_instance_destroy(struct table_instance *ti, + struct table_instance *ufid_ti) +{ + call_rcu(&ti->rcu, flow_tbl_destroy_rcu_cb); + call_rcu(&ufid_ti->rcu, flow_tbl_destroy_rcu_cb); } /* No need for locking this function is called from RCU callback or @@ -393,7 +387,7 @@ void ovs_flow_tbl_destroy(struct flow_table *table) free_percpu(table->mask_cache); kfree_rcu(rcu_dereference_raw(table->mask_array), rcu); - table_instance_destroy(table, ti, ufid_ti, false); + table_instance_destroy(ti, ufid_ti); } struct sw_flow *ovs_flow_tbl_dump_next(struct table_instance *ti, @@ -511,7 +505,8 @@ int ovs_flow_tbl_flush(struct flow_table *flow_table) flow_table->count = 0; flow_table->ufid_count = 0; - table_instance_destroy(flow_table, old_ti, old_ufid_ti, true); + table_instance_flow_flush(flow_table, old_ti, old_ufid_ti); + table_instance_destroy(old_ti, old_ufid_ti); return 0; err_free_ti: diff --git a/net/openvswitch/flow_table.h b/net/openvswitch/flow_table.h index 8a5cea6ae111..8ea8fc957377 100644 --- a/net/openvswitch/flow_table.h +++ b/net/openvswitch/flow_table.h @@ -86,4 +86,7 @@ bool ovs_flow_cmp(const struct sw_flow *, const struct sw_flow_match *); void ovs_flow_mask_key(struct sw_flow_key *dst, const struct sw_flow_key *src, bool full, const struct sw_flow_mask *mask); +void table_instance_flow_flush(struct flow_table *table, + struct table_instance *ti, + struct table_instance *ufid_ti); #endif /* flow_table.h */ -- 2.23.0

4 years, 9 months

3
2
0 0

[PATCH net backport to 5.5 - 5.8.3 v2] net: openvswitch: introduce common code for flushing flows

by xiangxia.m.yue＠gmail.com

From: Tonghao Zhang <xiangxia.m.yue(a)gmail.com> [ Upstream commit 1f3a090b9033f69de380c03db3ea1a1015c850cf ] Backport this commit to 5.5 - 5.8.3. To avoid some issues, for example RCU usage warning and double free, we should flush the flows under ovs_lock. This patch refactors table_instance_destroy and introduces table_instance_flow_flush which can be invoked by __dp_destroy or ovs_flow_tbl_flush. Fixes: 50b0e61b32ee ("net: openvswitch: fix possible memleak on destroy flow-table") Reported-by: Johan Knöös <jknoos(a)google.com> Reported-at: https://mail.openvswitch.org/pipermail/ovs-discuss/2020-August/050489.html Signed-off-by: Tonghao Zhang <xiangxia.m.yue(a)gmail.com> Reviewed-by: Cong Wang <xiyou.wangcong(a)gmail.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> --- net/openvswitch/datapath.c | 10 +++++++++- net/openvswitch/flow_table.c | 35 +++++++++++++++-------------------- net/openvswitch/flow_table.h | 3 +++ 3 files changed, 27 insertions(+), 21 deletions(-) diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c index e3a37d22539c..15615cae4c89 100644 --- a/net/openvswitch/datapath.c +++ b/net/openvswitch/datapath.c @@ -1737,6 +1737,7 @@ static int ovs_dp_cmd_new(struct sk_buff *skb, struct genl_info *info) /* Called with ovs_mutex. */ static void __dp_destroy(struct datapath *dp) { + struct flow_table *table = &dp->table; int i; for (i = 0; i < DP_VPORT_HASH_BUCKETS; i++) { @@ -1755,7 +1756,14 @@ static void __dp_destroy(struct datapath *dp) */ ovs_dp_detach_port(ovs_vport_ovsl(dp, OVSP_LOCAL)); - /* RCU destroy the flow table */ + /* Flush sw_flow in the tables. RCU cb only releases resource + * such as dp, ports and tables. That may avoid some issues + * such as RCU usage warning. + */ + table_instance_flow_flush(table, ovsl_dereference(table->ti), + ovsl_dereference(table->ufid_ti)); + + /* RCU destroy the ports, meters and flow tables. */ call_rcu(&dp->rcu, destroy_dp_rcu); } diff --git a/net/openvswitch/flow_table.c b/net/openvswitch/flow_table.c index 5904e93e5765..1c4fbac53fbd 100644 --- a/net/openvswitch/flow_table.c +++ b/net/openvswitch/flow_table.c @@ -345,19 +345,15 @@ static void table_instance_flow_free(struct flow_table *table, flow_mask_remove(table, flow->mask); } -static void table_instance_destroy(struct flow_table *table, - struct table_instance *ti, - struct table_instance *ufid_ti, - bool deferred) +/* Must be called with OVS mutex held. */ +void table_instance_flow_flush(struct flow_table *table, + struct table_instance *ti, + struct table_instance *ufid_ti) { int i; - if (!ti) - return; - - BUG_ON(!ufid_ti); if (ti->keep_flows) - goto skip_flows; + return; for (i = 0; i < ti->n_buckets; i++) { struct sw_flow *flow; @@ -369,18 +365,16 @@ static void table_instance_destroy(struct flow_table *table, table_instance_flow_free(table, ti, ufid_ti, flow, false); - ovs_flow_free(flow, deferred); + ovs_flow_free(flow, true); } } +} -skip_flows: - if (deferred) { - call_rcu(&ti->rcu, flow_tbl_destroy_rcu_cb); - call_rcu(&ufid_ti->rcu, flow_tbl_destroy_rcu_cb); - } else { - __table_instance_destroy(ti); - __table_instance_destroy(ufid_ti); - } +static void table_instance_destroy(struct table_instance *ti, + struct table_instance *ufid_ti) +{ + call_rcu(&ti->rcu, flow_tbl_destroy_rcu_cb); + call_rcu(&ufid_ti->rcu, flow_tbl_destroy_rcu_cb); } /* No need for locking this function is called from RCU callback or @@ -393,7 +387,7 @@ void ovs_flow_tbl_destroy(struct flow_table *table) free_percpu(table->mask_cache); kfree_rcu(rcu_dereference_raw(table->mask_array), rcu); - table_instance_destroy(table, ti, ufid_ti, false); + table_instance_destroy(ti, ufid_ti); } struct sw_flow *ovs_flow_tbl_dump_next(struct table_instance *ti, @@ -509,7 +503,8 @@ int ovs_flow_tbl_flush(struct flow_table *flow_table) flow_table->count = 0; flow_table->ufid_count = 0; - table_instance_destroy(flow_table, old_ti, old_ufid_ti, true); + table_instance_flow_flush(flow_table, old_ti, old_ufid_ti); + table_instance_destroy(old_ti, old_ufid_ti); return 0; err_free_ti: diff --git a/net/openvswitch/flow_table.h b/net/openvswitch/flow_table.h index 8a5cea6ae111..8ea8fc957377 100644 --- a/net/openvswitch/flow_table.h +++ b/net/openvswitch/flow_table.h @@ -86,4 +86,7 @@ bool ovs_flow_cmp(const struct sw_flow *, const struct sw_flow_match *); void ovs_flow_mask_key(struct sw_flow_key *dst, const struct sw_flow_key *src, bool full, const struct sw_flow_mask *mask); +void table_instance_flow_flush(struct flow_table *table, + struct table_instance *ti, + struct table_instance *ufid_ti); #endif /* flow_table.h */ -- 2.23.0

4 years, 9 months

1
0
0 0

[PATCH] dmaengine: dw-edma: Fix linked list physical address calculation on non-64 bits architectures

by Gustavo Pimentel

Fix linked list physical address calculation on non-64 bits architectures. The paddr variable is phys_addr_t type, which can assume a different type (u64 or u32) depending on the conditional compilation flag CONFIG_PHYS_ADDR_T_64BIT. Since this variable is used in with upper_32 bits() macro to get the value from 32 to 63 bits, on a non-64 bits architecture this variable will assume a u32 type, it can cause a compilation warning. This issue was reported by a Coverity analysis. Fixes: 7e4b8a4fbe2c ("dmaengine: Add Synopsys eDMA IP version 0 support") Cc: Joao Pinto <jpinto(a)synopsys.com> Cc: stable(a)vger.kernel.org Signed-off-by: Gustavo Pimentel <gustavo.pimentel(a)synopsys.com> --- drivers/dma/dw-edma/dw-edma-v0-core.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/drivers/dma/dw-edma/dw-edma-v0-core.c b/drivers/dma/dw-edma/dw-edma-v0-core.c index 692de47..cfabbf5 100644 --- a/drivers/dma/dw-edma/dw-edma-v0-core.c +++ b/drivers/dma/dw-edma/dw-edma-v0-core.c @@ -229,8 +229,13 @@ static void dw_edma_v0_core_write_chunk(struct dw_edma_chunk *chunk) /* Channel control */ SET_LL(&llp->control, control); /* Linked list - low, high */ - SET_LL(&llp->llp_low, lower_32_bits(chunk->ll_region.paddr)); - SET_LL(&llp->llp_high, upper_32_bits(chunk->ll_region.paddr)); + #ifdef CONFIG_PHYS_ADDR_T_64BIT + SET_LL(&llp->llp_low, lower_32_bits(chunk->ll_region.paddr)); + SET_LL(&llp->llp_high, upper_32_bits(chunk->ll_region.paddr)); + #else /* CONFIG_PHYS_ADDR_T_64BIT */ + SET_LL(&llp->llp_low, chunk->ll_region.paddr); + SET_LL(&llp->llp_high, 0x0); + #endif /* CONFIG_PHYS_ADDR_T_64BIT */ } void dw_edma_v0_core_start(struct dw_edma_chunk *chunk, bool first) @@ -257,10 +262,16 @@ void dw_edma_v0_core_start(struct dw_edma_chunk *chunk, bool first) SET_CH(dw, chan->dir, chan->id, ch_control1, (DW_EDMA_V0_CCS | DW_EDMA_V0_LLE)); /* Linked list - low, high */ - SET_CH(dw, chan->dir, chan->id, llp_low, - lower_32_bits(chunk->ll_region.paddr)); - SET_CH(dw, chan->dir, chan->id, llp_high, - upper_32_bits(chunk->ll_region.paddr)); + #ifdef CONFIG_PHYS_ADDR_T_64BIT + SET_CH(dw, chan->dir, chan->id, llp_low, + lower_32_bits(chunk->ll_region.paddr)); + SET_CH(dw, chan->dir, chan->id, llp_high, + upper_32_bits(chunk->ll_region.paddr)); + #else /* CONFIG_PHYS_ADDR_T_64BIT */ + SET_CH(dw, chan->dir, chan->id, llp_low, + chunk->ll_region.paddr); + SET_CH(dw, chan->dir, chan->id, llp_high, 0x0); + #endif /* CONFIG_PHYS_ADDR_T_64BIT*/ } /* Doorbell */ SET_RW(dw, chan->dir, doorbell, -- 2.7.4

4 years, 9 months

3
4
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror August 2020