Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp728392pxa; Wed, 19 Aug 2020 13:12:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzQUjLyAvwYVvpUpEi5vCZ9fLvdDWyI5hGewYHUzhRuAUfm+s16KLO0SsySB2N+SyZhsrcK X-Received: by 2002:a17:906:5246:: with SMTP id y6mr18029ejm.316.1597867951792; Wed, 19 Aug 2020 13:12:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597867951; cv=none; d=google.com; s=arc-20160816; b=b2Xh8SvwnAfab4oGAei12Nqv96+Szo3IhvMDX5m4ed6PeBIpiip+XLBdprxZIr2sP/ qLDexrfA6tFqxhLHzU+jAz2Wqnse3N9vg0Q+KzhsQLeD7idjBZloxAkt+GhaKj9fBgs8 1RfknW0dEEZmMMM9NS2Wwp9Pzemc75WJFI61M1h1IkQFHTdh6kuamsBWAxeTV8PYE+1B e+k2gj04O+NMtzkbdyRd2qTmepmGnN2Oz4S74PuzV/gfjLzDMIJh/4Vh+ncdfTMNYoUH FRKUsI8zlazsl07bJOIzYAd4gNC5PaPi0Azm8fMilIwfmxE2R26knLj1+8ck0cDbrHzw 2sJA== 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 :subject:references:in-reply-to:message-id:cc:to:from:date :dkim-signature; bh=dbcOzTqx7hOOJVlLikGR6xEV3IO3I5Sm2hqIIob1Cuo=; b=Qd1/kH5Ypa8fBiyBvD7RgWC+aTmk8jm62lw9LaVKO8WVluLPaM16Hw65ShCDrYCmxU qA5PzdR+mLoopUJgBrxN3haHO0enPixqtwGTyDwB7C+xtM5Ye/jd2PnXIHfuSdyAel+Z 4E5ejE7Rm01xSxrS6PS1BnIL8rwoXYXAYJ4sXepCg79qMScBU4zB7DMzT1gdtCWGDTkX 5ujZQOMfQnErf8GjiwsJOc3qUVUbPVAOEZffOZdToIoRte6CE5EzBYNbBnU3RNJ3ki1O ApOOEBHu+vPJ8TEb997WyOqgRca8aEup6BQeORvXy3BAmkwaN3WzKE1mcXeoyFQt2sui PH4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=DPsJXVrE; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id o9si16990323ejr.637.2020.08.19.13.12.08; Wed, 19 Aug 2020 13:12:31 -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=@gmail.com header.s=20161025 header.b=DPsJXVrE; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726983AbgHSULT (ORCPT + 99 others); Wed, 19 Aug 2020 16:11:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46954 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725275AbgHSULT (ORCPT ); Wed, 19 Aug 2020 16:11:19 -0400 Received: from mail-pl1-x629.google.com (mail-pl1-x629.google.com [IPv6:2607:f8b0:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A21B5C061757; Wed, 19 Aug 2020 13:11:18 -0700 (PDT) Received: by mail-pl1-x629.google.com with SMTP id k13so11343168plk.13; Wed, 19 Aug 2020 13:11:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:message-id:in-reply-to:references:subject :mime-version:content-transfer-encoding; bh=dbcOzTqx7hOOJVlLikGR6xEV3IO3I5Sm2hqIIob1Cuo=; b=DPsJXVrE4wsCVAUtKsCOLb0YlLh7Om3nNkFl0FqcfsIcx8uJav/oLgVJmYsTroWpAt s9kTeMsnuX112omdMZ8Oxa024PmVMXGgYRG5cRpVUECVxsUcyN+DrJY7KFmuMYZrdG00 k0BH7UkcZ2Yaqh09IuRyJDWKUd6349jkwvc2whcHZMezjP65WV7V8dBuCTeN+XT+nl7r kKJdB0jL6lioLHwvJYzwRrthg+bEMxuDMobrRsNVFC3RwvI76mPPAAynEaDTEzT1PCLk 9CsjyIcbysz7H1fNXVH2KNd0nkYZgfSlRShswGEe528kABtIOV0g3uy0G+wQkr6rz+mw Jfvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:message-id:in-reply-to :references:subject:mime-version:content-transfer-encoding; bh=dbcOzTqx7hOOJVlLikGR6xEV3IO3I5Sm2hqIIob1Cuo=; b=AV4II6ZmdDZi/IcxGi4hE6vmKzmyvo0ymm+9zyqLSXFjyqHQpNR3jbyKxXG6eUPXyS B4Yu18qQ0iiEUSOr4Sf1mfTRa7GKhaUMmBIGNcQGRZbi+xMIIJa2Ku5gKCL8SM60Z87N KJOMJeQnQBjRFkZ4zBxTG6lDwdEdsuG9jPvKXu5d2a/FXcZXvSwtJUmSYy0lMr2A2C82 OhCjHV646ls1c9ysktG8e1t/R+QYwtMS3rl7N+99P5KpgD1nV/1uLSngwDxeiEFUDF19 ml+ZAw6O+ooyuEaGRlyQBVESN44UpSFtbadSApTT+ekWC8qxRlxnhM0Tc5dQojCfBD/W MKQw== X-Gm-Message-State: AOAM533eUjNru3CV0vPK+7gFw15Ss4kBIhRPMcrNqcyC7YivVnRzGyzK gIP0uK93oJz2BsPEsI1yHZ4= X-Received: by 2002:a17:902:8546:: with SMTP id d6mr20334128plo.218.1597867878106; Wed, 19 Aug 2020 13:11:18 -0700 (PDT) Received: from localhost ([184.63.162.180]) by smtp.gmail.com with ESMTPSA id n12sm44536pfj.99.2020.08.19.13.11.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Aug 2020 13:11:17 -0700 (PDT) Date: Wed, 19 Aug 2020 13:11:11 -0700 From: John Fastabend To: Lorenz Bauer , jakub@cloudflare.com, john.fastabend@gmail.com, Daniel Borkmann , Lorenz Bauer , "David S. Miller" , Jakub Kicinski , Alexei Starovoitov Cc: kernel-team@cloudflare.com, netdev@vger.kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org Message-ID: <5f3d875f43b9f_2c9b2adeefb585bcea@john-XPS-13-9370.notmuch> In-Reply-To: <20200819092436.58232-3-lmb@cloudflare.com> References: <20200819092436.58232-1-lmb@cloudflare.com> <20200819092436.58232-3-lmb@cloudflare.com> Subject: RE: [PATCH bpf-next 2/6] bpf: sockmap: merge sockmap and sockhash update functions Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Lorenz Bauer wrote: > Merge the two very similar functions sock_map_update_elem and > sock_hash_update_elem into one. > > Signed-off-by: Lorenz Bauer > --- > net/core/sock_map.c | 53 ++++++++------------------------------------- > 1 file changed, 9 insertions(+), 44 deletions(-) > Fixup the warning, but otherwise Acked-by: John Fastabend