Received: by 2002:a05:6358:4e97:b0:b3:742d:4702 with SMTP id ce23csp3022111rwb; Mon, 15 Aug 2022 16:19:35 -0700 (PDT) X-Google-Smtp-Source: AA6agR7NuvkBwalvsXlrGLUJBZ0UDiGeUIOHuOZZLP22XU0NY1E+lRhEeWtKjvaR9Wb7THouyoKm X-Received: by 2002:a63:d703:0:b0:41a:8d7a:eb3d with SMTP id d3-20020a63d703000000b0041a8d7aeb3dmr16162375pgg.59.1660605574758; Mon, 15 Aug 2022 16:19:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660605574; cv=none; d=google.com; s=arc-20160816; b=RmiVPDx5YW2fMdQU0hCNHkyxApNfBMt94Dl4eo/8f7NdgKZGZC7h3grW8OjKPj70LA /ZYgqwjxzcoMXDcsx9JjLbVO80F67ItRzEJY4LGmPpgkd+K6BSNTZmgkT6juCndqueE9 yp8462JQT/HC/6CxB2gs1Z5WZU9OA/J0/jvcYwJEYUpub4mD2d6Y24zp+IuIxuHifT/D Kvm/3Jf5tDgWNncihMhsJTiyqVJ7kiMlmOYdZTgRQNV2gl62ueT+BcQ3ShC0XplbXqAQ XQAxCQbD6mv5lIe98PIbnG6KP1TeedtzCtqRdZGXDS5a2atzNBN5rczDyI+8RWZzmY11 1BXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=WRba7lY1H1xkFr8f8JDd/Xuhrtkk6kD2KKbP8X0S3Yc=; b=abGbAJY+dXPVFIdfmYs3PXDhWADWxsDbqJPfskh6xNFyRtqCRuvkowAacBPJ+aP1l2 azmCsILIUpKCWUF6LFzn9tCNT8Fr7w/7jlpNR0xb0lrEbwE+LqZUly8Lq6FsXXX4OsKr TA67nJPFEKkEm/lSGN/3yASSALexqcdQaA1W+7asw1dNUWurypteCONi9W72qqJ+xg+3 QjABqpFjMhfU03lkSVX7UoSo9QTgzMB0jXf+b//x21CgyhmNezpPfPBk70s7HdBEgtK+ QzoaaRznVvYR0OSCAutpSwqpXfGpgx+IPn/sQFGGuLDB43V4eLzKewHw5LnJY/5SN/Y/ xYRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=RiCP3AND; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z13-20020a17090ad78d00b001f328c57d90si17565833pju.59.2022.08.15.16.19.23; Mon, 15 Aug 2022 16:19:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=RiCP3AND; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241402AbiHOVPf (ORCPT + 99 others); Mon, 15 Aug 2022 17:15:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46060 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347993AbiHOVHx (ORCPT ); Mon, 15 Aug 2022 17:07:53 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 493C52AE3E; Mon, 15 Aug 2022 12:17:26 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id B0ACDCE12C7; Mon, 15 Aug 2022 19:17:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 894DCC433C1; Mon, 15 Aug 2022 19:17:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660591043; bh=eZUb+aQMNbV6lZHdXecjaoF0a6s0C00ln2UItW2hTY0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RiCP3ANDcwOSUs6JxbuEuN1unIXAu/bdpIYyrFxo+RtHeoWAzHRvW06+VA52TBtVX fOUHOc49l8gUOC4x5JAwnBHJlzrwuuOw3Tpz8W13+9yjtbmnOhO+lAb9VeuT+VuBwU 1FmySetzoaBrfTg16vwlxgzQS+HczXIeOpZ/KsvA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Milan Landaverde , Andrii Nakryiko , Sasha Levin Subject: [PATCH 5.18 0453/1095] bpftool: Add missing link types Date: Mon, 15 Aug 2022 19:57:32 +0200 Message-Id: <20220815180448.362288232@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220815180429.240518113@linuxfoundation.org> References: <20220815180429.240518113@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Milan Landaverde [ Upstream commit fff3dfab17866f6ac5c5666839f6132b6c52f306 ] Will display the link type names in bpftool link show output Signed-off-by: Milan Landaverde Signed-off-by: Andrii Nakryiko Link: https://lore.kernel.org/bpf/20220331154555.422506-3-milan@mdaverde.com Signed-off-by: Sasha Levin --- tools/bpf/bpftool/link.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/bpf/bpftool/link.c b/tools/bpf/bpftool/link.c index 97dec81950e5..8fb0116f9136 100644 --- a/tools/bpf/bpftool/link.c +++ b/tools/bpf/bpftool/link.c @@ -20,6 +20,9 @@ static const char * const link_type_name[] = { [BPF_LINK_TYPE_CGROUP] = "cgroup", [BPF_LINK_TYPE_ITER] = "iter", [BPF_LINK_TYPE_NETNS] = "netns", + [BPF_LINK_TYPE_XDP] = "xdp", + [BPF_LINK_TYPE_PERF_EVENT] = "perf_event", + [BPF_LINK_TYPE_KPROBE_MULTI] = "kprobe_multi", }; static struct hashmap *link_table; -- 2.35.1