/* * net/ife/ife.c - Inter-FE protocol based on ForCES WG InterFE LFB * Copyright (c) 2015 Jamal Hadi Salim * Copyright (c) 2017 Yotam Gigi * * Refer to: draft-ietf-forces-interfelfb-03 and netdev01 paper: * "Distributing Linux Traffic Control Classifier-Action Subsystem" * Authors: Jamal Hadi Salim and Damascene M. Joachimpillai * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation. */ #include #include #include #include #include #include #include #include #include #include #include #include #include struct ifeheadr { __be16 metalen; u8 tlv_data[]; }; void *ife_encode(struct sk_buff *skb, u16 metalen) { /* OUTERHDR:TOTMETALEN:{TLVHDR:Metadatum:TLVHDR..}:ORIGDATA * where ORIGDATA = original ethernet header ... */ int hdrm = metalen + IFE_METAHDRLEN; int total_push = hdrm + skb->dev->hard_header_len; struct ifeheadr *ifehdr; struct ethhdr *iethh; /* inner ether header */ int skboff = 0; int err; err = skb_cow_head(skb, total_push); if (unlikely(err)) return NULL; iethh = (struct ethhdr *) skb->data; __skb_push(skb, total_push); memcpy(skb->data, iethh, skb->dev->hard_header_len); skb_reset_mac_header(skb); skboff += skb->dev->hard_header_len; /* total metadata length */ ifehdr = (struct ifeheadr *) (skb->data + skboff); metalen += IFE_METAHDRLEN; ifehdr->metalen = htons(metalen); return ifehdr->tlv_data; } EXPORT_SYMBOL_GPL(ife_encode); void *ife_decode(struct sk_buff *skb, u16 *metalen) { struct ifeheadr *ifehdr; int total_pull; u16 ifehdrln; ifehdr = (struct ifeheadr *) (skb->data + skb->dev->hard_header_len); ifehdrln = ntohs(ifehdr->metalen); total_pull = skb->dev->hard_header_len + ifehdrln; if (unlikely(ifehdrln < 2)) return NULL; if (unlikely(!pskb_may_pull(skb, total_pull))) return NULL; skb_set_mac_header(skb, total_pull); __skb_pull(skb, total_pull); *metalen = ifehdrln - IFE_METAHDRLEN; return &ifehdr->tlv_data; } EXPORT_SYMBOL_GPL(ife_decode); struct meta_tlvhdr { __be16 type; __be16 len; }; /* Caller takes care of presenting data in network order */ void *ife_tlv_meta_decode(void *skbdata, u16 *attrtype, u16 *dlen, u16 *totlen) { struct meta_tlvhdr *tlv = (struct meta_tlvhdr *) skbdata; *dlen = ntohs(tlv->len) - NLA_HDRLEN; *attrtype = ntohs(tlv->type); if (totlen) *totlen = nla_total_size(*dlen); return skbdata + sizeof(struct meta_tlvhdr); } EXPORT_SYMBOL_GPL(ife_tlv_meta_decode); void *ife_tlv_meta_next(void *skbdata) { struct meta_tlvhdr *tlv = (struct meta_tlvhdr *) skbdata; u16 tlvlen = ntohs(tlv->len); tlvlen = NLA_ALIGN(tlvlen); return skbdata + tlvlen; } EXPORT_SYMBOL_GPL(ife_tlv_meta_next); /* Caller takes care of presenting data in network order */ int ife_tlv_meta_encode(void *skbdata, u16 attrtype, u16 dlen, const void *dval) { __be32 *tlv = (__be32 *) (skbdata); u16 totlen = nla_total_size(dlen); /*alignment + hdr */ char *dptr = (char *) tlv + NLA_HDRLEN; u32 htlv = attrtype << 16 | (dlen + NLA_HDRLEN); *tlv = htonl(htlv); memset(dptr, 0, totlen - NLA_HDRLEN); memcpy(dptr, dval, dlen); return totlen; } EXPORT_SYMBOL_GPL(ife_tlv_meta_encode); MODULE_AUTHOR("Jamal Hadi Salim "); MODULE_AUTHOR("Yotam Gigi "); MODULE_DESCRIPTION("Inter-FE LFB action"); MODULE_LICENSE("GPL"); alue='5'>5space:mode:
authorIago Abal <mail@iagoabal.eu>2017-01-11 14:00:21 +0100
committerVinod Koul <vinod.koul@intel.com>2017-01-25 15:35:11 +0530
commit91539eb1fda2d530d3b268eef542c5414e54bf1a (patch)
tree960f5ca6342ad20837aff18aad6e8ecd7da32fd6 /drivers/usb/phy/Makefile
parent6610d0edf6dc7ee97e46ab3a538a565c79d26199 (diff)
dmaengine: pl330: fix double lock
The static bug finder EBA (http://www.iagoabal.eu/eba/) reported the following double-lock bug: Double lock: 1. spin_lock_irqsave(pch->lock, flags) at pl330_free_chan_resources:2236; 2. call to function `pl330_release_channel' immediately after; 3. call to function `dma_pl330_rqcb' in line 1753; 4. spin_lock_irqsave(pch->lock, flags) at dma_pl330_rqcb:1505. I have fixed it as suggested by Marek Szyprowski. First, I have replaced `pch->lock' with `pl330->lock' in functions `pl330_alloc_chan_resources' and `pl330_free_chan_resources'. This avoids the double-lock by acquiring a different lock than `dma_pl330_rqcb'. NOTE that, as a result, `pl330_free_chan_resources' executes `list_splice_tail_init' on `pch->work_list' under lock `pl330->lock', whereas in the rest of the code `pch->work_list' is protected by `pch->lock'. I don't know if this may cause race conditions. Similarly `pch->cyclic' is written by `pl330_alloc_chan_resources' under `pl330->lock' but read by `pl330_tx_submit' under `pch->lock'. Second, I have removed locking from `pl330_request_channel' and `pl330_release_channel' functions. Function `pl330_request_channel' is only called from `pl330_alloc_chan_resources', so the lock is already held. Function `pl330_release_channel' is called from `pl330_free_chan_resources', which already holds the lock, and from `pl330_del'. Function `pl330_del' is called in an error path of `pl330_probe' and at the end of `pl330_remove', but I assume that there cannot be concurrent accesses to the protected data at those points. Signed-off-by: Iago Abal <mail@iagoabal.eu> Reviewed-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/usb/phy/Makefile')