From patchwork Thu May 6 12:30:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liming Sun X-Patchwork-Id: 1474952 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=Nvidia.com header.i=@Nvidia.com header.a=rsa-sha256 header.s=selector2 header.b=jJSxoR0/; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FbXxp4nWxz9sX3; Thu, 6 May 2021 22:31:25 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1ledA2-00052P-Kx; Thu, 06 May 2021 12:31:22 +0000 Received: from mail-eopbgr760088.outbound.protection.outlook.com ([40.107.76.88] helo=NAM02-CY1-obe.outbound.protection.outlook.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1ledA0-00051R-A5 for kernel-team@lists.ubuntu.com; Thu, 06 May 2021 12:31:20 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NYOGYnqGyb7EwgacaWr5oVcNRFS8xFuYd3/MaQS9pV9+KHyualctcoeWDy0legTuhdXeTjpZWqCYNqoZx9Xjtj/6s07y9mKSMg/h4+nIrQfAx+HEJKiW9SifjbAQu/hkWo++99x/BvDm1XxhykBZAMHARUsjaCy3+AXFXCZf+xEJnfGSZ255m5ROHswKJHIwYwnLumI66ACWDJHwp7LWQ0i51KBADnpMLc9m/lTrvP39cw05zmVsUJJj13DbdAYSX5oELaXH4OirZYYQSp+F/nmxk16qkxUe5aq6CpaNLY1Wi8guWajogg44P5Gdq2XVQchSWMnMgG0yMxFeaP7KJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jd8GbBh5IWBCxoCKnXsSA5MZup54vZ1k0SDuMPtcSC8=; b=oOkhFCAYzYGWc/OroneZ7ClgPYb5KQL1A8sJENiyTB6e8RFmSSE/qUZ2k5SDOp0BqJRxht5xA/sHOIMN3nO6O2wMpiY5bQTz5QIP6v73RbM1wtx+OaNEu0gIs4hJxPy1li0C7SS3RJXgf5U8QUg2S51dpAfoWNwrtzVzC99EVEtG8ao2dhVoqScDn7mJGCF/4NkKR6FugxDjC8tkQ1l6p7cCN7DzDr9hjJNbe++kCE0+hibmL35XLMa2KSH/snTOqHWoicZDp2EEY5hzv4J66SDXfJU+s3ujF4CML4V6C3trgzVCJnBVTZoZ9ykpiAslsvBbMubGZvewHJ76mFqVeA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.36) smtp.rcpttodomain=lists.ubuntu.com smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jd8GbBh5IWBCxoCKnXsSA5MZup54vZ1k0SDuMPtcSC8=; b=jJSxoR0/9owjrKCFbqmSxlk1JpG7J+FLFobTS5tpDV4BI00aOxpHiRtORx88aayZFAx43w74JK8ABvBwBSHYYROAjXs+gQyJixt5HLrI+n46akMEK45LVBCsJQ1It6ngqCaOWOIdd4nMmqBWHCwdUWLFhQs2rBwE95Rw3XRSvG0ODs4PzkVuHZABkYw/BveSVN1QJvur86QpyG3rFHwNnR/rs2AwmuDwdbzrBkY2rNkPWgfh06K0apvBpuiPWQxsNu04IzX6bfJra0NqfU2X+IfK0fG9MR7zrp115eMQHgU9OuVpdrXEFsIwUVQpTIHsEfuIeVio/VP6ptGwgDCysQ== Received: from BN0PR04CA0043.namprd04.prod.outlook.com (2603:10b6:408:e8::18) by BN9PR12MB5178.namprd12.prod.outlook.com (2603:10b6:408:11b::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.26; Thu, 6 May 2021 12:31:18 +0000 Received: from BN8NAM11FT004.eop-nam11.prod.protection.outlook.com (2603:10b6:408:e8:cafe::9b) by BN0PR04CA0043.outlook.office365.com (2603:10b6:408:e8::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Thu, 6 May 2021 12:31:18 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.36) smtp.mailfrom=nvidia.com; lists.ubuntu.com; dkim=none (message not signed) header.d=none;lists.ubuntu.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.36 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.36; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.36) by BN8NAM11FT004.mail.protection.outlook.com (10.13.176.164) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4108.25 via Frontend Transport; Thu, 6 May 2021 12:31:17 +0000 Received: from HQMAIL109.nvidia.com (172.20.187.15) by HQMAIL101.nvidia.com (172.20.187.10) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 6 May 2021 12:30:36 +0000 Received: from vdi.nvidia.com (172.20.145.6) by mail.nvidia.com (172.20.187.15) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Thu, 6 May 2021 05:30:35 -0700 From: Liming Sun To: Subject: [SRU][F:linux-bluefield][PATCH v3 1/1] UBUNTU: SAUCE: tmfifo: Fix a memory barrier issue Date: Thu, 6 May 2021 08:30:29 -0400 Message-ID: <09f6e8db17903d91c840716db4bc7c551e302e92.1620304098.git.limings@nvidia.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: References: MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0837d2e8-a677-417e-a3ff-08d9108ad89e X-MS-TrafficTypeDiagnostic: BN9PR12MB5178: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:556; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2xjwwNnHTVVbWEStwGmhcLEYF1Bb8xVaBAyVrgVqLj/o4QM8u6Xv+6g5JgEZLuIQdpz7bFqUSfuT/PWUga1tOmj/lUvBotwmJw18rpmkED5nDVN9okAnsGFpGutllSzbMskaKNK2gFiXywAxDJ3zwIHOjj4lbf6c1k2s1HisreLJyLcryrfNFqpeMZ7fJg1FT9mQQjjqLRUCs140xz2LJYr1E5NRn1K/LLrg6yEx/v+FfyKQHLozRRNNC3JGou+Fr7DgyUZgR1uT8uV3zcu4g6n1GDYYOYoF8tOIKx5TZKrlhuLzSyqGxftVNBJSX2j7ugu3wFqD3cLC7JOJNbnCxBFkkmLizh0p1vEkleNSwGoeJP+fiLucqihwV38YpsqQ/YdaIrDIdlCfesnloowyvuUDP5dA5kcyA6AQkbf1VXPRFyqRWAbRXdFhjlrbAQqLWW8o5XntOwqDYhEw6g7nDDldS2Ac3J5Pw7gSBgtGnpQuHlGlAeh9xPfJAugKpqtpFszZWG21Ok7Q3aCwTdtrMJJO5FROKzXLSOZvhMPnyN8yiKHY80Q8Y0Q584oLQwk1UYZenLKwk5Wro61zgjnlTa+myJCHejkVIKW5KC9HEO1kGFL2H6tEWuLEr/wseG7HT1bNd7oWoMXX/WGxM6TJPTTNO4WffniTLMRzFXSfK0vUckHvwIhuFuMxYh3aCwFkQ62PSbaV0h3KNHq/8RcrzHEsB8a3tPAviXe5tpjoBjk= X-Forefront-Antispam-Report: CIP:216.228.112.36; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid05.nvidia.com; CAT:NONE; SFS:(4636009)(396003)(346002)(376002)(136003)(39850400004)(36840700001)(46966006)(6916009)(82310400003)(83380400001)(186003)(336012)(7636003)(47076005)(2906002)(36756003)(2616005)(70586007)(426003)(26005)(966005)(478600001)(356005)(36860700001)(8936002)(82740400003)(316002)(7696005)(6666004)(4326008)(86362001)(8676002)(107886003)(5660300002)(54906003)(70206006); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 May 2021 12:31:17.3563 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0837d2e8-a677-417e-a3ff-08d9108ad89e X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.36]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT004.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN9PR12MB5178 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Liming Sun , Liming Sun Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Liming Sun BugLink: https://bugs.launchpad.net/bugs/1927262 The virtio framework uses wmb() when updating avail->idx. It gurantees the write order, but not necessarily loading order for the code accessing the memory. This commit adds a load barrier after reading the avail->idx to make sure all the data in the descriptor is visible. It also adds a barrier when returning the packet to virtio framework to make sure read/writes are visible to the virtio code. Signed-off-by: Liming Sun Acked-by: Krzysztof Kozlowski Acked-by: Tim Gardner --- drivers/platform/mellanox/mlxbf-tmfifo.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/platform/mellanox/mlxbf-tmfifo.c b/drivers/platform/mellanox/mlxbf-tmfifo.c index 5739a966..92bda873 100644 --- a/drivers/platform/mellanox/mlxbf-tmfifo.c +++ b/drivers/platform/mellanox/mlxbf-tmfifo.c @@ -294,6 +294,9 @@ static irqreturn_t mlxbf_tmfifo_irq_handler(int irq, void *arg) if (vring->next_avail == virtio16_to_cpu(vdev, vr->avail->idx)) return NULL; + /* Make sure 'avail->idx' is visible already. */ + virtio_rmb(false); + idx = vring->next_avail % vr->num; head = virtio16_to_cpu(vdev, vr->avail->ring[idx]); if (WARN_ON(head >= vr->num)) @@ -322,7 +325,7 @@ static void mlxbf_tmfifo_release_desc(struct mlxbf_tmfifo_vring *vring, * done or not. Add a memory barrier here to make sure the update above * completes before updating the idx. */ - mb(); + virtio_mb(false); vr->used->idx = cpu_to_virtio16(vdev, vr_idx + 1); } @@ -730,6 +733,12 @@ static bool mlxbf_tmfifo_rxtx_one_desc(struct mlxbf_tmfifo_vring *vring, desc = NULL; fifo->vring[is_rx] = NULL; + /* + * Make sure the load/store are in order before + * returning back to virtio. + */ + virtio_mb(false); + /* Notify upper layer that packet is done. */ spin_lock_irqsave(&fifo->spin_lock[is_rx], flags); vring_interrupt(0, vring->vq);