19c8f421a6
New generation devices have firmware which has more than 256 flowrings.
E.g. following debugging message comes from 14e4:4365 BCM4366:
[ 194.606245] brcmfmac: brcmf_pcie_init_ringbuffers Nr of flowrings is 264
At various code places (related to flowrings) we were using u8 which
could lead to storing wrong number or infinite loops when indexing with
this type. This issue was quite easy to spot in brcmf_flowring_detach
where it led to infinite loop e.g. on failed initialization.
This patch switches code to proper types and increases the maximum
number of supported flowrings to 512.
Originally this change was sent in September 2015, but back it was
causing a regression on BCM43602 resulting in:
Unable to handle kernel NULL pointer dereference at virtual address ...
The reason for this regression was missing update (s/u8/u16) of struct
brcmf_flowring_ring. This problem was handled in 9f64df9 ("brcmfmac: Fix
bug in flowring management."). Starting with that it's safe to apply
this original patch as it doesn't cause a regression anymore.
This patch fixes an infinite loop on BCM4366 which is supported since
4.4 so it makes sense to apply it to stable 4.4+.
Cc: <stable@vger.kernel.org> # 4.4+
Reviewed-by: Arend Van Spriel <arend@broadcom.com>
Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
85 lines
2.8 KiB
C
85 lines
2.8 KiB
C
/* Copyright (c) 2014 Broadcom Corporation
|
|
*
|
|
* Permission to use, copy, modify, and/or distribute this software for any
|
|
* purpose with or without fee is hereby granted, provided that the above
|
|
* copyright notice and this permission notice appear in all copies.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
|
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
|
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
|
|
* SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
|
|
* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
|
|
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
*/
|
|
#ifndef BRCMFMAC_FLOWRING_H
|
|
#define BRCMFMAC_FLOWRING_H
|
|
|
|
|
|
#define BRCMF_FLOWRING_HASHSIZE 512 /* has to be 2^x */
|
|
#define BRCMF_FLOWRING_INVALID_ID 0xFFFFFFFF
|
|
|
|
|
|
struct brcmf_flowring_hash {
|
|
u8 mac[ETH_ALEN];
|
|
u8 fifo;
|
|
u8 ifidx;
|
|
u16 flowid;
|
|
};
|
|
|
|
enum ring_status {
|
|
RING_CLOSED,
|
|
RING_CLOSING,
|
|
RING_OPEN
|
|
};
|
|
|
|
struct brcmf_flowring_ring {
|
|
u16 hash_id;
|
|
bool blocked;
|
|
enum ring_status status;
|
|
struct sk_buff_head skblist;
|
|
};
|
|
|
|
struct brcmf_flowring_tdls_entry {
|
|
u8 mac[ETH_ALEN];
|
|
struct brcmf_flowring_tdls_entry *next;
|
|
};
|
|
|
|
struct brcmf_flowring {
|
|
struct device *dev;
|
|
struct brcmf_flowring_hash hash[BRCMF_FLOWRING_HASHSIZE];
|
|
struct brcmf_flowring_ring **rings;
|
|
spinlock_t block_lock;
|
|
enum proto_addr_mode addr_mode[BRCMF_MAX_IFS];
|
|
u16 nrofrings;
|
|
bool tdls_active;
|
|
struct brcmf_flowring_tdls_entry *tdls_entry;
|
|
};
|
|
|
|
|
|
u32 brcmf_flowring_lookup(struct brcmf_flowring *flow, u8 da[ETH_ALEN],
|
|
u8 prio, u8 ifidx);
|
|
u32 brcmf_flowring_create(struct brcmf_flowring *flow, u8 da[ETH_ALEN],
|
|
u8 prio, u8 ifidx);
|
|
void brcmf_flowring_delete(struct brcmf_flowring *flow, u16 flowid);
|
|
void brcmf_flowring_open(struct brcmf_flowring *flow, u16 flowid);
|
|
u8 brcmf_flowring_tid(struct brcmf_flowring *flow, u16 flowid);
|
|
u32 brcmf_flowring_enqueue(struct brcmf_flowring *flow, u16 flowid,
|
|
struct sk_buff *skb);
|
|
struct sk_buff *brcmf_flowring_dequeue(struct brcmf_flowring *flow, u16 flowid);
|
|
void brcmf_flowring_reinsert(struct brcmf_flowring *flow, u16 flowid,
|
|
struct sk_buff *skb);
|
|
u32 brcmf_flowring_qlen(struct brcmf_flowring *flow, u16 flowid);
|
|
u8 brcmf_flowring_ifidx_get(struct brcmf_flowring *flow, u16 flowid);
|
|
struct brcmf_flowring *brcmf_flowring_attach(struct device *dev, u16 nrofrings);
|
|
void brcmf_flowring_detach(struct brcmf_flowring *flow);
|
|
void brcmf_flowring_configure_addr_mode(struct brcmf_flowring *flow, int ifidx,
|
|
enum proto_addr_mode addr_mode);
|
|
void brcmf_flowring_delete_peer(struct brcmf_flowring *flow, int ifidx,
|
|
u8 peer[ETH_ALEN]);
|
|
void brcmf_flowring_add_tdls_peer(struct brcmf_flowring *flow, int ifidx,
|
|
u8 peer[ETH_ALEN]);
|
|
|
|
|
|
#endif /* BRCMFMAC_FLOWRING_H */
|