Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1237234 > unrolled thread
| Started by | Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
|---|---|
| First post | 2015-10-01 11:50 +0200 |
| Last post | 2015-10-02 17:50 +0200 |
| Articles | 7 — 5 participants |
Back to article view | Back to linux.kernel
[PATCH 4.1 00/29] 4.1.10-stable review Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2015-10-01 11:50 +0200
[PATCH 4.1 10/29] net: dsa: bcm_sf2: Fix ageing conditions and operation Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2015-10-01 11:50 +0200
[PATCH 4.1 12/29] net: dsa: bcm_sf2: Fix 64-bits register writes Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2015-10-01 11:50 +0200
Re: [PATCH 4.1 15/29] bridge: fix igmpv3 / mldv2 report parsing Linus Lüssing <linus.luessing@c0d3.blue> - 2015-10-02 01:20 +0200
Re: [PATCH 4.1 00/29] 4.1.10-stable review Guenter Roeck <linux@roeck-us.net> - 2015-10-02 03:30 +0200
Re: [PATCH 4.1 00/29] 4.1.10-stable review Sudip Mukherjee <sudipm.mukherjee@gmail.com> - 2015-10-02 08:30 +0200
Re: [PATCH 4.1 00/29] 4.1.10-stable review Shuah Khan <shuahkh@osg.samsung.com> - 2015-10-02 17:50 +0200
| From | Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
|---|---|
| Date | 2015-10-01 11:50 +0200 |
| Subject | [PATCH 4.1 00/29] 4.1.10-stable review |
| Message-ID | <qeIvg-5L-9@gated-at.bofh.it> |
This is the start of the stable review cycle for the 4.1.10 release.
There are 29 patches in this series, all will be posted as a response
to this one. If anyone has any issues with these being applied, please
let me know.
Responses should be made by Sat Oct 3 09:31:26 UTC 2015.
Anything received after that time might be too late.
The whole patch series can be found in one patch at:
kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.1.10-rc1.gz
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Linux 4.1.10-rc1
Kyle Evans <kvans32@gmail.com>
hp-wmi: limit hotkey enable
Luis Henriques <luis.henriques@canonical.com>
zram: fix possible use after free in zcomp_create()
Herbert Xu <herbert@gondor.apana.org.au>
netlink: Replace rhash_portid with bound
Herbert Xu <herbert@gondor.apana.org.au>
netlink: Fix autobind race condition that leads to zero port ID
Stas Sergeev <stsp@list.ru>
mvneta: use inband status only when explicitly enabled
Stas Sergeev <stsp@list.ru>
of_mdio: add new DT property 'managed' to specify the PHY management type
Stas Sergeev <stsp@list.ru>
net: phy: fixed_phy: handle link-down case
Florian Fainelli <f.fainelli@gmail.com>
net: dsa: bcm_sf2: Do not override speed settings
Wilson Kok <wkok@cumulusnetworks.com>
fib_rules: fix fib rule dumps across multiple skbs
WANG Cong <xiyou.wangcong@gmail.com>
net: revert "net_sched: move tp->root allocation into fw_init()"
Eric Dumazet <edumazet@google.com>
tcp: add proper TS val into RST packets
Jesse Gross <jesse@nicira.com>
openvswitch: Zero flows on allocation.
Michael S. Tsirkin <mst@redhat.com>
macvtap: fix TUNSETSNDBUF values > 64k
Eric Dumazet <edumazet@google.com>
net/mlx4_en: really allow to change RSS key
Linus Lüssing <linus.luessing@c0d3.blue>
bridge: fix igmpv3 / mldv2 report parsing
Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
sctp: fix race on protocol/netns initialization
Daniel Borkmann <daniel@iogearbox.net>
netlink, mmap: transform mmap skb into full skb on taps
Florian Fainelli <f.fainelli@gmail.com>
net: dsa: bcm_sf2: Fix 64-bits register writes
Roopa Prabhu <roopa@cumulusnetworks.com>
ipv6: fix multipath route replace error recovery
Florian Fainelli <f.fainelli@gmail.com>
net: dsa: bcm_sf2: Fix ageing conditions and operation
Richard Laing <richard.laing@alliedtelesis.co.nz>
net/ipv6: Correct PIM6 mrt_lock handling
Atsushi Nemoto <nemoto@toshiba-tops.co.jp>
net: eth: altera: fix napi poll_list corruption
Russell King <rmk+kernel@arm.linux.org.uk>
net: fec: clear receive interrupts before processing a packet
Daniel Borkmann <daniel@iogearbox.net>
ipv6: fix exthdrs offload registration in out_rt path
Daniel Borkmann <daniel@iogearbox.net>
sock, diag: fix panic in sock_diag_put_filterinfo
Eugene Shatokhin <eugene.shatokhin@rosalab.ru>
usbnet: Get EVENT_NO_RUNTIME_PM bit before it is cleared
WANG Cong <xiyou.wangcong@gmail.com>
cls_u32: complete the check for non-forced case in u32_destroy()
Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
vxlan: re-ignore EADDRINUSE from igmp_join
huaibin Wang <huaibin.wang@6wind.com>
ip6_gre: release cached dst on tunnel removal
-------------
Diffstat:
Documentation/devicetree/bindings/net/ethernet.txt | 4 +
Makefile | 4 +-
drivers/block/zram/zcomp.c | 12 +-
drivers/net/dsa/bcm_sf2.c | 30 +--
drivers/net/dsa/bcm_sf2.h | 4 +-
drivers/net/ethernet/altera/altera_tse_main.c | 3 +-
drivers/net/ethernet/freescale/fec_main.c | 1 +
drivers/net/ethernet/marvell/mvneta.c | 9 +-
drivers/net/ethernet/mellanox/mlx4/en_rx.c | 2 -
drivers/net/macvtap.c | 4 +-
drivers/net/phy/fixed_phy.c | 8 +-
drivers/net/usb/usbnet.c | 7 +-
drivers/net/vxlan.c | 2 +
drivers/of/of_mdio.c | 19 +-
drivers/platform/x86/hp-wmi.c | 31 ++--
net/bridge/br_multicast.c | 4 +-
net/core/fib_rules.c | 14 +-
net/core/sock_diag.c | 3 +
net/ipv4/tcp_output.c | 1 +
net/ipv6/exthdrs_offload.c | 2 +-
net/ipv6/ip6_gre.c | 1 +
net/ipv6/ip6mr.c | 2 +-
net/ipv6/route.c | 201 ++++++++++++++++++---
net/netlink/af_netlink.c | 62 +++++--
net/netlink/af_netlink.h | 10 +
net/openvswitch/datapath.c | 4 +-
net/openvswitch/flow_table.c | 23 +--
net/openvswitch/flow_table.h | 2 +-
net/sched/cls_fw.c | 30 +--
net/sched/cls_u32.c | 13 ++
net/sctp/protocol.c | 64 ++++---
31 files changed, 416 insertions(+), 160 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [next] | [standalone]
| From | Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
|---|---|
| Date | 2015-10-01 11:50 +0200 |
| Subject | [PATCH 4.1 10/29] net: dsa: bcm_sf2: Fix ageing conditions and operation |
| Message-ID | <qeIEW-gR-13@gated-at.bofh.it> |
| In reply to | #1237234 |
4.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Florian Fainelli <f.fainelli@gmail.com>
[ Upstream commit 39797a279d62972cd914ef580fdfacb13e508bf8 ]
The comparison check between cur_hw_state and hw_state is currently
invalid because cur_hw_state is right shifted by G_MISTP_SHIFT, while
hw_state is not, so we end-up comparing bits 2:0 with bits 7:5, which is
going to cause an additional aging to occur. Fix this by not shifting
cur_hw_state while reading it, but instead, mask the value with the
appropriately shitfted bitmask.
The other problem with the fast-ageing process is that we did not set
the EN_AGE_DYNAMIC bit to request the ageing to occur for dynamically
learned MAC addresses. Finally, write back 0 to the FAST_AGE_CTRL
register to avoid leaving spurious bits sets from one operation to the
other.
Fixes: 12f460f23423 ("net: dsa: bcm_sf2: add HW bridging support")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/net/dsa/bcm_sf2.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
--- a/drivers/net/dsa/bcm_sf2.c
+++ b/drivers/net/dsa/bcm_sf2.c
@@ -417,7 +417,7 @@ static int bcm_sf2_sw_fast_age_port(stru
core_writel(priv, port, CORE_FAST_AGE_PORT);
reg = core_readl(priv, CORE_FAST_AGE_CTRL);
- reg |= EN_AGE_PORT | FAST_AGE_STR_DONE;
+ reg |= EN_AGE_PORT | EN_AGE_DYNAMIC | FAST_AGE_STR_DONE;
core_writel(priv, reg, CORE_FAST_AGE_CTRL);
do {
@@ -431,6 +431,8 @@ static int bcm_sf2_sw_fast_age_port(stru
if (!timeout)
return -ETIMEDOUT;
+ core_writel(priv, 0, CORE_FAST_AGE_CTRL);
+
return 0;
}
@@ -506,7 +508,7 @@ static int bcm_sf2_sw_br_set_stp_state(s
u32 reg;
reg = core_readl(priv, CORE_G_PCTL_PORT(port));
- cur_hw_state = reg >> G_MISTP_STATE_SHIFT;
+ cur_hw_state = reg & (G_MISTP_STATE_MASK << G_MISTP_STATE_SHIFT);
switch (state) {
case BR_STATE_DISABLED:
@@ -530,10 +532,12 @@ static int bcm_sf2_sw_br_set_stp_state(s
}
/* Fast-age ARL entries if we are moving a port from Learning or
- * Forwarding state to Disabled, Blocking or Listening state
+ * Forwarding (cur_hw_state) state to Disabled, Blocking or Listening
+ * state (hw_state)
*/
if (cur_hw_state != hw_state) {
- if (cur_hw_state & 4 && !(hw_state & 4)) {
+ if (cur_hw_state >= G_MISTP_LEARN_STATE &&
+ hw_state <= G_MISTP_LISTEN_STATE) {
ret = bcm_sf2_sw_fast_age_port(ds, port);
if (ret) {
pr_err("%s: fast-ageing failed\n", __func__);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
|---|---|
| Date | 2015-10-01 11:50 +0200 |
| Subject | [PATCH 4.1 12/29] net: dsa: bcm_sf2: Fix 64-bits register writes |
| Message-ID | <qeIEW-gR-19@gated-at.bofh.it> |
| In reply to | #1237234 |
4.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Florian Fainelli <f.fainelli@gmail.com>
[ Upstream commit 03679a14739a0d4c14b52ba65a69ff553bfba73b ]
The macro to write 64-bits quantities to the 32-bits register swapped
the value and offsets arguments, we want to preserve the ordering of the
arguments with respect to how writel() is implemented for instance:
value first, offset/base second.
Fixes: 246d7f773c13 ("net: dsa: add Broadcom SF2 switch driver")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/net/dsa/bcm_sf2.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/drivers/net/dsa/bcm_sf2.h
+++ b/drivers/net/dsa/bcm_sf2.h
@@ -112,8 +112,8 @@ static inline u64 name##_readq(struct bc
spin_unlock(&priv->indir_lock); \
return (u64)indir << 32 | dir; \
} \
-static inline void name##_writeq(struct bcm_sf2_priv *priv, u32 off, \
- u64 val) \
+static inline void name##_writeq(struct bcm_sf2_priv *priv, u64 val, \
+ u32 off) \
{ \
spin_lock(&priv->indir_lock); \
reg_writel(priv, upper_32_bits(val), REG_DIR_DATA_WRITE); \
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Linus Lüssing <linus.luessing@c0d3.blue> |
|---|---|
| Date | 2015-10-02 01:20 +0200 |
| Subject | Re: [PATCH 4.1 15/29] bridge: fix igmpv3 / mldv2 report parsing |
| Message-ID | <qeViO-2oq-11@gated-at.bofh.it> |
| In reply to | #1237234 |
Hi Greg,
On Thu, Oct 01, 2015 at 11:31:51AM +0200, Greg Kroah-Hartman wrote:
> 4.1-stable review patch. If anyone has any objections, please let me know.
[...]
> Fixes: 9afd85c9e455 ("net: Export IGMP/MLD message validation code")
While it shouldn't(tm) break anything on 4.1, there's no need to
pull it here. 9afd85c9e455 introduced the bug and was added in 4.2
only.
Cheers, Linus
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Guenter Roeck <linux@roeck-us.net> |
|---|---|
| Date | 2015-10-02 03:30 +0200 |
| Message-ID | <qeXkB-5f4-7@gated-at.bofh.it> |
| In reply to | #1237234 |
On Thu, Oct 01, 2015 at 11:31:36AM +0200, Greg Kroah-Hartman wrote: > This is the start of the stable review cycle for the 4.1.10 release. > There are 29 patches in this series, all will be posted as a response > to this one. If anyone has any issues with these being applied, please > let me know. > > Responses should be made by Sat Oct 3 09:31:26 UTC 2015. > Anything received after that time might be too late. > Build results: total: 137 pass: 137 fail: 0 Qemu test results: total: 93 pass: 92 fail: 1 Failed tests: mips:fuloong2e_defconfig Details are available at http://server.roeck-us.net:8010/builders. Guenter -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Sudip Mukherjee <sudipm.mukherjee@gmail.com> |
|---|---|
| Date | 2015-10-02 08:30 +0200 |
| Message-ID | <qf20W-3Fm-27@gated-at.bofh.it> |
| In reply to | #1237234 |
On Thu, Oct 01, 2015 at 11:31:36AM +0200, Greg Kroah-Hartman wrote: > This is the start of the stable review cycle for the 4.1.10 release. > There are 29 patches in this series, all will be posted as a response > to this one. If anyone has any issues with these being applied, please > let me know. Compiled and booted on x86_32. No errors in dmesg. regards sudip -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Shuah Khan <shuahkh@osg.samsung.com> |
|---|---|
| Date | 2015-10-02 17:50 +0200 |
| Message-ID | <qfaKS-7Fv-13@gated-at.bofh.it> |
| In reply to | #1237234 |
On 10/01/2015 03:31 AM, Greg Kroah-Hartman wrote: > This is the start of the stable review cycle for the 4.1.10 release. > There are 29 patches in this series, all will be posted as a response > to this one. If anyone has any issues with these being applied, please > let me know. > > Responses should be made by Sat Oct 3 09:31:26 UTC 2015. > Anything received after that time might be too late. > > The whole patch series can be found in one patch at: > kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.1.10-rc1.gz > and the diffstat can be found below. > Compiled and booted on my test system. No dmesg regressions. thanks, -- Shuah -- Shuah Khan Sr. Linux Kernel Developer Open Source Innovation Group Samsung Research America (Silicon Valley) shuahkh@osg.samsung.com | (970) 217-8978 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web