Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp563180pxa; Wed, 19 Aug 2020 08:50:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxF0HSwE4Aqs0zki8AFcvNNXsxANMWGtdMApibUUKnEcQMw9hDRwV6ChAgOBHadg8pu5hkm X-Received: by 2002:aa7:c688:: with SMTP id n8mr25628116edq.345.1597852201935; Wed, 19 Aug 2020 08:50:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597852201; cv=none; d=google.com; s=arc-20160816; b=q/RCwR81vtdHqPi7ZRfbJ028y1rCjnRz0Bz7NiLwYHHbGrx860Mz/rti+rl7Vr8Qbc L+PTsN4f5RBQ9bwxje1xi/w6XEOY0rv1BFgIwbJWQpxkxhTh67R7JZzxj36qNpqz3SGK JrMz9SREyAslQLORJ+g7igMSYNI4zrcJG0TNH5x0X7SQ0/L7xP1I2eF2X4THhXZsGt+b +WHpRH5oo67ZRwitl2dzbCjQSEN3OliPn2TlxMD8qk4O4mKFkWbKrmag3XJwc5fsADmC 7L7cFGVFUzjVRBBdnRO7ouX/Vx81XGOwkjtN3r8RY2RCUpU2d2o8P2feGoV5G64naf9b YIhw== 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:subject:cc:to:from:date :dkim-signature; bh=IEq44pGTGwnYYkyFRW1cfTq9TnXp4tVvGFgbQPIDyTw=; b=ulmZRLdaPMxahIwhKyfHRRL/2e4oxic8y1O4cC2Aqz31B0YSmXt8nXGTht0/qpchzC JVmBUdGa1VZIUV6DpCja8J2ZlG61C8hG7LupprXbZllVrpF1Qz9bVc2FXgMfqDJOXgSa r9oWFvn+4C/0UL1X4iOswOuZVoxQGoSey/YnSFED06+c7TynCQSN2tWHTSaFnflDZ9AS Kq1KK6YdCxgeF783KlRcB883jOGfUcX/1hBep88MAJD3QGAEmQDoUcSqWmT+806RiYth AFBlTw3blhNXk31mp4Zdy8keHG7WWFXYslH97CP91bNUQgJuBNFqdptzY53Rv4Orjvcj XZ6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=agAmgtUP; 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=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id i11si15565080ejx.592.2020.08.19.08.49.37; Wed, 19 Aug 2020 08:50: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=@kernel.org header.s=default header.b=agAmgtUP; 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=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727000AbgHSPs7 (ORCPT + 99 others); Wed, 19 Aug 2020 11:48:59 -0400 Received: from mail.kernel.org ([198.145.29.99]:51196 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726636AbgHSPs6 (ORCPT ); Wed, 19 Aug 2020 11:48:58 -0400 Received: from kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com (unknown [163.114.132.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DD85220639; Wed, 19 Aug 2020 15:48:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597852138; bh=M+KmLvjZXimpBFj9/QwTW6ppu9PIQJ7dauQO7HVxdsQ=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=agAmgtUPMIWENJAki83v0ilnSFnKZPItSyS7xLAaljX4C64Iu/cA8Zuh4izqsGOrM qp2NfsywEVraFZ6KIJbtXTU5sa6bRTVb6bX7ZoLCWRoOhfd1iCiuwOaTIaqKyOTL5c 5XKg1OWe3L2zQSZASVuzy1HoK/7EyZWYGgecLvaI= Date: Wed, 19 Aug 2020 08:48:56 -0700 From: Jakub Kicinski To: Lorenz Bauer Cc: jakub@cloudflare.com, john.fastabend@gmail.com, Daniel Borkmann , "David S. Miller" , Alexei Starovoitov , kernel-team@cloudflare.com, netdev@vger.kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH bpf-next 2/6] bpf: sockmap: merge sockmap and sockhash update functions Message-ID: <20200819084856.01716806@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com> In-Reply-To: <20200819092436.58232-3-lmb@cloudflare.com> References: <20200819092436.58232-1-lmb@cloudflare.com> <20200819092436.58232-3-lmb@cloudflare.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 19 Aug 2020 10:24:32 +0100 Lorenz Bauer wrote: > --- a/net/core/sock_map.c > +++ b/net/core/sock_map.c > @@ -559,10 +559,12 @@ static bool sock_map_sk_state_allowed(const struct = sock *sk) > return false; > } > =20 > -static int sock_map_update_elem(struct bpf_map *map, void *key, > - void *value, u64 flags) > +static int sock_hash_update_common(struct bpf_map *map, void *key, > + struct sock *sk, u64 flags); > + > +int sock_map_update_elem(struct bpf_map *map, void *key, > + void *value, u64 flags) > { > - u32 idx =3D *(u32 *)key; > struct socket *sock; > struct sock *sk; > int ret; net/core/sock_map.c:565:5: warning: no previous prototype for =E2=80=98sock= _map_update_elem=E2=80=99 [-Wmissing-prototypes] 565 | int sock_map_update_elem(struct bpf_map *map, void *key, | ^~~~~~~~~~~~~~~~~~~~