From patchwork Fri Oct 13 12:46:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Matias_Bj=C3=B8rling?= X-Patchwork-Id: 10004599 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2E2C56037E for ; Fri, 13 Oct 2017 12:57:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 210BC2905B for ; Fri, 13 Oct 2017 12:57:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 15F8C2902E; Fri, 13 Oct 2017 12:57:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_HI,RCVD_IN_SORBS_SPAM autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B732A2905B for ; Fri, 13 Oct 2017 12:57:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758253AbdJMM5a (ORCPT ); Fri, 13 Oct 2017 08:57:30 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:53854 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758251AbdJMMre (ORCPT ); Fri, 13 Oct 2017 08:47:34 -0400 Received: by mail-wm0-f66.google.com with SMTP id q132so21529590wmd.2 for ; Fri, 13 Oct 2017 05:47:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bjorling.me; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GG42sKaO4cXUkgEC47dsoufsEUBDOVD9+vyRy+VyTZw=; b=GVY63jtE9XK4IZONupDVRKjL6R+Z8n99/5Zi10w9EYQXuZT0eJ1FEB7XeDCmsgnl+G 2x0UXTibexEWt2jKLB4S5bui2b9/BphpkbV4E+2slCXQnOLPR+JOB8soo2332N0jtmlT Aa+ARO8jpMKtOL5QSM6Sfth5tfAimK3Yd+rYY= 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:mime-version:content-transfer-encoding; bh=GG42sKaO4cXUkgEC47dsoufsEUBDOVD9+vyRy+VyTZw=; b=Lr8aar7a/7PcP977Cs4XW/I64YeakjXWBbKwXNIuT/O/DlKCNRZGta/X4wyjEIIPV+ bZj7hvWna6CfabwKDu/OdSNa2Y2MrRgcNP9cz3ZqllTMglmODzSbEFXH1b//TSxHNXIM ILsKA/sfVX7TLKxX0d/+bpodc7Gd+YcoNho68V7r8O6nMvxnyGSRpHDc/62SeO7cC/Ri 2mGpxd/Zpdrb9WmkCYxZV+/VT7VkQiNiMkBteYo5Ta5FuDc9c+iOzZfBqoi1uta9E152 IEzsF1GtGcjNgbYlwvY5EOIjBSr8mL1cH0YEROOKqHWZFzEnOOv5bcu+p97xOD5YxhMm tOCg== X-Gm-Message-State: AMCzsaWvC9FWYbzEAP3eni757pnkiXgvT/wqjaLM33V4kVGf9QH/dWT1 y+DdjJN22ErvDK8kFjyuGgBkSg== X-Google-Smtp-Source: AOwi7QBZv1SBStOMF41lU8i01pOsqXhADeM39xSUecztFJiC1jQpvFnxHoV4fHEvRfveuIAzIxt/xw== X-Received: by 10.80.152.103 with SMTP id h36mr2004133edb.293.1507898853754; Fri, 13 Oct 2017 05:47:33 -0700 (PDT) Received: from skyninja.cnexlabs.com (6164211-cl69.boa.fiberby.dk. [193.106.164.211]) by smtp.gmail.com with ESMTPSA id p91sm735012edp.69.2017.10.13.05.47.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Oct 2017 05:47:33 -0700 (PDT) From: =?UTF-8?q?Matias=20Bj=C3=B8rling?= To: axboe@fb.com Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Javier=20Gonz=C3=A1lez?= , =?UTF-8?q?Matias=20Bj=C3=B8rling?= Subject: [GIT PULL 28/58] lightnvm: pblk: simplify path on REQ_PREFLUSH Date: Fri, 13 Oct 2017 14:46:17 +0200 Message-Id: <20171013124647.32668-29-m@bjorling.me> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20171013124647.32668-1-m@bjorling.me> References: <20171013124647.32668-1-m@bjorling.me> MIME-Version: 1.0 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Javier González On REQ_PREFLUSH, directly tag the I/O context flags to signal a flush in the write to cache path, instead of finding the correct entry context and imposing a memory barrier. This simplifies the code and might potentially prevent race conditions when adding functionality to the write path. Signed-off-by: Javier González Signed-off-by: Matias Bjørling --- drivers/lightnvm/pblk-cache.c | 4 +++- drivers/lightnvm/pblk-rb.c | 8 +------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/lightnvm/pblk-cache.c b/drivers/lightnvm/pblk-cache.c index 1d6b8e3..0d227ef 100644 --- a/drivers/lightnvm/pblk-cache.c +++ b/drivers/lightnvm/pblk-cache.c @@ -43,8 +43,10 @@ int pblk_write_to_cache(struct pblk *pblk, struct bio *bio, unsigned long flags) if (unlikely(!bio_has_data(bio))) goto out; + pblk_ppa_set_empty(&w_ctx.ppa); w_ctx.flags = flags; - pblk_ppa_set_empty(&w_ctx.ppa); + if (bio->bi_opf & REQ_PREFLUSH) + w_ctx.flags |= PBLK_FLUSH_ENTRY; for (i = 0; i < nr_entries; i++) { void *data = bio_data(bio); diff --git a/drivers/lightnvm/pblk-rb.c b/drivers/lightnvm/pblk-rb.c index 74c768c..05e6b2e 100644 --- a/drivers/lightnvm/pblk-rb.c +++ b/drivers/lightnvm/pblk-rb.c @@ -355,7 +355,6 @@ static int pblk_rb_sync_point_set(struct pblk_rb *rb, struct bio *bio, { struct pblk_rb_entry *entry; unsigned int subm, sync_point; - int flags; subm = READ_ONCE(rb->subm); @@ -369,12 +368,6 @@ static int pblk_rb_sync_point_set(struct pblk_rb *rb, struct bio *bio, sync_point = (pos == 0) ? (rb->nr_entries - 1) : (pos - 1); entry = &rb->entries[sync_point]; - flags = READ_ONCE(entry->w_ctx.flags); - flags |= PBLK_FLUSH_ENTRY; - - /* Release flags on context. Protect from writes */ - smp_store_release(&entry->w_ctx.flags, flags); - /* Protect syncs */ smp_store_release(&rb->sync_point, sync_point); @@ -454,6 +447,7 @@ static int pblk_rb_may_write_flush(struct pblk_rb *rb, unsigned int nr_entries, /* Protect from read count */ smp_store_release(&rb->mem, mem); + return 1; }