From: Mike Snitzer <snitzer@redhat.com> To: Mikulas Patocka <mpatocka@redhat.com> Cc: device-mapper development <dm-devel@redhat.com>, linux-nvdimm <linux-nvdimm@lists.01.org> Subject: Re: [patch 4/4] dm-writecache: use new API for flushing Date: Thu, 31 May 2018 08:09:06 -0400 [thread overview] Message-ID: <20180531120906.GA8456@redhat.com> (raw) In-Reply-To: <alpine.LRH.2.02.1805310412240.30096@file01.intranet.prod.int.rdu2.redhat.com> On Thu, May 31 2018 at 4:16am -0400, Mikulas Patocka <mpatocka@redhat.com> wrote: > > > On Wed, 30 May 2018, Mike Snitzer wrote: > > > On Wed, May 30 2018 at 10:09P -0400, > > Mikulas Patocka <mpatocka@redhat.com> wrote: > > > > > And what about this? > > > #define WC_MODE_PMEM(wc) ((wc)->pmem_mode) > > > > > > The code that I had just allowed the compiler to optimize out > > > persistent-memory code if we have DM_WRITECACHE_ONLY_SSD defined - and you > > > deleted it. > > > > > > Most architectures don't have persistent memory and the dm-writecache > > > driver could work in ssd-only mode on them. On these architectures, I > > > define > > > #define WC_MODE_PMEM(wc) false > > > - and the compiler will just automatically remove the tests for that > > > condition and the unused branch. It does also eliminate unused static > > > functions. > > > > Here is the patch that I just folded into the rebased version of > > dm-writecache now in the dm-4.18 branch. > > > > (I rebased ontop of Jens' latest block tree for 4.18 that now includes > > the mempool_init changes, etc.) > > > > --- > > drivers/md/dm-writecache.c | 17 +++++++++++++++-- > > 1 file changed, 15 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/md/dm-writecache.c b/drivers/md/dm-writecache.c > > index fcbfaf7c27ec..691b5ffb799f 100644 > > --- a/drivers/md/dm-writecache.c > > +++ b/drivers/md/dm-writecache.c > > @@ -34,13 +34,21 @@ > > #define BITMAP_GRANULARITY PAGE_SIZE > > #endif > > > > +#if defined(CONFIG_ARCH_HAS_PMEM_API) && IS_ENABLED(CONFIG_DAX_DRIVER) > > +#define DM_WRITECACHE_HAS_PMEM > > +#endif > > + > > +#ifdef DM_WRITECACHE_HAS_PMEM > > #define pmem_assign(dest, src) \ > > do { \ > > typeof(dest) uniq = (src); \ > > memcpy_flushcache(&(dest), &uniq, sizeof(dest)); \ > > } while (0) > > +#else > > +#define pmem_assign(dest, src) ((dest)) = (src)) > > +#endif > > > > -#if defined(__HAVE_ARCH_MEMCPY_MCSAFE) && defined(CONFIG_ARCH_HAS_PMEM_API) > > +#if defined(__HAVE_ARCH_MEMCPY_MCSAFE) && defined(DM_WRITECACHE_HAS_PMEM) > > #define DM_WRITECACHE_HANDLE_HARDWARE_ERRORS > > #endif > > > > @@ -87,8 +95,13 @@ struct wc_entry { > > #endif > > }; > > > > +#ifdef DM_WRITECACHE_HAS_PMEM > > #define WC_MODE_PMEM(wc) ((wc)->pmem_mode) > > #define WC_MODE_FUA(wc) ((wc)->writeback_fua) > > +#else > > +#define WC_MODE_PMEM(wc) false > > +#define WC_MODE_FUA(wc) false > > +#endif > > #define WC_MODE_SORT_FREELIST(wc) (!WC_MODE_PMEM(wc)) > > > > struct dm_writecache { > > @@ -1857,7 +1870,7 @@ static int writecache_ctr(struct dm_target *ti, unsigned argc, char **argv) > > if (!strcasecmp(string, "s")) { > > wc->pmem_mode = false; > > } else if (!strcasecmp(string, "p")) { > > -#if defined(CONFIG_ARCH_HAS_PMEM_API) && IS_ENABLED(CONFIG_DAX_DRIVER) > > +#ifdef DM_WRITECACHE_HAS_PMEM > > wc->pmem_mode = true; > > wc->writeback_fua = true; > > #else > > -- > > 2.15.0 > > OK. > > I think that persistent_memory_claim should also be conditioned based on > DM_WRITECACHE_HAS_PMEM - i.e. if we have DM_WRITECACHE_HAS_PMEM, we don't > need to use other ifdefs. > > Is there some difference between "#if IS_ENABLED(CONFIG_OPTION)" and > "#if defined(CONFIG_OPTION)"? Not that I'm aware of: #define IS_ENABLED(option) __or(IS_BUILTIN(option), IS_MODULE(option)) Here is the incremental patch I just folded in: diff --git a/drivers/md/dm-writecache.c b/drivers/md/dm-writecache.c index fd3bc232b7d6..f2ae02f22c43 100644 --- a/drivers/md/dm-writecache.c +++ b/drivers/md/dm-writecache.c @@ -34,7 +34,7 @@ #define BITMAP_GRANULARITY PAGE_SIZE #endif -#if defined(CONFIG_ARCH_HAS_PMEM_API) && IS_ENABLED(CONFIG_DAX_DRIVER) +#if IS_ENABLED(CONFIG_ARCH_HAS_PMEM_API) && IS_ENABLED(CONFIG_DAX_DRIVER) #define DM_WRITECACHE_HAS_PMEM #endif @@ -218,7 +218,7 @@ static void wc_unlock(struct dm_writecache *wc) mutex_unlock(&wc->lock); } -#if IS_ENABLED(CONFIG_DAX_DRIVER) +#ifdef DM_WRITECACHE_HAS_PMEM static int persistent_memory_claim(struct dm_writecache *wc) { int r; _______________________________________________ Linux-nvdimm mailing list Linux-nvdimm@lists.01.org https://lists.01.org/mailman/listinfo/linux-nvdimm
WARNING: multiple messages have this Message-ID (diff)
From: Mike Snitzer <snitzer-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> To: Mikulas Patocka <mpatocka-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> Cc: device-mapper development <dm-devel-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>, linux-nvdimm <linux-nvdimm-hn68Rpc1hR1g9hUCZPvPmw@public.gmane.org> Subject: Re: [patch 4/4] dm-writecache: use new API for flushing Date: Thu, 31 May 2018 08:09:06 -0400 [thread overview] Message-ID: <20180531120906.GA8456@redhat.com> (raw) In-Reply-To: <alpine.LRH.2.02.1805310412240.30096-Hpncn10jQN4oNljnaZt3ZvA+iT7yCHsGwRM8/txMwJMAicBL8TP8PQ@public.gmane.org> On Thu, May 31 2018 at 4:16am -0400, Mikulas Patocka <mpatocka-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote: > > > On Wed, 30 May 2018, Mike Snitzer wrote: > > > On Wed, May 30 2018 at 10:09P -0400, > > Mikulas Patocka <mpatocka-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote: > > > > > And what about this? > > > #define WC_MODE_PMEM(wc) ((wc)->pmem_mode) > > > > > > The code that I had just allowed the compiler to optimize out > > > persistent-memory code if we have DM_WRITECACHE_ONLY_SSD defined - and you > > > deleted it. > > > > > > Most architectures don't have persistent memory and the dm-writecache > > > driver could work in ssd-only mode on them. On these architectures, I > > > define > > > #define WC_MODE_PMEM(wc) false > > > - and the compiler will just automatically remove the tests for that > > > condition and the unused branch. It does also eliminate unused static > > > functions. > > > > Here is the patch that I just folded into the rebased version of > > dm-writecache now in the dm-4.18 branch. > > > > (I rebased ontop of Jens' latest block tree for 4.18 that now includes > > the mempool_init changes, etc.) > > > > --- > > drivers/md/dm-writecache.c | 17 +++++++++++++++-- > > 1 file changed, 15 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/md/dm-writecache.c b/drivers/md/dm-writecache.c > > index fcbfaf7c27ec..691b5ffb799f 100644 > > --- a/drivers/md/dm-writecache.c > > +++ b/drivers/md/dm-writecache.c > > @@ -34,13 +34,21 @@ > > #define BITMAP_GRANULARITY PAGE_SIZE > > #endif > > > > +#if defined(CONFIG_ARCH_HAS_PMEM_API) && IS_ENABLED(CONFIG_DAX_DRIVER) > > +#define DM_WRITECACHE_HAS_PMEM > > +#endif > > + > > +#ifdef DM_WRITECACHE_HAS_PMEM > > #define pmem_assign(dest, src) \ > > do { \ > > typeof(dest) uniq = (src); \ > > memcpy_flushcache(&(dest), &uniq, sizeof(dest)); \ > > } while (0) > > +#else > > +#define pmem_assign(dest, src) ((dest)) = (src)) > > +#endif > > > > -#if defined(__HAVE_ARCH_MEMCPY_MCSAFE) && defined(CONFIG_ARCH_HAS_PMEM_API) > > +#if defined(__HAVE_ARCH_MEMCPY_MCSAFE) && defined(DM_WRITECACHE_HAS_PMEM) > > #define DM_WRITECACHE_HANDLE_HARDWARE_ERRORS > > #endif > > > > @@ -87,8 +95,13 @@ struct wc_entry { > > #endif > > }; > > > > +#ifdef DM_WRITECACHE_HAS_PMEM > > #define WC_MODE_PMEM(wc) ((wc)->pmem_mode) > > #define WC_MODE_FUA(wc) ((wc)->writeback_fua) > > +#else > > +#define WC_MODE_PMEM(wc) false > > +#define WC_MODE_FUA(wc) false > > +#endif > > #define WC_MODE_SORT_FREELIST(wc) (!WC_MODE_PMEM(wc)) > > > > struct dm_writecache { > > @@ -1857,7 +1870,7 @@ static int writecache_ctr(struct dm_target *ti, unsigned argc, char **argv) > > if (!strcasecmp(string, "s")) { > > wc->pmem_mode = false; > > } else if (!strcasecmp(string, "p")) { > > -#if defined(CONFIG_ARCH_HAS_PMEM_API) && IS_ENABLED(CONFIG_DAX_DRIVER) > > +#ifdef DM_WRITECACHE_HAS_PMEM > > wc->pmem_mode = true; > > wc->writeback_fua = true; > > #else > > -- > > 2.15.0 > > OK. > > I think that persistent_memory_claim should also be conditioned based on > DM_WRITECACHE_HAS_PMEM - i.e. if we have DM_WRITECACHE_HAS_PMEM, we don't > need to use other ifdefs. > > Is there some difference between "#if IS_ENABLED(CONFIG_OPTION)" and > "#if defined(CONFIG_OPTION)"? Not that I'm aware of: #define IS_ENABLED(option) __or(IS_BUILTIN(option), IS_MODULE(option)) Here is the incremental patch I just folded in: diff --git a/drivers/md/dm-writecache.c b/drivers/md/dm-writecache.c index fd3bc232b7d6..f2ae02f22c43 100644 --- a/drivers/md/dm-writecache.c +++ b/drivers/md/dm-writecache.c @@ -34,7 +34,7 @@ #define BITMAP_GRANULARITY PAGE_SIZE #endif -#if defined(CONFIG_ARCH_HAS_PMEM_API) && IS_ENABLED(CONFIG_DAX_DRIVER) +#if IS_ENABLED(CONFIG_ARCH_HAS_PMEM_API) && IS_ENABLED(CONFIG_DAX_DRIVER) #define DM_WRITECACHE_HAS_PMEM #endif @@ -218,7 +218,7 @@ static void wc_unlock(struct dm_writecache *wc) mutex_unlock(&wc->lock); } -#if IS_ENABLED(CONFIG_DAX_DRIVER) +#ifdef DM_WRITECACHE_HAS_PMEM static int persistent_memory_claim(struct dm_writecache *wc) { int r;
next prev parent reply other threads:[~2018-05-31 12:09 UTC|newest] Thread overview: 108+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-05-19 5:25 [patch 0/4] dm-writecache patches Mikulas Patocka 2018-05-19 5:25 ` [patch 1/4] x86: optimize memcpy_flushcache Mikulas Patocka 2018-05-19 14:21 ` Dan Williams 2018-05-24 18:20 ` [PATCH v2] " Mike Snitzer 2018-06-18 13:23 ` [PATCH v2 RESEND] " Mike Snitzer 2018-06-18 13:23 ` Mike Snitzer 2018-06-21 14:31 ` Ingo Molnar 2018-06-22 1:19 ` Mikulas Patocka 2018-06-22 1:19 ` Mikulas Patocka 2018-06-22 1:30 ` Ingo Molnar 2018-08-08 21:22 ` [PATCH v3 " Mikulas Patocka 2018-09-10 13:18 ` Ingo Molnar 2018-09-11 6:22 ` [tip:x86/asm] x86/asm: Optimize memcpy_flushcache() tip-bot for Mikulas Patocka 2018-05-19 5:25 ` [patch 2/4] swait: export the symbols __prepare_to_swait and __finish_swait Mikulas Patocka 2018-05-22 6:34 ` Christoph Hellwig 2018-05-22 18:52 ` Mike Snitzer 2018-05-23 9:21 ` Peter Zijlstra 2018-05-23 15:10 ` Mike Snitzer 2018-05-23 18:10 ` [PATCH v2] swait: export " Mike Snitzer 2018-05-23 20:38 ` Mikulas Patocka 2018-05-23 21:51 ` Mike Snitzer 2018-05-24 14:10 ` Peter Zijlstra 2018-05-24 15:09 ` Mike Snitzer 2018-05-19 5:25 ` [patch 3/4] dm-writecache Mikulas Patocka 2018-05-22 6:37 ` Christoph Hellwig 2018-05-19 5:25 ` [patch 4/4] dm-writecache: use new API for flushing Mikulas Patocka 2018-05-22 6:39 ` [dm-devel] " Christoph Hellwig 2018-05-22 6:39 ` Christoph Hellwig 2018-05-22 18:41 ` Mike Snitzer 2018-05-22 18:41 ` Mike Snitzer 2018-05-22 19:00 ` Dan Williams 2018-05-22 19:00 ` Dan Williams 2018-05-22 19:19 ` Mike Snitzer 2018-05-22 19:19 ` Mike Snitzer 2018-05-22 19:27 ` Dan Williams 2018-05-22 19:27 ` Dan Williams 2018-05-22 20:52 ` Mike Snitzer 2018-05-22 20:52 ` Mike Snitzer 2018-05-22 22:53 ` [dm-devel] " Jeff Moyer 2018-05-22 22:53 ` Jeff Moyer 2018-05-23 20:57 ` Mikulas Patocka 2018-05-23 20:57 ` Mikulas Patocka 2018-05-28 13:52 ` Mikulas Patocka 2018-05-28 13:52 ` Mikulas Patocka 2018-05-28 17:41 ` Dan Williams 2018-05-28 17:41 ` Dan Williams 2018-05-30 13:42 ` [dm-devel] " Jeff Moyer 2018-05-30 13:42 ` Jeff Moyer 2018-05-30 13:51 ` Mikulas Patocka 2018-05-30 13:51 ` Mikulas Patocka 2018-05-30 13:52 ` Jeff Moyer 2018-05-30 13:52 ` Jeff Moyer 2018-05-24 8:15 ` Mikulas Patocka 2018-05-24 8:15 ` Mikulas Patocka 2018-05-25 3:12 ` Dan Williams 2018-05-25 6:17 ` Mikulas Patocka 2018-05-25 12:51 ` Mike Snitzer 2018-05-25 12:51 ` Mike Snitzer 2018-05-25 15:57 ` Dan Williams 2018-05-25 15:57 ` Dan Williams 2018-05-26 7:02 ` Mikulas Patocka 2018-05-26 7:02 ` Mikulas Patocka 2018-05-26 15:26 ` Dan Williams 2018-05-26 15:26 ` Dan Williams 2018-05-28 13:32 ` Mikulas Patocka 2018-05-28 13:32 ` Mikulas Patocka 2018-05-28 18:14 ` Dan Williams 2018-05-28 18:14 ` Dan Williams 2018-05-30 13:07 ` Mikulas Patocka 2018-05-30 13:07 ` Mikulas Patocka 2018-05-30 13:16 ` Mike Snitzer 2018-05-30 13:16 ` Mike Snitzer 2018-05-30 13:21 ` Mikulas Patocka 2018-05-30 13:21 ` Mikulas Patocka 2018-05-30 13:26 ` Mike Snitzer 2018-05-30 13:26 ` Mike Snitzer 2018-05-30 13:33 ` Mikulas Patocka 2018-05-30 13:33 ` Mikulas Patocka 2018-05-30 13:54 ` Mike Snitzer 2018-05-30 13:54 ` Mike Snitzer 2018-05-30 14:09 ` Mikulas Patocka 2018-05-30 14:09 ` Mikulas Patocka 2018-05-30 14:21 ` Mike Snitzer 2018-05-30 14:21 ` Mike Snitzer 2018-05-30 14:46 ` Mikulas Patocka 2018-05-30 14:46 ` Mikulas Patocka 2018-05-31 3:42 ` Mike Snitzer 2018-05-31 3:42 ` Mike Snitzer 2018-06-03 15:03 ` Mikulas Patocka 2018-06-03 15:03 ` Mikulas Patocka 2018-05-31 3:39 ` Mike Snitzer 2018-05-31 3:39 ` Mike Snitzer 2018-05-31 8:16 ` Mikulas Patocka 2018-05-31 8:16 ` Mikulas Patocka 2018-05-31 12:09 ` Mike Snitzer [this message] 2018-05-31 12:09 ` Mike Snitzer 2018-05-30 15:58 ` Dan Williams 2018-05-30 15:58 ` Dan Williams 2018-05-30 22:39 ` Dan Williams 2018-05-30 22:39 ` Dan Williams 2018-05-31 8:19 ` Mikulas Patocka 2018-05-31 8:19 ` Mikulas Patocka 2018-05-31 14:51 ` Dan Williams 2018-05-31 14:51 ` Dan Williams 2018-05-31 15:31 ` Mikulas Patocka 2018-05-31 15:31 ` Mikulas Patocka 2018-05-31 16:39 ` Dan Williams 2018-05-31 16:39 ` Dan Williams
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20180531120906.GA8456@redhat.com \ --to=snitzer@redhat.com \ --cc=dm-devel@redhat.com \ --cc=linux-nvdimm@lists.01.org \ --cc=mpatocka@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.