From patchwork Sat Jul 22 07:47:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 124230 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp678561vqg; Sat, 22 Jul 2023 00:56:33 -0700 (PDT) X-Google-Smtp-Source: APBJJlGaDYHH1VRax9ajIkufUDNMP1gBDSdRbwQ1cfpBrN6yqLw45aM3/QPedyhtA+x89tIYCTXi X-Received: by 2002:a50:ec86:0:b0:51e:1858:693a with SMTP id e6-20020a50ec86000000b0051e1858693amr3385623edr.31.1690012593219; Sat, 22 Jul 2023 00:56:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690012593; cv=none; d=google.com; s=arc-20160816; b=bRohsaHo+Qv6vifrYr+/YQzdxUxRGn0dazLagYCxV/lX8tgjR75axCqHVptzA4mS8b niYD93BNTjKhxqrgatsDZXehcauNzND1bcGnvydqDfXx8xWd/smA6DZxJMJ4+/EGhCEZ Q9vBWxU0DUMIRa/W2Od0q9UG+lk+RmW6wrREKlR6X38qINal/vy0g9r52ZIM+Ubwfdwa AchjarGeXWxGzQTYpk6PcTKORf2FnvpcnbjiU7J/1RxFqKKMkjRWKUH0fcqEkF4E7jJZ RRF/YxAbF1JCAiz96sr61yME5GEvyg/6Hvlp+KwzJDxxuDQotbVfDTeX9t9LtcKBxqO6 ILVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=OdAax6y1uOCyCmGv7I0BcTzo2TNpDSMP38eL9Kd2TKg=; fh=kw9j8wzGMzsBY2Au+7RzP5doXADIRuoiRE2fCu2Zxr8=; b=FzrOGcXAxnZHIOeIBoiKLqMUsp0Z6JRV4tmeWxioKUoQgixMJAYMmRgp2QylDIxTGx 4XHDGEPktugQ54iUzxlRVkWQhnVw3ZcDZW7gjejpd0Xd0lZKxyLQIJgday8KANc61omS kbIqmT5o1pxxvF+d8Cbf63w/i4STS+I8XgsWvhgoWz20xXP/DeJfqqiFlAFSWmUu+PTt BI/MIuDmHP3oaK3F19Q9jCwe8/MmC+HUYPvyU5e9QKbRWvAim7aebA3D/z9uWgC6swWa /9dJkikqKV5ktSy0kpuh8jDYhVFdvADondMZULdJGnrU8mlbdd762JPfPnD2ueoRcIBl +X4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Kj9zb2QV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i26-20020aa7c9da000000b0051e27ecdd08si3386486edt.114.2023.07.22.00.56.09; Sat, 22 Jul 2023 00:56:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Kj9zb2QV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 S231322AbjGVHtQ (ORCPT + 99 others); Sat, 22 Jul 2023 03:49:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33090 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231318AbjGVHtP (ORCPT ); Sat, 22 Jul 2023 03:49:15 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 87BBA3C3D for ; Sat, 22 Jul 2023 00:48:39 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 941496010F for ; Sat, 22 Jul 2023 07:48:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9A43DC433C8; Sat, 22 Jul 2023 07:47:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1690012082; bh=6MQ29HDi9RobghOfq9ww6P1ehrV7jdzcjLwHNnWU8TY=; h=From:To:Cc:Subject:Date:From; b=Kj9zb2QV2XUlO6ArJk7Um1dVjnJix123wkWielmwHI1G12aNiMOftnyppaawHQ2Ev 9QihLXgFdtBBVHkdUPcfxtp1WVr9oya/sDbZZHbv5Kb0KTENPsRQoJpiK84Nf9JszY aSsTkzZicl1F5DjvqaDwI9SkAjwEaPqXUptOLRt+EbkNT4pzyFXhdl5Cyn8e/gkXum e76D0qNn7Zm3o1CUc/bhEHQtKDqPC4tV5gIUdbrXCZmma6fqI8R8SpEqaQeIK8ZVYJ HoNqbHSk/r12c+HB/7bmVVjDFGFtClCwxaOpVGUlPJlPNz0x5ot1ozRxr9xlTQOSuh fZztE9O4HIqIg== From: Arnd Bergmann To: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Hou Tao Cc: Arnd Bergmann , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Kumar Kartikeya Dwivedi , bpf@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] bpf: force inc_active()/dec_active() to be inline functions Date: Sat, 22 Jul 2023 09:47:44 +0200 Message-Id: <20230722074753.568696-1-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772106644922369477 X-GMAIL-MSGID: 1772106644922369477 From: Arnd Bergmann Splitting these out into separate helper functions means that we actually pass an uninitialized variable into another function call if dec_active() happens to not be inlined, and CONFIG_PREEMPT_RT is disabled: kernel/bpf/memalloc.c: In function 'add_obj_to_free_list': kernel/bpf/memalloc.c:200:9: error: 'flags' is used uninitialized [-Werror=uninitialized] 200 | dec_active(c, flags); Mark the two functions as __always_inline so gcc can see through this regardless of optimizations and other options that may prevent it otherwise. Fixes: 18e027b1c7c6d ("bpf: Factor out inc/dec of active flag into helpers.") Signed-off-by: Arnd Bergmann --- kernel/bpf/memalloc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/bpf/memalloc.c b/kernel/bpf/memalloc.c index 51d6389e5152e..23906325298da 100644 --- a/kernel/bpf/memalloc.c +++ b/kernel/bpf/memalloc.c @@ -165,7 +165,7 @@ static struct mem_cgroup *get_memcg(const struct bpf_mem_cache *c) #endif } -static void inc_active(struct bpf_mem_cache *c, unsigned long *flags) +static __always_inline void inc_active(struct bpf_mem_cache *c, unsigned long *flags) { if (IS_ENABLED(CONFIG_PREEMPT_RT)) /* In RT irq_work runs in per-cpu kthread, so disable @@ -183,7 +183,7 @@ static void inc_active(struct bpf_mem_cache *c, unsigned long *flags) WARN_ON_ONCE(local_inc_return(&c->active) != 1); } -static void dec_active(struct bpf_mem_cache *c, unsigned long flags) +static __always_inline void dec_active(struct bpf_mem_cache *c, unsigned long flags) { local_dec(&c->active); if (IS_ENABLED(CONFIG_PREEMPT_RT))