From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5142FCA9EA0 for ; Tue, 22 Oct 2019 11:37:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1D48A207FC for ; Tue, 22 Oct 2019 11:37:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=cloudflare.com header.i=@cloudflare.com header.b="L9mD9u1N" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731934AbfJVLhh (ORCPT ); Tue, 22 Oct 2019 07:37:37 -0400 Received: from mail-lj1-f193.google.com ([209.85.208.193]:35927 "EHLO mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730749AbfJVLhg (ORCPT ); Tue, 22 Oct 2019 07:37:36 -0400 Received: by mail-lj1-f193.google.com with SMTP id v24so16818133ljj.3 for ; Tue, 22 Oct 2019 04:37:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloudflare.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XwpTSQZj56OSYomc9KDBVc5uyUVwcduu9tcaPzQMlu4=; b=L9mD9u1NtrWM8xoDfW9KBEBAjbwYr/XNsM9Nw4rsdtB4K+DpJdibES7k+VbjRKCc5M jiLN4EugX0slnPe0d05Y36kGeRG8sWw2cIsPaimvFA4Dbc8v8ForgV+se1tDBOymyZXj +nREmzhFJYp+gOE6cf9yB8X3sZu+0J20GrkzQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XwpTSQZj56OSYomc9KDBVc5uyUVwcduu9tcaPzQMlu4=; b=AyTWAK3R1IB9BLqMpJNmnNYqFI0QH5DTm/VT+f/joNCogEgbrrcSXeNeNkr2z2AI5b Ha+6liI+CS8Fz0DZnn5z2rKM8dOUoLLPU2SsheMLOpQ32UeBgb8GP03dgTUiYcBOS6v+ uWV62dWh5AXc7yT3ucdvxg2mzXcsCByzdhV9pO1qBbIBSWKsR/m2Xi5ZZT9AATPA9QvQ 801AjR1BhwJ8tjrw1HE1Pkvk1oS/1ZGxR25w+rBJIU0+RARAzSReNPz4SxsmIlZAciJw rhIT6Tx0pPLaokvH6bj9YqpxdPrjb/Ks4MthPo6FEvDnTeJ94lgV//Nv1QWB/Va6NV5B qwBg== X-Gm-Message-State: APjAAAXsHBh0dWprMtRs+evO2BPAXtr2urgIt2VB279AzTU5ViCxePuA 0aDTpAMJh8XQgFrExym7hG0aWA== X-Google-Smtp-Source: APXvYqzmjfWIVuqz2e1ZdmrW+JohGhmSgP9fCvJZKAk9rUck9ZRuA0qxpcq+Gr2vjJnrtkO8Y4vAGQ== X-Received: by 2002:a2e:85cf:: with SMTP id h15mr18966379ljj.141.1571744253522; Tue, 22 Oct 2019 04:37:33 -0700 (PDT) Received: from cloudflare.com ([176.221.114.230]) by smtp.gmail.com with ESMTPSA id t135sm9396057lff.70.2019.10.22.04.37.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Oct 2019 04:37:33 -0700 (PDT) From: Jakub Sitnicki To: bpf@vger.kernel.org Cc: John Fastabend , Martin KaFai Lau , netdev@vger.kernel.org, kernel-team@cloudflare.com Subject: [RFC bpf-next 1/5] bpf, sockmap: Let BPF helpers use lookup operation on SOCKMAP Date: Tue, 22 Oct 2019 13:37:26 +0200 Message-Id: <20191022113730.29303-2-jakub@cloudflare.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191022113730.29303-1-jakub@cloudflare.com> References: <20191022113730.29303-1-jakub@cloudflare.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Don't require the BPF helpers that need to access SOCKMAP maps to live in the sock_map module. Expose SOCKMAP lookup to all kernel-land. Signed-off-by: Jakub Sitnicki --- net/core/sock_map.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/core/sock_map.c b/net/core/sock_map.c index eb114ee419b6..facacc296e6c 100644 --- a/net/core/sock_map.c +++ b/net/core/sock_map.c @@ -271,7 +271,9 @@ static struct sock *__sock_map_lookup_elem(struct bpf_map *map, u32 key) static void *sock_map_lookup(struct bpf_map *map, void *key) { - return ERR_PTR(-EOPNOTSUPP); + u32 index = *(u32 *)key; + + return __sock_map_lookup_elem(map, index); } static int __sock_map_delete(struct bpf_stab *stab, struct sock *sk_test, -- 2.20.1