From patchwork Sat Jan 26 17:26:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiong Wang X-Patchwork-Id: 1031479 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=netronome.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="L5KRGJBi"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43n2r60NJMz9s55 for ; Sun, 27 Jan 2019 04:26:46 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726357AbfAZR02 (ORCPT ); Sat, 26 Jan 2019 12:26:28 -0500 Received: from mail-wm1-f68.google.com ([209.85.128.68]:55075 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726089AbfAZR01 (ORCPT ); Sat, 26 Jan 2019 12:26:27 -0500 Received: by mail-wm1-f68.google.com with SMTP id a62so9644360wmh.4 for ; Sat, 26 Jan 2019 09:26:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=8KIBcP5/7OU5Moyii/iDeDY32vL+GO+PGxOlGfOGi3o=; b=L5KRGJBig3hEuSiU34Z3Ifd/EXa/wuIQkpAAXKF2lo9/w/2K21tjitSAlTjuofEEMe 7qgHbcpwcBPL3N+Tt+WvFE32VQGIfojzi7f+85ixkeoIIEAJwJC9SKiu0ZjqqS3n/mGq vLwBdTJJqk7MLedKu0dHPk6sIrtMOZZgMQiPP8h4a+F1qVLGMBM/Vpcu7C5hVB4SLRaO LYYAUP0ixTBIXYOUUC8b7EC44rvS1qDfLrZXyiJ6Wv6Mmm/3gcXVajaHWuv1g0/f+BZY llIm2PegVwmYQO4Tnr6AsD9haa/i/ZcRjnYgEJqGa2Xl+GTR7Vm9pT/K1Lv9GcguVtFE JKmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=8KIBcP5/7OU5Moyii/iDeDY32vL+GO+PGxOlGfOGi3o=; b=U/N5gP0J2Ydv99K4KKk3+O7l2mg9EvC8mVRIQcu5pjcA95nL+VTHkxwuAeQz/KxOWq sVvog30aufUmnv7/6Vb4/MYKo8eJJonuooBLYO4F8vx6seVXbQ02SVxwTCMcNvzv/5XI aLGGx6UgCZXPZt7Mm/QLscsnolLvauoERxYY3lhl12g2Nhq0cLTlyNmivs6TQoDZcfIS BtjagCaLybCzqdC6Y+ZbFJh2bOWt1V+T+wozqpG2ef0QnBpbT7gNQ0j8eNLVW44PWGBI /gILgi3H1jG8VT1eGr8y56rwFZo2tT3cO4b+5UWwJ8O2VN2BnB7/wpyE3FlZ4uinPKZt D0pw== X-Gm-Message-State: AJcUukcdhV24gFuN/KCAv6C1PBvG6DcNC/7mkaWWPE9bhovaCuz/SHeG QqbTqodAZ6Ym95s3b+c6zd4v3P92Yd8= X-Google-Smtp-Source: ALg8bN5GuuNOAapeUjrXDLZFq3EZjGykUqGb+MEf8kZwghq+JpDfKV+lC/7SrOqlqwQF0I261A+Nnw== X-Received: by 2002:a1c:6657:: with SMTP id a84mr10329537wmc.23.1548523585006; Sat, 26 Jan 2019 09:26:25 -0800 (PST) Received: from cbtest28.netronome.com ([217.38.71.146]) by smtp.gmail.com with ESMTPSA id g188sm84426444wmf.32.2019.01.26.09.26.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 26 Jan 2019 09:26:23 -0800 (PST) From: Jiong Wang To: ast@kernel.org, daniel@iogearbox.net Cc: netdev@vger.kernel.org, oss-drivers@netronome.com, Jiong Wang Subject: [PATCH bpf-next v4 05/16] tools: bpftool: teach cfg code about JMP32 Date: Sat, 26 Jan 2019 12:26:03 -0500 Message-Id: <1548523574-18316-6-git-send-email-jiong.wang@netronome.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1548523574-18316-1-git-send-email-jiong.wang@netronome.com> References: <1548523574-18316-1-git-send-email-jiong.wang@netronome.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The cfg code need to be aware of the new JMP32 instruction class so it could partition functions correctly. Reviewed-by: Jakub Kicinski Signed-off-by: Jiong Wang --- tools/bpf/bpftool/cfg.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/bpf/bpftool/cfg.c b/tools/bpf/bpftool/cfg.c index 31f0db4..3e21f99 100644 --- a/tools/bpf/bpftool/cfg.c +++ b/tools/bpf/bpftool/cfg.c @@ -157,6 +157,11 @@ static bool cfg_partition_funcs(struct cfg *cfg, struct bpf_insn *cur, return false; } +static bool is_jmp_insn(u8 code) +{ + return BPF_CLASS(code) == BPF_JMP || BPF_CLASS(code) == BPF_JMP32; +} + static bool func_partition_bb_head(struct func_node *func) { struct bpf_insn *cur, *end; @@ -170,7 +175,7 @@ static bool func_partition_bb_head(struct func_node *func) return true; for (; cur <= end; cur++) { - if (BPF_CLASS(cur->code) == BPF_JMP) { + if (is_jmp_insn(cur->code)) { u8 opcode = BPF_OP(cur->code); if (opcode == BPF_EXIT || opcode == BPF_CALL) @@ -296,7 +301,7 @@ static bool func_add_bb_edges(struct func_node *func) e->src = bb; insn = bb->tail; - if (BPF_CLASS(insn->code) != BPF_JMP || + if (!is_jmp_insn(insn->code) || BPF_OP(insn->code) == BPF_EXIT) { e->dst = bb_next(bb); e->flags |= EDGE_FLAG_FALLTHROUGH;