2007-01-05 06:02:07

by Andrew Morton

[permalink] [raw]
Subject: 2.6.20-rc3-mm1


Temporarily at

http://userweb.kernel.org/~akpm/2.6.20-rc3-mm1/

will appear later at

ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.20-rc3/2.6.20-rc3-mm1/



- Added the IBM ACPi driver tree to the -mm lineup, as git-ibm-acpi.patch
(Henrique de Moraes Holschuh <[email protected]>)

- Lots of block-layer changes rewriting the plug/unplug code. Seems to work.



Boilerplate:

- See the `hot-fixes' directory for any important updates to this patchset.

- To fetch an -mm tree using git, use (for example)

git-fetch git://git.kernel.org/pub/scm/linux/kernel/git/smurf/linux-trees.git tag v2.6.16-rc2-mm1
git-checkout -b local-v2.6.16-rc2-mm1 v2.6.16-rc2-mm1

- -mm kernel commit activity can be reviewed by subscribing to the
mm-commits mailing list.

echo "subscribe mm-commits" | mail [email protected]

- If you hit a bug in -mm and it is not obvious which patch caused it, it is
most valuable if you can perform a bisection search to identify which patch
introduced the bug. Instructions for this process are at

http://www.zip.com.au/~akpm/linux/patches/stuff/bisecting-mm-trees.txt

But beware that this process takes some time (around ten rebuilds and
reboots), so consider reporting the bug first and if we cannot immediately
identify the faulty patch, then perform the bisection search.

- When reporting bugs, please try to Cc: the relevant maintainer and mailing
list on any email.

- When reporting bugs in this kernel via email, please also rewrite the
email Subject: in some manner to reflect the nature of the bug. Some
developers filter by Subject: when looking for messages to read.

- Semi-daily snapshots of the -mm lineup are uploaded to
ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/mm/ and are announced on
the mm-commits list.



Changes since 2.6.20-rc2-mm1:


origin.patch
git-acpi.patch
git-ibm-acpi.patch
git-alsa.patch
git-arm.patch
git-avr32.patch
git-cifs.patch
git-dvb.patch
git-gfs2-nmw.patch
git-ieee1394.patch
git-infiniband.patch
git-input.patch
git-libata-all.patch
git-lxdialog.patch
git-mmc.patch
git-mtd.patch
git-ubi.patch
git-netdev-all.patch
git-ioat.patch
git-ocfs2.patch
git-pcmcia.patch
git-selinux.patch
git-pciseg.patch
git-sh.patch
git-scsi-rc-fixes.patch
git-block.patch
git-sas.patch
git-qla3xxx.patch
git-watchdog.patch
git-wireless.patch
git-cryptodev.patch
git-gccbug.patch

git trees

-fix-ipmi-watchdog-set_param_str-using-kstrdup.patch
-aio-fix-buggy-put_ioctx-call-in-aio_complete.patch
-fix-lock-inversion-aio_kick_handler.patch
-powerpc-iseries-link-error-in-allmodconfig.patch
-change-warn_on-back-to-bug-at.patch
-rcu-rcutorture-suspend-fix.patch
-fix-oom-killer-kills-current-every-time-if-there-is.patch
-add-gitignore-file-for-relocs-in-arch-i386.patch
-pci-probe-fix-macro-that-confuses-kernel-doc.patch
-char-mxser-fix-oops-when-removing-opened.patch
-ib-mthca-fix-fmr-breakage-caused-by-kmemdup-conversion.patch
-maintainers-email-addr-change-for-eric-moore.patch
-make-fn_keys-work-again-on-power-macbooks.patch
-char-isicom-eliminate-spinlock-recursion.patch
-update-to-documentation-ttytxt-on-line-disciplines.patch
-fix-mrproper-incompleteness.patch
-sched-fix-cond_resched_softirq-offset.patch
-fix-compilation-of-via-pmu-backlight.patch
-module-fix-mod_sysfs_setup-return-value.patch
-mm-ramfs-breaks-without-config_block.patch
-mm-slob-is-broken-by-recent-cleanup-of-slabh.patch
-cciss-build-with-proc_fs=n.patch
-page_mkclean_one-fix-call-to-set_pte_at.patch
-spi-define-null-tx_buf-to-mean-shift-out-zeroes.patch
-m25p80-build-fixes-with-mtd-debug.patch
-spi-mtd-mtd_dataflash-oops-prevention.patch
-arm-omap-fix-gpmc-compiler-errors.patch
-arm-omap-fix-missing-header-on-apollon-board.patch
-buglet-in-vmscanc.patch
-cpuset-procfs-warning-fix.patch
-respect-srctree-objtree-in-documentation-docbook-makefile.patch
-spi_s3c24xx_gpio-use-right-header.patch
-lockdep-printk-warning-fix.patch
-restore-pdeath_signal-behaviour.patch
-gregkh-driver-driver-core-warn-users-that-the-sysfs-power-interface-really-is-broken.patch
-gregkh-driver-driver-core-prefix-driver-links-in-sys-module-by-bus-name.patch
-altix-acpi-_prt-support.patch
-git-iee1394-printk-warning-fix.patch
-git-ieee1394-build-fix.patch
-git-ieee1394-build-fix-2.patch
-git-ieee1394-build-fix-3.patch
-pci-quirks-fix-the-festering-mess-that-claims-to-handle-ide-quirks-ide-fix.patch
-git-ubi-build-fix.patch
-git-ubi-mtd_read-arg-fix.patch
-ebtables-dont-compute-gap-before-checking-struct.patch
-pci-quirk-1k-i-o-space-iobl_adr-fix-on-p64h2.patch
-pciehp-cleanup-init_slot.patch
-pciehp-cleanup-slot-list.patch
-pciehp-remove-unnecessary-php_ctlr.patch
-pciehp-remove-unused-pci_bus-from-struct-controller.patch
-pciehp-cleanup-register-access.patch
-pciehp-cleanup-pciehph.patch
-pciehp-remove-unused-pcie_cap_base.patch
-pciehp-cleanup-wait-command-completion.patch
-pciehp-fix-wait-command-completion.patch
-pciehp-add-emi-support.patch
-scsi-advansys-wrap-pci-table-inside-ifdef-config_pci.patch
-make-qla2x00_reg_remote_port-static.patch
-git-qla3xxx-fixup.patch
-i386-restore-config_physical_start-option.patch
-remove-drivers-pci-searchcpci_find_device_reverse.patch
-piix-remove-check-for-broken-mw-dma-mode-0.patch
-piix-slc90e66-pio-mode-fallback-fix.patch

Merged into mainline or a subsystem tree

+origin.patch
+add-afs_super_magic-to-magich.patch
+fix-implicit-declarations-in-via-pmu.patch
+fix-leds-s3c24xx-hardwareh-reference.patch
+start_kernel-test-if-irqs-got-enabled-early-barf-and-disable-them-again.patch
+start_kernel-test-if-irqs-got-enabled-early-barf-and-disable-them-again-fix.patch
+kernelparams-detect-if-and-which-parameter-parsing-enabled-irqs.patch
+kernelparams-detect-if-and-which-parameter-parsing-enabled-irqs-fix.patch
+pci-prevent-down_read-when-pci_devices-is-empty.patch
+pci-prevent-down_read-when-pci_devices-is-empty-fix.patch
+via82cxxx-fix-cable-detection.patch
+kvm-fix-gfp_kernel-alloc-in-atomic-section-bug.patch
+kvm-use-raw_smp_processor_id-instead-of-smp_processor_id-where-applicable.patch
+kvm-recover-after-an-arch-module-load-failure.patch
+kvm-improve-interrupt-response.patch
+rtc-at91rm9200-build-fix.patch
+fix-bug-at-drivers-scsi-scsi_libc1118-caused-by-pktsetup-dvd-dev-sr0.patch
+atiixp-old-drivers-ide-layer-driver-for-the-atiixp-hang.patch
+atiixp-old-drivers-ide-layer-driver-for-the-atiixp-hang-tidy.patch
+adfs-fix-filename-handling.patch
+swsusp-do-not-fail-if-resume-device-is-not-set.patch
+profiling-fix-sched-profiling-typo.patch
+i386-restore-config_physical_start-option.patch
+sanely-size-hash-tables-when-using-large-base-pages-take-2.patch
+i386-fix-modpost-warning-in-smp-trampoline-code.patch
+i386-fix-another-modpost-warning.patch
+i386-modpost-smpboot-code-warning-fix.patch
+ip2-warning-fix.patch
+fix-memory-corruption-from-misinterpreted-bad_inode_ops.patch
+fix-memory-corruption-from-misinterpreted-bad_inode_ops-tidy.patch
+fix-bug_onpageslab-from-fallback_alloc.patch
+update-the-rtc-rs5c372-driver.patch
+kvm-prevent-stale-bits-in-cr0-and-cr4.patch
+kvm-mmu-implement-simple-reverse-mapping.patch
+kvm-mmu-teach-the-page-table-walker-to-track-guest-page-table-gfns.patch
+kvm-mmu-load-the-pae-pdptrs-on-cr3-change-like-the-processor-does.patch
+kvm-mmu-fold-fetch_guest-into-init_walker.patch
+kvm-mu-special-treatment-for-shadow-pae-root-pages.patch
+kvm-mmu-use-the-guest-pdptrs-instead-of-mapping-cr3-in-pae-mode.patch
+kvm-mmu-make-the-shadow-page-tables-also-special-case-pae.patch
+kvm-mmu-make-kvm_mmu_alloc_page-return-a-kvm_mmu_page-pointer.patch
+kvm-mmu-shadow-page-table-caching.patch
+kvm-mmu-write-protect-guest-pages-when-a-shadow-is-created-for-them.patch
+kvm-mmu-let-the-walker-extract-the-target-page-gfn-from-the-pte.patch
+kvm-mmu-support-emulated-writes-into-ram.patch
+kvm-mmu-zap-shadow-page-table-entries-on-writes-to-guest-page-tables.patch
+kvm-mmu-if-emulating-an-instruction-fails-try-unprotecting-the-page.patch
+kvm-mmu-implement-child-shadow-unlinking.patch
+kvm-mmu-kvm_mmu_put_page-only-removes-one-link-to-the-page.patch
+kvm-mmu-oom-handling.patch
+kvm-mmu-remove-invlpg-interception.patch
+kvm-mmu-remove-release_pt_page_64.patch
+kvm-mmu-handle-misaligned-accesses-to-write-protected-guest-page-tables.patch
+kvm-mmu-ove-is_empty_shadow_page-above-kvm_mmu_free_page.patch
+kvm-mmu-ensure-freed-shadow-pages-are-clean.patch
+kvm-mmu-if-an-empty-shadow-page-is-not-empty-report-more-info.patch
+kvm-mmu-page-table-write-flood-protection.patch
+kvm-mmu-never-free-a-shadow-page-actively-serving-as-a-root.patch
+kvm-mmu-fix-cmpxchg8b-emulation.patch
+kvm-mmu-treat-user-mode-faults-as-a-hint-that-a-page-is-no-longer-a-page-table.patch
+kvm-mmu-free-pages-on-kvm-destruction.patch
+kvm-mmu-replace-atomic-allocations-by-preallocated-objects.patch
+kvm-mmu-detect-oom-conditions-and-propagate-error-to-userspace.patch
+kvm-mmu-flush-guest-tlb-when-reducing-permissions-on-a-pte.patch
+kvm-mmu-destroy-mmu-while-we-still-have-a-vcpu-left.patch
+kvm-mmu-add-audit-code-to-check-mappings-etc-are-correct.patch
+pata_optidma-typo-in-kconfig.patch
+hpt37x-two-important-bug-fixes.patch
+check-for-populated-zone-in-__drain_pages.patch
+qconf-fix-sigsegv-on-empty-menu-items.patch
+fix-the-toshiba_acpi-write_lcd-return-value.patch

2.6.20 queue

+use-correct-macros-in-raid-code-not-raw-asm.patch
+use-correct-macros-in-raid-code-not-raw-asm-include.patch

Fiddle with the RAID code's x86 assembly (needs work)

+pci-avoid-taking-pci_bus_sem-early-in-boot.patch

Fix early-boot lockups on some machines

+git-alsa-fixup.patch

Fix rejects in git-alsa

+sound-hda-detect-alc883-on-msi-k9a-platinum-motherboards.patch

SOund fix

+rewrite-lock-in-cpufreq-to-eliminate-cpufreq-hotplug-related-issues.patch
+rewrite-lock-in-cpufreq-to-eliminate-cpufreq-hotplug-related-issues-fix.patch
+ondemand-governor-restructure-the-work-callback.patch
+ondemand-governor-use-new-cpufreq-rwsem-locking-in-work-callback.patch

cpufreq locking rewrite

+gregkh-driver-sysfs-kobject_put-cleanup.patch
+gregkh-driver-kobject-kobject_put-cleanup.patch

Driver tree updates

+kobject-kobj-k_name-verification-fix.patch
+error-handling-in-sysfs-fill_read_buffer.patch

Driver tree things

+make-usbvision_rvfree-static.patch
+maintainers-tag-pvrusb2-list-as-subscribers-only.patch
+ks0127-status-flags.patch

DVB updates

+jdelvare-i2c-i2c-migration-aids-for-i2c_adapter.dev-removal.patch
+jdelvare-i2c-i2c-smbus-doc-typo.patch
+jdelvare-i2c-i2c-i801-spelling-fix.patch
+jdelvare-i2c-i2c-completion-header-cleanups.patch
+jdelvare-i2c-i2c-01-hwmon-drivers-stop-using-i2c_adapter.dev.patch
+jdelvare-i2c-i2c-02-i2c-bus-drivers-stop-using-i2c_adapter.dev.patch
+jdelvare-i2c-i2c-03-misc-i2c-drivers-stop-using-i2c_adapter.dev.patch
+jdelvare-i2c-i2c-04-other-drivers-stop-using-i2c_adapter.dev.patch
+jdelvare-i2c-i2c-05-remove-i2c_adapter.dev-from-all-i2c-adapters.patch
+jdelvare-i2c-i2c-06-missing-i2c_adapter-parent-devices.patch

I2C tree updates

+i2c-m41t00-do-not-forget-to-write-year.patch

i2c driver fix

+ia64-swiotlb-bug-fixes.patch
+ia64-make-swiotlb-use-bus_to_virt-virt_to_bus.patch
+ia64-swiotlb-cleanup.patch
+ia64-swiotlb-abstraction-eg-for-xen.patch
+ia64-missing-exports-hwsw_sync_.patch
+ia64-enable-swiotlb-only-when-needed.patch
+show_mem-for-ia64-sparsemem-numa.patch

ia64 stuff

-git-libata-all-fixup.patch

Unneeded

-mmc-add-support-for-sdhc-cards.patch
+mmc-add-a-quirk-to-allow-ene-pci-sd-card-readers-to-work-again.patch

Updated

+ubiioc-needs-schedh.patch
+drivers-mtd-ubi-vtblc-make-2-functions-static.patch

Fix git-ubi

+sis190-mac-address-setting-fix.patch
+qeth-fix-uaccess-handling-and-get-rid-of-unused-variable.patch
+net-ifb-error-path-loop-fix.patch
+forcedeth-sideband-management-fix.patch

netdev updates

+fix-for-crash-in-adummy_init.patch

net fix

+r8169-warning-fixes.patch

netdev warning fix

+gregkh-pci-pci-remove-pci_find_device_reverse.patch
+gregkh-pci-pci-mark-pci_find_device-as-__deprecated.patch
+gregkh-pci-pciehp-cleanup-init_slot.patch
+gregkh-pci-pciehp-cleanup-slot-list.patch
+gregkh-pci-pciehp-remove-unnecessary-php_ctlr.patch
+gregkh-pci-pciehp-remove-unused-pci_bus-from-struct-controller.patch
+gregkh-pci-pciehp-cleanup-register-access.patch
+gregkh-pci-pciehp-cleanup-pciehp.h.patch
+gregkh-pci-pciehp-remove-unused-pcie_cap_base.patch
+gregkh-pci-pciehp-cleanup-wait-command-completion.patch
+gregkh-pci-pciehp-fix-wait-command-completion.patch
+gregkh-pci-add-emi-support-to-pciehp.patch
+gregkh-pci-pci-quirk-1k-i-o-space-iobl_adr-fix-on-p64h2.patch

PCI tree updates

+x86-fix-dev_to_node-for-x86-and-x86_64.patch

Fix dev_to_node()

+scsi-lpfc-error-path-fix.patch

scsi driver fix

+git-block-atomicity-fix.patch

Fix git-block

+gregkh-usb-usb-storage-unusual_devs-add-supertop-drives.patch
+gregkh-usb-usb-storage-fix-ipod-ejecting-issue.patch
+gregkh-usb-usb-small-update-to-documentation-usb-acmtxt.patch
+gregkh-usb-usb-fixed-bug-in-endpoint-release-function.patch
+gregkh-usb-usb-fix-ohci-warning.patch
+gregkh-usb-usb-fix-ehci-warning.patch
+gregkh-usb-usb-gadget-file_storage.c-remove-unnecessary-casts.patch
+gregkh-usb-usb-add-usb_endpoint_xfer_control-to-usb.h.patch

USB tree updates

-revert-gregkh-usb-usb-implement-support-for-split-endian-ohci.patch
-revert-gregkh-usb-usb-implement-support-for-ehci-with-big-endian-mmio.patch
-revert-gregkh-usb-ohci-add-support-for-ohci-controller-on-the-of_platform-bus.patch

Dropped

-usb-interrupt-endpoint-support-for-keyspan-usb-to-serial.patch

Dropped (I think)

+usblpc-add-kyocera-mita-fs-820-to-list-of-quirky-printers.patch
+input-hid-add-cidc-usb-device-to-hid-blacklist.patch
+usb-usbmixer-error-path-fix.patch
+fix-for-bugzilla-7544-keyspan-usb-to-serial-converter.patch
+sisusb_con-warning-fixes.patch

USB updates

-convert-i386-pda-code-to-use-%fs-ptrace-make-putgetreg-work-again-for-gs-and-fs.patch

Filded into convert-i386-pda-code-to-use-%fs.patch

+paravirt-vmi-backend-for-paravirt-ops-compile-fix.patch
+paravirt-vmi-backend-for-paravirt-ops-initialize-fs-for-smp.patch
+paravirt-vmi-backend-for-paravirt-ops-native-fix.patch

Fix paravirt-vmi-backend-for-paravirt-ops.patch

-add-i386-idle-notifier-take-3-fix.patch

Folded into add-i386-idle-notifier-take-3.patch

-sched-improve-sched_clock-on-i686-fix.patch

Folded into sched-improve-sched_clock-on-i686.patch

-mmconfig-fix-x86_64-ioremap-base_address.patch

Dropped

+fix-fake-numa-for-x86_64-machines-with-big-io-hole.patch
+x86-64-calgary-tighten-up-printks.patch
+remove-fastcall-references-in-x86_64-code.patch
+spin_lock_irq-enable-interrupts-while-spinning-preparatory-patch.patch
+spin_lock_irq-enable-interrupts-while-spinning-x86_64-implementation.patch
+spin_lock_irq-enable-interrupts-while-spinning-i386-implementation.patch
+use-constant-instead-of-raw-number-in-x86_64-iopermc.patch
+all-transmeta-cpus-have-constant-tscs.patch

x86/x86_64 updates

+slab-remove-broken-pageslab-check-from-kfree_debugcheck.patch

slab fix

+uml-console-locking-fixes.patch
+uml-return-hotplug-errors-to-host.patch
+uml-console-whitespace-and-comment-tidying.patch
+uml-lock-the-irqs_to_free-list.patch
+uml-add-locking-to-network-transport-registration.patch
+uml-network-driver-whitespace-and-style-fixes.patch
+uml-watchdog-driver-locking.patch
+uml-watchdog-driver-formatting.patch
+uml-audio-driver-locking.patch
+uml-audio-driver-formatting.patch
+uml-mconsole-locking.patch
+uml-make-two-variables-static.patch
+uml-port-driver-formatting.patch
+uml-kill-a-compilation-warning.patch

UML updates

+spi-controller-driver-for-omap-microwire-update.patch
+spi-controller-driver-for-omap-microwire-update-fix.patch

Fix spi-controller-driver-for-omap-microwire.patch some more

+char-mxser_new-remove-unused-stuff.patch
+char-mxser-obsolete-old-nonexperimental-new.patch
+char-mxser_new-remove-tty_wakeup-bottomhalf.patch
+char-mxser_new-clean-request_irq-call.patch
+doc-isicom-remove-reserved-ioctl-number.patch
+char-mxser_new-alter-locking-in-isr.patch
+char-mxser_new-header-file-cleanup.patch
+char-mxser_new-less-loops-in-isr.patch
+char-mxser_new-fix-twice-resource-releasing.patch
+char-mxser_new-do-not-put-pdev.patch
+aio-fix-buggy-put_ioctx-call-in-aio_complete-v2.patch
+add-taint_user-and-ability-to-set-taint-flags-from-userspace.patch
+char-moxa-remove-unused-allocated-page.patch
+char-moxa-do-not-initialize-global-static.patch
+char-moxa-timers-cleanup.patch
+char-moxa-remove-hangup-bottomhalf.patch
+char-moxa-remove-unused-functions.patch
+char-moxa-devids-cleanup.patch
+char-moxa-use-pci_device.patch
+char-moxa-eliminate-typedefs.patch
+docbook-html-generate-chapter-section-level-tocs-for-functions.patch
+export-invalidate_mapping_pages-to-modules.patch
+remove-invalidate_inode_pages.patch
+use-cycle_t-instead-of-u64-in-struct-time_interpolator.patch
+fix-sparse-warnings-from-asmnet-checksumh.patch
+add-an-rcu-version-of-list-splicing.patch
+add-an-rcu-version-of-list-splicing-fix.patch
+ipmi-fix-some-rcu-problems.patch
+ipmi-fix-some-rcu-problems-update.patch
+clone-flag-clone_parent_tidptr-leaves-invalid-results-in-memory.patch
+factor-outstanding-i-o-error-handling.patch
+factor-outstanding-i-o-error-handling-tidy.patch
+sync_sb_inodes-propagate-errors.patch
+block_write_full_page-handle-enospc.patch
+get-rid-of-double-zeroing-of-allocated-pages.patch
+relax-check-for-aix-in-msdos-partition-table.patch
+msdos-partitions-fix-logic-error-in-aix-detection.patch
+add-const-for-timespecval_compare-arguments.patch
+schedule-obsolete-oss-drivers-for-removal-3rd-round.patch
+sysctl-warning-fix.patch
+proc_misc-warning-fix.patch

Misc fixes and updates

+hrtimers-namespace-and-enum-cleanup-vs-git-input.patch

Fix hrtimers-namespace-and-enum-cleanup.patch

+reimplement-flush_workqueue.patch
+implement-flush_work.patch
+implement-flush_work-sanity.patch
+implement-flush_work_keventd.patch
+flush_workqueue-use-preempt_disable-to-hold-off-cpu-hotplug.patch
+aio-use-flush_work.patch
+kblockd-use-flush_work.patch
+relayfs-use-flush_keventd_work.patch
+tg3-use-flush_keventd_work.patch
+e1000-use-flush_keventd_work.patch
+libata-use-flush_work.patch
+phy-use-flush_work.patch

workqueue API changes and users thereof.

+edac-e752x-bit-mask-fix.patch
+edac-e752x-byte-access-fix.patch
+edac-fix-in-e752x-mc-driver.patch
+edac-add-memory-scrubbing-controls-api-to-core.patch
+edac-add-fully-buffered-dimm-apis-to-core.patch

EDAC driver updates

+aio-is-unlikely.patch

AIO tweak.

+nsproxy-externalizes-exit_task_namespaces.patch
+user-namespace-add-the-framework.patch
+user-namespace-add-the-framework-fix.patch
+user-ns-add-user_namespace-ptr-to-vfsmount.patch
+user-ns-hook-permission.patch
+user-ns-prepare-copy_tree-copy_mnt-and-their-callers-to-handle-errs.patch
+user-ns-prepare-copy_tree-copy_mnt-and-their-callers-to-handle-errs-fix.patch
+user-ns-implement-shared-mounts.patch
+user_ns-handle-file-sigio.patch
+user-ns-implement-user-ns-unshare.patch
+user-ns-implement-user-ns-unshare-tidy.patch

virtualise struct user.

+user-ns-always-on.patch

Temporarily force CONFIG_USER_NS=y, because to kerenl doesn't work with it
disabled.

+reiser4-vs-git-block.patch
+reiser4-vs-git-block-2.patch

Update resier4 for git-block API changes.

+piix-tuneproc-fixes-cleanups.patch
+slc90e66-carry-over-fixes-from-piix-driver.patch
+hpt36x-pci-clock-detection-fix.patch

IDE driver updates

+remove-555-unneeded-includes-of-schedh.patch

Untangle some headers

+fix-flush_workqueue-vs-cpu_dead-race.patch

More workqueue changes

+integrity-service-api-and-dummy-provider-fix.patch

Fixegrity-service-api-and-dummy-provider.patch some more

+panic-on-slim-selinux.patch

Fix SLIM patches in -mm.

-unplug-can-sleep.patch

Dropped due to git-block changes

+profile-likely-unlikely-macros-x86_64-fix.patch

Fix profile-likely-unlikely-macros.patch




All 933 patches:

ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.20-rc3/2.6.20-rc3-mm1/patch-list



2007-01-05 09:46:56

by Frederik Deweerdt

[permalink] [raw]
Subject: [-mm patch] lockdep: unbalance at generic_sync_sb_inodes

On Thu, Jan 04, 2007 at 10:02:00PM -0800, Andrew Morton wrote:

> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.20-rc3/2.6.20-rc3-mm1/
Hi,

The reiser4-sb_sync_inodes.patch, which goal is to:
"This patch moves spin_lock/spin_unlock down to sync_sb_inodes."
Only really moved the spin_unlock, thus triggering the following
lockdep message:
[ 65.267402] =====================================
[ 65.267508] [ BUG: bad unlock balance detected! ]
[ 65.267563] -------------------------------------
[ 65.267619] swapper/0 is trying to release lock (inode_lock) at:
[ 65.267751] [<c018f573>] generic_sync_sb_inodes+0xa6/0x2e8
[ 65.267853] but there are no more locks to release!
[ 65.267908]
[ 65.267909] other info that might help us debug this:
[ 65.268014] 1 lock held by swapper/0:
[ 65.268068] #0: (&type->s_umount_key){--..}, at: [<c0174c18>] alloc_super+0xe8/0x1a5
[ 65.268330]
[ 65.268330] stack backtrace:
[ 65.268433] [<c010390d>] show_trace_log_lvl+0x1a/0x30
[ 65.268528] [<c0103935>] show_trace+0x12/0x14
[ 65.268621] [<c0103a2f>] dump_stack+0x16/0x18
[ 65.268714] [<c013b2a0>] print_unlock_inbalance_bug+0xce/0xd8
[ 65.268811] [<c013b39b>] lock_release_non_nested+0x6f/0x172
[ 65.268907] [<c013b4d2>] lock_release_nested+0x34/0xdc
[ 65.269001] [<c013b5ce>] __lock_release+0x54/0x56
[ 65.269095] [<c013b809>] lock_release+0x46/0x60
[ 65.269188] [<c03e8660>] _spin_unlock+0x16/0x40
[ 65.269284] [<c018f573>] generic_sync_sb_inodes+0xa6/0x2e8
[ 65.269379] [<c018f7d5>] sync_sb_inodes+0x20/0x23
[ 65.269472] [<c018f937>] sync_inodes_sb+0x82/0x8a
[ 65.269566] [<c0174eab>] __fsync_super+0xd/0x84
[ 65.269659] [<c0174f2d>] fsync_super+0xb/0x19
[ 65.269753] [<c017558a>] do_remount_sb+0x30/0xee
[ 65.269846] [<c0175aa2>] get_sb_single+0x66/0x8b
[ 65.269940] [<c01b45c1>] sysfs_get_sb+0x1d/0x2c
[ 65.270036] [<c0175b49>] vfs_kern_mount+0x82/0xfb
[ 65.270130] [<c0175c19>] kern_mount+0x16/0x1d
[ 65.270223] [<c055ddb6>] sysfs_init+0x57/0xad
[ 65.270319] [<c055c8d2>] mnt_init+0xbf/0x13b
[ 65.270412] [<c055c555>] vfs_caches_init+0x97/0xa7
[ 65.270506] [<c0544bd4>] start_kernel+0x1ca/0x261
[ 65.270600] [<00000000>] 0x0
[ 65.270691] =======================

Regards,
Frederik

Signed-off-by: Frederik Deweerdt <[email protected]>

diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c
index ea054f7..7e84b93 100644
--- a/fs/fs-writeback.c
+++ b/fs/fs-writeback.c
@@ -306,6 +306,8 @@ int generic_sync_sb_inodes(struct super_
const unsigned long start = jiffies; /* livelock avoidance */
int ret = 0;

+ spin_lock(&inode_lock);
+
if (!wbc->for_kupdate || list_empty(&sb->s_io))
list_splice_init(&sb->s_dirty, &sb->s_io);

2007-01-05 12:18:44

by Frederik Deweerdt

[permalink] [raw]
Subject: [-mm patch] lockdep: possible deadlock in sysfs

On Thu, Jan 04, 2007 at 10:02:00PM -0800, Andrew Morton wrote:
>
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.20-rc3/2.6.20-rc3-mm1/
>
Hi,

Lockdep issues the following warning:
[ 9.064000] =============================================
[ 9.064000] [ INFO: possible recursive locking detected ]
[ 9.064000] 2.6.20-rc3-mm1 #3
[ 9.064000] ---------------------------------------------
[ 9.064000] init/1 is trying to acquire lock:
[ 9.064000] (&sysfs_inode_imutex_key){--..}, at: [<c03e6afc>] mutex_lock+0x1c/0x1f
[ 9.064000]
[ 9.064000] but task is already holding lock:
[ 9.064000] (&sysfs_inode_imutex_key){--..}, at: [<c03e6afc>] mutex_lock+0x1c/0x1f
[ 9.065000]
[ 9.065000] other info that might help us debug this:
[ 9.065000] 2 locks held by init/1:
[ 9.065000] #0: (tty_mutex){--..}, at: [<c03e6afc>] mutex_lock+0x1c/0x1f
[ 9.065000] #1: (&sysfs_inode_imutex_key){--..}, at: [<c03e6afc>] mutex_lock+0x1c/0x1f
[ 9.065000]
[ 9.065000] stack backtrace:
[ 9.065000] [<c010390d>] show_trace_log_lvl+0x1a/0x30
[ 9.066000] [<c0103935>] show_trace+0x12/0x14
[ 9.066000] [<c0103a2f>] dump_stack+0x16/0x18
[ 9.066000] [<c0138cb8>] print_deadlock_bug+0xb9/0xc3
[ 9.066000] [<c0138d17>] check_deadlock+0x55/0x5a
[ 9.066000] [<c013a953>] __lock_acquire+0x371/0xbf0
[ 9.066000] [<c013b7a9>] lock_acquire+0x69/0x83
[ 9.066000] [<c03e6b7e>] __mutex_lock_slowpath+0x75/0x2d1
[ 9.066000] [<c03e6afc>] mutex_lock+0x1c/0x1f
[ 9.066000] [<c01b249c>] sysfs_drop_dentry+0xb1/0x133
[ 9.066000] [<c01b25d1>] sysfs_hash_and_remove+0xb3/0x142
[ 9.066000] [<c01b30ed>] sysfs_remove_file+0xd/0x10
[ 9.067000] [<c02849e0>] device_remove_file+0x23/0x2e
[ 9.067000] [<c02850b2>] device_del+0x188/0x1e6
[ 9.067000] [<c028511b>] device_unregister+0xb/0x15
[ 9.067000] [<c0285318>] device_destroy+0x9c/0xa9
[ 9.067000] [<c0261431>] vcs_remove_sysfs+0x1c/0x3b
[ 9.067000] [<c0267a08>] con_close+0x5e/0x6b
[ 9.067000] [<c02598f2>] release_dev+0x4c4/0x6e5
[ 9.067000] [<c0259faa>] tty_release+0x12/0x1c
[ 9.067000] [<c0174872>] __fput+0x177/0x1a0
[ 9.067000] [<c01746f5>] fput+0x3b/0x41
[ 9.068000] [<c0172ee1>] filp_close+0x36/0x65
[ 9.068000] [<c0172f73>] sys_close+0x63/0xa4
[ 9.068000] [<c0102a96>] sysenter_past_esp+0x5f/0x99
[ 9.068000] =======================

This is due to sysfs_hash_and_remove() holding dir->d_inode->i_mutex
before calling sysfs_drop_dentry() which calls orphan_all_buffers()
which in turn takes node->i_mutex.
The following patch solves the problem by defering the buffers orphaning
after the dir->d_inode->imutex is released. Not sure it's the best
solution though, better wait for feedback from Maneesh and Oliver.

(This is mostly a resend of the patch that I sent for 2.6.20-rc2-mm1 [1], but
it adds the initialisation of inode in sysfs_hash_and_remove)

Regards,
Frederik

[1]
http://groups.google.com/group/linux.kernel/msg/5164f76c31958e0b?dmode=source

Signed-off-by: Frederik Deweerdt <[email protected]>

diff --git a/fs/sysfs/inode.c b/fs/sysfs/inode.c
index 8c533cb..bcf6bc0 100644
--- a/fs/sysfs/inode.c
+++ b/fs/sysfs/inode.c
@@ -230,10 +230,10 @@ static inline void orphan_all_buffers(struct inode *node)
* Unhashes the dentry corresponding to given sysfs_dirent
* Called with parent inode's i_mutex held.
*/
-void sysfs_drop_dentry(struct sysfs_dirent * sd, struct dentry * parent)
+struct inode *sysfs_drop_dentry(struct sysfs_dirent * sd, struct dentry * parent)
{
struct dentry * dentry = sd->s_dentry;
- struct inode *inode;
+ struct inode *inode = NULL;

if (dentry) {
spin_lock(&dcache_lock);
@@ -248,19 +248,19 @@ void sysfs_drop_dentry(struct sysfs_dirent * sd, struct dentry * parent)
spin_unlock(&dentry->d_lock);
spin_unlock(&dcache_lock);
simple_unlink(parent->d_inode, dentry);
- orphan_all_buffers(inode);
- iput(inode);
} else {
spin_unlock(&dentry->d_lock);
spin_unlock(&dcache_lock);
}
}
+ return inode;
}

int sysfs_hash_and_remove(struct dentry * dir, const char * name)
{
struct sysfs_dirent * sd;
struct sysfs_dirent * parent_sd;
+ struct inode *inode = NULL;
int found = 0;

if (!dir)
@@ -277,7 +277,7 @@ int sysfs_hash_and_remove(struct dentry * dir, const char * name)
continue;
if (!strcmp(sysfs_get_name(sd), name)) {
list_del_init(&sd->s_sibling);
- sysfs_drop_dentry(sd, dir);
+ inode = sysfs_drop_dentry(sd, dir);
sysfs_put(sd);
found = 1;
break;
@@ -285,5 +285,10 @@ int sysfs_hash_and_remove(struct dentry * dir, const char * name)
}
mutex_unlock(&dir->d_inode->i_mutex);

+ if (found && inode) {
+ orphan_all_buffers(inode);
+ iput(inode);
+ }
+
return found ? 0 : -ENOENT;
}
diff --git a/fs/sysfs/sysfs.h b/fs/sysfs/sysfs.h
index 5100a12..ef9d217 100644
--- a/fs/sysfs/sysfs.h
+++ b/fs/sysfs/sysfs.h
@@ -17,7 +17,7 @@ extern int sysfs_create_subdir(struct kobject *, const char *, struct dentry **)
extern void sysfs_remove_subdir(struct dentry *);

extern const unsigned char * sysfs_get_name(struct sysfs_dirent *sd);
-extern void sysfs_drop_dentry(struct sysfs_dirent *sd, struct dentry *parent);
+extern struct inode * sysfs_drop_dentry(struct sysfs_dirent *sd, struct dentry *parent);
extern int sysfs_setattr(struct dentry *dentry, struct iattr *iattr);

extern struct rw_semaphore sysfs_rename_sem;

2007-01-05 12:48:14

by Oliver Neukum

[permalink] [raw]
Subject: Re: [-mm patch] lockdep: possible deadlock in sysfs

Am Freitag, 5. Januar 2007 13:16 schrieb Frederik Deweerdt:
> This is due to sysfs_hash_and_remove() holding dir->d_inode->i_mutex
> before calling sysfs_drop_dentry() which calls orphan_all_buffers()
> which in turn takes node->i_mutex.

This makes me wonder why it didn't deadlock during my tests.
I am investigating.

Regards
Oliver

2007-01-05 15:13:19

by Oliver Neukum

[permalink] [raw]
Subject: Re: [-mm patch] lockdep: possible deadlock in sysfs

Am Freitag, 5. Januar 2007 13:16 schrieb Frederik Deweerdt:
> On Thu, Jan 04, 2007 at 10:02:00PM -0800, Andrew Morton wrote:
> >
> > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.20-rc3/2.6.20-rc3-mm1/
> >
> Hi,
>
> Lockdep issues the following warning:
> [ 9.064000] =============================================
> [ 9.064000] [ INFO: possible recursive locking detected ]
> [ 9.064000] 2.6.20-rc3-mm1 #3
> [ 9.064000] ---------------------------------------------
> [ 9.064000] init/1 is trying to acquire lock:
> [ 9.064000] (&sysfs_inode_imutex_key){--..}, at: [<c03e6afc>] mutex_lock+0x1c/0x1f
> [ 9.064000]
> [ 9.064000] but task is already holding lock:
> [ 9.064000] (&sysfs_inode_imutex_key){--..}, at: [<c03e6afc>] mutex_lock+0x1c/0x1f
> [ 9.065000]
> [ 9.065000] other info that might help us debug this:
> [ 9.065000] 2 locks held by init/1:
> [ 9.065000] #0: (tty_mutex){--..}, at: [<c03e6afc>] mutex_lock+0x1c/0x1f
> [ 9.065000] #1: (&sysfs_inode_imutex_key){--..}, at: [<c03e6afc>] mutex_lock+0x1c/0x1f
> [ 9.065000]
> [ 9.065000] stack backtrace:
> [ 9.065000] [<c010390d>] show_trace_log_lvl+0x1a/0x30
> [ 9.066000] [<c0103935>] show_trace+0x12/0x14
> [ 9.066000] [<c0103a2f>] dump_stack+0x16/0x18
> [ 9.066000] [<c0138cb8>] print_deadlock_bug+0xb9/0xc3
> [ 9.066000] [<c0138d17>] check_deadlock+0x55/0x5a
> [ 9.066000] [<c013a953>] __lock_acquire+0x371/0xbf0
> [ 9.066000] [<c013b7a9>] lock_acquire+0x69/0x83
> [ 9.066000] [<c03e6b7e>] __mutex_lock_slowpath+0x75/0x2d1
> [ 9.066000] [<c03e6afc>] mutex_lock+0x1c/0x1f
> [ 9.066000] [<c01b249c>] sysfs_drop_dentry+0xb1/0x133
> [ 9.066000] [<c01b25d1>] sysfs_hash_and_remove+0xb3/0x142
> [ 9.066000] [<c01b30ed>] sysfs_remove_file+0xd/0x10
> [ 9.067000] [<c02849e0>] device_remove_file+0x23/0x2e
> [ 9.067000] [<c02850b2>] device_del+0x188/0x1e6
> [ 9.067000] [<c028511b>] device_unregister+0xb/0x15
> [ 9.067000] [<c0285318>] device_destroy+0x9c/0xa9
> [ 9.067000] [<c0261431>] vcs_remove_sysfs+0x1c/0x3b
> [ 9.067000] [<c0267a08>] con_close+0x5e/0x6b
> [ 9.067000] [<c02598f2>] release_dev+0x4c4/0x6e5
> [ 9.067000] [<c0259faa>] tty_release+0x12/0x1c
> [ 9.067000] [<c0174872>] __fput+0x177/0x1a0
> [ 9.067000] [<c01746f5>] fput+0x3b/0x41
> [ 9.068000] [<c0172ee1>] filp_close+0x36/0x65
> [ 9.068000] [<c0172f73>] sys_close+0x63/0xa4
> [ 9.068000] [<c0102a96>] sysenter_past_esp+0x5f/0x99
> [ 9.068000] =======================
>
> This is due to sysfs_hash_and_remove() holding dir->d_inode->i_mutex
> before calling sysfs_drop_dentry() which calls orphan_all_buffers()
> which in turn takes node->i_mutex.
> The following patch solves the problem by defering the buffers orphaning
> after the dir->d_inode->imutex is released. Not sure it's the best
> solution though, better wait for feedback from Maneesh and Oliver.

Hi,

are you sure there's a code path that takes these locks in the reverse order?
I've looked through the code twice and not found any. It doesn't make much
sense to first lock the file and afterwards the directory.

Regarding your patch, it should work, but I don't see the need for it.

Regards
Oliver

2007-01-05 16:23:08

by Mariusz Kozlowski

[permalink] [raw]
Subject: Re: 2.6.20-rc3-mm1

Hello,

Doesn't build on my iMac G3 based garage jukebox ;-)

arch/powerpc/kernel/of_platform.c:479: error: unknown field 'multithread_probe' specified in initializer
arch/powerpc/kernel/of_platform.c:479: warning: initialization makes pointer from integer without a cast
make[1]: *** [arch/powerpc/kernel/of_platform.o] Blad 1
make: *** [arch/powerpc/kernel] Blad 2

I guess someone who knows multithread code should take a look at it.

--
Regards,

Mariusz Kozlowski

2007-01-05 16:44:53

by Frederik Deweerdt

[permalink] [raw]
Subject: Re: [-mm patch] lockdep: possible deadlock in sysfs

On Fri, Jan 05, 2007 at 04:13:25PM +0100, Oliver Neukum wrote:
> Am Freitag, 5. Januar 2007 13:16 schrieb Frederik Deweerdt:
> > On Thu, Jan 04, 2007 at 10:02:00PM -0800, Andrew Morton wrote:
> > >
> > > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.20-rc3/2.6.20-rc3-mm1/
> > >
> are you sure there's a code path that takes these locks in the reverse order?
> I've looked through the code twice and not found any. It doesn't make much
> sense to first lock the file and afterwards the directory.
You're right, an annotation should be enough, what do you think?

Regards,
Frederik


Signed-off-by: Frederik Deweerdt <[email protected]>

diff --git a/fs/sysfs/inode.c b/fs/sysfs/inode.c
index 8c533cb..3b5574b 100644
--- a/fs/sysfs/inode.c
+++ b/fs/sysfs/inode.c
@@ -214,7 +214,7 @@ static inline void orphan_all_buffers(st
struct sysfs_buffer_collection *set = node->i_private;
struct sysfs_buffer *buf;

- mutex_lock(&node->i_mutex);
+ mutex_lock_nested(&node->i_mutex, I_MUTEX_CHILD);
if (node->i_private) {
list_for_each_entry(buf, &set->associates, associates) {
down(&buf->sem);
@@ -271,7 +271,7 @@ int sysfs_hash_and_remove(struct dentry
return -ENOENT;

parent_sd = dir->d_fsdata;
- mutex_lock(&dir->d_inode->i_mutex);
+ mutex_lock_nested(&dir->d_inode->i_mutex, I_MUTEX_PARENT);
list_for_each_entry(sd, &parent_sd->s_children, s_sibling) {
if (!sd->s_element)
continue;

> Regarding your patch, it should work, but I don't see the need for it.
>
> Regards
> Oliver
> -
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>

2007-01-05 16:53:00

by Oliver Neukum

[permalink] [raw]
Subject: Re: [-mm patch] lockdep: possible deadlock in sysfs

Am Freitag, 5. Januar 2007 17:42 schrieb Frederik Deweerdt:
> On Fri, Jan 05, 2007 at 04:13:25PM +0100, Oliver Neukum wrote:
> > Am Freitag, 5. Januar 2007 13:16 schrieb Frederik Deweerdt:
> > > On Thu, Jan 04, 2007 at 10:02:00PM -0800, Andrew Morton wrote:
> > > >
> > > > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.20-rc3/2.6.20-rc3-mm1/
> > > >
> > are you sure there's a code path that takes these locks in the reverse order?
> > I've looked through the code twice and not found any. It doesn't make much
> > sense to first lock the file and afterwards the directory.
> You're right, an annotation should be enough, what do you think?

I agree.

Regards
Oliver

2007-01-05 18:45:27

by Tim Schmielau

[permalink] [raw]
Subject: Re: 2.6.20-rc3-mm1

On Fri, 5 Jan 2007, Mariusz Kozlowski wrote:

> Doesn't build on my iMac G3 based garage jukebox ;-)
>
> arch/powerpc/kernel/of_platform.c:479: error: unknown field 'multithread_probe' specified in initializer
> arch/powerpc/kernel/of_platform.c:479: warning: initialization makes pointer from integer without a cast
> make[1]: *** [arch/powerpc/kernel/of_platform.o] Blad 1
> make: *** [arch/powerpc/kernel] Blad 2

Can you please post your .config?

Thanks,
Tim

2007-01-05 20:56:01

by Benjamin Herrenschmidt

[permalink] [raw]
Subject: Re: 2.6.20-rc3-mm1

On Fri, 2007-01-05 at 17:23 +0100, Mariusz Kozlowski wrote:
> Hello,
>
> Doesn't build on my iMac G3 based garage jukebox ;-)
>
> arch/powerpc/kernel/of_platform.c:479: error: unknown field 'multithread_probe' specified in initializer
> arch/powerpc/kernel/of_platform.c:479: warning: initialization makes pointer from integer without a cast
> make[1]: *** [arch/powerpc/kernel/of_platform.o] Blad 1
> make: *** [arch/powerpc/kernel] Blad 2
>
> I guess someone who knows multithread code should take a look at it.

Hrm. struct driver -> multithread_probe is gone in -mm ?

Ben.


2007-01-05 21:15:47

by Andrew Morton

[permalink] [raw]
Subject: Re: 2.6.20-rc3-mm1

On Sat, 06 Jan 2007 07:55:36 +1100
Benjamin Herrenschmidt <[email protected]> wrote:

> On Fri, 2007-01-05 at 17:23 +0100, Mariusz Kozlowski wrote:
> > Hello,
> >
> > Doesn't build on my iMac G3 based garage jukebox ;-)
> >
> > arch/powerpc/kernel/of_platform.c:479: error: unknown field 'multithread_probe' specified in initializer
> > arch/powerpc/kernel/of_platform.c:479: warning: initialization makes pointer from integer without a cast
> > make[1]: *** [arch/powerpc/kernel/of_platform.o] Blad 1
> > make: *** [arch/powerpc/kernel] Blad 2
> >
> > I guess someone who knows multithread code should take a look at it.
>
> Hrm. struct driver -> multithread_probe is gone in -mm ?
>

yeah, it moved into struct bus_type.

http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.20-rc3/2.6.20-rc3-mm1/broken-out/driver-core-per-subsystem-multithreaded-probing.patch

2007-01-05 21:25:19

by Benjamin Herrenschmidt

[permalink] [raw]
Subject: Re: 2.6.20-rc3-mm1

On Fri, 2007-01-05 at 13:15 -0800, Andrew Morton wrote:
> On Sat, 06 Jan 2007 07:55:36 +1100
> Benjamin Herrenschmidt <[email protected]> wrote:
>
> > On Fri, 2007-01-05 at 17:23 +0100, Mariusz Kozlowski wrote:
> > > Hello,
> > >
> > > Doesn't build on my iMac G3 based garage jukebox ;-)
> > >
> > > arch/powerpc/kernel/of_platform.c:479: error: unknown field 'multithread_probe' specified in initializer
> > > arch/powerpc/kernel/of_platform.c:479: warning: initialization makes pointer from integer without a cast
> > > make[1]: *** [arch/powerpc/kernel/of_platform.o] Blad 1
> > > make: *** [arch/powerpc/kernel] Blad 2
> > >
> > > I guess someone who knows multithread code should take a look at it.
> >
> > Hrm. struct driver -> multithread_probe is gone in -mm ?
> >
>
> yeah, it moved into struct bus_type.
>
> http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.20-rc3/2.6.20-rc3-mm1/broken-out/driver-core-per-subsystem-multithreaded-probing.patch

Hrm. I disagree with this change. I have a few cases where drivers
actually want to explicitely do that. I suppose they can always fire off
a thread themselves from probe() but I don't see the reason to move it
to the bus type...

Easy enough for the bus type to force it if it wants.

Ben.

2007-01-06 01:06:59

by Adrian Bunk

[permalink] [raw]
Subject: [-mm patch] make proc_dointvec_taint() static

On Thu, Jan 04, 2007 at 10:02:00PM -0800, Andrew Morton wrote:
>...
> Changes since 2.6.20-rc2-mm1:
>...
> +add-taint_user-and-ability-to-set-taint-flags-from-userspace.patch
>...
> Misc fixes and updates
>...

This patch makes the needlessly global proc_dointvec_taint() static.

Signed-off-by: Adrian Bunk <[email protected]>

---

include/linux/sysctl.h | 2 --
kernel/sysctl.c | 7 +++++--
2 files changed, 5 insertions(+), 4 deletions(-)

--- linux-2.6.20-rc3-mm1/include/linux/sysctl.h.old 2007-01-05 23:28:46.000000000 +0100
+++ linux-2.6.20-rc3-mm1/include/linux/sysctl.h 2007-01-05 23:28:54.000000000 +0100
@@ -929,8 +929,6 @@
void __user *, size_t *, loff_t *);
extern int proc_dointvec_bset(ctl_table *, int, struct file *,
void __user *, size_t *, loff_t *);
-extern int proc_dointvec_taint(ctl_table *, int, struct file *,
- void __user *, size_t *, loff_t *);
extern int proc_dointvec_minmax(ctl_table *, int, struct file *,
void __user *, size_t *, loff_t *);
extern int proc_dointvec_jiffies(ctl_table *, int, struct file *,
--- linux-2.6.20-rc3-mm1/kernel/sysctl.c.old 2007-01-05 23:29:05.000000000 +0100
+++ linux-2.6.20-rc3-mm1/kernel/sysctl.c 2007-01-05 23:30:31.000000000 +0100
@@ -181,6 +181,9 @@
int sysctl_legacy_va_layout;
#endif

+static int proc_dointvec_taint(ctl_table *table, int write, struct file *filp,
+ void __user *buffer, size_t *lenp, loff_t *ppos);
+
static void *get_uts(ctl_table *table, int write)
{
char *which = table->data;
@@ -2022,8 +2025,8 @@
/*
* Taint values can only be increased
*/
-int proc_dointvec_taint(ctl_table *table, int write, struct file *filp,
- void __user *buffer, size_t *lenp, loff_t *ppos)
+static int proc_dointvec_taint(ctl_table *table, int write, struct file *filp,
+ void __user *buffer, size_t *lenp, loff_t *ppos)
{
int op;


2007-01-06 10:58:51

by Laurent Riffard

[permalink] [raw]
Subject: Re: 2.6.20-rc3-mm1: umount reiser4 FS stuck in D state

#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.20-rc3-mm1
# Sat Jan 6 09:34:05 2007
#
CONFIG_X86_32=y
CONFIG_GENERIC_TIME=y
CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
CONFIG_LOCKDEP_SUPPORT=y
CONFIG_STACKTRACE_SUPPORT=y
CONFIG_SEMAPHORE_SLEEPERS=y
CONFIG_X86=y
CONFIG_MMU=y
CONFIG_ZONE_DMA=y
CONFIG_GENERIC_ISA_DMA=y
CONFIG_GENERIC_IOMAP=y
CONFIG_GENERIC_BUG=y
CONFIG_GENERIC_HWEIGHT=y
CONFIG_ARCH_MAY_HAVE_PC_FDC=y
CONFIG_DMI=y
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"

#
# Code maturity level options
#
CONFIG_EXPERIMENTAL=y
CONFIG_BROKEN_ON_SMP=y
CONFIG_LOCK_KERNEL=y
CONFIG_INIT_ENV_ARG_LIMIT=32

#
# General setup
#
CONFIG_LOCALVERSION=""
CONFIG_LOCALVERSION_AUTO=y
CONFIG_SWAP=y
CONFIG_SWAP_PREFETCH=y
CONFIG_SYSVIPC=y
# CONFIG_IPC_NS is not set
CONFIG_POSIX_MQUEUE=y
# CONFIG_BSD_PROCESS_ACCT is not set
# CONFIG_TASKSTATS is not set
# CONFIG_UTS_NS is not set
CONFIG_USER_NS=y
# CONFIG_AUDIT is not set
# CONFIG_IKCONFIG is not set
CONFIG_SYSFS_DEPRECATED=y
# CONFIG_RELAY is not set
CONFIG_INITRAMFS_SOURCE=""
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_SYSCTL=y
CONFIG_EMBEDDED=y
CONFIG_UID16=y
CONFIG_SYSCTL_SYSCALL=y
CONFIG_KALLSYMS=y
CONFIG_KALLSYMS_ALL=y
# CONFIG_KALLSYMS_EXTRA_PASS is not set
CONFIG_HOTPLUG=y
CONFIG_PRINTK=y
CONFIG_BUG=y
CONFIG_ELF_CORE=y
CONFIG_BASE_FULL=y
CONFIG_FUTEX=y
CONFIG_EPOLL=y
CONFIG_SHMEM=y
CONFIG_SLAB=y
CONFIG_VM_EVENT_COUNTERS=y
CONFIG_RT_MUTEXES=y
# CONFIG_TINY_SHMEM is not set
CONFIG_BASE_SMALL=0
# CONFIG_SLOB is not set

#
# Loadable module support
#
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
CONFIG_MODULE_FORCE_UNLOAD=y
# CONFIG_MODVERSIONS is not set
# CONFIG_MODULE_SRCVERSION_ALL is not set
CONFIG_KMOD=y

#
# Block layer
#
CONFIG_BLOCK=y
# CONFIG_LBD is not set
# CONFIG_BLK_DEV_IO_TRACE is not set
# CONFIG_LSF is not set

#
# IO Schedulers
#
CONFIG_IOSCHED_NOOP=y
CONFIG_IOSCHED_AS=y
CONFIG_IOSCHED_DEADLINE=y
CONFIG_IOSCHED_CFQ=y
# CONFIG_DEFAULT_AS is not set
# CONFIG_DEFAULT_DEADLINE is not set
CONFIG_DEFAULT_CFQ=y
# CONFIG_DEFAULT_NOOP is not set
CONFIG_DEFAULT_IOSCHED="cfq"

#
# Processor type and features
#
# CONFIG_HIGH_RES_TIMERS is not set
# CONFIG_SMP is not set
CONFIG_X86_PC=y
# CONFIG_X86_ELAN is not set
# CONFIG_X86_VOYAGER is not set
# CONFIG_X86_NUMAQ is not set
# CONFIG_X86_SUMMIT is not set
# CONFIG_X86_BIGSMP is not set
# CONFIG_X86_VISWS is not set
# CONFIG_X86_GENERICARCH is not set
# CONFIG_X86_ES7000 is not set
# CONFIG_PARAVIRT is not set
# CONFIG_M386 is not set
# CONFIG_M486 is not set
# CONFIG_M586 is not set
# CONFIG_M586TSC is not set
# CONFIG_M586MMX is not set
# CONFIG_M686 is not set
# CONFIG_MPENTIUMII is not set
# CONFIG_MPENTIUMIII is not set
# CONFIG_MPENTIUMM is not set
# CONFIG_MCORE2 is not set
# CONFIG_MPENTIUM4 is not set
# CONFIG_MK6 is not set
CONFIG_MK7=y
# CONFIG_MK8 is not set
# CONFIG_MCRUSOE is not set
# CONFIG_MEFFICEON is not set
# CONFIG_MWINCHIPC6 is not set
# CONFIG_MWINCHIP2 is not set
# CONFIG_MWINCHIP3D is not set
# CONFIG_MGEODEGX1 is not set
# CONFIG_MGEODE_LX is not set
# CONFIG_MCYRIXIII is not set
# CONFIG_MVIAC3_2 is not set
# CONFIG_X86_GENERIC is not set
CONFIG_X86_CMPXCHG=y
CONFIG_X86_XADD=y
CONFIG_X86_L1_CACHE_SHIFT=6
CONFIG_RWSEM_XCHGADD_ALGORITHM=y
# CONFIG_ARCH_HAS_ILOG2_U32 is not set
# CONFIG_ARCH_HAS_ILOG2_U64 is not set
CONFIG_GENERIC_CALIBRATE_DELAY=y
CONFIG_X86_WP_WORKS_OK=y
CONFIG_X86_INVLPG=y
CONFIG_X86_BSWAP=y
CONFIG_X86_POPAD_OK=y
CONFIG_X86_CMPXCHG64=y
CONFIG_X86_GOOD_APIC=y
CONFIG_X86_INTEL_USERCOPY=y
CONFIG_X86_USE_PPRO_CHECKSUM=y
CONFIG_X86_USE_3DNOW=y
CONFIG_X86_TSC=y
CONFIG_HPET_TIMER=y
# CONFIG_PREEMPT_NONE is not set
# CONFIG_PREEMPT_VOLUNTARY is not set
CONFIG_PREEMPT=y
CONFIG_PREEMPT_BKL=y
CONFIG_X86_UP_APIC=y
CONFIG_X86_UP_IOAPIC=y
CONFIG_X86_LOCAL_APIC=y
CONFIG_X86_IO_APIC=y
CONFIG_X86_MCE=y
CONFIG_X86_MCE_NONFATAL=m
CONFIG_X86_MCE_P4THERMAL=y
CONFIG_VM86=y
# CONFIG_TOSHIBA is not set
# CONFIG_I8K is not set
CONFIG_X86_REBOOTFIXUPS=y
# CONFIG_MICROCODE is not set
CONFIG_X86_MSR=m
# CONFIG_X86_CPUID is not set

#
# Firmware Drivers
#
CONFIG_EDD=y
# CONFIG_DELL_RBU is not set
# CONFIG_DCDBAS is not set
CONFIG_NOHIGHMEM=y
# CONFIG_HIGHMEM4G is not set
# CONFIG_HIGHMEM64G is not set
CONFIG_VMSPLIT_3G=y
# CONFIG_VMSPLIT_3G_OPT is not set
# CONFIG_VMSPLIT_2G is not set
# CONFIG_VMSPLIT_1G is not set
CONFIG_PAGE_OFFSET=0xC0000000
CONFIG_ARCH_FLATMEM_ENABLE=y
CONFIG_ARCH_SPARSEMEM_ENABLE=y
CONFIG_ARCH_SELECT_MEMORY_MODEL=y
CONFIG_ARCH_POPULATES_NODE_MAP=y
CONFIG_SELECT_MEMORY_MODEL=y
CONFIG_FLATMEM_MANUAL=y
# CONFIG_DISCONTIGMEM_MANUAL is not set
# CONFIG_SPARSEMEM_MANUAL is not set
CONFIG_FLATMEM=y
CONFIG_FLAT_NODE_MEM_MAP=y
CONFIG_SPARSEMEM_STATIC=y
CONFIG_SPLIT_PTLOCK_CPUS=4
# CONFIG_RESOURCES_64BIT is not set
CONFIG_ZONE_DMA_FLAG=1
CONFIG_ADAPTIVE_READAHEAD=y
# CONFIG_DEBUG_READAHEAD is not set
# CONFIG_MATH_EMULATION is not set
CONFIG_MTRR=y
# CONFIG_EFI is not set
CONFIG_SECCOMP=y
# CONFIG_HZ_100 is not set
CONFIG_HZ_250=y
# CONFIG_HZ_300 is not set
# CONFIG_HZ_1000 is not set
CONFIG_HZ=250
CONFIG_KEXEC=y
CONFIG_PHYSICAL_START=0x100000
# CONFIG_RELOCATABLE is not set
CONFIG_PHYSICAL_ALIGN=0x100000
# CONFIG_COMPAT_VDSO is not set

#
# Power management options (ACPI, APM)
#
CONFIG_PM=y
CONFIG_PM_LEGACY=y
# CONFIG_PM_DEBUG is not set
# CONFIG_PM_SYSFS_DEPRECATED is not set
CONFIG_SOFTWARE_SUSPEND=y
CONFIG_PM_STD_PARTITION="/dev/hdb6"

#
# ACPI (Advanced Configuration and Power Interface) Support
#
CONFIG_ACPI=y
CONFIG_ACPI_SLEEP=y
CONFIG_ACPI_SLEEP_PROC_FS=y
# CONFIG_ACPI_SLEEP_PROC_SLEEP is not set
# CONFIG_ACPI_AC is not set
# CONFIG_ACPI_BATTERY is not set
CONFIG_ACPI_BUTTON=y
CONFIG_ACPI_FAN=y
# CONFIG_ACPI_DOCK is not set
# CONFIG_ACPI_BAY is not set
CONFIG_ACPI_PROCESSOR=y
CONFIG_ACPI_THERMAL=y
# CONFIG_ACPI_ASUS is not set
# CONFIG_ACPI_IBM is not set
# CONFIG_ACPI_TOSHIBA is not set
# CONFIG_ACPI_SONY is not set
CONFIG_ACPI_BLACKLIST_YEAR=0
CONFIG_ACPI_DEBUG=y
CONFIG_ACPI_EC=y
CONFIG_ACPI_POWER=y
CONFIG_ACPI_SYSTEM=y
CONFIG_X86_PM_TIMER=y
# CONFIG_ACPI_CONTAINER is not set
# CONFIG_ACPI_SBS is not set

#
# APM (Advanced Power Management) BIOS Support
#
# CONFIG_APM is not set

#
# CPU Frequency scaling
#
# CONFIG_CPU_FREQ is not set

#
# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
#
CONFIG_PCI=y
# CONFIG_PCI_GOBIOS is not set
# CONFIG_PCI_GOMMCONFIG is not set
# CONFIG_PCI_GODIRECT is not set
CONFIG_PCI_GOANY=y
CONFIG_PCI_BIOS=y
CONFIG_PCI_DIRECT=y
CONFIG_PCI_MMCONFIG=y
# CONFIG_PCIEPORTBUS is not set
# CONFIG_PCI_MSI is not set
# CONFIG_PCI_DEBUG is not set
CONFIG_HT_IRQ=y
CONFIG_ISA_DMA_API=y
CONFIG_ISA=y
# CONFIG_EISA is not set
# CONFIG_MCA is not set
# CONFIG_SCx200 is not set

#
# PCCARD (PCMCIA/CardBus) support
#
# CONFIG_PCCARD is not set

#
# PCI Hotplug Support
#
# CONFIG_HOTPLUG_PCI is not set

#
# Executable file formats
#
CONFIG_BINFMT_ELF=y
CONFIG_BINFMT_AOUT=m
CONFIG_BINFMT_MISC=m

#
# Networking
#
CONFIG_NET=y

#
# Networking options
#
# CONFIG_NETDEBUG is not set
CONFIG_PACKET=m
# CONFIG_PACKET_MMAP is not set
CONFIG_UNIX=y
CONFIG_XFRM=y
CONFIG_XFRM_USER=m
# CONFIG_XFRM_SUB_POLICY is not set
# CONFIG_NET_KEY is not set
CONFIG_INET=y
# CONFIG_IP_MULTICAST is not set
CONFIG_IP_ADVANCED_ROUTER=y
CONFIG_ASK_IP_FIB_HASH=y
# CONFIG_IP_FIB_TRIE is not set
CONFIG_IP_FIB_HASH=y
# CONFIG_IP_MULTIPLE_TABLES is not set
# CONFIG_IP_ROUTE_MULTIPATH is not set
CONFIG_IP_ROUTE_VERBOSE=y
# CONFIG_IP_PNP is not set
# CONFIG_NET_IPIP is not set
# CONFIG_NET_IPGRE is not set
# CONFIG_ARPD is not set
CONFIG_SYN_COOKIES=y
CONFIG_INET_AH=m
CONFIG_INET_ESP=m
CONFIG_INET_IPCOMP=m
CONFIG_INET_XFRM_TUNNEL=m
CONFIG_INET_TUNNEL=m
# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
# CONFIG_INET_XFRM_MODE_TUNNEL is not set
CONFIG_INET_XFRM_MODE_BEET=y
CONFIG_INET_DIAG=m
CONFIG_INET_TCP_DIAG=m
# CONFIG_TCP_CONG_ADVANCED is not set
CONFIG_TCP_CONG_CUBIC=y
CONFIG_DEFAULT_TCP_CONG="cubic"
# CONFIG_TCP_MD5SIG is not set

#
# IP: Virtual Server Configuration
#
# CONFIG_IP_VS is not set
CONFIG_IPV6=m
# CONFIG_IPV6_PRIVACY is not set
# CONFIG_IPV6_ROUTER_PREF is not set
# CONFIG_INET6_AH is not set
# CONFIG_INET6_ESP is not set
# CONFIG_INET6_IPCOMP is not set
# CONFIG_IPV6_MIP6 is not set
# CONFIG_INET6_XFRM_TUNNEL is not set
# CONFIG_INET6_TUNNEL is not set
CONFIG_INET6_XFRM_MODE_TRANSPORT=m
CONFIG_INET6_XFRM_MODE_TUNNEL=m
CONFIG_INET6_XFRM_MODE_BEET=m
# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
CONFIG_IPV6_SIT=m
# CONFIG_IPV6_TUNNEL is not set
# CONFIG_IPV6_MULTIPLE_TABLES is not set
# CONFIG_NETWORK_SECMARK is not set
CONFIG_NETFILTER=y
# CONFIG_NETFILTER_DEBUG is not set

#
# Core Netfilter Configuration
#
CONFIG_NETFILTER_NETLINK=m
CONFIG_NETFILTER_NETLINK_QUEUE=m
CONFIG_NETFILTER_NETLINK_LOG=m
# CONFIG_NF_CONNTRACK_ENABLED is not set
CONFIG_NETFILTER_XTABLES=m
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
CONFIG_NETFILTER_XT_TARGET_MARK=m
CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
CONFIG_NETFILTER_XT_MATCH_COMMENT=m
# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
# CONFIG_NETFILTER_XT_MATCH_ESP is not set
# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
CONFIG_NETFILTER_XT_MATCH_LIMIT=m
CONFIG_NETFILTER_XT_MATCH_MAC=m
CONFIG_NETFILTER_XT_MATCH_MARK=m
CONFIG_NETFILTER_XT_MATCH_POLICY=m
# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
# CONFIG_NETFILTER_XT_MATCH_REALM is not set
CONFIG_NETFILTER_XT_MATCH_SCTP=m
# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
CONFIG_NETFILTER_XT_MATCH_STRING=m
CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set

#
# IP: Netfilter Configuration
#
CONFIG_IP_NF_QUEUE=m
CONFIG_IP_NF_IPTABLES=m
CONFIG_IP_NF_MATCH_IPRANGE=m
CONFIG_IP_NF_MATCH_TOS=m
CONFIG_IP_NF_MATCH_RECENT=m
# CONFIG_IP_NF_MATCH_ECN is not set
# CONFIG_IP_NF_MATCH_AH is not set
# CONFIG_IP_NF_MATCH_TTL is not set
CONFIG_IP_NF_MATCH_OWNER=m
CONFIG_IP_NF_MATCH_ADDRTYPE=m
CONFIG_IP_NF_FILTER=m
CONFIG_IP_NF_TARGET_REJECT=m
CONFIG_IP_NF_TARGET_LOG=m
CONFIG_IP_NF_TARGET_ULOG=m
# CONFIG_IP_NF_TARGET_TCPMSS is not set
CONFIG_IP_NF_MANGLE=m
CONFIG_IP_NF_TARGET_TOS=m
CONFIG_IP_NF_TARGET_ECN=m
CONFIG_IP_NF_TARGET_TTL=m
# CONFIG_IP_NF_RAW is not set
CONFIG_IP_NF_ARPTABLES=m
CONFIG_IP_NF_ARPFILTER=m
# CONFIG_IP_NF_ARP_MANGLE is not set

#
# IPv6: Netfilter Configuration (EXPERIMENTAL)
#
# CONFIG_IP6_NF_QUEUE is not set
# CONFIG_IP6_NF_IPTABLES is not set

#
# DCCP Configuration (EXPERIMENTAL)
#
# CONFIG_IP_DCCP is not set

#
# SCTP Configuration (EXPERIMENTAL)
#
# CONFIG_IP_SCTP is not set

#
# TIPC Configuration (EXPERIMENTAL)
#
# CONFIG_TIPC is not set
CONFIG_ATM=m
CONFIG_ATM_CLIP=m
# CONFIG_ATM_CLIP_NO_ICMP is not set
# CONFIG_ATM_LANE is not set
CONFIG_ATM_BR2684=m
# CONFIG_ATM_BR2684_IPFILTER is not set
# CONFIG_BRIDGE is not set
# CONFIG_VLAN_8021Q is not set
# CONFIG_DECNET is not set
# CONFIG_LLC2 is not set
# CONFIG_IPX is not set
# CONFIG_ATALK is not set
# CONFIG_X25 is not set
# CONFIG_LAPB is not set
# CONFIG_ECONET is not set
# CONFIG_WAN_ROUTER is not set

#
# QoS and/or fair queueing
#
CONFIG_NET_SCHED=y
CONFIG_NET_SCH_FIFO=y
CONFIG_NET_SCH_CLK_JIFFIES=y
# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
# CONFIG_NET_SCH_CLK_CPU is not set

#
# Queueing/Scheduling
#
CONFIG_NET_SCH_CBQ=m
CONFIG_NET_SCH_HTB=m
CONFIG_NET_SCH_HFSC=m
# CONFIG_NET_SCH_ATM is not set
CONFIG_NET_SCH_PRIO=m
CONFIG_NET_SCH_RED=m
CONFIG_NET_SCH_SFQ=m
CONFIG_NET_SCH_TEQL=m
CONFIG_NET_SCH_TBF=m
CONFIG_NET_SCH_GRED=m
CONFIG_NET_SCH_DSMARK=m
# CONFIG_NET_SCH_NETEM is not set
CONFIG_NET_SCH_INGRESS=m

#
# Classification
#
CONFIG_NET_CLS=y
CONFIG_NET_CLS_BASIC=m
CONFIG_NET_CLS_TCINDEX=m
CONFIG_NET_CLS_ROUTE4=m
CONFIG_NET_CLS_ROUTE=y
CONFIG_NET_CLS_FW=m
CONFIG_NET_CLS_U32=m
CONFIG_CLS_U32_PERF=y
CONFIG_CLS_U32_MARK=y
CONFIG_NET_CLS_RSVP=m
# CONFIG_NET_CLS_RSVP6 is not set
# CONFIG_NET_EMATCH is not set
# CONFIG_NET_CLS_ACT is not set
CONFIG_NET_CLS_POLICE=y
# CONFIG_NET_CLS_IND is not set
CONFIG_NET_ESTIMATOR=y

#
# Network testing
#
# CONFIG_NET_PKTGEN is not set
# CONFIG_HAMRADIO is not set
# CONFIG_IRDA is not set
# CONFIG_BT is not set
CONFIG_IEEE80211=m
# CONFIG_IEEE80211_DEBUG is not set
CONFIG_IEEE80211_CRYPT_WEP=m
CONFIG_IEEE80211_CRYPT_CCMP=m
CONFIG_IEEE80211_CRYPT_TKIP=m
CONFIG_IEEE80211_SOFTMAC=m
# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
CONFIG_WIRELESS_EXT=y

#
# Device Drivers
#

#
# Generic Driver Options
#
CONFIG_STANDALONE=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
CONFIG_FW_LOADER=m
# CONFIG_DEBUG_DRIVER is not set
# CONFIG_SYS_HYPERVISOR is not set

#
# Connector - unified userspace <-> kernelspace linker
#
# CONFIG_CONNECTOR is not set

#
# Memory Technology Devices (MTD)
#
# CONFIG_MTD is not set

#
# Parallel port support
#
CONFIG_PARPORT=m
CONFIG_PARPORT_PC=m
# CONFIG_PARPORT_PC_FIFO is not set
# CONFIG_PARPORT_PC_SUPERIO is not set
# CONFIG_PARPORT_GSC is not set
# CONFIG_PARPORT_AX88796 is not set
CONFIG_PARPORT_1284=y

#
# Plug and Play support
#
# CONFIG_PNP is not set

#
# Block devices
#
CONFIG_BLK_DEV_FD=m
# CONFIG_BLK_DEV_XD is not set
# CONFIG_PARIDE is not set
# CONFIG_BLK_CPQ_DA is not set
# CONFIG_BLK_CPQ_CISS_DA is not set
# CONFIG_BLK_DEV_DAC960 is not set
# CONFIG_BLK_DEV_UMEM is not set
# CONFIG_BLK_DEV_COW_COMMON is not set
CONFIG_BLK_DEV_LOOP=m
CONFIG_BLK_DEV_CRYPTOLOOP=m
# CONFIG_BLK_DEV_NBD is not set
# CONFIG_BLK_DEV_SX8 is not set
CONFIG_BLK_DEV_UB=m
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=4096
CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
CONFIG_BLK_DEV_INITRD=y
CONFIG_CDROM_PKTCDVD=m
CONFIG_CDROM_PKTCDVD_BUFFERS=8
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
# CONFIG_ATA_OVER_ETH is not set

#
# Misc devices
#
# CONFIG_IBM_ASM is not set
# CONFIG_SGI_IOC4 is not set
# CONFIG_TIFM_CORE is not set

#
# ATA/ATAPI/MFM/RLL support
#
CONFIG_IDE=y
CONFIG_IDE_MAX_HWIFS=2
CONFIG_BLK_DEV_IDE=y

#
# Please see Documentation/ide.txt for help/info on IDE drives
#
# CONFIG_BLK_DEV_IDE_SATA is not set
# CONFIG_BLK_DEV_HD_IDE is not set
CONFIG_BLK_DEV_IDEDISK=y
# CONFIG_IDEDISK_MULTI_MODE is not set
CONFIG_BLK_DEV_IDECD=m
# CONFIG_BLK_DEV_IDETAPE is not set
# CONFIG_BLK_DEV_IDEFLOPPY is not set
CONFIG_BLK_DEV_IDESCSI=m
# CONFIG_IDE_TASK_IOCTL is not set

#
# IDE chipset support/bugfixes
#
CONFIG_IDE_GENERIC=m
# CONFIG_BLK_DEV_CMD640 is not set
CONFIG_BLK_DEV_IDEPCI=y
CONFIG_IDEPCI_SHARE_IRQ=y
# CONFIG_BLK_DEV_OFFBOARD is not set
# CONFIG_BLK_DEV_GENERIC is not set
# CONFIG_BLK_DEV_OPTI621 is not set
# CONFIG_BLK_DEV_RZ1000 is not set
CONFIG_BLK_DEV_IDEDMA_PCI=y
# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
CONFIG_IDEDMA_PCI_AUTO=y
# CONFIG_IDEDMA_ONLYDISK is not set
# CONFIG_BLK_DEV_AEC62XX is not set
# CONFIG_BLK_DEV_ALI15X3 is not set
# CONFIG_BLK_DEV_AMD74XX is not set
# CONFIG_BLK_DEV_ATIIXP is not set
# CONFIG_BLK_DEV_CMD64X is not set
# CONFIG_BLK_DEV_TRIFLEX is not set
# CONFIG_BLK_DEV_CY82C693 is not set
# CONFIG_BLK_DEV_CS5520 is not set
# CONFIG_BLK_DEV_CS5530 is not set
# CONFIG_BLK_DEV_CS5535 is not set
# CONFIG_BLK_DEV_HPT34X is not set
# CONFIG_BLK_DEV_HPT366 is not set
# CONFIG_BLK_DEV_JMICRON is not set
# CONFIG_BLK_DEV_SC1200 is not set
# CONFIG_BLK_DEV_PIIX is not set
# CONFIG_BLK_DEV_IT821X is not set
# CONFIG_BLK_DEV_NS87415 is not set
# CONFIG_BLK_DEV_PDC202XX_OLD is not set
# CONFIG_BLK_DEV_PDC202XX_NEW is not set
# CONFIG_BLK_DEV_SVWKS is not set
# CONFIG_BLK_DEV_SIIMAGE is not set
# CONFIG_BLK_DEV_SIS5513 is not set
# CONFIG_BLK_DEV_SLC90E66 is not set
# CONFIG_BLK_DEV_TRM290 is not set
CONFIG_BLK_DEV_VIA82CXXX=m
# CONFIG_BLK_DEV_TC86C001 is not set
# CONFIG_IDE_ARM is not set
# CONFIG_IDE_CHIPSETS is not set
CONFIG_BLK_DEV_IDEDMA=y
# CONFIG_IDEDMA_IVB is not set
CONFIG_IDEDMA_AUTO=y
# CONFIG_BLK_DEV_HD is not set

#
# SCSI device support
#
# CONFIG_RAID_ATTRS is not set
CONFIG_SCSI=m
# CONFIG_SCSI_TGT is not set
CONFIG_SCSI_NETLINK=y
CONFIG_SCSI_PROC_FS=y

#
# SCSI support type (disk, tape, CD-ROM)
#
CONFIG_BLK_DEV_SD=m
CONFIG_CHR_DEV_ST=m
# CONFIG_CHR_DEV_OSST is not set
CONFIG_BLK_DEV_SR=m
CONFIG_BLK_DEV_SR_VENDOR=y
CONFIG_CHR_DEV_SG=m
# CONFIG_CHR_DEV_SCH is not set

#
# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
#
CONFIG_SCSI_MULTI_LUN=y
CONFIG_SCSI_CONSTANTS=y
# CONFIG_SCSI_LOGGING is not set
# CONFIG_SCSI_SCAN_ASYNC is not set

#
# SCSI Transports
#
CONFIG_SCSI_SPI_ATTRS=m
CONFIG_SCSI_FC_ATTRS=m
# CONFIG_SCSI_ISCSI_ATTRS is not set
# CONFIG_SCSI_SAS_ATTRS is not set
# CONFIG_SCSI_SAS_LIBSAS is not set

#
# SCSI low-level drivers
#
# CONFIG_ISCSI_TCP is not set
# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
# CONFIG_SCSI_3W_9XXX is not set
# CONFIG_SCSI_7000FASST is not set
# CONFIG_SCSI_ACARD is not set
# CONFIG_SCSI_AHA152X is not set
# CONFIG_SCSI_AHA1542 is not set
# CONFIG_SCSI_AACRAID is not set
# CONFIG_SCSI_AIC7XXX is not set
# CONFIG_SCSI_AIC7XXX_OLD is not set
# CONFIG_SCSI_AIC79XX is not set
# CONFIG_SCSI_AIC94XX is not set
# CONFIG_SCSI_DPT_I2O is not set
# CONFIG_SCSI_ADVANSYS is not set
# CONFIG_SCSI_IN2000 is not set
# CONFIG_SCSI_ARCMSR is not set
# CONFIG_MEGARAID_NEWGEN is not set
# CONFIG_MEGARAID_LEGACY is not set
# CONFIG_MEGARAID_SAS is not set
# CONFIG_SCSI_HPTIOP is not set
# CONFIG_SCSI_BUSLOGIC is not set
# CONFIG_SCSI_DMX3191D is not set
# CONFIG_SCSI_DTC3280 is not set
# CONFIG_SCSI_EATA is not set
# CONFIG_SCSI_FUTURE_DOMAIN is not set
# CONFIG_SCSI_GDTH is not set
# CONFIG_SCSI_GENERIC_NCR5380 is not set
# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
# CONFIG_SCSI_IPS is not set
# CONFIG_SCSI_INITIO is not set
# CONFIG_SCSI_INIA100 is not set
# CONFIG_SCSI_PPA is not set
# CONFIG_SCSI_IMM is not set
# CONFIG_SCSI_NCR53C406A is not set
# CONFIG_SCSI_STEX is not set
# CONFIG_SCSI_SYM53C8XX_2 is not set
# CONFIG_SCSI_IPR is not set
# CONFIG_SCSI_PAS16 is not set
# CONFIG_SCSI_PSI240I is not set
# CONFIG_SCSI_QLOGIC_FAS is not set
# CONFIG_SCSI_QLOGIC_1280 is not set
# CONFIG_SCSI_QLA_FC is not set
# CONFIG_SCSI_QLA_ISCSI is not set
# CONFIG_SCSI_LPFC is not set
# CONFIG_SCSI_SEAGATE is not set
# CONFIG_SCSI_SYM53C416 is not set
# CONFIG_SCSI_DC395x is not set
# CONFIG_SCSI_DC390T is not set
# CONFIG_SCSI_T128 is not set
# CONFIG_SCSI_U14_34F is not set
# CONFIG_SCSI_ULTRASTOR is not set
# CONFIG_SCSI_NSP32 is not set
# CONFIG_SCSI_DEBUG is not set
# CONFIG_SCSI_SRP is not set

#
# Serial ATA (prod) and Parallel ATA (experimental) drivers
#
CONFIG_ATA=m
# CONFIG_SATA_AHCI is not set
# CONFIG_SATA_SVW is not set
# CONFIG_ATA_PIIX is not set
# CONFIG_SATA_MV is not set
# CONFIG_SATA_NV is not set
# CONFIG_PDC_ADMA is not set
# CONFIG_SATA_QSTOR is not set
# CONFIG_SATA_PROMISE is not set
# CONFIG_SATA_SX4 is not set
# CONFIG_SATA_SIL is not set
# CONFIG_SATA_SIL24 is not set
# CONFIG_SATA_SIS is not set
# CONFIG_SATA_ULI is not set
# CONFIG_SATA_VIA is not set
# CONFIG_SATA_VITESSE is not set
CONFIG_SATA_ACPI=y
# CONFIG_PATA_ALI is not set
# CONFIG_PATA_AMD is not set
# CONFIG_PATA_ARTOP is not set
# CONFIG_PATA_ATIIXP is not set
# CONFIG_PATA_CMD64X is not set
# CONFIG_PATA_CS5520 is not set
# CONFIG_PATA_CS5530 is not set
# CONFIG_PATA_CS5535 is not set
# CONFIG_PATA_CYPRESS is not set
# CONFIG_PATA_EFAR is not set
CONFIG_ATA_GENERIC=m
# CONFIG_PATA_HPT366 is not set
# CONFIG_PATA_HPT37X is not set
# CONFIG_PATA_HPT3X2N is not set
# CONFIG_PATA_HPT3X3 is not set
# CONFIG_PATA_IT821X is not set
# CONFIG_PATA_IT8213 is not set
# CONFIG_PATA_JMICRON is not set
# CONFIG_PATA_LEGACY is not set
# CONFIG_PATA_TRIFLEX is not set
# CONFIG_PATA_MARVELL is not set
# CONFIG_PATA_MPIIX is not set
# CONFIG_PATA_OLDPIIX is not set
# CONFIG_PATA_NETCELL is not set
# CONFIG_PATA_NS87410 is not set
# CONFIG_PATA_OPTI is not set
# CONFIG_PATA_OPTIDMA is not set
# CONFIG_PATA_PDC_OLD is not set
# CONFIG_PATA_QDI is not set
# CONFIG_PATA_RADISYS is not set
# CONFIG_PATA_RZ1000 is not set
# CONFIG_PATA_SC1200 is not set
# CONFIG_PATA_SERVERWORKS is not set
# CONFIG_PATA_PDC2027X is not set
# CONFIG_PATA_SIL680 is not set
# CONFIG_PATA_SIS is not set
CONFIG_PATA_VIA=m
# CONFIG_PATA_WINBOND is not set
# CONFIG_PATA_WINBOND_VLB is not set
CONFIG_PATA_PLATFORM=m

#
# Old CD-ROM drivers (not SCSI, not IDE)
#
# CONFIG_CD_NO_IDESCSI is not set

#
# Multi-device support (RAID and LVM)
#
CONFIG_MD=y
CONFIG_BLK_DEV_MD=m
CONFIG_MD_LINEAR=m
CONFIG_MD_RAID0=m
CONFIG_MD_RAID1=m
CONFIG_MD_RAID10=m
CONFIG_MD_RAID456=m
CONFIG_MD_RAID5_RESHAPE=y
# CONFIG_MD_MULTIPATH is not set
# CONFIG_MD_FAULTY is not set
CONFIG_BLK_DEV_DM=m
# CONFIG_DM_DEBUG is not set
CONFIG_DM_CRYPT=m
CONFIG_DM_SNAPSHOT=m
CONFIG_DM_MIRROR=m
# CONFIG_DM_ZERO is not set
# CONFIG_DM_MULTIPATH is not set

#
# Fusion MPT device support
#
# CONFIG_FUSION is not set
# CONFIG_FUSION_SPI is not set
# CONFIG_FUSION_FC is not set
# CONFIG_FUSION_SAS is not set

#
# IEEE 1394 (FireWire) support (JUJU alternative stack)
#
CONFIG_FW=m
CONFIG_FW_OHCI=m
# CONFIG_FW_SBP2 is not set

#
# IEEE 1394 (FireWire) support
#
CONFIG_IEEE1394=m

#
# Subsystem Options
#
# CONFIG_IEEE1394_VERBOSEDEBUG is not set
# CONFIG_IEEE1394_EXTRA_CONFIG_ROMS is not set

#
# Device Drivers
#
# CONFIG_IEEE1394_PCILYNX is not set
CONFIG_IEEE1394_OHCI1394=m

#
# Protocol Drivers
#
CONFIG_IEEE1394_VIDEO1394=m
# CONFIG_IEEE1394_SBP2 is not set
# CONFIG_IEEE1394_ETH1394 is not set
CONFIG_IEEE1394_DV1394=m
CONFIG_IEEE1394_RAWIO=m

#
# I2O device support
#
# CONFIG_I2O is not set

#
# Network device support
#
CONFIG_NETDEVICES=y
CONFIG_DUMMY=m
CONFIG_BONDING=m
# CONFIG_EQUALIZER is not set
CONFIG_TUN=m

#
# ARCnet devices
#
# CONFIG_ARCNET is not set

#
# PHY device support
#
# CONFIG_PHYLIB is not set

#
# Ethernet (10 or 100Mbit)
#
CONFIG_NET_ETHERNET=y
CONFIG_MII=m
# CONFIG_HAPPYMEAL is not set
# CONFIG_SUNGEM is not set
# CONFIG_CASSINI is not set
# CONFIG_NET_VENDOR_3COM is not set
# CONFIG_LANCE is not set
# CONFIG_NET_VENDOR_SMC is not set
# CONFIG_NET_VENDOR_RACAL is not set

#
# Tulip family network device support
#
# CONFIG_NET_TULIP is not set
# CONFIG_AT1700 is not set
# CONFIG_DEPCA is not set
# CONFIG_HP100 is not set
# CONFIG_NET_ISA is not set
CONFIG_NET_PCI=y
# CONFIG_PCNET32 is not set
# CONFIG_AMD8111_ETH is not set
# CONFIG_ADAPTEC_STARFIRE is not set
# CONFIG_AC3200 is not set
# CONFIG_APRICOT is not set
# CONFIG_B44 is not set
# CONFIG_FORCEDETH is not set
# CONFIG_CS89x0 is not set
# CONFIG_DGRS is not set
# CONFIG_EEPRO100 is not set
# CONFIG_E100 is not set
# CONFIG_FEALNX is not set
# CONFIG_NATSEMI is not set
CONFIG_NE2K_PCI=y
# CONFIG_8139CP is not set
# CONFIG_8139TOO is not set
# CONFIG_SIS900 is not set
# CONFIG_EPIC100 is not set
# CONFIG_SUNDANCE is not set
# CONFIG_TLAN is not set
# CONFIG_VIA_RHINE is not set
# CONFIG_SC92031 is not set
# CONFIG_NET_POCKET is not set

#
# Ethernet (1000 Mbit)
#
# CONFIG_ACENIC is not set
# CONFIG_DL2K is not set
# CONFIG_E1000 is not set
# CONFIG_NS83820 is not set
# CONFIG_HAMACHI is not set
# CONFIG_YELLOWFIN is not set
# CONFIG_R8169 is not set
# CONFIG_SIS190 is not set
# CONFIG_SKGE is not set
# CONFIG_SKY2 is not set
# CONFIG_SK98LIN is not set
# CONFIG_VIA_VELOCITY is not set
# CONFIG_TIGON3 is not set
# CONFIG_BNX2 is not set
# CONFIG_QLA3XXX is not set

#
# Ethernet (10000 Mbit)
#
# CONFIG_CHELSIO_T1 is not set
# CONFIG_CHELSIO_T3 is not set
# CONFIG_IXGB is not set
# CONFIG_S2IO is not set
# CONFIG_MYRI10GE is not set
# CONFIG_NETXEN_NIC is not set

#
# Token Ring devices
#
# CONFIG_TR is not set

#
# Wireless LAN (non-hamradio)
#
CONFIG_NET_RADIO=y
# CONFIG_NET_WIRELESS_RTNETLINK is not set

#
# Obsolete Wireless cards support (pre-802.11)
#
# CONFIG_STRIP is not set
# CONFIG_ARLAN is not set
# CONFIG_WAVELAN is not set

#
# Wireless 802.11b ISA/PCI cards support
#
# CONFIG_IPW2100 is not set
# CONFIG_IPW2200 is not set
# CONFIG_AIRO is not set
# CONFIG_HERMES is not set
# CONFIG_ATMEL is not set

#
# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support
#
# CONFIG_PRISM54 is not set
# CONFIG_USB_ZD1201 is not set
# CONFIG_HOSTAP is not set
# CONFIG_BCM43XX is not set
CONFIG_ZD1211RW=m
# CONFIG_ZD1211RW_DEBUG is not set
CONFIG_NET_WIRELESS=y

#
# Wan interfaces
#
# CONFIG_WAN is not set

#
# ATM drivers
#
# CONFIG_ATM_DUMMY is not set
# CONFIG_ATM_TCP is not set
# CONFIG_ATM_LANAI is not set
# CONFIG_ATM_ENI is not set
# CONFIG_ATM_FIRESTREAM is not set
# CONFIG_ATM_ZATM is not set
# CONFIG_ATM_NICSTAR is not set
# CONFIG_ATM_IDT77252 is not set
# CONFIG_ATM_AMBASSADOR is not set
# CONFIG_ATM_HORIZON is not set
# CONFIG_ATM_IA is not set
# CONFIG_ATM_FORE200E_MAYBE is not set
# CONFIG_ATM_HE is not set
# CONFIG_FDDI is not set
# CONFIG_HIPPI is not set
# CONFIG_PLIP is not set
CONFIG_PPP=m
# CONFIG_PPP_MULTILINK is not set
CONFIG_PPP_FILTER=y
CONFIG_PPP_ASYNC=m
CONFIG_PPP_SYNC_TTY=m
CONFIG_PPP_DEFLATE=m
CONFIG_PPP_BSDCOMP=m
# CONFIG_PPP_MPPE is not set
CONFIG_PPPOE=m
CONFIG_PPPOATM=m
# CONFIG_SLIP is not set
CONFIG_SLHC=m
# CONFIG_NET_FC is not set
# CONFIG_SHAPER is not set
CONFIG_NETCONSOLE=y
CONFIG_NETPOLL=y
# CONFIG_NETPOLL_RX is not set
# CONFIG_NETPOLL_TRAP is not set
CONFIG_NET_POLL_CONTROLLER=y

#
# ISDN subsystem
#
# CONFIG_ISDN is not set

#
# Telephony Support
#
# CONFIG_PHONE is not set

#
# Input device support
#
CONFIG_INPUT=y
# CONFIG_INPUT_FF_MEMLESS is not set

#
# Userland interfaces
#
CONFIG_INPUT_MOUSEDEV=y
CONFIG_INPUT_MOUSEDEV_PSAUX=y
CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
CONFIG_INPUT_JOYDEV=m
# CONFIG_INPUT_TSDEV is not set
# CONFIG_INPUT_EVDEV is not set
# CONFIG_INPUT_EVBUG is not set

#
# Input Device Drivers
#
CONFIG_INPUT_KEYBOARD=y
CONFIG_KEYBOARD_ATKBD=y
# CONFIG_KEYBOARD_SUNKBD is not set
# CONFIG_KEYBOARD_LKKBD is not set
# CONFIG_KEYBOARD_XTKBD is not set
# CONFIG_KEYBOARD_NEWTON is not set
# CONFIG_KEYBOARD_STOWAWAY is not set
CONFIG_INPUT_MOUSE=y
CONFIG_MOUSE_PS2=y
# CONFIG_MOUSE_SERIAL is not set
# CONFIG_MOUSE_INPORT is not set
# CONFIG_MOUSE_LOGIBM is not set
# CONFIG_MOUSE_PC110PAD is not set
# CONFIG_MOUSE_VSXXXAA is not set
CONFIG_INPUT_JOYSTICK=y
CONFIG_JOYSTICK_ANALOG=m
# CONFIG_JOYSTICK_A3D is not set
# CONFIG_JOYSTICK_ADI is not set
# CONFIG_JOYSTICK_COBRA is not set
# CONFIG_JOYSTICK_GF2K is not set
# CONFIG_JOYSTICK_GRIP is not set
# CONFIG_JOYSTICK_GRIP_MP is not set
# CONFIG_JOYSTICK_GUILLEMOT is not set
# CONFIG_JOYSTICK_INTERACT is not set
# CONFIG_JOYSTICK_SIDEWINDER is not set
# CONFIG_JOYSTICK_TMDC is not set
# CONFIG_JOYSTICK_IFORCE is not set
# CONFIG_JOYSTICK_WARRIOR is not set
# CONFIG_JOYSTICK_MAGELLAN is not set
# CONFIG_JOYSTICK_SPACEORB is not set
# CONFIG_JOYSTICK_SPACEBALL is not set
# CONFIG_JOYSTICK_STINGER is not set
# CONFIG_JOYSTICK_TWIDJOY is not set
# CONFIG_JOYSTICK_DB9 is not set
# CONFIG_JOYSTICK_GAMECON is not set
# CONFIG_JOYSTICK_TURBOGRAFX is not set
# CONFIG_JOYSTICK_JOYDUMP is not set
# CONFIG_INPUT_TOUCHSCREEN is not set
CONFIG_INPUT_MISC=y
CONFIG_INPUT_PCSPKR=m
# CONFIG_INPUT_WISTRON_BTNS is not set
# CONFIG_INPUT_UINPUT is not set

#
# Hardware I/O ports
#
CONFIG_SERIO=y
CONFIG_SERIO_I8042=y
# CONFIG_SERIO_SERPORT is not set
# CONFIG_SERIO_CT82C710 is not set
# CONFIG_SERIO_PARKBD is not set
# CONFIG_SERIO_PCIPS2 is not set
CONFIG_SERIO_LIBPS2=y
# CONFIG_SERIO_RAW is not set
CONFIG_GAMEPORT=m
# CONFIG_GAMEPORT_NS558 is not set
# CONFIG_GAMEPORT_L4 is not set
# CONFIG_GAMEPORT_EMU10K1 is not set
# CONFIG_GAMEPORT_FM801 is not set

#
# Character devices
#
CONFIG_VT=y
CONFIG_VT_CONSOLE=y
CONFIG_HW_CONSOLE=y
CONFIG_VT_HW_CONSOLE_BINDING=y
# CONFIG_SERIAL_NONSTANDARD is not set
# CONFIG_NOZOMI is not set

#
# Serial drivers
#
CONFIG_SERIAL_8250=m
# CONFIG_SERIAL_8250_PCI is not set
CONFIG_SERIAL_8250_NR_UARTS=4
CONFIG_SERIAL_8250_RUNTIME_UARTS=4
# CONFIG_SERIAL_8250_EXTENDED is not set

#
# Non-8250 serial port support
#
CONFIG_SERIAL_CORE=m
# CONFIG_SERIAL_JSM is not set
CONFIG_UNIX98_PTYS=y
# CONFIG_LEGACY_PTYS is not set
CONFIG_PRINTER=m
# CONFIG_LP_CONSOLE is not set
# CONFIG_PPDEV is not set
# CONFIG_TIPAR is not set

#
# IPMI
#
# CONFIG_IPMI_HANDLER is not set

#
# Watchdog Cards
#
# CONFIG_WATCHDOG is not set
# CONFIG_HW_RANDOM is not set
# CONFIG_NVRAM is not set
CONFIG_RTC=m
# CONFIG_GEN_RTC is not set
# CONFIG_DTLK is not set
# CONFIG_R3964 is not set
# CONFIG_APPLICOM is not set
# CONFIG_SONYPI is not set
CONFIG_AGP=m
# CONFIG_AGP_ALI is not set
# CONFIG_AGP_ATI is not set
# CONFIG_AGP_AMD is not set
# CONFIG_AGP_AMD64 is not set
# CONFIG_AGP_INTEL is not set
# CONFIG_AGP_NVIDIA is not set
# CONFIG_AGP_SIS is not set
# CONFIG_AGP_SWORKS is not set
CONFIG_AGP_VIA=m
# CONFIG_AGP_EFFICEON is not set
CONFIG_DRM=m
# CONFIG_DRM_TDFX is not set
# CONFIG_DRM_R128 is not set
# CONFIG_DRM_RADEON is not set
# CONFIG_DRM_MGA is not set
# CONFIG_DRM_SIS is not set
# CONFIG_DRM_VIA is not set
# CONFIG_DRM_SAVAGE is not set
# CONFIG_MWAVE is not set
# CONFIG_PC8736x_GPIO is not set
# CONFIG_NSC_GPIO is not set
# CONFIG_CS5535_GPIO is not set
# CONFIG_RAW_DRIVER is not set
# CONFIG_HPET is not set
# CONFIG_HANGCHECK_TIMER is not set

#
# TPM devices
#
# CONFIG_TCG_TPM is not set
# CONFIG_TELCLOCK is not set

#
# I2C support
#
CONFIG_I2C=y
CONFIG_I2C_CHARDEV=m

#
# I2C Algorithms
#
CONFIG_I2C_ALGOBIT=y
CONFIG_I2C_ALGOPCF=m
CONFIG_I2C_ALGOPCA=m

#
# I2C Hardware Bus support
#
# CONFIG_I2C_ALI1535 is not set
# CONFIG_I2C_ALI1563 is not set
# CONFIG_I2C_ALI15X3 is not set
# CONFIG_I2C_AMD756 is not set
# CONFIG_I2C_AMD8111 is not set
# CONFIG_I2C_ELEKTOR is not set
# CONFIG_I2C_I801 is not set
# CONFIG_I2C_I810 is not set
# CONFIG_I2C_PIIX4 is not set
CONFIG_I2C_ISA=m
# CONFIG_I2C_NFORCE2 is not set
# CONFIG_I2C_OCORES is not set
# CONFIG_I2C_PARPORT is not set
# CONFIG_I2C_PARPORT_LIGHT is not set
# CONFIG_I2C_PROSAVAGE is not set
# CONFIG_I2C_SAVAGE4 is not set
# CONFIG_SCx200_ACB is not set
# CONFIG_I2C_SIS5595 is not set
# CONFIG_I2C_SIS630 is not set
# CONFIG_I2C_SIS96X is not set
# CONFIG_I2C_STUB is not set
CONFIG_I2C_VIA=m
CONFIG_I2C_VIAPRO=m
# CONFIG_I2C_VOODOO3 is not set
# CONFIG_I2C_PCA_ISA is not set

#
# Miscellaneous I2C Chip support
#
# CONFIG_SENSORS_DS1337 is not set
# CONFIG_SENSORS_DS1374 is not set
# CONFIG_SENSORS_EEPROM is not set
# CONFIG_SENSORS_PCF8574 is not set
# CONFIG_SENSORS_PCA9539 is not set
# CONFIG_SENSORS_PCF8591 is not set
# CONFIG_SENSORS_MAX6875 is not set
# CONFIG_I2C_DEBUG_CORE is not set
# CONFIG_I2C_DEBUG_ALGO is not set
# CONFIG_I2C_DEBUG_BUS is not set
# CONFIG_I2C_DEBUG_CHIP is not set

#
# SPI support
#
# CONFIG_SPI is not set
# CONFIG_SPI_MASTER is not set

#
# Dallas's 1-wire bus
#
# CONFIG_W1 is not set

#
# Hardware Monitoring support
#
CONFIG_HWMON=y
CONFIG_HWMON_VID=m
# CONFIG_SENSORS_ABITUGURU is not set
# CONFIG_SENSORS_ADM1021 is not set
# CONFIG_SENSORS_ADM1025 is not set
# CONFIG_SENSORS_ADM1026 is not set
# CONFIG_SENSORS_ADM1031 is not set
# CONFIG_SENSORS_ADM9240 is not set
# CONFIG_SENSORS_K8TEMP is not set
# CONFIG_SENSORS_ASB100 is not set
# CONFIG_SENSORS_ATXP1 is not set
# CONFIG_SENSORS_DS1621 is not set
# CONFIG_SENSORS_F71805F is not set
# CONFIG_SENSORS_FSCHER is not set
# CONFIG_SENSORS_FSCPOS is not set
# CONFIG_SENSORS_GL518SM is not set
# CONFIG_SENSORS_GL520SM is not set
# CONFIG_SENSORS_IT87 is not set
# CONFIG_SENSORS_LM63 is not set
# CONFIG_SENSORS_LM75 is not set
# CONFIG_SENSORS_LM77 is not set
# CONFIG_SENSORS_LM78 is not set
CONFIG_SENSORS_LM80=m
# CONFIG_SENSORS_LM83 is not set
# CONFIG_SENSORS_LM85 is not set
# CONFIG_SENSORS_LM87 is not set
# CONFIG_SENSORS_LM90 is not set
# CONFIG_SENSORS_LM92 is not set
# CONFIG_SENSORS_MAX1619 is not set
# CONFIG_SENSORS_PC87360 is not set
# CONFIG_SENSORS_PC87427 is not set
# CONFIG_SENSORS_SIS5595 is not set
# CONFIG_SENSORS_SMSC47M1 is not set
# CONFIG_SENSORS_SMSC47M192 is not set
# CONFIG_SENSORS_SMSC47B397 is not set
CONFIG_SENSORS_VIA686A=m
# CONFIG_SENSORS_VT1211 is not set
# CONFIG_SENSORS_VT8231 is not set
CONFIG_SENSORS_W83781D=m
# CONFIG_SENSORS_W83791D is not set
# CONFIG_SENSORS_W83792D is not set
# CONFIG_SENSORS_W83793 is not set
# CONFIG_SENSORS_W83L785TS is not set
# CONFIG_SENSORS_W83627HF is not set
# CONFIG_SENSORS_W83627EHF is not set
# CONFIG_SENSORS_HDAPS is not set
# CONFIG_HWMON_DEBUG_CHIP is not set

#
# Multimedia devices
#
CONFIG_VIDEO_DEV=m
CONFIG_VIDEO_V4L1=y
CONFIG_VIDEO_V4L1_COMPAT=y
CONFIG_VIDEO_V4L2=y

#
# Video Capture Adapters
#

#
# Video Capture Adapters
#
# CONFIG_VIDEO_ADV_DEBUG is not set
CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
# CONFIG_VIDEO_VIVI is not set
# CONFIG_VIDEO_BT848 is not set
# CONFIG_VIDEO_PMS is not set
# CONFIG_VIDEO_BWQCAM is not set
# CONFIG_VIDEO_CQCAM is not set
# CONFIG_VIDEO_W9966 is not set
# CONFIG_VIDEO_CPIA is not set
# CONFIG_VIDEO_CPIA2 is not set
# CONFIG_VIDEO_SAA5246A is not set
# CONFIG_VIDEO_SAA5249 is not set
# CONFIG_TUNER_3036 is not set
# CONFIG_VIDEO_STRADIS is not set
# CONFIG_VIDEO_ZORAN is not set
# CONFIG_VIDEO_SAA7134 is not set
# CONFIG_VIDEO_MXB is not set
# CONFIG_VIDEO_DPC is not set
# CONFIG_VIDEO_HEXIUM_ORION is not set
# CONFIG_VIDEO_HEXIUM_GEMINI is not set
# CONFIG_VIDEO_CX88 is not set
# CONFIG_VIDEO_CAFE_CCIC is not set

#
# V4L USB devices
#
# CONFIG_VIDEO_PVRUSB2 is not set
# CONFIG_VIDEO_EM28XX is not set
# CONFIG_VIDEO_USBVISION is not set
# CONFIG_USB_VICAM is not set
# CONFIG_USB_IBMCAM is not set
# CONFIG_USB_KONICAWC is not set
# CONFIG_USB_QUICKCAM_MESSENGER is not set
# CONFIG_USB_ET61X251 is not set
# CONFIG_VIDEO_OVCAMCHIP is not set
# CONFIG_USB_W9968CF is not set
CONFIG_USB_OV511=m
# CONFIG_USB_SE401 is not set
# CONFIG_USB_SN9C102 is not set
# CONFIG_USB_STV680 is not set
# CONFIG_USB_ZC0301 is not set
# CONFIG_USB_PWC is not set

#
# Radio Adapters
#
# CONFIG_RADIO_CADET is not set
# CONFIG_RADIO_RTRACK is not set
# CONFIG_RADIO_RTRACK2 is not set
# CONFIG_RADIO_AZTECH is not set
# CONFIG_RADIO_GEMTEK is not set
# CONFIG_RADIO_GEMTEK_PCI is not set
# CONFIG_RADIO_MAXIRADIO is not set
# CONFIG_RADIO_MAESTRO is not set
# CONFIG_RADIO_SF16FMI is not set
# CONFIG_RADIO_SF16FMR2 is not set
# CONFIG_RADIO_TERRATEC is not set
# CONFIG_RADIO_TRUST is not set
# CONFIG_RADIO_TYPHOON is not set
# CONFIG_RADIO_ZOLTRIX is not set
# CONFIG_USB_DSBR is not set

#
# Digital Video Broadcasting Devices
#
# CONFIG_DVB is not set
# CONFIG_USB_DABUSB is not set

#
# Graphics support
#
# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
CONFIG_FB=y
CONFIG_FIRMWARE_EDID=y
CONFIG_FB_DDC=m
CONFIG_FB_CFB_FILLRECT=y
CONFIG_FB_CFB_COPYAREA=y
CONFIG_FB_CFB_IMAGEBLIT=y
# CONFIG_FB_SVGALIB is not set
# CONFIG_FB_MACMODES is not set
# CONFIG_FB_BACKLIGHT is not set
CONFIG_FB_MODE_HELPERS=y
# CONFIG_FB_TILEBLITTING is not set

#
# Frambuffer hardware drivers
#
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_PM2 is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_ARC is not set
# CONFIG_FB_ASILIANT is not set
# CONFIG_FB_IMSTT is not set
# CONFIG_FB_VGA16 is not set
CONFIG_FB_VESA=y
# CONFIG_FB_HGA is not set
# CONFIG_FB_S1D13XXX is not set
CONFIG_FB_NVIDIA=m
CONFIG_FB_NVIDIA_I2C=y
# CONFIG_FB_NVIDIA_BACKLIGHT is not set
CONFIG_FB_RIVA=m
CONFIG_FB_RIVA_I2C=y
# CONFIG_FB_RIVA_DEBUG is not set
# CONFIG_FB_RIVA_BACKLIGHT is not set
# CONFIG_FB_I810 is not set
# CONFIG_FB_INTEL is not set
# CONFIG_FB_MATROX is not set
# CONFIG_FB_RADEON is not set
# CONFIG_FB_ATY128 is not set
# CONFIG_FB_ATY is not set
# CONFIG_FB_S3 is not set
# CONFIG_FB_SAVAGE is not set
# CONFIG_FB_SIS is not set
# CONFIG_FB_NEOMAGIC is not set
# CONFIG_FB_KYRO is not set
# CONFIG_FB_3DFX is not set
# CONFIG_FB_VOODOO1 is not set
# CONFIG_FB_CYBLA is not set
# CONFIG_FB_TRIDENT is not set
# CONFIG_FB_GEODE is not set
# CONFIG_FB_VIRTUAL is not set

#
# Console display driver support
#
CONFIG_VGA_CONSOLE=y
# CONFIG_VGACON_SOFT_SCROLLBACK is not set
CONFIG_VIDEO_SELECT=y
# CONFIG_MDA_CONSOLE is not set
CONFIG_DUMMY_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE=y
# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
# CONFIG_FONTS is not set
CONFIG_FONT_8x8=y
CONFIG_FONT_8x16=y

#
# Logo configuration
#
CONFIG_LOGO=y
CONFIG_LOGO_LINUX_MONO=y
CONFIG_LOGO_LINUX_VGA16=y
CONFIG_LOGO_LINUX_CLUT224=y

#
# Sound
#
CONFIG_SOUND=m

#
# Advanced Linux Sound Architecture
#
CONFIG_SND=m
CONFIG_SND_TIMER=m
CONFIG_SND_PCM=m
CONFIG_SND_RAWMIDI=m
CONFIG_SND_SEQUENCER=m
# CONFIG_SND_SEQ_DUMMY is not set
CONFIG_SND_OSSEMUL=y
CONFIG_SND_MIXER_OSS=m
CONFIG_SND_PCM_OSS=m
CONFIG_SND_PCM_OSS_PLUGINS=y
CONFIG_SND_SEQUENCER_OSS=y
CONFIG_SND_RTCTIMER=m
CONFIG_SND_SEQ_RTCTIMER_DEFAULT=y
CONFIG_SND_DYNAMIC_MINORS=y
# CONFIG_SND_SUPPORT_OLD_API is not set
# CONFIG_SND_VERBOSE_PROCFS is not set
# CONFIG_SND_VERBOSE_PRINTK is not set
# CONFIG_SND_DEBUG is not set

#
# Generic devices
#
CONFIG_SND_AC97_CODEC=m
# CONFIG_SND_DUMMY is not set
# CONFIG_SND_VIRMIDI is not set
# CONFIG_SND_MTPAV is not set
# CONFIG_SND_MTS64 is not set
# CONFIG_SND_SERIAL_U16550 is not set
# CONFIG_SND_MPU401 is not set

#
# ISA devices
#
# CONFIG_SND_ADLIB is not set
# CONFIG_SND_AD1848 is not set
# CONFIG_SND_CMI8330 is not set
# CONFIG_SND_CS4231 is not set
# CONFIG_SND_CS4232 is not set
# CONFIG_SND_CS4236 is not set
# CONFIG_SND_ES1688 is not set
# CONFIG_SND_ES18XX is not set
# CONFIG_SND_GUSCLASSIC is not set
# CONFIG_SND_GUSEXTREME is not set
# CONFIG_SND_GUSMAX is not set
# CONFIG_SND_OPL3SA2 is not set
# CONFIG_SND_OPTI92X_AD1848 is not set
# CONFIG_SND_OPTI92X_CS4231 is not set
# CONFIG_SND_OPTI93X is not set
# CONFIG_SND_MIRO is not set
# CONFIG_SND_SB8 is not set
# CONFIG_SND_SB16 is not set
# CONFIG_SND_SBAWE is not set
# CONFIG_SND_SGALAXY is not set
# CONFIG_SND_SSCAPE is not set
# CONFIG_SND_WAVEFRONT is not set

#
# PCI devices
#
# CONFIG_SND_AD1889 is not set
# CONFIG_SND_ALS300 is not set
# CONFIG_SND_ALS4000 is not set
# CONFIG_SND_ALI5451 is not set
# CONFIG_SND_ATIIXP is not set
# CONFIG_SND_ATIIXP_MODEM is not set
# CONFIG_SND_AU8810 is not set
# CONFIG_SND_AU8820 is not set
# CONFIG_SND_AU8830 is not set
# CONFIG_SND_AZT3328 is not set
# CONFIG_SND_BT87X is not set
# CONFIG_SND_CA0106 is not set
# CONFIG_SND_CMIPCI is not set
# CONFIG_SND_CS4281 is not set
# CONFIG_SND_CS46XX is not set
# CONFIG_SND_CS5535AUDIO is not set
# CONFIG_SND_DARLA20 is not set
# CONFIG_SND_GINA20 is not set
# CONFIG_SND_LAYLA20 is not set
# CONFIG_SND_DARLA24 is not set
# CONFIG_SND_GINA24 is not set
# CONFIG_SND_LAYLA24 is not set
# CONFIG_SND_MONA is not set
# CONFIG_SND_MIA is not set
# CONFIG_SND_ECHO3G is not set
# CONFIG_SND_INDIGO is not set
# CONFIG_SND_INDIGOIO is not set
# CONFIG_SND_INDIGODJ is not set
# CONFIG_SND_EMU10K1 is not set
# CONFIG_SND_EMU10K1X is not set
# CONFIG_SND_ENS1370 is not set
CONFIG_SND_ENS1371=m
# CONFIG_SND_ES1938 is not set
# CONFIG_SND_ES1968 is not set
# CONFIG_SND_FM801 is not set
# CONFIG_SND_HDA_INTEL is not set
# CONFIG_SND_HDSP is not set
# CONFIG_SND_HDSPM is not set
# CONFIG_SND_ICE1712 is not set
# CONFIG_SND_ICE1724 is not set
# CONFIG_SND_INTEL8X0 is not set
# CONFIG_SND_INTEL8X0M is not set
# CONFIG_SND_KORG1212 is not set
# CONFIG_SND_MAESTRO3 is not set
# CONFIG_SND_MIXART is not set
# CONFIG_SND_NM256 is not set
# CONFIG_SND_PCXHR is not set
# CONFIG_SND_RIPTIDE is not set
# CONFIG_SND_RME32 is not set
# CONFIG_SND_RME96 is not set
# CONFIG_SND_RME9652 is not set
# CONFIG_SND_SONICVIBES is not set
# CONFIG_SND_TRIDENT is not set
# CONFIG_SND_VIA82XX is not set
# CONFIG_SND_VIA82XX_MODEM is not set
# CONFIG_SND_VX222 is not set
# CONFIG_SND_YMFPCI is not set
CONFIG_SND_AC97_POWER_SAVE=y

#
# USB devices
#
# CONFIG_SND_USB_AUDIO is not set
# CONFIG_SND_USB_USX2Y is not set

#
# SoC audio support
#
# CONFIG_SND_SOC is not set

#
# Open Sound System
#
# CONFIG_SOUND_PRIME is not set
CONFIG_AC97_BUS=m

#
# HID Devices
#
CONFIG_HID=m

#
# USB support
#
CONFIG_USB_ARCH_HAS_HCD=y
CONFIG_USB_ARCH_HAS_OHCI=y
CONFIG_USB_ARCH_HAS_EHCI=y
CONFIG_USB=m
# CONFIG_USB_DEBUG is not set

#
# Miscellaneous USB options
#
CONFIG_USB_DEVICEFS=y
CONFIG_USB_BANDWIDTH=y
CONFIG_USB_DYNAMIC_MINORS=y
CONFIG_USB_SUSPEND=y
CONFIG_USB_MULTITHREAD_PROBE=y
# CONFIG_USB_OTG is not set

#
# USB Host Controller Drivers
#
CONFIG_USB_EHCI_HCD=m
# CONFIG_USB_EHCI_SPLIT_ISO is not set
CONFIG_USB_EHCI_ROOT_HUB_TT=y
# CONFIG_USB_EHCI_TT_NEWSCHED is not set
# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
# CONFIG_USB_ISP116X_HCD is not set
# CONFIG_USB_OHCI_HCD is not set
CONFIG_USB_UHCI_HCD=m
# CONFIG_USB_SL811_HCD is not set

#
# USB Device Class drivers
#
# CONFIG_USB_ACM is not set
CONFIG_USB_PRINTER=m

#
# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
#

#
# may also be needed; see USB_STORAGE Help for more information
#
CONFIG_USB_STORAGE=m
# CONFIG_USB_STORAGE_DEBUG is not set
# CONFIG_USB_STORAGE_DATAFAB is not set
# CONFIG_USB_STORAGE_FREECOM is not set
# CONFIG_USB_STORAGE_ISD200 is not set
# CONFIG_USB_STORAGE_DPCM is not set
# CONFIG_USB_STORAGE_USBAT is not set
# CONFIG_USB_STORAGE_SDDR09 is not set
# CONFIG_USB_STORAGE_SDDR55 is not set
# CONFIG_USB_STORAGE_JUMPSHOT is not set
# CONFIG_USB_STORAGE_ALAUDA is not set
# CONFIG_USB_STORAGE_KARMA is not set
# CONFIG_USB_LIBUSUAL is not set

#
# USB Input Devices
#
CONFIG_USB_HID=m
# CONFIG_USB_HIDINPUT_POWERBOOK is not set
# CONFIG_HID_FF is not set
# CONFIG_USB_HIDDEV is not set

#
# USB HID Boot Protocol drivers
#
# CONFIG_USB_KBD is not set
# CONFIG_USB_MOUSE is not set
# CONFIG_USB_AIPTEK is not set
# CONFIG_USB_WACOM is not set
# CONFIG_USB_ACECAD is not set
# CONFIG_USB_KBTAB is not set
# CONFIG_USB_POWERMATE is not set
# CONFIG_USB_TOUCHSCREEN is not set
# CONFIG_USB_YEALINK is not set
# CONFIG_USB_XPAD is not set
# CONFIG_USB_ATI_REMOTE is not set
# CONFIG_USB_ATI_REMOTE2 is not set
# CONFIG_USB_KEYSPAN_REMOTE is not set
# CONFIG_USB_APPLETOUCH is not set

#
# USB Imaging devices
#
# CONFIG_USB_MDC800 is not set
# CONFIG_USB_MICROTEK is not set

#
# USB Network Adapters
#
# CONFIG_USB_CATC is not set
# CONFIG_USB_KAWETH is not set
# CONFIG_USB_PEGASUS is not set
# CONFIG_USB_RTL8150 is not set
# CONFIG_USB_USBNET_MII is not set
# CONFIG_USB_USBNET is not set
# CONFIG_USB_MON is not set

#
# USB port drivers
#
# CONFIG_USB_USS720 is not set

#
# USB Serial Converter support
#
# CONFIG_USB_SERIAL is not set

#
# USB Miscellaneous drivers
#
# CONFIG_USB_EMI62 is not set
# CONFIG_USB_EMI26 is not set
# CONFIG_USB_ADUTUX is not set
# CONFIG_USB_AUERSWALD is not set
# CONFIG_USB_RIO500 is not set
# CONFIG_USB_LEGOTOWER is not set
# CONFIG_USB_LCD is not set
# CONFIG_USB_LED is not set
# CONFIG_USB_CYPRESS_CY7C63 is not set
# CONFIG_USB_CYTHERM is not set
# CONFIG_USB_PHIDGET is not set
# CONFIG_USB_IDMOUSE is not set
# CONFIG_USB_FTDI_ELAN is not set
# CONFIG_USB_APPLEDISPLAY is not set
# CONFIG_USB_SISUSBVGA is not set
# CONFIG_USB_LD is not set
# CONFIG_USB_TRANCEVIBRATOR is not set
# CONFIG_USB_TEST is not set
# CONFIG_USB_GOTEMP is not set

#
# USB DSL modem support
#
CONFIG_USB_ATM=m
# CONFIG_USB_SPEEDTOUCH is not set
# CONFIG_USB_CXACRU is not set
CONFIG_USB_UEAGLEATM=m
# CONFIG_USB_XUSBATM is not set

#
# USB Gadget Support
#
# CONFIG_USB_GADGET is not set

#
# MMC/SD Card support
#
# CONFIG_MMC is not set

#
# LED devices
#
# CONFIG_NEW_LEDS is not set

#
# LED drivers
#

#
# LED Triggers
#

#
# InfiniBand support
#
# CONFIG_INFINIBAND is not set

#
# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
#
CONFIG_EDAC=m

#
# Reporting subsystems
#
# CONFIG_EDAC_DEBUG is not set
CONFIG_EDAC_MM_EDAC=m
CONFIG_EDAC_AMD76X=m
# CONFIG_EDAC_E7XXX is not set
# CONFIG_EDAC_E752X is not set
# CONFIG_EDAC_I82875P is not set
# CONFIG_EDAC_I82860 is not set
# CONFIG_EDAC_K8 is not set
# CONFIG_EDAC_R82600 is not set
CONFIG_EDAC_POLL=y

#
# Real Time Clock
#
# CONFIG_RTC_CLASS is not set

#
# DMA Engine support
#
CONFIG_DMA_ENGINE=y

#
# DMA Clients
#
CONFIG_NET_DMA=y

#
# DMA Devices
#
# CONFIG_INTEL_IOATDMA is not set

#
# Auxiliary Display support
#
# CONFIG_KS0108 is not set

#
# Virtualization
#
# CONFIG_KVM is not set

#
# Userspace I/O
#
# CONFIG_UIO is not set

#
# File systems
#
CONFIG_EXT2_FS=y
CONFIG_EXT2_FS_XATTR=y
# CONFIG_EXT2_FS_POSIX_ACL is not set
# CONFIG_EXT2_FS_SECURITY is not set
CONFIG_EXT2_FS_XIP=y
CONFIG_FS_XIP=y
CONFIG_EXT3_FS=y
CONFIG_EXT3_FS_XATTR=y
CONFIG_EXT3_FS_POSIX_ACL=y
# CONFIG_EXT3_FS_SECURITY is not set
# CONFIG_EXT4DEV_FS is not set
CONFIG_JBD=y
# CONFIG_JBD_DEBUG is not set
CONFIG_FS_MBCACHE=y
CONFIG_REISER4_FS=m
CONFIG_REISER4_DEBUG=y
CONFIG_REISERFS_FS=m
# CONFIG_REISERFS_CHECK is not set
# CONFIG_REISERFS_PROC_INFO is not set
# CONFIG_REISERFS_FS_XATTR is not set
# CONFIG_JFS_FS is not set
CONFIG_FS_POSIX_ACL=y
# CONFIG_XFS_FS is not set
# CONFIG_GFS2_FS is not set
# CONFIG_OCFS2_FS is not set
# CONFIG_MINIX_FS is not set
# CONFIG_ROMFS_FS is not set
CONFIG_INOTIFY=y
CONFIG_INOTIFY_USER=y
# CONFIG_QUOTA is not set
CONFIG_DNOTIFY=y
# CONFIG_AUTOFS_FS is not set
CONFIG_AUTOFS4_FS=m
# CONFIG_FUSE_FS is not set

#
# CD-ROM/DVD Filesystems
#
CONFIG_ISO9660_FS=m
CONFIG_JOLIET=y
# CONFIG_ZISOFS is not set
CONFIG_UDF_FS=m
CONFIG_UDF_NLS=y

#
# DOS/FAT/NT Filesystems
#
CONFIG_FAT_FS=m
CONFIG_MSDOS_FS=m
CONFIG_VFAT_FS=m
CONFIG_FAT_DEFAULT_CODEPAGE=850
CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
# CONFIG_NTFS_FS is not set

#
# Pseudo filesystems
#
CONFIG_PROC_FS=y
CONFIG_PROC_KCORE=y
CONFIG_PROC_SYSCTL=y
CONFIG_SYSFS=y
CONFIG_TMPFS=y
# CONFIG_TMPFS_POSIX_ACL is not set
# CONFIG_HUGETLBFS is not set
# CONFIG_HUGETLB_PAGE is not set
CONFIG_RAMFS=y
CONFIG_CONFIGFS_FS=m

#
# Miscellaneous filesystems
#
# CONFIG_ADFS_FS is not set
# CONFIG_AFFS_FS is not set
CONFIG_ECRYPT_FS=m
# CONFIG_HFS_FS is not set
# CONFIG_HFSPLUS_FS is not set
# CONFIG_BEFS_FS is not set
# CONFIG_BFS_FS is not set
# CONFIG_EFS_FS is not set
# CONFIG_CRAMFS is not set
# CONFIG_VXFS_FS is not set
# CONFIG_HPFS_FS is not set
# CONFIG_QNX4FS_FS is not set
# CONFIG_SYSV_FS is not set
# CONFIG_UFS_FS is not set

#
# Network File Systems
#
CONFIG_NFS_FS=m
CONFIG_NFS_V3=y
# CONFIG_NFS_V3_ACL is not set
CONFIG_NFS_V4=y
# CONFIG_NFS_DIRECTIO is not set
CONFIG_NFSD=m
CONFIG_NFSD_V3=y
# CONFIG_NFSD_V3_ACL is not set
CONFIG_NFSD_V4=y
CONFIG_NFSD_TCP=y
CONFIG_LOCKD=m
CONFIG_LOCKD_V4=y
CONFIG_EXPORTFS=m
CONFIG_NFS_COMMON=y
CONFIG_SUNRPC=m
CONFIG_SUNRPC_GSS=m
CONFIG_RPCSEC_GSS_KRB5=m
# CONFIG_RPCSEC_GSS_SPKM3 is not set
CONFIG_SMB_FS=m
# CONFIG_SMB_NLS_DEFAULT is not set
CONFIG_CIFS=m
CONFIG_CIFS_STATS=y
# CONFIG_CIFS_STATS2 is not set
# CONFIG_CIFS_WEAK_PW_HASH is not set
CONFIG_CIFS_XATTR=y
CONFIG_CIFS_POSIX=y
# CONFIG_CIFS_DEBUG2 is not set
# CONFIG_CIFS_EXPERIMENTAL is not set
# CONFIG_NCP_FS is not set
# CONFIG_CODA_FS is not set
# CONFIG_AFS_FS is not set
# CONFIG_9P_FS is not set

#
# Partition Types
#
CONFIG_PARTITION_ADVANCED=y
# CONFIG_ACORN_PARTITION is not set
# CONFIG_OSF_PARTITION is not set
# CONFIG_AMIGA_PARTITION is not set
# CONFIG_ATARI_PARTITION is not set
# CONFIG_MAC_PARTITION is not set
CONFIG_MSDOS_PARTITION=y
# CONFIG_BSD_DISKLABEL is not set
# CONFIG_MINIX_SUBPARTITION is not set
# CONFIG_SOLARIS_X86_PARTITION is not set
# CONFIG_UNIXWARE_DISKLABEL is not set
# CONFIG_LDM_PARTITION is not set
# CONFIG_SGI_PARTITION is not set
# CONFIG_ULTRIX_PARTITION is not set
# CONFIG_SUN_PARTITION is not set
# CONFIG_KARMA_PARTITION is not set
# CONFIG_EFI_PARTITION is not set

#
# Native Language Support
#
CONFIG_NLS=y
CONFIG_NLS_DEFAULT="iso8859-1"
CONFIG_NLS_CODEPAGE_437=m
# CONFIG_NLS_CODEPAGE_737 is not set
# CONFIG_NLS_CODEPAGE_775 is not set
CONFIG_NLS_CODEPAGE_850=m
# CONFIG_NLS_CODEPAGE_852 is not set
# CONFIG_NLS_CODEPAGE_855 is not set
# CONFIG_NLS_CODEPAGE_857 is not set
# CONFIG_NLS_CODEPAGE_860 is not set
# CONFIG_NLS_CODEPAGE_861 is not set
# CONFIG_NLS_CODEPAGE_862 is not set
# CONFIG_NLS_CODEPAGE_863 is not set
# CONFIG_NLS_CODEPAGE_864 is not set
# CONFIG_NLS_CODEPAGE_865 is not set
# CONFIG_NLS_CODEPAGE_866 is not set
# CONFIG_NLS_CODEPAGE_869 is not set
# CONFIG_NLS_CODEPAGE_936 is not set
# CONFIG_NLS_CODEPAGE_950 is not set
# CONFIG_NLS_CODEPAGE_932 is not set
# CONFIG_NLS_CODEPAGE_949 is not set
# CONFIG_NLS_CODEPAGE_874 is not set
# CONFIG_NLS_ISO8859_8 is not set
# CONFIG_NLS_CODEPAGE_1250 is not set
# CONFIG_NLS_CODEPAGE_1251 is not set
CONFIG_NLS_ASCII=m
CONFIG_NLS_ISO8859_1=m
# CONFIG_NLS_ISO8859_2 is not set
# CONFIG_NLS_ISO8859_3 is not set
# CONFIG_NLS_ISO8859_4 is not set
# CONFIG_NLS_ISO8859_5 is not set
# CONFIG_NLS_ISO8859_6 is not set
# CONFIG_NLS_ISO8859_7 is not set
# CONFIG_NLS_ISO8859_9 is not set
# CONFIG_NLS_ISO8859_13 is not set
# CONFIG_NLS_ISO8859_14 is not set
CONFIG_NLS_ISO8859_15=m
# CONFIG_NLS_KOI8_R is not set
# CONFIG_NLS_KOI8_U is not set
CONFIG_NLS_UTF8=m

#
# Distributed Lock Manager
#
# CONFIG_DLM is not set

#
# Instrumentation Support
#
CONFIG_PROFILING=y
CONFIG_OPROFILE=m
# CONFIG_KPROBES is not set

#
# Kernel hacking
#
CONFIG_TRACE_IRQFLAGS_SUPPORT=y
# CONFIG_PRINTK_TIME is not set
CONFIG_ENABLE_MUST_CHECK=y
CONFIG_MAGIC_SYSRQ=y
CONFIG_UNUSED_SYMBOLS=y
# CONFIG_PAGE_OWNER is not set
CONFIG_DEBUG_FS=y
# CONFIG_HEADERS_CHECK is not set
CONFIG_DEBUG_KERNEL=y
# CONFIG_DEBUG_SHIRQ is not set
CONFIG_LOG_BUF_SHIFT=15
# CONFIG_DETECT_SOFTLOCKUP is not set
# CONFIG_SCHEDSTATS is not set
# CONFIG_TIMER_STATS is not set
CONFIG_DEBUG_SLAB=y
CONFIG_DEBUG_SLAB_LEAK=y
CONFIG_DEBUG_PREEMPT=y
# CONFIG_DEBUG_RT_MUTEXES is not set
# CONFIG_RT_MUTEX_TESTER is not set
CONFIG_DEBUG_SPINLOCK=y
CONFIG_DEBUG_MUTEXES=y
CONFIG_DEBUG_RWSEMS=y
CONFIG_DEBUG_LOCK_ALLOC=y
CONFIG_PROVE_LOCKING=y
CONFIG_LOCKDEP=y
# CONFIG_DEBUG_LOCKDEP is not set
CONFIG_TRACE_IRQFLAGS=y
CONFIG_DEBUG_SPINLOCK_SLEEP=y
CONFIG_DEBUG_LOCKING_API_SELFTESTS=y
CONFIG_STACKTRACE=y
# CONFIG_DEBUG_KOBJECT is not set
CONFIG_DEBUG_BUGVERBOSE=y
# CONFIG_DEBUG_INFO is not set
# CONFIG_DEBUG_VM is not set
# CONFIG_DEBUG_LIST is not set
CONFIG_FRAME_POINTER=y
# CONFIG_PROFILE_LIKELY is not set
CONFIG_FORCED_INLINING=y
# CONFIG_DEBUG_SYNCHRO_TEST is not set
# CONFIG_RCU_TORTURE_TEST is not set
# CONFIG_FAULT_INJECTION is not set
CONFIG_EARLY_PRINTK=y
CONFIG_DEBUG_STACKOVERFLOW=y
CONFIG_DEBUG_STACK_USAGE=y

#
# Page alloc debug is incompatible with Software Suspend on i386
#
CONFIG_DEBUG_RODATA=y
CONFIG_X86_FIND_SMP_CONFIG=y
CONFIG_X86_MPPARSE=y
CONFIG_DOUBLEFAULT=y

#
# Security options
#
CONFIG_KEYS=y
# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
# CONFIG_INTEGRITY is not set
# CONFIG_SECURITY is not set
# CONFIG_SECURITY_FS_CAPABILITIES is not set

#
# Cryptographic options
#
CONFIG_CRYPTO=y
CONFIG_CRYPTO_ALGAPI=y
CONFIG_CRYPTO_BLKCIPHER=m
CONFIG_CRYPTO_HASH=y
CONFIG_CRYPTO_MANAGER=y
CONFIG_CRYPTO_HMAC=y
# CONFIG_CRYPTO_XCBC is not set
# CONFIG_CRYPTO_NULL is not set
# CONFIG_CRYPTO_MD4 is not set
CONFIG_CRYPTO_MD5=y
CONFIG_CRYPTO_SHA1=m
CONFIG_CRYPTO_SHA256=m
CONFIG_CRYPTO_SHA512=m
# CONFIG_CRYPTO_WP512 is not set
# CONFIG_CRYPTO_TGR192 is not set
# CONFIG_CRYPTO_GF128MUL is not set
CONFIG_CRYPTO_ECB=m
CONFIG_CRYPTO_CBC=m
CONFIG_CRYPTO_PCBC=m
# CONFIG_CRYPTO_LRW is not set
CONFIG_CRYPTO_DES=m
# CONFIG_CRYPTO_FCRYPT is not set
CONFIG_CRYPTO_BLOWFISH=m
# CONFIG_CRYPTO_TWOFISH is not set
# CONFIG_CRYPTO_TWOFISH_586 is not set
# CONFIG_CRYPTO_SERPENT is not set
CONFIG_CRYPTO_AES=m
CONFIG_CRYPTO_AES_586=m
# CONFIG_CRYPTO_CAST5 is not set
# CONFIG_CRYPTO_CAST6 is not set
# CONFIG_CRYPTO_TEA is not set
CONFIG_CRYPTO_ARC4=m
# CONFIG_CRYPTO_KHAZAD is not set
# CONFIG_CRYPTO_ANUBIS is not set
CONFIG_CRYPTO_DEFLATE=m
CONFIG_CRYPTO_MICHAEL_MIC=m
CONFIG_CRYPTO_CRC32C=m
# CONFIG_CRYPTO_TEST is not set

#
# Hardware crypto devices
#
# CONFIG_CRYPTO_DEV_PADLOCK is not set
# CONFIG_CRYPTO_DEV_GEODE is not set

#
# Library routines
#
CONFIG_BITREVERSE=y
CONFIG_CRC_CCITT=m
# CONFIG_CRC16 is not set
CONFIG_CRC32=y
CONFIG_LIBCRC32C=m
CONFIG_ZLIB_INFLATE=m
CONFIG_ZLIB_DEFLATE=m
CONFIG_TEXTSEARCH=y
CONFIG_TEXTSEARCH_KMP=m
CONFIG_TEXTSEARCH_BM=m
CONFIG_TEXTSEARCH_FSM=m
CONFIG_PLIST=y
CONFIG_IOMAP_COPY=y
CONFIG_GENERIC_HARDIRQS=y
CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_X86_BIOS_REBOOT=y
CONFIG_KTIME_SCALAR=y


Attachments:
config-2.6.20-rc3-mm1 (50.63 kB)

2007-01-06 12:55:59

by Valdis Klētnieks

[permalink] [raw]
Subject: 2.6.20-rc3-mm1 - git-block.patch causes hard lockups

On Thu, 04 Jan 2007 22:02:00 PST, Andrew Morton said:

> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.20-rc3/2.6.20-rc3-mm1/

With git-block.patch applied, my system locks up *hard* at system shutdown
time - even alt-sysrq doesn't do anything. Need to do the "power button for 5"
stunt to get the system back.

The system is Fedora Core 6/Rawhide, and the last command issued (from
/etc/rc6.d/S01reboot) is "/sbin/cryptsetup remove swap". It hits that,
and *wham* we're dead. Works fine if I revert git-block.patch.

The line from /etc/crypttab for the encrypted swap:

swap /dev/mapper/VolGroup00-swap /dev/urandom swap,cipher=aes-cbc-essiv:sha256

This ring any bells? I haven't gotten ambitious enough yet to look for
individual commits inside the git-block.patch (this is just one of 3 issues
I've having to bisect in -mm this time around...)


Attachments:
(No filename) (226.00 B)

2007-01-06 13:45:27

by Valdis Klētnieks

[permalink] [raw]
Subject: Re: 2.6.20-rc3-mm1 - rewrite-lock-in-cpufreq-to-eliminate-cpufreq-hotplug-related-issues.patch

On Thu, 04 Jan 2007 22:02:00 PST, Andrew Morton said:
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.20-rc3/2.6.20-rc3-mm1/

One of these 3 patches:

rewrite-lock-in-cpufreq-to-eliminate-cpufreq-hotplug-related-issues.patch
rewrite-lock-in-cpufreq-to-eliminate-cpufreq-hotplug-related-issues-fix.patch
ondemand-governor-restructure-the-work-callback.patch

causes an oops in kref_put during early boot ("unable to handle paging
request at 00078").

Dell Latitude D820 laptop, Core2 T7200 with a 64-bit kernel.

Hand-copied trace of the oops:

kobject_put+0x19/0x1b
cpufreq_cpu_put+0xd/0x1e
cpufreq_get+0x45/0x51
handle_cpufreq_delayed_get+0x1e/0x41
run_workqueue+0x9c/0x14e
worker_thread+0x0/0x145
worker_thread+0x10e/0x145
default_wake_function+0x0/0xf
worker_thread+0x0/0x145
kthread+0x8/0x10b
schedule_tail+0x38/0xa1
child_rip+0xa/0x12
kthread+0x0/0x10b
child_rip+0x0/0x12

With the 3 listed patches plus:
ondemand-governor-use-new-cpufreq-rwsem-locking-in-work-callback.patch
reverted, the system boots OK.
This ring any bells?


Attachments:
(No filename) (226.00 B)

2007-01-06 14:12:39

by Laurent Riffard

[permalink] [raw]
Subject: Re: 2.6.20-rc3-mm1: umount reiser4 FS stuck in D state


Le 06.01.2007 11:58, Laurent Riffard a ?crit :
> Le 05.01.2007 07:02, Andrew Morton a ?crit :
>> Temporarily at
>>
>> http://userweb.kernel.org/~akpm/2.6.20-rc3-mm1/
>>
>> will appear later at
>>
>> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.20-rc3/2.6.20-rc3-mm1/
>>
>
> Hello,
>
> got this with 2.6.20-rc3-mm1:
>
> =======================
> SysRq : Show Blocked State
>
> free sibling
> task PC stack pid father child younger older
> umount D C013135E 6044 1168 1150 (NOTLB)
> de591ae4 00000086 de591abc c013135e dff979c8 c012a6fe 00000046
> 00000007 dfd94ac0 128d3000 00000026 00000000 dfd94bcc dff979c8
> de591ae4 dffda038 00000002 dff979c0 dff979bc dff979c8 de591b10
> c012d600 dff979f8 00000000 Call Trace:
> [<c012d600>] synchronize_qrcu+0x70/0x8c
> [<c01bede4>] __make_request+0x4c/0x29b
> [<c01bd24b>] generic_make_request+0x1b0/0x1de
> [<c01bf354>] submit_bio+0xda/0xe2
> [<e12674bd>] write_jnodes_to_disk_extent+0x920/0x974 [reiser4]
> [<e12678dd>] update_journal_footer+0x29f/0x2b7 [reiser4]
> [<e1268b65>] write_tx_back+0x149/0x185 [reiser4]
> [<e126a8e7>] reiser4_write_logs+0xea4/0xfd2 [reiser4]
> [<e125626a>] try_commit_txnh+0x7e6/0xa4f [reiser4]
> [<e125661b>] reiser4_txn_end+0x148/0x3cf [reiser4]
> [<e12568ad>] reiser4_txn_restart+0xb/0x1a [reiser4]
> [<e125692f>] reiser4_txn_restart_current+0x73/0x75 [reiser4]
> [<e1256b89>] force_commit_atom+0x258/0x261 [reiser4]
> [<e1257703>] txnmgr_force_commit_all+0x406/0x697 [reiser4]
> [<e12e5e08>] release_format40+0x10c/0x193 [reiser4]
> [<e1279922>] reiser4_put_super+0x134/0x16a [reiser4]
> [<c015c930>] generic_shutdown_super+0x55/0xd8
> [<c015c9d3>] kill_block_super+0x20/0x32
> [<c015ca75>] deactivate_super+0x3f/0x51
> [<c016d903>] mntput_no_expire+0x42/0x5f
> [<c0160f37>] path_release_on_umount+0x15/0x18
> [<c016df77>] sys_umount+0x1a3/0x1cb
> [<c016dfb8>] sys_oldumount+0x19/0x1b
> [<c0103ed2>] sysenter_past_esp+0x5f/0x99
> =======================
>
> Scenario:
> - umount a reiser4 FS (no need to write something before)
>
> Earlier kernels were OK.
>
> I tested Frederik Deweerdt's patch for "lockdep: unbalance at
> generic_sync_sb_inodes", it did not help.
>
> I think I'll a give a try to
> http://userweb.kernel.org/~akpm/2.6.20-rc3-mm1x.bz2 (basically
> 2.6.20-rc3-mm1, minus git-block.patch).

Ok, 2.6.20-rc3-mm1 minus git-block.patch does work for me, ie I can safely
use reiser4 FS, there is no more lockups.

--
laurent

2007-01-06 15:20:53

by Valdis Klētnieks

[permalink] [raw]
Subject: 2.6.20-rc3-mm1 - reiser4-sb_sync_inodes.patch causes boot hang

On Thu, 04 Jan 2007 22:02:00 PST, Andrew Morton said:
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.20-rc3/2.6.20-rc3-mm1/

reiser4-sb_sync_inodes.patch causes my system to lock hard (no alt-sysrq,
need to power cycle) *very* early in the boot - earlyprintk hasn't fired
up yet, I don't get penguins, *nada*. I'm guessing it's something to do with
the changed spinlocking from the -rc2-mm1 version.

Kernel boots OK with that one patch reverted.



Attachments:
(No filename) (226.00 B)

2007-01-06 16:37:27

by Jens Axboe

[permalink] [raw]
Subject: Re: 2.6.20-rc3-mm1: umount reiser4 FS stuck in D state

On Sat, Jan 06 2007, Laurent Riffard wrote:
> Le 05.01.2007 07:02, Andrew Morton a ?crit :
> >Temporarily at
> >
> > http://userweb.kernel.org/~akpm/2.6.20-rc3-mm1/
> >
> >will appear later at
> >
> > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.20-rc3/2.6.20-rc3-mm1/
>
> Hello,
>
> got this with 2.6.20-rc3-mm1:
>
> =======================
> SysRq : Show Blocked State
>
> free sibling
> task PC stack pid father child younger older
> umount D C013135E 6044 1168 1150 (NOTLB)
> de591ae4 00000086 de591abc c013135e dff979c8 c012a6fe 00000046
> 00000007 dfd94ac0 128d3000 00000026 00000000 dfd94bcc dff979c8
> de591ae4 dffda038 00000002 dff979c0 dff979bc dff979c8 de591b10
> c012d600 dff979f8 00000000 Call Trace:
> [<c012d600>] synchronize_qrcu+0x70/0x8c
> [<c01bede4>] __make_request+0x4c/0x29b
> [<c01bd24b>] generic_make_request+0x1b0/0x1de
> [<c01bf354>] submit_bio+0xda/0xe2

That's certainly a barrier related hang. Since raid and XFS both hang as
well, it might be the same problem. I'll get it fixed up, don't expect
anything before monday though.

--
Jens Axboe

2007-01-06 16:59:32

by Mattia Dongili

[permalink] [raw]
Subject: Re: 2.6.20-rc3-mm1 - rewrite-lock-in-cpufreq-to-eliminate-cpufreq-hotplug-related-issues.patch

On Sat, Jan 06, 2007 at 08:44:51AM -0500, [email protected] wrote:
> On Thu, 04 Jan 2007 22:02:00 PST, Andrew Morton said:
> > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.20-rc3/2.6.20-rc3-mm1/
>
> One of these 3 patches:
>
> rewrite-lock-in-cpufreq-to-eliminate-cpufreq-hotplug-related-issues.patch
> rewrite-lock-in-cpufreq-to-eliminate-cpufreq-hotplug-related-issues-fix.patch
> ondemand-governor-restructure-the-work-callback.patch
>
> causes an oops in kref_put during early boot ("unable to handle paging
> request at 00078").
>
> Dell Latitude D820 laptop, Core2 T7200 with a 64-bit kernel.
>
> Hand-copied trace of the oops:
>
> kobject_put+0x19/0x1b
> cpufreq_cpu_put+0xd/0x1e
> cpufreq_get+0x45/0x51
> handle_cpufreq_delayed_get+0x1e/0x41
> run_workqueue+0x9c/0x14e
> worker_thread+0x0/0x145
> worker_thread+0x10e/0x145
> default_wake_function+0x0/0xf
> worker_thread+0x0/0x145
> kthread+0x8/0x10b
> schedule_tail+0x38/0xa1
> child_rip+0xa/0x12
> kthread+0x0/0x10b
> child_rip+0x0/0x12

Does the following help?

Signed-off-by: Mattia Dongili <[email protected]>
---
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index a7b17ab..1112f31 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -1113,14 +1113,15 @@ unsigned int cpufreq_get(unsigned int cpu)
goto out;

if (unlikely(lock_policy_rwsem_read(cpu)))
- goto out;
+ goto out_policy;

ret_freq = __cpufreq_get(cpu);

unlock_policy_rwsem_read(cpu);

-out:
+out_policy:
cpufreq_cpu_put(policy);
+out:
return (ret_freq);
}
EXPORT_SYMBOL(cpufreq_get);
--
mattia
:wq!

2007-01-06 19:14:25

by Andrew Morton

[permalink] [raw]
Subject: Re: 2.6.20-rc3-mm1 - reiser4-sb_sync_inodes.patch causes boot hang

On Sat, 06 Jan 2007 10:20:49 -0500
[email protected] wrote:

> On Thu, 04 Jan 2007 22:02:00 PST, Andrew Morton said:
> > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.20-rc3/2.6.20-rc3-mm1/
>
> reiser4-sb_sync_inodes.patch causes my system to lock hard (no alt-sysrq,
> need to power cycle) *very* early in the boot - earlyprintk hasn't fired
> up yet, I don't get penguins, *nada*. I'm guessing it's something to do with
> the changed spinlocking from the -rc2-mm1 version.

Yeah, that's an akpm screwup, sorry.

Take a peek in
http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.20-rc3/2.6.20-rc3-mm1/hot-fixes/

2007-01-06 19:28:24

by Vladimir V. Saveliev

[permalink] [raw]
Subject: Re: 2.6.20-rc3-mm1: umount reiser4 FS stuck in D state

Hello

On Saturday 06 January 2007 13:58, Laurent Riffard wrote:
> Le 05.01.2007 07:02, Andrew Morton a ?crit :
> > Temporarily at
> >
> > http://userweb.kernel.org/~akpm/2.6.20-rc3-mm1/
> >
> > will appear later at
> >
> > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.20-rc3/2.6.20-rc3-mm1/
>
> Hello,
>
> got this with 2.6.20-rc3-mm1:
>
> =======================
> SysRq : Show Blocked State
>
> free sibling
> task PC stack pid father child younger older
> umount D C013135E 6044 1168 1150 (NOTLB)
> de591ae4 00000086 de591abc c013135e dff979c8 c012a6fe 00000046 00000007
> dfd94ac0 128d3000 00000026 00000000 dfd94bcc dff979c8 de591ae4 dffda038
> 00000002 dff979c0 dff979bc dff979c8 de591b10 c012d600 dff979f8 00000000
> Call Trace:
> [<c012d600>] synchronize_qrcu+0x70/0x8c
> [<c01bede4>] __make_request+0x4c/0x29b
> [<c01bd24b>] generic_make_request+0x1b0/0x1de
> [<c01bf354>] submit_bio+0xda/0xe2
> [<e12674bd>] write_jnodes_to_disk_extent+0x920/0x974 [reiser4]
> [<e12678dd>] update_journal_footer+0x29f/0x2b7 [reiser4]
> [<e1268b65>] write_tx_back+0x149/0x185 [reiser4]
> [<e126a8e7>] reiser4_write_logs+0xea4/0xfd2 [reiser4]
> [<e125626a>] try_commit_txnh+0x7e6/0xa4f [reiser4]
> [<e125661b>] reiser4_txn_end+0x148/0x3cf [reiser4]
> [<e12568ad>] reiser4_txn_restart+0xb/0x1a [reiser4]
> [<e125692f>] reiser4_txn_restart_current+0x73/0x75 [reiser4]
> [<e1256b89>] force_commit_atom+0x258/0x261 [reiser4]
> [<e1257703>] txnmgr_force_commit_all+0x406/0x697 [reiser4]
> [<e12e5e08>] release_format40+0x10c/0x193 [reiser4]
> [<e1279922>] reiser4_put_super+0x134/0x16a [reiser4]
> [<c015c930>] generic_shutdown_super+0x55/0xd8
> [<c015c9d3>] kill_block_super+0x20/0x32
> [<c015ca75>] deactivate_super+0x3f/0x51
> [<c016d903>] mntput_no_expire+0x42/0x5f
> [<c0160f37>] path_release_on_umount+0x15/0x18
> [<c016df77>] sys_umount+0x1a3/0x1cb
> [<c016dfb8>] sys_oldumount+0x19/0x1b
> [<c0103ed2>] sysenter_past_esp+0x5f/0x99
> =======================
>
> Scenario:
> - umount a reiser4 FS (no need to write something before)

Hmm, I can not reproduce this with 2.6.20-rc3-mm1. Probably I need to config the kernel more close to your system.

>
> Earlier kernels were OK.
>
> I tested Frederik Deweerdt's patch for "lockdep: unbalance at
> generic_sync_sb_inodes", it did not help.
>
> I think I'll a give a try to
> http://userweb.kernel.org/~akpm/2.6.20-rc3-mm1x.bz2 (basically
> 2.6.20-rc3-mm1, minus git-block.patch).
>
> .config attached
>


> ~~
> laurent
>
>
>

2007-01-07 00:28:32

by Valdis Klētnieks

[permalink] [raw]
Subject: Re: 2.6.20-rc3-mm1 - reiser4-sb_sync_inodes.patch causes boot hang

On Sat, 06 Jan 2007 11:14:21 PST, Andrew Morton said:
>
> Yeah, that's an akpm screwup, sorry.
>
> Take a peek in
> http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.20-rc3/2.6.20-rc3-mm1/hot-fixes/

Confirming that reiser4-sb_sync_inodes-fix.patch fixes my problem.


Attachments:
(No filename) (226.00 B)

2007-01-07 00:29:35

by Valdis Klētnieks

[permalink] [raw]
Subject: Re: 2.6.20-rc3-mm1 - rewrite-lock-in-cpufreq-to-eliminate-cpufreq-hotplug-related-issues.patch

On Sat, 06 Jan 2007 17:59:06 +0100, Mattia Dongili said:
> On Sat, Jan 06, 2007 at 08:44:51AM -0500, [email protected] wrote:
> > One of these 3 patches:
> >
> > rewrite-lock-in-cpufreq-to-eliminate-cpufreq-hotplug-related-issues.patch

> Does the following help?
>
> Signed-off-by: Mattia Dongili <[email protected]>
> ---
> diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
> index a7b17ab..1112f31 100644

Yes, that fixes the problem. Thanks.


Attachments:
(No filename) (226.00 B)

2007-01-08 08:54:54

by Jens Axboe

[permalink] [raw]
Subject: Re: 2.6.20-rc3-mm1 - git-block.patch causes hard lockups

On Sat, Jan 06 2007, [email protected] wrote:
> On Thu, 04 Jan 2007 22:02:00 PST, Andrew Morton said:
>
> > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.20-rc3/2.6.20-rc3-mm1/
>
> With git-block.patch applied, my system locks up *hard* at system
> shutdown time - even alt-sysrq doesn't do anything. Need to do the
> "power button for 5" stunt to get the system back.

Does this change anything?

diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c
index ec40e44..bae57e0 100644
--- a/block/ll_rw_blk.c
+++ b/block/ll_rw_blk.c
@@ -1542,7 +1542,7 @@ static inline void queue_sync_plugs(request_queue_t *q)
* If the current process is plugged and has barriers submitted,
* we will livelock if we don't unplug first.
*/
- blk_unplug_current();
+ blk_replug_current_nested();

synchronize_qrcu(&q->qrcu);
}

--
Jens Axboe

2007-01-08 12:36:35

by Mariusz Kozlowski

[permalink] [raw]
Subject: Re: 2.6.20-rc3-mm1

Hello,

> On Fri, 5 Jan 2007, Mariusz Kozlowski wrote:
>
> > Doesn't build on my iMac G3 based garage jukebox ;-)
> >
> > arch/powerpc/kernel/of_platform.c:479: error: unknown field 'multithread_probe' specified in initializer
> > arch/powerpc/kernel/of_platform.c:479: warning: initialization makes pointer from integer without a cast
> > make[1]: *** [arch/powerpc/kernel/of_platform.o] Blad 1
> > make: *** [arch/powerpc/kernel] Blad 2
>
> Can you please post your .config?

Sure. Please find it attached.

processor : 0
cpu : 740/750
temperature : 28-31 C (uncalibrated)
clock : 400MHz
revision : 2.2 (pvr 0008 0202)
bogomips : 796.67
machine : PowerMac2,1
motherboard : PowerMac2,1 MacRISC2 MacRISC Power Macintosh
detected as : 66 (iMac FireWire)
pmac flags : 00000005
L2 cache : 512K unified
memory : 256MB
pmac-generation : NewWorld

Gnu C 4.1.2
Gnu make 3.81
binutils 2.17
util-linux 2.12r
mount 2.12r
module-init-tools 3.3-pre2
e2fsprogs 1.40-WIP
Linux C Library 2.3.6
Dynamic linker (ldd) 2.3.6
Procps 3.2.7
Net-tools 1.60
Console-tools 0.2.3
Sh-utils 5.97
Modules Loaded ipv6 af_packet tsdev eth1394 tulip crc32 ohci1394 ieee1394 uninorth_agp agpgart dm_snapshot dm_mirror dm_mod snd_powermac snd_pcm_oss snd_pcm snd_page_alloc snd_mixer_oss snd_seq_oss snd_seq_device snd_seq_midi_event snd_seq snd_timer snd soundcore ide_cd cdrom joydev evdev ext3 jbd mbcache usbhid uhci_hcd ohci_hcd usbcore ide_disk unix

--
Regards,

Mariusz Kozlowski


Attachments:
(No filename) (1.67 kB)
config (69.15 kB)
Download all attachments

2007-01-08 19:32:48

by Cornelia Huck

[permalink] [raw]
Subject: Re: 2.6.20-rc3-mm1

On Sat, 06 Jan 2007 08:24:44 +1100,
Benjamin Herrenschmidt <[email protected]> wrote:

> > http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.20-rc3/2.6.20-rc3-mm1/broken-out/driver-core-per-subsystem-multithreaded-probing.patch
>
> Hrm. I disagree with this change. I have a few cases where drivers
> actually want to explicitely do that. I suppose they can always fire off
> a thread themselves from probe() but I don't see the reason to move it
> to the bus type...

The idea behind this is to have a probing thread for each device that
does the actual work (call probe for the matching drivers) so that
multiple devices can be probed in parallel. The decision to do this can
only be made at the bus level.

Previously, the code made it possible to have a probing thread for each
matching driver for the same device in parallel. I didn't see any
benefit in that, but maybe I'm just dense...

--
Cornelia Huck
Linux for zSeries Developer
Tel.: +49-7031-16-4837, Mail: [email protected]

2007-01-08 21:19:45

by Benjamin Herrenschmidt

[permalink] [raw]
Subject: Re: 2.6.20-rc3-mm1


> The idea behind this is to have a probing thread for each device that
> does the actual work (call probe for the matching drivers) so that
> multiple devices can be probed in parallel. The decision to do this can
> only be made at the bus level.
>
> Previously, the code made it possible to have a probing thread for each
> matching driver for the same device in parallel. I didn't see any
> benefit in that, but maybe I'm just dense...

Hrm... I see. Well, I was using it from the driver because I have a
driver that needs to wait in it's probe() routing for another driver to
show up for another device (they are linked in some ways, but that is
not expressed via bus bindings).

I suppose I'll just have probe() fire off a kthread instead.

Cheers,
Ben.


2007-01-09 14:40:53

by Maciej Rutecki

[permalink] [raw]
Subject: [Re: 2.6.20-rc3-mm1] BUG: at kernel/sched.c:3415 sub_preempt_count()

[ 24.311778] BUG: at kernel/sched.c:3415 sub_preempt_count()
[ 24.311794] [<c018e07e>] generic_sync_sb_inodes+0x9e/0x2f0
[ 24.311823] [<c018e373>] sync_inodes_sb+0x83/0xa0
[ 24.311840] [<c0171a28>] fsync_super+0x8/0x20
[ 24.311864] [<c0171a6c>] do_remount_sb+0x2c/0x140
[ 24.311881] [<c0171f41>] get_sb_single+0x61/0xd0
[ 24.311895] [<c01afb30>] sysfs_fill_super+0x0/0xb0
[ 24.311916] [<c0171e13>] vfs_kern_mount+0x43/0x90
[ 24.311929] [<c01afb30>] sysfs_fill_super+0x0/0xb0
[ 24.311944] [<c0171e73>] kern_mount+0x13/0x20
[ 24.311957] [<c03b311f>] sysfs_init+0x6f/0xb0
[ 24.311984] [<c03b2790>] mnt_init+0xc0/0x200
[ 24.311999] [<c03b2377>] vfs_caches_init+0xd7/0x170
[ 24.312015] [<c01ef758>] idr_init+0x48/0x50
[ 24.312041] [<c039ca68>] start_kernel+0x1a8/0x360
[ 24.312057] [<c039c4b0>] unknown_bootoption+0x0/0x260
[ 24.312071] =======================



--
Maciej Rutecki <[email protected]>
http://www.unixy.pl
LTG - Linux Testers Group
(http://www.stardust.webpages.pl/ltg/wiki/)


Attachments:
config-2.6.20-rc3-mm1.gz (12.65 kB)
dmesg.gz (6.20 kB)
lspci.txt.gz (1.03 kB)
ver_linux.txt.gz (718.00 B)
smime.p7s (3.19 kB)
S/MIME Cryptographic Signature
Download all attachments

2007-01-09 15:30:51

by Frederik Deweerdt

[permalink] [raw]
Subject: Re: [Re: 2.6.20-rc3-mm1] BUG: at kernel/sched.c:3415 sub_preempt_count()

On Tue, Jan 09, 2007 at 03:40:43PM +0100, Maciej Rutecki wrote:
> [ 24.311778] BUG: at kernel/sched.c:3415 sub_preempt_count()
> [ 24.311794] [<c018e07e>] generic_sync_sb_inodes+0x9e/0x2f0
> [ 24.311823] [<c018e373>] sync_inodes_sb+0x83/0xa0
> [ 24.311840] [<c0171a28>] fsync_super+0x8/0x20
> [ 24.311864] [<c0171a6c>] do_remount_sb+0x2c/0x140
> [ 24.311881] [<c0171f41>] get_sb_single+0x61/0xd0
> [ 24.311895] [<c01afb30>] sysfs_fill_super+0x0/0xb0
> [ 24.311916] [<c0171e13>] vfs_kern_mount+0x43/0x90
> [ 24.311929] [<c01afb30>] sysfs_fill_super+0x0/0xb0
> [ 24.311944] [<c0171e73>] kern_mount+0x13/0x20
> [ 24.311957] [<c03b311f>] sysfs_init+0x6f/0xb0
> [ 24.311984] [<c03b2790>] mnt_init+0xc0/0x200
> [ 24.311999] [<c03b2377>] vfs_caches_init+0xd7/0x170
> [ 24.312015] [<c01ef758>] idr_init+0x48/0x50
> [ 24.312041] [<c039ca68>] start_kernel+0x1a8/0x360
> [ 24.312057] [<c039c4b0>] unknown_bootoption+0x0/0x260
> [ 24.312071] =======================
See:
http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.20-rc3/2.6.20-rc3-mm1/hot-fixes/
This should fix it.
Regards,
Frederik
>
>
>
> --
> Maciej Rutecki <[email protected]>
> http://www.unixy.pl
> LTG - Linux Testers Group
> (http://www.stardust.webpages.pl/ltg/wiki/)







2007-01-09 18:03:39

by Valdis Klētnieks

[permalink] [raw]
Subject: Re: 2.6.20-rc3-mm1 - git-block.patch causes hard lockups

On Mon, 08 Jan 2007 09:55:24 +0100, Jens Axboe said:
> On Sat, Jan 06 2007, [email protected] wrote:
> > On Thu, 04 Jan 2007 22:02:00 PST, Andrew Morton said:
> >
> > > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.20-rc
3/2.6.20-rc3-mm1/
> >
> > With git-block.patch applied, my system locks up *hard* at system
> > shutdown time - even alt-sysrq doesn't do anything. Need to do the
> > "power button for 5" stunt to get the system back.
>
> Does this change anything?
>
> diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c
> index ec40e44..bae57e0 100644
> --- a/block/ll_rw_blk.c
> +++ b/block/ll_rw_blk.c
> @@ -1542,7 +1542,7 @@ static inline void queue_sync_plugs(request_queue_t *q)
> * If the current process is plugged and has barriers submitted,
> * we will livelock if we don't unplug first.
> */
> - blk_unplug_current();
> + blk_replug_current_nested();
>
> synchronize_qrcu(&q->qrcu);
> }

Nope, still hangs exactly the same way. Maybe I need to get the watchdog
timer stuff working, and see if that can kick the system in a way that
produces a backtrace....


Attachments:
(No filename) (226.00 B)

2007-01-09 20:50:25

by Maciej Rutecki

[permalink] [raw]
Subject: Re: [Re: 2.6.20-rc3-mm1] BUG: at kernel/sched.c:3415 sub_preempt_count()

Frederik Deweerdt napisał(a):

> See:
> http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.20-rc3/2.6.20-rc3-mm1/hot-fixes/
> This should fix it.
> Regards,
> Frederik
>>

I don't use reiser4 or cpufreq, see my .config.

--
Maciej Rutecki <[email protected]>
http://www.unixy.pl
LTG - Linux Testers Group
(http://www.stardust.webpages.pl/ltg/wiki/)


Attachments:
smime.p7s (3.19 kB)
S/MIME Cryptographic Signature

2007-01-09 21:08:58

by Frederik Deweerdt

[permalink] [raw]
Subject: Re: [Re: 2.6.20-rc3-mm1] BUG: at kernel/sched.c:3415 sub_preempt_count()

On Tue, Jan 09, 2007 at 09:50:20PM +0100, Maciej Rutecki wrote:
> Frederik Deweerdt napisał(a):
>
> > See:
> > http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.20-rc3/2.6.20-rc3-mm1/hot-fixes/
> > This should fix it.
> > Regards,
> > Frederik
> >>
>
> I don't use reiser4 or cpufreq, see my .config.
The generic_sync_sb_inodes() function which gets fixed by the
reiser4-sb_sync_inodes-fix patch isn't only used by reiser4. The
spinlock unbalance is most likely responsible for the preempt_count
mismatch.

Regards,
Frederik
>
> --
> Maciej Rutecki <[email protected]>
> http://www.unixy.pl
> LTG - Linux Testers Group
> (http://www.stardust.webpages.pl/ltg/wiki/)
>


2007-01-10 16:54:18

by Maciej Rutecki

[permalink] [raw]
Subject: Re: [Re: 2.6.20-rc3-mm1] BUG: at kernel/sched.c:3415 sub_preempt_count()

Frederik Deweerdt napisał(a):
> On Tue, Jan 09, 2007 at 09:50:20PM +0100, Maciej Rutecki wrote:
>> Frederik Deweerdt napisał(a):
>>
>>> See:
>>> http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.20-rc3/2.6.20-rc3-mm1/hot-fixes/
>>> This should fix it.
>>> Regards,
>>> Frederik
>> I don't use reiser4 or cpufreq, see my .config.
> The generic_sync_sb_inodes() function which gets fixed by the
> reiser4-sb_sync_inodes-fix patch isn't only used by reiser4. The
> spinlock unbalance is most likely responsible for the preempt_count
> mismatch.
>
> Regards,
> Frederik

After add reiser4-sb_sync_inodes-fix.patch all works fine. Thanks for help.

--
Maciej Rutecki <[email protected]>
http://www.unixy.pl
LTG - Linux Testers Group
(http://www.stardust.webpages.pl/ltg/wiki/)


Attachments:
smime.p7s (3.19 kB)
S/MIME Cryptographic Signature

2007-01-11 18:31:01

by Frederik Deweerdt

[permalink] [raw]
Subject: [-mm patch] remove tcp header from tcp_v4_check

On Thu, Jan 04, 2007 at 10:02:00PM -0800, Andrew Morton wrote:
>
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.20-rc3/2.6.20-rc3-mm1/
>
The tcphdr struct passed to tcp_v4_check is not used, the following patch
removes it from the parameter list.

Regards,
Frederik


Signed-off-by: Frederik Deweerdt <[email protected]>


Index: 2.6.20-rc3-mm1/include/net/tcp.h
===================================================================
--- 2.6.20-rc3-mm1.orig/include/net/tcp.h
+++ 2.6.20-rc3-mm1/include/net/tcp.h
@@ -802,9 +802,8 @@ static inline void tcp_update_wl(struct
/*
* Calculate(/check) TCP checksum
*/
-static inline __sum16 tcp_v4_check(struct tcphdr *th, int len,
- __be32 saddr, __be32 daddr,
- __wsum base)
+static inline __sum16 tcp_v4_check(int len, __be32 saddr,
+ __be32 daddr, __wsum base)
{
return csum_tcpudp_magic(saddr,daddr,len,IPPROTO_TCP,base);
}
Index: 2.6.20-rc3-mm1/net/ipv4/netfilter/ipt_REJECT.c
===================================================================
--- 2.6.20-rc3-mm1.orig/net/ipv4/netfilter/ipt_REJECT.c
+++ 2.6.20-rc3-mm1/net/ipv4/netfilter/ipt_REJECT.c
@@ -116,7 +116,7 @@ static void send_reset(struct sk_buff *o

/* Adjust TCP checksum */
tcph->check = 0;
- tcph->check = tcp_v4_check(tcph, sizeof(struct tcphdr),
+ tcph->check = tcp_v4_check(sizeof(struct tcphdr),
nskb->nh.iph->saddr,
nskb->nh.iph->daddr,
csum_partial((char *)tcph,
Index: 2.6.20-rc3-mm1/net/ipv4/tcp_ipv4.c
===================================================================
--- 2.6.20-rc3-mm1.orig/net/ipv4/tcp_ipv4.c
+++ 2.6.20-rc3-mm1/net/ipv4/tcp_ipv4.c
@@ -502,14 +502,13 @@ void tcp_v4_send_check(struct sock *sk,
struct tcphdr *th = skb->h.th;

if (skb->ip_summed == CHECKSUM_PARTIAL) {
- th->check = ~tcp_v4_check(th, len,
- inet->saddr, inet->daddr, 0);
+ th->check = ~tcp_v4_check(len, inet->saddr,
+ inet->daddr, 0);
skb->csum_offset = offsetof(struct tcphdr, check);
} else {
- th->check = tcp_v4_check(th, len, inet->saddr, inet->daddr,
+ th->check = tcp_v4_check(len, inet->saddr, inet->daddr,
csum_partial((char *)th,
- th->doff << 2,
- skb->csum));
+ th->doff << 2, skb->csum));
}
}

@@ -525,7 +524,7 @@ int tcp_v4_gso_send_check(struct sk_buff
th = skb->h.th;

th->check = 0;
- th->check = ~tcp_v4_check(th, skb->len, iph->saddr, iph->daddr, 0);
+ th->check = ~tcp_v4_check(skb->len, iph->saddr, iph->daddr, 0);
skb->csum_offset = offsetof(struct tcphdr, check);
skb->ip_summed = CHECKSUM_PARTIAL;
return 0;
@@ -747,7 +746,7 @@ static int tcp_v4_send_synack(struct soc
if (skb) {
struct tcphdr *th = skb->h.th;

- th->check = tcp_v4_check(th, skb->len,
+ th->check = tcp_v4_check(skb->len,
ireq->loc_addr,
ireq->rmt_addr,
csum_partial((char *)th, skb->len,
@@ -1514,7 +1513,7 @@ static struct sock *tcp_v4_hnd_req(struc
static __sum16 tcp_v4_checksum_init(struct sk_buff *skb)
{
if (skb->ip_summed == CHECKSUM_COMPLETE) {
- if (!tcp_v4_check(skb->h.th, skb->len, skb->nh.iph->saddr,
+ if (!tcp_v4_check(skb->len, skb->nh.iph->saddr,
skb->nh.iph->daddr, skb->csum)) {
skb->ip_summed = CHECKSUM_UNNECESSARY;
return 0;

2007-01-12 22:56:52

by Laurent Riffard

[permalink] [raw]
Subject: Re: 2.6.20-rc3-mm1: umount reiser4 FS stuck in D state

Le 06.01.2007 19:58, Vladimir V. Saveliev a ?crit :
> Hello
>
> On Saturday 06 January 2007 13:58, Laurent Riffard wrote:
>> Hello,
>>
>> got this with 2.6.20-rc3-mm1:
>>
>> =======================
>> SysRq : Show Blocked State
>>
>> free sibling
>> task PC stack pid father child younger older
>> umount D C013135E 6044 1168 1150 (NOTLB)
>> de591ae4 00000086 de591abc c013135e dff979c8 c012a6fe 00000046 00000007
>> dfd94ac0 128d3000 00000026 00000000 dfd94bcc dff979c8 de591ae4 dffda038
>> 00000002 dff979c0 dff979bc dff979c8 de591b10 c012d600 dff979f8 00000000
>> Call Trace:
>> [<c012d600>] synchronize_qrcu+0x70/0x8c
>> [<c01bede4>] __make_request+0x4c/0x29b
>> [<c01bd24b>] generic_make_request+0x1b0/0x1de
>> [<c01bf354>] submit_bio+0xda/0xe2
>> [<e12674bd>] write_jnodes_to_disk_extent+0x920/0x974 [reiser4]
>> [<e12678dd>] update_journal_footer+0x29f/0x2b7 [reiser4]
>> [<e1268b65>] write_tx_back+0x149/0x185 [reiser4]
>> [<e126a8e7>] reiser4_write_logs+0xea4/0xfd2 [reiser4]
>> [<e125626a>] try_commit_txnh+0x7e6/0xa4f [reiser4]
>> [<e125661b>] reiser4_txn_end+0x148/0x3cf [reiser4]
>> [<e12568ad>] reiser4_txn_restart+0xb/0x1a [reiser4]
>> [<e125692f>] reiser4_txn_restart_current+0x73/0x75 [reiser4]
>> [<e1256b89>] force_commit_atom+0x258/0x261 [reiser4]
>> [<e1257703>] txnmgr_force_commit_all+0x406/0x697 [reiser4]
>> [<e12e5e08>] release_format40+0x10c/0x193 [reiser4]
>> [<e1279922>] reiser4_put_super+0x134/0x16a [reiser4]
>> [<c015c930>] generic_shutdown_super+0x55/0xd8
>> [<c015c9d3>] kill_block_super+0x20/0x32
>> [<c015ca75>] deactivate_super+0x3f/0x51
>> [<c016d903>] mntput_no_expire+0x42/0x5f
>> [<c0160f37>] path_release_on_umount+0x15/0x18
>> [<c016df77>] sys_umount+0x1a3/0x1cb
>> [<c016dfb8>] sys_oldumount+0x19/0x1b
>> [<c0103ed2>] sysenter_past_esp+0x5f/0x99
>> =======================
>>
>> Scenario:
>> - umount a reiser4 FS (no need to write something before)
>
> Hmm, I can not reproduce this with 2.6.20-rc3-mm1. Probably I need to config the kernel more close to your system.
>
>> Earlier kernels were OK.

This still happens with 2.6.20-rc4-mm1...

Should I open a bug report at http://bugzilla.kernel.org?

--
laurent

2007-01-13 02:00:35

by Valdis Klētnieks

[permalink] [raw]
Subject: Re: 2.6.20-rc3-mm1 - git-block.patch causes hard lockups

On , [email protected] said:
> On Thu, 04 Jan 2007 22:02:00 PST, Andrew Morton said:
>
> > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.20-rc3/2.6.20-rc3-mm1/

Still seeing this in -rc4-mm1..

> With git-block.patch applied, my system locks up *hard* at system shutdown
> time - even alt-sysrq doesn't do anything. Need to do the "power button for 5"
> stunt to get the system back.

And today's chef's special is wild crow, tastefully prepared in a stir-fry
with broccoli and mixed asiatic vegetables, served on a bed of steamed rice...

It doesn't look quite as locked up hard when you fix the ##$*&% script that
did an 'echo 0 > /proc/sys/kernel/sysrq' :)

Here's the hand-copied traceback:

__mutex_lock_slowpath+0x22/0xaa
mutex_lock+0xe/0x10
synchronize_rcu+0x23/0xc5
blk_sync_queue+0x1d/0x5a
blk_release_queue+0x19/0x65
kobject_cleanup+0x53/0x72
kobject_release+0x0/0xf
kobject_release+0xd/0xf
kref_put+0x5f/0x6b
kobject_put+0x19/0x1b
blk_put_queue+0x43/0x48
dm_put+0x11f/0x133
dev_remove+0xa3/0xb7
ctl_ioctl+0x24f/0x29f
dev_remove+0x0/0xb7
file_has_perm+0xa7/0xb6
do_ioctl+0x5e/0x77
vfs_ioctl+0x252/0x26f
sys_ioctl+0x5f/0x82
tracesys+0xdc/0xe1


> The system is Fedora Core 6/Rawhide, and the last command issued (from
> /etc/rc6.d/S01reboot) is "/sbin/cryptsetup remove swap". It hits that,
> and *wham* we're dead. Works fine if I revert git-block.patch.
>
> The line from /etc/crypttab for the encrypted swap:
>
> swap /dev/mapper/VolGroup00-swap /dev/urandom swap,cipher=aes-cbc-essiv:sha256


Attachments:
(No filename) (226.00 B)

2007-01-23 15:41:29

by Vladimir V. Saveliev

[permalink] [raw]
Subject: Re: 2.6.20-rc3-mm1: umount reiser4 FS stuck in D state

Hello

On Saturday 13 January 2007 01:56, Laurent Riffard wrote:
> Le 06.01.2007 19:58, Vladimir V. Saveliev a ?crit :
> > Hello
> >
> > On Saturday 06 January 2007 13:58, Laurent Riffard wrote:
> >> Hello,
> >>
> >> got this with 2.6.20-rc3-mm1:
> >>
> >> =======================
> >> SysRq : Show Blocked State
> >>
> >> free sibling
> >> task PC stack pid father child younger older
> >> umount D C013135E 6044 1168 1150 (NOTLB)
> >> de591ae4 00000086 de591abc c013135e dff979c8 c012a6fe 00000046 00000007
> >> dfd94ac0 128d3000 00000026 00000000 dfd94bcc dff979c8 de591ae4 dffda038
> >> 00000002 dff979c0 dff979bc dff979c8 de591b10 c012d600 dff979f8 00000000
> >> Call Trace:
> >> [<c012d600>] synchronize_qrcu+0x70/0x8c
> >> [<c01bede4>] __make_request+0x4c/0x29b
> >> [<c01bd24b>] generic_make_request+0x1b0/0x1de
> >> [<c01bf354>] submit_bio+0xda/0xe2
> >> [<e12674bd>] write_jnodes_to_disk_extent+0x920/0x974 [reiser4]
> >> [<e12678dd>] update_journal_footer+0x29f/0x2b7 [reiser4]
> >> [<e1268b65>] write_tx_back+0x149/0x185 [reiser4]
> >> [<e126a8e7>] reiser4_write_logs+0xea4/0xfd2 [reiser4]
> >> [<e125626a>] try_commit_txnh+0x7e6/0xa4f [reiser4]
> >> [<e125661b>] reiser4_txn_end+0x148/0x3cf [reiser4]
> >> [<e12568ad>] reiser4_txn_restart+0xb/0x1a [reiser4]
> >> [<e125692f>] reiser4_txn_restart_current+0x73/0x75 [reiser4]
> >> [<e1256b89>] force_commit_atom+0x258/0x261 [reiser4]
> >> [<e1257703>] txnmgr_force_commit_all+0x406/0x697 [reiser4]
> >> [<e12e5e08>] release_format40+0x10c/0x193 [reiser4]
> >> [<e1279922>] reiser4_put_super+0x134/0x16a [reiser4]
> >> [<c015c930>] generic_shutdown_super+0x55/0xd8
> >> [<c015c9d3>] kill_block_super+0x20/0x32
> >> [<c015ca75>] deactivate_super+0x3f/0x51
> >> [<c016d903>] mntput_no_expire+0x42/0x5f
> >> [<c0160f37>] path_release_on_umount+0x15/0x18
> >> [<c016df77>] sys_umount+0x1a3/0x1cb
> >> [<c016dfb8>] sys_oldumount+0x19/0x1b
> >> [<c0103ed2>] sysenter_past_esp+0x5f/0x99
> >> =======================
> >>
> >> Scenario:
> >> - umount a reiser4 FS (no need to write something before)
> >
> > Hmm, I can not reproduce this with 2.6.20-rc3-mm1. Probably I need to config the kernel more close to your system.
> >
> >> Earlier kernels were OK.
>
> This still happens with 2.6.20-rc4-mm1...
>
> Should I open a bug report at http://bugzilla.kernel.org?
>

Which device with reiser4 did you try to umount?
Jens wrote that it could be a barrier related. If there are no multidevices involved - please report to bugzilla.

2007-01-23 15:44:44

by Jens Axboe

[permalink] [raw]
Subject: Re: 2.6.20-rc3-mm1: umount reiser4 FS stuck in D state

On Tue, Jan 23 2007, Vladimir V. Saveliev wrote:
> Hello
>
> On Saturday 13 January 2007 01:56, Laurent Riffard wrote:
> > Le 06.01.2007 19:58, Vladimir V. Saveliev a ?crit :
> > > Hello
> > >
> > > On Saturday 06 January 2007 13:58, Laurent Riffard wrote:
> > >> Hello,
> > >>
> > >> got this with 2.6.20-rc3-mm1:
> > >>
> > >> =======================
> > >> SysRq : Show Blocked State
> > >>
> > >> free sibling
> > >> task PC stack pid father child younger older
> > >> umount D C013135E 6044 1168 1150 (NOTLB)
> > >> de591ae4 00000086 de591abc c013135e dff979c8 c012a6fe 00000046 00000007
> > >> dfd94ac0 128d3000 00000026 00000000 dfd94bcc dff979c8 de591ae4 dffda038
> > >> 00000002 dff979c0 dff979bc dff979c8 de591b10 c012d600 dff979f8 00000000
> > >> Call Trace:
> > >> [<c012d600>] synchronize_qrcu+0x70/0x8c
> > >> [<c01bede4>] __make_request+0x4c/0x29b
> > >> [<c01bd24b>] generic_make_request+0x1b0/0x1de
> > >> [<c01bf354>] submit_bio+0xda/0xe2
> > >> [<e12674bd>] write_jnodes_to_disk_extent+0x920/0x974 [reiser4]
> > >> [<e12678dd>] update_journal_footer+0x29f/0x2b7 [reiser4]
> > >> [<e1268b65>] write_tx_back+0x149/0x185 [reiser4]
> > >> [<e126a8e7>] reiser4_write_logs+0xea4/0xfd2 [reiser4]
> > >> [<e125626a>] try_commit_txnh+0x7e6/0xa4f [reiser4]
> > >> [<e125661b>] reiser4_txn_end+0x148/0x3cf [reiser4]
> > >> [<e12568ad>] reiser4_txn_restart+0xb/0x1a [reiser4]
> > >> [<e125692f>] reiser4_txn_restart_current+0x73/0x75 [reiser4]
> > >> [<e1256b89>] force_commit_atom+0x258/0x261 [reiser4]
> > >> [<e1257703>] txnmgr_force_commit_all+0x406/0x697 [reiser4]
> > >> [<e12e5e08>] release_format40+0x10c/0x193 [reiser4]
> > >> [<e1279922>] reiser4_put_super+0x134/0x16a [reiser4]
> > >> [<c015c930>] generic_shutdown_super+0x55/0xd8
> > >> [<c015c9d3>] kill_block_super+0x20/0x32
> > >> [<c015ca75>] deactivate_super+0x3f/0x51
> > >> [<c016d903>] mntput_no_expire+0x42/0x5f
> > >> [<c0160f37>] path_release_on_umount+0x15/0x18
> > >> [<c016df77>] sys_umount+0x1a3/0x1cb
> > >> [<c016dfb8>] sys_oldumount+0x19/0x1b
> > >> [<c0103ed2>] sysenter_past_esp+0x5f/0x99
> > >> =======================
> > >>
> > >> Scenario:
> > >> - umount a reiser4 FS (no need to write something before)
> > >
> > > Hmm, I can not reproduce this with 2.6.20-rc3-mm1. Probably I need to config the kernel more close to your system.
> > >
> > >> Earlier kernels were OK.
> >
> > This still happens with 2.6.20-rc4-mm1...
> >
> > Should I open a bug report at http://bugzilla.kernel.org?
> >
>
> Which device with reiser4 did you try to umount? Jens wrote that it
> could be a barrier related. If there are no multidevices involved -
> please report to bugzilla.

Make sure that your kernel contains this fix:

http://git.kernel.dk/?p=linux-2.6-block.git;a=commitdiff;h=4af09c42ee1af70356471f51c1f40c1ff7881b68;hp=036f6008f43b5b4dd8c825365f15434d75005c6d

I think it missed 2.6.20-rc3-mm1. Again, that assumes you are using md
or dm.

--
Jens Axboe

2007-01-23 18:21:47

by Laurent Riffard

[permalink] [raw]
Subject: Re: 2.6.20-rc3-mm1: umount reiser4 FS stuck in D state

Le 23.01.2007 16:46, Jens Axboe a ?crit :
> On Tue, Jan 23 2007, Vladimir V. Saveliev wrote:
>> Hello
>>
>> On Saturday 13 January 2007 01:56, Laurent Riffard wrote:
>>> Le 06.01.2007 19:58, Vladimir V. Saveliev a ?crit :
>>>> Hello
>>>>
>>>> On Saturday 06 January 2007 13:58, Laurent Riffard wrote:
>>>>> Hello,
>>>>>
>>>>> got this with 2.6.20-rc3-mm1:
>>>>>
>>>>> =======================
>>>>> SysRq : Show Blocked State
>>>>>
>>>>> free sibling
>>>>> task PC stack pid father child younger older
>>>>> umount D C013135E 6044 1168 1150 (NOTLB)
>>>>> de591ae4 00000086 de591abc c013135e dff979c8 c012a6fe 00000046 00000007
>>>>> dfd94ac0 128d3000 00000026 00000000 dfd94bcc dff979c8 de591ae4 dffda038
>>>>> 00000002 dff979c0 dff979bc dff979c8 de591b10 c012d600 dff979f8 00000000
>>>>> Call Trace:
>>>>> [<c012d600>] synchronize_qrcu+0x70/0x8c
>>>>> [<c01bede4>] __make_request+0x4c/0x29b
>>>>> [<c01bd24b>] generic_make_request+0x1b0/0x1de
>>>>> [<c01bf354>] submit_bio+0xda/0xe2
>>>>> [<e12674bd>] write_jnodes_to_disk_extent+0x920/0x974 [reiser4]
>>>>> [<e12678dd>] update_journal_footer+0x29f/0x2b7 [reiser4]
>>>>> [<e1268b65>] write_tx_back+0x149/0x185 [reiser4]
>>>>> [<e126a8e7>] reiser4_write_logs+0xea4/0xfd2 [reiser4]
>>>>> [<e125626a>] try_commit_txnh+0x7e6/0xa4f [reiser4]
>>>>> [<e125661b>] reiser4_txn_end+0x148/0x3cf [reiser4]
>>>>> [<e12568ad>] reiser4_txn_restart+0xb/0x1a [reiser4]
>>>>> [<e125692f>] reiser4_txn_restart_current+0x73/0x75 [reiser4]
>>>>> [<e1256b89>] force_commit_atom+0x258/0x261 [reiser4]
>>>>> [<e1257703>] txnmgr_force_commit_all+0x406/0x697 [reiser4]
>>>>> [<e12e5e08>] release_format40+0x10c/0x193 [reiser4]
>>>>> [<e1279922>] reiser4_put_super+0x134/0x16a [reiser4]
>>>>> [<c015c930>] generic_shutdown_super+0x55/0xd8
>>>>> [<c015c9d3>] kill_block_super+0x20/0x32
>>>>> [<c015ca75>] deactivate_super+0x3f/0x51
>>>>> [<c016d903>] mntput_no_expire+0x42/0x5f
>>>>> [<c0160f37>] path_release_on_umount+0x15/0x18
>>>>> [<c016df77>] sys_umount+0x1a3/0x1cb
>>>>> [<c016dfb8>] sys_oldumount+0x19/0x1b
>>>>> [<c0103ed2>] sysenter_past_esp+0x5f/0x99
>>>>> =======================
>>>>>
>>>>> Scenario:
>>>>> - umount a reiser4 FS (no need to write something before)
>>>> Hmm, I can not reproduce this with 2.6.20-rc3-mm1. Probably I need to config the kernel more close to your system.
>>>>
>>>>> Earlier kernels were OK.
>>> This still happens with 2.6.20-rc4-mm1...
>>>
>>> Should I open a bug report at http://bugzilla.kernel.org?
>>>
>> Which device with reiser4 did you try to umount? Jens wrote that it
>> could be a barrier related. If there are no multidevices involved -
>> please report to bugzilla.
>
> Make sure that your kernel contains this fix:
>
> http://git.kernel.dk/?p=linux-2.6-block.git;a=commitdiff;h=4af09c42ee1af70356471f51c1f40c1ff7881b68;hp=036f6008f43b5b4dd8c825365f15434d75005c6d
>
> I think it missed 2.6.20-rc3-mm1. Again, that assumes you are using md
> or dm.

I've got 2 reiser4 FS:
- one with /dev/sdb6
- the other with /dev/vglinux1/ccache (vglinux1 is built on /dev/sda4
and /dev/sdb7).
There is no md here, only dm.

I applied the above patch on top of 2.6.20-rc4-mm1, but the problem
still happens with the two devices.

thanks
--
laurent


2007-02-01 20:05:14

by Edward Shishkin

[permalink] [raw]
Subject: Re: 2.6.20-rc3-mm1: umount reiser4 FS stuck in D state

Laurent Riffard wrote:

> Le 23.01.2007 16:46, Jens Axboe a ?crit :
>
>> On Tue, Jan 23 2007, Vladimir V. Saveliev wrote:
>>
>>> Hello
>>>
>>> On Saturday 13 January 2007 01:56, Laurent Riffard wrote:
>>>
>>>> Le 06.01.2007 19:58, Vladimir V. Saveliev a ?crit :
>>>>
>>>>> Hello
>>>>>
>>>>> On Saturday 06 January 2007 13:58, Laurent Riffard wrote:
>>>>>
>>>>>> Hello,
>>>>>>
>>>>>> got this with 2.6.20-rc3-mm1:
>>>>>>
>>>>>> =======================
>>>>>> SysRq : Show Blocked State
>>>>>>
>>>>>> free sibling
>>>>>> task PC stack pid father child younger older
>>>>>> umount D C013135E 6044 1168 1150
>>>>>> (NOTLB)
>>>>>> de591ae4 00000086 de591abc c013135e dff979c8 c012a6fe
>>>>>> 00000046 00000007 dfd94ac0 128d3000 00000026 00000000
>>>>>> dfd94bcc dff979c8 de591ae4 dffda038 00000002 dff979c0
>>>>>> dff979bc dff979c8 de591b10 c012d600 dff979f8 00000000 Call Trace:
>>>>>> [<c012d600>] synchronize_qrcu+0x70/0x8c
>>>>>> [<c01bede4>] __make_request+0x4c/0x29b
>>>>>> [<c01bd24b>] generic_make_request+0x1b0/0x1de
>>>>>> [<c01bf354>] submit_bio+0xda/0xe2
>>>>>> [<e12674bd>] write_jnodes_to_disk_extent+0x920/0x974 [reiser4]
>>>>>> [<e12678dd>] update_journal_footer+0x29f/0x2b7 [reiser4]
>>>>>> [<e1268b65>] write_tx_back+0x149/0x185 [reiser4]
>>>>>> [<e126a8e7>] reiser4_write_logs+0xea4/0xfd2 [reiser4]
>>>>>> [<e125626a>] try_commit_txnh+0x7e6/0xa4f [reiser4]
>>>>>> [<e125661b>] reiser4_txn_end+0x148/0x3cf [reiser4]
>>>>>> [<e12568ad>] reiser4_txn_restart+0xb/0x1a [reiser4]
>>>>>> [<e125692f>] reiser4_txn_restart_current+0x73/0x75 [reiser4]
>>>>>> [<e1256b89>] force_commit_atom+0x258/0x261 [reiser4]
>>>>>> [<e1257703>] txnmgr_force_commit_all+0x406/0x697 [reiser4]
>>>>>> [<e12e5e08>] release_format40+0x10c/0x193 [reiser4]
>>>>>> [<e1279922>] reiser4_put_super+0x134/0x16a [reiser4]
>>>>>> [<c015c930>] generic_shutdown_super+0x55/0xd8
>>>>>> [<c015c9d3>] kill_block_super+0x20/0x32
>>>>>> [<c015ca75>] deactivate_super+0x3f/0x51
>>>>>> [<c016d903>] mntput_no_expire+0x42/0x5f
>>>>>> [<c0160f37>] path_release_on_umount+0x15/0x18
>>>>>> [<c016df77>] sys_umount+0x1a3/0x1cb
>>>>>> [<c016dfb8>] sys_oldumount+0x19/0x1b
>>>>>> [<c0103ed2>] sysenter_past_esp+0x5f/0x99
>>>>>> =======================
>>>>>>
>>>>>> Scenario:
>>>>>> - umount a reiser4 FS (no need to write something before)
>>>>>
>>>>> Hmm, I can not reproduce this with 2.6.20-rc3-mm1. Probably I need
>>>>> to config the kernel more close to your system.
>>>>>
>>>>>> Earlier kernels were OK.
>>>>>
>>>> This still happens with 2.6.20-rc4-mm1...
>>>>
>>>> Should I open a bug report at http://bugzilla.kernel.org?
>>>>
>>> Which device with reiser4 did you try to umount? Jens wrote that it
>>> could be a barrier related. If there are no multidevices involved -
>>> please report to bugzilla.
>>
>>
>> Make sure that your kernel contains this fix:
>>
>> http://git.kernel.dk/?p=linux-2.6-block.git;a=commitdiff;h=4af09c42ee1af70356471f51c1f40c1ff7881b68;hp=036f6008f43b5b4dd8c825365f15434d75005c6d
>>
>>
>> I think it missed 2.6.20-rc3-mm1. Again, that assumes you are using md
>> or dm.
>
>
> I've got 2 reiser4 FS:
> - one with /dev/sdb6
> - the other with /dev/vglinux1/ccache (vglinux1 is built on /dev/sda4
> and /dev/sdb7).
> There is no md here, only dm.
>
> I applied the above patch on top of 2.6.20-rc4-mm1, but the problem
> still happens with the two devices.
>
> thanks

Laurent, would you please try 2.6.20-rc6-mm3 + this patch:
http://lkml.org/lkml/diff/2007/2/1/195/1

Thanks,
Edward.

2007-02-01 20:42:56

by Laurent Riffard

[permalink] [raw]
Subject: Re: 2.6.20-rc3-mm1: umount reiser4 FS stuck in D state



Le 01.02.2007 21:04, Edward Shishkin a ?crit :
> Laurent Riffard wrote:
>
>> Le 23.01.2007 16:46, Jens Axboe a ?crit :
>>
>>> On Tue, Jan 23 2007, Vladimir V. Saveliev wrote:
>>>
>>>> Hello
>>>>
>>>> On Saturday 13 January 2007 01:56, Laurent Riffard wrote:
>>>>
>>>>> Le 06.01.2007 19:58, Vladimir V. Saveliev a ?crit :
>>>>>
>>>>>> Hello
>>>>>>
>>>>>> On Saturday 06 January 2007 13:58, Laurent Riffard wrote:
>>>>>>
>>>>>>> Hello,
>>>>>>>
>>>>>>> got this with 2.6.20-rc3-mm1:
>>>>>>>
>>>>>>> =======================
>>>>>>> SysRq : Show Blocked State
>>>>>>>
>>>>>>> free sibling
>>>>>>> task PC stack pid father child younger older
>>>>>>> umount D C013135E 6044 1168 1150
>>>>>>> (NOTLB)
>>>>>>> de591ae4 00000086 de591abc c013135e dff979c8 c012a6fe
>>>>>>> 00000046 00000007 dfd94ac0 128d3000 00000026 00000000
>>>>>>> dfd94bcc dff979c8 de591ae4 dffda038 00000002 dff979c0
>>>>>>> dff979bc dff979c8 de591b10 c012d600 dff979f8 00000000 Call Trace:
>>>>>>> [<c012d600>] synchronize_qrcu+0x70/0x8c
>>>>>>> [<c01bede4>] __make_request+0x4c/0x29b
>>>>>>> [<c01bd24b>] generic_make_request+0x1b0/0x1de
>>>>>>> [<c01bf354>] submit_bio+0xda/0xe2
>>>>>>> [<e12674bd>] write_jnodes_to_disk_extent+0x920/0x974 [reiser4]
>>>>>>> [<e12678dd>] update_journal_footer+0x29f/0x2b7 [reiser4]
>>>>>>> [<e1268b65>] write_tx_back+0x149/0x185 [reiser4]
>>>>>>> [<e126a8e7>] reiser4_write_logs+0xea4/0xfd2 [reiser4]
>>>>>>> [<e125626a>] try_commit_txnh+0x7e6/0xa4f [reiser4]
>>>>>>> [<e125661b>] reiser4_txn_end+0x148/0x3cf [reiser4]
>>>>>>> [<e12568ad>] reiser4_txn_restart+0xb/0x1a [reiser4]
>>>>>>> [<e125692f>] reiser4_txn_restart_current+0x73/0x75 [reiser4]
>>>>>>> [<e1256b89>] force_commit_atom+0x258/0x261 [reiser4]
>>>>>>> [<e1257703>] txnmgr_force_commit_all+0x406/0x697 [reiser4]
>>>>>>> [<e12e5e08>] release_format40+0x10c/0x193 [reiser4]
>>>>>>> [<e1279922>] reiser4_put_super+0x134/0x16a [reiser4]
>>>>>>> [<c015c930>] generic_shutdown_super+0x55/0xd8
>>>>>>> [<c015c9d3>] kill_block_super+0x20/0x32
>>>>>>> [<c015ca75>] deactivate_super+0x3f/0x51
>>>>>>> [<c016d903>] mntput_no_expire+0x42/0x5f
>>>>>>> [<c0160f37>] path_release_on_umount+0x15/0x18
>>>>>>> [<c016df77>] sys_umount+0x1a3/0x1cb
>>>>>>> [<c016dfb8>] sys_oldumount+0x19/0x1b
>>>>>>> [<c0103ed2>] sysenter_past_esp+0x5f/0x99
>>>>>>> =======================
>>>>>>>
>>>>>>> Scenario:
>>>>>>> - umount a reiser4 FS (no need to write something before)
>>>>>>
>>>>>> Hmm, I can not reproduce this with 2.6.20-rc3-mm1. Probably I need
>>>>>> to config the kernel more close to your system.
>>>>>>
>>>>>>> Earlier kernels were OK.
>>>>>>
>>>>> This still happens with 2.6.20-rc4-mm1...
>>>>>
>>>>> Should I open a bug report at http://bugzilla.kernel.org?
>>>>>
>>>> Which device with reiser4 did you try to umount? Jens wrote that it
>>>> could be a barrier related. If there are no multidevices involved -
>>>> please report to bugzilla.
>>>
>>>
>>> Make sure that your kernel contains this fix:
>>>
>>> http://git.kernel.dk/?p=linux-2.6-block.git;a=commitdiff;h=4af09c42ee1af70356471f51c1f40c1ff7881b68;hp=036f6008f43b5b4dd8c825365f15434d75005c6d
>>>
>>>
>>> I think it missed 2.6.20-rc3-mm1. Again, that assumes you are using md
>>> or dm.
>>
>>
>> I've got 2 reiser4 FS:
>> - one with /dev/sdb6
>> - the other with /dev/vglinux1/ccache (vglinux1 is built on /dev/sda4
>> and /dev/sdb7).
>> There is no md here, only dm.
>>
>> I applied the above patch on top of 2.6.20-rc4-mm1, but the problem
>> still happens with the two devices.
>>
>> thanks
>
> Laurent, would you please try 2.6.20-rc6-mm3 + this patch:
> http://lkml.org/lkml/diff/2007/2/1/195/1

Reiser4 works fine with 2.6.20-rc6-mm2 or 2.6.20-rc6-mm3 without any
additional patch (it was broken in rc6-mm1).

FWIW, Andrew removed git-block.patch from 2.6.20-rc6-mm2, and he
restored git-block.patch without some problematic CFQ updates in
2.6.20-rc6-mm3.

In this case, does this patch need testing in rc6-mm3 ?
--
laurent

2007-02-01 21:53:03

by Edward Shishkin

[permalink] [raw]
Subject: Re: 2.6.20-rc3-mm1: umount reiser4 FS stuck in D state

Laurent Riffard wrote:

>
>
> Le 01.02.2007 21:04, Edward Shishkin a ?crit :
>
>> Laurent Riffard wrote:
>>
>>> Le 23.01.2007 16:46, Jens Axboe a ?crit :
>>>
>>>> On Tue, Jan 23 2007, Vladimir V. Saveliev wrote:
>>>>
>>>>> Hello
>>>>>
>>>>> On Saturday 13 January 2007 01:56, Laurent Riffard wrote:
>>>>>
>>>>>> Le 06.01.2007 19:58, Vladimir V. Saveliev a ?crit :
>>>>>>
>>>>>>> Hello
>>>>>>>
>>>>>>> On Saturday 06 January 2007 13:58, Laurent Riffard wrote:
>>>>>>>
>>>>>>>> Hello,
>>>>>>>>
>>>>>>>> got this with 2.6.20-rc3-mm1:
>>>>>>>>
>>>>>>>> =======================
>>>>>>>> SysRq : Show Blocked State
>>>>>>>>
>>>>>>>> free sibling
>>>>>>>> task PC stack pid father child younger older
>>>>>>>> umount D C013135E 6044 1168 1150
>>>>>>>> (NOTLB)
>>>>>>>> de591ae4 00000086 de591abc c013135e dff979c8 c012a6fe
>>>>>>>> 00000046 00000007 dfd94ac0 128d3000 00000026 00000000
>>>>>>>> dfd94bcc dff979c8 de591ae4 dffda038 00000002 dff979c0
>>>>>>>> dff979bc dff979c8 de591b10 c012d600 dff979f8 00000000 Call Trace:
>>>>>>>> [<c012d600>] synchronize_qrcu+0x70/0x8c
>>>>>>>> [<c01bede4>] __make_request+0x4c/0x29b
>>>>>>>> [<c01bd24b>] generic_make_request+0x1b0/0x1de
>>>>>>>> [<c01bf354>] submit_bio+0xda/0xe2
>>>>>>>> [<e12674bd>] write_jnodes_to_disk_extent+0x920/0x974 [reiser4]
>>>>>>>> [<e12678dd>] update_journal_footer+0x29f/0x2b7 [reiser4]
>>>>>>>> [<e1268b65>] write_tx_back+0x149/0x185 [reiser4]
>>>>>>>> [<e126a8e7>] reiser4_write_logs+0xea4/0xfd2 [reiser4]
>>>>>>>> [<e125626a>] try_commit_txnh+0x7e6/0xa4f [reiser4]
>>>>>>>> [<e125661b>] reiser4_txn_end+0x148/0x3cf [reiser4]
>>>>>>>> [<e12568ad>] reiser4_txn_restart+0xb/0x1a [reiser4]
>>>>>>>> [<e125692f>] reiser4_txn_restart_current+0x73/0x75 [reiser4]
>>>>>>>> [<e1256b89>] force_commit_atom+0x258/0x261 [reiser4]
>>>>>>>> [<e1257703>] txnmgr_force_commit_all+0x406/0x697 [reiser4]
>>>>>>>> [<e12e5e08>] release_format40+0x10c/0x193 [reiser4]
>>>>>>>> [<e1279922>] reiser4_put_super+0x134/0x16a [reiser4]
>>>>>>>> [<c015c930>] generic_shutdown_super+0x55/0xd8
>>>>>>>> [<c015c9d3>] kill_block_super+0x20/0x32
>>>>>>>> [<c015ca75>] deactivate_super+0x3f/0x51
>>>>>>>> [<c016d903>] mntput_no_expire+0x42/0x5f
>>>>>>>> [<c0160f37>] path_release_on_umount+0x15/0x18
>>>>>>>> [<c016df77>] sys_umount+0x1a3/0x1cb
>>>>>>>> [<c016dfb8>] sys_oldumount+0x19/0x1b
>>>>>>>> [<c0103ed2>] sysenter_past_esp+0x5f/0x99
>>>>>>>> =======================
>>>>>>>>
>>>>>>>> Scenario:
>>>>>>>> - umount a reiser4 FS (no need to write something before)
>>>>>>>
>>>>>>>
>>>>>>> Hmm, I can not reproduce this with 2.6.20-rc3-mm1. Probably I
>>>>>>> need to config the kernel more close to your system.
>>>>>>>
>>>>>>>> Earlier kernels were OK.
>>>>>>>
>>>>>>>
>>>>>> This still happens with 2.6.20-rc4-mm1...
>>>>>>
>>>>>> Should I open a bug report at http://bugzilla.kernel.org?
>>>>>>
>>>>> Which device with reiser4 did you try to umount? Jens wrote that it
>>>>> could be a barrier related. If there are no multidevices involved -
>>>>> please report to bugzilla.
>>>>
>>>>
>>>>
>>>> Make sure that your kernel contains this fix:
>>>>
>>>> http://git.kernel.dk/?p=linux-2.6-block.git;a=commitdiff;h=4af09c42ee1af70356471f51c1f40c1ff7881b68;hp=036f6008f43b5b4dd8c825365f15434d75005c6d
>>>>
>>>>
>>>> I think it missed 2.6.20-rc3-mm1. Again, that assumes you are using md
>>>> or dm.
>>>
>>>
>>>
>>> I've got 2 reiser4 FS:
>>> - one with /dev/sdb6
>>> - the other with /dev/vglinux1/ccache (vglinux1 is built on
>>> /dev/sda4 and /dev/sdb7).
>>> There is no md here, only dm.
>>>
>>> I applied the above patch on top of 2.6.20-rc4-mm1, but the problem
>>> still happens with the two devices.
>>>
>>> thanks
>>
>>
>> Laurent, would you please try 2.6.20-rc6-mm3 + this patch:
>> http://lkml.org/lkml/diff/2007/2/1/195/1
>
>
> Reiser4 works fine with 2.6.20-rc6-mm2 or 2.6.20-rc6-mm3 without any
> additional patch (it was broken in rc6-mm1).
>
> FWIW, Andrew removed git-block.patch from 2.6.20-rc6-mm2, and he
> restored git-block.patch without some problematic CFQ updates in
> 2.6.20-rc6-mm3.
>
> In this case, does this patch need testing in rc6-mm3 ?

Yes. This is against git-block patch to prevent endless waiting for IO
completion.
I have reproduced it by ./iozone -B -a -n 524288 -f /mnt/foo
on x86 box with 512M RAM available.

2007-02-02 21:13:39

by Laurent Riffard

[permalink] [raw]
Subject: Re: 2.6.20-rc3-mm1: umount reiser4 FS stuck in D state


Le 01.02.2007 22:52, Edward Shishkin a ?crit :
> Laurent Riffard wrote:
>>
>> Le 01.02.2007 21:04, Edward Shishkin a ?crit :
>>>
>>> Laurent, would you please try 2.6.20-rc6-mm3 + this patch:
>>> http://lkml.org/lkml/diff/2007/2/1/195/1
>>
>>
>> Reiser4 works fine with 2.6.20-rc6-mm2 or 2.6.20-rc6-mm3 without any
>> additional patch (it was broken in rc6-mm1).
>>
>> FWIW, Andrew removed git-block.patch from 2.6.20-rc6-mm2, and he
>> restored git-block.patch without some problematic CFQ updates in
>> 2.6.20-rc6-mm3.
>>
>> In this case, does this patch need testing in rc6-mm3 ?
>
> Yes. This is against git-block patch to prevent endless waiting for IO
> completion.
> I have reproduced it by ./iozone -B -a -n 524288 -f /mnt/foo
> on x86 box with 512M RAM available.

OK, applied yesterday. I have been using it a few hours with a normal
workload and I didn't notice any problem.

Thanks
--
laurent