mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2024-12-29 09:13:38 +00:00
net/smc: set rmb's SG_MAX_SINGLE_ALLOC limitation only when CONFIG_ARCH_NO_SG_CHAIN is defined
SG_MAX_SINGLE_ALLOC is used to limit maximum number of entries that will be allocated in one piece of scatterlist. When the entries of scatterlist exceeds SG_MAX_SINGLE_ALLOC, sg chain will be used. From commit7c703e54cc
("arch: switch the default on ARCH_HAS_SG_CHAIN"), we can know that the macro CONFIG_ARCH_NO_SG_CHAIN is used to identify whether sg chain is supported. So, SMC-R's rmb buffer should be limited by SG_MAX_SINGLE_ALLOC only when the macro CONFIG_ARCH_NO_SG_CHAIN is defined. Fixes:a3fe3d01bd
("net/smc: introduce sg-logic for RMBs") Signed-off-by: Guangguan Wang <guangguan.wang@linux.alibaba.com> Co-developed-by: Wen Gu <guwen@linux.alibaba.com> Signed-off-by: Wen Gu <guwen@linux.alibaba.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
b5c0898807
commit
3ac14b9dfb
@ -2015,7 +2015,6 @@ int smc_conn_create(struct smc_sock *smc, struct smc_init_info *ini)
|
||||
*/
|
||||
static u8 smc_compress_bufsize(int size, bool is_smcd, bool is_rmb)
|
||||
{
|
||||
const unsigned int max_scat = SG_MAX_SINGLE_ALLOC * PAGE_SIZE;
|
||||
u8 compressed;
|
||||
|
||||
if (size <= SMC_BUF_MIN_SIZE)
|
||||
@ -2025,9 +2024,11 @@ static u8 smc_compress_bufsize(int size, bool is_smcd, bool is_rmb)
|
||||
compressed = min_t(u8, ilog2(size) + 1,
|
||||
is_smcd ? SMCD_DMBE_SIZES : SMCR_RMBE_SIZES);
|
||||
|
||||
#ifdef CONFIG_ARCH_NO_SG_CHAIN
|
||||
if (!is_smcd && is_rmb)
|
||||
/* RMBs are backed by & limited to max size of scatterlists */
|
||||
compressed = min_t(u8, compressed, ilog2(max_scat >> 14));
|
||||
compressed = min_t(u8, compressed, ilog2((SG_MAX_SINGLE_ALLOC * PAGE_SIZE) >> 14));
|
||||
#endif
|
||||
|
||||
return compressed;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user