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=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham 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 67BFFC10F27 for ; Wed, 11 Mar 2020 13:41:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2E2FF20873 for ; Wed, 11 Mar 2020 13:41:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="sMH7y/fu" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729688AbgCKNlq (ORCPT ); Wed, 11 Mar 2020 09:41:46 -0400 Received: from mail-il1-f194.google.com ([209.85.166.194]:44555 "EHLO mail-il1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729428AbgCKNlp (ORCPT ); Wed, 11 Mar 2020 09:41:45 -0400 Received: by mail-il1-f194.google.com with SMTP id j69so1994093ila.11; Wed, 11 Mar 2020 06:41:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=vgb75o+vA+lH/Bs4fzoKWda8hTxwfps2LW8ivFsRHBo=; b=sMH7y/fu4YMsoE6rmldO6Jy7eMUxpLP6cuTD9cYCALDPXjEBslMfyjeCkDX+8zTXZ5 2Bbu8jIXDRKvyU4ON12ZiuP3VftKuQDGhdAW+wweIV0h+LRfE3ilm/voWF0lAD/cAYFS GnghJv9u92bM+6bXTuiCL77sjGIEDlbdCjBFkDpepZuhl19+1zaZFamqC9iCk1b4h9Yz Xp65m2O542jR7T0haY33Ujok5nALgUjpy2FswVEaILxRcEKLVzOoeApKmPyQEDL4+kpn lp7r6GpyCpjjbFI5pNU5ikhHDEsYqfN/TIiXwybOXCctFipAxsyZOWiFuMAfOOEfTjH3 641A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=vgb75o+vA+lH/Bs4fzoKWda8hTxwfps2LW8ivFsRHBo=; b=Cjo12S6UxsiBt1KRi4X+kXLlFAy+wK31MO/lC3DSZxN+nvF1x73JKsqKIhxdsDuDnn dO1CIqjgC/nsDjFPHfqEATFcfcEx4cAgeaWh4hPfCmpi4blERDk1GGAJrcbRL3umc1RV DoOtNbGHmgkThnUyBygRogKQkkr9EnIN3J+T8C2HwhtIFVWNtOhOC72OottlpSfnWddb SLTqcbhMtPqcdPKoWjGnyrqFtHHBhjEuugsgaFY1xy84mKhAPz3J+Sj3XYXk9aM2HF2x 39hkod0KDc7geJR7GEjSGjBToP7XG4zJW+iiCY9BpCZcdKoKoYkiZBFpZv0TtKuPWg5C 6X3g== X-Gm-Message-State: ANhLgQ0Fw8LMs9nSgVEBPux7UsXD+yi+QxiET3ei/C+eCuLqehZIwfiw 0+18EsKve+n6T5MkxQUtbATa9aIUvkOu2WGFHk0= X-Google-Smtp-Source: ADFU+vtzNE3iPRvXWJt1EwjI+Uf8PxKO6jcmAyb7APpME3dqV/1L1GIvlAwuDtKZMyyVcJXDp2+rd2/uayygo2mrn9Y= X-Received: by 2002:a92:ccd0:: with SMTP id u16mr2949817ilq.215.1583934103149; Wed, 11 Mar 2020 06:41:43 -0700 (PDT) MIME-Version: 1.0 References: <20200303093327.8720-1-gmayyyha@gmail.com> In-Reply-To: From: Ilya Dryomov Date: Wed, 11 Mar 2020 14:41:44 +0100 Message-ID: Subject: Re: [v2] ceph: using POOL FULL flag instead of OSDMAP FULL flag To: Yanhu Cao Cc: Jeff Layton , Sage Weil , "David S. Miller" , kuba@kernel.org, Ceph Development , LKML , netdev Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Mar 11, 2020 at 10:55 AM Yanhu Cao wrote: > > On Tue, Mar 10, 2020 at 4:43 AM Ilya Dryomov wrote: > > > > On Tue, Mar 3, 2020 at 10:33 AM Yanhu Cao wrote: > > > > > > CEPH_OSDMAP_FULL/NEARFULL has been deprecated since mimic, so it > > > does not work well in new versions, added POOL flags to handle it. > > > > > > Signed-off-by: Yanhu Cao > > > --- > > > fs/ceph/file.c | 9 +++++++-- > > > include/linux/ceph/osd_client.h | 2 ++ > > > include/linux/ceph/osdmap.h | 3 ++- > > > net/ceph/osd_client.c | 23 +++++++++++++---------- > > > 4 files changed, 24 insertions(+), 13 deletions(-) > > > > > > diff --git a/fs/ceph/file.c b/fs/ceph/file.c > > > index 7e0190b1f821..84ec44f9d77a 100644 > > > --- a/fs/ceph/file.c > > > +++ b/fs/ceph/file.c > > > @@ -1482,7 +1482,9 @@ static ssize_t ceph_write_iter(struct kiocb *iocb, struct iov_iter *from) > > > } > > > > > > /* FIXME: not complete since it doesn't account for being at quota */ > > > - if (ceph_osdmap_flag(&fsc->client->osdc, CEPH_OSDMAP_FULL)) { > > > + if (ceph_osdmap_flag(&fsc->client->osdc, CEPH_OSDMAP_FULL) || > > > + pool_flag(&fsc->client->osdc, ci->i_layout.pool_id, > > > + CEPH_POOL_FLAG_FULL)) { > > > err = -ENOSPC; > > > goto out; > > > } > > > @@ -1575,7 +1577,10 @@ static ssize_t ceph_write_iter(struct kiocb *iocb, struct iov_iter *from) > > > } > > > > > > if (written >= 0) { > > > - if (ceph_osdmap_flag(&fsc->client->osdc, CEPH_OSDMAP_NEARFULL)) > > > + if (ceph_osdmap_flag(&fsc->client->osdc, > > > + CEPH_OSDMAP_NEARFULL) || > > > + pool_flag(&fsc->client->osdc, ci->i_layout.pool_id, > > > + CEPH_POOL_FLAG_NEARFULL)) > > > iocb->ki_flags |= IOCB_DSYNC; > > > written = generic_write_sync(iocb, written); > > > } > > > diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h > > > index 5a62dbd3f4c2..be9007b93862 100644 > > > --- a/include/linux/ceph/osd_client.h > > > +++ b/include/linux/ceph/osd_client.h > > > @@ -375,6 +375,8 @@ static inline bool ceph_osdmap_flag(struct ceph_osd_client *osdc, int flag) > > > return osdc->osdmap->flags & flag; > > > } > > > > > > +bool pool_flag(struct ceph_osd_client *osdc, s64 pool_id, int flag); > > > + > > > extern int ceph_osdc_setup(void); > > > extern void ceph_osdc_cleanup(void); > > > > > > diff --git a/include/linux/ceph/osdmap.h b/include/linux/ceph/osdmap.h > > > index e081b56f1c1d..88faacc11f55 100644 > > > --- a/include/linux/ceph/osdmap.h > > > +++ b/include/linux/ceph/osdmap.h > > > @@ -36,7 +36,8 @@ int ceph_spg_compare(const struct ceph_spg *lhs, const struct ceph_spg *rhs); > > > > > > #define CEPH_POOL_FLAG_HASHPSPOOL (1ULL << 0) /* hash pg seed and pool id > > > together */ > > > -#define CEPH_POOL_FLAG_FULL (1ULL << 1) /* pool is full */ > > > +#define CEPH_POOL_FLAG_FULL (1ULL << 1) /* pool is full */ > > > +#define CEPH_POOL_FLAG_NEARFULL (1ULL << 11) /* pool is nearfull */ > > > > > > struct ceph_pg_pool_info { > > > struct rb_node node; > > > diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c > > > index b68b376d8c2f..9ad2b96c3e78 100644 > > > --- a/net/ceph/osd_client.c > > > +++ b/net/ceph/osd_client.c > > > @@ -1447,9 +1447,9 @@ static void unlink_request(struct ceph_osd *osd, struct ceph_osd_request *req) > > > atomic_dec(&osd->o_osdc->num_homeless); > > > } > > > > > > -static bool __pool_full(struct ceph_pg_pool_info *pi) > > > +static bool __pool_flag(struct ceph_pg_pool_info *pi, int flag) > > > { > > > - return pi->flags & CEPH_POOL_FLAG_FULL; > > > + return pi->flags & flag; > > > } > > > > > > static bool have_pool_full(struct ceph_osd_client *osdc) > > > @@ -1460,14 +1460,14 @@ static bool have_pool_full(struct ceph_osd_client *osdc) > > > struct ceph_pg_pool_info *pi = > > > rb_entry(n, struct ceph_pg_pool_info, node); > > > > > > - if (__pool_full(pi)) > > > + if (__pool_flag(pi, CEPH_POOL_FLAG_FULL)) > > > return true; > > > } > > > > > > return false; > > > } > > > > > > -static bool pool_full(struct ceph_osd_client *osdc, s64 pool_id) > > > +bool pool_flag(struct ceph_osd_client *osdc, s64 pool_id, int flag) > > > { > > > struct ceph_pg_pool_info *pi; > > > > > > @@ -1475,8 +1475,10 @@ static bool pool_full(struct ceph_osd_client *osdc, s64 pool_id) > > > if (!pi) > > > return false; > > > > > > - return __pool_full(pi); > > > + return __pool_flag(pi, flag); > > > } > > > +EXPORT_SYMBOL(pool_flag); > > > + > > > > > > /* > > > * Returns whether a request should be blocked from being sent > > > @@ -1489,7 +1491,7 @@ static bool target_should_be_paused(struct ceph_osd_client *osdc, > > > bool pauserd = ceph_osdmap_flag(osdc, CEPH_OSDMAP_PAUSERD); > > > bool pausewr = ceph_osdmap_flag(osdc, CEPH_OSDMAP_PAUSEWR) || > > > ceph_osdmap_flag(osdc, CEPH_OSDMAP_FULL) || > > > - __pool_full(pi); > > > + __pool_flag(pi, CEPH_POOL_FLAG_FULL); > > > > > > WARN_ON(pi->id != t->target_oloc.pool); > > > return ((t->flags & CEPH_OSD_FLAG_READ) && pauserd) || > > > @@ -2320,7 +2322,8 @@ static void __submit_request(struct ceph_osd_request *req, bool wrlocked) > > > !(req->r_flags & (CEPH_OSD_FLAG_FULL_TRY | > > > CEPH_OSD_FLAG_FULL_FORCE)) && > > > (ceph_osdmap_flag(osdc, CEPH_OSDMAP_FULL) || > > > - pool_full(osdc, req->r_t.base_oloc.pool))) { > > > + pool_flag(osdc, req->r_t.base_oloc.pool, > > > + CEPH_POOL_FLAG_FULL))) { > > > dout("req %p full/pool_full\n", req); > > > if (ceph_test_opt(osdc->client, ABORT_ON_FULL)) { > > > err = -ENOSPC; > > > @@ -2539,7 +2542,7 @@ static int abort_on_full_fn(struct ceph_osd_request *req, void *arg) > > > > > > if ((req->r_flags & CEPH_OSD_FLAG_WRITE) && > > > (ceph_osdmap_flag(osdc, CEPH_OSDMAP_FULL) || > > > - pool_full(osdc, req->r_t.base_oloc.pool))) { > > > + pool_flag(osdc, req->r_t.base_oloc.pool, CEPH_POOL_FLAG_FULL))) { > > > if (!*victims) { > > > update_epoch_barrier(osdc, osdc->osdmap->epoch); > > > *victims = true; > > > @@ -3707,7 +3710,7 @@ static void set_pool_was_full(struct ceph_osd_client *osdc) > > > struct ceph_pg_pool_info *pi = > > > rb_entry(n, struct ceph_pg_pool_info, node); > > > > > > - pi->was_full = __pool_full(pi); > > > + pi->was_full = __pool_flag(pi, CEPH_POOL_FLAG_FULL); > > > } > > > } > > > > > > @@ -3719,7 +3722,7 @@ static bool pool_cleared_full(struct ceph_osd_client *osdc, s64 pool_id) > > > if (!pi) > > > return false; > > > > > > - return pi->was_full && !__pool_full(pi); > > > + return pi->was_full && !__pool_flag(pi, CEPH_POOL_FLAG_FULL); > > > } > > > > > > static enum calc_target_result > > > > Hi Yanhu, > > > > Sorry for a late reply. > > > > This adds some unnecessary churn and also exposes a helper that > > must be called under osdc->lock without making that obvious. How > > about the attached instead? > > > > ceph_pg_pool_flags() takes osdmap instead of osdc, making it clear > > that the caller is resposibile for keeping the map stable. > > > > Thanks, > > > > Ilya > > net/ceph/osdmap.c > -------------------------- > bool ceph_pg_pool_flags(struct ceph_osdmap *map, s64 pool_id, int flag) > { > struct ceph_pg_pool_info *pi; > > /* CEPH_OSDMAP_FULL|CEPH_OSDMAP_NEARFULL deprecated since mimic */ > if (flag & (CEPH_POOL_FLAG_FULL|CEPH_POOL_FLAG_NEARFULL)) > if (map->flags & (CEPH_OSDMAP_FULL|CEPH_OSDMAP_NEARFULL)) > return true; > > pi = ceph_pg_pool_by_id(map, pool_id); > if (!pi) > return false; > > return pi->flags & flag; > } > > fs/ceph/file.c > ----------------- > ceph_write_iter() { > ... > down_read(&osdc->lock); > if (ceph_pg_pool_flags(osdc->osdmap, ci->i_layout.pool_id, > CEPH_POOL_FLAG_FULL|CEPH_POOL_FLAG_FULL_QUOTA)) { > err = -ENOSPC; > up_read(&osdc->lock); > goto out; > } > up_read(&osdc->lock); > ... > down_read(&osdc->lock); > if (ceph_pg_pool_flags(osdc->osdmap, ci->i_layout.pool_id, > CEPH_POOL_FLAG_NEARFULL)) > iocb->ki_flags |= IOCB_DSYNC; > up_read(&osdc->lock); > ... > } > > how about this? Well, this takes osdc->lock and looks up ceph_pg_pool_info twice. Given that these checks are inherently racy, I think doing it once at the top makes more sense. Also, I don't think this does what you intended it to do. Your ceph_pg_pool_flags(..., CEPH_POOL_FLAG_FULL) returns true even if the map only has CEPH_OSDMAP_NEARFULL, triggering early ENOSPC. Checking CEPH_POOL_FLAG_FULL_QUOTA is not necessary, because it is set together with CEPH_POOL_FLAG_FULL: src/osd/osd_types.h: 1199 FLAG_FULL_QUOTA = 1<<10, // pool is currently running out of quota, will set FLAG_FULL too Thanks, Ilya