Commit 29f1bf34 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm'(patches from Andrew) 

Merge fixes from Andrew Morton:
 "10 fixes"

The lockdep hlist conversion is in the locking tree too, waiting for the
next merge window.  Andrew thought it should go in now.  I'll take it,
since it fixes a real problem and looks trivially correct (famous last
words).

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  arch/x86/Kconfig: CONFIG_X86_UV should depend on CONFIG_EFI
  mm: fix pfn_t vs highmem
  kernel/locking/lockdep.c: convert hash tables to hlists
  mm,thp: fix spellos in describing __HAVE_ARCH_FLUSH_PMD_TLB_RANGE
  mm,thp: khugepaged: call pte flush at the time of collapse
  mm/backing-dev.c: fix error path in wb_init()
  mm, dax: check for pmd_none() after split_huge_pmd()
  vsprintf: kptr_restrict is okay in IRQ when 2
  mm: fix filemap.c kernel doc warning
  ubsan: cosmetic fix to Kconfig text
parents 5952cc77 1ecb4ae5

arch/x86/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -475,6 +475,7 @@ config X86_UV 
	depends on X86_64

	depends on X86_EXTENDED_PLATFORM

	depends on NUMA

	depends on EFI

	depends on X86_X2APIC

	depends on PCI

	---help---

include/linux/lockdep.h

+2 −2
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ struct lock_class { 
	/*

	 * class-hash:

	 */

	struct list_head		hash_entry;

	struct hlist_node		hash_entry;



	/*

	 * global list of all lock-classes:
@@ -199,7 +199,7 @@ struct lock_chain { 
	u8				irq_context;

	u8				depth;

	u16				base;

	struct list_head		entry;

	struct hlist_node		entry;

	u64				chain_key;

};

include/linux/pfn.h

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
 * backing is indicated by flags in the high bits of the value.

 */

typedef struct {

	unsigned long val;

	u64 val;

} pfn_t;

#endif

include/linux/pfn_t.h

+9 −10
Original line number Diff line number Diff line
@@ -9,14 +9,13 @@ 
 * PFN_DEV - pfn is not covered by system memmap by default

 * PFN_MAP - pfn has a dynamic page mapping established by a device driver

 */

#define PFN_FLAGS_MASK (((unsigned long) ~PAGE_MASK) \

		<< (BITS_PER_LONG - PAGE_SHIFT))

#define PFN_SG_CHAIN (1UL << (BITS_PER_LONG - 1))

#define PFN_SG_LAST (1UL << (BITS_PER_LONG - 2))

#define PFN_DEV (1UL << (BITS_PER_LONG - 3))

#define PFN_MAP (1UL << (BITS_PER_LONG - 4))



static inline pfn_t __pfn_to_pfn_t(unsigned long pfn, unsigned long flags)

#define PFN_FLAGS_MASK (((u64) ~PAGE_MASK) << (BITS_PER_LONG_LONG - PAGE_SHIFT))

#define PFN_SG_CHAIN (1ULL << (BITS_PER_LONG_LONG - 1))

#define PFN_SG_LAST (1ULL << (BITS_PER_LONG_LONG - 2))

#define PFN_DEV (1ULL << (BITS_PER_LONG_LONG - 3))

#define PFN_MAP (1ULL << (BITS_PER_LONG_LONG - 4))



static inline pfn_t __pfn_to_pfn_t(unsigned long pfn, u64 flags)

{

	pfn_t pfn_t = { .val = pfn | (flags & PFN_FLAGS_MASK), };
@@ -29,7 +28,7 @@ static inline pfn_t pfn_to_pfn_t(unsigned long pfn) 
	return __pfn_to_pfn_t(pfn, 0);

}



extern pfn_t phys_to_pfn_t(phys_addr_t addr, unsigned long flags);

extern pfn_t phys_to_pfn_t(phys_addr_t addr, u64 flags);



static inline bool pfn_t_has_page(pfn_t pfn)

{
@@ -87,7 +86,7 @@ static inline pmd_t pfn_t_pmd(pfn_t pfn, pgprot_t pgprot) 
#ifdef __HAVE_ARCH_PTE_DEVMAP

static inline bool pfn_t_devmap(pfn_t pfn)

{

	const unsigned long flags = PFN_DEV|PFN_MAP;

	const u64 flags = PFN_DEV|PFN_MAP;



	return (pfn.val & flags) == flags;

}

kernel/locking/lockdep.c

+19 −23
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ LIST_HEAD(all_lock_classes); 
#define __classhashfn(key)	hash_long((unsigned long)key, CLASSHASH_BITS)

#define classhashentry(key)	(classhash_table + __classhashfn((key)))



static struct list_head classhash_table[CLASSHASH_SIZE];

static struct hlist_head classhash_table[CLASSHASH_SIZE];



/*

 * We put the lock dependency chains into a hash-table as well, to cache
@@ -303,7 +303,7 @@ static struct list_head classhash_table[CLASSHASH_SIZE]; 
#define __chainhashfn(chain)	hash_long(chain, CHAINHASH_BITS)

#define chainhashentry(chain)	(chainhash_table + __chainhashfn((chain)))



static struct list_head chainhash_table[CHAINHASH_SIZE];

static struct hlist_head chainhash_table[CHAINHASH_SIZE];



/*

 * The hash key of the lock dependency chains is a hash itself too:
@@ -666,7 +666,7 @@ static inline struct lock_class * 
look_up_lock_class(struct lockdep_map *lock, unsigned int subclass)

{

	struct lockdep_subclass_key *key;

	struct list_head *hash_head;

	struct hlist_head *hash_head;

	struct lock_class *class;



#ifdef CONFIG_DEBUG_LOCKDEP
@@ -719,7 +719,7 @@ look_up_lock_class(struct lockdep_map *lock, unsigned int subclass) 
	if (DEBUG_LOCKS_WARN_ON(!irqs_disabled()))

		return NULL;



	list_for_each_entry_rcu(class, hash_head, hash_entry) {

	hlist_for_each_entry_rcu(class, hash_head, hash_entry) {

		if (class->key == key) {

			/*

			 * Huh! same key, different name? Did someone trample
@@ -742,7 +742,7 @@ static inline struct lock_class * 
register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)

{

	struct lockdep_subclass_key *key;

	struct list_head *hash_head;

	struct hlist_head *hash_head;

	struct lock_class *class;



	DEBUG_LOCKS_WARN_ON(!irqs_disabled());
@@ -774,7 +774,7 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force) 
	 * We have to do the hash-walk again, to avoid races

	 * with another CPU:

	 */

	list_for_each_entry_rcu(class, hash_head, hash_entry) {

	hlist_for_each_entry_rcu(class, hash_head, hash_entry) {

		if (class->key == key)

			goto out_unlock_set;

	}
@@ -805,7 +805,7 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force) 
	 * We use RCU's safe list-add method to make

	 * parallel walking of the hash-list safe:

	 */

	list_add_tail_rcu(&class->hash_entry, hash_head);

	hlist_add_head_rcu(&class->hash_entry, hash_head);

	/*

	 * Add it to the global list of classes:

	 */
@@ -2017,7 +2017,7 @@ static inline int lookup_chain_cache(struct task_struct *curr, 
				     u64 chain_key)

{

	struct lock_class *class = hlock_class(hlock);

	struct list_head *hash_head = chainhashentry(chain_key);

	struct hlist_head *hash_head = chainhashentry(chain_key);

	struct lock_chain *chain;

	struct held_lock *hlock_curr;

	int i, j;
@@ -2033,7 +2033,7 @@ static inline int lookup_chain_cache(struct task_struct *curr, 
	 * We can walk it lock-free, because entries only get added

	 * to the hash:

	 */

	list_for_each_entry_rcu(chain, hash_head, entry) {

	hlist_for_each_entry_rcu(chain, hash_head, entry) {

		if (chain->chain_key == chain_key) {

cache_hit:

			debug_atomic_inc(chain_lookup_hits);
@@ -2057,7 +2057,7 @@ cache_hit: 
	/*

	 * We have to walk the chain again locked - to avoid duplicates:

	 */

	list_for_each_entry(chain, hash_head, entry) {

	hlist_for_each_entry(chain, hash_head, entry) {

		if (chain->chain_key == chain_key) {

			graph_unlock();

			goto cache_hit;
@@ -2091,7 +2091,7 @@ cache_hit: 
		}

		chain_hlocks[chain->base + j] = class - lock_classes;

	}

	list_add_tail_rcu(&chain->entry, hash_head);

	hlist_add_head_rcu(&chain->entry, hash_head);

	debug_atomic_inc(chain_lookup_misses);

	inc_chains();
@@ -3875,7 +3875,7 @@ void lockdep_reset(void) 
	nr_process_chains = 0;

	debug_locks = 1;

	for (i = 0; i < CHAINHASH_SIZE; i++)

		INIT_LIST_HEAD(chainhash_table + i);

		INIT_HLIST_HEAD(chainhash_table + i);

	raw_local_irq_restore(flags);

}
@@ -3894,7 +3894,7 @@ static void zap_class(struct lock_class *class) 
	/*

	 * Unhash the class and remove it from the all_lock_classes list:

	 */

	list_del_rcu(&class->hash_entry);

	hlist_del_rcu(&class->hash_entry);

	list_del_rcu(&class->lock_entry);



	RCU_INIT_POINTER(class->key, NULL);
@@ -3917,7 +3917,7 @@ static inline int within(const void *addr, void *start, unsigned long size) 
void lockdep_free_key_range(void *start, unsigned long size)

{

	struct lock_class *class;

	struct list_head *head;

	struct hlist_head *head;

	unsigned long flags;

	int i;

	int locked;
@@ -3930,9 +3930,7 @@ void lockdep_free_key_range(void *start, unsigned long size) 
	 */

	for (i = 0; i < CLASSHASH_SIZE; i++) {

		head = classhash_table + i;

		if (list_empty(head))

			continue;

		list_for_each_entry_rcu(class, head, hash_entry) {

		hlist_for_each_entry_rcu(class, head, hash_entry) {

			if (within(class->key, start, size))

				zap_class(class);

			else if (within(class->name, start, size))
@@ -3962,7 +3960,7 @@ void lockdep_free_key_range(void *start, unsigned long size) 
void lockdep_reset_lock(struct lockdep_map *lock)

{

	struct lock_class *class;

	struct list_head *head;

	struct hlist_head *head;

	unsigned long flags;

	int i, j;

	int locked;
@@ -3987,9 +3985,7 @@ void lockdep_reset_lock(struct lockdep_map *lock) 
	locked = graph_lock();

	for (i = 0; i < CLASSHASH_SIZE; i++) {

		head = classhash_table + i;

		if (list_empty(head))

			continue;

		list_for_each_entry_rcu(class, head, hash_entry) {

		hlist_for_each_entry_rcu(class, head, hash_entry) {

			int match = 0;



			for (j = 0; j < NR_LOCKDEP_CACHING_CLASSES; j++)
@@ -4027,10 +4023,10 @@ void lockdep_init(void) 
		return;



	for (i = 0; i < CLASSHASH_SIZE; i++)

		INIT_LIST_HEAD(classhash_table + i);

		INIT_HLIST_HEAD(classhash_table + i);



	for (i = 0; i < CHAINHASH_SIZE; i++)

		INIT_LIST_HEAD(chainhash_table + i);

		INIT_HLIST_HEAD(chainhash_table + i);



	lockdep_initialized = 1;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE