From patchwork Mon Jan 21 13:15:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiong Wang X-Patchwork-Id: 1028643 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="YklOCY1j"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43jsWQ3F8wz9s7h for ; Tue, 22 Jan 2019 00:16:18 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728764AbfAUNQR (ORCPT ); Mon, 21 Jan 2019 08:16:17 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:39547 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728728AbfAUNQQ (ORCPT ); Mon, 21 Jan 2019 08:16:16 -0500 Received: by mail-wm1-f67.google.com with SMTP id y8so10686460wmi.4 for ; Mon, 21 Jan 2019 05:16:15 -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=YklOCY1jyKlugi984C/RGP/e4lA7+QaSDkbtcR7pdmvSlNa5ipQQ1jRrFqqCs/gwLs 4cgTKQRzd4CXnGgQFLSLcK8MxlNMVPcZCfBx230PvkllQapi4oRE4MmqDetmxu5vxZl2 4AJghjQlQ93dtbA/IaXWERST6XUiXg8iYrsdxWgdKe/mz+kWjlaOXCqixM0u+NhI/fVG EoRvJEOfcl2H8Ci+ZgVjUn0Lgd0DfpcaUI93YTaLWnRlNfGZSVdSBAUWdM9sKtgjrzU/ bSQ9x4qnBtGzt3Or0JrhUAo+XblhKjoSqWTRQ6S4dxgYr1JOj3juJOLFjz/pGRc/SPhw E1Vg== 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=S/dv2P3GHMa3JeRfJ9nqv0W7vyXNqZSqgxf1AuEZKNTXQxgR0cTyT+hAQmpiVfPbY6 p1FBMnAVRZQKx3TsdidRkLplkf//wMrP/cLOkdjc7/2HfXDgY82QVrAOBfPtiXyEd3Gw GgJBu2OGRme/z9IP1teDz7D0MCW7bcDV57QhYVgpOXSoFZvsYFsNzx1D4ITM2iixDKzq kb/p8zXlLw9KFmOaXIUKYjPVKM7//CmQgL8BXd+lBJzL/LHnLOee7SJwrP92R/CpJWfq MGy5PZWqE0cxT+C024x3hAbcV5M9S0kXi0gVtyM/etfPZKhau3QaHTsgnKByFZzhgY0Y FT4g== X-Gm-Message-State: AJcUukept7el/grYhcvDCe/eMKQbqdmC8Pv7Prer2n1uT4B2OB3SZB4k ZNm5pcgrK1ncv0GeH97KVQV8sg== X-Google-Smtp-Source: ALg8bN5TXeS1ukt3iPWgHycJfjAE9K5PqDy3bP57+N7HtLOkvZe3F6wW8reCzcjharctqYNiTy9uoQ== X-Received: by 2002:a1c:1902:: with SMTP id 2mr8933698wmz.150.1548076574400; Mon, 21 Jan 2019 05:16:14 -0800 (PST) Received: from cbtest28.netronome.com ([217.38.71.146]) by smtp.gmail.com with ESMTPSA id a12sm100591936wro.18.2019.01.21.05.16.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 21 Jan 2019 05:16:13 -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 v2 05/16] tools: bpftool: teach cfg code about JMP32 Date: Mon, 21 Jan 2019 08:15:42 -0500 Message-Id: <1548076553-31268-6-git-send-email-jiong.wang@netronome.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1548076553-31268-1-git-send-email-jiong.wang@netronome.com> References: <1548076553-31268-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;