Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp3322824pxu; Tue, 15 Dec 2020 04:24:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJyhhvkcNqN/nC4VuOAjCXXibkBsykhKejNKpywebwSmfoUL3Tl1VVmpWpgMXyx0X+ubSVf0 X-Received: by 2002:a17:906:878d:: with SMTP id za13mr26469218ejb.395.1608035067438; Tue, 15 Dec 2020 04:24:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1608035067; cv=none; d=google.com; s=arc-20160816; b=s5r43gX8fpK3kgJ+i1NgoDTrBX9SRMYt3MdWpDU/5Lz6vibNds04kcKOp6dKXnw1sQ hII8H5D5X05s6V94Y8fJV6g9FXmF67u9jZwrzORjNJgsMi/W8y4Cp+LaOADgr80LTHLP jXaZ+h3zvAoKKcwvHAbR3XSsuWmlGZEu6UqWcdgMiBbLUZ0QHONBwgq3X0jdR3IWeOg9 rPauMvBTndj2GwbbN7ZMUX/tAIQHMUhI3nYhlvq92Ra2CRW2uJvPCtXlBD6NE/le5ouE nyMisdZaI48AOMV4lU9F2OM0q6Aj/2/5Aaj1aG5yvuLN5wta2ag/jI362PX8W1520I71 trYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:references:mime-version :message-id:in-reply-to:date:sender:dkim-signature; bh=GfOHg26UfN7htR+y5ZGUHFu1Y2LwTx5ym50n7DLpgdc=; b=pFpzZcn+2Z8j4RPziyXTsq2GhvhdZZUZoioo/jDFxwx3pDUUyWzsTtC5j6l988JpHg 4w9H6Zu/M4v+TSzw7Kx9fz/IuVCe7G3yrkqSXhHWq5xVbgL2EOIhNgL2cUksvYW+aZrp e+31bTXI8T0d1/oJI2oQC4wt1rX28ZViOTGc6N4lu9gfU6merKLmZEhKzbV+JkmiOFvg uUvtMjNhdSpLWN4dXQZQsj9IAzpQbiFibaNXJIO9Mf8rI3qP6d/lz+IubntpyxLSBSbJ BHxsebqKTCQQthmTkIxZXzO2HKBlzJWsFOh6omm0dQ8z3PtvgednkJi3ENYpF8Nqgcdv roEw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=LkEd+cbX; 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=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id lw27si762739ejb.35.2020.12.15.04.24.04; Tue, 15 Dec 2020 04:24:27 -0800 (PST) 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=@google.com header.s=20161025 header.b=LkEd+cbX; 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=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729313AbgLOMUZ (ORCPT + 99 others); Tue, 15 Dec 2020 07:20:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50380 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729248AbgLOMUE (ORCPT ); Tue, 15 Dec 2020 07:20:04 -0500 Received: from mail-wm1-x34a.google.com (mail-wm1-x34a.google.com [IPv6:2a00:1450:4864:20::34a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BD6DCC0619D2 for ; Tue, 15 Dec 2020 04:18:43 -0800 (PST) Received: by mail-wm1-x34a.google.com with SMTP id g198so4554224wme.7 for ; Tue, 15 Dec 2020 04:18:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=GfOHg26UfN7htR+y5ZGUHFu1Y2LwTx5ym50n7DLpgdc=; b=LkEd+cbXxHgsj2GfpBjcoW7u5Z5fe8BDFz2UK4YL4Xn1U8VzWplUBXUzYoirUHs8IY N6tiBP3aqtPwNIAG/7ZydfCZzOARstKw9zPAa8n/U2nzy5U7SdkU+KrvlgyuDVRabrAs tdDAt9i7A1IFDnkji+myd/R4P1E4pegZQdeaGcmV2ODqjrvLfauroIjcGR2+GlKW0Tfi D8NDyk5b62oqAjlaREv1odqT9YQNYsv/1jxAOp9RHCfttn0Y/RM/pHTbUqsi2U2jVVKa 4KIN9Ns15ep7YeeDBrD4XmDXl0FU9QNVcESdhXO41dLxTYhTSCRpXfN/XEkeZFqSDlrD +cUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=GfOHg26UfN7htR+y5ZGUHFu1Y2LwTx5ym50n7DLpgdc=; b=ESKRM6nTH4JosZa8VcXV41eaDmXsvnZSTVtzCFB7Mb7pq14xM4Nh0eCCoQ7vneUkM1 gBx+kO5ZGZ0YcLAwD7XNP0oLYsTc50cfMX2g8fAtmyaSOZ69JF0lapmi1pWcWdnQ/wra 3K6QU6jdVYUHEkQmCvhCL/0im2vQUPwMdp8gMj5zvsGigKeqPIiaj7XpDzJyD9GY0VnO 3CHekrZDWFE74Z3jisd0SB4cEkW+Xyd2OSxBooyTxy+4VOka5W9868urkgUzwRXHRTeT +XVpPJVS3oPmJwvBvk0oEs2e2JFPDqdr4t6QdY9MSXt8Bi/j6QzWs1fD9Aql4TP+GaF3 UWkQ== X-Gm-Message-State: AOAM531HCyp7B3C/MAXieow9FAhcXtiDuoniYlsLv8iwpNx/Q/59GHWd hAB/HVG8/tpReK4GvZM46wrNUQC973Dgvw== Sender: "jackmanb via sendgmr" X-Received: from beeg.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:11db]) (user=jackmanb job=sendgmr) by 2002:a05:600c:2246:: with SMTP id a6mr32653097wmm.80.1608034722508; Tue, 15 Dec 2020 04:18:42 -0800 (PST) Date: Tue, 15 Dec 2020 12:18:13 +0000 In-Reply-To: <20201215121816.1048557-1-jackmanb@google.com> Message-Id: <20201215121816.1048557-10-jackmanb@google.com> Mime-Version: 1.0 References: <20201215121816.1048557-1-jackmanb@google.com> X-Mailer: git-send-email 2.29.2.684.gfbc64c5ab5-goog Subject: [PATCH bpf-next v5 08/11] bpf: Pull out a macro for interpreting atomic ALU operations From: Brendan Jackman To: bpf@vger.kernel.org Cc: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , KP Singh , Florent Revest , linux-kernel@vger.kernel.org, Brendan Jackman , Yonghong Song Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since the atomic operations that are added in subsequent commits are all isomorphic with BPF_ADD, pull out a macro to avoid the interpreter becoming dominated by lines of atomic-related code. Note that this sacrificies interpreter performance (combining STX_ATOMIC_W and STX_ATOMIC_DW into single switch case means that we need an extra conditional branch to differentiate them) in favour of compact and (relatively!) simple C code. Acked-by: Yonghong Song Signed-off-by: Brendan Jackman --- kernel/bpf/core.c | 80 +++++++++++++++++++++++------------------------ 1 file changed, 39 insertions(+), 41 deletions(-) diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c index 4f22cff4491e..7b52affc5bd8 100644 --- a/kernel/bpf/core.c +++ b/kernel/bpf/core.c @@ -1618,55 +1618,53 @@ static u64 ___bpf_prog_run(u64 *regs, const struct bpf_insn *insn, u64 *stack) LDX_PROBE(DW, 8) #undef LDX_PROBE - STX_ATOMIC_W: - switch (IMM) { - case BPF_ADD: - /* lock xadd *(u32 *)(dst_reg + off16) += src_reg */ - atomic_add((u32) SRC, (atomic_t *)(unsigned long) - (DST + insn->off)); - break; - case BPF_ADD | BPF_FETCH: - SRC = (u32) atomic_fetch_add( - (u32) SRC, - (atomic_t *)(unsigned long) (DST + insn->off)); - break; - case BPF_XCHG: - SRC = (u32) atomic_xchg( - (atomic_t *)(unsigned long) (DST + insn->off), - (u32) SRC); - break; - case BPF_CMPXCHG: - BPF_R0 = (u32) atomic_cmpxchg( - (atomic_t *)(unsigned long) (DST + insn->off), - (u32) BPF_R0, (u32) SRC); +#define ATOMIC_ALU_OP(BOP, KOP) \ + case BOP: \ + if (BPF_SIZE(insn->code) == BPF_W) \ + atomic_##KOP((u32) SRC, (atomic_t *)(unsigned long) \ + (DST + insn->off)); \ + else \ + atomic64_##KOP((u64) SRC, (atomic64_t *)(unsigned long) \ + (DST + insn->off)); \ + break; \ + case BOP | BPF_FETCH: \ + if (BPF_SIZE(insn->code) == BPF_W) \ + SRC = (u32) atomic_fetch_##KOP( \ + (u32) SRC, \ + (atomic_t *)(unsigned long) (DST + insn->off)); \ + else \ + SRC = (u64) atomic64_fetch_##KOP( \ + (u64) SRC, \ + (atomic64_t *)(unsigned long) (DST + insn->off)); \ break; - default: - goto default_label; - } - CONT; STX_ATOMIC_DW: + STX_ATOMIC_W: switch (IMM) { - case BPF_ADD: - /* lock xadd *(u64 *)(dst_reg + off16) += src_reg */ - atomic64_add((u64) SRC, (atomic64_t *)(unsigned long) - (DST + insn->off)); - break; - case BPF_ADD | BPF_FETCH: - SRC = (u64) atomic64_fetch_add( - (u64) SRC, - (atomic64_t *)(unsigned long) (DST + insn->off)); - break; + ATOMIC_ALU_OP(BPF_ADD, add) +#undef ATOMIC_ALU_OP + case BPF_XCHG: - SRC = (u64) atomic64_xchg( - (atomic64_t *)(unsigned long) (DST + insn->off), - (u64) SRC); + if (BPF_SIZE(insn->code) == BPF_W) + SRC = (u32) atomic_xchg( + (atomic_t *)(unsigned long) (DST + insn->off), + (u32) SRC); + else + SRC = (u64) atomic64_xchg( + (atomic64_t *)(unsigned long) (DST + insn->off), + (u64) SRC); break; case BPF_CMPXCHG: - BPF_R0 = (u64) atomic64_cmpxchg( - (atomic64_t *)(unsigned long) (DST + insn->off), - (u64) BPF_R0, (u64) SRC); + if (BPF_SIZE(insn->code) == BPF_W) + BPF_R0 = (u32) atomic_cmpxchg( + (atomic_t *)(unsigned long) (DST + insn->off), + (u32) BPF_R0, (u32) SRC); + else + BPF_R0 = (u64) atomic64_cmpxchg( + (atomic64_t *)(unsigned long) (DST + insn->off), + (u64) BPF_R0, (u64) SRC); break; + default: goto default_label; } -- 2.29.2.684.gfbc64c5ab5-goog