From patchwork Fri Jan 25 00:10:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiong Wang X-Patchwork-Id: 1030735 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="ryLHlhAH"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43lzwV0nxsz9s4s for ; Fri, 25 Jan 2019 11:11:54 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728137AbfAYALx (ORCPT ); Thu, 24 Jan 2019 19:11:53 -0500 Received: from mail-wr1-f66.google.com ([209.85.221.66]:45003 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726517AbfAYALw (ORCPT ); Thu, 24 Jan 2019 19:11:52 -0500 Received: by mail-wr1-f66.google.com with SMTP id z5so8419264wrt.11 for ; Thu, 24 Jan 2019 16:11:50 -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=ryLHlhAHBC8kJHdFvnWKv+tY7TWuV4ngC8DWUlicZxC97em7Lr1aM2lbvsKoYQ5TT4 SUZcoKdywD9JEzAt0NHlyt5ioVHed+oAwqDqP7s1Xwx6E4iKY2KnhJaUqllCE8hXQiTt Tbkcd9mHS6aICp4nZzHEYpwXkN1UYKd0PlpqKaAG9blJ9kZ1CzdFRNzaEsnYxzkAFYOD J76Y9KSUl/JwX+hm0Vj0nrA1XTzPAo6rYD4lFws2j4VOKi6VLR8YgWcZ//B1j/UnKU3Z S+AghC0Vji5iNRCC2q+Bwt5zS5EPKXRqo6OGQ8AEe2HK6gXNLxqy0u5zRiGrOcQCMohz C4YA== 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=Iv8DW/KqSKBKKDeL1gPOcKDfwzbsCci71kFI7Lf2XurzA6LycJbuAuIgZy3WhONnTP UMBisJZXU2zL+p3fxt6IMSq9zvM1HQWi77fejlMpFY7SlVTE3qokBGHNXl6ztpbgJQcd wDTPuAgAMxzaWZYoEuW81ioU53FrThkB9FnviR8CVy9VNHtXRFfmcBX29TeWQvjkWLx8 NOErwFt8eXKqz5+c/9j8Upg+wWq6r/qORS0p/dpz4IZKAyR7xvqYsRcHF5vRrE60n93k +tTLeCW4pRzzEXdCr4bajdXsWEyUBdwt0QY5x20DSMg1R2yoInO80r6MZYAVISQjGsFp /Aaw== X-Gm-Message-State: AJcUukdqTVc3DKlmYm+t6VQWJFlOyWzqkyPNXU84STQlVUhaX9eQjpsj zyBfsaF/kE1Q+kR5eMrlqjiZxw== X-Google-Smtp-Source: ALg8bN5ffBjp8PMmywvA/aTIPP1jJikg0oN+wfqT7+nC26J8rm5WtnFvlQS/3mi6/OjKXP5TsF2KPA== X-Received: by 2002:adf:e149:: with SMTP id f9mr9875634wri.42.1548375110191; Thu, 24 Jan 2019 16:11:50 -0800 (PST) Received: from cbtest28.netronome.com ([217.38.71.146]) by smtp.gmail.com with ESMTPSA id y138sm71273216wmc.16.2019.01.24.16.11.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 24 Jan 2019 16:11:49 -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 v3 05/16] tools: bpftool: teach cfg code about JMP32 Date: Thu, 24 Jan 2019 19:10:17 -0500 Message-Id: <1548375028-8308-6-git-send-email-jiong.wang@netronome.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1548375028-8308-1-git-send-email-jiong.wang@netronome.com> References: <1548375028-8308-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;