From patchwork Wed Aug 7 00:19:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 1143075 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: incoming-bpf@patchwork.ozlabs.org Delivered-To: patchwork-incoming-bpf@bilbo.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=bpf-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="xE9bl7Cw"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 463Bvt3T9vz9sNm for ; Wed, 7 Aug 2019 10:19:38 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726612AbfHGATg (ORCPT ); Tue, 6 Aug 2019 20:19:36 -0400 Received: from mail-qk1-f193.google.com ([209.85.222.193]:36836 "EHLO mail-qk1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726340AbfHGATg (ORCPT ); Tue, 6 Aug 2019 20:19:36 -0400 Received: by mail-qk1-f193.google.com with SMTP id g18so64450645qkl.3 for ; Tue, 06 Aug 2019 17:19:36 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=7ngjxHdg2v9ArnvarT9VRp5qq6SSckdhrdOnAxxdI1o=; b=xE9bl7CwVRr8fvh2mG2pryotdcE9m9N7kbFjDOFQ7l7JyFVvvSbQ4Wtr2wQzRCoZ7R MEnfUtOx4s4gtj/A6s99UozrB7+sEEPzQNFx4gSQVMv8Hle5l7yLUELa2Koiw9v4A0Nr pe57RG0fuYq6173I/SKDQEIPd8HXhDRdgrK0VIO32b2OTHqPgfBhmrkC3k/dj/BPKoCU RfhC2gZHEr1Ni9V42rqBtkcD/9XPZnOFYp2E7DJ3KNmfI4ZD1SOV2UfGDJaecXbZEAhZ LRNqVTOrQ7YndKKZAGgMWMoKyVnt9IXVDzEjkMH3AMDdS58etuKXweBOy6e1FKa+PsSt VmQA== 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:mime-version:content-transfer-encoding; bh=7ngjxHdg2v9ArnvarT9VRp5qq6SSckdhrdOnAxxdI1o=; b=s7m7XjwFNmOEhxVtCjCCeyvLItd/KKnwMh2RTH/cX44ajID3s1Jg49/YhvXZYp1Mse gvjc7eMAx+sk7yXs/fB0yAniA+dk8V5MZuB3QqqCRh/DOuURvdWw2Pz3BhR0LnWdyR1q 3lcqXiEjcJIXqBkiamH4qfu8jeuaW/leeYH5z+ssWxPgQxXnrIDMJ4su3I6LLrlselgW zlWkhkXVg8iRNDEOaCB7lEgx5mtR6GaoWhfk6MvclqmhHMS0zDeWPOLzbz0v4ZVF/8wW 5xMZea0fMA4kIGOrwrpfUSqVvDUP8AcQbz047gn7xrszGy7iUI+PDlUpITWjr8KFXj7p LSzA== X-Gm-Message-State: APjAAAWU775bw1vk4gYq3hCJambhDGjrVPWGvnpxFwTWfeXYMh4ysyJD 95QE7PjyI+s9+4APXAbZ3R3ogeyiRj8= X-Google-Smtp-Source: APXvYqxgOsZQXDpdf8GOmnrQDqjd4gdTCy80voGLgh4OBPuqUYltxpcUD0vgjY6CDypHx+bsvwbhEQ== X-Received: by 2002:a37:5d87:: with SMTP id r129mr5832636qkb.388.1565137175729; Tue, 06 Aug 2019 17:19:35 -0700 (PDT) Received: from jkicinski-Precision-T1700.netronome.com ([66.60.152.14]) by smtp.gmail.com with ESMTPSA id i5sm35547554qtp.20.2019.08.06.17.19.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Aug 2019 17:19:35 -0700 (PDT) From: Jakub Kicinski To: alexei.starovoitov@gmail.com, daniel@iogearbox.net Cc: netdev@vger.kernel.org, bpf@vger.kernel.org, oss-drivers@netronome.com, Jakub Kicinski , Quentin Monnet Subject: [PATCH bpf 1/2] tools: bpftool: fix error message (prog -> object) Date: Tue, 6 Aug 2019 17:19:22 -0700 Message-Id: <20190807001923.19483-2-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190807001923.19483-1-jakub.kicinski@netronome.com> References: <20190807001923.19483-1-jakub.kicinski@netronome.com> MIME-Version: 1.0 Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org Change an error message to work for any object being pinned not just programs. Fixes: 71bb428fe2c1 ("tools: bpf: add bpftool") Signed-off-by: Jakub Kicinski Reviewed-by: Quentin Monnet --- tools/bpf/bpftool/common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/bpf/bpftool/common.c b/tools/bpf/bpftool/common.c index 5215e0870bcb..c52a6ffb8949 100644 --- a/tools/bpf/bpftool/common.c +++ b/tools/bpf/bpftool/common.c @@ -237,7 +237,7 @@ int do_pin_any(int argc, char **argv, int (*get_fd_by_id)(__u32)) fd = get_fd_by_id(id); if (fd < 0) { - p_err("can't get prog by id (%u): %s", id, strerror(errno)); + p_err("can't open object by id (%u): %s", id, strerror(errno)); return -1; } From patchwork Wed Aug 7 00:19:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 1143078 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: incoming-bpf@patchwork.ozlabs.org Delivered-To: patchwork-incoming-bpf@bilbo.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=bpf-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="VHrmh+0F"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 463Bvx6bbYz9s7T for ; Wed, 7 Aug 2019 10:19:41 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727087AbfHGATi (ORCPT ); Tue, 6 Aug 2019 20:19:38 -0400 Received: from mail-qt1-f194.google.com ([209.85.160.194]:41143 "EHLO mail-qt1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726797AbfHGATi (ORCPT ); Tue, 6 Aug 2019 20:19:38 -0400 Received: by mail-qt1-f194.google.com with SMTP id d17so7646610qtj.8 for ; Tue, 06 Aug 2019 17:19:37 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=XRsl0hq2sktvUUN9RQLQt4ElBo/nkveeqhoqozaDdMo=; b=VHrmh+0FfYFYc6ASAFpV7lz0e8zO3xo2Tq93z3rFxeI4Au+N2uZtex27qAugn+0/cu mJCL/LnxBTnXsWILME5J0RoLjLEo4UBTOUDsnenYLXq55xPjcv6vBXhjI9Zq66atPW9h 2zKmkOIrCV7bJ3lqorVGlSnkAHA5UCUfzbSTEdpL1+bHeMMkrSDN4+pN6/Ta0WjsC1ry OhDVg2sSz7HS+7BOTOKqm9I/wPta3XtzYrnfkSCTog0HmC4jdhEzV7u/+o5EFQRNqyno 6lCzl/bRsL40AcQ35EZAfPbMsHHVZyRhsmbik9RzaTLMNyfjMuhUg90dwKApeFL32ii5 vNLg== 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:mime-version:content-transfer-encoding; bh=XRsl0hq2sktvUUN9RQLQt4ElBo/nkveeqhoqozaDdMo=; b=m27OICqGfmjQiIJaYo1pc/j4LoqsFD6o5gHMF742cU/cODYWzS5a/0N69o3O/Z0Oqw ZWx1P5sGBtdH7+qAsMbUs7Ykxs5Ujt7Rf8iMIpZc4VvzPp0yu/2CsJRijvaRdKKoFaXO kUc4pHHUggAXVacJYgW9Xme2SBLIqso8i3euRE7nPvBxEWlF5FP2P3k+ytZR2bzT1VQd 1wbfDFpE4zT8Ssy6tFs0Pjbq5nU2+pQ7f1guFCE9HRLq3OL4+KmAVh3Pcu/rVk4VqV+E l4jnRxmvR7mJkmlxbROG/sITpZmbVSJZ/sgG4Oi9zJZb6+Ma5tPjzjYcP5NLvcRgZwxI kDLw== X-Gm-Message-State: APjAAAXySP0+pEwAa8XF6rbSDzsHkwgNsvUOkRHBi1rJEayHkT8WuePC ZhN0fwQvt6cPKcFHQNgp0cLYiA== X-Google-Smtp-Source: APXvYqy+VIxlXwV7g6+hU7VMi8uG8VheY3mhYYyLOi623igKtv3BlH0t3hHGqSYpq1nfGFQKKe71jQ== X-Received: by 2002:a0c:99e6:: with SMTP id y38mr5717677qve.42.1565137177343; Tue, 06 Aug 2019 17:19:37 -0700 (PDT) Received: from jkicinski-Precision-T1700.netronome.com ([66.60.152.14]) by smtp.gmail.com with ESMTPSA id i5sm35547554qtp.20.2019.08.06.17.19.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Aug 2019 17:19:36 -0700 (PDT) From: Jakub Kicinski To: alexei.starovoitov@gmail.com, daniel@iogearbox.net Cc: netdev@vger.kernel.org, bpf@vger.kernel.org, oss-drivers@netronome.com, Jakub Kicinski , Andy Lutomirski , Quentin Monnet Subject: [PATCH bpf 2/2] tools: bpftool: add error message on pin failure Date: Tue, 6 Aug 2019 17:19:23 -0700 Message-Id: <20190807001923.19483-3-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190807001923.19483-1-jakub.kicinski@netronome.com> References: <20190807001923.19483-1-jakub.kicinski@netronome.com> MIME-Version: 1.0 Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org No error message is currently printed if the pin syscall itself fails. It got lost in the loadall refactoring. Fixes: 77380998d91d ("bpftool: add loadall command") Reported-by: Andy Lutomirski Signed-off-by: Jakub Kicinski Reviewed-by: Quentin Monnet Acked-by: Andrii Nakryiko --- CC: luto@kernel.org, sdf@google.com tools/bpf/bpftool/common.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/bpf/bpftool/common.c b/tools/bpf/bpftool/common.c index c52a6ffb8949..6a71324be628 100644 --- a/tools/bpf/bpftool/common.c +++ b/tools/bpf/bpftool/common.c @@ -204,7 +204,11 @@ int do_pin_fd(int fd, const char *name) if (err) return err; - return bpf_obj_pin(fd, name); + err = bpf_obj_pin(fd, name); + if (err) + p_err("can't pin the object (%s): %s", name, strerror(errno)); + + return err; } int do_pin_any(int argc, char **argv, int (*get_fd_by_id)(__u32))