Re: repeatedly reading ipchains rules causes ppp trouble

Paul Rusty Russell (Paul.Russell@rustcorp.com.au)
Wed, 20 Oct 1999 16:39:03 +1000

In message <19991020074043.A7436@server.ds9a.tudelft.nl> you write:
> > How many rules? It's almost certainly blocking interrupts for too
> > long, and causing serial overflows. The fix is fairly trivial if this
> > is the case.
>
> 9 rules, on a 486.

Ouch. Does this patch help? (against 2.2.13, but any 2.2 should be
OK) It should give three harmless compile warnings; if it works, I'll
prepare a ``real'' patch.

--- linux-2.2/net/ipv4/ip_fw.c.~1~ Wed Oct 20 16:12:05 1999
+++ linux-2.2/net/ipv4/ip_fw.c Wed Oct 20 16:19:46 1999
@@ -199,12 +199,12 @@

#define FWC_READ_LOCK(l) do { FWC_DEBUG_LOCK(fwc_rlocks); read_lock(l); } while (0)
#define FWC_WRITE_LOCK(l) do { FWC_DEBUG_LOCK(fwc_wlocks); write_lock(l); } while (0)
-#define FWC_READ_LOCK_IRQ(l,f) do { FWC_DEBUG_LOCK(fwc_rlocks); read_lock_irqsave(l,f); } while (0)
-#define FWC_WRITE_LOCK_IRQ(l,f) do { FWC_DEBUG_LOCK(fwc_wlocks); write_lock_irqsave(l,f); } while (0)
+#define FWC_READ_LOCK_IRQ(l,f) do { FWC_DEBUG_LOCK(fwc_rlocks); read_lock_bh(l); } while (0)
+#define FWC_WRITE_LOCK_IRQ(l,f) do { FWC_DEBUG_LOCK(fwc_wlocks); write_lock_bh(l); } while (0)
#define FWC_READ_UNLOCK(l) do { FWC_DEBUG_UNLOCK(fwc_rlocks); read_unlock(l); } while (0)
#define FWC_WRITE_UNLOCK(l) do { FWC_DEBUG_UNLOCK(fwc_wlocks); write_unlock(l); } while (0)
-#define FWC_READ_UNLOCK_IRQ(l,f) do { FWC_DEBUG_UNLOCK(fwc_rlocks); read_unlock_irqrestore(l,f); } while (0)
-#define FWC_WRITE_UNLOCK_IRQ(l,f) do { FWC_DEBUG_UNLOCK(fwc_wlocks); write_unlock_irqrestore(l,f); } while (0)
+#define FWC_READ_UNLOCK_IRQ(l,f) do { FWC_DEBUG_UNLOCK(fwc_rlocks); read_unlock_bh(l); } while (0)
+#define FWC_WRITE_UNLOCK_IRQ(l,f) do { FWC_DEBUG_UNLOCK(fwc_wlocks); write_unlock_bh(l); } while (0)

struct ip_chain;

--
Hacking time.


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/