Skip to content

Commit a493f1a

Browse files
rolanddrolandd
committed
Merge branches 'cxgb4', 'ipoib', 'misc' and 'qib' into for-next
4 parents 01b225e + 3874397 + 580da35 + 8ee887d commit a493f1a

File tree

9 files changed

+58
-43
lines changed

9 files changed

+58
-43
lines changed

‎drivers/infiniband/core/addr.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,9 @@ static int addr4_resolve(struct sockaddr_in *src_in,
216216

217217
neigh = neigh_lookup(&arp_tbl, &rt->rt_gateway, rt->dst.dev);
218218
if (!neigh || !(neigh->nud_state & NUD_VALID)) {
219+
rcu_read_lock();
219220
neigh_event_send(dst_get_neighbour(&rt->dst), NULL);
221+
rcu_read_unlock();
220222
ret = -ENODATA;
221223
if (neigh)
222224
goto release;
@@ -274,15 +276,16 @@ static int addr6_resolve(struct sockaddr_in6 *src_in,
274276
goto put;
275277
}
276278

279+
rcu_read_lock();
277280
neigh = dst_get_neighbour(dst);
278281
if (!neigh || !(neigh->nud_state & NUD_VALID)) {
279282
if (neigh)
280283
neigh_event_send(neigh, NULL);
281284
ret = -ENODATA;
282-
goto put;
285+
} else {
286+
ret = rdma_copy_addr(addr, dst->dev, neigh->ha);
283287
}
284-
285-
ret = rdma_copy_addr(addr, dst->dev, neigh->ha);
288+
rcu_read_unlock();
286289
put:
287290
dst_release(dst);
288291
return ret;

‎drivers/infiniband/hw/cxgb3/iwch_cm.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1375,8 +1375,10 @@ static int pass_accept_req(struct t3cdev *tdev, struct sk_buff *skb, void *ctx)
13751375
goto reject;
13761376
}
13771377
dst = &rt->dst;
1378+
rcu_read_lock();
13781379
neigh = dst_get_neighbour(dst);
13791380
l2t = t3_l2t_get(tdev, neigh, neigh->dev);
1381+
rcu_read_unlock();
13801382
if (!l2t) {
13811383
printk(KERN_ERR MOD "%s - failed to allocate l2t entry!\n",
13821384
__func__);
@@ -1946,10 +1948,12 @@ int iwch_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
19461948
}
19471949
ep->dst = &rt->dst;
19481950

1951+
rcu_read_lock();
19491952
neigh = dst_get_neighbour(ep->dst);
19501953

19511954
/* get a l2t entry */
19521955
ep->l2t = t3_l2t_get(ep->com.tdev, neigh, neigh->dev);
1956+
rcu_read_unlock();
19531957
if (!ep->l2t) {
19541958
printk(KERN_ERR MOD "%s - cannot alloc l2e.\n", __func__);
19551959
err = -ENOMEM;

‎drivers/infiniband/hw/cxgb4/cm.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1596,6 +1596,7 @@ static int pass_accept_req(struct c4iw_dev *dev, struct sk_buff *skb)
15961596
goto reject;
15971597
}
15981598
dst = &rt->dst;
1599+
rcu_read_lock();
15991600
neigh = dst_get_neighbour(dst);
16001601
if (neigh->dev->flags & IFF_LOOPBACK) {
16011602
pdev = ip_dev_find(&init_net, peer_ip);
@@ -1622,6 +1623,7 @@ static int pass_accept_req(struct c4iw_dev *dev, struct sk_buff *skb)
16221623
rss_qid = dev->rdev.lldi.rxq_ids[
16231624
cxgb4_port_idx(neigh->dev) * step];
16241625
}
1626+
rcu_read_unlock();
16251627
if (!l2t) {
16261628
printk(KERN_ERR MOD "%s - failed to allocate l2t entry!\n",
16271629
__func__);
@@ -1822,6 +1824,7 @@ static int c4iw_reconnect(struct c4iw_ep *ep)
18221824
}
18231825
ep->dst = &rt->dst;
18241826

1827+
rcu_read_lock();
18251828
neigh = dst_get_neighbour(ep->dst);
18261829

18271830
/* get a l2t entry */
@@ -1858,6 +1861,7 @@ static int c4iw_reconnect(struct c4iw_ep *ep)
18581861
ep->rss_qid = ep->com.dev->rdev.lldi.rxq_ids[
18591862
cxgb4_port_idx(neigh->dev) * step];
18601863
}
1864+
rcu_read_unlock();
18611865
if (!ep->l2t) {
18621866
printk(KERN_ERR MOD "%s - cannot alloc l2e.\n", __func__);
18631867
err = -ENOMEM;
@@ -2303,6 +2307,7 @@ int c4iw_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
23032307
}
23042308
ep->dst = &rt->dst;
23052309

2310+
rcu_read_lock();
23062311
neigh = dst_get_neighbour(ep->dst);
23072312

23082313
/* get a l2t entry */
@@ -2341,6 +2346,7 @@ int c4iw_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
23412346
ep->retry_with_mpa_v1 = 0;
23422347
ep->tried_with_mpa_v1 = 0;
23432348
}
2349+
rcu_read_unlock();
23442350
if (!ep->l2t) {
23452351
printk(KERN_ERR MOD "%s - cannot alloc l2e.\n", __func__);
23462352
err = -ENOMEM;

‎drivers/infiniband/hw/nes/nes_cm.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1377,9 +1377,11 @@ static int nes_addr_resolve_neigh(struct nes_vnic *nesvnic, u32 dst_ip, int arpi
13771377
neigh_release(neigh);
13781378
}
13791379

1380-
if ((neigh == NULL) || (!(neigh->nud_state & NUD_VALID)))
1380+
if ((neigh == NULL) || (!(neigh->nud_state & NUD_VALID))) {
1381+
rcu_read_lock();
13811382
neigh_event_send(dst_get_neighbour(&rt->dst), NULL);
1382-
1383+
rcu_read_unlock();
1384+
}
13831385
ip_rt_put(rt);
13841386
return rc;
13851387
}

‎drivers/infiniband/hw/qib/qib_iba7322.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2307,19 +2307,11 @@ static int qib_7322_bringup_serdes(struct qib_pportdata *ppd)
23072307
SYM_LSB(IBCCtrlA_0, MaxPktLen);
23082308
ppd->cpspec->ibcctrl_a = ibc; /* without linkcmd or linkinitcmd! */
23092309

2310-
/* initially come up waiting for TS1, without sending anything. */
2311-
val = ppd->cpspec->ibcctrl_a | (QLOGIC_IB_IBCC_LINKINITCMD_DISABLE <<
2312-
QLOGIC_IB_IBCC_LINKINITCMD_SHIFT);
2313-
2314-
ppd->cpspec->ibcctrl_a = val;
23152310
/*
23162311
* Reset the PCS interface to the serdes (and also ibc, which is still
23172312
* in reset from above). Writes new value of ibcctrl_a as last step.
23182313
*/
23192314
qib_7322_mini_pcs_reset(ppd);
2320-
qib_write_kreg(dd, kr_scratch, 0ULL);
2321-
/* clear the linkinit cmds */
2322-
ppd->cpspec->ibcctrl_a &= ~SYM_MASK(IBCCtrlA_0, LinkInitCmd);
23232315

23242316
if (!ppd->cpspec->ibcctrl_b) {
23252317
unsigned lse = ppd->link_speed_enabled;
@@ -2385,6 +2377,14 @@ static int qib_7322_bringup_serdes(struct qib_pportdata *ppd)
23852377
ppd->cpspec->ibcctrl_a |= SYM_MASK(IBCCtrlA_0, IBLinkEn);
23862378
set_vls(ppd);
23872379

2380+
/* initially come up DISABLED, without sending anything. */
2381+
val = ppd->cpspec->ibcctrl_a | (QLOGIC_IB_IBCC_LINKINITCMD_DISABLE <<
2382+
QLOGIC_IB_IBCC_LINKINITCMD_SHIFT);
2383+
qib_write_kreg_port(ppd, krp_ibcctrl_a, val);
2384+
qib_write_kreg(dd, kr_scratch, 0ULL);
2385+
/* clear the linkinit cmds */
2386+
ppd->cpspec->ibcctrl_a = val & ~SYM_MASK(IBCCtrlA_0, LinkInitCmd);
2387+
23882388
/* be paranoid against later code motion, etc. */
23892389
spin_lock_irqsave(&dd->cspec->rcvmod_lock, flags);
23902390
ppd->p_rcvctrl |= SYM_MASK(RcvCtrl_0, RcvIBPortEnable);
@@ -5241,7 +5241,7 @@ static int qib_7322_ib_updown(struct qib_pportdata *ppd, int ibup, u64 ibcs)
52415241
off */
52425242
if (ppd->dd->flags & QIB_HAS_QSFP) {
52435243
qd->t_insert = get_jiffies_64();
5244-
schedule_work(&qd->work);
5244+
queue_work(ib_wq, &qd->work);
52455245
}
52465246
spin_lock_irqsave(&ppd->sdma_lock, flags);
52475247
if (__qib_sdma_running(ppd))

‎drivers/infiniband/hw/qib/qib_qsfp.c

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -480,18 +480,6 @@ void qib_qsfp_init(struct qib_qsfp_data *qd,
480480
udelay(20); /* Generous RST dwell */
481481

482482
dd->f_gpio_mod(dd, mask, mask, mask);
483-
/* Spec says module can take up to two seconds! */
484-
mask = QSFP_GPIO_MOD_PRS_N;
485-
if (qd->ppd->hw_pidx)
486-
mask <<= QSFP_GPIO_PORT2_SHIFT;
487-
488-
/* Do not try to wait here. Better to let event handle it */
489-
if (!qib_qsfp_mod_present(qd->ppd))
490-
goto bail;
491-
/* We see a module, but it may be unwise to look yet. Just schedule */
492-
qd->t_insert = get_jiffies_64();
493-
queue_work(ib_wq, &qd->work);
494-
bail:
495483
return;
496484
}
497485

‎drivers/infiniband/ulp/ipoib/ipoib_ib.c

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,21 +57,24 @@ struct ipoib_ah *ipoib_create_ah(struct net_device *dev,
5757
struct ib_pd *pd, struct ib_ah_attr *attr)
5858
{
5959
struct ipoib_ah *ah;
60+
struct ib_ah *vah;
6061

6162
ah = kmalloc(sizeof *ah, GFP_KERNEL);
6263
if (!ah)
63-
return NULL;
64+
return ERR_PTR(-ENOMEM);
6465

6566
ah->dev = dev;
6667
ah->last_send = 0;
6768
kref_init(&ah->ref);
6869

69-
ah->ah = ib_create_ah(pd, attr);
70-
if (IS_ERR(ah->ah)) {
70+
vah = ib_create_ah(pd, attr);
71+
if (IS_ERR(vah)) {
7172
kfree(ah);
72-
ah = NULL;
73-
} else
73+
ah = (struct ipoib_ah *)vah;
74+
} else {
75+
ah->ah = vah;
7476
ipoib_dbg(netdev_priv(dev), "Created ah %p\n", ah->ah);
77+
}
7578

7679
return ah;
7780
}

‎drivers/infiniband/ulp/ipoib/ipoib_main.c

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ static void path_rec_completion(int status,
432432

433433
spin_lock_irqsave(&priv->lock, flags);
434434

435-
if (ah) {
435+
if (!IS_ERR_OR_NULL(ah)) {
436436
path->pathrec = *pathrec;
437437

438438
old_ah = path->ah;
@@ -555,6 +555,7 @@ static int path_rec_start(struct net_device *dev,
555555
return 0;
556556
}
557557

558+
/* called with rcu_read_lock */
558559
static void neigh_add_path(struct sk_buff *skb, struct net_device *dev)
559560
{
560561
struct ipoib_dev_priv *priv = netdev_priv(dev);
@@ -636,6 +637,7 @@ static void neigh_add_path(struct sk_buff *skb, struct net_device *dev)
636637
spin_unlock_irqrestore(&priv->lock, flags);
637638
}
638639

640+
/* called with rcu_read_lock */
639641
static void ipoib_path_lookup(struct sk_buff *skb, struct net_device *dev)
640642
{
641643
struct ipoib_dev_priv *priv = netdev_priv(skb->dev);
@@ -720,13 +722,14 @@ static int ipoib_start_xmit(struct sk_buff *skb, struct net_device *dev)
720722
struct neighbour *n = NULL;
721723
unsigned long flags;
722724

725+
rcu_read_lock();
723726
if (likely(skb_dst(skb)))
724727
n = dst_get_neighbour(skb_dst(skb));
725728

726729
if (likely(n)) {
727730
if (unlikely(!*to_ipoib_neigh(n))) {
728731
ipoib_path_lookup(skb, dev);
729-
return NETDEV_TX_OK;
732+
goto unlock;
730733
}
731734

732735
neigh = *to_ipoib_neigh(n);
@@ -749,17 +752,17 @@ static int ipoib_start_xmit(struct sk_buff *skb, struct net_device *dev)
749752
ipoib_neigh_free(dev, neigh);
750753
spin_unlock_irqrestore(&priv->lock, flags);
751754
ipoib_path_lookup(skb, dev);
752-
return NETDEV_TX_OK;
755+
goto unlock;
753756
}
754757

755758
if (ipoib_cm_get(neigh)) {
756759
if (ipoib_cm_up(neigh)) {
757760
ipoib_cm_send(dev, skb, ipoib_cm_get(neigh));
758-
return NETDEV_TX_OK;
761+
goto unlock;
759762
}
760763
} else if (neigh->ah) {
761764
ipoib_send(dev, skb, neigh->ah, IPOIB_QPN(n->ha));
762-
return NETDEV_TX_OK;
765+
goto unlock;
763766
}
764767

765768
if (skb_queue_len(&neigh->queue) < IPOIB_MAX_PATH_REC_QUEUE) {
@@ -793,13 +796,14 @@ static int ipoib_start_xmit(struct sk_buff *skb, struct net_device *dev)
793796
phdr->hwaddr + 4);
794797
dev_kfree_skb_any(skb);
795798
++dev->stats.tx_dropped;
796-
return NETDEV_TX_OK;
799+
goto unlock;
797800
}
798801

799802
unicast_arp_send(skb, dev, phdr);
800803
}
801804
}
802-
805+
unlock:
806+
rcu_read_unlock();
803807
return NETDEV_TX_OK;
804808
}
805809

@@ -837,7 +841,7 @@ static int ipoib_hard_header(struct sk_buff *skb,
837841
dst = skb_dst(skb);
838842
n = NULL;
839843
if (dst)
840-
n = dst_get_neighbour(dst);
844+
n = dst_get_neighbour_raw(dst);
841845
if ((!dst || !n) && daddr) {
842846
struct ipoib_pseudoheader *phdr =
843847
(struct ipoib_pseudoheader *) skb_push(skb, sizeof *phdr);

‎drivers/infiniband/ulp/ipoib/ipoib_multicast.c

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -240,8 +240,11 @@ static int ipoib_mcast_join_finish(struct ipoib_mcast *mcast,
240240
av.grh.dgid = mcast->mcmember.mgid;
241241

242242
ah = ipoib_create_ah(dev, priv->pd, &av);
243-
if (!ah) {
244-
ipoib_warn(priv, "ib_address_create failed\n");
243+
if (IS_ERR(ah)) {
244+
ipoib_warn(priv, "ib_address_create failed %ld\n",
245+
-PTR_ERR(ah));
246+
/* use original error */
247+
return PTR_ERR(ah);
245248
} else {
246249
spin_lock_irq(&priv->lock);
247250
mcast->ah = ah;
@@ -266,7 +269,7 @@ static int ipoib_mcast_join_finish(struct ipoib_mcast *mcast,
266269

267270
skb->dev = dev;
268271
if (dst)
269-
n = dst_get_neighbour(dst);
272+
n = dst_get_neighbour_raw(dst);
270273
if (!dst || !n) {
271274
/* put pseudoheader back on for next time */
272275
skb_push(skb, sizeof (struct ipoib_pseudoheader));
@@ -722,6 +725,8 @@ void ipoib_mcast_send(struct net_device *dev, void *mgid, struct sk_buff *skb)
722725
if (mcast && mcast->ah) {
723726
struct dst_entry *dst = skb_dst(skb);
724727
struct neighbour *n = NULL;
728+
729+
rcu_read_lock();
725730
if (dst)
726731
n = dst_get_neighbour(dst);
727732
if (n && !*to_ipoib_neigh(n)) {
@@ -734,7 +739,7 @@ void ipoib_mcast_send(struct net_device *dev, void *mgid, struct sk_buff *skb)
734739
list_add_tail(&neigh->list, &mcast->neigh_list);
735740
}
736741
}
737-
742+
rcu_read_unlock();
738743
spin_unlock_irqrestore(&priv->lock, flags);
739744
ipoib_send(dev, skb, mcast->ah, IB_MULTICAST_QPN);
740745
return;

0 commit comments

Comments
 (0)