]>
Commit | Line | Data |
---|---|---|
dd5b528c GKH |
1 | From foo@baz Tue 04 Jun 2019 04:46:27 PM CEST |
2 | From: Ben Hutchings <ben.hutchings@codethink.co.uk> | |
3 | Date: Wed, 29 May 2019 18:02:44 +0100 | |
4 | Subject: binder: Replace "%p" with "%pK" for stable | |
5 | ||
6 | From: Ben Hutchings <ben.hutchings@codethink.co.uk> | |
7 | ||
8 | This was done as part of upstream commits fdfb4a99b6ab "8inder: | |
9 | separate binder allocator structure from binder proc", 19c987241ca1 | |
10 | "binder: separate out binder_alloc functions", and 7a4408c6bd3e | |
11 | "binder: make sure accesses to proc/thread are safe". However, those | |
12 | commits made lots of other changes that are not suitable for stable. | |
13 | ||
14 | Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk> | |
15 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
16 | --- | |
17 | drivers/android/binder.c | 28 ++++++++++++++-------------- | |
18 | 1 file changed, 14 insertions(+), 14 deletions(-) | |
19 | ||
20 | --- a/drivers/android/binder.c | |
21 | +++ b/drivers/android/binder.c | |
22 | @@ -477,7 +477,7 @@ static void binder_insert_free_buffer(st | |
23 | new_buffer_size = binder_buffer_size(proc, new_buffer); | |
24 | ||
25 | binder_debug(BINDER_DEBUG_BUFFER_ALLOC, | |
26 | - "%d: add free buffer, size %zd, at %p\n", | |
27 | + "%d: add free buffer, size %zd, at %pK\n", | |
28 | proc->pid, new_buffer_size, new_buffer); | |
29 | ||
30 | while (*p) { | |
31 | @@ -555,7 +555,7 @@ static int binder_update_page_range(stru | |
32 | struct mm_struct *mm; | |
33 | ||
34 | binder_debug(BINDER_DEBUG_BUFFER_ALLOC, | |
35 | - "%d: %s pages %p-%p\n", proc->pid, | |
36 | + "%d: %s pages %pK-%pK\n", proc->pid, | |
37 | allocate ? "allocate" : "free", start, end); | |
38 | ||
39 | if (end <= start) | |
40 | @@ -595,7 +595,7 @@ static int binder_update_page_range(stru | |
41 | BUG_ON(*page); | |
42 | *page = alloc_page(GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO); | |
43 | if (*page == NULL) { | |
44 | - pr_err("%d: binder_alloc_buf failed for page at %p\n", | |
45 | + pr_err("%d: binder_alloc_buf failed for page at %pK\n", | |
46 | proc->pid, page_addr); | |
47 | goto err_alloc_page_failed; | |
48 | } | |
49 | @@ -604,7 +604,7 @@ static int binder_update_page_range(stru | |
50 | flush_cache_vmap((unsigned long)page_addr, | |
51 | (unsigned long)page_addr + PAGE_SIZE); | |
52 | if (ret != 1) { | |
53 | - pr_err("%d: binder_alloc_buf failed to map page at %p in kernel\n", | |
54 | + pr_err("%d: binder_alloc_buf failed to map page at %pK in kernel\n", | |
55 | proc->pid, page_addr); | |
56 | goto err_map_kernel_failed; | |
57 | } | |
58 | @@ -708,7 +708,7 @@ static struct binder_buffer *binder_allo | |
59 | } | |
60 | ||
61 | binder_debug(BINDER_DEBUG_BUFFER_ALLOC, | |
62 | - "%d: binder_alloc_buf size %zd got buffer %p size %zd\n", | |
63 | + "%d: binder_alloc_buf size %zd got buffer %pK size %zd\n", | |
64 | proc->pid, size, buffer, buffer_size); | |
65 | ||
66 | has_page_addr = | |
67 | @@ -738,7 +738,7 @@ static struct binder_buffer *binder_allo | |
68 | binder_insert_free_buffer(proc, new_buffer); | |
69 | } | |
70 | binder_debug(BINDER_DEBUG_BUFFER_ALLOC, | |
71 | - "%d: binder_alloc_buf size %zd got %p\n", | |
72 | + "%d: binder_alloc_buf size %zd got %pK\n", | |
73 | proc->pid, size, buffer); | |
74 | buffer->data_size = data_size; | |
75 | buffer->offsets_size = offsets_size; | |
76 | @@ -778,7 +778,7 @@ static void binder_delete_free_buffer(st | |
77 | if (buffer_end_page(prev) == buffer_end_page(buffer)) | |
78 | free_page_end = 0; | |
79 | binder_debug(BINDER_DEBUG_BUFFER_ALLOC, | |
80 | - "%d: merge free, buffer %p share page with %p\n", | |
81 | + "%d: merge free, buffer %pK share page with %pK\n", | |
82 | proc->pid, buffer, prev); | |
83 | } | |
84 | ||
85 | @@ -791,14 +791,14 @@ static void binder_delete_free_buffer(st | |
86 | buffer_start_page(buffer)) | |
87 | free_page_start = 0; | |
88 | binder_debug(BINDER_DEBUG_BUFFER_ALLOC, | |
89 | - "%d: merge free, buffer %p share page with %p\n", | |
90 | + "%d: merge free, buffer %pK share page with %pK\n", | |
91 | proc->pid, buffer, prev); | |
92 | } | |
93 | } | |
94 | list_del(&buffer->entry); | |
95 | if (free_page_start || free_page_end) { | |
96 | binder_debug(BINDER_DEBUG_BUFFER_ALLOC, | |
97 | - "%d: merge free, buffer %p do not share page%s%s with %p or %p\n", | |
98 | + "%d: merge free, buffer %pK do not share page%s%s with %pK or %pK\n", | |
99 | proc->pid, buffer, free_page_start ? "" : " end", | |
100 | free_page_end ? "" : " start", prev, next); | |
101 | binder_update_page_range(proc, 0, free_page_start ? | |
102 | @@ -819,7 +819,7 @@ static void binder_free_buf(struct binde | |
103 | ALIGN(buffer->offsets_size, sizeof(void *)); | |
104 | ||
105 | binder_debug(BINDER_DEBUG_BUFFER_ALLOC, | |
106 | - "%d: binder_free_buf %p size %zd buffer_size %zd\n", | |
107 | + "%d: binder_free_buf %pK size %zd buffer_size %zd\n", | |
108 | proc->pid, buffer, size, buffer_size); | |
109 | ||
110 | BUG_ON(buffer->free); | |
111 | @@ -2912,7 +2912,7 @@ static int binder_mmap(struct file *filp | |
112 | #ifdef CONFIG_CPU_CACHE_VIPT | |
113 | if (cache_is_vipt_aliasing()) { | |
114 | while (CACHE_COLOUR((vma->vm_start ^ (uint32_t)proc->buffer))) { | |
115 | - pr_info("binder_mmap: %d %lx-%lx maps %p bad alignment\n", proc->pid, vma->vm_start, vma->vm_end, proc->buffer); | |
116 | + pr_info("binder_mmap: %d %lx-%lx maps %pK bad alignment\n", proc->pid, vma->vm_start, vma->vm_end, proc->buffer); | |
117 | vma->vm_start += PAGE_SIZE; | |
118 | } | |
119 | } | |
120 | @@ -3170,7 +3170,7 @@ static void binder_deferred_release(stru | |
121 | ||
122 | page_addr = proc->buffer + i * PAGE_SIZE; | |
123 | binder_debug(BINDER_DEBUG_BUFFER_ALLOC, | |
124 | - "%s: %d: page %d at %p not freed\n", | |
125 | + "%s: %d: page %d at %pK not freed\n", | |
126 | __func__, proc->pid, i, page_addr); | |
127 | unmap_kernel_range((unsigned long)page_addr, PAGE_SIZE); | |
128 | __free_page(proc->pages[i]); | |
129 | @@ -3271,7 +3271,7 @@ static void print_binder_transaction(str | |
130 | static void print_binder_buffer(struct seq_file *m, const char *prefix, | |
131 | struct binder_buffer *buffer) | |
132 | { | |
133 | - seq_printf(m, "%s %d: %p size %zd:%zd %s\n", | |
134 | + seq_printf(m, "%s %d: %pK size %zd:%zd %s\n", | |
135 | prefix, buffer->debug_id, buffer->data, | |
136 | buffer->data_size, buffer->offsets_size, | |
137 | buffer->transaction ? "active" : "delivered"); | |
138 | @@ -3374,7 +3374,7 @@ static void print_binder_node(struct seq | |
139 | ||
140 | static void print_binder_ref(struct seq_file *m, struct binder_ref *ref) | |
141 | { | |
142 | - seq_printf(m, " ref %d: desc %d %snode %d s %d w %d d %p\n", | |
143 | + seq_printf(m, " ref %d: desc %d %snode %d s %d w %d d %pK\n", | |
144 | ref->debug_id, ref->desc, ref->node->proc ? "" : "dead ", | |
145 | ref->node->debug_id, ref->strong, ref->weak, ref->death); | |
146 | } |