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;
Message-ID: <d1088f1a-d9d2-68c9-ca2f-cf314f057aba@intel.com>
Date:   Wed, 18 Jan 2023 07:24:30 +0200
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101
 Firefox/102.0 Thunderbird/102.6.1
Subject: Re: [Intel-wired-lan] [PATCH] igc: return an error if the mac type is
 unknown in igc_ptp_systim_to_hwtstamp()
Content-Language: en-US
To:     Tom Rix <trix@redhat.com>, <jesse.brandeburg@intel.com>,
        <anthony.l.nguyen@intel.com>, <davem@davemloft.net>,
        <edumazet@google.com>, <kuba@kernel.org>, <pabeni@redhat.com>,
        <richardcochran@gmail.com>, <nathan@kernel.org>,
        <ndesaulniers@google.com>, <vinicius.gomes@intel.com>,
        <jeffrey.t.kirsher@intel.com>
CC:     <netdev@vger.kernel.org>, <llvm@lists.linux.dev>,
        <intel-wired-lan@lists.osuosl.org>, <linux-kernel@vger.kernel.org>
References: <20230114140412.3975245-1-trix@redhat.com>
From:   "Neftin, Sasha" <sasha.neftin@intel.com>
In-Reply-To: <20230114140412.3975245-1-trix@redhat.com>
Content-Type: text/plain; charset="UTF-8"; format=flowed
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?UTM0TUVDRWlFd0srYXBUMlZvS0ptdTFxZUszVFZoaVlKNTllUmdKNHpWTnZm?=
 =?utf-8?B?cFl5bkF6S2FLdThTdWhDL3Y1QnA4Z0RjMEI4U3QyYmtwZUs0S0Q1ZjJaRk85?=
 =?utf-8?B?VmVqa09tKzFOd1UwTE41ZTFIZW1ITGNoeWxPMkJ6UHlrc0MrMmdJZVd1YWZ3?=
 =?utf-8?B?NUI0dlVQcW5VSHg0MFBmKzM3Vjh1Z2JJMGUyNGltLzBEbDNEN0pLVVMrd04v?=
 =?utf-8?B?T3dSeUN1QlRTTi91dXFTRzA4TTVPNFZRMHFOaHhUdVJhaTJtdmtWRGZUVWZJ?=
 =?utf-8?B?elMvWmV6cjYwNEJYVjU2T2hBRnpuZDg0SzVoU2lSMThzS3RiMEVhTmdrNWJy?=
 =?utf-8?B?OVVWMlNHQzJjeGNQVldYLzd4Nzd6MjV2RklyVXhzcEx1UC9TdHdoSGxKOUg0?=
 =?utf-8?B?RDh6VFppdytOTjZ4cUV1Ung5cFdscWo3cE55REF0WlBXWnZCR1RmS3pKM1Vn?=
 =?utf-8?B?Y21IUTdiRWhGSzhyZnVLcmNHVkluUXd6a3o5NWRqK0xOMG9ubVBlOW9WT1hV?=
 =?utf-8?B?bjl2WjdyUFpNNmV2R1hRRDVmbGJranZzSU1vcnBKaDhpSU5kdUxqaEl5QXBB?=
 =?utf-8?B?ZU9CVlhxbDQ0c2c0MlRMZk5xa0dVcjU5U2h0YUp5SFNzczcxNm9XWUkzT3kx?=
 =?utf-8?B?VkpWaUxSNEh1bXA1YkNwSE5xUmxjc2xpUGI1YjczWW5CVWI5ZW1mdnR1VDAr?=
 =?utf-8?B?d0FWSFJXc2tyWVNaRVBPR00vQTJzaElTZ2phNU1MSHlQY29sRVRTenoyQ3Yr?=
 =?utf-8?B?TlloeTBtMXI5ck9JUzBoRGx5TTRFMW0rVEhNREo4TWJOeGhEK0RYVlVMbjFH?=
 =?utf-8?B?S3pQaVRnYVhHQUhrSVNvQkVqSkFPeXZEU0lUSHJxbVhEcjNMM21Va1JsMXli?=
 =?utf-8?B?aVp3ZDJGbHNZY0lPaHU0YXQzaFNvbnh2OVc1NmJIMFJ0SDBjVUpkekRpc2JE?=
 =?utf-8?B?Y2t1SGhqRkNVb081cjV1SDJDMnJ3cVFTQTBQUXF1QzNTZFhvYjVzc20vRnYr?=
 =?utf-8?B?SWtQZFRxcUt6L2JsUkl2RGRvOWpKaGtTQmRDdWtkUDg2Mnk0NWZmSlpmWCsw?=
 =?utf-8?B?cXdhZk5GTnhWSTJLSkhzTUtmMlkwR2Nhb1NBZUUySzBBaW9FNjUvcFVzM1RV?=
 =?utf-8?B?NGhMWGVJT1FnRU92NFZXdXdoRmNQMWg4elVjWW54YS85NkpKRVVGWVJzcUxO?=
 =?utf-8?B?UWwvbDloVzZwRXZIY0pOSUFxY01pOUlWRE9GUE95cmE0d09vb2pWM1BCb3V2?=
 =?utf-8?B?V1Q4NHZnYnFoZzFUVFR1ZGh5MjNGMEkwTHBnTDhscC8vakZyWWxBMmVGY1Rq?=
 =?utf-8?B?VjZzRnlucmt3cjlCbXo1Z0JzMWFYVUk1UDlVYWZhbTcvL1BsclZjQWVhcnN2?=
 =?utf-8?B?TkxGZWgwTHl1LzFiY3hESmVwbzA2K0V1QW9GNncxNzVFZ0Q4UmlSWTdmWjMy?=
 =?utf-8?B?ZDBpRGRzWnJSalhXNWdvNlRxUGlXbDVkcXNHRERhVFRESVNrbEdOSWFWKy9m?=
 =?utf-8?B?VEQyUnMrYTZXOE11WEp1MTJLeWJCUXhRWk1XTVoydzk0VU5WM0pQZGFDekI5?=
 =?utf-8?B?TjZ6bkc2S3V4SEZhU0RsdEJRMnVxenBPV2lGdFh5c2RSQTR4R1VXdE43Ym8v?=
 =?utf-8?B?Rml5ejZVVXYyYkpUYU5lRmVBcGJNUnFwdk1Ha1lPMXBvYXU3ZWZqMFJ4SWlS?=
 =?utf-8?B?WHZ0Um80QjdCalRWbFZ4eGl3VTBZTEJXYjR0dWdndWVXYUo5TWNQWit4QTJI?=
 =?utf-8?B?bFlWNGtybUpjMXpxUDRBT2VscGV4RmJpazluOWhJNE1HdDFYbGxtdnVYRytV?=
 =?utf-8?B?OUc0cmdWVU1pQlYvc1lKamw3ejFEZ3NNVmZNSWNTbmFQL0IramVGT01vK0R4?=
 =?utf-8?B?M2k0YW1CN0xRdExDbmdJU01jSTQvdFpvQm9MM1laOEorN0o5Z2VrNU9kM25w?=
 =?utf-8?B?SGZXalJPSnJrbC9kTmpPRFZxcC9XYUFWRk42enFweFJOWjBlZWdyUlhlY1E3?=
 =?utf-8?B?ck5XNmplWVYyemxLb3VTakFBckszNklZK2ptNlBkbWdnRGR3emdjRTcvTHFW?=
 =?utf-8?B?b012dFhoVnpMUTNFeUhZS0h2T09HakFEazhrTlFZRlVnUlU3RlNnSHRxWHFw?=
 =?utf-8?B?dWNIM3pTcFRRSXBJWlUxcUZBaW8ycUtuVnRybit0VGN4OFc1Q2xlcXMvVlNx?=
 =?utf-8?B?M0E9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: e9f31502-fabd-412c-e68a-08daf9144c1c
X-MS-Exchange-CrossTenant-AuthSource: MW4PR11MB6738.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jan 2023 05:24:40.1424
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: sL1+6TWbV6EjtqHmFvFAILHdyWdLAOopSvmUAlfHOm9kGws4ULZz0Wn4mEGNyyzc9QqEUhVqnSR0BlU8bDnTEw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR11MB5679
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-4.5 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,
        RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE 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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 1/14/2023 16:04, Tom Rix wrote:
> clang static analysis reports
> drivers/net/ethernet/intel/igc/igc_ptp.c:673:3: warning: The left operand of
>    '+' is a garbage value [core.UndefinedBinaryOperatorResult]
>     ktime_add_ns(shhwtstamps.hwtstamp, adjust);
>     ^            ~~~~~~~~~~~~~~~~~~~~
> 
> igc_ptp_systim_to_hwtstamp() silently returns without setting the hwtstamp
> if the mac type is unknown.  This should be treated as an error.
> 
> Fixes: 81b055205e8b ("igc: Add support for RX timestamping")
> Signed-off-by: Tom Rix <trix@redhat.com>
> ---
>   drivers/net/ethernet/intel/igc/igc_ptp.c | 14 +++++++++-----
>   1 file changed, 9 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/net/ethernet/intel/igc/igc_ptp.c b/drivers/net/ethernet/intel/igc/igc_ptp.c
> index c34734d432e0..4e10ced736db 100644
> --- a/drivers/net/ethernet/intel/igc/igc_ptp.c
> +++ b/drivers/net/ethernet/intel/igc/igc_ptp.c
> @@ -417,10 +417,12 @@ static int igc_ptp_verify_pin(struct ptp_clock_info *ptp, unsigned int pin,
>    *
>    * We need to convert the system time value stored in the RX/TXSTMP registers
>    * into a hwtstamp which can be used by the upper level timestamping functions.
> + *
> + * Returns 0 on success.
>    **/
> -static void igc_ptp_systim_to_hwtstamp(struct igc_adapter *adapter,
> -				       struct skb_shared_hwtstamps *hwtstamps,
> -				       u64 systim)
> +static int igc_ptp_systim_to_hwtstamp(struct igc_adapter *adapter,
> +				      struct skb_shared_hwtstamps *hwtstamps,
> +				      u64 systim)
>   {
>   	switch (adapter->hw.mac.type) {
>   	case igc_i225:
> @@ -430,8 +432,9 @@ static void igc_ptp_systim_to_hwtstamp(struct igc_adapter *adapter,
>   						systim & 0xFFFFFFFF);
>   		break;
>   	default:
> -		break;
> +		return -EINVAL;
>   	}
> +	return 0;
>   }
>   
>   /**
> @@ -652,7 +655,8 @@ static void igc_ptp_tx_hwtstamp(struct igc_adapter *adapter)
>   
>   	regval = rd32(IGC_TXSTMPL);
>   	regval |= (u64)rd32(IGC_TXSTMPH) << 32;
> -	igc_ptp_systim_to_hwtstamp(adapter, &shhwtstamps, regval);
> +	if (igc_ptp_systim_to_hwtstamp(adapter, &shhwtstamps, regval))
> +		return;
>   
>   	switch (adapter->link_speed) {
>   	case SPEED_10:
Acked-by: Sasha Neftin <sasha.neftin@intel.com>