Received: by 2002:a05:6a10:9e8c:0:0:0:0 with SMTP id y12csp259878pxx; Wed, 28 Oct 2020 04:21:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxGsdmbT+Xmu9FJ/x6po9unpeKQvzF7lf91Q8Xz/yiYABfIBXf525CWgx4xqa2Tg/E6NkCh X-Received: by 2002:a17:906:8058:: with SMTP id x24mr2011862ejw.272.1603884073528; Wed, 28 Oct 2020 04:21:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1603884073; cv=none; d=google.com; s=arc-20160816; b=p+cPDaW80t93truh6pc6xjZ51/WghPc1x19eBuJtuC+aSj7oU7toJkUXopUhGWdi9n +MA5jDIow4L/WXyYM8RTv4CVrHtHh4SniGhd2gokaqPozpP51UmEx/j52xPqhhLRwZsO S+VshBe40n/lGunoCUjS7B8FC4l/KPfkND1AcNA3uV2e9dAbzBD754lxCH79PGWddU3S j4Sl2IXEKVsNDVwtKbf0Nr68zGpR7zzrXkCCjKX9tNoFe1DqLpu14pnzhgpIjgEabtGh LAyXmLXiBnpoALmfII+UoRn0Fn3Dm+yKNPSkrsPIin4hZzAbrZF7sylUwyHPsv284Zra Vnlw== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=jOBtD/XRISkqKpZfzti4VbXxrroynkVbT8M4CePLo9s=; b=yh5LCpNqgPlM+DKdsDVF2Yl8b8BKAUqJYg/JpIFZxFlIJyJEYN7M3HEDdxd7Alir75 GT7ftUr5HjEHF+klFqm7pkLqCOxYCMapw6xqq64JY5fOdsHU0FjCQM7JzSL9bvSZhAn1 RB5crPjJlbhgdwAjrVOZK2NJDUD6x5zeoEr06wPVHm7DaoAZ7ty/J+qmBpvkbU2QXH/T 89InxNRoCbniH3oTg6S6oQk8iVVOF7FBRwihslK332RKg9uZiXXE5lUYZiBTKGfB485P ZNdxxc1cKvv+UNnFX9dtOZAbtbNepSWAHF8gkdIIib+DkhyLdL4GretWdm27XqOUU9vR 5BYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=w+yjiWlg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d4si2698178edr.173.2020.10.28.04.20.51; Wed, 28 Oct 2020 04:21:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=w+yjiWlg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1789441AbgJ0PCQ (ORCPT + 99 others); Tue, 27 Oct 2020 11:02:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:60698 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1784389AbgJ0O7H (ORCPT ); Tue, 27 Oct 2020 10:59:07 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0146720714; Tue, 27 Oct 2020 14:59:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603810747; bh=O87+XfpZ5i2uWQkUtxNP+ISVBsLYB03oZkYU5gowM4k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=w+yjiWlgRCcOTvHRu+tklqknNgFzTAbhJ77jgNSZZBMDcRD0zZf2s++icceQdS07u Yk/M6qN3DOe7lCgv5iSXEjsoq/PyavmE16Zc8yRG2LcVlZDLc1h0s1Q8f9s+YwfJ8h xoEZS52WepsSTXaw3t+snF9DgjmAlN8IFR2rQtc4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Eran Ben Elisha , Sasha Levin Subject: [PATCH 5.8 218/633] net/mlx5: Dont call timecounter cyc2time directly from 1PPS flow Date: Tue, 27 Oct 2020 14:49:21 +0100 Message-Id: <20201027135532.911456396@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135522.655719020@linuxfoundation.org> References: <20201027135522.655719020@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Eran Ben Elisha [ Upstream commit 0d2ffdc8d4002a62de31ff7aa3bef28c843c3cbe ] Before calling timecounter_cyc2time(), clock->lock must be taken. Use mlx5_timecounter_cyc2time instead which guarantees a safe access. Fixes: afc98a0b46d8 ("net/mlx5: Update ptp_clock_event foreach PPS event") Signed-off-by: Eran Ben Elisha Signed-off-by: Sasha Levin --- drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c b/drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c index 2d55b7c22c034..4e7cfa22b3d2f 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c @@ -550,8 +550,9 @@ static int mlx5_pps_event(struct notifier_block *nb, switch (clock->ptp_info.pin_config[pin].func) { case PTP_PF_EXTTS: ptp_event.index = pin; - ptp_event.timestamp = timecounter_cyc2time(&clock->tc, - be64_to_cpu(eqe->data.pps.time_stamp)); + ptp_event.timestamp = + mlx5_timecounter_cyc2time(clock, + be64_to_cpu(eqe->data.pps.time_stamp)); if (clock->pps_info.enabled) { ptp_event.type = PTP_CLOCK_PPSUSR; ptp_event.pps_times.ts_real = -- 2.25.1