* Re: [PATCH net 1/2] net/mlx4_en: Fix bridged vSwitch configuration for non SRIOV mode
From: Or Gerlitz @ 2013-01-17 16:34 UTC (permalink / raw)
To: Eric Dumazet; +Cc: davem, netdev, amirv, jackm, yevgenyp, Yan Burman
In-Reply-To: <50F8279F.5030403@mellanox.com>
On 17/01/2013 18:32, Or Gerlitz wrote:
> (I don't really understand why mlx4_en_mac_to_u64() is done... its
> horribly expensive...). matching 6 bytes can be done in 3 x86_64
> instructions using the right helper (ether_addr_equal_64bits())
thanks for the heads up, we will fix.
Or.
^ permalink raw reply
* [PATCH v5 1/1] net: ethernet: davinci_cpdma: Add boundary for rx and tx descriptors
From: Mugunthan V N @ 2013-01-17 16:31 UTC (permalink / raw)
To: netdev; +Cc: davem, s.hauer, Mugunthan V N
When there is heavy transmission traffic in the CPDMA, then Rx descriptors
memory is also utilized as tx desc memory looses all rx descriptors and the
driver stops working then.
This patch adds boundary for tx and rx descriptors in bd ram dividing the
descriptor memory to ensure that during heavy transmission tx doesn't use
rx descriptors.
This patch is already applied to davinci_emac driver, since CPSW and
davici_dmac shares the same CPDMA, moving the boundry seperation from
Davinci EMAC driver to CPDMA driver which was done in the following
commit
commit 86d8c07ff2448eb4e860e50f34ef6ee78e45c40c
Author: Sascha Hauer <s.hauer@pengutronix.de>
Date: Tue Jan 3 05:27:47 2012 +0000
net/davinci: do not use all descriptors for tx packets
The driver uses a shared pool for both rx and tx descriptors.
During open it queues fixed number of 128 descriptors for receive
packets. For each received packet it tries to queue another
descriptor. If this fails the descriptor is lost for rx.
The driver has no limitation on tx descriptors to use, so it
can happen during a nmap / ping -f attack that the driver
allocates all descriptors for tx and looses all rx descriptors.
The driver stops working then.
To fix this limit the number of tx descriptors used to half of
the descriptors available, the rx path uses the other half.
Tested on a custom board using nmap / ping -f to the board from
two different hosts.
Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
---
Changes from v4
* Removed duplicate calls of bitmap_find_next_zero_area()
* Used is_rx_chan() to find whether the channel is rx channel
drivers/net/ethernet/ti/cpsw.c | 9 ++++++
drivers/net/ethernet/ti/davinci_cpdma.c | 47 ++++++++++++++++++++++++++-----
drivers/net/ethernet/ti/davinci_cpdma.h | 1 +
drivers/net/ethernet/ti/davinci_emac.c | 13 +++++----
4 files changed, 57 insertions(+), 13 deletions(-)
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index 3772804..b35e6a7 100644
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -374,6 +374,9 @@ void cpsw_tx_handler(void *token, int len, int status)
struct net_device *ndev = skb->dev;
struct cpsw_priv *priv = netdev_priv(ndev);
+ /* Check whether the queue is stopped due to stalled tx dma, if the
+ * queue is stopped then start the queue as we have free desc for tx
+ */
if (unlikely(netif_queue_stopped(ndev)))
netif_start_queue(ndev);
cpts_tx_timestamp(&priv->cpts, skb);
@@ -736,6 +739,12 @@ static netdev_tx_t cpsw_ndo_start_xmit(struct sk_buff *skb,
goto fail;
}
+ /* If there is no more tx desc left free then we need to
+ * tell the kernel to stop sending us tx frames.
+ */
+ if (unlikely(cpdma_check_free_tx_desc(priv->txch)))
+ netif_stop_queue(ndev);
+
return NETDEV_TX_OK;
fail:
priv->stats.tx_dropped++;
diff --git a/drivers/net/ethernet/ti/davinci_cpdma.c b/drivers/net/ethernet/ti/davinci_cpdma.c
index 4995673..f862918 100644
--- a/drivers/net/ethernet/ti/davinci_cpdma.c
+++ b/drivers/net/ethernet/ti/davinci_cpdma.c
@@ -105,13 +105,13 @@ struct cpdma_ctlr {
};
struct cpdma_chan {
+ struct cpdma_desc __iomem *head, *tail;
+ void __iomem *hdp, *cp, *rxfree;
enum cpdma_state state;
struct cpdma_ctlr *ctlr;
int chan_num;
spinlock_t lock;
- struct cpdma_desc __iomem *head, *tail;
int count;
- void __iomem *hdp, *cp, *rxfree;
u32 mask;
cpdma_handler_fn handler;
enum dma_data_direction dir;
@@ -217,17 +217,27 @@ desc_from_phys(struct cpdma_desc_pool *pool, dma_addr_t dma)
}
static struct cpdma_desc __iomem *
-cpdma_desc_alloc(struct cpdma_desc_pool *pool, int num_desc)
+cpdma_desc_alloc(struct cpdma_desc_pool *pool, int num_desc, bool is_rx)
{
unsigned long flags;
int index;
+ int desc_start;
+ int desc_end;
struct cpdma_desc __iomem *desc = NULL;
spin_lock_irqsave(&pool->lock, flags);
- index = bitmap_find_next_zero_area(pool->bitmap, pool->num_desc, 0,
- num_desc, 0);
- if (index < pool->num_desc) {
+ if (is_rx) {
+ desc_start = 0;
+ desc_end = pool->num_desc/2;
+ } else {
+ desc_start = pool->num_desc/2;
+ desc_end = pool->num_desc;
+ }
+
+ index = bitmap_find_next_zero_area(pool->bitmap,
+ desc_end, desc_start, num_desc, 0);
+ if (index < desc_end) {
bitmap_set(pool->bitmap, index, num_desc);
desc = pool->iomap + pool->desc_size * index;
pool->used_desc++;
@@ -668,7 +678,7 @@ int cpdma_chan_submit(struct cpdma_chan *chan, void *token, void *data,
goto unlock_ret;
}
- desc = cpdma_desc_alloc(ctlr->pool, 1);
+ desc = cpdma_desc_alloc(ctlr->pool, 1, is_rx_chan(chan));
if (!desc) {
chan->stats.desc_alloc_fail++;
ret = -ENOMEM;
@@ -704,6 +714,29 @@ unlock_ret:
}
EXPORT_SYMBOL_GPL(cpdma_chan_submit);
+bool cpdma_check_free_tx_desc(struct cpdma_chan *chan)
+{
+ unsigned long flags;
+ int index;
+ bool ret;
+ struct cpdma_ctlr *ctlr = chan->ctlr;
+ struct cpdma_desc_pool *pool = ctlr->pool;
+
+ spin_lock_irqsave(&pool->lock, flags);
+
+ index = bitmap_find_next_zero_area(pool->bitmap,
+ pool->num_desc, pool->num_desc/2, 1, 0);
+
+ if (index < pool->num_desc)
+ ret = true;
+ else
+ ret = false;
+
+ spin_unlock_irqrestore(&pool->lock, flags);
+ return ret;
+}
+EXPORT_SYMBOL_GPL(cpdma_check_free_tx_desc);
+
static void __cpdma_chan_free(struct cpdma_chan *chan,
struct cpdma_desc __iomem *desc,
int outlen, int status)
diff --git a/drivers/net/ethernet/ti/davinci_cpdma.h b/drivers/net/ethernet/ti/davinci_cpdma.h
index afa19a0..8d2aeb2 100644
--- a/drivers/net/ethernet/ti/davinci_cpdma.h
+++ b/drivers/net/ethernet/ti/davinci_cpdma.h
@@ -88,6 +88,7 @@ int cpdma_chan_process(struct cpdma_chan *chan, int quota);
int cpdma_ctlr_int_ctrl(struct cpdma_ctlr *ctlr, bool enable);
void cpdma_ctlr_eoi(struct cpdma_ctlr *ctlr);
int cpdma_chan_int_ctrl(struct cpdma_chan *chan, bool enable);
+bool cpdma_check_free_tx_desc(struct cpdma_chan *chan);
enum cpdma_control {
CPDMA_CMD_IDLE, /* write-only */
diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c
index 8478d98..1c97c81 100644
--- a/drivers/net/ethernet/ti/davinci_emac.c
+++ b/drivers/net/ethernet/ti/davinci_emac.c
@@ -120,7 +120,6 @@ static const char emac_version_string[] = "TI DaVinci EMAC Linux v6.1";
#define EMAC_DEF_TX_CH (0) /* Default 0th channel */
#define EMAC_DEF_RX_CH (0) /* Default 0th channel */
#define EMAC_DEF_RX_NUM_DESC (128)
-#define EMAC_DEF_TX_NUM_DESC (128)
#define EMAC_DEF_MAX_TX_CH (1) /* Max TX channels configured */
#define EMAC_DEF_MAX_RX_CH (1) /* Max RX channels configured */
#define EMAC_POLL_WEIGHT (64) /* Default NAPI poll weight */
@@ -342,7 +341,6 @@ struct emac_priv {
u32 mac_hash2;
u32 multicast_hash_cnt[EMAC_NUM_MULTICAST_BITS];
u32 rx_addr_type;
- atomic_t cur_tx;
const char *phy_id;
#ifdef CONFIG_OF
struct device_node *phy_node;
@@ -1050,10 +1048,10 @@ static void emac_tx_handler(void *token, int len, int status)
{
struct sk_buff *skb = token;
struct net_device *ndev = skb->dev;
- struct emac_priv *priv = netdev_priv(ndev);
-
- atomic_dec(&priv->cur_tx);
+ /* Check whether the queue is stopped due to stalled tx dma, if the
+ * queue is stopped then start the queue as we have free desc for tx
+ */
if (unlikely(netif_queue_stopped(ndev)))
netif_start_queue(ndev);
ndev->stats.tx_packets++;
@@ -1101,7 +1099,10 @@ static int emac_dev_xmit(struct sk_buff *skb, struct net_device *ndev)
goto fail_tx;
}
- if (atomic_inc_return(&priv->cur_tx) >= EMAC_DEF_TX_NUM_DESC)
+ /* If there is no more tx desc left free then we need to
+ * tell the kernel to stop sending us tx frames.
+ */
+ if (unlikely(cpdma_check_free_tx_desc(priv->txch)))
netif_stop_queue(ndev);
return NETDEV_TX_OK;
--
1.7.9.5
^ permalink raw reply related
* Re: [net-next 12/14] igb: Add mechanism for detecting latched hardware Rx timestamp
From: Vick, Matthew @ 2013-01-17 16:51 UTC (permalink / raw)
To: Richard Cochran, Kirsher, Jeffrey T
Cc: davem@davemloft.net, netdev@vger.kernel.org, gospo@redhat.com,
sassmann@redhat.com
In-Reply-To: <20130117153812.GB2937@netboy.at.omicron.at>
On 1/17/13 7:38 AM, "Richard Cochran" <richardcochran@gmail.com> wrote:
>On Thu, Jan 17, 2013 at 03:35:17AM -0800, Jeff Kirsher wrote:
>> From: Matthew Vick <matthew.vick@intel.com>
>>
>> Add a check against possible Rx timestamp freezing in the hardware via
>> watchdog mechanism. This situation can occur when an Rx timestamp has
>>been
>> latched, but the packet has been dropped because the Rx ring is full.
>
>Does this also need fixing in stable?
>
>The igb patches look okay to me.
>
>Acked-by: Richard Cochran <richardcochran@gmail.com>
Thanks for the review, Richard!
I'm not too particularly worried about getting this one into stable. This
is to prevent it from theoretically occurring rather than a bug fix for an
issue someone has reported. Plus, it only really affects 82576, as for
82580 and newer we put the timestamp in the packet buffer instead of the
RXSTMP registers. I think it's good to have this fix in going forward,
though.
^ permalink raw reply
* Re: [net-next 09/14] igb: Report L4 Rx hash via skb->l4_rxhash
From: Alexander Duyck @ 2013-01-17 17:07 UTC (permalink / raw)
To: Eric Dumazet; +Cc: Jeff Kirsher, davem, netdev, gospo, sassmann
In-Reply-To: <1358432385.29723.6.camel@edumazet-glaptop>
On 01/17/2013 06:19 AM, Eric Dumazet wrote:
> On Thu, 2013-01-17 at 03:35 -0800, Jeff Kirsher wrote:
>> From: Alexander Duyck <alexander.h.duyck@intel.com>
>>
>> This change makes it so that we report when the Rx hash data is based on L4
>> protocol inputs, specifically TCP or UDP port numbers.
>>
>> Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
>> Tested-by: Aaron Brown <aaron.f.brown@intel.com>
>> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> ---
>> drivers/net/ethernet/intel/igb/e1000_82575.h | 9 +++++++++
>> drivers/net/ethernet/intel/igb/igb_main.c | 21 +++++++++++++++++++--
>> 2 files changed, 28 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/net/ethernet/intel/igb/e1000_82575.h b/drivers/net/ethernet/intel/igb/e1000_82575.h
>> index 444f6f5..fa13e70 100644
>> --- a/drivers/net/ethernet/intel/igb/e1000_82575.h
>> +++ b/drivers/net/ethernet/intel/igb/e1000_82575.h
>> @@ -112,11 +112,20 @@ union e1000_adv_rx_desc {
>> } wb; /* writeback */
>> };
>>
>> +#define E1000_RXDADV_RSSTYPE_MASK 0x0000000F
>> #define E1000_RXDADV_HDRBUFLEN_MASK 0x7FE0
>> #define E1000_RXDADV_HDRBUFLEN_SHIFT 5
>> #define E1000_RXDADV_STAT_TS 0x10000 /* Pkt was time stamped */
>> #define E1000_RXDADV_STAT_TSIP 0x08000 /* timestamp in packet */
>>
>> +/* RSS Hash results */
>> +#define E1000_RXDADV_RSSTYPE_IPV4_TCP 0x00000001
>> +#define E1000_RXDADV_RSSTYPE_IPV6_TCP 0x00000003
>> +#define E1000_RXDADV_RSSTYPE_IPV6_TCP_EX 0x00000006
>> +#define E1000_RXDADV_RSSTYPE_IPV4_UDP 0x00000007
>> +#define E1000_RXDADV_RSSTYPE_IPV6_UDP 0x00000008
>> +#define E1000_RXDADV_RSSTYPE_IPV6_UDP_EX 0x00000009
>> +
>> /* Transmit Descriptor - Advanced */
>> union e1000_adv_tx_desc {
>> struct {
>> diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
>> index a9cb84a..2c66ec8 100644
>> --- a/drivers/net/ethernet/intel/igb/igb_main.c
>> +++ b/drivers/net/ethernet/intel/igb/igb_main.c
>> @@ -6280,12 +6280,29 @@ static inline void igb_rx_checksum(struct igb_ring *ring,
>> le32_to_cpu(rx_desc->wb.upper.status_error));
>> }
>>
>> +#define IGB_RSS_L4TYPES \
>> + (((u16)1 << E1000_RXDADV_RSSTYPE_IPV4_TCP) | \
>> + ((u16)1 << E1000_RXDADV_RSSTYPE_IPV4_UDP) | \
>> + ((u16)1 << E1000_RXDADV_RSSTYPE_IPV6_TCP) | \
>> + ((u16)1 << E1000_RXDADV_RSSTYPE_IPV6_UDP) | \
>> + ((u16)1 << E1000_RXDADV_RSSTYPE_IPV6_TCP_EX) | \
>> + ((u16)1 << E1000_RXDADV_RSSTYPE_IPV6_UDP_EX))
>> +
>> static inline void igb_rx_hash(struct igb_ring *ring,
>> union e1000_adv_rx_desc *rx_desc,
>> struct sk_buff *skb)
>> {
>> - if (ring->netdev->features & NETIF_F_RXHASH)
>> - skb->rxhash = le32_to_cpu(rx_desc->wb.lower.hi_dword.rss);
>> + u16 rss_type;
>> +
>> + if (!(ring->netdev->features & NETIF_F_RXHASH))
>> + return;
>> +
>> + skb->rxhash = le32_to_cpu(rx_desc->wb.lower.hi_dword.rss);
>> +
>> + rss_type = le16_to_cpu(rx_desc->wb.lower.lo_dword.pkt_info) &
>> + E1000_RXDADV_RSSTYPE_MASK;
>> +
>> + skb->l4_rxhash = (IGB_RSS_L4TYPES >> rss_type) & 0x1;
>> }
>>
>
> Problem is that we should not set l4_rxhash for UDP traffic, as it might
> contains encapsulated protocol.
Isn't the same true of TCP? I believe STT is intended to run over the
TCP protocol, or am I getting ahead of myself since STT is not supported
by the kernel?
> Also, is IGB really using the ports in the rss for UDP packets ?
Not by default. The default is to only hash on the IP header for UDP
packets.
As such the default would only be setting the l4_rxhash on TCP frames
only. The user would have to specifically request L4 port hashing for
UDP via the "ethtool -N" command for configuring rx-flow-hash.
Thanks,
Alex
^ permalink raw reply
* Re: [PATCH net-next] igbvf: fix setting addr_assign_type if PF is up
From: Greg Rose @ 2013-01-17 17:08 UTC (permalink / raw)
To: Williams, Mitch A
Cc: e1000-devel@lists.sourceforge.net, Stefan Assmann,
Andy Gospodarek, netdev@vger.kernel.org
In-Reply-To: <AAEA33E297BCAC4B9BB20A7C2DF0AB8D2A3468AE@FMSMSX107.amr.corp.intel.com>
On Wed, 16 Jan 2013 16:42:30 -0800
"Williams, Mitch A" <mitch.a.williams@intel.com> wrote:
> > -----Original Message-----
> > From: Rose, Gregory V
> > Sent: Tuesday, January 15, 2013 10:32 AM
> > To: Andy Gospodarek
> > Cc: Williams, Mitch A; Stefan Assmann; netdev@vger.kernel.org;
> > e1000- devel@lists.sourceforge.net
> > Subject: Re: [E1000-devel] [PATCH net-next] igbvf: fix setting
> > addr_assign_type if PF is up
> >
> > On Mon, 14 Jan 2013 17:25:42 -0500
> > Andy Gospodarek <andy@greyhouse.net> wrote:
> >
> > > On Wed, Jan 09, 2013 at 01:37:45PM -0800, Greg Rose wrote:
> > > > On Wed, 9 Jan 2013 18:56:36 +0000
> > > > "Williams, Mitch A" <mitch.a.williams@intel.com> wrote:
> > > >
> > > > > > >> When the PF is up and igbvf is loaded the MAC address is
> > > > > > >> not generated using eth_hw_addr_random(). This results in
> > > > > > >> addr_assign_type not to be set.
> > > > > > >> Make sure it gets set.
> > > > > > >>
> > > > > > >
> > > > > > > NAK - In this case, the address may or may not be random.
> > > > > > > The user may have (and should have!) explicitly set this
> > > > > > > address from the host to ensure that the VF device
> > > > > > > receives the same address each time it
> > > > > > boots.
> > > > > >
> > > > > > Maybe you can give me some advice on this then. Why is there
> > > > > > different behaviour depending on the PF being up or down?
> > > > > > The problem I'm facing is that if the user did not set a
> > > > > > MAC address for the VF manually and the PF is up during
> > > > > > igbvf_probe it will not be labelled as random although it
> > > > > > is. What about checking IGB_VF_FLAG_PF_SET_MAC and only set
> > > > > > NET_ADDR_RANDOM if the flag is cleared?
> > > > > >
> > > > >
> > > > > The difference in behavior is because we cannot get any MAC
> > > > > address at all if the PF is down. The interface won't operate
> > > > > at all in this case, but if the PF comes up sometime later,
> > > > > we can start working. The other alternative is to leave the
> > > > > MAC address as all zeros and forcing the user to assign an
> > > > > address manually. We chose to use a random address to at
> > > > > least give it a chance of working once the PF woke up.
> > > >
> > > > Having been around at the inception of SR-IOV in Linux I recall
> > > > that the primary reason we used a random ethernet address was
> > > > so that the VF could at least work because there was no
> > > > infrastructure to allow the host administrator to set the MAC
> > > > address of the VF. This hobbled testing and validation because
> > > > the user would have to go to each VM and use a command local to
> > > > the VM to set the VF MAC address to some LAA via ifconfig or
> > > > ip. When testing large numbers of VFs this was a definite pain.
> > > >
> > > > Now that has changed and I wonder if maybe we shouldn't back
> > > > out the random ethernet address assignment and go ahead with
> > > > all zeros, leaving the device non-functional until the user has
> > > > intentionally set either an LAA through the VF itself, or an
> > > > administratively assigned MAC through the ip tool via the PF.
> > > >
> > > > Use of the random MAC address is not recommended by Intel's own
> > > > best known methods literature, it was used mostly so that we
> > > > could get the technology working and it should probably be at
> > > > least considered for deprecation or out right elimination.
> > > >
> > >
> > > It would be great to remove the bits that created random MAC
> > > addresses for VFs, but wouldn't that break Linus' rule to "not
> > > break userspace" if it was removed?
> >
> > It may, I'm not sure but before we make any changes we'd want to do
> > our due diligence.
> >
> > >
> > > There are 2 options that immediately come to mind when looking to
> > > resolve this:
> > >
> > > 1. Use some of the left-over bits in the mailbox messages to pass
> > > along a flag with the E1000_VF_RESET messages to indicate whether
> > > the MAC was randomly generated. This would be pretty easy, but
> > > there could be compatibility issues for a while.
> >
> > We recently introduced the concept of mailbox message API versions
> > in our PF and VF drivers to handle this sort of thing. We could
> > probably leverage that method to introduce a new API version that
> > supports the additional bits in the reset message. It would only
> > be used if the VF could negotiate to the proper mailbox message API
> > version with the PF.
> >
> > >
> > > 2. Default to a MAC address of all zeros, and as a device with
> > > all-zeros for a MAC is brought up, randomly create one with
> > > eth_hw_addr_random. This may not immediately help cases where
> > > device assignment are a problem, but it would ensure that any
> > > device with a random MAC as assigned by the kernel, would have
> > > NET_ADDR_RANDOM set in addr_assign_type.
> >
> > Thanks for the suggestions. We're considering some changes in this
> > area but we (Intel) need to give this a lot of thought and right
> > now we're just in a preliminary discussion mode about it. Stay
> > tuned.
> >
> > - Greg
>
> OK, here's what I'm thinking. We don't need to change the
> communications protocol for this, and it shouldn't break userspace.
>
> First, have the PF driver quit assigning random addresses. It will
> either give the VF the address assigned by the administrator, or it
> will give all zeros.
>
> Second, modify the VF driver init sequence slightly. If it gets all
> zeros from the PF driver, then it should give itself a random address
> and set NET_ADDR_RANDOM.
>
> If we do it this way, the VF will still come up with a random address
> if one has not been assigned, and it will always know whether or not
> the address that it is using is random.
>
> If there are no objections, I'll try to get some patches done in the
> next few days and get them into our internal test queue. These would
> then escape into the real world in a few weeks.
>
> -Mitch
I'll second and third Andy and Stefan and say go for it. I'll look
into making equivalent changes for the 82599 and X540 10G drivers.
thanks Mitch,
- Greg
------------------------------------------------------------------------------
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. ON SALE this month only -- learn more at:
http://p.sf.net/sfu/learnmore_122712
_______________________________________________
E1000-devel mailing list
E1000-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/e1000-devel
To learn more about Intel® Ethernet, visit http://communities.intel.com/community/wired
^ permalink raw reply
* Re: [net-next 09/14] igb: Report L4 Rx hash via skb->l4_rxhash
From: Eric Dumazet @ 2013-01-17 17:14 UTC (permalink / raw)
To: Alexander Duyck; +Cc: Jeff Kirsher, davem, netdev, gospo, sassmann
In-Reply-To: <50F82FCA.9090709@intel.com>
On Thu, 2013-01-17 at 09:07 -0800, Alexander Duyck wrote:
> Isn't the same true of TCP? I believe STT is intended to run over the
> TCP protocol, or am I getting ahead of myself since STT is not supported
> by the kernel?
>
probably ;)
> > Also, is IGB really using the ports in the rss for UDP packets ?
>
> Not by default. The default is to only hash on the IP header for UDP
> packets.
>
> As such the default would only be setting the l4_rxhash on TCP frames
> only. The user would have to specifically request L4 port hashing for
> UDP via the "ethtool -N" command for configuring rx-flow-hash.
So you should rewrite this patch ?
Or have I missed something ?
^ permalink raw reply
* [PATCH] 3c574_cs: fix operator precedence between << and &
From: Nickolai Zeldovich @ 2013-01-17 17:18 UTC (permalink / raw)
To: netdev; +Cc: Nickolai Zeldovich, linux-kernel
The code to print the FIFO size in tc574_config computes it as:
8 << config & Ram_size
which evaluates the '<<' first, but the actual intent is to evaluate the
'&' first. Add parentheses to enforce desired evaluation order.
Signed-off-by: Nickolai Zeldovich <nickolai@csail.mit.edu>
---
drivers/net/ethernet/3com/3c574_cs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/3com/3c574_cs.c b/drivers/net/ethernet/3com/3c574_cs.c
index 66df936..ffd8de2 100644
--- a/drivers/net/ethernet/3com/3c574_cs.c
+++ b/drivers/net/ethernet/3com/3c574_cs.c
@@ -432,7 +432,7 @@ static int tc574_config(struct pcmcia_device *link)
netdev_info(dev, "%s at io %#3lx, irq %d, hw_addr %pM\n",
cardname, dev->base_addr, dev->irq, dev->dev_addr);
netdev_info(dev, " %dK FIFO split %s Rx:Tx, %sMII interface.\n",
- 8 << config & Ram_size,
+ 8 << (config & Ram_size),
ram_split[(config & Ram_split) >> Ram_split_shift],
config & Autoselect ? "autoselect " : "");
--
1.7.10.4
^ permalink raw reply related
* Re: [net-next 09/14] igb: Report L4 Rx hash via skb->l4_rxhash
From: Alexander Duyck @ 2013-01-17 17:23 UTC (permalink / raw)
To: Eric Dumazet; +Cc: Jeff Kirsher, davem, netdev, gospo, sassmann
In-Reply-To: <1358442889.29723.58.camel@edumazet-glaptop>
On 01/17/2013 09:14 AM, Eric Dumazet wrote:
> On Thu, 2013-01-17 at 09:07 -0800, Alexander Duyck wrote:
>
>> Isn't the same true of TCP? I believe STT is intended to run over the
>> TCP protocol, or am I getting ahead of myself since STT is not supported
>> by the kernel?
>>
>
> probably ;)
>
>>> Also, is IGB really using the ports in the rss for UDP packets ?
>>
>> Not by default. The default is to only hash on the IP header for UDP
>> packets.
>>
>> As such the default would only be setting the l4_rxhash on TCP frames
>> only. The user would have to specifically request L4 port hashing for
>> UDP via the "ethtool -N" command for configuring rx-flow-hash.
>
> So you should rewrite this patch ?
>
> Or have I missed something ?
I'm probably going to scrap it. No point in rewriting it.
I has assumed that there were other uses for the l4_rxhash value. If
all it is meant for is to indicate that the inner header of a tunnel was
used to compute the hash then there isn't much point to adding support
for this in igb/ixgbe since they don't support any inner header hashing.
It might add value at some point to rename the l4_rxhash flag to
something else though since it seems like there are now tunnels that are
encapsulated inside of l4 headers and it is going to get confusing.
Thanks,
Alex
^ permalink raw reply
* pull request: wireless 2013-01-17
From: John W. Linville @ 2013-01-17 17:32 UTC (permalink / raw)
To: davem; +Cc: linux-wireless, netdev, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 23445 bytes --]
(This message comes to you from Santa Clara, CA -- where I found
frost on the windshield this morning!)
Dave,
This batch of fixes is intended for 3.8...
Included is a Bluetooth pull. Gustavo says:
"A few fixes for 3.8. Five of them are just new devices ids addition.
Apart from the that there is fix to a kernel memory leak to userspace from
Anderson Lizardo, two interoperability fixes from Jaganath Kanakkassery and
Szymon Janc. And a crash fix by me."
Along with that, Amitkumar Karwar brings a pair of mwifiex fixes for
problems related to handling of band information within the driver.
These problems can lead to association failures.
Sujith Manoharan fixes a memory leak in the ath9k_htc code (originally
reported by Larry Finger).
The big hero this round is Felix Fietkau. Felix gives us seven
ath9k fixes, including a fix for a race condition, the removal of a
double-free, and a fix for a deadlock, among others.
These have all been in linux-next for at least a couple of days,
with no complaints so far. Please let me know if there are problems!
Thanks,
John
---
The following changes since commit fa1e492aa3cbafba9f8fc6d05e5b08a3091daf4a:
ipv4: Don't update the pmtu on mtu locked routes (2013-01-17 03:39:36 -0500)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem
for you to fetch changes up to 811477de5f6d65baea69f25cb5528d428b82cc9c:
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem (2013-01-17 12:07:44 -0500)
----------------------------------------------------------------
AceLan Kao (3):
Bluetooth: Add support for IMC Networks [13d3:3393]
Bluetooth: Add support for Foxconn / Hon Hai [0489:e04e]
Bluetooth: Add support for Foxconn / Hon Hai [0489:e056]
Amitkumar Karwar (2):
mwifiex: update config_bands during infra association
mwifiex: correct config_bands handling for ibss network
Anderson Lizardo (1):
Bluetooth: Fix incorrect strncpy() in hidp_setup_hid()
Daniel Schaal (1):
Bluetooth: Add support for GC-WB300D PCIe [04ca:3006] to ath3k.
Felix Fietkau (7):
ath9k: do not link receive buffers during flush
ath9k: fix double-free bug on beacon generate failure
ath9k: remove the WARN_ON that triggers if generating a beacon fails
ath9k: add a better fix for the rx tasklet vs rx flush race
ath9k: fix rx flush handling
ath9k: remove sc->rx.rxbuflock to fix a deadlock
ath9k: disable the tasklet before taking the PCU lock
Gustavo Padovan (1):
Bluetooth: Check if the hci connection exists in SCO shutdown
Jaganath Kanakkassery (1):
Bluetooth: Fix authentication if acl data comes before remote feature evt
John W. Linville (1):
Merge branch 'master' of git://git.kernel.org/.../linville/wireless into for-davem
Piotr Haber (1):
brcmsmac: increase timer reference count for new timers only
Sergio Cambra (1):
Bluetooth device 04ca:3008 should use ath3k
Sujith Manoharan (1):
ath9k_htc: Fix memory leak
Szymon Janc (1):
Bluetooth: Fix sending HCI commands after reset
drivers/bluetooth/ath3k.c | 10 ++++
drivers/bluetooth/btusb.c | 5 ++
drivers/net/wireless/ath/ath9k/ath9k.h | 3 --
drivers/net/wireless/ath/ath9k/beacon.c | 2 +-
drivers/net/wireless/ath/ath9k/debug.c | 1 -
drivers/net/wireless/ath/ath9k/debug.h | 2 -
drivers/net/wireless/ath/ath9k/htc_hst.c | 2 +
drivers/net/wireless/ath/ath9k/main.c | 19 +++-----
drivers/net/wireless/ath/ath9k/recv.c | 54 ++++++----------------
.../net/wireless/brcm80211/brcmsmac/mac80211_if.c | 7 +--
drivers/net/wireless/mwifiex/cfg80211.c | 17 +------
drivers/net/wireless/mwifiex/sta_ioctl.c | 14 ++++++
net/bluetooth/hci_core.c | 8 ----
net/bluetooth/hci_event.c | 2 +-
net/bluetooth/hidp/core.c | 2 +-
net/bluetooth/l2cap_core.c | 11 +++++
net/bluetooth/sco.c | 2 +-
17 files changed, 73 insertions(+), 88 deletions(-)
diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c
index b00000e..33c9a44 100644
--- a/drivers/bluetooth/ath3k.c
+++ b/drivers/bluetooth/ath3k.c
@@ -77,10 +77,15 @@ static struct usb_device_id ath3k_table[] = {
{ USB_DEVICE(0x0CF3, 0x311D) },
{ USB_DEVICE(0x13d3, 0x3375) },
{ USB_DEVICE(0x04CA, 0x3005) },
+ { USB_DEVICE(0x04CA, 0x3006) },
+ { USB_DEVICE(0x04CA, 0x3008) },
{ USB_DEVICE(0x13d3, 0x3362) },
{ USB_DEVICE(0x0CF3, 0xE004) },
{ USB_DEVICE(0x0930, 0x0219) },
{ USB_DEVICE(0x0489, 0xe057) },
+ { USB_DEVICE(0x13d3, 0x3393) },
+ { USB_DEVICE(0x0489, 0xe04e) },
+ { USB_DEVICE(0x0489, 0xe056) },
/* Atheros AR5BBU12 with sflash firmware */
{ USB_DEVICE(0x0489, 0xE02C) },
@@ -104,10 +109,15 @@ static struct usb_device_id ath3k_blist_tbl[] = {
{ USB_DEVICE(0x0cf3, 0x311D), .driver_info = BTUSB_ATH3012 },
{ USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },
{ USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },
+ { USB_DEVICE(0x04ca, 0x3006), .driver_info = BTUSB_ATH3012 },
+ { USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 },
{ USB_DEVICE(0x13d3, 0x3362), .driver_info = BTUSB_ATH3012 },
{ USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 },
{ USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },
{ USB_DEVICE(0x0489, 0xe057), .driver_info = BTUSB_ATH3012 },
+ { USB_DEVICE(0x13d3, 0x3393), .driver_info = BTUSB_ATH3012 },
+ { USB_DEVICE(0x0489, 0xe04e), .driver_info = BTUSB_ATH3012 },
+ { USB_DEVICE(0x0489, 0xe056), .driver_info = BTUSB_ATH3012 },
/* Atheros AR5BBU22 with sflash firmware */
{ USB_DEVICE(0x0489, 0xE03C), .driver_info = BTUSB_ATH3012 },
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index a1d4ede..7e351e3 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -135,10 +135,15 @@ static struct usb_device_id blacklist_table[] = {
{ USB_DEVICE(0x0cf3, 0x311d), .driver_info = BTUSB_ATH3012 },
{ USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },
{ USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },
+ { USB_DEVICE(0x04ca, 0x3006), .driver_info = BTUSB_ATH3012 },
+ { USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 },
{ USB_DEVICE(0x13d3, 0x3362), .driver_info = BTUSB_ATH3012 },
{ USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 },
{ USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },
{ USB_DEVICE(0x0489, 0xe057), .driver_info = BTUSB_ATH3012 },
+ { USB_DEVICE(0x13d3, 0x3393), .driver_info = BTUSB_ATH3012 },
+ { USB_DEVICE(0x0489, 0xe04e), .driver_info = BTUSB_ATH3012 },
+ { USB_DEVICE(0x0489, 0xe056), .driver_info = BTUSB_ATH3012 },
/* Atheros AR5BBU12 with sflash firmware */
{ USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE },
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
index 86e26a1..42794c5 100644
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -317,7 +317,6 @@ struct ath_rx {
u32 *rxlink;
u32 num_pkts;
unsigned int rxfilter;
- spinlock_t rxbuflock;
struct list_head rxbuf;
struct ath_descdma rxdma;
struct ath_buf *rx_bufptr;
@@ -328,7 +327,6 @@ struct ath_rx {
int ath_startrecv(struct ath_softc *sc);
bool ath_stoprecv(struct ath_softc *sc);
-void ath_flushrecv(struct ath_softc *sc);
u32 ath_calcrxfilter(struct ath_softc *sc);
int ath_rx_init(struct ath_softc *sc, int nbufs);
void ath_rx_cleanup(struct ath_softc *sc);
@@ -646,7 +644,6 @@ void ath_ant_comb_update(struct ath_softc *sc);
enum sc_op_flags {
SC_OP_INVALID,
SC_OP_BEACONS,
- SC_OP_RXFLUSH,
SC_OP_ANI_RUN,
SC_OP_PRIM_STA_VIF,
SC_OP_HW_RESET,
diff --git a/drivers/net/wireless/ath/ath9k/beacon.c b/drivers/net/wireless/ath/ath9k/beacon.c
index 531fffd..2ca355e 100644
--- a/drivers/net/wireless/ath/ath9k/beacon.c
+++ b/drivers/net/wireless/ath/ath9k/beacon.c
@@ -147,6 +147,7 @@ static struct ath_buf *ath9k_beacon_generate(struct ieee80211_hw *hw,
skb->len, DMA_TO_DEVICE);
dev_kfree_skb_any(skb);
bf->bf_buf_addr = 0;
+ bf->bf_mpdu = NULL;
}
skb = ieee80211_beacon_get(hw, vif);
@@ -359,7 +360,6 @@ void ath9k_beacon_tasklet(unsigned long data)
return;
bf = ath9k_beacon_generate(sc->hw, vif);
- WARN_ON(!bf);
if (sc->beacon.bmisscnt != 0) {
ath_dbg(common, BSTUCK, "resume beacon xmit after %u misses\n",
diff --git a/drivers/net/wireless/ath/ath9k/debug.c b/drivers/net/wireless/ath/ath9k/debug.c
index 13ff9ed..e585fc8 100644
--- a/drivers/net/wireless/ath/ath9k/debug.c
+++ b/drivers/net/wireless/ath/ath9k/debug.c
@@ -861,7 +861,6 @@ static ssize_t read_file_recv(struct file *file, char __user *user_buf,
RXS_ERR("RX-LENGTH-ERR", rx_len_err);
RXS_ERR("RX-OOM-ERR", rx_oom_err);
RXS_ERR("RX-RATE-ERR", rx_rate_err);
- RXS_ERR("RX-DROP-RXFLUSH", rx_drop_rxflush);
RXS_ERR("RX-TOO-MANY-FRAGS", rx_too_many_frags_err);
PHY_ERR("UNDERRUN ERR", ATH9K_PHYERR_UNDERRUN);
diff --git a/drivers/net/wireless/ath/ath9k/debug.h b/drivers/net/wireless/ath/ath9k/debug.h
index 375c3b4..6df2ab6 100644
--- a/drivers/net/wireless/ath/ath9k/debug.h
+++ b/drivers/net/wireless/ath/ath9k/debug.h
@@ -216,7 +216,6 @@ struct ath_tx_stats {
* @rx_oom_err: No. of frames dropped due to OOM issues.
* @rx_rate_err: No. of frames dropped due to rate errors.
* @rx_too_many_frags_err: Frames dropped due to too-many-frags received.
- * @rx_drop_rxflush: No. of frames dropped due to RX-FLUSH.
* @rx_beacons: No. of beacons received.
* @rx_frags: No. of rx-fragements received.
*/
@@ -235,7 +234,6 @@ struct ath_rx_stats {
u32 rx_oom_err;
u32 rx_rate_err;
u32 rx_too_many_frags_err;
- u32 rx_drop_rxflush;
u32 rx_beacons;
u32 rx_frags;
};
diff --git a/drivers/net/wireless/ath/ath9k/htc_hst.c b/drivers/net/wireless/ath/ath9k/htc_hst.c
index 4a9570d..aac4a40 100644
--- a/drivers/net/wireless/ath/ath9k/htc_hst.c
+++ b/drivers/net/wireless/ath/ath9k/htc_hst.c
@@ -344,6 +344,8 @@ void ath9k_htc_txcompletion_cb(struct htc_target *htc_handle,
endpoint->ep_callbacks.tx(endpoint->ep_callbacks.priv,
skb, htc_hdr->endpoint_id,
txok);
+ } else {
+ kfree_skb(skb);
}
}
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index be30a9a..3796e65 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -182,7 +182,7 @@ static void ath_restart_work(struct ath_softc *sc)
ath_start_ani(sc);
}
-static bool ath_prepare_reset(struct ath_softc *sc, bool retry_tx, bool flush)
+static bool ath_prepare_reset(struct ath_softc *sc, bool retry_tx)
{
struct ath_hw *ah = sc->sc_ah;
bool ret = true;
@@ -202,14 +202,6 @@ static bool ath_prepare_reset(struct ath_softc *sc, bool retry_tx, bool flush)
if (!ath_drain_all_txq(sc, retry_tx))
ret = false;
- if (!flush) {
- if (ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)
- ath_rx_tasklet(sc, 1, true);
- ath_rx_tasklet(sc, 1, false);
- } else {
- ath_flushrecv(sc);
- }
-
return ret;
}
@@ -262,11 +254,11 @@ static int ath_reset_internal(struct ath_softc *sc, struct ath9k_channel *hchan,
struct ath_common *common = ath9k_hw_common(ah);
struct ath9k_hw_cal_data *caldata = NULL;
bool fastcc = true;
- bool flush = false;
int r;
__ath_cancel_work(sc);
+ tasklet_disable(&sc->intr_tq);
spin_lock_bh(&sc->sc_pcu_lock);
if (!(sc->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL)) {
@@ -276,11 +268,10 @@ static int ath_reset_internal(struct ath_softc *sc, struct ath9k_channel *hchan,
if (!hchan) {
fastcc = false;
- flush = true;
hchan = ah->curchan;
}
- if (!ath_prepare_reset(sc, retry_tx, flush))
+ if (!ath_prepare_reset(sc, retry_tx))
fastcc = false;
ath_dbg(common, CONFIG, "Reset to %u MHz, HT40: %d fastcc: %d\n",
@@ -302,6 +293,8 @@ static int ath_reset_internal(struct ath_softc *sc, struct ath9k_channel *hchan,
out:
spin_unlock_bh(&sc->sc_pcu_lock);
+ tasklet_enable(&sc->intr_tq);
+
return r;
}
@@ -804,7 +797,7 @@ static void ath9k_stop(struct ieee80211_hw *hw)
ath9k_hw_cfg_gpio_input(ah, ah->led_pin);
}
- ath_prepare_reset(sc, false, true);
+ ath_prepare_reset(sc, false);
if (sc->rx.frag) {
dev_kfree_skb_any(sc->rx.frag);
diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c
index d4df98a..90752f2 100644
--- a/drivers/net/wireless/ath/ath9k/recv.c
+++ b/drivers/net/wireless/ath/ath9k/recv.c
@@ -254,8 +254,6 @@ rx_init_fail:
static void ath_edma_start_recv(struct ath_softc *sc)
{
- spin_lock_bh(&sc->rx.rxbuflock);
-
ath9k_hw_rxena(sc->sc_ah);
ath_rx_addbuffer_edma(sc, ATH9K_RX_QUEUE_HP,
@@ -267,8 +265,6 @@ static void ath_edma_start_recv(struct ath_softc *sc)
ath_opmode_init(sc);
ath9k_hw_startpcureceive(sc->sc_ah, !!(sc->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL));
-
- spin_unlock_bh(&sc->rx.rxbuflock);
}
static void ath_edma_stop_recv(struct ath_softc *sc)
@@ -285,8 +281,6 @@ int ath_rx_init(struct ath_softc *sc, int nbufs)
int error = 0;
spin_lock_init(&sc->sc_pcu_lock);
- spin_lock_init(&sc->rx.rxbuflock);
- clear_bit(SC_OP_RXFLUSH, &sc->sc_flags);
common->rx_bufsize = IEEE80211_MAX_MPDU_LEN / 2 +
sc->sc_ah->caps.rx_status_len;
@@ -447,7 +441,6 @@ int ath_startrecv(struct ath_softc *sc)
return 0;
}
- spin_lock_bh(&sc->rx.rxbuflock);
if (list_empty(&sc->rx.rxbuf))
goto start_recv;
@@ -468,26 +461,31 @@ start_recv:
ath_opmode_init(sc);
ath9k_hw_startpcureceive(ah, !!(sc->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL));
- spin_unlock_bh(&sc->rx.rxbuflock);
-
return 0;
}
+static void ath_flushrecv(struct ath_softc *sc)
+{
+ if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)
+ ath_rx_tasklet(sc, 1, true);
+ ath_rx_tasklet(sc, 1, false);
+}
+
bool ath_stoprecv(struct ath_softc *sc)
{
struct ath_hw *ah = sc->sc_ah;
bool stopped, reset = false;
- spin_lock_bh(&sc->rx.rxbuflock);
ath9k_hw_abortpcurecv(ah);
ath9k_hw_setrxfilter(ah, 0);
stopped = ath9k_hw_stopdmarecv(ah, &reset);
+ ath_flushrecv(sc);
+
if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)
ath_edma_stop_recv(sc);
else
sc->rx.rxlink = NULL;
- spin_unlock_bh(&sc->rx.rxbuflock);
if (!(ah->ah_flags & AH_UNPLUGGED) &&
unlikely(!stopped)) {
@@ -499,15 +497,6 @@ bool ath_stoprecv(struct ath_softc *sc)
return stopped && !reset;
}
-void ath_flushrecv(struct ath_softc *sc)
-{
- set_bit(SC_OP_RXFLUSH, &sc->sc_flags);
- if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)
- ath_rx_tasklet(sc, 1, true);
- ath_rx_tasklet(sc, 1, false);
- clear_bit(SC_OP_RXFLUSH, &sc->sc_flags);
-}
-
static bool ath_beacon_dtim_pending_cab(struct sk_buff *skb)
{
/* Check whether the Beacon frame has DTIM indicating buffered bc/mc */
@@ -744,6 +733,7 @@ static struct ath_buf *ath_get_next_rx_buf(struct ath_softc *sc,
return NULL;
}
+ list_del(&bf->list);
if (!bf->bf_mpdu)
return bf;
@@ -1059,16 +1049,12 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
dma_type = DMA_FROM_DEVICE;
qtype = hp ? ATH9K_RX_QUEUE_HP : ATH9K_RX_QUEUE_LP;
- spin_lock_bh(&sc->rx.rxbuflock);
tsf = ath9k_hw_gettsf64(ah);
tsf_lower = tsf & 0xffffffff;
do {
bool decrypt_error = false;
- /* If handling rx interrupt and flush is in progress => exit */
- if (test_bit(SC_OP_RXFLUSH, &sc->sc_flags) && (flush == 0))
- break;
memset(&rs, 0, sizeof(rs));
if (edma)
@@ -1111,15 +1097,6 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
ath_debug_stat_rx(sc, &rs);
- /*
- * If we're asked to flush receive queue, directly
- * chain it back at the queue without processing it.
- */
- if (test_bit(SC_OP_RXFLUSH, &sc->sc_flags)) {
- RX_STAT_INC(rx_drop_rxflush);
- goto requeue_drop_frag;
- }
-
memset(rxs, 0, sizeof(struct ieee80211_rx_status));
rxs->mactime = (tsf & ~0xffffffffULL) | rs.rs_tstamp;
@@ -1254,19 +1231,18 @@ requeue_drop_frag:
sc->rx.frag = NULL;
}
requeue:
+ list_add_tail(&bf->list, &sc->rx.rxbuf);
+ if (flush)
+ continue;
+
if (edma) {
- list_add_tail(&bf->list, &sc->rx.rxbuf);
ath_rx_edma_buf_link(sc, qtype);
} else {
- list_move_tail(&bf->list, &sc->rx.rxbuf);
ath_rx_buf_link(sc, bf);
- if (!flush)
- ath9k_hw_rxena(ah);
+ ath9k_hw_rxena(ah);
}
} while (1);
- spin_unlock_bh(&sc->rx.rxbuflock);
-
if (!(ah->imask & ATH9K_INT_RXEOL)) {
ah->imask |= (ATH9K_INT_RXEOL | ATH9K_INT_RXORN);
ath9k_hw_set_interrupts(ah);
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
index 1fbd8ec..0f71d1d 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
@@ -1407,9 +1407,10 @@ void brcms_add_timer(struct brcms_timer *t, uint ms, int periodic)
#endif
t->ms = ms;
t->periodic = (bool) periodic;
- t->set = true;
-
- atomic_inc(&t->wl->callbacks);
+ if (!t->set) {
+ t->set = true;
+ atomic_inc(&t->wl->callbacks);
+ }
ieee80211_queue_delayed_work(hw, &t->dly_wrk, msecs_to_jiffies(ms));
}
diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c
index efe525b..cdb11b3 100644
--- a/drivers/net/wireless/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/mwifiex/cfg80211.c
@@ -1459,7 +1459,7 @@ mwifiex_cfg80211_assoc(struct mwifiex_private *priv, size_t ssid_len, u8 *ssid,
struct cfg80211_ssid req_ssid;
int ret, auth_type = 0;
struct cfg80211_bss *bss = NULL;
- u8 is_scanning_required = 0, config_bands = 0;
+ u8 is_scanning_required = 0;
memset(&req_ssid, 0, sizeof(struct cfg80211_ssid));
@@ -1478,19 +1478,6 @@ mwifiex_cfg80211_assoc(struct mwifiex_private *priv, size_t ssid_len, u8 *ssid,
/* disconnect before try to associate */
mwifiex_deauthenticate(priv, NULL);
- if (channel) {
- if (mode == NL80211_IFTYPE_STATION) {
- if (channel->band == IEEE80211_BAND_2GHZ)
- config_bands = BAND_B | BAND_G | BAND_GN;
- else
- config_bands = BAND_A | BAND_AN;
-
- if (!((config_bands | priv->adapter->fw_bands) &
- ~priv->adapter->fw_bands))
- priv->adapter->config_bands = config_bands;
- }
- }
-
/* As this is new association, clear locally stored
* keys and security related flags */
priv->sec_info.wpa_enabled = false;
@@ -1707,7 +1694,7 @@ static int mwifiex_set_ibss_params(struct mwifiex_private *priv,
if (cfg80211_get_chandef_type(¶ms->chandef) !=
NL80211_CHAN_NO_HT)
- config_bands |= BAND_GN;
+ config_bands |= BAND_G | BAND_GN;
} else {
if (cfg80211_get_chandef_type(¶ms->chandef) ==
NL80211_CHAN_NO_HT)
diff --git a/drivers/net/wireless/mwifiex/sta_ioctl.c b/drivers/net/wireless/mwifiex/sta_ioctl.c
index 60e88b5..f542bb8 100644
--- a/drivers/net/wireless/mwifiex/sta_ioctl.c
+++ b/drivers/net/wireless/mwifiex/sta_ioctl.c
@@ -283,6 +283,20 @@ int mwifiex_bss_start(struct mwifiex_private *priv, struct cfg80211_bss *bss,
if (ret)
goto done;
+ if (bss_desc) {
+ u8 config_bands = 0;
+
+ if (mwifiex_band_to_radio_type((u8) bss_desc->bss_band)
+ == HostCmd_SCAN_RADIO_TYPE_BG)
+ config_bands = BAND_B | BAND_G | BAND_GN;
+ else
+ config_bands = BAND_A | BAND_AN;
+
+ if (!((config_bands | adapter->fw_bands) &
+ ~adapter->fw_bands))
+ adapter->config_bands = config_bands;
+ }
+
ret = mwifiex_check_network_compatibility(priv, bss_desc);
if (ret)
goto done;
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 596660d..0f78e34 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -2810,14 +2810,6 @@ static void hci_acldata_packet(struct hci_dev *hdev, struct sk_buff *skb)
if (conn) {
hci_conn_enter_active_mode(conn, BT_POWER_FORCE_ACTIVE_OFF);
- hci_dev_lock(hdev);
- if (test_bit(HCI_MGMT, &hdev->dev_flags) &&
- !test_and_set_bit(HCI_CONN_MGMT_CONNECTED, &conn->flags))
- mgmt_device_connected(hdev, &conn->dst, conn->type,
- conn->dst_type, 0, NULL, 0,
- conn->dev_class);
- hci_dev_unlock(hdev);
-
/* Send to upper protocol */
l2cap_recv_acldata(conn, skb, flags);
return;
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 705078a..81b4448 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -2688,7 +2688,7 @@ static void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
if (ev->opcode != HCI_OP_NOP)
del_timer(&hdev->cmd_timer);
- if (ev->ncmd) {
+ if (ev->ncmd && !test_bit(HCI_RESET, &hdev->flags)) {
atomic_set(&hdev->cmd_cnt, 1);
if (!skb_queue_empty(&hdev->cmd_q))
queue_work(hdev->workqueue, &hdev->cmd_work);
diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c
index b2bcbe2..a7352ff 100644
--- a/net/bluetooth/hidp/core.c
+++ b/net/bluetooth/hidp/core.c
@@ -931,7 +931,7 @@ static int hidp_setup_hid(struct hidp_session *session,
hid->version = req->version;
hid->country = req->country;
- strncpy(hid->name, req->name, 128);
+ strncpy(hid->name, req->name, sizeof(req->name) - 1);
snprintf(hid->phys, sizeof(hid->phys), "%pMR",
&bt_sk(session->ctrl_sock->sk)->src);
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 2c78208..22e6583 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -3727,6 +3727,17 @@ sendresp:
static int l2cap_connect_req(struct l2cap_conn *conn,
struct l2cap_cmd_hdr *cmd, u8 *data)
{
+ struct hci_dev *hdev = conn->hcon->hdev;
+ struct hci_conn *hcon = conn->hcon;
+
+ hci_dev_lock(hdev);
+ if (test_bit(HCI_MGMT, &hdev->dev_flags) &&
+ !test_and_set_bit(HCI_CONN_MGMT_CONNECTED, &hcon->flags))
+ mgmt_device_connected(hdev, &hcon->dst, hcon->type,
+ hcon->dst_type, 0, NULL, 0,
+ hcon->dev_class);
+ hci_dev_unlock(hdev);
+
l2cap_connect(conn, cmd, data, L2CAP_CONN_RSP, 0);
return 0;
}
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index 531a93d..57f250c 100644
--- a/net/bluetooth/sco.c
+++ b/net/bluetooth/sco.c
@@ -352,7 +352,7 @@ static void __sco_sock_close(struct sock *sk)
case BT_CONNECTED:
case BT_CONFIG:
- if (sco_pi(sk)->conn) {
+ if (sco_pi(sk)->conn->hcon) {
sk->sk_state = BT_DISCONN;
sco_sock_set_timer(sk, SCO_DISCONN_TIMEOUT);
hci_conn_put(sco_pi(sk)->conn->hcon);
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply related
* [PATCH net-next 00/11] IPv6: rt->n (neighbour in rt6_info) removal (TAKE 3)
From: YOSHIFUJI Hideaki @ 2013-01-17 17:41 UTC (permalink / raw)
To: davem, netdev; +Cc: yoshfuji, xiyou.wangcong
This is "TAKE 3" of neighbour removal from rt6_info.
2->3:
- Removed "icmp6_dst_alloc() removal" patch.
This is nothing to do with this series.
- Removed several unused variables, ifdefs, BUG_ONs.
- Handled several comments from Cong Wang.
- Reordered.
---
YOSHIFUJI Hideaki (11):
ndisc: Update neigh->updated with write lock.
ndisc: Remove tbl argument for __ipv6_neigh_lookup().
ipv6 route: Dump gateway based on RTF_GATEWAY flag and
rt->rt6i_gateway.
ndisc: Introduce __ipv6_neigh_lookup_noref().
ipv6: Do not depend on rt->n in ip6_pol_route().
ipv6: Do not depend on rt->n in rt6_check_neigh().
ipv6: Do not depend on rt->n in rt6_probe().
ipv6: Introduce rt6_nexthop() to select nexthop address.
ipv6: Do not depend on rt->n in ip6_dst_lookup_tail().
ipv6: Do not depend on rt->n in ip6_finish_output2().
ipv6: Complete neighbour entry removal from dst_entry.
include/net/ip6_fib.h | 2 -
include/net/ip6_route.h | 8 +++
include/net/ndisc.h | 24 ++++++---
net/ipv6/ip6_output.c | 26 ++++++---
net/ipv6/route.c | 138 ++++++++++++-----------------------------------
net/ipv6/xfrm6_policy.c | 1 -
6 files changed, 76 insertions(+), 123 deletions(-)
--
1.7.9.5
^ permalink raw reply
* [PATCH net-next 01/11] ndisc: Update neigh->updated with write lock.
From: YOSHIFUJI Hideaki @ 2013-01-17 17:41 UTC (permalink / raw)
To: davem, netdev; +Cc: yoshfuji, xiyou.wangcong
neigh->nud_state and neigh->updated are under protection of
neigh->lock.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
---
net/ipv6/route.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 7c34c01..1341f68 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -499,22 +499,26 @@ static void rt6_probe(struct rt6_info *rt)
* to no more than one per minute.
*/
neigh = rt ? rt->n : NULL;
- if (!neigh || (neigh->nud_state & NUD_VALID))
+ if (!neigh)
+ return;
+ write_lock_bh(&neigh->lock);
+ if (neigh->nud_state & NUD_VALID) {
+ write_unlock_bh(&neigh->lock);
return;
- read_lock_bh(&neigh->lock);
+ }
if (!(neigh->nud_state & NUD_VALID) &&
time_after(jiffies, neigh->updated + rt->rt6i_idev->cnf.rtr_probe_interval)) {
struct in6_addr mcaddr;
struct in6_addr *target;
neigh->updated = jiffies;
- read_unlock_bh(&neigh->lock);
+ write_unlock_bh(&neigh->lock);
target = (struct in6_addr *)&neigh->primary_key;
addrconf_addr_solict_mult(target, &mcaddr);
ndisc_send_ns(rt->dst.dev, NULL, target, &mcaddr, NULL);
} else {
- read_unlock_bh(&neigh->lock);
+ write_unlock_bh(&neigh->lock);
}
}
#else
--
1.7.9.5
^ permalink raw reply related
* [PATCH net-next 02/11] ndisc: Remove tbl argument for __ipv6_neigh_lookup().
From: YOSHIFUJI Hideaki @ 2013-01-17 17:41 UTC (permalink / raw)
To: davem, netdev; +Cc: yoshfuji, xiyou.wangcong
We can refer to nd_tbl directly.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
---
include/net/ndisc.h | 4 ++--
net/ipv6/route.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/net/ndisc.h b/include/net/ndisc.h
index 23b3a7c..bbc938e 100644
--- a/include/net/ndisc.h
+++ b/include/net/ndisc.h
@@ -148,7 +148,7 @@ static inline u32 ndisc_hashfn(const void *pkey, const struct net_device *dev, _
(p32[3] * hash_rnd[3]));
}
-static inline struct neighbour *__ipv6_neigh_lookup(struct neigh_table *tbl, struct net_device *dev, const void *pkey)
+static inline struct neighbour *__ipv6_neigh_lookup(struct net_device *dev, const void *pkey)
{
struct neigh_hash_table *nht;
const u32 *p32 = pkey;
@@ -156,7 +156,7 @@ static inline struct neighbour *__ipv6_neigh_lookup(struct neigh_table *tbl, str
u32 hash_val;
rcu_read_lock_bh();
- nht = rcu_dereference_bh(tbl->nht);
+ nht = rcu_dereference_bh(nd_tbl.nht);
hash_val = ndisc_hashfn(pkey, dev, nht->hash_rnd) >> (32 - nht->hash_shift);
for (n = rcu_dereference_bh(nht->hash_buckets[hash_val]);
n != NULL;
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 1341f68..5d9ca27 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -145,7 +145,7 @@ static struct neighbour *ip6_neigh_lookup(const struct dst_entry *dst,
struct neighbour *n;
daddr = choose_neigh_daddr(rt, skb, daddr);
- n = __ipv6_neigh_lookup(&nd_tbl, dst->dev, daddr);
+ n = __ipv6_neigh_lookup(dst->dev, daddr);
if (n)
return n;
return neigh_create(&nd_tbl, daddr, dst->dev);
@@ -153,7 +153,7 @@ static struct neighbour *ip6_neigh_lookup(const struct dst_entry *dst,
static int rt6_bind_neighbour(struct rt6_info *rt, struct net_device *dev)
{
- struct neighbour *n = __ipv6_neigh_lookup(&nd_tbl, dev, &rt->rt6i_gateway);
+ struct neighbour *n = __ipv6_neigh_lookup(dev, &rt->rt6i_gateway);
if (!n) {
n = neigh_create(&nd_tbl, &rt->rt6i_gateway, dev);
if (IS_ERR(n))
--
1.7.9.5
^ permalink raw reply related
* [PATCH net-next 03/11] ipv6 route: Dump gateway based on RTF_GATEWAY flag and rt->rt6i_gateway.
From: YOSHIFUJI Hideaki @ 2013-01-17 17:42 UTC (permalink / raw)
To: davem, netdev; +Cc: yoshfuji, xiyou.wangcong
Do not depend on rt->n.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
---
net/ipv6/route.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 5d9ca27..d82eb1f 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -2484,7 +2484,6 @@ static int rt6_fill_node(struct net *net,
struct nlmsghdr *nlh;
long expires;
u32 table;
- struct neighbour *n;
if (prefix) { /* user wants prefix routes only */
if (!(rt->rt6i_flags & RTF_PREFIX_RT)) {
@@ -2597,9 +2596,8 @@ static int rt6_fill_node(struct net *net,
if (rtnetlink_put_metrics(skb, dst_metrics_ptr(&rt->dst)) < 0)
goto nla_put_failure;
- n = rt->n;
- if (n) {
- if (nla_put(skb, RTA_GATEWAY, 16, &n->primary_key) < 0)
+ if (rt->rt6i_flags & RTF_GATEWAY) {
+ if (nla_put(skb, RTA_GATEWAY, 16, &rt->rt6i_gateway) < 0)
goto nla_put_failure;
}
@@ -2794,7 +2792,6 @@ struct rt6_proc_arg
static int rt6_info_route(struct rt6_info *rt, void *p_arg)
{
struct seq_file *m = p_arg;
- struct neighbour *n;
seq_printf(m, "%pi6 %02x ", &rt->rt6i_dst.addr, rt->rt6i_dst.plen);
@@ -2803,9 +2800,8 @@ static int rt6_info_route(struct rt6_info *rt, void *p_arg)
#else
seq_puts(m, "00000000000000000000000000000000 00 ");
#endif
- n = rt->n;
- if (n) {
- seq_printf(m, "%pi6", n->primary_key);
+ if (rt->rt6i_flags & RTF_GATEWAY) {
+ seq_printf(m, "%pi6", &rt->rt6i_gateway);
} else {
seq_puts(m, "00000000000000000000000000000000");
}
--
1.7.9.5
^ permalink raw reply related
* [PATCH net-next 04/11] ndisc: Introduce __ipv6_neigh_lookup_noref().
From: YOSHIFUJI Hideaki @ 2013-01-17 17:42 UTC (permalink / raw)
To: davem, netdev; +Cc: yoshfuji, xiyou.wangcong
This function, which looks up neighbour entry for an IPv6 address
without touching refcnt, will be used for patches to remove
dependency on rt->n (neighbour entry in rt6_info).
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
---
include/net/ndisc.h | 22 +++++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)
diff --git a/include/net/ndisc.h b/include/net/ndisc.h
index bbc938e..ec48f42 100644
--- a/include/net/ndisc.h
+++ b/include/net/ndisc.h
@@ -148,14 +148,13 @@ static inline u32 ndisc_hashfn(const void *pkey, const struct net_device *dev, _
(p32[3] * hash_rnd[3]));
}
-static inline struct neighbour *__ipv6_neigh_lookup(struct net_device *dev, const void *pkey)
+static inline struct neighbour *__ipv6_neigh_lookup_noref(struct net_device *dev, const void *pkey)
{
struct neigh_hash_table *nht;
const u32 *p32 = pkey;
struct neighbour *n;
u32 hash_val;
- rcu_read_lock_bh();
nht = rcu_dereference_bh(nd_tbl.nht);
hash_val = ndisc_hashfn(pkey, dev, nht->hash_rnd) >> (32 - nht->hash_shift);
for (n = rcu_dereference_bh(nht->hash_buckets[hash_val]);
@@ -164,12 +163,21 @@ static inline struct neighbour *__ipv6_neigh_lookup(struct net_device *dev, cons
u32 *n32 = (u32 *) n->primary_key;
if (n->dev == dev &&
((n32[0] ^ p32[0]) | (n32[1] ^ p32[1]) |
- (n32[2] ^ p32[2]) | (n32[3] ^ p32[3])) == 0) {
- if (!atomic_inc_not_zero(&n->refcnt))
- n = NULL;
- break;
- }
+ (n32[2] ^ p32[2]) | (n32[3] ^ p32[3])) == 0)
+ return n;
}
+
+ return NULL;
+}
+
+static inline struct neighbour *__ipv6_neigh_lookup(struct net_device *dev, const void *pkey)
+{
+ struct neighbour *n;
+
+ rcu_read_lock_bh();
+ n = __ipv6_neigh_lookup_noref(dev, pkey);
+ if (n && !atomic_inc_not_zero(&n->refcnt))
+ n = NULL;
rcu_read_unlock_bh();
return n;
--
1.7.9.5
^ permalink raw reply related
* [PATCH net-next 05/11] ipv6: Do not depend on rt->n in ip6_pol_route().
From: YOSHIFUJI Hideaki @ 2013-01-17 17:42 UTC (permalink / raw)
To: davem, netdev; +Cc: yoshfuji, xiyou.wangcong
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
---
net/ipv6/route.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index d82eb1f..2839381 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -925,7 +925,7 @@ restart:
dst_hold(&rt->dst);
read_unlock_bh(&table->tb6_lock);
- if (!rt->n && !(rt->rt6i_flags & RTF_NONEXTHOP))
+ if (!(rt->rt6i_flags & (RTF_NONEXTHOP | RTF_GATEWAY)))
nrt = rt6_alloc_cow(rt, &fl6->daddr, &fl6->saddr);
else if (!(rt->dst.flags & DST_HOST))
nrt = rt6_alloc_clone(rt, &fl6->daddr);
--
1.7.9.5
^ permalink raw reply related
* [PATCH net-next 06/11] ipv6: Do not depend on rt->n in rt6_check_neigh().
From: YOSHIFUJI Hideaki @ 2013-01-17 17:42 UTC (permalink / raw)
To: davem, netdev; +Cc: yoshfuji, xiyou.wangcong
CC: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
---
net/ipv6/route.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 2839381..c7bcd77 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -546,20 +546,24 @@ static inline bool rt6_check_neigh(struct rt6_info *rt)
struct neighbour *neigh;
bool ret = false;
- neigh = rt->n;
if (rt->rt6i_flags & RTF_NONEXTHOP ||
!(rt->rt6i_flags & RTF_GATEWAY))
- ret = true;
- else if (neigh) {
- read_lock_bh(&neigh->lock);
+ return true;
+
+ rcu_read_lock_bh();
+ neigh = __ipv6_neigh_lookup_noref(rt->dst.dev, &rt->rt6i_gateway);
+ if (neigh) {
+ read_lock(&neigh->lock);
if (neigh->nud_state & NUD_VALID)
ret = true;
#ifdef CONFIG_IPV6_ROUTER_PREF
else if (!(neigh->nud_state & NUD_FAILED))
ret = true;
#endif
- read_unlock_bh(&neigh->lock);
+ read_unlock(&neigh->lock);
}
+ rcu_read_unlock_bh();
+
return ret;
}
--
1.7.9.5
^ permalink raw reply related
* [PATCH net-next 07/11] ipv6: Do not depend on rt->n in rt6_probe().
From: YOSHIFUJI Hideaki @ 2013-01-17 17:42 UTC (permalink / raw)
To: davem, netdev; +Cc: yoshfuji, xiyou.wangcong
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
---
net/ipv6/route.c | 26 ++++++++++++++++----------
1 file changed, 16 insertions(+), 10 deletions(-)
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index c7bcd77..afc8386 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -498,28 +498,34 @@ static void rt6_probe(struct rt6_info *rt)
* Router Reachability Probe MUST be rate-limited
* to no more than one per minute.
*/
- neigh = rt ? rt->n : NULL;
- if (!neigh)
- return;
- write_lock_bh(&neigh->lock);
- if (neigh->nud_state & NUD_VALID) {
- write_unlock_bh(&neigh->lock);
+ if (!rt || !(rt->rt6i_flags & RTF_GATEWAY))
return;
+ rcu_read_lock_bh();
+ neigh = __ipv6_neigh_lookup_noref(rt->dst.dev, &rt->rt6i_gateway);
+ if (neigh) {
+ write_lock(&neigh->lock);
+ if (neigh->nud_state & NUD_VALID)
+ goto out;
}
- if (!(neigh->nud_state & NUD_VALID) &&
+
+ if (!neigh ||
time_after(jiffies, neigh->updated + rt->rt6i_idev->cnf.rtr_probe_interval)) {
struct in6_addr mcaddr;
struct in6_addr *target;
neigh->updated = jiffies;
- write_unlock_bh(&neigh->lock);
- target = (struct in6_addr *)&neigh->primary_key;
+ if (neigh)
+ write_unlock(&neigh->lock);
+
+ target = (struct in6_addr *)&rt->rt6i_gateway;
addrconf_addr_solict_mult(target, &mcaddr);
ndisc_send_ns(rt->dst.dev, NULL, target, &mcaddr, NULL);
} else {
- write_unlock_bh(&neigh->lock);
+out:
+ write_unlock(&neigh->lock);
}
+ rcu_read_unlock_bh();
}
#else
static inline void rt6_probe(struct rt6_info *rt)
--
1.7.9.5
^ permalink raw reply related
* [PATCH net-next 08/11] ipv6: Introduce rt6_nexthop() to select nexthop address.
From: YOSHIFUJI Hideaki @ 2013-01-17 17:43 UTC (permalink / raw)
To: davem, netdev; +Cc: yoshfuji, xiyou.wangcong
For RTF_GATEWAY route, return rt->rt6i_gateway.
Otherwise, return 2nd argument (destination address).
This will be used by following patches which remove rt->n
dependency patches in ip6_dst_lookup_tail() and ip6_finish_output2().
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
---
include/net/ip6_route.h | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
index 27d8318..30cbb15 100644
--- a/include/net/ip6_route.h
+++ b/include/net/ip6_route.h
@@ -23,6 +23,7 @@ struct route_info {
#include <net/sock.h>
#include <linux/ip.h>
#include <linux/ipv6.h>
+#include <linux/route.h>
#define RT6_LOOKUP_F_IFACE 0x00000001
#define RT6_LOOKUP_F_REACHABLE 0x00000002
@@ -194,4 +195,11 @@ static inline int ip6_skb_dst_mtu(struct sk_buff *skb)
skb_dst(skb)->dev->mtu : dst_mtu(skb_dst(skb));
}
+static inline struct in6_addr *rt6_nexthop(struct rt6_info *rt, struct in6_addr *dest)
+{
+ if (rt->rt6i_flags & RTF_GATEWAY)
+ return &rt->rt6i_gateway;
+ return dest;
+}
+
#endif
--
1.7.9.5
^ permalink raw reply related
* [PATCH net-next 09/11] ipv6: Do not depend on rt->n in ip6_dst_lookup_tail().
From: YOSHIFUJI Hideaki @ 2013-01-17 17:43 UTC (permalink / raw)
To: davem, netdev; +Cc: yoshfuji, xiyou.wangcong
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
---
net/ipv6/ip6_output.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index 9250c69..7c00edb 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -913,8 +913,12 @@ static int ip6_dst_lookup_tail(struct sock *sk,
* dst entry of the nexthop router
*/
rt = (struct rt6_info *) *dst;
- n = rt->n;
- if (n && !(n->nud_state & NUD_VALID)) {
+ rcu_read_lock_bh();
+ n = __ipv6_neigh_lookup_noref(rt->dst.dev, rt6_nexthop(rt, &fl6->daddr));
+ err = n && !(n->nud_state & NUD_VALID) ? -EINVAL : 0;
+ rcu_read_unlock_bh();
+
+ if (err) {
struct inet6_ifaddr *ifp;
struct flowi6 fl_gw6;
int redirect;
--
1.7.9.5
^ permalink raw reply related
* [PATCH net-next 10/11] ipv6: Do not depend on rt->n in ip6_finish_output2().
From: YOSHIFUJI Hideaki @ 2013-01-17 17:43 UTC (permalink / raw)
To: davem, netdev; +Cc: yoshfuji, xiyou.wangcong
If neigh is not found, create new one.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
---
net/ipv6/ip6_output.c | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index 7c00edb..b2fe048 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -88,7 +88,8 @@ static int ip6_finish_output2(struct sk_buff *skb)
struct dst_entry *dst = skb_dst(skb);
struct net_device *dev = dst->dev;
struct neighbour *neigh;
- struct rt6_info *rt;
+ struct in6_addr *nexthop;
+ int ret;
skb->protocol = htons(ETH_P_IPV6);
skb->dev = dev;
@@ -123,10 +124,17 @@ static int ip6_finish_output2(struct sk_buff *skb)
skb->len);
}
- rt = (struct rt6_info *) dst;
- neigh = rt->n;
- if (neigh)
- return dst_neigh_output(dst, neigh, skb);
+ rcu_read_lock_bh();
+ nexthop = rt6_nexthop((struct rt6_info *)dst, &ipv6_hdr(skb)->daddr);
+ neigh = __ipv6_neigh_lookup_noref(dst->dev, nexthop);
+ if (unlikely(!neigh))
+ neigh = __neigh_create(&nd_tbl, nexthop, dst->dev, false);
+ if (neigh) {
+ ret = dst_neigh_output(dst, neigh, skb);
+ rcu_read_unlock_bh();
+ return ret;
+ }
+ rcu_read_unlock_bh();
IP6_INC_STATS_BH(dev_net(dst->dev),
ip6_dst_idev(dst), IPSTATS_MIB_OUTNOROUTES);
--
1.7.9.5
^ permalink raw reply related
* [PATCH net-next 11/11] ipv6: Complete neighbour entry removal from dst_entry.
From: YOSHIFUJI Hideaki @ 2013-01-17 17:43 UTC (permalink / raw)
To: davem, netdev; +Cc: yoshfuji, xiyou.wangcong
CC: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
---
include/net/ip6_fib.h | 2 --
net/ipv6/route.c | 84 +----------------------------------------------
net/ipv6/xfrm6_policy.c | 1 -
3 files changed, 1 insertion(+), 86 deletions(-)
diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h
index fdc48a9..6919a50 100644
--- a/include/net/ip6_fib.h
+++ b/include/net/ip6_fib.h
@@ -89,8 +89,6 @@ struct fib6_table;
struct rt6_info {
struct dst_entry dst;
- struct neighbour *n;
-
/*
* Tail elements of dst_entry (__refcnt etc.)
* and these elements (rarely used in hot path) are in
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index afc8386..3a562a1 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -151,19 +151,6 @@ static struct neighbour *ip6_neigh_lookup(const struct dst_entry *dst,
return neigh_create(&nd_tbl, daddr, dst->dev);
}
-static int rt6_bind_neighbour(struct rt6_info *rt, struct net_device *dev)
-{
- struct neighbour *n = __ipv6_neigh_lookup(dev, &rt->rt6i_gateway);
- if (!n) {
- n = neigh_create(&nd_tbl, &rt->rt6i_gateway, dev);
- if (IS_ERR(n))
- return PTR_ERR(n);
- }
- rt->n = n;
-
- return 0;
-}
-
static struct dst_ops ip6_dst_ops_template = {
.family = AF_INET6,
.protocol = cpu_to_be16(ETH_P_IPV6),
@@ -301,9 +288,6 @@ static void ip6_dst_destroy(struct dst_entry *dst)
struct rt6_info *rt = (struct rt6_info *)dst;
struct inet6_dev *idev = rt->rt6i_idev;
- if (rt->n)
- neigh_release(rt->n);
-
if (!(rt->dst.flags & DST_HOST))
dst_destroy_metrics_generic(dst);
@@ -354,11 +338,6 @@ static void ip6_dst_ifdown(struct dst_entry *dst, struct net_device *dev,
in6_dev_put(idev);
}
}
- if (rt->n && rt->n->dev == dev) {
- rt->n->dev = loopback_dev;
- dev_hold(loopback_dev);
- dev_put(dev);
- }
}
}
@@ -845,8 +824,6 @@ static struct rt6_info *rt6_alloc_cow(struct rt6_info *ort,
rt = ip6_rt_copy(ort, daddr);
if (rt) {
- int attempts = !in_softirq();
-
if (!(rt->rt6i_flags & RTF_GATEWAY)) {
if (ort->rt6i_dst.plen != 128 &&
ipv6_addr_equal(&ort->rt6i_dst.addr, daddr))
@@ -862,32 +839,6 @@ static struct rt6_info *rt6_alloc_cow(struct rt6_info *ort,
rt->rt6i_src.plen = 128;
}
#endif
-
- retry:
- if (rt6_bind_neighbour(rt, rt->dst.dev)) {
- struct net *net = dev_net(rt->dst.dev);
- int saved_rt_min_interval =
- net->ipv6.sysctl.ip6_rt_gc_min_interval;
- int saved_rt_elasticity =
- net->ipv6.sysctl.ip6_rt_gc_elasticity;
-
- if (attempts-- > 0) {
- net->ipv6.sysctl.ip6_rt_gc_elasticity = 1;
- net->ipv6.sysctl.ip6_rt_gc_min_interval = 0;
-
- ip6_dst_gc(&net->ipv6.ip6_dst_ops);
-
- net->ipv6.sysctl.ip6_rt_gc_elasticity =
- saved_rt_elasticity;
- net->ipv6.sysctl.ip6_rt_gc_min_interval =
- saved_rt_min_interval;
- goto retry;
- }
-
- net_warn_ratelimited("Neighbour table overflow\n");
- dst_free(&rt->dst);
- return NULL;
- }
}
return rt;
@@ -898,10 +849,8 @@ static struct rt6_info *rt6_alloc_clone(struct rt6_info *ort,
{
struct rt6_info *rt = ip6_rt_copy(ort, daddr);
- if (rt) {
+ if (rt)
rt->rt6i_flags |= RTF_CACHE;
- rt->n = neigh_clone(ort->n);
- }
return rt;
}
@@ -1272,20 +1221,8 @@ struct dst_entry *icmp6_dst_alloc(struct net_device *dev,
goto out;
}
- if (neigh)
- neigh_hold(neigh);
- else {
- neigh = ip6_neigh_lookup(&rt->dst, NULL, &fl6->daddr);
- if (IS_ERR(neigh)) {
- in6_dev_put(idev);
- dst_free(&rt->dst);
- return ERR_CAST(neigh);
- }
- }
-
rt->dst.flags |= DST_HOST;
rt->dst.output = ip6_output;
- rt->n = neigh;
atomic_set(&rt->dst.__refcnt, 1);
rt->rt6i_dst.addr = fl6->daddr;
rt->rt6i_dst.plen = 128;
@@ -1594,12 +1531,6 @@ int ip6_route_add(struct fib6_config *cfg)
} else
rt->rt6i_prefsrc.plen = 0;
- if (cfg->fc_flags & (RTF_GATEWAY | RTF_NONEXTHOP)) {
- err = rt6_bind_neighbour(rt, dev);
- if (err)
- goto out;
- }
-
rt->rt6i_flags = cfg->fc_flags;
install_route:
@@ -1713,7 +1644,6 @@ static void rt6_do_redirect(struct dst_entry *dst, struct sock *sk, struct sk_bu
struct netevent_redirect netevent;
struct rt6_info *rt, *nrt = NULL;
struct ndisc_options ndopts;
- struct neighbour *old_neigh;
struct inet6_dev *in6_dev;
struct neighbour *neigh;
struct rd_msg *msg;
@@ -1786,11 +1716,6 @@ static void rt6_do_redirect(struct dst_entry *dst, struct sock *sk, struct sk_bu
if (!neigh)
return;
- /* Duplicate redirect: silently ignore. */
- old_neigh = rt->n;
- if (neigh == old_neigh)
- goto out;
-
/*
* We have finally decided to accept it.
*/
@@ -1811,7 +1736,6 @@ static void rt6_do_redirect(struct dst_entry *dst, struct sock *sk, struct sk_bu
nrt->rt6i_flags &= ~RTF_GATEWAY;
nrt->rt6i_gateway = *(struct in6_addr *)neigh->primary_key;
- nrt->n = neigh_clone(neigh);
if (ip6_ins_rt(nrt))
goto out;
@@ -2125,7 +2049,6 @@ struct rt6_info *addrconf_dst_alloc(struct inet6_dev *idev,
{
struct net *net = dev_net(idev->dev);
struct rt6_info *rt = ip6_dst_alloc(net, net->loopback_dev, 0, NULL);
- int err;
if (!rt) {
net_warn_ratelimited("Maximum number of routes reached, consider increasing route/max_size\n");
@@ -2144,11 +2067,6 @@ struct rt6_info *addrconf_dst_alloc(struct inet6_dev *idev,
rt->rt6i_flags |= RTF_ANYCAST;
else
rt->rt6i_flags |= RTF_LOCAL;
- err = rt6_bind_neighbour(rt, rt->dst.dev);
- if (err) {
- dst_free(&rt->dst);
- return ERR_PTR(err);
- }
rt->rt6i_dst.addr = *addr;
rt->rt6i_dst.plen = 128;
diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
index c984413..1282737 100644
--- a/net/ipv6/xfrm6_policy.c
+++ b/net/ipv6/xfrm6_policy.c
@@ -110,7 +110,6 @@ static int xfrm6_fill_dst(struct xfrm_dst *xdst, struct net_device *dev,
/* Sheit... I remember I did this right. Apparently,
* it was magically lost, so this code needs audit */
- xdst->u.rt6.n = neigh_clone(rt->n);
xdst->u.rt6.rt6i_flags = rt->rt6i_flags & (RTF_ANYCAST |
RTF_LOCAL);
xdst->u.rt6.rt6i_metric = rt->rt6i_metric;
--
1.7.9.5
^ permalink raw reply related
* netrom circular locking dependency detected
From: f6bvp @ 2013-01-17 18:21 UTC (permalink / raw)
To: linux-hams, Linux Netdev List, Ralf Baechle
[-- Attachment #1: Type: text/plain, Size: 183 bytes --]
Hi,
Circular locking I reported a while ago is still present in kernel 3.7.2
netrom module.
I include here /var/log/kernel relevant details for information.
73 de Bernard, f6bvp
[-- Attachment #2: nr_circular_locking.txt --]
[-- Type: text/plain, Size: 12393 bytes --]
Jan 13 12:05:39 f6bvp-8 kernel: [76938.785965]
Jan 13 12:05:39 f6bvp-8 kernel: [76938.785980] ======================================================
Jan 13 12:05:39 f6bvp-8 kernel: [76938.785984] [ INFO: possible circular locking dependency detected ]
Jan 13 12:05:39 f6bvp-8 kernel: [76938.785989] 3.7.2 #2 Not tainted
Jan 13 12:05:39 f6bvp-8 kernel: [76938.785993] -------------------------------------------------------
Jan 13 12:05:39 f6bvp-8 kernel: [76938.785997] ax25ipd/2093 is trying to acquire lock:
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786001] (nr_node_list_lock){+.-...}, at: [<ffffffffa06025ec>] nr_rt_device_down+0x7c/0x240 [netrom]
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006]
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] but task is already holding lock:
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] (nr_neigh_list_lock){+.-...}, at: [<ffffffffa0602596>] nr_rt_device_down+0x26/0x240 [netrom]
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006]
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] which lock already depends on the new lock.
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006]
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006]
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] the existing dependency chain (in reverse order) is:
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006]
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] -> #2 (nr_neigh_list_lock){+.-...}:
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff810b80a2>] lock_acquire+0x92/0x120
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff81491616>] _raw_spin_lock_bh+0x36/0x50
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffffa06019eb>] nr_remove_neigh+0x1b/0xb0 [netrom]
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffffa0602c20>] nr_rt_ioctl+0x2b0/0xa60 [netrom]
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffffa05fefa1>] nr_ioctl+0x51/0x1d0 [netrom]
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff813a3cd0>] sock_do_ioctl+0x30/0x70
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff813a4029>] sock_ioctl+0x79/0x2f0
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff81190808>] do_vfs_ioctl+0x98/0x560
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff81190d61>] sys_ioctl+0x91/0xb0
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff8149a869>] system_call_fastpath+0x16/0x1b
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006]
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] -> #1 (&(&nr_node->node_lock)->rlock){+.-...}:
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff810b80a2>] lock_acquire+0x92/0x120
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff81491616>] _raw_spin_lock_bh+0x36/0x50
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffffa0601acc>] nr_node_show+0x4c/0x150 [netrom]
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff811a158c>] seq_read+0x26c/0x420
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff811e7226>] proc_reg_read+0x86/0xc0
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff8117ed1c>] vfs_read+0xac/0x180
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff8117ee42>] sys_read+0x52/0xa0
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff8149a869>] system_call_fastpath+0x16/0x1b
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006]
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] -> #0 (nr_node_list_lock){+.-...}:
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff810b78b3>] __lock_acquire+0x1c13/0x1e40
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff810b80a2>] lock_acquire+0x92/0x120
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff81491616>] _raw_spin_lock_bh+0x36/0x50
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffffa06025ec>] nr_rt_device_down+0x7c/0x240 [netrom]
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffffa05ffb4d>] nr_device_event+0x7d/0xa0 [netrom]
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff814961c8>] notifier_call_chain+0x58/0xb0
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff810824e6>] raw_notifier_call_chain+0x16/0x20
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff813bac06>] call_netdevice_notifiers+0x36/0x60
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff813badff>] dev_close_many+0xbf/0x100
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff813baf18>] rollback_registered_many+0xd8/0x240
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff813bb11d>] rollback_registered+0x2d/0x40
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff813bdea8>] unregister_netdevice_queue+0x68/0xc0
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff813bdf20>] unregister_netdev+0x20/0x30
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffffa05f34e7>] mkiss_close+0x57/0x90 [mkiss]
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff81313861>] tty_ldisc_close.isra.2+0x41/0x60
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff81313ad0>] tty_ldisc_reinit+0x40/0x80
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff81314287>] tty_ldisc_hangup+0x197/0x340
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff8130b86a>] __tty_hangup+0x10a/0x3c0
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff8130bb4e>] tty_vhangup+0xe/0x10
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff813161d9>] pty_close+0x109/0x180
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff8130cb06>] tty_release+0x156/0x580
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff8117fd5e>] __fput+0xae/0x230
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff8117feee>] ____fput+0xe/0x10
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff8107811c>] task_work_run+0xbc/0xe0
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff8105b4cf>] do_exit+0x17f/0x8f0
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff8105c0be>] do_group_exit+0x4e/0xc0
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff8105c147>] sys_exit_group+0x17/0x20
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff8149a869>] system_call_fastpath+0x16/0x1b
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006]
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] other info that might help us debug this:
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006]
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] Chain exists of:
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] nr_node_list_lock --> &(&nr_node->node_lock)->rlock --> nr_neigh_list_lock
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006]
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] Possible unsafe locking scenario:
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006]
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] CPU0 CPU1
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] ---- ----
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] lock(nr_neigh_list_lock);
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] lock(&(&nr_node->node_lock)->rlock);
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] lock(nr_neigh_list_lock);
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] lock(nr_node_list_lock);
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006]
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] *** DEADLOCK ***
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006]
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] 4 locks held by ax25ipd/2093:
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] #0: (&tty->legacy_mutex){+.+.+.}, at: [<ffffffff81491d82>] tty_lock_nested+0x42/0x90
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] #1: (&tty->ldisc_mutex){+.+.+.}, at: [<ffffffff8131420a>] tty_ldisc_hangup+0x11a/0x340
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] #2: (rtnl_mutex){+.+.+.}, at: [<ffffffff813cd707>] rtnl_lock+0x17/0x20
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] #3: (nr_neigh_list_lock){+.-...}, at: [<ffffffffa0602596>] nr_rt_device_down+0x26/0x240 [netrom]
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006]
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] stack backtrace:
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] Pid: 2093, comm: ax25ipd Not tainted 3.7.2 #2
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] Call Trace:
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff814884e9>] print_circular_bug+0x289/0x29a
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff810b78b3>] __lock_acquire+0x1c13/0x1e40
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffffa06025ec>] ? nr_rt_device_down+0x7c/0x240 [netrom]
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff810b80a2>] lock_acquire+0x92/0x120
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffffa06025ec>] ? nr_rt_device_down+0x7c/0x240 [netrom]
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff81491616>] _raw_spin_lock_bh+0x36/0x50
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffffa06025ec>] ? nr_rt_device_down+0x7c/0x240 [netrom]
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff810b8b15>] ? trace_hardirqs_on_caller+0x105/0x190
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffffa05ffb41>] ? nr_device_event+0x71/0xa0 [netrom]
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffffa06025ec>] nr_rt_device_down+0x7c/0x240 [netrom]
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff8105e2c7>] ? local_bh_enable_ip+0x97/0x100
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffffa05ffb4d>] nr_device_event+0x7d/0xa0 [netrom]
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff814961c8>] notifier_call_chain+0x58/0xb0
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff810824e6>] raw_notifier_call_chain+0x16/0x20
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff813bac06>] call_netdevice_notifiers+0x36/0x60
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff813badff>] dev_close_many+0xbf/0x100
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff813baf18>] rollback_registered_many+0xd8/0x240
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff813bb11d>] rollback_registered+0x2d/0x40
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff813bdea8>] unregister_netdevice_queue+0x68/0xc0
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff813bdf20>] unregister_netdev+0x20/0x30
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffffa05f34e7>] mkiss_close+0x57/0x90 [mkiss]
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff81313861>] tty_ldisc_close.isra.2+0x41/0x60
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff81313ad0>] tty_ldisc_reinit+0x40/0x80
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff81314287>] tty_ldisc_hangup+0x197/0x340
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff8130b86a>] __tty_hangup+0x10a/0x3c0
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff8130bb4e>] tty_vhangup+0xe/0x10
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff813161d9>] pty_close+0x109/0x180
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff8130cb06>] tty_release+0x156/0x580
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff81195952>] ? dput+0x62/0x1b0
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff8117fd5e>] __fput+0xae/0x230
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff8117feee>] ____fput+0xe/0x10
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff8107811c>] task_work_run+0xbc/0xe0
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff8105b4cf>] do_exit+0x17f/0x8f0
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff81153008>] ? do_munmap+0x2c8/0x3a0
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff814920d8>] ? retint_swapgs+0x13/0x1b
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff8105c0be>] do_group_exit+0x4e/0xc0
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff8105c147>] sys_exit_group+0x17/0x20
Jan 13 12:05:39 f6bvp-8 kernel: [76938.786006] [<ffffffff8149a869>] system_call_fastpath+0x16/0x1b
Jan 13 12:06:20 f6bvp-8 kernel: [76979.963779] mkiss: ax0: crc mode is auto.
Jan 13 12:06:20 f6bvp-8 kernel: [76979.964864] IPv6: ADDRCONF(NETDEV_CHANGE): ax0: link becomes ready
^ permalink raw reply
* Re: [net-next 09/14] igb: Report L4 Rx hash via skb->l4_rxhash
From: Jesse Gross @ 2013-01-17 18:46 UTC (permalink / raw)
To: Alexander Duyck
Cc: Eric Dumazet, Jeff Kirsher, davem, netdev, gospo, sassmann
In-Reply-To: <50F8337E.9030302@intel.com>
On Thu, Jan 17, 2013 at 9:23 AM, Alexander Duyck
<alexander.h.duyck@intel.com> wrote:
> On 01/17/2013 09:14 AM, Eric Dumazet wrote:
>> On Thu, 2013-01-17 at 09:07 -0800, Alexander Duyck wrote:
>>
>>> Isn't the same true of TCP? I believe STT is intended to run over the
>>> TCP protocol, or am I getting ahead of myself since STT is not supported
>>> by the kernel?
>>>
>>
>> probably ;)
>>
>>>> Also, is IGB really using the ports in the rss for UDP packets ?
>>>
>>> Not by default. The default is to only hash on the IP header for UDP
>>> packets.
>>>
>>> As such the default would only be setting the l4_rxhash on TCP frames
>>> only. The user would have to specifically request L4 port hashing for
>>> UDP via the "ethtool -N" command for configuring rx-flow-hash.
>>
>> So you should rewrite this patch ?
>>
>> Or have I missed something ?
>
> I'm probably going to scrap it. No point in rewriting it.
>
> I has assumed that there were other uses for the l4_rxhash value. If
> all it is meant for is to indicate that the inner header of a tunnel was
> used to compute the hash then there isn't much point to adding support
> for this in igb/ixgbe since they don't support any inner header hashing.
>
> It might add value at some point to rename the l4_rxhash flag to
> something else though since it seems like there are now tunnels that are
> encapsulated inside of l4 headers and it is going to get confusing.
I think there is value in setting it for TCP since it is used by
things like RPS and VXLAN (on the encapsulation side, to generate the
source port).
Ultimately, the semantics that I think we are looking for here is
whether the software flow dissector would look deeper into the packet
than the NIC. In the case of STT, the answer to this is going to be
no, so there's no reason to not set the flag. Even for protocols like
VXLAN, in software we don't currently look deeply into the packet on
receive, so we could set it there as well. Both of these protocols
also have the advantage that the outer header contains an inner hash.
In the case of UDP tunnels, it would be nice to use the ports for RSS
since they often do contain these hashes. We just have to make sure
that they aren't IP fragments.
^ permalink raw reply
* [PATCH] net/xfrm/xfrm_replay: avoid division by zero
From: Nickolai Zeldovich @ 2013-01-17 18:58 UTC (permalink / raw)
To: Steffen Klassert, Herbert Xu, David S. Miller
Cc: Nickolai Zeldovich, netdev, linux-kernel
All of the xfrm_replay->advance functions in xfrm_replay.c check if
x->replay_esn->replay_window is zero (and return if so). However,
one of them, xfrm_replay_advance_bmp(), divides by that value (in the
'%' operator) before doing the check, which can potentially trigger
a divide-by-zero exception. Some compilers will also assume that the
earlier division means the value cannot be zero later, and thus will
eliminate the subsequent zero check as dead code.
This patch moves the division to after the check.
Signed-off-by: Nickolai Zeldovich <nickolai@csail.mit.edu>
---
net/xfrm/xfrm_replay.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/net/xfrm/xfrm_replay.c b/net/xfrm/xfrm_replay.c
index 765f6fe..35754cc 100644
--- a/net/xfrm/xfrm_replay.c
+++ b/net/xfrm/xfrm_replay.c
@@ -242,11 +242,13 @@ static void xfrm_replay_advance_bmp(struct xfrm_state *x, __be32 net_seq)
u32 diff;
struct xfrm_replay_state_esn *replay_esn = x->replay_esn;
u32 seq = ntohl(net_seq);
- u32 pos = (replay_esn->seq - 1) % replay_esn->replay_window;
+ u32 pos;
if (!replay_esn->replay_window)
return;
+ pos = (replay_esn->seq - 1) % replay_esn->replay_window;
+
if (seq > replay_esn->seq) {
diff = seq - replay_esn->seq;
--
1.7.10.4
^ permalink raw reply related
* Re: [PATCH 4/4 v3] net/smsc911x: Provide common clock functionality
From: David Miller @ 2013-01-17 19:36 UTC (permalink / raw)
To: lee.jones
Cc: linux, steve.glendinning, robert.marklund, linus.walleij, arnd,
netdev, linux-kernel, linux-arm-kernel, linus.walleij
In-Reply-To: <20130117104744.GP20091@gmail.com>
From: Lee Jones <lee.jones@linaro.org>
Date: Thu, 17 Jan 2013 10:47:44 +0000
> https://patchwork.kernel.org/patch/1926971/
I'm fine with this:
Acked-by: David S. Miller <davem@davemloft.net>
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox