From patchwork Mon Dec 12 10:26:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Ramadoss X-Patchwork-Id: 32305 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp2168198wrr; Mon, 12 Dec 2022 02:42:17 -0800 (PST) X-Google-Smtp-Source: AA0mqf6XOIJt3N7jQwemE5ZAqo1UNZvjkO86hchkovxBn0nkWhxOrKV1+slWZJq9igeEvAQOpLV7 X-Received: by 2002:a05:6402:43c7:b0:46c:e558:ce60 with SMTP id p7-20020a05640243c700b0046ce558ce60mr13222749edc.22.1670841737712; Mon, 12 Dec 2022 02:42:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670841737; cv=none; d=google.com; s=arc-20160816; b=Tdr3EB//x4l5opviAe7LrcHajwP0NUIhUVYA1AtErDQN+fHxTqEoNAinJTUr9aJ2zN mFZn/hgrQM7CjM0WSns65rBeK9i9O8rGnS6EQ86subQa1u8xjwKLj8Nu/AvXFfQYR9iO 7mCUPJ9TdiAihM+zJlhdTlfUAEQDy9ENz2jrqbKuzCpPeV6+aroIOlp+erqtiIYXr8Qm RjVXgboRPAsMIHn/nHDMCd7f+3jswBI7II6/+VPSAMZU7YQsrB3B5ZeSwuWLLfrjXbqY i7fhIqnuQw4L6gMSRIojo5TLRqI7Pf1U3e2A0bMk8JyHe5+uVa/qcTS+o1UVf73tcgK2 F2AA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Guv9i3IBMAcyy6vGd2Rh2K7r9Sr+srDgZmP+tXa6fOo=; b=b/w3BuuLHer73twnBre57JXmfbLPhYZ88Jon1BnTAVaO6eUUzrnFfNlo14KFxoUSlp 2HJGEtMJjHvWP2QKA53LhqZhjRkinxYGvDl8S8SFicc7USHCjBp7s91CBs+pbJs1Biw6 sLjSsAEmZT6mpTiRWejlz8Hhy0X7imDFwLxgnVYYmGa3pV9tNHWWCJHt2mdFQpB8CJ82 hKMIabVykjpQjqkdO/cTN8POjuC7HlopTKeRpDUbnARoAVz3TzHeD4vw3c9g2DDy2Pks NM8Uxir1rJqnB6+3sW4TQQNgCo9Q+F1a4+YKf7uhodSkR82+zPOpS9yPouAiyt93CNUk Rp0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microchip.com header.s=mchp header.b=uu18TjB5; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=microchip.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i14-20020a056402054e00b0046b45e2ff96si6206024edx.370.2022.12.12.02.41.53; Mon, 12 Dec 2022 02:42:17 -0800 (PST) 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=@microchip.com header.s=mchp header.b=uu18TjB5; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=microchip.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231851AbiLLK3J (ORCPT + 99 others); Mon, 12 Dec 2022 05:29:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54004 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231741AbiLLK1w (ORCPT ); Mon, 12 Dec 2022 05:27:52 -0500 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.154.123]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E4A4CAE6A; Mon, 12 Dec 2022 02:27:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1670840869; x=1702376869; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=TBiocUlMd4lgD3UieKC9lMwBVyukIc3JWqKRD/9Iuek=; b=uu18TjB5JwlCRXpE2dHk8fF45TWNHVGXmRTnWdRYd6Nw0P0AH4Sxcm4H LAJ/A8P4lBWnRtlM7+c4ncmTWouMaKlyAvtGLGK6hEb4hdK0k31ujLDx0 ZI8EhuL+QqLlkIhbUCo39fpHp5RzY5tMoFYlYpted6U5olE1937XXX+LF 3dUhKTSRzhOSLQqkiMpm86AiotgrkXff6Uj1f5SkKUczGUcw+5H79GF4b IGjOhaZJulztP0MMPoTKKejV36utc03HKKEq4wvXxghjBMq05VvwwA7QU fKPgAh8t5SwF4joSzW7Q107giU4NWdx6VtfWgCSDLqbtCj0RAeeNVpJcP g==; X-IronPort-AV: E=Sophos;i="5.96,238,1665471600"; d="scan'208";a="127655416" Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa6.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 12 Dec 2022 03:27:48 -0700 Received: from chn-vm-ex02.mchp-main.com (10.10.85.144) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16; Mon, 12 Dec 2022 03:27:47 -0700 Received: from CHE-LT-I17769U.microchip.com (10.10.115.15) by chn-vm-ex02.mchp-main.com (10.10.85.144) with Microsoft SMTP Server id 15.1.2507.16 via Frontend Transport; Mon, 12 Dec 2022 03:27:41 -0700 From: Arun Ramadoss To: , CC: , , , , , , , , , , , , , Subject: [Patch net-next v4 06/13] net: ptp: add helper for one-step P2P clocks Date: Mon, 12 Dec 2022 15:56:32 +0530 Message-ID: <20221212102639.24415-7-arun.ramadoss@microchip.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20221212102639.24415-1-arun.ramadoss@microchip.com> References: <20221212102639.24415-1-arun.ramadoss@microchip.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752004545755586413?= X-GMAIL-MSGID: =?utf-8?q?1752004545755586413?= From: Christian Eggers For P2P delay measurement, the ingress time stamp of the PDelay_Req is required for the correction field of the PDelay_Resp. The application echoes back the correction field of the PDelay_Req when sending the PDelay_Resp. Some hardware (like the ZHAW InES PTP time stamping IP core) subtracts the ingress timestamp autonomously from the correction field, so that the hardware only needs to add the egress timestamp on tx. Other hardware (like the Microchip KSZ9563) reports the ingress time stamp via an interrupt and requires that the software provides this time stamp via tail-tag on tx. In order to avoid introducing a further application interface for this, the driver can simply emulate the behavior of the InES device and subtract the ingress time stamp in software from the correction field. On egress, the correction field can either be kept as it is (and the time stamp field in the tail-tag is set to zero) or move the value from the correction field back to the tail-tag. Changing the correction field requires updating the UDP checksum (if UDP is used as transport). Signed-off-by: Christian Eggers Co-developed-by: Arun Ramadoss Signed-off-by: Arun Ramadoss --- v1 -> v2 - Fixed compilation issue when PTP_CLASSIFY not selected in menuconfig as reported by kernel test robot --- include/linux/ptp_classify.h | 71 ++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/include/linux/ptp_classify.h b/include/linux/ptp_classify.h index 2b6ea36ad162..6e5869c2504c 100644 --- a/include/linux/ptp_classify.h +++ b/include/linux/ptp_classify.h @@ -10,8 +10,12 @@ #ifndef _PTP_CLASSIFY_H_ #define _PTP_CLASSIFY_H_ +#include #include +#include #include +#include +#include #define PTP_CLASS_NONE 0x00 /* not a PTP event message */ #define PTP_CLASS_V1 0x01 /* protocol version 1 */ @@ -129,6 +133,67 @@ static inline u8 ptp_get_msgtype(const struct ptp_header *hdr, return msgtype; } +/** + * ptp_check_diff8 - Computes new checksum (when altering a 64-bit field) + * @old: old field value + * @new: new field value + * @oldsum: previous checksum + * + * This function can be used to calculate a new checksum when only a single + * field is changed. Similar as ip_vs_check_diff*() in ip_vs.h. + * + * Return: Updated checksum + */ +static inline __wsum ptp_check_diff8(__be64 old, __be64 new, __wsum oldsum) +{ + __be64 diff[2] = { ~old, new }; + + return csum_partial(diff, sizeof(diff), oldsum); +} + +/** + * ptp_header_update_correction - Update PTP header's correction field + * @skb: packet buffer + * @type: type of the packet (see ptp_classify_raw()) + * @hdr: ptp header + * @correction: new correction value + * + * This updates the correction field of a PTP header and updates the UDP + * checksum (if UDP is used as transport). It is needed for hardware capable of + * one-step P2P that does not already modify the correction field of Pdelay_Req + * event messages on ingress. + */ +static inline +void ptp_header_update_correction(struct sk_buff *skb, unsigned int type, + struct ptp_header *hdr, s64 correction) +{ + __be64 correction_old; + struct udphdr *uhdr; + + /* previous correction value is required for checksum update. */ + memcpy(&correction_old, &hdr->correction, sizeof(correction_old)); + + /* write new correction value */ + put_unaligned_be64((u64)correction, &hdr->correction); + + switch (type & PTP_CLASS_PMASK) { + case PTP_CLASS_IPV4: + case PTP_CLASS_IPV6: + /* locate udp header */ + uhdr = (struct udphdr *)((char *)hdr - sizeof(struct udphdr)); + break; + default: + return; + } + + /* update checksum */ + uhdr->check = csum_fold(ptp_check_diff8(correction_old, + hdr->correction, + ~csum_unfold(uhdr->check))); + if (!uhdr->check) + uhdr->check = CSUM_MANGLED_0; +} + /** * ptp_msg_is_sync - Evaluates whether the given skb is a PTP Sync message * @skb: packet buffer @@ -166,5 +231,11 @@ static inline bool ptp_msg_is_sync(struct sk_buff *skb, unsigned int type) { return false; } + +static inline +void ptp_header_update_correction(struct sk_buff *skb, unsigned int type, + struct ptp_header *hdr, s64 correction) +{ +} #endif #endif /* _PTP_CLASSIFY_H_ */