Re: [KGDB PATCH][6/7] KGDBOE fixes

[Amit S. Kale]

ok by me
-Amit

On Saturday 28 Feb 2004 3:22 am, Tom Rini wrote:
> Hello.  The following is a couple of small but important cleanups to
> kgdboe. - memset out_buf in case we don't have it full when we flush.
> - In rx_hook, if netpoll_trap() is set, clear it.  If kgdb_isn't connected,
>   schedule a breakpoint, and never call breakpoint() directly.
> - In kgdb_serial->hook, set netpoll_trap(1).  kgdb_serial->hook must be
>   called prior to using a 'serial' port, so this is where we should stick
>   this.
> - Backout unneeded changes to other files.
>
> --- linux-2.6.3/drivers/net/kgdb_eth.c.orig	2004-02-27 13:27:53.778658691
> -0700 +++ linux-2.6.3/drivers/net/kgdb_eth.c	2004-02-27 13:32:07.920255062
> -0700 @@ -18,6 +18,7 @@
>   * Refactored for netpoll API by Matt Mackall <mpm@xxxxxxxxxxx>
>   *
>   * Some cleanups by Pavel Machek <pavel@xxxxxxx>
> + * Further cleanups by Tom Rini <trini@xxxxxxxxxx>
>   */
>
>  #include <linux/module.h>
> @@ -60,7 +61,6 @@
>  static atomic_t in_count;
>  int kgdboe = 0;			/* Default to tty mode */
>
> -extern void breakpoint(void);
>  static void rx_hook(struct netpoll *np, int port, char *msg, int len);
>
>  static struct netpoll np = {
> @@ -89,6 +89,7 @@
>  {
>  	if (out_count && np.dev) {
>  		netpoll_send_udp(&np, out_buf, out_count);
> +		memset(out_buf, 0, sizeof(out_buf));
>  		out_count = 0;
>  	}
>  }
> @@ -107,12 +108,15 @@
>  	np->remote_port = port;
>
> +	/* Do we need to clear the trap? */
> +	if (netpoll_trap())
> +		netpoll_set_trap(0);
>  	/* Is this gdb trying to attach? */
> -	if (!netpoll_trap() && len == 8 && !strncmp(msg, "$Hc-1#09", 8))
> -		breakpoint();
> +	if (kgdb_connected) {
> +		kgdb_schedule_breakpoint();
>
>  	for (i = 0; i < len; i++) {
>  		if (msg[i] == 3)
> -			breakpoint();
> +			kgdb_schedule_breakpoint();
>
>  		if (atomic_read(&in_count) >= IN_BUF_SIZE) {
>  			/* buffer overflow, clear it */
> @@ -138,6 +141,9 @@
>  	/* Un-initalized, don't go further. */
>  	if (kgdboe != 1)
>  		return 1;
> +
> +	netpoll_set_trap(1);
> +
>  	return 0;
>  }
>
> --- linux-2.6.3/net/core/skbuff.c.orig	2004-02-27 13:30:21.107968572 -0700
> +++ linux-2.6.3/net/core/skbuff.c	2004-02-27 13:30:44.279825113 -0700
> @@ -55,7 +55,6 @@
>  #include <linux/rtnetlink.h>
>  #include <linux/init.h>
>  #include <linux/highmem.h>
> -#include <linux/debugger.h>
>
>  #include <net/protocol.h>
>  #include <net/dst.h>
> --- linux-2.6.3/net/core/dev.c.orig	2004-02-27 13:30:27.687508165 -0700
> +++ linux-2.6.3/net/core/dev.c	2004-02-27 13:30:44.261829108 -0700
> @@ -1547,6 +1547,7 @@
>  }
>  #endif
>
> +
>  /**
>   *	netif_rx	-	post buffer to the network code
>   *	@skb: buffer to post

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