From patchwork Wed Jul 12 08:47:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Menglong Dong X-Patchwork-Id: 13309830 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F108CEB64DD for ; Wed, 12 Jul 2023 08:51:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=1lOLb8p+QMy1jFR2Cx4BBMMEGFR3ywQUAAoLJ/Yj12c=; b=G/vhwQC79JUB6M hzK6PfWaPNMrw71NJStM4F6mj2vwuaYFAYMTzKm90wkO5ZMzVM4IeG4Wx292Z/7PIc7jMvxemAQoh VOaj2mswsUrX2nbN4+Ev/5G+aAkHPsEGawD4kAvh2gsN50VF4f4NlyeJp44rZZofRh29BV0I8q2H3 noEAsxgq07KmjUTm1Zzr1Gg6IguIANvISlVDSFs7WS7kh5lsF5CHqeYlUCoTHaJYspG8LdWCZ1gOO NwrNX+9V71/gBgoZ5UB/bBrCmZk2f8/z7UW3u04DwKxSDhnKWi39ftZ4w8rajfoaarzwRnuxFtTTO 2Wsz8rvbVZ9ggq2xm4Cg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qJVYU-00GxY7-0J; Wed, 12 Jul 2023 08:50:38 +0000 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qJVYL-00GxX8-2Q for linux-arm-kernel@lists.infradead.org; Wed, 12 Jul 2023 08:50:34 +0000 Received: by mail-pf1-x444.google.com with SMTP id d2e1a72fcca58-66f5faba829so3956228b3a.3 for ; Wed, 12 Jul 2023 01:50:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689151829; x=1691743829; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=iRO0VgQOKWIhyr12EjEvkzc4obUWhSgU/tP39Q4+6M8=; b=sLD6dBsFzbwHQu73JiQ5cWZfI7lpzpaK7S6gmSbXndbWIcK7SqlTsfJ4LEi497owC7 GJ1v602MxZgovBtLFlDQPp+RBWaCcufF7ardUBT1dgf3B5Pb545KexnOKBnXDzV43S7I 3nz4CexqLzJID288uCjaVOagN2l6s3zZdIfHvlqZNFyukTcPKdCfuc7WHpeUCjDzJba4 KGxixA7v43/6pLmHc0TFJ8YxvTgZMz8YzNnnKez6rgDPTBYjd4yiCaDahiqDvZgpREvk kMiXBp306D95fTDGFAGubeJMAQhMbbOvcSHKkKQO7fYhGuQMJXkN2VKfTiLGKQu2NegI Y/8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689151829; x=1691743829; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=iRO0VgQOKWIhyr12EjEvkzc4obUWhSgU/tP39Q4+6M8=; b=dILnz6KPrFQKD8EmjMZNvK+hvpAvvzLLrlpjKhYujitdQjf89Ovk0/mjPLiXSvAtQC DmbvVSRDWO+8XDcQmGBt/Z1GCIDDA+g/Xm7Ctvaulky1di8JKvG6HGdJnh85iAO706Jx 1bhDVXXFt0hQZqyCKtCbLvjKLaNC9FtwueeG/VdiUcxYiiCA1S41/Nw+Gq0hhl2HfepF qIVpOucdsw3vlsCzCShCdVeVEATt3hpZnxNxvaH0l47ZsrBZaiuYzR0apwfITGL9MFRw gvAKG3HEtwmkSL0CH0xWqDY/+U+aE6IwaLMzTS82exlKraM0VU9e5XIDDBAa8TiYYNY3 O8SQ== X-Gm-Message-State: ABy/qLYhdo9qve2Bq2m+d2U3Ms+TimYrhHBuf5TQJHdFjMqTFS6Devvg K1fdNY6LH4dmMBlOfWPzFbo= X-Google-Smtp-Source: APBJJlHCWYQv/x7sE+wUc45XH1ysEpDi6GYGaj7tVfAE+HAS1MTs9PfdEVJU7q4sXyaRC/y1p/5yDA== X-Received: by 2002:a05:6a00:198f:b0:67e:18c6:d2db with SMTP id d15-20020a056a00198f00b0067e18c6d2dbmr15716475pfl.28.1689151828855; Wed, 12 Jul 2023 01:50:28 -0700 (PDT) Received: from localhost.localdomain ([203.205.141.11]) by smtp.gmail.com with ESMTPSA id e26-20020a62aa1a000000b006749c22d079sm3037066pff.167.2023.07.12.01.50.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jul 2023 01:50:28 -0700 (PDT) From: menglong8.dong@gmail.com X-Google-Original-From: imagedong@tencent.com To: yhs@meta.com, daniel@iogearbox.net, alexei.starovoitov@gmail.com Cc: ast@kernel.org, andrii@kernel.org, martin.lau@linux.dev, song@kernel.org, yhs@fb.com, john.fastabend@gmail.com, kpsingh@kernel.org, sdf@google.com, haoluo@google.com, dsahern@kernel.org, jolsa@kernel.org, x86@kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Menglong Dong Subject: [PATCH bpf-next v9 0/3] bpf, x86: allow function arguments up to 12 for TRACING Date: Wed, 12 Jul 2023 16:47:43 +0800 Message-Id: <20230712084746.833965-1-imagedong@tencent.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230712_015029_812649_D452A95E X-CRM114-Status: GOOD ( 21.70 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Menglong Dong For now, the BPF program of type BPF_PROG_TYPE_TRACING can only be used on the kernel functions whose arguments count less than or equal to 6, if not considering '> 8 bytes' struct argument. This is not friendly at all, as too many functions have arguments count more than 6. According to the current kernel version, below is a statistics of the function arguments count: argument count | function count 7 | 704 8 | 270 9 | 84 10 | 47 11 | 47 12 | 27 13 | 22 14 | 5 15 | 0 16 | 1 Therefore, let's enhance it by increasing the function arguments count allowed in arch_prepare_bpf_trampoline(), for now, only x86_64. In the 1st patch, we save/restore regs with BPF_DW size to make the code in save_regs()/restore_regs() simpler. In the 2nd patch, we make arch_prepare_bpf_trampoline() support to copy function arguments in stack for x86 arch. Therefore, the maximum arguments can be up to MAX_BPF_FUNC_ARGS for FENTRY, FEXIT and MODIFY_RETURN. Meanwhile, we clean the potential garbage value when we copy the arguments on-stack. And the 3rd patch is for the testcases of the this series. Changes since v8: - change the way to test fmod_ret in the 3rd patch Changes since v7: - split the testcases, and add fentry_many_args/fexit_many_args to DENYLIST.aarch64 in 3rd patch Changes since v6: - somit nits from commit message and comment in the 1st patch - remove the inline in get_nr_regs() in the 1st patch - rename some function and various in the 1st patch Changes since v5: - adjust the commit log of the 1st patch, avoiding confusing people that bugs exist in current code - introduce get_nr_regs() to get the space that used to pass args on stack correct in the 2nd patch - add testcases to tracing_struct.c instead of fentry_test.c and fexit_test.c Changes since v4: - consider the case of the struct in arguments can't be hold by regs - add comment for some code - add testcases for MODIFY_RETURN - rebase to the latest Changes since v3: - try make the stack pointer 16-byte aligned. Not sure if I'm right :) - introduce clean_garbage() to clean the grabage when argument count is 7 - use different data type in bpf_testmod_fentry_test{7,12} - add testcase for grabage values in ctx Changes since v2: - keep MAX_BPF_FUNC_ARGS still - clean garbage value in upper bytes in the 2nd patch - move bpf_fentry_test{7,12} to bpf_testmod.c and rename them to bpf_testmod_fentry_test{7,12} meanwhile in the 3rd patch Changes since v1: - change the maximun function arguments to 14 from 12 - add testcases (Jiri Olsa) - instead EMIT4 with EMIT3_off32 for "lea" to prevent overflow Menglong Dong (3): bpf, x86: save/restore regs with BPF_DW size bpf, x86: allow function arguments up to 12 for TRACING selftests/bpf: add testcase for TRACING with 6+ arguments arch/x86/net/bpf_jit_comp.c | 246 +++++++++++++++--- net/bpf/test_run.c | 14 +- tools/testing/selftests/bpf/DENYLIST.aarch64 | 2 + .../selftests/bpf/bpf_testmod/bpf_testmod.c | 49 +++- .../selftests/bpf/prog_tests/fentry_test.c | 43 ++- .../selftests/bpf/prog_tests/fexit_test.c | 43 ++- .../selftests/bpf/prog_tests/modify_return.c | 13 +- .../selftests/bpf/prog_tests/tracing_struct.c | 19 ++ .../selftests/bpf/progs/fentry_many_args.c | 39 +++ .../selftests/bpf/progs/fexit_many_args.c | 40 +++ .../selftests/bpf/progs/modify_return.c | 40 +++ .../selftests/bpf/progs/tracing_struct.c | 54 ++++ 12 files changed, 545 insertions(+), 57 deletions(-) create mode 100644 tools/testing/selftests/bpf/progs/fentry_many_args.c create mode 100644 tools/testing/selftests/bpf/progs/fexit_many_args.c