From patchwork Tue Dec 6 09:14:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Ramadoss X-Patchwork-Id: 30159 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp2716526wrr; Tue, 6 Dec 2022 01:19:57 -0800 (PST) X-Google-Smtp-Source: AA0mqf7GSe2rifJ/GyQhtAyfwe4KfDPnSggXGpkZjg1O9ORxJtkrHBjJPmcWzo+WUjBd6gjcoxWg X-Received: by 2002:a17:902:b182:b0:189:dc5e:887d with SMTP id s2-20020a170902b18200b00189dc5e887dmr7232208plr.55.1670318397563; Tue, 06 Dec 2022 01:19:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670318397; cv=none; d=google.com; s=arc-20160816; b=OhcnA2A/A1TAjIoIAiTnfdpjBWzvrPDs/qRXvOvlqInWHJIMxPH6H9o0tH0fWLq9lC 1zOzqK1Z1/Diw+bFKKTam9mpzOulgdvn6nHUHBCuc0BnMTAOtlhiF+8souWquv9ky/zC rQIte02JZG9QESZgOLCpaLpoolHON+ezikxecHW7RtvQHncOj8rqcIuGBni7+39HnUYo ChzjN65ogg5K2p8P3NTzTyRoIQRKb9IlC4INyXXPO02SWme65IH3OcWaE7nbvPDfF+/n seOsw3Bcicbh6ZRzLKmnPYWVFIN/2FcHGmjr2gkwMeNu3R0n6YzAVioXhkJLacYHZaDA MDCQ== 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=o1by4yONO5u/YH2vWJ2huasS2TCvHUiPgz3aKsuuOeU=; b=LpBqk4evpk5UT+3abH6OXCqGyr+J1bEwxFtwtAVTXEnkdlvpyFv6g/N1OTJHjPrKXR OBe+rx3LClj+75IDgxJM9qzuAt6FOAyE0sgUrShUkzxsy69HkkONNe7xcAip4J7teIt4 7pFHQ9b5EM9/iJKMwO9szWsM9RZYIcYKpu8Bx4QT/HYNVE05jhvmyEo8rQC12V4JU4c7 KGWdrM03Tw+n/QWgglgcGNomLSbqZcklU/v4yzq5IlhHezv6BrLN8+17hLt3csJbeP71 U3VTsW4lB793ahEb9izORpgME0ghz/RzAVd+zxQ1wNx3EMdnVnS2Y0TqFcfsWOfloSgc Mupw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microchip.com header.s=mchp header.b=ROJ1htGg; 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 f2-20020a170902860200b00186dcc37df6si16059779plo.616.2022.12.06.01.19.44; Tue, 06 Dec 2022 01:19:57 -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=ROJ1htGg; 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 S234607AbiLFJQn (ORCPT + 99 others); Tue, 6 Dec 2022 04:16:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60692 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234697AbiLFJP7 (ORCPT ); Tue, 6 Dec 2022 04:15:59 -0500 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.153.233]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 44CA120199; Tue, 6 Dec 2022 01:15:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1670318157; x=1701854157; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=6lKXvk95G8RcDirvU+IcFRkbr5bO0RrnPIXh0IkFuBU=; b=ROJ1htGgFCElWvcsp8l3LQIDiGdE8AM7KAAOWY6/0CJO3nG3HrF+G6pY goYHx3whJIMGCUE24mLzdv+ZCipjdcSmISUG3IwdfM0qcCut5poJwTMV0 zbWztmg13WTG/MATrL2bp6UgsMv4dL0u4Tflb7m44kDIMbjksjajMekfy 41nblQRZHj8M0GnX/udR+7Mbb09wwV7Z2LbiUesTMcpzLSD9/XzS0kgu8 zHYuxhiFwH/FM9pLioFiRFROyrkgmngEtRM0PaKXigxd2H9A4eatzthJ9 UXQ9RR73dIbPtOVRrez/ZAgxpEg8hoWgvOe/+SY1v0eqsCNak9c0YmgOU Q==; X-IronPort-AV: E=Sophos;i="5.96,220,1665471600"; d="scan'208";a="191877920" Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa3.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 06 Dec 2022 02:15:56 -0700 Received: from chn-vm-ex03.mchp-main.com (10.10.85.151) 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.12; Tue, 6 Dec 2022 02:15:56 -0700 Received: from CHE-LT-I17769U.microchip.com (10.10.115.15) by chn-vm-ex03.mchp-main.com (10.10.85.151) with Microsoft SMTP Server id 15.1.2507.12 via Frontend Transport; Tue, 6 Dec 2022 02:15:50 -0700 From: Arun Ramadoss To: , CC: , , , , , , , , , , , , , Subject: [Patch net-next v2 06/13] net: ptp: add helper for one-step P2P clocks Date: Tue, 6 Dec 2022 14:44:21 +0530 Message-ID: <20221206091428.28285-7-arun.ramadoss@microchip.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20221206091428.28285-1-arun.ramadoss@microchip.com> References: <20221206091428.28285-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?1751455784126738998?= X-GMAIL-MSGID: =?utf-8?q?1751455784126738998?= 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). Reported-by: kernel test robot Signed-off-by: Christian Eggers --- v1 -> v2 - Fixed compilation issue when PTP_CLASSIFY not selected in menuconfig --- 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_ */