From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 92266C04AAC for ; Mon, 20 May 2019 17:24:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 68D42214DA for ; Mon, 20 May 2019 17:24:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="efPBd60S" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392899AbfETRYq (ORCPT ); Mon, 20 May 2019 13:24:46 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:35463 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2392897AbfETRYo (ORCPT ); Mon, 20 May 2019 13:24:44 -0400 Received: by mail-wr1-f67.google.com with SMTP id m3so2551092wrv.2 for ; Mon, 20 May 2019 10:24:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=9f53yOiq05lWNzaZ4psZ5nNqcD+KW9Z7mWrkNOPWql4=; b=efPBd60SOweuaEtrPmrvEAgFFXxgKxmKmyy9bpp8zJvI5p/4b8l1Mn6o8ECeNMr/8o TR/T60XAGyrFAEC62ziZN83mYFMvD8us0wEeBN1UQDPpg+6HiATagjokE0O0ckPxuq8a u81B8sI9GEMzVMYxkYjOB3RafSNgh5bJD8f2s= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=9f53yOiq05lWNzaZ4psZ5nNqcD+KW9Z7mWrkNOPWql4=; b=LKzl/1wk1su63Vsy5W+oiijtd1HOAXM2u3tfFNSwNbUqZN2zzXFAabHpFfKPAL35Ih 2SEy+qaEiD0+hOPEhXzhjhpbVbR+qJ8pk/OYUVspyXJALA5OM+xVnmGnNkglCr0Z1cjk fl/FaUz97Khmg94QmkAtarkPf8jvHhxiQVA9C/qPWtVmV1CZCE5KRqMFp1NuLD2zoG9D O1UnXBm/FybFT+89H9/fePUI7OuQPeF3vt6cxfj6Ue0H+i9P/K5iEhc5DctOXrYUb4Pn oKQ71jH2z5KeMbR1J9/aTYpVq5W+AP0i5AdD0zYqIKsXsZ6Z95TztgCHG9q0fjxcwLry U0Rg== X-Gm-Message-State: APjAAAWD3Hiucuyk9dWev6eP97hDg5oeIqdnUhQTpxpqecgubhporZQL Uup4BYf1gl4DT/gdpBU4ih1ymA== X-Google-Smtp-Source: APXvYqyx/q1u3qdOUfvt8mMH75in5zSdwv3nB5g27nP/2IT3WgDE13X8vLgZnhmLOLrTkenOvjl+Zw== X-Received: by 2002:adf:efc3:: with SMTP id i3mr30248014wrp.45.1558373083131; Mon, 20 May 2019 10:24:43 -0700 (PDT) Received: from localhost.localdomain ([91.253.179.221]) by smtp.gmail.com with ESMTPSA id b12sm180021wmg.27.2019.05.20.10.24.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 20 May 2019 10:24:42 -0700 (PDT) From: Andrea Parri To: linux-kernel@vger.kernel.org Cc: Andrea Parri , stable@vger.kernel.org, Jens Axboe , Omar Sandoval , Ming Lei , linux-block@vger.kernel.org, "Paul E. McKenney" , Peter Zijlstra Subject: [PATCH 3/4] sbitmap: fix improper use of smp_mb__before_atomic() Date: Mon, 20 May 2019 19:23:57 +0200 Message-Id: <1558373038-5611-4-git-send-email-andrea.parri@amarulasolutions.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1558373038-5611-1-git-send-email-andrea.parri@amarulasolutions.com> References: <1558373038-5611-1-git-send-email-andrea.parri@amarulasolutions.com> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org This barrier only applies to the read-modify-write operations; in particular, it does not apply to the atomic_set() primitive. Replace the barrier with an smp_mb(). Fixes: 6c0ca7ae292ad ("sbitmap: fix wakeup hang after sbq resize") Cc: stable@vger.kernel.org Reported-by: "Paul E. McKenney" Reported-by: Peter Zijlstra Signed-off-by: Andrea Parri Reviewed-by: Ming Lei Cc: Jens Axboe Cc: Omar Sandoval Cc: Ming Lei Cc: linux-block@vger.kernel.org Cc: "Paul E. McKenney" Cc: Peter Zijlstra --- lib/sbitmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/sbitmap.c b/lib/sbitmap.c index 155fe38756ecf..4a7fc4915dfc6 100644 --- a/lib/sbitmap.c +++ b/lib/sbitmap.c @@ -435,7 +435,7 @@ static void sbitmap_queue_update_wake_batch(struct sbitmap_queue *sbq, * to ensure that the batch size is updated before the wait * counts. */ - smp_mb__before_atomic(); + smp_mb(); for (i = 0; i < SBQ_WAIT_QUEUES; i++) atomic_set(&sbq->ws[i].wait_cnt, 1); } -- 2.7.4