[IPCOMP]: Disable BH on output when using shared tfm (21e43188) · Commits · 戴 / test

Because we use shared tfm objects in order to conserve memory, (each tfm requires 128K of vmalloc memory), BH needs to be turned off on output as that can occur in process context. Previously this was done implicitly by the xfrm output code. That was lost when it became lockless. So we need to add the BH disabling to IPComp directly. Signed-off-by:

Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by:

David S. Miller <davem@davemloft.net>

net/ipv4/ipcomp.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -108,8 +108,11 @@ static int ipcomp_compress(struct xfrm_state x, struct sk_buff skb)
		const int cpu = get_cpu();
		u8 scratch = per_cpu_ptr(ipcomp_scratches, cpu);
		struct crypto_comp tfm = per_cpu_ptr(ipcd->tfms, cpu);
		int err = crypto_comp_compress(tfm, start, plen, scratch, &dlen);
		int err;

		local_bh_disable();
		err = crypto_comp_compress(tfm, start, plen, scratch, &dlen);
		local_bh_enable();
		if (err)
		goto out;

net/ipv6/ipcomp6.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -146,7 +146,9 @@ static int ipcomp6_output(struct xfrm_state x, struct sk_buff skb)
		scratch = *per_cpu_ptr(ipcomp6_scratches, cpu);
		tfm = *per_cpu_ptr(ipcd->tfms, cpu);

		local_bh_disable();
		err = crypto_comp_compress(tfm, start, plen, scratch, &dlen);
		local_bh_enable();
		if (err \|\| (dlen + sizeof(*ipch)) >= plen) {
		put_cpu();
		goto out_ok;

Admin message