From patchwork Thu Apr 13 15:12:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Song Yoong Siang X-Patchwork-Id: 83024 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1117538vqo; Thu, 13 Apr 2023 08:23:33 -0700 (PDT) X-Google-Smtp-Source: AKy350bhjpCgV9PiqJDuvJf6r1/zRDX5u2owcgG4t01eTfxsW8vlmp9KXwpeYCGIEyF5/DZICT5a X-Received: by 2002:aa7:8890:0:b0:63b:4a65:e186 with SMTP id z16-20020aa78890000000b0063b4a65e186mr3309163pfe.7.1681399413443; Thu, 13 Apr 2023 08:23:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681399413; cv=none; d=google.com; s=arc-20160816; b=GyOxkJLFvKptBmCZbt6T1Ngm8+eXojDvmQeqs7P/viO9wn1odESrHrES1iA321gPLK rGb8XtDikEJ2j416WxylQ7mYFAMod1rTYhf+VAiOTlKJMQHDk8OR44xfu52j7kn/+EdZ OZ/+4IDlQ1uZDl19XYkSa39XZ9NQXGiWf3fw6Ad9x06r70TmhW67BYxLX4SRbunx6zih lycwXjJe2syk5rAx/zzYJ5FGM//H36/MidIrL4une3iAIfBfZKLFazkIx7Jci9swbCJF 7OZlsUJF23Ye9viUhjJxhezHj3G6AsPghn9tRQsUav95WlU2ZRclCGTCIp4qHbXvFplg Se8w== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=nOJd9h9ubI0OyQOcZ+zAPywnTr5cCjYtLdPru+gs5ew=; b=gxAr8NttiDGhc67kP7ATvrxjMabKc9Or9wxjwfNcAwMFD781pL0ZcufPggUzmu+Rey FHHXOMSIxOn70Zgmj5AUVoJMGBj6gRX/KMF7QrK6pBKrNJ3B4FM/4sjYx+lPHkEQ9Mkd 6QxiFn3NYlb+LTuiHWBNVr1dKePeFT53WsNrREVYiNLkqDEWi1hEQPvzA6mGj4eUO8vH 6e00du6gdohEjGm6FnojaymVIB9fgEPwci54i2vUIUKoUh+xPaicEKmLroND0QD4Itt0 wgEkJxfSyheSQ3EssR9SQoF1BJ3mfH1JEIeBSVEppFYeUoP9WmnTx6oUjx49Vo0Y6O8N l+Ow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=lL4BSuEG; 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=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a8-20020aa78e88000000b0063718ff9acbsi1962565pfr.288.2023.04.13.08.23.18; Thu, 13 Apr 2023 08:23:33 -0700 (PDT) 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=@intel.com header.s=Intel header.b=lL4BSuEG; 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=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231519AbjDMPNR (ORCPT + 99 others); Thu, 13 Apr 2023 11:13:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35106 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229611AbjDMPNO (ORCPT ); Thu, 13 Apr 2023 11:13:14 -0400 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 32E01184; Thu, 13 Apr 2023 08:13:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1681398785; x=1712934785; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=f6ND7RnB4gbPxv8sBeifXq2wwq96IRhvnSOplOcfMXw=; b=lL4BSuEGRYub3csp0mOy1sWkpkJDByqRWM8DhoVvP6huCeD3a4pBHd0m 114HjJTR8p23zHuoQV/zjCkPB0hP4j35euLlKuFt644czfL05qzoNc/mt Ffc/TMnN2NpZ0WDspGO1fAiW2w1n8xmsjQ0LlxwFZcei2ptu0G98+2MqC qW1cvebfxhe0NexzC+CorSooGfVGwuYBY/caMzJBZlCZb+W6dCTZbujwV q0FiPAP3vGKv5aoD8joew1ZXMwko2kfrGxsKTYWvADF+wihO0n/HjjdiD +TfvZhxzTZfdSiLijfDJ8jSNZpJjw3uZUl9amlVHcPsEKUKsCygr8BhPQ w==; X-IronPort-AV: E=McAfee;i="6600,9927,10679"; a="344203265" X-IronPort-AV: E=Sophos;i="5.99,194,1677571200"; d="scan'208";a="344203265" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Apr 2023 08:13:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10679"; a="666808531" X-IronPort-AV: E=Sophos;i="5.99,194,1677571200"; d="scan'208";a="666808531" Received: from p12ill20yoongsia.png.intel.com ([10.88.227.28]) by orsmga006.jf.intel.com with ESMTP; 13 Apr 2023 08:12:57 -0700 From: Song Yoong Siang To: Jesse Brandeburg , Tony Nguyen , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , Maciej Fijalkowski , Vedang Patel , Jithu Joseph , Andre Guedes , Jesper Dangaard Brouer , Stanislav Fomichev Cc: intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, xdp-hints@xdp-project.net, stable@vger.kernel.org, Song Yoong Siang Subject: [PATCH net 1/1] igc: read before write to SRRCTL register Date: Thu, 13 Apr 2023 23:12:22 +0800 Message-Id: <20230413151222.1864307-1-yoong.siang.song@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-1.4 required=5.0 tests=AC_FROM_MANY_DOTS,BAYES_00, DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE,URIBL_BLOCKED autolearn=no 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?1763075071541574863?= X-GMAIL-MSGID: =?utf-8?q?1763075071541574863?= igc_configure_rx_ring() function will be called as part of XDP program setup. If Rx hardware timestamp is enabled prio to XDP program setup, this timestamp enablement will be overwritten when buffer size is written into SRRCTL register. Thus, this commit read the register value before write to SRRCTL register. This commit is tested by using xdp_hw_metadata bpf selftest tool. The tool enables Rx hardware timestamp and then attach XDP program to igc driver. It will display hardware timestamp of UDP packet with port number 9092. Below are detail of test steps and results. Command on DUT: sudo ./xdp_hw_metadata Command on Link Partner: echo -n skb | nc -u -q1 9092 Result before this patch: skb hwtstamp is not found! Result after this patch: found skb hwtstamp = 1677762212.590696226 Fixes: fc9df2a0b520 ("igc: Enable RX via AF_XDP zero-copy") Cc: # 5.14+ Signed-off-by: Song Yoong Siang Reviewed-by: Jacob Keller Tested-by: Naama Meir --- drivers/net/ethernet/intel/igc/igc_base.h | 7 +++++-- drivers/net/ethernet/intel/igc/igc_main.c | 5 ++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/intel/igc/igc_base.h b/drivers/net/ethernet/intel/igc/igc_base.h index 7a992befca24..b95007d51d13 100644 --- a/drivers/net/ethernet/intel/igc/igc_base.h +++ b/drivers/net/ethernet/intel/igc/igc_base.h @@ -87,8 +87,11 @@ union igc_adv_rx_desc { #define IGC_RXDCTL_SWFLUSH 0x04000000 /* Receive Software Flush */ /* SRRCTL bit definitions */ -#define IGC_SRRCTL_BSIZEPKT_SHIFT 10 /* Shift _right_ */ -#define IGC_SRRCTL_BSIZEHDRSIZE_SHIFT 2 /* Shift _left_ */ +#define IGC_SRRCTL_BSIZEPKT_MASK GENMASK(6, 0) +#define IGC_SRRCTL_BSIZEPKT_SHIFT 10 /* Shift _right_ */ +#define IGC_SRRCTL_BSIZEHDRSIZE_MASK GENMASK(13, 8) +#define IGC_SRRCTL_BSIZEHDRSIZE_SHIFT 2 /* Shift _left_ */ +#define IGC_SRRCTL_DESCTYPE_MASK GENMASK(27, 25) #define IGC_SRRCTL_DESCTYPE_ADV_ONEBUF 0x02000000 #endif /* _IGC_BASE_H */ diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c index 25fc6c65209b..de7b21c2ccd6 100644 --- a/drivers/net/ethernet/intel/igc/igc_main.c +++ b/drivers/net/ethernet/intel/igc/igc_main.c @@ -641,7 +641,10 @@ static void igc_configure_rx_ring(struct igc_adapter *adapter, else buf_size = IGC_RXBUFFER_2048; - srrctl = IGC_RX_HDR_LEN << IGC_SRRCTL_BSIZEHDRSIZE_SHIFT; + srrctl = rd32(IGC_SRRCTL(reg_idx)); + srrctl &= ~(IGC_SRRCTL_BSIZEPKT_MASK | IGC_SRRCTL_BSIZEHDRSIZE_MASK | + IGC_SRRCTL_DESCTYPE_MASK); + srrctl |= IGC_RX_HDR_LEN << IGC_SRRCTL_BSIZEHDRSIZE_SHIFT; srrctl |= buf_size >> IGC_SRRCTL_BSIZEPKT_SHIFT; srrctl |= IGC_SRRCTL_DESCTYPE_ADV_ONEBUF;