Re: [PATCH net] bpf: do not use reciprocal divide

[Heiko Carstens <heiko.carstens@de.ibm.com>]

On Wed, Jan 15, 2014 at 09:13:22AM +0100, Martin Schwidefsky wrote:
> On Wed, 15 Jan 2014 09:00:07 +0100
> Heiko Carstens <heiko.carstens@de.ibm.com> wrote:
> 
> > On Tue, Jan 14, 2014 at 11:02:41PM -0800, Eric Dumazet wrote:
> > > diff --git a/arch/s390/net/bpf_jit_comp.c b/arch/s390/net/bpf_jit_comp.c
> > > index 16871da37371..e349dc7d0992 100644
> > > --- a/arch/s390/net/bpf_jit_comp.c
> > > +++ b/arch/s390/net/bpf_jit_comp.c
> > > @@ -371,11 +371,11 @@ static int bpf_jit_insn(struct bpf_jit *jit, struct sock_filter *filter,
> > >  		/* dr %r4,%r12 */
> > >  		EMIT2(0x1d4c);
> > >  		break;
> > > -	case BPF_S_ALU_DIV_K: /* A = reciprocal_divide(A, K) */
> > > -		/* m %r4,<d(K)>(%r13) */
> > > -		EMIT4_DISP(0x5c40d000, EMIT_CONST(K));
> > > -		/* lr %r5,%r4 */
> > > -		EMIT2(0x1854);
> > > +	case BPF_S_ALU_DIV_K: /* A /= K */
> > > +		/* lhi %r4,0 */
> > > +		EMIT4(0xa7480000);
> > > +		/* d %r4,<d(K)>(%r13) */
> > > +		EMIT4_DISP(0x5d40d000, EMIT_CONST(K));
> > >  		break;
> > 
> > The s390 part looks good.
> 
> Does it? The divide instruction is signed, for the special
> case of K==1 this can now cause an exception if the quotient
> gets too large. We should add a check for K==1 and do nothing
> in this case. With a divisor of at least 2 the result will
> stay in the limit.

Indeed. That's quite subtle.