Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp1269392pxa; Thu, 20 Aug 2020 07:11:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyTjDiHm6Jz6JUpUKMFO7JGXzyA8gKaELVbeRXgXeNcsCdxTRwehI+cdUMNiqd7uC14RZjf X-Received: by 2002:a17:906:a1cf:: with SMTP id bx15mr3252824ejb.231.1597932661305; Thu, 20 Aug 2020 07:11:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597932661; cv=none; d=google.com; s=arc-20160816; b=fQAhMDf9uZ9omzbuEDCX2C8+nv/VU7ESwZ2sNgGLbp0gBKiwR6bGgJLQ1m2aZrcb+4 Hp9NAIeLtRzsiySXzLrCwMhZy8ynvX/yLE0nRsexyqnFManvWj+6UpYm9pX0gsijO06O tFjEQG9fqD5Oxm5juh78v0vF0Rh/PHF/I+ZDtrmtcdAlIRt2unz38fjC6fhPS8BLPoAW 0wuJkevkqcVyAwMSwunfPyUUYfRT4qctUeOU3SkGKYtyCIK0T4AIxQJ3UoD2ANclwFRA W94+8+Dc+l/+WUMAaviZNVPg9mFGnYFUv10fyZ8IYoikBQno9RrMmI9cbfcnWvNy6WBK Mo7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=69sOyCq0/PTkMt8U0eelreX//j7fcPl/BZSpBurBpUo=; b=fvs0GiuwDW27kDA41dWC+SsRwBp91oS1jytZZ9WtIYl8erM0IJyGgSGd1WIv39kUg4 IPxeWQ9db1nBRITERghekoegtH9bKvc7Dl05J+g0AJ2DoGKt2mh3PFszFPMNLZy4GdKa 10f2HpVbRa5qCkwF8L1rPUE68KeiCYMyi/JJzBEWb+Z47SGBDPyucMdsHh0qV/x+MybO 6ApenZFhkgACMen8LCojB4g+FRNJQQBkMUVqcT/TVdhs3jHHUbxnmjMBmj/KQypVqiv8 tn4M80mJ0TCK3BYJ9LOMzI4YOKIBNTOVejjhVvKyjYNcdAGXQ+IywoDNp1v8Mr61lbcj HEpQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cloudflare.com header.s=google header.b=NKfVAWDA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cloudflare.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id lr26si1364245ejb.47.2020.08.20.07.10.37; Thu, 20 Aug 2020 07:11:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@cloudflare.com header.s=google header.b=NKfVAWDA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cloudflare.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729192AbgHTOKB (ORCPT + 99 others); Thu, 20 Aug 2020 10:10:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42094 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731185AbgHTN6f (ORCPT ); Thu, 20 Aug 2020 09:58:35 -0400 Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BE6F7C061347 for ; Thu, 20 Aug 2020 06:58:09 -0700 (PDT) Received: by mail-wm1-x344.google.com with SMTP id d190so1687331wmd.4 for ; Thu, 20 Aug 2020 06:58:09 -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=69sOyCq0/PTkMt8U0eelreX//j7fcPl/BZSpBurBpUo=; b=NKfVAWDAIR8ZJHZC8OWpm5CRXjVZNw1xe2VottFCPq++d/jsD8EFS1L0ojf6qvkwVZ jEfIyyEkjij6YrI1IUlDkK/wadvu3F9SQIrQ11eAu8IkmqMLcLUu3GssdT0MqqJ/xvUy DiriGLoRa/+8DwfCJqeVs74lZBBtWmOQ+N1oU= 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=69sOyCq0/PTkMt8U0eelreX//j7fcPl/BZSpBurBpUo=; b=uez8tJ5v5bjRRCixq1/XglAmG1Dw7GG7PwFcVKaqmCQtCOe1PWJWc/aiyTyBCrknB1 FnObFGMZ1x06xfFswPB7qHUzinZSOmc4c6apXFqTcWXN4Qf4j1tpdQ2OwV4ParY48eyB HJsagzBdhaKoNcAsavoj7y6mWHQQowEtp/XTS6BQdFwfWgMn0kNJjrnv/qlsYsNOpujV zzwjIky6+zO7AgWxQC2O3vkzLYXV6GYiqziE3QLHq3HV/zwPAlJ3rbIk+ASjzog/8ivm HwpDyBLimtpkIYfJKTe4Tv9Sf5mL6/jBux1VmeePYed5INvKD6sMwZjdIQ50ZELUcyt1 JwlA== X-Gm-Message-State: AOAM5325LVckiR/8n2cVZvGeZ6XKfUUBsMjz/EIHKp6WYc4kMmNRfqUH eNtAv4qc4rh075i5RCWqCs08qg== X-Received: by 2002:a7b:c056:: with SMTP id u22mr3671470wmc.188.1597931888431; Thu, 20 Aug 2020 06:58:08 -0700 (PDT) Received: from antares.lan (d.0.f.e.b.c.7.2.d.c.3.8.4.8.d.9.f.f.6.2.a.5.a.7.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:7a5a:26ff:9d84:83cd:27cb:ef0d]) by smtp.gmail.com with ESMTPSA id l81sm4494215wmf.4.2020.08.20.06.58.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Aug 2020 06:58:07 -0700 (PDT) From: Lorenz Bauer To: jakub@cloudflare.com, john.fastabend@gmail.com, Alexei Starovoitov , Daniel Borkmann , Lorenz Bauer , "David S. Miller" , Jakub Kicinski Cc: kernel-team@cloudflare.com, netdev@vger.kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH bpf-next v2 3/6] bpf: sockmap: call sock_map_update_elem directly Date: Thu, 20 Aug 2020 14:57:26 +0100 Message-Id: <20200820135729.135783-4-lmb@cloudflare.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200820135729.135783-1-lmb@cloudflare.com> References: <20200820135729.135783-1-lmb@cloudflare.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Don't go via map->ops to call sock_map_update_elem, since we know what function to call in bpf_map_update_value. Since we currently don't allow calling map_update_elem from BPF context, we can remove ops->map_update_elem and rename the function to sock_map_update_elem_sys. Signed-off-by: Lorenz Bauer --- include/linux/bpf.h | 7 +++++++ kernel/bpf/syscall.c | 5 +++-- net/core/sock_map.c | 6 ++---- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/include/linux/bpf.h b/include/linux/bpf.h index cef4ef0d2b4e..cf3416d1b8c2 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -1635,6 +1635,7 @@ int sock_map_prog_update(struct bpf_map *map, struct bpf_prog *prog, struct bpf_prog *old, u32 which); int sock_map_get_from_fd(const union bpf_attr *attr, struct bpf_prog *prog); int sock_map_prog_detach(const union bpf_attr *attr, enum bpf_prog_type ptype); +int sock_map_update_elem_sys(struct bpf_map *map, void *key, void *value, u64 flags); void sock_map_unhash(struct sock *sk); void sock_map_close(struct sock *sk, long timeout); #else @@ -1656,6 +1657,12 @@ static inline int sock_map_prog_detach(const union bpf_attr *attr, { return -EOPNOTSUPP; } + +static inline int sock_map_update_elem_sys(struct bpf_map *map, void *key, void *value, + u64 flags) +{ + return -EOPNOTSUPP; +} #endif /* CONFIG_BPF_STREAM_PARSER */ #if defined(CONFIG_INET) && defined(CONFIG_BPF_SYSCALL) diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c index 2f343ce15747..5867cf615a3c 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -157,10 +157,11 @@ static int bpf_map_update_value(struct bpf_map *map, struct fd f, void *key, if (bpf_map_is_dev_bound(map)) { return bpf_map_offload_update_elem(map, key, value, flags); } else if (map->map_type == BPF_MAP_TYPE_CPUMAP || - map->map_type == BPF_MAP_TYPE_SOCKHASH || - map->map_type == BPF_MAP_TYPE_SOCKMAP || map->map_type == BPF_MAP_TYPE_STRUCT_OPS) { return map->ops->map_update_elem(map, key, value, flags); + } else if (map->map_type == BPF_MAP_TYPE_SOCKHASH || + map->map_type == BPF_MAP_TYPE_SOCKMAP) { + return sock_map_update_elem_sys(map, key, value, flags); } else if (IS_FD_PROG_ARRAY(map)) { return bpf_fd_array_map_update_elem(map, f.file, key, value, flags); diff --git a/net/core/sock_map.c b/net/core/sock_map.c index 905e2dd765aa..48e83f93ee66 100644 --- a/net/core/sock_map.c +++ b/net/core/sock_map.c @@ -562,8 +562,8 @@ static bool sock_map_sk_state_allowed(const struct sock *sk) static int sock_hash_update_common(struct bpf_map *map, void *key, struct sock *sk, u64 flags); -static int sock_map_update_elem(struct bpf_map *map, void *key, - void *value, u64 flags) +int sock_map_update_elem_sys(struct bpf_map *map, void *key, void *value, + u64 flags) { struct socket *sock; struct sock *sk; @@ -687,7 +687,6 @@ const struct bpf_map_ops sock_map_ops = { .map_free = sock_map_free, .map_get_next_key = sock_map_get_next_key, .map_lookup_elem_sys_only = sock_map_lookup_sys, - .map_update_elem = sock_map_update_elem, .map_delete_elem = sock_map_delete_elem, .map_lookup_elem = sock_map_lookup, .map_release_uref = sock_map_release_progs, @@ -1181,7 +1180,6 @@ const struct bpf_map_ops sock_hash_ops = { .map_alloc = sock_hash_alloc, .map_free = sock_hash_free, .map_get_next_key = sock_hash_get_next_key, - .map_update_elem = sock_map_update_elem, .map_delete_elem = sock_hash_delete_elem, .map_lookup_elem = sock_hash_lookup, .map_lookup_elem_sys_only = sock_hash_lookup_sys, -- 2.25.1