Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp761676ybl; Wed, 4 Dec 2019 10:24:55 -0800 (PST) X-Google-Smtp-Source: APXvYqwLrE9wovmqbGGEiolw2CWb+2HvxOahs+WmeCaYHVAWcLXTBYKUmmqvuxDDUpP/6bqKb/ww X-Received: by 2002:a9d:53c2:: with SMTP id i2mr3361602oth.43.1575483895188; Wed, 04 Dec 2019 10:24:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575483895; cv=none; d=google.com; s=arc-20160816; b=RjbxKudm1nqpQZ/hZXuiUvHuvmlnKqjd6N1cp/8gNyllpaHmUceeLilwyuJZMxu5ix wPZbvlesk6SHOjdL7V3Oe3B2CJbeCC9SvKUzCifXccYQrym712ZBBxVpOaJge+hHfmNV Pz5F7X4zz/RwLoInIGoj9lSUexCQ8xsOTHgZ019bBzwnl+FQOlJYHN6EbpKkCR/KB5Ku nWI0PSTqtKE8xRpqTd0D/4R7FlqAc+D4Pp2Z4JTizIQGcHMjrHNlKlRdjJ8xs5b+wGlZ h+DNn/Ejtt7w61g/ppqQQ0v8jOfdJixG/+JM6KN6HyT1kjCqVdX+Wxr8OBUvBDbPxdaW zG7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=uqubZpKGpdmOHvkDHXKsQ0WhGtA2yEGbfgt8+WJN8wM=; b=MkB336H0bzH76e5U+gRYpcM43Yeukq01BG5LicZwzCeRrfrToojOrVXZaqpr/tifuE 3Gt+t4cSx7lKZES/ceYUzov3lGRJ60CukSRVQc5WjesVOfKcc3rMQpS8Pmrs+pmxykF3 SeFJBxcGR0oV+L+fJKqAGUGrF8t5liQ+orefWMO+3Qw0I+4DvIq9LQUvOrX/BP8gjgsY E85mbHkqOZOUagHpAEky158Tey63CR5RQs9rPS3WIShYDBc6bq+dfK0a/c5ClSnA7/v1 XLAqiEl7AIJWUQdW0VtdgoFksurG73r04JC+g2shEEVgmoRRmWLyniHdr89quTooy5Fm gENQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=dZ1P4uI0; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l20si3615140otd.292.2019.12.04.10.24.42; Wed, 04 Dec 2019 10:24:55 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=dZ1P4uI0; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730862AbfLDSWh (ORCPT + 99 others); Wed, 4 Dec 2019 13:22:37 -0500 Received: from mail.kernel.org ([198.145.29.99]:51198 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729984AbfLDSFF (ORCPT ); Wed, 4 Dec 2019 13:05:05 -0500 Received: from localhost (unknown [217.68.49.72]) (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 753A3206DF; Wed, 4 Dec 2019 18:05:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575482704; bh=VvRfFCC/KgixHFcsaFYlG0r52DlU90PC4AO4Z5QVs/Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dZ1P4uI0/CN3dJ77rZ/c1eXkJoc9kC2gWEs3L3sm/S5Mi6CAMhwKGL0ruMGbJUbUH q262zNpD3metNIDiB5wtC5i4kL46gZHMx7+JpIMlhcbw1L73HBhIWJIhGTGb99qfEE AdXSVASmrlsyzy4onIOUA3jsXZeBuSY/uS5O3fxg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Parav Pandit , Jason Gunthorpe , Sasha Levin Subject: [PATCH 4.14 103/209] IB/rxe: Make counters thread safe Date: Wed, 4 Dec 2019 18:55:15 +0100 Message-Id: <20191204175328.951209411@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191204175321.609072813@linuxfoundation.org> References: <20191204175321.609072813@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Parav Pandit [ Upstream commit d5108e69fe013ff47ab815b849caba9cc33ca1e5 ] Current rxe device counters are not thread safe. When multiple QPs are used, they can be racy. Make them thread safe by making it atomic64. Fixes: 0b1e5b99a48b ("IB/rxe: Add port protocol stats") Signed-off-by: Parav Pandit Signed-off-by: Jason Gunthorpe Signed-off-by: Sasha Levin --- drivers/infiniband/sw/rxe/rxe_hw_counters.c | 2 +- drivers/infiniband/sw/rxe/rxe_verbs.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/infiniband/sw/rxe/rxe_hw_counters.c b/drivers/infiniband/sw/rxe/rxe_hw_counters.c index 6aeb7a165e469..ea4542a9d69e6 100644 --- a/drivers/infiniband/sw/rxe/rxe_hw_counters.c +++ b/drivers/infiniband/sw/rxe/rxe_hw_counters.c @@ -59,7 +59,7 @@ int rxe_ib_get_hw_stats(struct ib_device *ibdev, return -EINVAL; for (cnt = 0; cnt < ARRAY_SIZE(rxe_counter_name); cnt++) - stats->value[cnt] = dev->stats_counters[cnt]; + stats->value[cnt] = atomic64_read(&dev->stats_counters[cnt]); return ARRAY_SIZE(rxe_counter_name); } diff --git a/drivers/infiniband/sw/rxe/rxe_verbs.h b/drivers/infiniband/sw/rxe/rxe_verbs.h index b2b76a316ebae..d1cc89f6f2e33 100644 --- a/drivers/infiniband/sw/rxe/rxe_verbs.h +++ b/drivers/infiniband/sw/rxe/rxe_verbs.h @@ -410,16 +410,16 @@ struct rxe_dev { spinlock_t mmap_offset_lock; /* guard mmap_offset */ int mmap_offset; - u64 stats_counters[RXE_NUM_OF_COUNTERS]; + atomic64_t stats_counters[RXE_NUM_OF_COUNTERS]; struct rxe_port port; struct list_head list; struct crypto_shash *tfm; }; -static inline void rxe_counter_inc(struct rxe_dev *rxe, enum rxe_counters cnt) +static inline void rxe_counter_inc(struct rxe_dev *rxe, enum rxe_counters index) { - rxe->stats_counters[cnt]++; + atomic64_inc(&rxe->stats_counters[index]); } static inline struct rxe_dev *to_rdev(struct ib_device *dev) -- 2.20.1