X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fofd%2Fofd_grant.c;h=6ed619a306944c9dc38cbc112ade6f8cc56fb5df;hp=7fa1e4a87cc77242d31515751e85447b46d35945;hb=cf54bda257dc3287458a9157bb4647f05d8f8469;hpb=db68565b462d954dc50b0f638fea820991f54209 diff --git a/lustre/ofd/ofd_grant.c b/lustre/ofd/ofd_grant.c index 7fa1e4a..6ed619a 100644 --- a/lustre/ofd/ofd_grant.c +++ b/lustre/ofd/ofd_grant.c @@ -15,11 +15,7 @@ * * You should have received a copy of the GNU General Public License * version 2 along with this program; If not, see - * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * http://www.gnu.org/licenses/gpl-2.0.html * * GPL HEADER END */ @@ -27,83 +23,140 @@ * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2012, 2013, Intel Corporation. + * Copyright (c) 2012, 2015, Intel Corporation. */ /* - * This file is part of Lustre, http://www.lustre.org/ - * Lustre is a trademark of Sun Microsystems, Inc. - * * lustre/ofd/ofd_grant.c * - * Author: Johann Lombardi + * This file provides code related to grant space management on Object Storage + * Targets (OSTs). Grant is a mechanism used by client nodes to reserve disk + * space on OSTs for the data writeback cache. The Lustre client is thus assured + * that enough space will be available when flushing dirty pages asynchronously. + * Each client node is granted an initial amount of reserved space at connect + * time and gets additional space back from OST in bulk write reply. + * + * We actually support three different cases: + * - The client supports the new grant parameters (i.e. OBD_CONNECT_GRANT_PARAM) + * which means that all grant overhead calculation happens on the client side. + * The server reports at connect time the backend filesystem block size, the + * maximum extent size as well as the extent insertion cost and it is then up + * to the osc layer to the track dirty extents and consume grant accordingly + * (see osc_cache.c). In each bulk write request, the client provides how much + * grant space was consumed for this RPC. + * - The client does not support OBD_CONNECT_GRANT_PARAM and always assumes a + * a backend file system block size of 4KB. We then have two cases: + * - If the block size is really 4KB, then the client can deal with grant + * allocation for partial block writes, but won't take extent insertion cost + * into account. For such clients, we inflate grant by 100% on the server + * side. It means that when 32MB of grant is hold by the client, 64MB of + * grant space is actually reserved on the server. All grant counters + * provided by such a client are inflated by 100%. + * - The backend filesystem block size is bigger than 4KB, which isn't + * supported by the client. In this case, we emulate a 4KB block size and + * consume one block size on the server for each 4KB of grant returned to + * client. With a 128KB blocksize, it means that 32MB dirty pages of 4KB + * on the client will actually consume 1GB of grant on the server. + * All grant counters provided by such a client are inflated by the block + * size ratio. + * + * This file handles the core logic for: + * - grant allocation strategy + * - maintaining per-client as well as global grant space accounting + * - processing grant information packed in incoming requests + * - allocating server-side grant space for synchronous write RPCs which did not + * consume grant on the client side (OBD_BRW_FROM_GRANT flag not set). If not + * enough space is available, such RPCs fail with ENOSPC + * + * Author: Johann Lombardi */ #define DEBUG_SUBSYSTEM S_FILTER #include "ofd_internal.h" -/* At least enough to send a couple of 1MB RPCs, even if not max sized */ -#define OFD_GRANT_CHUNK (2ULL * DT_MAX_BRW_SIZE) - /* Clients typically hold 2x their max_rpcs_in_flight of grant space */ #define OFD_GRANT_SHRINK_LIMIT(exp) (2ULL * 8 * exp_max_brw_size(exp)) -static inline obd_size ofd_grant_from_cli(struct obd_export *exp, - struct ofd_device *ofd, obd_size val) +/* Helpers to inflate/deflate grants for clients that do not support the grant + * parameters */ +static inline u64 ofd_grant_inflate(struct ofd_device *ofd, u64 val) { - if (ofd_grant_compat(exp, ofd)) - /* clients not supporting OBD_CONNECT_GRANT_PARAM actually - * consume 4KB of grant per block, we should thus inflate - * the grant counters to reflect what was actually consumed */ + if (ofd->ofd_blockbits > COMPAT_BSIZE_SHIFT) + /* Client does not support such large block size, grant + * is thus inflated. We already significantly overestimate + * overhead, no need to add the extent tax in this case */ return val << (ofd->ofd_blockbits - COMPAT_BSIZE_SHIFT); - return val; + /* client can deal with the block size, but does not support per-extent + * grant accounting, inflate grant by 100% for such clients */ + return val << 1; } -static inline obd_size ofd_grant_to_cli(struct obd_export *exp, - struct ofd_device *ofd, obd_size val) +/* Companion of ofd_grant_inflate() */ +static inline u64 ofd_grant_deflate(struct ofd_device *ofd, u64 val) { - if (ofd_grant_compat(exp, ofd)) + if (ofd->ofd_blockbits > COMPAT_BSIZE_SHIFT) return val >> (ofd->ofd_blockbits - COMPAT_BSIZE_SHIFT); - return val; + return val >> 1; } -static inline obd_size ofd_grant_chunk(struct obd_export *exp, - struct ofd_device *ofd) +/* Grant chunk is used as a unit for grant allocation. It should be inflated + * if the client does not support the grant paramaters. + * Check connection flag against \a data if not NULL. This is used during + * connection creation where exp->exp_connect_data isn't populated yet */ +static inline u64 ofd_grant_chunk(struct obd_export *exp, + struct ofd_device *ofd, + struct obd_connect_data *data) { + u64 chunk = exp_max_brw_size(exp); + u64 tax; + if (ofd_obd(ofd)->obd_self_export == exp) /* Grant enough space to handle a big precreate request */ return OST_MAX_PRECREATE * ofd->ofd_dt_conf.ddp_inodespace / 2; - if (ofd_grant_compat(exp, ofd)) + if ((data == NULL && !ofd_grant_param_supp(exp)) || + (data != NULL && !OCD_HAS_FLAG(data, GRANT_PARAM))) /* Try to grant enough space to send a full-size RPC */ - return exp_max_brw_size(exp) << - (ofd->ofd_blockbits - COMPAT_BSIZE_SHIFT); - - /* Try to return enough to send two full RPCs, if needed */ - return exp_max_brw_size(exp) * 2; + return ofd_grant_inflate(ofd, chunk); + + /* Try to return enough to send two full-size RPCs + * = 2 * (BRW_size + #extents_in_BRW * grant_tax) */ + tax = 1ULL << ofd->ofd_blockbits; /* block size */ + tax *= ofd->ofd_dt_conf.ddp_max_extent_blks; /* max extent size */ + tax = (chunk + tax - 1) / tax; /* #extents in a RPC */ + tax *= ofd->ofd_dt_conf.ddp_extent_tax; /* extent tax for a RPC */ + chunk = (chunk + tax) * 2; /* we said two full RPCs */ + return chunk; } /** - * Perform extra sanity checks for grant accounting. This is done at connect, - * disconnect, and statfs RPC time, so it shouldn't be too bad. We can - * always get rid of it or turn it off when we know accounting is good. + * Perform extra sanity checks for grant accounting. + * + * This function scans the export list, sanity checks per-export grant counters + * and verifies accuracy of global grant accounting. If an inconsistency is + * found, a CERROR is printed with the function name \func that was passed as + * argument. LBUG is only called in case of serious counter corruption (i.e. + * value larger than the device size). + * Those sanity checks can be pretty expensive and are disabled if the OBD + * device has more than 100 connected exports. * - * \param obd - is the device to check - * \param func - is the function to call if an inconsistency is found + * \param[in] obd OBD device for which grant accounting should be + * verified + * \param[in] func caller's function name */ void ofd_grant_sanity_check(struct obd_device *obd, const char *func) { - struct filter_export_data *fed; - struct ofd_device *ofd = ofd_dev(obd->obd_lu_dev); - struct obd_export *exp; - obd_size maxsize; - obd_size tot_dirty = 0; - obd_size tot_pending = 0; - obd_size tot_granted = 0; - obd_size fo_tot_dirty, fo_tot_pending; - obd_size fo_tot_granted; - - if (cfs_list_empty(&obd->obd_exports)) + struct ofd_device *ofd = ofd_dev(obd->obd_lu_dev); + struct obd_export *exp; + u64 maxsize; + u64 tot_dirty = 0; + u64 tot_pending = 0; + u64 tot_granted = 0; + u64 fo_tot_granted; + u64 fo_tot_pending; + u64 fo_tot_dirty; + + if (list_empty(&obd->obd_exports)) return; /* We don't want to do this for large machines that do lots of @@ -115,8 +168,9 @@ void ofd_grant_sanity_check(struct obd_device *obd, const char *func) spin_lock(&obd->obd_dev_lock); spin_lock(&ofd->ofd_grant_lock); - cfs_list_for_each_entry(exp, &obd->obd_exports, exp_obd_chain) { - int error = 0; + list_for_each_entry(exp, &obd->obd_exports, exp_obd_chain) { + struct filter_export_data *fed; + int error = 0; fed = &exp->exp_filter_data; @@ -153,10 +207,50 @@ void ofd_grant_sanity_check(struct obd_device *obd, const char *func) tot_pending += fed->fed_pending; tot_dirty += fed->fed_dirty; } - spin_unlock(&obd->obd_dev_lock); + + /* exports about to be unlinked should also be taken into account since + * they might still hold pending grant space to be released at + * commit time */ + list_for_each_entry(exp, &obd->obd_unlinked_exports, exp_obd_chain) { + struct filter_export_data *fed; + int error = 0; + + fed = &exp->exp_filter_data; + + if (fed->fed_grant < 0 || fed->fed_pending < 0 || + fed->fed_dirty < 0) + error = 1; + if (fed->fed_grant + fed->fed_pending > maxsize) { + CERROR("%s: cli %s/%p fed_grant(%ld) + fed_pending(%ld)" + " > maxsize("LPU64")\n", obd->obd_name, + exp->exp_client_uuid.uuid, exp, fed->fed_grant, + fed->fed_pending, maxsize); + spin_unlock(&obd->obd_dev_lock); + spin_unlock(&ofd->ofd_grant_lock); + LBUG(); + } + if (fed->fed_dirty > maxsize) { + CERROR("%s: cli %s/%p fed_dirty(%ld) > maxsize("LPU64 + ")\n", obd->obd_name, exp->exp_client_uuid.uuid, + exp, fed->fed_dirty, maxsize); + spin_unlock(&obd->obd_dev_lock); + spin_unlock(&ofd->ofd_grant_lock); + LBUG(); + } + CDEBUG_LIMIT(error ? D_ERROR : D_CACHE, "%s: cli %s/%p dirty " + "%ld pend %ld grant %ld\n", obd->obd_name, + exp->exp_client_uuid.uuid, exp, fed->fed_dirty, + fed->fed_pending, fed->fed_grant); + tot_granted += fed->fed_grant + fed->fed_pending; + tot_pending += fed->fed_pending; + tot_dirty += fed->fed_dirty; + } + fo_tot_granted = ofd->ofd_tot_granted; fo_tot_pending = ofd->ofd_tot_pending; fo_tot_dirty = ofd->ofd_tot_dirty; + spin_unlock(&obd->obd_dev_lock); + spin_unlock(&ofd->ofd_grant_lock); if (tot_granted != fo_tot_granted) CERROR("%s: tot_granted "LPU64" != fo_tot_granted "LPU64"\n", @@ -176,19 +270,22 @@ void ofd_grant_sanity_check(struct obd_device *obd, const char *func) if (tot_dirty > maxsize) CERROR("%s: tot_dirty "LPU64" > maxsize "LPU64"\n", func, tot_dirty, maxsize); - spin_unlock(&ofd->ofd_grant_lock); } /** - * Get fresh statfs information from the OSD layer if the cache is older than 1s - * or if force is set. The OSD layer is in charge of estimating data & metadata - * overhead. + * Update cached statfs information from the OSD layer + * + * Refresh statfs information cached in ofd::ofd_osfs if the cache is older + * than 1s or if force is set. The OSD layer is in charge of estimating data & + * metadata overhead. + * This function can sleep so it should not be called with any spinlock held. * - * \param env - is the lu environment passed by the caller - * \param exp - export used to print client info in debug messages - * \param force - is used to force a refresh of statfs information - * \param from_cache - returns whether the statfs information are - * taken from cache + * \param[in] env LU environment passed by the caller + * \param[in] exp export used to print client info in debug + * messages + * \param[in] force force a refresh of statfs information + * \param[out] from_cache returns whether the statfs information are + * taken from cache */ static void ofd_grant_statfs(const struct lu_env *env, struct obd_export *exp, int force, int *from_cache) @@ -218,23 +315,29 @@ static void ofd_grant_statfs(const struct lu_env *env, struct obd_export *exp, } /** - * Figure out how much space is available on the backend filesystem. + * Figure out how much space is available on the backend filesystem after + * removing grant space already booked by clients. + * * This is done by accessing cached statfs data previously populated by * ofd_grant_statfs(), from which we withdraw the space already granted to * clients and the reserved space. + * Caller must hold ofd_grant_lock spinlock. * - * \param exp - export which received the write request + * \param[in] exp export associated with the device for which the amount + * of available space is requested + * \retval amount of non-allocated space, in bytes */ -static obd_size ofd_grant_space_left(struct obd_export *exp) +static u64 ofd_grant_space_left(struct obd_export *exp) { - struct obd_device *obd = exp->exp_obd; - struct ofd_device *ofd = ofd_exp(exp); - obd_size tot_granted; - obd_size left, avail; - obd_size unstable; + struct obd_device *obd = exp->exp_obd; + struct ofd_device *ofd = ofd_exp(exp); + u64 tot_granted; + u64 left; + u64 avail; + u64 unstable; ENTRY; - LASSERT(spin_is_locked(&ofd->ofd_grant_lock)); + assert_spin_locked(&ofd->ofd_grant_lock); spin_lock(&ofd->ofd_osfs_lock); /* get available space from cached statfs data */ @@ -262,14 +365,6 @@ static obd_size ofd_grant_space_left(struct obd_export *exp) /* Withdraw space already granted to clients */ left -= tot_granted; - /* If the left space is below the grant threshold x available space, - * stop granting space to clients. - * The purpose of this threshold is to keep some error margin on the - * overhead estimate made by the OSD layer. If we grant all the free - * space, we have no way (grant space cannot be revoked yet) to - * adjust if the write overhead has been underestimated. */ - left -= min_t(obd_size, left, ofd_grant_reserved(ofd, avail)); - /* Align left on block size */ left &= ~((1ULL << ofd->ofd_blockbits) - 1); @@ -282,24 +377,30 @@ static obd_size ofd_grant_space_left(struct obd_export *exp) } /** - * Grab the dirty and seen grant announcements from the incoming obdo. + * Process grant information from obdo structure packed in incoming BRW + * and inflate grant counters if required. + * + * Grab the dirty and seen grant announcements from the incoming obdo and + * inflate all grant counters passed in the request if the client does not + * support the grant parameters. * We will later calculate the client's new grant and return it. * Caller must hold ofd_grant_lock spinlock. * - * \param env - is the lu environment supplying osfs storage - * \param exp - is the export for which we received the request - * \paral oa - is the incoming obdo sent by the client + * \param[in] env LU environment supplying osfs storage + * \param[in] exp export for which we received the request + * \param[in,out] oa incoming obdo sent by the client */ static void ofd_grant_incoming(const struct lu_env *env, struct obd_export *exp, - struct obdo *oa) + struct obdo *oa, long chunk) { struct filter_export_data *fed; struct ofd_device *ofd = ofd_exp(exp); struct obd_device *obd = exp->exp_obd; - long dirty, dropped, grant_chunk; + long dirty; + long dropped; ENTRY; - LASSERT(spin_is_locked(&ofd->ofd_grant_lock)); + assert_spin_locked(&ofd->ofd_grant_lock); if ((oa->o_valid & (OBD_MD_FLBLOCKS|OBD_MD_FLGRANT)) != (OBD_MD_FLBLOCKS|OBD_MD_FLGRANT)) { @@ -320,16 +421,23 @@ static void ofd_grant_incoming(const struct lu_env *env, struct obd_export *exp, if ((long long)oa->o_dirty < 0) oa->o_dirty = 0; - dirty = ofd_grant_from_cli(exp, ofd, oa->o_dirty); - dropped = ofd_grant_from_cli(exp, ofd, (obd_size)oa->o_dropped); - grant_chunk = ofd_grant_chunk(exp, ofd); + /* inflate grant counters if required */ + if (!ofd_grant_param_supp(exp)) { + oa->o_grant = ofd_grant_inflate(ofd, oa->o_grant); + oa->o_dirty = ofd_grant_inflate(ofd, oa->o_dirty); + oa->o_dropped = ofd_grant_inflate(ofd, (u64)oa->o_dropped); + oa->o_undirty = ofd_grant_inflate(ofd, oa->o_undirty); + } + + dirty = oa->o_dirty; + dropped = oa->o_dropped; /* Update our accounting now so that statfs takes it into account. * Note that fed_dirty is only approximate and can become incorrect * if RPCs arrive out-of-order. No important calculations depend * on fed_dirty however, but we must check sanity to not assert. */ - if (dirty > fed->fed_grant + 4 * grant_chunk) - dirty = fed->fed_grant + 4 * grant_chunk; + if (dirty > fed->fed_grant + 4 * chunk) + dirty = fed->fed_grant + 4 * chunk; ofd->ofd_tot_dirty += dirty - fed->fed_dirty; if (fed->fed_grant < dropped) { CDEBUG(D_CACHE, @@ -359,31 +467,34 @@ static void ofd_grant_incoming(const struct lu_env *env, struct obd_export *exp, } /** - * Called when the client is able to release some grants. Proceed with the - * shrink request when there is less ungranted space remaining - * than the amount all of the connected clients would consume if they - * used their full grant. + * Grant shrink request handler. * - * \param exp - is the export for which we received the request - * \paral oa - is the incoming obdo sent by the client - * \param left_space - is the remaining free space with space already granted - * taken out + * Client nodes can explicitly release grant space (i.e. process called grant + * shrinking). This function proceeds with the shrink request when there is + * less ungranted space remaining than the amount all of the connected clients + * would consume if they used their full grant. + * Caller must hold ofd_grant_lock spinlock. + * + * \param[in] exp export releasing grant space + * \param[in,out] oa incoming obdo sent by the client + * \param[in] left_space remaining free space with space already granted + * taken out */ -static void ofd_grant_shrink(struct obd_export *exp, - struct obdo *oa, obd_size left_space) +static void ofd_grant_shrink(struct obd_export *exp, struct obdo *oa, + u64 left_space) { struct filter_export_data *fed; struct ofd_device *ofd = ofd_exp(exp); struct obd_device *obd = exp->exp_obd; long grant_shrink; - LASSERT(spin_is_locked(&ofd->ofd_grant_lock)); + assert_spin_locked(&ofd->ofd_grant_lock); LASSERT(exp); if (left_space >= ofd->ofd_tot_granted_clients * OFD_GRANT_SHRINK_LIMIT(exp)) return; - grant_shrink = ofd_grant_from_cli(exp, ofd, oa->o_grant); + grant_shrink = oa->o_grant; fed = &exp->exp_filter_data; fed->fed_grant -= grant_shrink; @@ -399,53 +510,87 @@ static void ofd_grant_shrink(struct obd_export *exp, /** * Calculate how much space is required to write a given network buffer + * + * This function takes block alignment into account to estimate how much on-disk + * space will be required to successfully write the whole niobuf. + * Estimated space is inflated if the export does not support + * OBD_CONNECT_GRANT_PARAM and if the backend filesystem has a block size + * larger than the minimal supported page size (i.e. 4KB). + * + * \param[in] exp export associated which the write request + * if NULL, then size estimate is done for server-side + * grant allocation. + * \param[in] ofd ofd device handling the request + * \param[in] rnb network buffer to estimate size of + * + * \retval space (in bytes) that will be consumed to write the + * network buffer */ -static inline int ofd_grant_rnb_size(struct obd_export *exp, +static inline u64 ofd_grant_rnb_size(struct obd_export *exp, struct ofd_device *ofd, struct niobuf_remote *rnb) { - obd_size blocksize, bytes, end; + u64 blksize; + u64 bytes; + u64 end; - if (exp && ofd_grant_compat(exp, ofd)) - blocksize = 1ULL << COMPAT_BSIZE_SHIFT; + if (exp && !ofd_grant_param_supp(exp) && + ofd->ofd_blockbits > COMPAT_BSIZE_SHIFT) + blksize = 1ULL << COMPAT_BSIZE_SHIFT; else - blocksize = 1ULL << ofd->ofd_blockbits; + blksize = 1ULL << ofd->ofd_blockbits; /* The network buffer might span several blocks, align it on block * boundaries */ - bytes = rnb->rnb_offset & (blocksize - 1); + bytes = rnb->rnb_offset & (blksize - 1); bytes += rnb->rnb_len; - end = bytes & (blocksize - 1); + end = bytes & (blksize - 1); if (end) - bytes += blocksize - end; - if (exp) - /* Apply per-export pecularities if one is given */ - bytes = ofd_grant_from_cli(exp, ofd, (obd_size)bytes); + bytes += blksize - end; + + if (exp == NULL || ofd_grant_param_supp(exp)) { + /* add per-extent insertion cost */ + u64 max_ext; + int nr_ext; + + max_ext = blksize * ofd->ofd_dt_conf.ddp_max_extent_blks; + nr_ext = (bytes + max_ext - 1) / max_ext; + bytes += nr_ext * ofd->ofd_dt_conf.ddp_extent_tax; + } else { + /* Inflate grant space if client does not support extent-based + * grant allocation */ + bytes = ofd_grant_inflate(ofd, (u64)bytes); + } + return bytes; } - /** + * Validate grant accounting for each incoming remote network buffer. + * * When clients have dirtied as much space as they've been granted they - * fall through to sync writes. These sync writes haven't been expressed + * fall through to sync writes. These sync writes haven't been expressed * in grants and need to error with ENOSPC when there isn't room in the - * filesystem for them after grants are taken into account. However, + * filesystem for them after grants are taken into account. However, * writeback of the dirty data that was already granted space can write * right on through. + * The OBD_BRW_GRANTED flag will be set in the rnb_flags of each network + * buffer which has been granted enough space to proceed. Buffers without + * this flag will fail to be written with -ENOSPC (see ofd_preprw_write(). * Caller must hold ofd_grant_lock spinlock. * - * \param env - is the lu environment passed by the caller - * \param exp - is the export identifying the client which sent the RPC - * \param oa - is the incoming obdo in which we should return the pack the - * additional grant - * \param rnb - is the list of network buffers - * \param niocont - is the number of network buffers in the list - * \param left - is the remaining free space with space already granted - * taken out + * \param[in] env LU environment passed by the caller + * \param[in] exp export identifying the client which sent the RPC + * \param[in] oa incoming obdo in which we should return the pack the + * additional grant + * \param[in,out] rnb the list of network buffers + * \param[in] niocount the number of network buffers in the list + * \param[in] left the remaining free space with space already granted + * taken out */ static void ofd_grant_check(const struct lu_env *env, struct obd_export *exp, struct obdo *oa, struct niobuf_remote *rnb, - int niocount, obd_size *left) + int niocount, u64 *left) { struct filter_export_data *fed = &exp->exp_filter_data; struct obd_device *obd = exp->exp_obd; @@ -453,74 +598,103 @@ static void ofd_grant_check(const struct lu_env *env, struct obd_export *exp, unsigned long ungranted = 0; unsigned long granted = 0; int i; - int resend = 0; + bool skip = false; struct ofd_thread_info *info = ofd_info(env); ENTRY; - LASSERT(spin_is_locked(&ofd->ofd_grant_lock)); - - if ((oa->o_valid & OBD_MD_FLFLAGS) && - (oa->o_flags & OBD_FL_RECOV_RESEND)) { - resend = 1; + assert_spin_locked(&ofd->ofd_grant_lock); + + if (obd->obd_recovering) { + /* Replaying write. Grant info have been processed already so no + * need to do any enforcement here. It is worth noting that only + * bulk writes with all rnbs having OBD_BRW_FROM_GRANT can be + * replayed. If one page hasn't OBD_BRW_FROM_GRANT set, then + * the whole bulk is written synchronously */ + skip = true; + CDEBUG(D_CACHE, "Replaying write, skipping accounting\n"); + } else if ((oa->o_valid & OBD_MD_FLFLAGS) && + (oa->o_flags & OBD_FL_RECOV_RESEND)) { + /* Recoverable resend, grant info have already been processed as + * well */ + skip = true; CDEBUG(D_CACHE, "Recoverable resend arrived, skipping " "accounting\n"); + } else if (ofd_grant_param_supp(exp) && oa->o_grant_used > 0) { + /* Client supports the new grant parameters and is telling us + * how much grant space it consumed for this bulk write. + * Although all rnbs are supposed to have the OBD_BRW_FROM_GRANT + * flag set, we will scan the rnb list and looks for non-cache + * I/O in case it changes in the future */ + if (fed->fed_grant >= oa->o_grant_used) { + /* skip grant accounting for rnbs with + * OBD_BRW_FROM_GRANT and just used grant consumption + * claimed in the request */ + granted = oa->o_grant_used; + skip = true; + } else { + /* client has used more grants for this request that + * it owns ... */ + CERROR("%s: cli %s claims %lu GRANT, real grant %lu\n", + exp->exp_obd->obd_name, + exp->exp_client_uuid.uuid, + (unsigned long)oa->o_grant_used, fed->fed_grant); + + /* check whether we can fill the gap with unallocated + * grant */ + if (*left > (oa->o_grant_used - fed->fed_grant)) { + /* ouf .. we are safe for now */ + granted = fed->fed_grant; + ungranted = oa->o_grant_used - granted; + *left -= ungranted; + skip = true; + } + /* too bad, but we cannot afford to blow up our grant + * accounting. The loop below will handle each rnb in + * case by case. */ + } } for (i = 0; i < niocount; i++) { int bytes; - if (obd->obd_recovering) { - /* Replaying write. Grant info have been processed - * already so no need to do any enforcement here. - * It is worth noting that only bulk writes with all - * rnbs having OBD_BRW_FROM_GRANT can be replayed. - * If one page hasn't OBD_BRW_FROM_GRANT set, then - * the whole bulk is written synchronously */ - if (rnb[i].rnb_flags & OBD_BRW_FROM_GRANT) { - rnb[i].rnb_flags |= OBD_BRW_GRANTED; - continue; - } else { - CERROR("%s: cli %s is replaying OST_WRITE " - "while one rnb hasn't OBD_BRW_FROM_GRANT" - " set (0x%x)\n", exp->exp_obd->obd_name, - exp->exp_client_uuid.uuid, - rnb[i].rnb_flags); - - } - } else if ((oa->o_valid & OBD_MD_FLGRANT) && - (rnb[i].rnb_flags & OBD_BRW_FROM_GRANT)) { - if (resend) { - /* This is a recoverable resend so grant - * information have already been processed */ + if ((rnb[i].rnb_flags & OBD_BRW_FROM_GRANT)) { + if (skip) { rnb[i].rnb_flags |= OBD_BRW_GRANTED; continue; } - /* inflate consumed space if needed */ + /* compute how much grant space is actually needed for + * this rnb, inflate grant if required */ bytes = ofd_grant_rnb_size(exp, ofd, &rnb[i]); - if (fed->fed_grant < granted + bytes) { - CDEBUG(D_CACHE, "%s: cli %s/%p claims %ld+%d " - "GRANT, real grant %lu idx %d\n", - exp->exp_obd->obd_name, - exp->exp_client_uuid.uuid, exp, - granted, bytes, fed->fed_grant, i); - } else { + if (fed->fed_grant >= granted + bytes) { granted += bytes; rnb[i].rnb_flags |= OBD_BRW_GRANTED; continue; } + + CDEBUG(D_CACHE, "%s: cli %s/%p claims %ld+%d GRANT, " + "real grant %lu idx %d\n", obd->obd_name, + exp->exp_client_uuid.uuid, exp, granted, bytes, + fed->fed_grant, i); } + if (obd->obd_recovering) + CERROR("%s: cli %s is replaying OST_WRITE while one rnb" + " hasn't OBD_BRW_FROM_GRANT set (0x%x)\n", + obd->obd_name, exp->exp_client_uuid.uuid, + rnb[i].rnb_flags); + /* Consume grant space on the server. * Unlike above, ofd_grant_rnb_size() is called with exp = NULL * so that the required grant space isn't inflated. This is * done on purpose since the server can deal with large block * size, unlike some clients */ bytes = ofd_grant_rnb_size(NULL, ofd, &rnb[i]); - if (*left > ungranted + bytes) { + if (*left > bytes) { /* if enough space, pretend it was granted */ ungranted += bytes; + *left -= bytes; rnb[i].rnb_flags |= OBD_BRW_GRANTED; continue; } @@ -528,35 +702,38 @@ static void ofd_grant_check(const struct lu_env *env, struct obd_export *exp, /* We can't check for already-mapped blocks here (make sense * when backend filesystem does not use COW) as it requires * dropping the grant lock. - * Instead, we clear ~OBD_BRW_GRANTED and in that case we need + * Instead, we clear OBD_BRW_GRANTED and in that case we need * to go through and verify if all of the blocks not marked * BRW_GRANTED are already mapped and we can ignore this error. */ rnb[i].rnb_flags &= ~OBD_BRW_GRANTED; CDEBUG(D_CACHE,"%s: cli %s/%p idx %d no space for %d\n", - exp->exp_obd->obd_name, - exp->exp_client_uuid.uuid, exp, i, bytes); + obd->obd_name, exp->exp_client_uuid.uuid, exp, i, bytes); } + /* record in o_grant_used the actual space reserved for the I/O, will be + * used later in ofd_grant_commmit() */ + oa->o_grant_used = granted + ungranted; + info->fti_used = granted + ungranted; + /* record space used for the I/O, will be used in ofd_grant_commmit() */ /* Now substract what the clients has used already. We don't subtract * this from the tot_granted yet, so that other client's can't grab * that space before we have actually allocated our blocks. That * happens in ofd_grant_commit() after the writes are done. */ - info->fti_used = granted + ungranted; - *left -= ungranted; fed->fed_grant -= granted; - fed->fed_pending += info->fti_used; + fed->fed_pending += oa->o_grant_used; ofd->ofd_tot_granted += ungranted; - ofd->ofd_tot_pending += info->fti_used; + ofd->ofd_tot_pending += oa->o_grant_used; CDEBUG(D_CACHE, "%s: cli %s/%p granted: %lu ungranted: %lu grant: %lu dirty: %lu" "\n", obd->obd_name, exp->exp_client_uuid.uuid, exp, granted, ungranted, fed->fed_grant, fed->fed_dirty); - if (obd->obd_recovering) - /* don't update dirty accounting during recovery */ + if (obd->obd_recovering || (oa->o_valid & OBD_MD_FLGRANT) == 0) + /* don't update dirty accounting during recovery or + * if grant information got discarded (e.g. during resend) */ RETURN_EXIT; if (fed->fed_dirty < granted) { @@ -579,25 +756,33 @@ static void ofd_grant_check(const struct lu_env *env, struct obd_export *exp, } /** + * Allocate additional grant space to a client + * * Calculate how much grant space to return to client, based on how much space * is currently free and how much of that is already granted. * Caller must hold ofd_grant_lock spinlock. * - * \param exp - is the export of the client which sent the request - * \param curgrant - is the current grant claimed by the client - * \param want - is how much grant space the client would like to have - * \param left - is the remaining free space with granted space taken out - * \param conservative - is how server grants, if true, a certain amount, else - * server will grant as client requested. + * \param[in] exp export of the client which sent the request + * \param[in] curgrant current grant claimed by the client + * \param[in] want how much grant space the client would like to + * have + * \param[in] left remaining free space with granted space taken + * out + * \param[in] conservative if set to true, the server should be cautious + * and limit how much space is granted back to the + * client. Otherwise, the server should try hard to + * satisfy the client request. + * + * \retval amount of grant space allocated */ -static long ofd_grant(struct obd_export *exp, obd_size curgrant, - obd_size want, obd_size left, bool conservative) +static long ofd_grant_alloc(struct obd_export *exp, u64 curgrant, + u64 want, u64 left, long chunk, + bool conservative) { struct obd_device *obd = exp->exp_obd; struct ofd_device *ofd = ofd_exp(exp); struct filter_export_data *fed = &exp->exp_filter_data; - long grant_chunk; - obd_size grant; + u64 grant; ENTRY; @@ -610,12 +795,6 @@ static long ofd_grant(struct obd_export *exp, obd_size curgrant, RETURN(0); } - /* client not supporting OBD_CONNECT_GRANT_PARAM works with a 4KB block - * size while the reality is different */ - curgrant = ofd_grant_from_cli(exp, ofd, curgrant); - want = ofd_grant_from_cli(exp, ofd, want); - grant_chunk = ofd_grant_chunk(exp, ofd); - /* Grant some fraction of the client's requested grant space so that * they are not always waiting for write credits (not all of it to * avoid overgranting in face of multiple RPCs in flight). This @@ -625,8 +804,8 @@ static long ofd_grant(struct obd_export *exp, obd_size curgrant, * has and what we think it has, don't grant very much and let the * client consume its grant first. Either it just has lots of RPCs * in flight, or it was evicted and its grants will soon be used up. */ - if (curgrant >= want || curgrant >= fed->fed_grant + grant_chunk) - RETURN(0); + if (curgrant >= want || curgrant >= fed->fed_grant + chunk) + RETURN(0); if (obd->obd_recovering) conservative = false; @@ -635,17 +814,17 @@ static long ofd_grant(struct obd_export *exp, obd_size curgrant, /* don't grant more than 1/8th of the remaining free space in * one chunk */ left >>= 3; - grant = min(want, left); - /* round grant upt to the next block size */ + grant = min(want - curgrant, left); + /* round grant up to the next block size */ grant = (grant + (1 << ofd->ofd_blockbits) - 1) & ~((1ULL << ofd->ofd_blockbits) - 1); if (!grant) RETURN(0); - /* Limit to ofd_grant_chunk() if not reconnect/recovery */ - if ((grant > grant_chunk) && conservative) - grant = grant_chunk; + /* Limit to grant_chunk if not reconnect/recovery */ + if ((grant > chunk) && conservative) + grant = chunk; ofd->ofd_tot_granted += grant; fed->fed_grant += grant; @@ -668,34 +847,50 @@ static long ofd_grant(struct obd_export *exp, obd_size curgrant, exp, ofd->ofd_tot_dirty, ofd->ofd_tot_granted, obd->obd_num_exports); - RETURN(ofd_grant_to_cli(exp, ofd, grant)); + RETURN(grant); } /** - * Client connection or reconnection. + * Handle grant space allocation on client connection & reconnection. + * + * A new non-readonly connection gets an initial grant allocation equals to + * ofd_grant_chunk() (i.e. twice the max BRW size in most of the cases). + * On reconnection, grant counters between client & OST are resynchronized + * and additional space might be granted back if possible. * - * \param env - is the lu environment provided by the caller - * \param exp - is the client's export which is reconnecting - * \param want - is how much the client would like to get - * \param conservative - is how server grants to client, if true server will - * only grant certain amount, else server will grant client requested - * amount. + * \param[in] env LU environment provided by the caller + * \param[in] exp client's export which is (re)connecting + * \param[in,out] data obd_connect_data structure sent by the client in the + * connect request + * \param[in] new_conn must set to true if this is a new connection and false + * for a reconnection */ -long ofd_grant_connect(const struct lu_env *env, struct obd_export *exp, - obd_size want, bool conservative) +void ofd_grant_connect(const struct lu_env *env, struct obd_export *exp, + struct obd_connect_data *data, bool new_conn) { struct ofd_device *ofd = ofd_exp(exp); struct filter_export_data *fed = &exp->exp_filter_data; - obd_size left = 0; - long grant; + u64 left = 0; + u64 want; + long chunk; int from_cache; int force = 0; /* can use cached data */ /* don't grant space to client with read-only access */ - if ((exp_connect_flags(exp) & OBD_CONNECT_RDONLY) || - ofd_grant_prohibit(exp, ofd)) - return 0; + if (OCD_HAS_FLAG(data, RDONLY) || + (!OCD_HAS_FLAG(data, GRANT_PARAM) && + ofd->ofd_grant_compat_disable)) { + data->ocd_grant = 0; + data->ocd_connect_flags &= ~(OBD_CONNECT_GRANT | + OBD_CONNECT_GRANT_PARAM); + RETURN_EXIT; + } + if (OCD_HAS_FLAG(data, GRANT_PARAM)) + want = data->ocd_grant; + else + want = ofd_grant_inflate(ofd, data->ocd_grant); + chunk = ofd_grant_chunk(exp, ofd, data); refresh: ofd_grant_statfs(env, exp, force, &from_cache); @@ -706,36 +901,48 @@ refresh: left = ofd_grant_space_left(exp); /* get fresh statfs data if we are short in ungranted space */ - if (from_cache && left < 32 * ofd_grant_chunk(exp, ofd)) { + if (from_cache && left < 32 * chunk) { spin_unlock(&ofd->ofd_grant_lock); CDEBUG(D_CACHE, "fs has no space left and statfs too old\n"); force = 1; goto refresh; } - ofd_grant(exp, ofd_grant_to_cli(exp, ofd, (obd_size)fed->fed_grant), - want, left, conservative); + ofd_grant_alloc(exp, (u64)fed->fed_grant, want, left, chunk, new_conn); /* return to client its current grant */ - grant = ofd_grant_to_cli(exp, ofd, (obd_size)fed->fed_grant); - ofd->ofd_tot_granted_clients++; + if (OCD_HAS_FLAG(data, GRANT_PARAM)) + data->ocd_grant = fed->fed_grant; + else + /* deflate grant */ + data->ocd_grant = ofd_grant_deflate(ofd, + (u64)fed->fed_grant); + + /* reset dirty accounting */ + ofd->ofd_tot_dirty -= fed->fed_dirty; + fed->fed_dirty = 0; + + if (new_conn && OCD_HAS_FLAG(data, GRANT)) + ofd->ofd_tot_granted_clients++; spin_unlock(&ofd->ofd_grant_lock); - CDEBUG(D_CACHE, "%s: cli %s/%p ocd_grant: %ld want: "LPU64" left: " + CDEBUG(D_CACHE, "%s: cli %s/%p ocd_grant: %d want: "LPU64" left: " LPU64"\n", exp->exp_obd->obd_name, exp->exp_client_uuid.uuid, - exp, grant, want, left); + exp, data->ocd_grant, want, left); - return grant; + EXIT; } /** + * Release all grant space attached to a given export. + * * Remove a client from the grant accounting totals. We also remove * the export from the obd device under the osfs and dev locks to ensure * that the ofd_grant_sanity_check() calculations are always valid. * The client should do something similar when it invalidates its import. * - * \param exp - is the client's export to remove from grant accounting + * \param[in] exp client's export to remove from grant accounting */ void ofd_grant_discard(struct obd_export *exp) { @@ -755,7 +962,7 @@ void ofd_grant_discard(struct obd_export *exp) obd->obd_name, ofd->ofd_tot_pending, exp->exp_client_uuid.uuid, exp, fed->fed_pending); /* ofd_tot_pending is handled in ofd_grant_commit as bulk - * finishes */ + * commmits */ LASSERTF(ofd->ofd_tot_dirty >= fed->fed_dirty, "%s: tot_dirty "LPU64" cli %s/%p fed_dirty %ld\n", obd->obd_name, ofd->ofd_tot_dirty, @@ -766,28 +973,33 @@ void ofd_grant_discard(struct obd_export *exp) } /** - * Called at prepare time when handling read request. This function extracts - * incoming grant information from the obdo and processes the grant shrink - * request, if any. + * Process grant information from incoming bulk read request. + * + * Extract grant information packed in obdo structure (OBD_MD_FLGRANT set in + * o_valid). Bulk reads usually comes with grant announcements (number of dirty + * blocks, remaining amount of grant space, ...) and could also include a grant + * shrink request. Unlike bulk write, no additional grant space is returned on + * bulk read request. * - * \param env - is the lu environment provided by the caller - * \param exp - is the export of the client which sent the request - * \paral oa - is the incoming obdo sent by the client + * \param[in] env is the lu environment provided by the caller + * \param[in] exp is the export of the client which sent the request + * \param[in,out] oa is the incoming obdo sent by the client */ void ofd_grant_prepare_read(const struct lu_env *env, struct obd_export *exp, struct obdo *oa) { struct ofd_device *ofd = ofd_exp(exp); int do_shrink; - obd_size left = 0; + u64 left = 0; + ENTRY; if (!oa) - return; + RETURN_EXIT; if ((oa->o_valid & OBD_MD_FLGRANT) == 0) /* The read request does not contain any grant * information */ - return; + RETURN_EXIT; if ((oa->o_valid & OBD_MD_FLFLAGS) && (oa->o_flags & OBD_FL_SHRINK_GRANT)) { @@ -815,8 +1027,9 @@ void ofd_grant_prepare_read(const struct lu_env *env, do_shrink = 0; } - /* extract incoming grant infomation provided by the client */ - ofd_grant_incoming(env, exp, oa); + /* extract incoming grant information provided by the client and + * inflate grant counters if required */ + ofd_grant_incoming(env, exp, oa, ofd_grant_chunk(exp, ofd, NULL)); /* unlike writes, we don't return grants back on reads unless a grant * shrink request was packed and we decided to turn it down. */ @@ -825,18 +1038,32 @@ void ofd_grant_prepare_read(const struct lu_env *env, else oa->o_grant = 0; + if (!ofd_grant_param_supp(exp)) + oa->o_grant = ofd_grant_deflate(ofd, oa->o_grant); spin_unlock(&ofd->ofd_grant_lock); + EXIT; } /** - * Called at write prepare time to handle incoming grant, check that we have - * enough space and grant some space back to the client if possible. + * Process grant information from incoming bulk write request. * - * \param env - is the lu environment provided by the caller - * \param exp - is the export of the client which sent the request - * \paral oa - is the incoming obdo sent by the client - * \param rnb - is the list of network buffers - * \param niocont - is the number of network buffers in the list + * This function extracts client's grant announcements from incoming bulk write + * request and attempts to allocate grant space for network buffers that need it + * (i.e. OBD_BRW_FROM_GRANT not set in rnb_fags). + * Network buffers which aren't granted the OBD_BRW_GRANTED flag should not + * proceed further and should fail with -ENOSPC. + * Whenever possible, additional grant space will be returned to the client + * in the bulk write reply. + * ofd_grant_prepare_write() must be called before writting any buffers to + * the backend storage. This function works in pair with ofd_grant_commit() + * which must be invoked once all buffers have been written to disk in order + * to release space from the pending grant counter. + * + * \param[in] env LU environment provided by the caller + * \param[in] exp export of the client which sent the request + * \param[in] oa incoming obdo sent by the client + * \param[in] rnb list of network buffers + * \param[in] niocount number of network buffers in the list */ void ofd_grant_prepare_write(const struct lu_env *env, struct obd_export *exp, struct obdo *oa, @@ -844,9 +1071,10 @@ void ofd_grant_prepare_write(const struct lu_env *env, { struct obd_device *obd = exp->exp_obd; struct ofd_device *ofd = ofd_exp(exp); - obd_size left; + u64 left; int from_cache; int force = 0; /* can use cached data intially */ + long chunk = ofd_grant_chunk(exp, ofd, NULL); int rc; ENTRY; @@ -862,7 +1090,7 @@ refresh: left = ofd_grant_space_left(exp); /* Get fresh statfs data if we are short in ungranted space */ - if (from_cache && left < 32 * ofd_grant_chunk(exp, ofd)) { + if (from_cache && left < 32 * chunk) { spin_unlock(&ofd->ofd_grant_lock); CDEBUG(D_CACHE, "%s: fs has no space left and statfs too old\n", obd->obd_name); @@ -873,7 +1101,7 @@ refresh: /* When close to free space exhaustion, trigger a sync to force * writeback cache to consume required space immediately and release as * much space as possible. */ - if (!obd->obd_recovering && force != 2 && left < OFD_GRANT_CHUNK) { + if (!obd->obd_recovering && force != 2 && left < chunk) { bool from_grant = true; int i; @@ -895,8 +1123,9 @@ refresh: } } - /* extract incoming grant information provided by the client */ - ofd_grant_incoming(env, exp, oa); + /* extract incoming grant information provided by the client, + * and inflate grant counters if required */ + ofd_grant_incoming(env, exp, oa, chunk); /* check limit */ ofd_grant_check(env, exp, oa, rnb, niocount, &left); @@ -913,31 +1142,42 @@ refresh: ofd_grant_shrink(exp, oa, left); else /* grant more space back to the client if possible */ - oa->o_grant = ofd_grant(exp, oa->o_grant, oa->o_undirty, left, - true); + oa->o_grant = ofd_grant_alloc(exp, oa->o_grant, oa->o_undirty, + left, chunk, true); + + if (!ofd_grant_param_supp(exp)) + oa->o_grant = ofd_grant_deflate(ofd, oa->o_grant); spin_unlock(&ofd->ofd_grant_lock); + EXIT; } /** - * Called during object precreation to consume grant space. - * More space is granted for precreation if possible. + * Consume grant space reserved for object creation. + * + * Grant space is allocated to the local self export for object precreation. + * This is required to prevent object precreation from consuming grant space + * allocated to client nodes for the data writeback cache. + * This function consumes enough space to create \a nr objects and allocates + * more grant space to the self export for future precreation requests, if + * possible. + * + * \param[in] env LU environment provided by the caller + * \param[in] exp export holding the grant space for precreation (= self + * export currently) + * \param[in] nr number of objects to be created * - * \param env - is the lu environment provided by the caller - * \param exp - is the export holding the grant space for precreation (= self - * export currently) - * \paral nr - is the number of objects the caller wants to create objects + * \retval >= 0 amount of grant space allocated to the precreate request + * \retval -ENOSPC on failure */ -int ofd_grant_create(const struct lu_env *env, struct obd_export *exp, int *nr) +long ofd_grant_create(const struct lu_env *env, struct obd_export *exp, int *nr) { - struct ofd_thread_info *info = ofd_info(env); struct ofd_device *ofd = ofd_exp(exp); struct filter_export_data *fed = &exp->exp_filter_data; - obd_size left = 0; + u64 left = 0; unsigned long wanted; + unsigned long granted; ENTRY; - info->fti_used = 0; - if (exp->exp_obd->obd_recovering || ofd->ofd_dt_conf.ddp_inodespace == 0) /* don't enforce grant during recovery */ @@ -955,7 +1195,7 @@ int ofd_grant_create(const struct lu_env *env, struct obd_export *exp, int *nr) (ofd->ofd_osfs.os_blocks >> 10)) { spin_unlock(&ofd->ofd_grant_lock); CDEBUG(D_RPCTRACE, "%s: not enough space for create "LPU64"\n", - ofd_obd(ofd)->obd_name, + ofd_name(ofd), ofd->ofd_osfs.os_bavail * ofd->ofd_osfs.os_blocks); RETURN(-ENOSPC); } @@ -992,40 +1232,43 @@ int ofd_grant_create(const struct lu_env *env, struct obd_export *exp, int *nr) left -= wanted - fed->fed_grant; fed->fed_grant = 0; } - info->fti_used = wanted; - fed->fed_pending += info->fti_used; - ofd->ofd_tot_pending += info->fti_used; + granted = wanted; + fed->fed_pending += granted; + ofd->ofd_tot_pending += granted; /* grant more space for precreate purpose if possible. */ wanted = OST_MAX_PRECREATE * ofd->ofd_dt_conf.ddp_inodespace / 2; if (wanted > fed->fed_grant) { + long chunk; + /* always try to book enough space to handle a large precreate * request */ + chunk = ofd_grant_chunk(exp, ofd, NULL); wanted -= fed->fed_grant; - ofd_grant(exp, fed->fed_grant, wanted, left, false); + ofd_grant_alloc(exp, fed->fed_grant, wanted, left, chunk, + false); } spin_unlock(&ofd->ofd_grant_lock); - RETURN(0); + RETURN(granted); } /** - * Called at commit time to update pending grant counter for writes in flight + * Release grant space added to the pending counter by ofd_grant_prepare_write() + * + * Update pending grant counter once buffers have been written to the disk. * - * \param env - is the lu environment provided by the caller - * \param exp - is the export of the client which sent the request + * \param[in] exp export of the client which sent the request + * \param[in] pending amount of reserved space to be released + * \param[in] rc return code of pre-commit operations */ -void ofd_grant_commit(const struct lu_env *env, struct obd_export *exp, +void ofd_grant_commit(struct obd_export *exp, unsigned long pending, int rc) { struct ofd_device *ofd = ofd_exp(exp); - struct ofd_thread_info *info = ofd_info(env); - unsigned long pending; - ENTRY; /* get space accounted in tot_pending for the I/O, set in * ofd_grant_check() */ - pending = info->fti_used; if (pending == 0) RETURN_EXIT; @@ -1039,7 +1282,7 @@ void ofd_grant_commit(const struct lu_env *env, struct obd_export *exp, if (rc == 0) { spin_lock(&ofd->ofd_osfs_lock); /* Take pending out of cached statfs data */ - ofd->ofd_osfs.os_bavail -= min_t(obd_size, + ofd->ofd_osfs.os_bavail -= min_t(u64, ofd->ofd_osfs.os_bavail, pending >> ofd->ofd_blockbits); if (ofd->ofd_statfs_inflight) @@ -1079,3 +1322,75 @@ void ofd_grant_commit(const struct lu_env *env, struct obd_export *exp, spin_unlock(&ofd->ofd_grant_lock); EXIT; } + +struct ofd_grant_cb { + /* commit callback structure */ + struct dt_txn_commit_cb ogc_cb; + /* export associated with the bulk write */ + struct obd_export *ogc_exp; + /* pending grant to be released */ + unsigned long ogc_granted; +}; + +/** + * Callback function for grant releasing + * + * Release grant space reserved by the client node. + * + * \param[in] env execution environment + * \param[in] th transaction handle + * \param[in] cb callback data + * \param[in] err error code + */ +static void ofd_grant_commit_cb(struct lu_env *env, struct thandle *th, + struct dt_txn_commit_cb *cb, int err) +{ + struct ofd_grant_cb *ogc; + + ogc = container_of(cb, struct ofd_grant_cb, ogc_cb); + + ofd_grant_commit(ogc->ogc_exp, ogc->ogc_granted, err); + class_export_cb_put(ogc->ogc_exp); + OBD_FREE_PTR(ogc); +} + +/** + * Add callback for grant releasing + * + * Register a commit callback to release grant space. + * + * \param[in] th transaction handle + * \param[in] exp OBD export of client + * \param[in] granted amount of grant space to be released upon commit + * + * \retval 0 on successful callback adding + * \retval negative value on error + */ +int ofd_grant_commit_cb_add(struct thandle *th, struct obd_export *exp, + unsigned long granted) +{ + struct ofd_grant_cb *ogc; + struct dt_txn_commit_cb *dcb; + int rc; + ENTRY; + + OBD_ALLOC_PTR(ogc); + if (ogc == NULL) + RETURN(-ENOMEM); + + ogc->ogc_exp = class_export_cb_get(exp); + ogc->ogc_granted = granted; + + dcb = &ogc->ogc_cb; + dcb->dcb_func = ofd_grant_commit_cb; + INIT_LIST_HEAD(&dcb->dcb_linkage); + strlcpy(dcb->dcb_name, "ofd_grant_commit_cb", sizeof(dcb->dcb_name)); + + rc = dt_trans_cb_add(th, dcb); + if (rc) { + class_export_cb_put(ogc->ogc_exp); + OBD_FREE_PTR(ogc); + } + + RETURN(rc); +}