From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CDF4DC43381 for ; Thu, 21 Feb 2019 16:06:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A468C2084D for ; Thu, 21 Feb 2019 16:06:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727771AbfBUQG0 (ORCPT ); Thu, 21 Feb 2019 11:06:26 -0500 Received: from mail-ed1-f47.google.com ([209.85.208.47]:37564 "EHLO mail-ed1-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726671AbfBUQG0 (ORCPT ); Thu, 21 Feb 2019 11:06:26 -0500 Received: by mail-ed1-f47.google.com with SMTP id m12so23579816edv.4 for ; Thu, 21 Feb 2019 08:06:25 -0800 (PST) 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:mime-version :content-transfer-encoding; bh=TRJv37FQf+ojLSSHn3KvTCndxghv+r0o7EuznlSjsjI=; b=EBw/G4u7vc2W+H49lISVAz/lOZI9I2q7JnkmuCMV2V4N6AhcsyLglTXQj40EWKeUtf OgaAc55zK4ExgHsWqLlSgaT4zTFTGHWyQAqjFJiky/GI+afmSlGaXKLZhBgGqWFpfr0Y fYvXGCC7W4lngsW0Du/uNNgKWfLBPdrlNS1bJkfkE9DlTIIozXJIxntce1SkzkXEwfPH dbFxyPpTPfz2PO1rx0KvRp2STGKW4qlXujZkTmzwy2DHQAC8MVsYc33+Bw3m2kZ0bB1G vX2jp1gN99FnHEmFL4vKrKwoBGincnXFkCEYUTMSchM/lSwGViaHRELsJrAkUmUQxOya 3i8g== X-Gm-Message-State: AHQUAuaUeWuy/YRqnSilnvgx2nD4uvCFCSCmqT383Eby7/V6eje9WyBv Zb4rPr2EKgm8AMdbZIP+UZY1oJS9rixfuA== X-Google-Smtp-Source: AHgI3IYPiS9rbwps1AdEyktl75ZxNRvLqjIrPb0QZWGevB3wolpEavOXOPhvajAUXD33qrgfEeopfQ== X-Received: by 2002:aa7:c757:: with SMTP id c23mr14849445eds.167.1550765184300; Thu, 21 Feb 2019 08:06:24 -0800 (PST) Received: from alrua-x1.borgediget.toke.dk (borgediget.toke.dk. [85.204.121.218]) by smtp.gmail.com with ESMTPSA id a5sm6485710ede.4.2019.02.21.08.06.23 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 21 Feb 2019 08:06:23 -0800 (PST) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id B4B041803B8; Thu, 21 Feb 2019 17:06:22 +0100 (CET) From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= To: netdev@vger.kernel.org Cc: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= Subject: [PATCH] samples/bpf: Fix dummy program unloading for xdp_redirect samples Date: Thu, 21 Feb 2019 17:05:39 +0100 Message-Id: <20190221160539.32132-1-toke@redhat.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The xdp_redirect and xdp_redirect_map sample programs both load a dummy program onto the egress interfaces. However, the unload code checks these programs against the wrong fd number, and thus refuses to unload them. Fix the comparison to avoid this. Fixes: 3b7a8ec2dec3 ("samples/bpf: Check the prog id before exiting") Signed-off-by: Toke Høiland-Jørgensen --- samples/bpf/xdp_redirect_map_user.c | 2 +- samples/bpf/xdp_redirect_user.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/bpf/xdp_redirect_map_user.c b/samples/bpf/xdp_redirect_map_user.c index 327226be5a06..1dbe7fd3a1a8 100644 --- a/samples/bpf/xdp_redirect_map_user.c +++ b/samples/bpf/xdp_redirect_map_user.c @@ -57,7 +57,7 @@ static void int_exit(int sig) printf("bpf_get_link_xdp_id failed\n"); exit(1); } - if (prog_id == curr_prog_id) + if (dummy_prog_id == curr_prog_id) bpf_set_link_xdp_fd(ifindex_out, -1, xdp_flags); else if (!curr_prog_id) printf("couldn't find a prog id on iface OUT\n"); diff --git a/samples/bpf/xdp_redirect_user.c b/samples/bpf/xdp_redirect_user.c index a5d8ad3129ed..e9054c0269ff 100644 --- a/samples/bpf/xdp_redirect_user.c +++ b/samples/bpf/xdp_redirect_user.c @@ -57,7 +57,7 @@ static void int_exit(int sig) printf("bpf_get_link_xdp_id failed\n"); exit(1); } - if (prog_id == curr_prog_id) + if (dummy_prog_id == curr_prog_id) bpf_set_link_xdp_fd(ifindex_out, -1, xdp_flags); else if (!curr_prog_id) printf("couldn't find a prog id on iface OUT\n"); -- 2.20.1