xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gfs2: Also reflect single-block allocations in rgd->rd_extfail_pt

Browse Source 
[ Upstream commit f38e998fbbb5da6a097ecd4b2700ba95eabab0c9 ]

Pass a non-NULL minext to gfs2_rbm_find even for single-block allocations.  In
gfs2_rbm_find, also set rgd->rd_extfail_pt when a single-block allocation
fails in a resource group: there is no reason for treating that case
differently.  In gfs2_reservation_check_and_update, only check how many free
blocks we have if more than one block is requested; we already know there's at
least one free block.

In addition, when allocating N blocks fails in gfs2_rbm_find, we need to set
rd_extfail_pt to N - 1 rather than N:  rd_extfail_pt defines the biggest
allocation that might still succeed.

Finally, reset rd_extfail_pt when updating the resource group statistics in
update_rgrp_lvb, as we already do in gfs2_rgrp_bh_get.

Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Stable-dep-of: 8877243beafa ("gfs2: Fix kernel NULL pointer dereference in gfs2_rgrp_dump")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Andreas Gruenbacher
2020-10-05 19:39:18 +02:00
committed by Greg Kroah-Hartman
parent 22f63f9bc8
commit 57c7b331f0
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
fs/gfs2/rgrp.c
View File

@@ -1247,6 +1247,8 @@ static int update_rgrp_lvb(struct gfs2_rgrpd *rgd)
rgd->rd_flags &= ~GFS2_RDF_CHECK; rgd->rd_flags &= ~GFS2_RDF_CHECK;
rgd->rd_free = be32_to_cpu(rgd->rd_rgl->rl_free); rgd->rd_free = be32_to_cpu(rgd->rd_rgl->rl_free);
rgd->rd_free_clone = rgd->rd_free; rgd->rd_free_clone = rgd->rd_free;
/* max out the rgrp allocation failure point */
rgd->rd_extfail_pt = rgd->rd_free;
rgd->rd_dinodes = be32_to_cpu(rgd->rd_rgl->rl_dinodes); rgd->rd_dinodes = be32_to_cpu(rgd->rd_rgl->rl_dinodes);
rgd->rd_igeneration = be64_to_cpu(rgd->rd_rgl->rl_igeneration); rgd->rd_igeneration = be64_to_cpu(rgd->rd_rgl->rl_igeneration);
return 0; return 0;
@@ -1648,7 +1650,7 @@ static int gfs2_reservation_check_and_update(struct gfs2_rbm *rbm,
* If we have a minimum extent length, then skip over any extent * If we have a minimum extent length, then skip over any extent
* which is less than the min extent length in size. * which is less than the min extent length in size.
*/ */
if (minext) { if (minext > 1) {
extlen = gfs2_free_extlen(rbm, minext); extlen = gfs2_free_extlen(rbm, minext);
if (extlen <= maxext->len) if (extlen <= maxext->len)
goto fail; goto fail;
@@ -1680,7 +1682,7 @@ fail:
* gfs2_rbm_find - Look for blocks of a particular state * gfs2_rbm_find - Look for blocks of a particular state
* @rbm: Value/result starting position and final position * @rbm: Value/result starting position and final position
* @state: The state which we want to find * @state: The state which we want to find
* @minext: Pointer to the requested extent length (NULL for a single block) * @minext: Pointer to the requested extent length
* This is updated to be the actual reservation size. * This is updated to be the actual reservation size.
* @ip: If set, check for reservations * @ip: If set, check for reservations
* @nowrap: Stop looking at the end of the rgrp, rather than wrapping * @nowrap: Stop looking at the end of the rgrp, rather than wrapping
@@ -1736,8 +1738,7 @@ static int gfs2_rbm_find(struct gfs2_rbm *rbm, u8 state, u32 *minext,
if (ip == NULL) if (ip == NULL)
return 0; return 0;
ret = gfs2_reservation_check_and_update(rbm, ip, ret = gfs2_reservation_check_and_update(rbm, ip, *minext,
minext ? *minext : 0,
&maxext); &maxext);
if (ret == 0) if (ret == 0)
return 0; return 0;
@@ -1769,7 +1770,7 @@ next_iter:
break; break;
} }
if (minext == NULL || state != GFS2_BLKST_FREE) if (state != GFS2_BLKST_FREE)
return -ENOSPC; return -ENOSPC;
/* If the extent was too small, and it's smaller than the smallest /* If the extent was too small, and it's smaller than the smallest
@@ -1777,7 +1778,7 @@ next_iter:
useless to search this rgrp again for this amount or more. */ useless to search this rgrp again for this amount or more. */
if (wrapped && (scan_from_start || rbm->bii > last_bii) && if (wrapped && (scan_from_start || rbm->bii > last_bii) &&
*minext < rbm->rgd->rd_extfail_pt) *minext < rbm->rgd->rd_extfail_pt)
rbm->rgd->rd_extfail_pt = *minext; rbm->rgd->rd_extfail_pt = *minext - 1;
/* If the maximum extent we found is big enough to fulfill the /* If the maximum extent we found is big enough to fulfill the
minimum requirements, use it anyway. */ minimum requirements, use it anyway. */
@@ -2351,14 +2352,15 @@ int gfs2_alloc_blocks(struct gfs2_inode *ip, u64 *bn, unsigned int *nblocks,
struct gfs2_rbm rbm = { .rgd = ip->i_res.rs_rbm.rgd, }; struct gfs2_rbm rbm = { .rgd = ip->i_res.rs_rbm.rgd, };
unsigned int ndata; unsigned int ndata;
u64 block; /* block, within the file system scope */ u64 block; /* block, within the file system scope */
u32 minext = 1;
int error; int error;
gfs2_set_alloc_start(&rbm, ip, dinode); gfs2_set_alloc_start(&rbm, ip, dinode);
error = gfs2_rbm_find(&rbm, GFS2_BLKST_FREE, NULL, ip, false); error = gfs2_rbm_find(&rbm, GFS2_BLKST_FREE, &minext, ip, false);
if (error == -ENOSPC) { if (error == -ENOSPC) {
gfs2_set_alloc_start(&rbm, ip, dinode); gfs2_set_alloc_start(&rbm, ip, dinode);
error = gfs2_rbm_find(&rbm, GFS2_BLKST_FREE, NULL, NULL, false); error = gfs2_rbm_find(&rbm, GFS2_BLKST_FREE, &minext, NULL, false);
} }
/* Since all blocks are reserved in advance, this shouldn't happen */ /* Since all blocks are reserved in advance, this shouldn't happen */