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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,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 6F614C4BA06 for ; Thu, 27 Feb 2020 03:20:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 45D5C24679 for ; Thu, 27 Feb 2020 03:20:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582773624; bh=Kzb4/R2uuS+aboCN/KgRKav39A6N1pzSpU181g1pq4Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=YDpZzp/i0Q1EweyBjS2nWKe/ojt6NpEn5Jo1rU/O2hdq+ntqI7bSr95dxlDyBS/Nj 9r2aTV7TmC7CEMlTAjGRzb/OyEGKU80w8rUy+HHtrD9pJuK+7CGh9QEpDlwN3H/5FZ 2ccMPUyO49iUw9afj5Uu2UyNH65d5L/UzkzEBJJY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728335AbgB0DUX (ORCPT ); Wed, 26 Feb 2020 22:20:23 -0500 Received: from mail.kernel.org ([198.145.29.99]:48572 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728234AbgB0DUW (ORCPT ); Wed, 26 Feb 2020 22:20:22 -0500 Received: from C02YQ0RWLVCF.internal.digitalocean.com (c-73-181-34-237.hsd1.co.comcast.net [73.181.34.237]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4506B24680; Thu, 27 Feb 2020 03:20:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582773622; bh=Kzb4/R2uuS+aboCN/KgRKav39A6N1pzSpU181g1pq4Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cxXVVSvrvtVsAqvMFuG+wTLmwfpQ/Hz5+ano3VqHdhrw0OsPPXTLZOiLLYH7gKvVH lm4mrkyh1Dyi4hwo4CaWyc4ju3yivalmlrIoZBIYO2qL71U+Eq0uPzozuOhYwbZ/bC PwuTpsnoXVUtOSMQxOi+MYKdKa9wajrCzFFtee6Q= From: David Ahern To: netdev@vger.kernel.org Cc: davem@davemloft.net, kuba@kernel.org, prashantbhole.linux@gmail.com, jasowang@redhat.com, brouer@redhat.com, toke@redhat.com, mst@redhat.com, toshiaki.makita1@gmail.com, daniel@iogearbox.net, john.fastabend@gmail.com, ast@kernel.org, kafai@fb.com, songliubraving@fb.com, yhs@fb.com, andriin@fb.com, dsahern@gmail.com, David Ahern Subject: [PATCH RFC v4 bpf-next 02/11] net: Add BPF_XDP_EGRESS as a bpf_attach_type Date: Wed, 26 Feb 2020 20:20:04 -0700 Message-Id: <20200227032013.12385-3-dsahern@kernel.org> X-Mailer: git-send-email 2.21.1 (Apple Git-122.3) In-Reply-To: <20200227032013.12385-1-dsahern@kernel.org> References: <20200227032013.12385-1-dsahern@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Prashant Bhole Add new bpf_attach_type, BPF_XDP_EGRESS, for BPF programs attached at the XDP layer, but the egress path. Since egress path does not have rx_queue_index set, update xdp_is_valid_access to block access to this entry in the xdp context when a program is attached to egress path. The next patch adds support for the egress ifindex. Signed-off-by: Prashant Bhole Signed-off-by: David Ahern --- include/uapi/linux/bpf.h | 1 + net/core/filter.c | 7 +++++++ tools/include/uapi/linux/bpf.h | 1 + 3 files changed, 9 insertions(+) diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index 906e9f2752db..7850f8683b81 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@ -210,6 +210,7 @@ enum bpf_attach_type { BPF_TRACE_RAW_TP, BPF_TRACE_FENTRY, BPF_TRACE_FEXIT, + BPF_XDP_EGRESS, __MAX_BPF_ATTACH_TYPE }; diff --git a/net/core/filter.c b/net/core/filter.c index 925b23de218b..c7cc98c55621 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -6795,6 +6795,13 @@ static bool xdp_is_valid_access(int off, int size, const struct bpf_prog *prog, struct bpf_insn_access_aux *info) { + if (prog->expected_attach_type == BPF_XDP_EGRESS) { + switch (off) { + case offsetof(struct xdp_md, rx_queue_index): + return false; + } + } + if (type == BPF_WRITE) { if (bpf_prog_is_dev_bound(prog->aux)) { switch (off) { diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h index 906e9f2752db..7850f8683b81 100644 --- a/tools/include/uapi/linux/bpf.h +++ b/tools/include/uapi/linux/bpf.h @@ -210,6 +210,7 @@ enum bpf_attach_type { BPF_TRACE_RAW_TP, BPF_TRACE_FENTRY, BPF_TRACE_FEXIT, + BPF_XDP_EGRESS, __MAX_BPF_ATTACH_TYPE }; -- 2.21.1 (Apple Git-122.3)