History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Two easily resolvable overlapping change conflicts, one in TCP and one in the eBPF verifier.

David S. Miller committed 7 years ago

Commit 375ca542 parents 58066ac 40e196a142 files · +1175 −735Browse files

Showing the changes to kernel (5 of 142 files). Show all

Unified · Split

5 files
  1. kernel/bpf/stackmap.c +7 −1
  2. kernel/events/core.c +16 −0
  3. kernel/events/ring_buffer.c +1 −1
  4. kernel/trace/trace.c +2 −0
  5. kernel/trace/trace_kprobe.c +1 −9
kernel/bpf/stackmap.c+7−1
@@ -44,7 +44,7 @@ static void do_up_read(struct irq_work *entry) · 43 unmodified lines
4444 struct stack_map_irq_work *work;
4545
4646 work = container_of(entry, struct stack_map_irq_work, irq_work);
47− up_read(work->sem);
47+ up_read_non_owner(work->sem);
4848 work->sem = NULL;
4949 }
5050
@@ -338,6 +338,12 @@ static void stack_map_get_build_id_offset(struct bpf_stack_build_id *id_offs, · 287 unmodified lines
338338 } else {
339339 work->sem = &current->mm->mmap_sem;
340340 irq_work_queue(&work->irq_work);
341+ /*
342+ * The irq_work will release the mmap_sem with
343+ * up_read_non_owner(). The rwsem_release() is called
344+ * here to release the lock from lockdep's perspective.
345+ */
346+ rwsem_release(&current->mm->mmap_sem.dep_map, 1, _RET_IP_);
341347 }
342348 }
343349
kernel/events/core.c+16−0
@@ -4963,6 +4963,11 @@ static void __perf_event_period(struct perf_event *event, · 4962 unmodified lines
49634963 }
49644964 }
49654965
4966+static int perf_event_check_period(struct perf_event *event, u64 value)
4967+{
4968+ return event->pmu->check_period(event, value);
4969+}
4970+
49664971 static int perf_event_period(struct perf_event *event, u64 __user *arg)
49674972 {
49684973 u64 value;
@@ -4979,6 +4984,9 @@ static int perf_event_period(struct perf_event *event, u64 __user *arg) · 10 unmodified lines
49794984 if (event->attr.freq && value > sysctl_perf_event_sample_rate)
49804985 return -EINVAL;
49814986
4987+ if (perf_event_check_period(event, value))
4988+ return -EINVAL;
4989+
49824990 event_function_call(event, __perf_event_period, &value);
49834991
49844992 return 0;
@@ -9391,6 +9399,11 @@ static int perf_pmu_nop_int(struct pmu *pmu) · 4406 unmodified lines
93919399 return 0;
93929400 }
93939401
9402+static int perf_event_nop_int(struct perf_event *event, u64 value)
9403+{
9404+ return 0;
9405+}
9406+
93949407 static DEFINE_PER_CPU(unsigned int, nop_txn_flags);
93959408
93969409 static void perf_pmu_start_txn(struct pmu *pmu, unsigned int flags)
@@ -9691,6 +9704,9 @@ got_cpu_context: · 294 unmodified lines
96919704 pmu->pmu_disable = perf_pmu_nop_void;
96929705 }
96939706
9707+ if (!pmu->check_period)
9708+ pmu->check_period = perf_event_nop_int;
9709+
96949710 if (!pmu->event_idx)
96959711 pmu->event_idx = perf_event_idx_default;
96969712
kernel/events/ring_buffer.c+1−1
@@ -734,7 +734,7 @@ struct ring_buffer *rb_alloc(int nr_pages, long watermark, int cpu, int flags) · 733 unmodified lines
734734 size = sizeof(struct ring_buffer);
735735 size += nr_pages * sizeof(void *);
736736
737− if (order_base_2(size) >= MAX_ORDER)
737+ if (order_base_2(size) >= PAGE_SHIFT+MAX_ORDER)
738738 goto fail;
739739
740740 rb = kzalloc(size, GFP_KERNEL);
kernel/trace/trace.c+2−0
@@ -3384,6 +3384,8 @@ static void print_func_help_header_irq(struct trace_buffer *buf, struct seq_file · 3383 unmodified lines
33843384 const char tgid_space[] = " ";
33853385 const char space[] = " ";
33863386
3387+ print_event_info(buf, m);
3388+
33873389 seq_printf(m, "# %s _-----=> irqs-off\n",
33883390 tgid ? tgid_space : space);
33893391 seq_printf(m, "# %s / _----=> need-resched\n",
kernel/trace/trace_kprobe.c+1−9
@@ -861,22 +861,14 @@ static const struct file_operations kprobe_profile_ops = { · 860 unmodified lines
861861 static nokprobe_inline int
862862 fetch_store_strlen(unsigned long addr)
863863 {
864− mm_segment_t old_fs;
865864 int ret, len = 0;
866865 u8 c;
867866
868− old_fs = get_fs();
869− set_fs(KERNEL_DS);
870− pagefault_disable();
871−
872867 do {
873− ret = __copy_from_user_inatomic(&c, (u8 *)addr + len, 1);
868+ ret = probe_mem_read(&c, (u8 *)addr + len, 1);
874869 len++;
875870 } while (c && ret == 0 && len < MAX_STRING_SIZE);
876871
877− pagefault_enable();
878− set_fs(old_fs);
879−
880872 return (ret < 0) ? ret : len;
881873 }
882874