From patchwork Thu Mar 10 02:56:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexei Starovoitov X-Patchwork-Id: 595617 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id E4DF614030E for ; Thu, 10 Mar 2016 13:56:57 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=fb.com header.i=@fb.com header.b=CgGKgbPa; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934766AbcCJC4z (ORCPT ); Wed, 9 Mar 2016 21:56:55 -0500 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:49226 "EHLO mx0b-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753958AbcCJC4y (ORCPT ); Wed, 9 Mar 2016 21:56:54 -0500 Received: from pps.filterd (m0089730.ppops.net [127.0.0.1]) by m0089730.ppops.net (8.15.0.59/8.15.0.59) with SMTP id u2A2rWq8006451 for ; Wed, 9 Mar 2016 18:56:53 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=fb.com; h=from : to : cc : subject : date : message-id : mime-version : content-type; s=facebook; bh=9ASXjyXej+shnhCU1+3MW3SAZQ8xudbiOxVE68goBKM=; b=CgGKgbPavBtVxsMQl5h1gqKpbFURvnXP+Rp4XpFntVuK7lqByXe9esTbPx00rPXwXkUx 28n2glDA0Vyy5l8NJ429vfAqzjA/VoKUvkYT5D3RpxP5O/X4UU4D0iPB/VqyBTLOjAE9 TYlkpiSOJOFp/EWkkzQH1dWjyDam09YbqGo= Received: from mail.thefacebook.com ([199.201.64.23]) by m0089730.ppops.net with ESMTP id 21jt8phjw1-2 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT) for ; Wed, 09 Mar 2016 18:56:53 -0800 Received: from mx-out.facebook.com (192.168.52.123) by PRN-CHUB05.TheFacebook.com (192.168.16.15) with Microsoft SMTP Server (TLS) id 14.3.248.2; Wed, 9 Mar 2016 18:56:49 -0800 Received: from facebook.com (2401:db00:11:d093:face:0:1b:0) by mx-out.facebook.com (10.102.107.97) with ESMTP id bbd8c9f4e66b11e5a98b0002c99331b0-614e6420 for ; Wed, 09 Mar 2016 18:56:49 -0800 Received: by devbig505.prn1.facebook.com (Postfix, from userid 572438) id 1EF132226C53; Wed, 9 Mar 2016 18:56:49 -0800 (PST) From: Alexei Starovoitov To: "David S . Miller" CC: Daniel Borkmann , Fengguang Wu , Subject: [PATCH net-next] bpf: bpf_stackmap_copy depends on CONFIG_PERF_EVENTS Date: Wed, 9 Mar 2016 18:56:49 -0800 Message-ID: <1457578609-277357-1-git-send-email-ast@fb.com> X-Mailer: git-send-email 2.8.0.rc1 X-FB-Internal: Safe MIME-Version: 1.0 X-Proofpoint-Spam-Reason: safe X-FB-Internal: Safe X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-03-10_01:, , signatures=0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 0-day bot reported build error: kernel/built-in.o: In function `map_lookup_elem': >> kernel/bpf/.tmp_syscall.o:(.text+0x329b3c): undefined reference to `bpf_stackmap_copy' when CONFIG_BPF_SYSCALL is set and CONFIG_PERF_EVENTS is not. Add weak definition to resolve it. This code path in map_lookup_elem() is never taken when CONFIG_PERF_EVENTS is not set. Fixes: 557c0c6e7df8 ("bpf: convert stackmap to pre-allocation") Reported-by: Fengguang Wu Signed-off-by: Alexei Starovoitov --- kernel/bpf/syscall.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c index 2978d0d08869..2a2efe1bc76c 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -244,6 +244,11 @@ static void __user *u64_to_ptr(__u64 val) return (void __user *) (unsigned long) val; } +int __weak bpf_stackmap_copy(struct bpf_map *map, void *key, void *value) +{ + return -ENOTSUPP; +} + /* last field in 'union bpf_attr' used by this command */ #define BPF_MAP_LOOKUP_ELEM_LAST_FIELD value