]> rtime.felk.cvut.cz Git - lincan.git/blobdiff - lincan/src/can_queue.c
Corrected CAN queues locking for corner case - i.e. partially connected queue.
[lincan.git] / lincan / src / can_queue.c
index f061f4f177017ffd03e191e2768b388338e5de36..a1aa1dfb01fdfdcad82440a3e801ce3357a8490a 100644 (file)
@@ -1,17 +1,42 @@
-/* can_queue.c - CAN message queues
- * Linux CAN-bus device driver.
- * New CAN queues by Pavel Pisa - OCERA team member
- * email:pisa@cmp.felk.cvut.cz
- * This software is released under the GPL-License.
- * Version lincan-0.2  9 Jul 2003
- */
+/**************************************************************************/
+/* File: can_queue.c - CAN message queues                                 */
+/*                                                                        */
+/* LinCAN - (Not only) Linux CAN bus driver                               */
+/* Copyright (C) 2002-2009 DCE FEE CTU Prague <http://dce.felk.cvut.cz>   */
+/* Copyright (C) 2002-2009 Pavel Pisa <pisa@cmp.felk.cvut.cz>             */
+/* Funded by OCERA and FRESCOR IST projects                               */
+/*                                                                        */
+/* LinCAN is free software; you can redistribute it and/or modify it      */
+/* under terms of the GNU General Public License as published by the      */
+/* Free Software Foundation; either version 2, or (at your option) any    */
+/* later version.  LinCAN is distributed in the hope that it will be      */
+/* useful, but WITHOUT ANY WARRANTY; without even the implied warranty    */
+/* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU    */
+/* General Public License for more details. You should have received a    */
+/* copy of the GNU General Public License along with LinCAN; see file     */
+/* COPYING. If not, write to the Free Software Foundation, 675 Mass Ave,  */
+/* Cambridge, MA 02139, USA.                                              */
+/*                                                                        */
+/* To allow use of LinCAN in the compact embedded systems firmware        */
+/* and RT-executives (RTEMS for example), main authors agree with next    */
+/* special exception:                                                     */
+/*                                                                        */
+/* Including LinCAN header files in a file, instantiating LinCAN generics */
+/* or templates, or linking other files with LinCAN objects to produce    */
+/* an application image/executable, does not by itself cause the          */
+/* resulting application image/executable to be covered by                */
+/* the GNU General Public License.                                        */
+/* This exception does not however invalidate any other reasons           */
+/* why the executable file might be covered by the GNU Public License.    */
+/* Publication of enhanced or derived LinCAN files is required although.  */
+/**************************************************************************/
 
 #include "../include/can.h"
 #include "../include/can_sysdep.h"
 #include "../include/can_queue.h"
 
-/* 
- * Modifies Tx message processing 
+/*
+ * Modifies Tx message processing
  *  0 .. local message processing disabled
  *  1 .. local messages disabled by default but can be enabled by canque_set_filt
  *  2 .. local messages enabled by default, can be disabled by canque_set_filt
@@ -97,6 +122,11 @@ int canque_fifo_init_slots(struct canque_fifo_t *fifo)
  list_entry(ptr, type, member)
 */
 
+void __canque_edge_decref(struct canque_edge_t *edge)
+{
+       __canque_edge_decref_body(edge);
+}
+
 /**
  * canque_get_inslot - finds one outgoing edge and allocates slot from it
  * @qends: ends structure belonging to calling communication object
@@ -114,7 +144,7 @@ int canque_get_inslot(struct canque_ends_t *qends,
 {
        int ret=-2;
        struct canque_edge_t *edge;
-       
+
        edge=canque_first_inedge(qends);
        if(edge){
                if(!canque_fifo_test_fl(&edge->fifo,BLOCK)){
@@ -156,7 +186,7 @@ int canque_get_inslot4id(struct canque_ends_t *qends,
 {
        int ret=-2;
        struct canque_edge_t *edge, *bestedge=NULL;
-       
+
        canque_for_each_inedge(qends, edge){
                if(canque_fifo_test_fl(&edge->fifo,BLOCK))
                        continue;
@@ -262,7 +292,7 @@ int canque_filter_msg2edges(struct canque_ends_t *qends, struct canmsg_t *msg)
        unsigned long msgid;
        struct canque_edge_t *edge;
        struct canque_slot_t *slot;
-       
+
        DEBUGQUE("canque_filter_msg2edges for msg ID 0x%08lx and flags 0x%02x\n",
                        msg->id, msg->flags);
        msgid = canque_filtid2internal(msg->id, msg->flags);
@@ -307,12 +337,26 @@ int canque_test_outslot(struct canque_ends_t *qends,
        int prio;
        struct canque_edge_t *edge;
        int ret;
-       
+
        can_spin_lock_irqsave(&qends->ends_lock, flags);
        for(prio=CANQUEUE_PRIO_NR;--prio>=0;){
                while(!list_empty(&qends->active[prio])){
                        edge=list_entry(qends->active[prio].next,struct canque_edge_t,activepeers);
                        if(!canque_fifo_test_fl(&edge->fifo,DEAD)) {
+                               /* The first test on unlocked FIFO */
+                               if(canque_fifo_test_fl(&edge->fifo,EMPTY)) {
+                                       can_spin_lock(&edge->fifo.fifo_lock);
+                                       /* Test has to be repeated to ensure that EMPTY
+                                          state has not been nagated when locking FIFO */
+                                       if(canque_fifo_test_fl(&edge->fifo,EMPTY)) {
+                                               canque_fifo_set_fl(&edge->fifo,INACTIVE);
+                                               list_del(&edge->activepeers);
+                                               list_add(&edge->activepeers,&qends->idle);
+                                               can_spin_unlock(&edge->fifo.fifo_lock);
+                                               continue;
+                                       }
+                                       can_spin_unlock(&edge->fifo.fifo_lock);
+                               }
                                canque_edge_incref(edge);
                                can_spin_unlock_irqrestore(&qends->ends_lock, flags);
                                *qedgep=edge;
@@ -320,14 +364,16 @@ int canque_test_outslot(struct canque_ends_t *qends,
                                ret=canque_fifo_test_outslot(&edge->fifo, slotp);
                                if(ret>=0)
                                        return ret;
+
+                               canque_edge_decref(edge);
                                can_spin_lock_irqsave(&qends->ends_lock, flags);
-                       }
-                       can_spin_lock(&edge->fifo.fifo_lock);
-                       if(canque_fifo_test_and_set_fl(&edge->fifo,INACTIVE)) {
+                       } else {
+                               can_spin_lock(&edge->fifo.fifo_lock);
+                               canque_fifo_set_fl(&edge->fifo,INACTIVE);
                                list_del(&edge->activepeers);
                                list_add(&edge->activepeers,&qends->idle);
+                               can_spin_unlock(&edge->fifo.fifo_lock);
                        }
-                       can_spin_unlock(&edge->fifo.fifo_lock);
                }
        }
        can_spin_unlock_irqrestore(&qends->ends_lock, flags);
@@ -413,13 +459,13 @@ int canque_set_filt(struct canque_edge_t *qedge,
        can_spin_irqflags_t flags;
 
        can_spin_lock_irqsave(&qedge->fifo.fifo_lock,flags);
-       
+
        if(!(filtflags&MSG_PROCESSLOCAL) && (processlocal<2))
                filtflags |= MSG_LOCAL_MASK;
-       
+
        qedge->filtid=canque_filtid2internal(filtid, filtflags);
        qedge->filtmask=canque_filtid2internal(filtmask, filtflags>>MSG_FILT_MASK_SHIFT);
-       
+
        if(canque_fifo_test_fl(&qedge->fifo,DEAD)) ret=-1;
        else ret=canque_fifo_test_and_set_fl(&qedge->fifo,BLOCK)?1:0;
 
@@ -430,7 +476,7 @@ int canque_set_filt(struct canque_edge_t *qedge,
        can_spin_lock_irqsave(&qedge->fifo.fifo_lock,flags);
        if(!ret) canque_fifo_clear_fl(&qedge->fifo,BLOCK);
        can_spin_unlock_irqrestore(&qedge->fifo.fifo_lock,flags);
-       
+
        DEBUGQUE("canque_set_filt for edge %d, ID %ld, mask %ld, flags %d returned %d\n",
                  qedge->edge_num,filtid,filtmask,filtflags,ret);
        return ret;
@@ -503,8 +549,7 @@ int canqueue_connect_edge(struct canque_edge_t *qedge, struct canque_ends_t *ine
        if(qedge == NULL) return -1;
        DEBUGQUE("canqueue_connect_edge %d\n",qedge->edge_num);
        canque_edge_incref(qedge);
-       can_spin_lock_irqsave(&inends->ends_lock, flags);
-       can_spin_lock(&outends->ends_lock);
+       flags=canque_edge_lock_both_ends(inends, outends);
        can_spin_lock(&qedge->fifo.fifo_lock);
        qedge->inends=inends;
        list_add(&qedge->inpeers,&inends->inlist);
@@ -512,8 +557,7 @@ int canqueue_connect_edge(struct canque_edge_t *qedge, struct canque_ends_t *ine
        list_add(&qedge->outpeers,&outends->outlist);
        list_add(&qedge->activepeers,&outends->idle);
        can_spin_unlock(&qedge->fifo.fifo_lock);
-       can_spin_unlock(&outends->ends_lock);
-       can_spin_unlock_irqrestore(&inends->ends_lock, flags);
+       canque_edge_unlock_both_ends(inends, outends, flags);
        canque_notify_bothends(qedge, CANQUEUE_NOTIFY_ATTACH);
 
        if(canque_fifo_test_and_set_fl(&qedge->fifo, READY))
@@ -535,9 +579,17 @@ int canqueue_disconnect_edge(struct canque_edge_t *qedge)
        struct canque_ends_t *inends, *outends;
 
        inends=qedge->inends;
-       if(inends) can_spin_lock_irqsave(&inends->ends_lock,flags);
        outends=qedge->outends;
-       if(outends) can_spin_lock(&outends->ends_lock);
+
+       if(inends && outends) {
+               flags=canque_edge_lock_both_ends(inends, outends);
+       } else {
+               DEBUGQUE("canqueue_disconnect_edge called with not fully connected edge");
+               if(inends) can_spin_lock_irqsave(&inends->ends_lock,flags);
+               else if(outends) can_spin_lock_irqsave(&outends->ends_lock,flags);
+               else flags=0;
+       }
+
        can_spin_lock(&qedge->fifo.fifo_lock);
        if(atomic_read(&qedge->edge_used)==0) {
                if(qedge->outends){
@@ -553,15 +605,21 @@ int canqueue_disconnect_edge(struct canque_edge_t *qedge)
                ret=1;
        } else ret=-1;
        can_spin_unlock(&qedge->fifo.fifo_lock);
-       if(outends) can_spin_unlock(&outends->ends_lock);
-       if(inends) can_spin_unlock_irqrestore(&inends->ends_lock,flags);
+
+       if(inends && outends) {
+               canque_edge_unlock_both_ends(inends, outends, flags);
+       } else {
+               if(inends) can_spin_unlock_irqrestore(&inends->ends_lock,flags);
+               else if(outends) can_spin_unlock_irqrestore(&outends->ends_lock,flags);
+       }
+
        DEBUGQUE("canqueue_disconnect_edge %d returned %d\n",qedge->edge_num,ret);
        return ret;
 }
 
 
 /**
- * canqueue_block_inlist - block slot allocation of all outgoing edges of specified ends  
+ * canqueue_block_inlist - block slot allocation of all outgoing edges of specified ends
  * @qends: pointer to ends structure
  */
 void canqueue_block_inlist(struct canque_ends_t *qends)
@@ -575,7 +633,7 @@ void canqueue_block_inlist(struct canque_ends_t *qends)
 
 
 /**
- * canqueue_block_outlist - block slot allocation of all incoming edges of specified ends  
+ * canqueue_block_outlist - block slot allocation of all incoming edges of specified ends
  * @qends: pointer to ends structure
  */
 void canqueue_block_outlist(struct canque_ends_t *qends)
@@ -600,7 +658,7 @@ void canqueue_block_outlist(struct canque_ends_t *qends)
 int canqueue_ends_kill_inlist(struct canque_ends_t *qends, int send_rest)
 {
        struct canque_edge_t *edge;
-       
+
        canque_for_each_inedge(qends, edge){
                canque_notify_bothends(edge, CANQUEUE_NOTIFY_DEAD_WANTED);
                if(send_rest){
@@ -628,7 +686,7 @@ int canqueue_ends_kill_inlist(struct canque_ends_t *qends, int send_rest)
 int canqueue_ends_kill_outlist(struct canque_ends_t *qends)
 {
        struct canque_edge_t *edge;
-       
+
        canque_for_each_outedge(qends, edge){
                canque_notify_bothends(edge, CANQUEUE_NOTIFY_DEAD_WANTED);
        }
@@ -636,4 +694,82 @@ int canqueue_ends_kill_outlist(struct canque_ends_t *qends)
 }
 
 
+/**
+ * canqueue_ends_filt_conjuction - computes conjunction of incoming edges filters filters
+ * @qends: pointer to ends structure
+ * @filt: pointer the filter structure filled by computed filters conjunction
+ *
+ * Return Value: Number of incoming edges
+ */
+int canqueue_ends_filt_conjuction(struct canque_ends_t *qends, struct canfilt_t *filt)
+{
+       struct canque_edge_t *edge;
+       int cnt=0;
+       unsigned long filtid=0;
+       unsigned long filtmask=~0;
+       unsigned long local_only=canque_filtid2internal(0,MSG_LOCAL);
+
+       canque_for_each_inedge(qends, edge){
+               /* skip edges processing only local messages */
+               if(edge->filtid & edge->filtmask & local_only)
+                       continue;
+
+               if(!cnt++)
+                       filtid = edge->filtid;
+               else
+                       filtmask &= ~(filtid ^ edge->filtid);
+
+               filtmask &= edge->filtmask;
+       }
+
+       filt->id = filtid & MSG_ID_MASK;
+       filt->mask = filtmask & MSG_ID_MASK;
+       filtid >>= 28;
+       filtmask >>= 28;
+       filt->flags = filtid & MSG_EXT;
+       if(filtmask & (MSG_EXT))
+               filt->flags |= MSG_EXT_MASK;
+       if(filtid & (MSG_RTR<<1))
+               filt->flags |= MSG_RTR<<1;
+       if(filtmask & (MSG_RTR<<1))
+               filt->flags |= MSG_RTR_MASK;
+       return cnt;
+}
+
+
+/**
+ * canqueue_ends_flush_inlist - flushes all messages in incoming edges
+ * @qends: pointer to ends structure
+ *
+ * Return Value: Negative value informs about unsuccessful result
+ */
+int canqueue_ends_flush_inlist(struct canque_ends_t *qends)
+{
+       struct canque_edge_t *edge;
+
+       canque_for_each_inedge(qends, edge){
+               canque_flush(edge);
+       }
+       return 0;
+}
+
+
+/**
+ * canqueue_ends_flush_outlist - flushes all messages in outgoing edges
+ * @qends: pointer to ends structure
+ *
+ * Return Value: Negative value informs about unsuccessful result
+ */
+int canqueue_ends_flush_outlist(struct canque_ends_t *qends)
+{
+       struct canque_edge_t *edge;
+
+       canque_for_each_outedge(qends, edge){
+               canque_flush(edge);
+       }
+       return 0;
+}
+
+
+