From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.115]) by mail.toke.dk (Postfix) with ESMTPS id 4293FA24B15 for ; Thu, 24 Aug 2023 21:34:20 +0200 (CEST) Authentication-Results: mail.toke.dk; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=ZeHKDgeb DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1692905660; x=1724441660; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ne/1/PTsQPHRdIJLnqaFI8aCCDNKyBxVh54JWoxv9yU=; b=ZeHKDgebBd6ZVJwYLxxT+k4vmZptxzv5AqOYctHxgiy9G3So6u+IjyMp ++evxCo165c+J0HOpQ+qyAiOGbw7mxckUy72V2RjsxvJjQIa7leuKQ0PT 8kK18ZZ0cQeBI9bLzbYmvvKyGTsyurSaKM4a1hwhWVcMAfV5tgTbLY1ta tABW2uKHYWhNXDs8rmSC+LkrAxT4LWABHrmTED5Th6Iy3kGPu6CKDO+Wv If+jlfXCTz1cnTQMqacpvcYAlnJkIOTeyUme897YQRfg9bNw2Qh1s9Vkc 7tBJASeSrv4o3Wp3BpGHq5pg1s8EWkpinnNnpHB5l5qNBAFKK+ynXTsdL g==; X-IronPort-AV: E=McAfee;i="6600,9927,10812"; a="374516762" X-IronPort-AV: E=Sophos;i="6.02,195,1688454000"; d="scan'208";a="374516762" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Aug 2023 12:34:18 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10812"; a="802667462" X-IronPort-AV: E=Sophos;i="6.02,195,1688454000"; d="scan'208";a="802667462" Received: from irvmail002.ir.intel.com ([10.43.11.120]) by fmsmga008.fm.intel.com with ESMTP; 24 Aug 2023 12:34:13 -0700 Received: from lincoln.igk.intel.com (lincoln.igk.intel.com [10.102.21.235]) by irvmail002.ir.intel.com (Postfix) with ESMTP id 680393494B; Thu, 24 Aug 2023 20:34:11 +0100 (IST) From: Larysa Zaremba To: bpf@vger.kernel.org Date: Thu, 24 Aug 2023 21:26:51 +0200 Message-ID: <20230824192703.712881-13-larysa.zaremba@intel.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230824192703.712881-1-larysa.zaremba@intel.com> References: <20230824192703.712881-1-larysa.zaremba@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: U4GCCEFINDX2T6OFV5VM5VWWRGTRHKN3 X-Message-ID-Hash: U4GCCEFINDX2T6OFV5VM5VWWRGTRHKN3 X-MailFrom: larysa.zaremba@intel.com X-Mailman-Rule-Hits: member-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address CC: Larysa Zaremba , ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, martin.lau@linux.dev, song@kernel.org, yhs@fb.com, john.fastabend@gmail.com, kpsingh@kernel.org, sdf@google.com, haoluo@google.com, jolsa@kernel.org, David Ahern , Jakub Kicinski , Willem de Bruijn , Jesper Dangaard Brouer , Anatoly Burakov , Alexander Lobakin , Magnus Karlsson , Maryam Tahhan , xdp-hints@xdp-project.net, netdev@vger.kernel.org, Willem de Bruijn , Alexei Starovoitov , Simon Horman , Tariq Toukan , Saeed Mahameed X-Mailman-Version: 3.3.8 Precedence: list Subject: [xdp-hints] [RFC bpf-next 12/23] xdp: Add checksum hint List-Id: XDP hardware hints design discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Implement functionality that enables drivers to expose to XDP code checksum information that consists of: - Checksum status - 2 non-exlusive flags: - XDP_CHECKSUM_VERIFIED indicating HW has validated the checksum (corresponding to CHECKSUM_UNNECESSARY in sk_buff) - XDP_CHECKSUM_COMPLETE signifies the validity of the second argument (corresponding to CHECKSUM_COMPLETE in sk_buff) - Checksum, calculated over the entire packet, valid if the second flag is set Signed-off-by: Larysa Zaremba --- Documentation/networking/xdp-rx-metadata.rst | 3 +++ include/net/xdp.h | 15 +++++++++++++ kernel/bpf/offload.c | 2 ++ net/core/xdp.c | 23 ++++++++++++++++++++ 4 files changed, 43 insertions(+) diff --git a/Documentation/networking/xdp-rx-metadata.rst b/Documentation/networking/xdp-rx-metadata.rst index ea6dd79a21d3..7f056a44f682 100644 --- a/Documentation/networking/xdp-rx-metadata.rst +++ b/Documentation/networking/xdp-rx-metadata.rst @@ -26,6 +26,9 @@ metadata is supported, this set will grow: .. kernel-doc:: net/core/xdp.c :identifiers: bpf_xdp_metadata_rx_vlan_tag +.. kernel-doc:: net/core/xdp.c + :identifiers: bpf_xdp_metadata_rx_csum + An XDP program can use these kfuncs to read the metadata into stack variables for its own consumption. Or, to pass the metadata on to other consumers, an XDP program can store it into the metadata area carried diff --git a/include/net/xdp.h b/include/net/xdp.h index 8bb64fc76498..495c4d2a2c50 100644 --- a/include/net/xdp.h +++ b/include/net/xdp.h @@ -390,6 +390,8 @@ void xdp_attachment_setup(struct xdp_attachment_info *info, bpf_xdp_metadata_rx_hash) \ XDP_METADATA_KFUNC(XDP_METADATA_KFUNC_RX_VLAN_TAG, \ bpf_xdp_metadata_rx_vlan_tag) \ + XDP_METADATA_KFUNC(XDP_METADATA_KFUNC_RX_CSUM, \ + bpf_xdp_metadata_rx_csum) \ enum { #define XDP_METADATA_KFUNC(name, _) name, @@ -447,12 +449,25 @@ enum xdp_rss_hash_type { XDP_RSS_TYPE_L4_IPV6_SCTP_EX = XDP_RSS_TYPE_L4_IPV6_SCTP | XDP_RSS_L3_DYNHDR, }; +enum xdp_csum_status { + /* HW had parsed headers and validated the outermost checksum, + * same as ``CHECKSUM_UNNECESSARY`` in ``sk_buff``. + */ + XDP_CHECKSUM_VERIFIED = BIT(0), + + /* Checksum, calculated over the entire packet is provided */ + XDP_CHECKSUM_COMPLETE = BIT(1), +}; + struct xdp_metadata_ops { int (*xmo_rx_timestamp)(const struct xdp_md *ctx, u64 *timestamp); int (*xmo_rx_hash)(const struct xdp_md *ctx, u32 *hash, enum xdp_rss_hash_type *rss_type); int (*xmo_rx_vlan_tag)(const struct xdp_md *ctx, u16 *vlan_tci, __be16 *vlan_proto); + int (*xmo_rx_csum)(const struct xdp_md *ctx, + enum xdp_csum_status *csum_status, + __wsum *csum); }; #ifdef CONFIG_NET diff --git a/kernel/bpf/offload.c b/kernel/bpf/offload.c index 8be340cf06f9..ee35f33a96d1 100644 --- a/kernel/bpf/offload.c +++ b/kernel/bpf/offload.c @@ -851,6 +851,8 @@ void *bpf_dev_bound_resolve_kfunc(struct bpf_prog *prog, u32 func_id) p = ops->xmo_rx_hash; else if (func_id == bpf_xdp_metadata_kfunc_id(XDP_METADATA_KFUNC_RX_VLAN_TAG)) p = ops->xmo_rx_vlan_tag; + else if (func_id == bpf_xdp_metadata_kfunc_id(XDP_METADATA_KFUNC_RX_CSUM)) + p = ops->xmo_rx_csum; out: up_read(&bpf_devs_lock); diff --git a/net/core/xdp.c b/net/core/xdp.c index 856e02bb4ce6..b197287d7196 100644 --- a/net/core/xdp.c +++ b/net/core/xdp.c @@ -772,6 +772,29 @@ __bpf_kfunc int bpf_xdp_metadata_rx_vlan_tag(const struct xdp_md *ctx, return -EOPNOTSUPP; } +/** + * bpf_xdp_metadata_rx_csum - Get checksum status with additional info. + * @ctx: XDP context pointer. + * @csum_status: Destination for checksum status. + * @csum: Destination for complete checksum. + * + * Status (@csum_status) is a bitfield that informs, what checksum + * processing was performed. If ``XDP_CHECKSUM_COMPLETE`` in status is set, + * second argument (@csum) contains a checksum, calculated over the entire + * packet. + * + * Return: + * * Returns 0 on success or ``-errno`` on error. + * * ``-EOPNOTSUPP`` : device driver doesn't implement kfunc + * * ``-ENODATA`` : Checksum status is unknown + */ +__bpf_kfunc int bpf_xdp_metadata_rx_csum(const struct xdp_md *ctx, + enum xdp_csum_status *csum_status, + __wsum *csum) +{ + return -EOPNOTSUPP; +} + __diag_pop(); BTF_SET8_START(xdp_metadata_kfunc_ids) -- 2.41.0