Skip to contentSkip to conversation

kgdb:unify x86-kgdb

PATCH In review Jan Kiszka 2 participants 5 messages Jan 17, 2008 – Jan 18, 2008 x86

lore
Share & tools
lore

Jan Kiszka

author
#0 lore raw

PATCH 1/1 kgdb:unify x86-kgdb

diff -up arch/x86/kernel/kgdb_32.c arch/x86/kernel/kgdb_64.c

screamed for unification. Here it is.

---
 arch/x86/kernel/Makefile_32 |    2 
 arch/x86/kernel/Makefile_64 |    2 
 arch/x86/kernel/kgdb.c      |  561 ++++++++++++++++++++++++++++++++++++++++++++
 arch/x86/kernel/kgdb_32.c   |  414 --------------------------------
 arch/x86/kernel/kgdb_64.c   |  495 --------------------------------------
 5 files changed, 563 insertions(+), 911 deletions(-)
arch/x86/kernel/Makefile_32 +1 -1
Index: b/arch/x86/kernel/Makefile_32
===================================================================
@@ -37,7 +37,7 @@ obj-y				+= sysenter_32.o vsyscall_32.o
 obj-$(CONFIG_ACPI_SRAT) 	+= srat_32.o
 obj-$(CONFIG_EFI) 		+= efi_32.o efi_stub_32.o
 obj-$(CONFIG_DOUBLEFAULT) 	+= doublefault_32.o
-obj-$(CONFIG_KGDB)		+= kgdb_32.o kgdb-jmp_32.o
+obj-$(CONFIG_KGDB)		+= kgdb.o kgdb-jmp_32.o
 obj-$(CONFIG_VM86)		+= vm86_32.o
 obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
 obj-$(CONFIG_HPET_TIMER) 	+= hpet.o
arch/x86/kernel/Makefile_64 +1 -1
Index: b/arch/x86/kernel/Makefile_64
===================================================================
@@ -31,7 +31,7 @@ obj-$(CONFIG_GART_IOMMU)	+= pci-gart_64.
 obj-$(CONFIG_CALGARY_IOMMU)	+= pci-calgary_64.o tce_64.o
 obj-$(CONFIG_SWIOTLB)		+= pci-swiotlb_64.o
 obj-$(CONFIG_KPROBES)		+= kprobes_64.o
-obj-$(CONFIG_KGDB)		+= kgdb_64.o kgdb-jmp_64.o
+obj-$(CONFIG_KGDB)		+= kgdb.o kgdb-jmp_64.o
 obj-$(CONFIG_X86_PM_TIMER)	+= pmtimer_64.o
 obj-$(CONFIG_X86_VSMP)		+= vsmp_64.o
 obj-$(CONFIG_K8_NB)		+= k8.o
arch/x86/kernel/kgdb.c new file +561 -0

561 lines not on this page · raw message

arch/x86/kernel/kgdb_32.c deleted +0 -414

414 lines not on this page · raw message

arch/x86/kernel/kgdb_64.c deleted +0 -495

495 lines not on this page · raw message

#1 lore raw
Quoted 6 lines · Jan Kiszka

diff -up arch/x86/kernel/kgdb_32.c arch/x86/kernel/kgdb_64.c

screamed for unification. Here it is.

Quoted 8 lines
---
 arch/x86/kernel/Makefile_32 |    2 
 arch/x86/kernel/Makefile_64 |    2 
 arch/x86/kernel/kgdb.c      |  561 ++++++++++++++++++++++++++++++++++++++++++++
 arch/x86/kernel/kgdb_32.c   |  414 --------------------------------
 arch/x86/kernel/kgdb_64.c   |  495 --------------------------------------
 5 files changed, 563 insertions(+), 911 deletions(-)

FYI this is already done in the head branch for kgdb which is going into the -mm tree. You will see the new patch set in the 2.6.25-rcX series.

There is now a single x86-lite.patch which contains a number of other modifications to the core-lite.patch to make use of probe_kernel_address() and a new function probe_kernel_write(). Also the die hooks for the "no context" memory faults were removed.

Jason.

author
#2 lore raw
Quoted 15 lines · Jason Wessel
Quoted 6 lines · Jan Kiszka

diff -up arch/x86/kernel/kgdb_32.c arch/x86/kernel/kgdb_64.c

screamed for unification. Here it is.

Quoted 8 lines
---
 arch/x86/kernel/Makefile_32 |    2 
 arch/x86/kernel/Makefile_64 |    2 
 arch/x86/kernel/kgdb.c      |  561 ++++++++++++++++++++++++++++++++++++++++++++
 arch/x86/kernel/kgdb_32.c   |  414 --------------------------------
 arch/x86/kernel/kgdb_64.c   |  495 --------------------------------------
 5 files changed, 563 insertions(+), 911 deletions(-)
Quoted 7 lines

FYI this is already done in the head branch for kgdb which is going into the -mm tree. You will see the new patch set in the 2.6.25-rcX series.

There is now a single x86-lite.patch which contains a number of other modifications to the core-lite.patch to make use of probe_kernel_address() and a new function probe_kernel_write(). Also the die hooks for the "no context" memory faults were removed.

Hmm, is this any kind of patch I should have seen in your kernel.org git? Which branch?

Jan

#3 lore raw
Quoted 22 lines · Jan Kiszka
Quoted 20 lines · Jason Wessel
Quoted 6 lines · Jan Kiszka

diff -up arch/x86/kernel/kgdb_32.c arch/x86/kernel/kgdb_64.c

screamed for unification. Here it is.

Quoted 9 lines
---
 arch/x86/kernel/Makefile_32 |    2 
 arch/x86/kernel/Makefile_64 |    2 
 arch/x86/kernel/kgdb.c      |  561 ++++++++++++++++++++++++++++++++++++++++++++
 arch/x86/kernel/kgdb_32.c   |  414 --------------------------------
 arch/x86/kernel/kgdb_64.c   |  495 --------------------------------------
 5 files changed, 563 insertions(+), 911 deletions(-)

FYI this is already done in the head branch for kgdb which is going into the -mm tree. You will see the new patch set in the 2.6.25-rcX series.

Quoted 9 lines
Quoted 5 lines

There is now a single x86-lite.patch which contains a number of other modifications to the core-lite.patch to make use of probe_kernel_address() and a new function probe_kernel_write(). Also the die hooks for the "no context" memory faults were removed.

Hmm, is this any kind of patch I should have seen in your kernel.org git? Which branch?

I'll be posting an update to the -mm tree soon. Presently, I have been updating the x86 patch set because the x86 developers provided some insight as to what needed to change to gain adoption into the mainline kernel.

See:
http://git.kernel.org/?p=linux/kernel/git/jwessel/linux-2.6-kgdb.git;a=shortlog;h=for_x86

Right now the scope is only 8 patches worth. The other archs will be patched in when I move the patches forward against the -mm tree.

If you or anyone else would like to help, I'll be happy to forward a copy of the todo list :-)

Thanks,
Jason.

author
#4 lore raw
Quoted 23 lines · Jason Wessel
Quoted 22 lines · Jan Kiszka
Quoted 20 lines · Jason Wessel
Quoted 6 lines · Jan Kiszka

diff -up arch/x86/kernel/kgdb_32.c arch/x86/kernel/kgdb_64.c

screamed for unification. Here it is.

Quoted 9 lines
---
 arch/x86/kernel/Makefile_32 |    2 
 arch/x86/kernel/Makefile_64 |    2 
 arch/x86/kernel/kgdb.c      |  561 ++++++++++++++++++++++++++++++++++++++++++++
 arch/x86/kernel/kgdb_32.c   |  414 --------------------------------
 arch/x86/kernel/kgdb_64.c   |  495 --------------------------------------
 5 files changed, 563 insertions(+), 911 deletions(-)

FYI this is already done in the head branch for kgdb which is going into the -mm tree. You will see the new patch set in the 2.6.25-rcX series.

Quoted 8 lines
Quoted 8 lines
Quoted 5 lines

There is now a single x86-lite.patch which contains a number of other modifications to the core-lite.patch to make use of probe_kernel_address() and a new function probe_kernel_write(). Also the die hooks for the "no context" memory faults were removed.

Hmm, is this any kind of patch I should have seen in your kernel.org git? Which branch?

Meanwhile I realized that the actual head-of-development was some branch in the corner of kgdb's cvs on sf.net - I hope this will change in the future... :->

Quoted 8 lines

I'll be posting an update to the -mm tree soon. Presently, I have been updating the x86 patch set because the x86 developers provided some insight as to what needed to change to gain adoption into the mainline kernel.

See:
http://git.kernel.org/?p=linux/kernel/git/jwessel/linux-2.6-kgdb.git;a=shortlog;h=for_x86

Thanks, will pick it up and continue to hammer against it.

Quoted 6 lines

Right now the scope is only 8 patches worth. The other archs will be patched in when I move the patches forward against the -mm tree.

If you or anyone else would like to help, I'll be happy to forward a copy of the todo list :-)

Can't promise anything beyond x86 ATM, because that's the arch our customer asked for. But I will look around here if someone happens to twiddle thumbs. ;)

Jan