From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B75F915B998; Tue, 16 Jun 2026 15:52:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781625174; cv=none; b=YpHyc9Tx37pGMyoOA429oByZAp6mw59Pfk2GZjRoSxay8OaWNFLgLXgtAhpAtZ4Ec/Dfqs09P58ndUIWyH63fI2cGDntcVvPNqZ+BpDWZpmM5RRfj0ZB+k/yn9J482Kl40oMuFRqVNdMznGX5nLLgYraa+ldAMeqsqNcaCkRef4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781625174; c=relaxed/simple; bh=Tb41KxDta9HnrxK0wTXK5yHXZoXIKmElBTWDwlTYRBM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IiiRxPgUBOjNDWjGIodcplIbGJrWgzidMF7HIO8vl8fLZcnU+SLT32hMXmCqRYYUHgzKq4vk/Hvzg/+ZURrWgvZn5SIXDmXsND73BdJBEETe6n6BC2utBbs0ZC8rqRrx9qNEeYrsQVhE6v0wwL7FRSJS0LBlPFxO/p9NL3bM3Ro= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Y+EWWIBS; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Y+EWWIBS" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B82BA1F000E9; Tue, 16 Jun 2026 15:52:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1781625173; bh=1A6ZFK4hj8Tjfjait4uoKKsodPuO9xXeoY6wdLpLMT0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Y+EWWIBSI8Hu4FYZnXul/TKX0ZHON/IZ5yQM9Gab3sGFYq+/jFRr/jy51ls1JGjw3 jQGL6fIQ58O9iK31tETiARzvQiJrbGLB3vTtJwPeItZHs7JXQk9LIJPmtHU4rp0m3p ap9pBdCqFWO830GFyBaBoKAV4BOvwniYsxE8qCQ0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Arthur Kiyanovski , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.18 092/325] net: ena: PHC: Add missing barrier Date: Tue, 16 Jun 2026 20:28:08 +0530 Message-ID: <20260616145102.284976709@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260616145057.827196531@linuxfoundation.org> References: <20260616145057.827196531@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Arthur Kiyanovski [ Upstream commit 954981dbbfbd78f21d2fbac1ac0742dbf38b4e69 ] Add dma_rmb() barrier after req_id completion check in ena_com_phc_get_timestamp(). On weakly-ordered architectures, payload fields may be read before req_id is observed as updated. Fixes: e0ea34158ee8 ("net: ena: Add PHC support in the ENA driver") Closes: https://sashiko.dev/#/patchset/20260430032507.11586-1-akiyano%40amazon.com Signed-off-by: Arthur Kiyanovski Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/amazon/ena/ena_com.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/ethernet/amazon/ena/ena_com.c b/drivers/net/ethernet/amazon/ena/ena_com.c index 8c86789d867a5f..297fb36ab8c16f 100644 --- a/drivers/net/ethernet/amazon/ena/ena_com.c +++ b/drivers/net/ethernet/amazon/ena/ena_com.c @@ -1880,6 +1880,11 @@ int ena_com_phc_get_timestamp(struct ena_com_dev *ena_dev, u64 *timestamp) continue; } + /* Ensure PHC payload (timestamp, error_flags) is read + * after req_id update is observed + */ + dma_rmb(); + /* req_id was updated by the device which indicates that * PHC timestamp and error_flags are updated too, * checking errors before retrieving timestamp -- 2.53.0