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=-7.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=no 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 429C7C47E48 for ; Thu, 15 Jul 2021 03:48:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 24F5160FEB for ; Thu, 15 Jul 2021 03:48:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233647AbhGODvo (ORCPT ); Wed, 14 Jul 2021 23:51:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47402 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230121AbhGODvn (ORCPT ); Wed, 14 Jul 2021 23:51:43 -0400 Received: from mail-pf1-x42a.google.com (mail-pf1-x42a.google.com [IPv6:2607:f8b0:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 78407C06175F; Wed, 14 Jul 2021 20:48:51 -0700 (PDT) Received: by mail-pf1-x42a.google.com with SMTP id y4so3851187pfi.9; Wed, 14 Jul 2021 20:48:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=x7mKC/lKfardBNYxSwnq2vv33vPUAvQA2chA6+76XEQ=; b=O4/OqJzy1bq370gDmTetx4n+OvioXMR3KvJdiHtDUh++/NN3p+IwDlyrIHNfG260K3 YRGxCx6qHEB/hCeh6UVi6n2dI/BzN6/T87QcG5l44QH0UHYkwkovt8UpFZl2lIKHf/fX UcDws10V9EDZTHpa7psppoCjmPnsx7RxIMh8uM/0kq9wzgXDQ34oLIlc263x3ceuYAjL SQnlbzTJ4EGeT/nqSfVIW25ZtQbT7zPShZpYsu7uTV2A4Tv3ECxlqdfDA/F+dCws1ilj 3IIjvJ4M5UkczqRANyvLp8M6H7Te6+NjupQ0jNr+Hyr5P4nCRHqsU5wlY9SAhYquFESh J4DA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=x7mKC/lKfardBNYxSwnq2vv33vPUAvQA2chA6+76XEQ=; b=bNGAj7yzVID7e+Ct9eAwM1U1nEJbb0rWE0JRbzZE7E6NiWoMflTSgL7pkA3SFJYYCq ldwLFGPn4g1cvS9n8gFxSuCcMVdo6/s33XofY45H0HTwJxSVq5kjUz7dCCK2xp/AJH3O BLblUImeugCTIauyvrjStrfYD8ia2r6GXNxhjWSoDR3YviBtuwip/lf6eYWltr9DTbjk wGGICI7FMV/dmYrIZ80HyvCtcWbA81QAnIE+AzC7Zb7nyI0sVs4Nhl0fU1h0jY3/TRr9 Ha1vQaoj8P5tuV+o7HMS1ldq22PvvSg8LiGwXhDWUJnX01fglLhTqEND2NIoapsYcLO4 fpMg== X-Gm-Message-State: AOAM531TjujqmJAUwI9/INbEds/iVw8BYdmcR13z31c/WF956bfbHGCp LNv2gHBkE8Cf4tKI5092DxJjM4FNibCBrGMHm8k= X-Google-Smtp-Source: ABdhPJwr03NG2N6gqvpdOCjDsSFo9+V/VZgdVCKT5j4B3U5o+aKk62eKtlYIgQnTSAG0sIKby3tCfTi4/ux4f0F6UJE= X-Received: by 2002:a05:6a00:26e5:b029:330:be3:cacd with SMTP id p37-20020a056a0026e5b02903300be3cacdmr2027563pfw.78.1626320930947; Wed, 14 Jul 2021 20:48:50 -0700 (PDT) MIME-Version: 1.0 References: <20210714154750.528206-1-jakub@cloudflare.com> In-Reply-To: <20210714154750.528206-1-jakub@cloudflare.com> From: Cong Wang Date: Wed, 14 Jul 2021 20:48:40 -0700 Message-ID: Subject: Re: [PATCH bpf v2] bpf, sockmap, udp: sk_prot needs inuse_idx set for proc stats To: Jakub Sitnicki Cc: John Fastabend , Daniel Borkmann , Lorenz Bauer , Alexei Starovoitov , Andrii Nakryiko , Linux Kernel Network Developers , bpf Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Wed, Jul 14, 2021 at 8:47 AM Jakub Sitnicki wrote: > > Proc socket stats use sk_prot->inuse_idx value to record inuse sock stats. > We currently do not set this correctly from sockmap side. The result is > reading sock stats '/proc/net/sockstat' gives incorrect values. The > socket counter is incremented correctly, but because we don't set the > counter correctly when we replace sk_prot we may omit the decrement. > > To get the correct inuse_idx value move the core_initcall that initializes > the udp proto handlers to late_initcall. This way it is initialized after > UDP has the chance to assign the inuse_idx value from the register protocol > handler. > > Fixes: edc6741cc660 ("bpf: Add sockmap hooks for UDP sockets") > Acked-by: John Fastabend > Signed-off-by: Jakub Sitnicki Reviewed-by: Cong Wang Thanks for the update!