X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=modules%2Fppp_comp.c;h=c3badd3698c54c5266a8260a8965e5507e29593e;hp=0e28c3354bb4ea1645a181c9c29f6c5883ec0a5d;hb=09032f7c09a5ead7d5cd14a61d17d1d495bf80f5;hpb=5c678fe1d4c90d83236a0a7e860381002bddaf02 diff --git a/modules/ppp_comp.c b/modules/ppp_comp.c index 0e28c33..c3badd3 100644 --- a/modules/ppp_comp.c +++ b/modules/ppp_comp.c @@ -24,7 +24,7 @@ * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, * OR MODIFICATIONS. * - * $Id: ppp_comp.c,v 1.4 1996/06/26 00:54:20 paulus Exp $ + * $Id: ppp_comp.c,v 1.8 1997/04/30 05:45:15 paulus Exp $ */ /* @@ -42,6 +42,9 @@ #include #else #include +#ifdef __osf__ +#include +#endif #endif /* SVR4 */ #include @@ -79,7 +82,11 @@ static int msg_byte __P((mblk_t *, unsigned int)); #define PPP_COMP_ID 0xbadf static struct module_info minfo = { +#ifdef PRIOQ + PPP_COMP_ID, "ppp_comp", 0, INFPSZ, 16512, 16384, +#else PPP_COMP_ID, "ppp_comp", 0, INFPSZ, 16384, 4096, +#endif }; static struct qinit r_init = { @@ -91,6 +98,10 @@ static struct qinit w_init = { ppp_comp_wput, ppp_comp_wsrv, NULL, NULL, NULL, &minfo, NULL }; +#if defined(SVR4) && !defined(SOL2) +int pcmpdevflag = 0; +#define ppp_compinfo pcmpinfo +#endif struct streamtab ppp_compinfo = { &r_init, &w_init, NULL, NULL }; @@ -101,11 +112,10 @@ int ppp_comp_count; /* number of module instances in use */ static void ppp_comp_alloc __P((comp_state_t *)); typedef struct memreq { - unsigned char *comp; - void *mem; - int len; + unsigned char comp_opts[20]; int cmd; - int ret; + int thread_status; + char *returned_mem; } memreq_t; #endif @@ -136,6 +146,7 @@ extern task_t first_task; /* Bits in flags are as defined in pppio.h. */ #define CCP_ERR (CCP_ERROR | CCP_FATALERROR) #define LAST_MOD 0x1000000 /* no ppp modules below us */ +#define DBGLOG 0x2000000 /* log debugging stuff */ #define MAX_IPHDR 128 /* max TCP/IP header size */ #define MAX_VJHDR 20 /* max VJ compressed header size (?) */ @@ -147,8 +158,12 @@ extern task_t first_task; * List of compressors we know about. */ +#if DO_BSD_COMPRESS extern struct compressor ppp_bsd_compress; +#endif +#if DO_DEFLATE extern struct compressor ppp_deflate; +#endif struct compressor *ppp_compressors[] = { #if DO_BSD_COMPRESS @@ -177,7 +192,7 @@ MOD_OPEN(ppp_comp_open) WR(q)->q_ptr = q->q_ptr = (caddr_t) cp; bzero((caddr_t)cp, sizeof(comp_state_t)); cp->mru = PPP_MRU; - cp->mtu = PPP_MRU; + cp->mtu = PPP_MTU; cp->xstate = NULL; cp->rstate = NULL; vj_compress_init(&cp->vj_comp, -1); @@ -207,7 +222,7 @@ MOD_CLOSE(ppp_comp_close) if (!cp->thread) printf("ppp_comp_close: NULL thread!\n"); else - thread_deallocate(cp->thread); + thread_terminate(cp->thread); #endif FREE(cp, sizeof(comp_state_t)); q->q_ptr = NULL; @@ -228,12 +243,13 @@ MOD_CLOSE(ppp_comp_close) static void ppp_comp_alloc(comp_state_t *cp) { - unsigned char *opt_data; int len, cmd; - struct compressor *comp; + unsigned char *compressor_options; thread_t thread; + void *(*comp_allocator)(); + -#if (MAJOR_VERSION <= 2) +#if defined(MAJOR_VERSION) && (MAJOR_VERSION <= 2) /* In 2.x and earlier the argument gets passed * in the thread structure itself. Yuck. @@ -245,30 +261,29 @@ ppp_comp_alloc(comp_state_t *cp) #endif for (;;) { - assert_wait((vm_offset_t)&cp->memreq.comp, TRUE); + assert_wait((vm_offset_t)&cp->memreq.thread_status, TRUE); thread_block(); - opt_data = cp->memreq.comp; - len = cp->memreq.len; - cmd = cp->memreq.cmd; - if (cmd == PPPIO_XCOMP) { - comp = cp->xcomp; - cp->memreq.mem = (*comp->comp_alloc)(opt_data, len); + if (thread_should_halt(current_thread())) + thread_halt_self(); + cmd = cp->memreq.cmd; + compressor_options = &cp->memreq.comp_opts[0]; + len = compressor_options[1]; + if (cmd == PPPIO_XCOMP) { + cp->memreq.returned_mem = cp->xcomp->comp_alloc(compressor_options, len); + if (!cp->memreq.returned_mem) { + cp->memreq.thread_status = ENOSR; + } else { + cp->memreq.thread_status = 0; + } } else { - comp = cp->rcomp; - cp->memreq.mem = (*comp->decomp_alloc)(opt_data, len); + cp->memreq.returned_mem = cp->rcomp->decomp_alloc(compressor_options, len); + if (!cp->memreq.returned_mem) { + cp->memreq.thread_status = ENOSR; + } else { + cp->memreq.thread_status = 0; + } } - if (!cp->memreq.mem) - cp->memreq.ret = ENOSR; - else - bcopy(opt_data, cp->memreq.mem, len); - - /* have to free thunk here, since there's - * no guarantee that the user will call the ioctl - * again if we've taken a long time to complete - */ - FREE(opt_data, len); - cp->memreq.ret = 0; } } @@ -300,7 +315,7 @@ ppp_comp_wput(q, mp) { struct iocblk *iop; comp_state_t *cp; - int error, len; + int error, len, n; int flags, mask; mblk_t *np; struct compressor **comp; @@ -375,8 +390,8 @@ ppp_comp_wput(q, mp) if ((*comp)->compress_proto == opt_data[0]) { /* here's the handler! */ error = 0; +#ifndef __osf__ if (iop->ioc_cmd == PPPIO_XCOMP) { - /* A previous call may have fetched memory for a compressor * that's now being retired or reset. Free it using it's * mechanism for freeing stuff. @@ -385,106 +400,72 @@ ppp_comp_wput(q, mp) (*cp->xcomp->comp_free)(cp->xstate); cp->xstate = NULL; } - -#ifdef __osf__ - /* Account for an orpahned call to get memory. - * Free that memory up and go on. - * - * The trick is that we need to be able to tell - * the difference between an old call that kicked - * off a thread where the memory was subsequently - * orphaned, and the memory we're really interested - * in. The thread helps by stamping the memory it - * allocated with the parameters for the compressor - * it belongs to. If the parameters match then this - * is the memory we want (whether it was an actual - * orphan or not we don't care.) If the parameters - * don't match then this is an orphan. - * - * Note that cp->memreq.ret is the synchronization - * point: we set it to EAGAIN in this function, then - * wait for the thread to set it to something other - * than EAGAIN before we fool with the data structure - * again. Basically, if ret != EAGAIN then the thread - * is working and it owns the memreq struture. + cp->xcomp = *comp; + cp->xstate = (*comp)->comp_alloc(opt_data, len); + if (cp->xstate == NULL) + error = ENOSR; + } else { + if (cp->rstate != NULL) { + (*cp->rcomp->decomp_free)(cp->rstate); + cp->rstate = NULL; + } + cp->rcomp = *comp; + cp->rstate = (*comp)->decomp_alloc(opt_data, len); + if (cp->rstate == NULL) + error = ENOSR; + } +#else + if ((error = cp->memreq.thread_status) != EAGAIN) + if (iop->ioc_cmd == PPPIO_XCOMP) { + if (cp->xstate) { + (*cp->xcomp->comp_free)(cp->xstate); + cp->xstate = 0; + } + /* sanity check for compressor options */ - if (cp->memreq.ret == 0 && cp->memreq.mem != NULL && - bcmp(cp->memreq.mem, opt_data, len)) { - (*cp->xcomp->comp_free)(cp->memreq.mem); - cp->memreq.mem = 0; + if (sizeof (cp->memreq.comp_opts) < len) { + printf("can't handle options for compressor %d (%d)\n", opt_data[0], + opt_data[1]); + cp->memreq.thread_status = ENOSR; + cp->memreq.returned_mem = 0; } - - /* First time through, prime the pump and kick - * off the thread. Subsequent times though, the thread - * is either busy (ret == EAGAIN) or finsihed (mem != NULL) - * || (ret != 0) + /* fill in request for the thread and kick it off */ - if (cp->memreq.ret == 0 && cp->memreq.mem == NULL) { - cp->memreq.comp = ALLOC_NOSLEEP(len); - if (!cp->memreq.comp) { - printf("gack! can't get memory for thunk\n"); - return ENOSR; - } - bcopy(opt_data, cp->memreq.comp, len); - cp->memreq.len = len; + if (cp->memreq.thread_status == 0 && !cp->memreq.returned_mem) { + bcopy(opt_data, cp->memreq.comp_opts, len); cp->memreq.cmd = PPPIO_XCOMP; cp->xcomp = *comp; - cp->memreq.ret = EAGAIN; - thread_wakeup((vm_offset_t)&cp->memreq.comp); - } - - /* Collect results from the thread, and reset the - * mechanism for the next attempt to allocate memory - * If the thread isn't finished (ret == EAGAIN) then - * don't reset and just return. - */ - if ((error = cp->memreq.ret) != EAGAIN) { - cp->xstate = cp->memreq.mem; - cp->memreq.mem = 0; - cp->memreq.ret = 0; + error = cp->memreq.thread_status = EAGAIN; + thread_wakeup((vm_offset_t)&cp->memreq.thread_status); + } else { + cp->xstate = cp->memreq.returned_mem; + cp->memreq.returned_mem = 0; + cp->memreq.thread_status = 0; } -#else - cp->xcomp = *comp; - cp->xstate = (*comp)->comp_alloc(opt_data, len); - if (cp->xstate == NULL) - error = ENOSR; -#endif } else { - if (cp->rstate != NULL) { + if (cp->rstate) { (*cp->rcomp->decomp_free)(cp->rstate); cp->rstate = NULL; } -#ifdef __osf__ - if (cp->memreq.ret == 0 && cp->memreq.mem != NULL && - bcmp(cp->memreq.mem, opt_data, len)) { - (*cp->rcomp->comp_free)(cp->memreq.mem); - cp->memreq.mem = 0; + if (sizeof (cp->memreq.comp_opts) < len) { + printf("can't handle options for compressor %d (%d)\n", opt_data[0], + opt_data[1]); + cp->memreq.thread_status = ENOSR; + cp->memreq.returned_mem = 0; } - if (cp->memreq.ret == 0 && cp->memreq.mem == NULL) { - cp->memreq.comp = ALLOC_NOSLEEP(len); - if (!cp->memreq.comp) { - printf("gack! can't get memory for thunk\n"); - return ENOSR; - } - bcopy(opt_data, cp->memreq.comp, len); - cp->memreq.len = len; + if (cp->memreq.thread_status == 0 && !cp->memreq.returned_mem) { + bcopy(opt_data, cp->memreq.comp_opts, len); cp->memreq.cmd = PPPIO_RCOMP; cp->rcomp = *comp; - cp->memreq.ret = EAGAIN; - thread_wakeup((vm_offset_t)&cp->memreq.comp); - } - if ((error = cp->memreq.ret) != EAGAIN) { - cp->rstate = cp->memreq.mem; - cp->memreq.mem = 0; - cp->memreq.ret = 0; + error = cp->memreq.thread_status = EAGAIN; + thread_wakeup((vm_offset_t)&cp->memreq.thread_status); + } else { + cp->rstate = cp->memreq.returned_mem; + cp->memreq.returned_mem = 0; + cp->memreq.thread_status = 0; } -#else - cp->rcomp = *comp; - cp->rstate = (*comp)->decomp_alloc(opt_data, len); - if (cp->rstate == NULL) - error = ENOSR; -#endif } +#endif break; } iop->ioc_count = 0; @@ -531,6 +512,20 @@ ppp_comp_wput(q, mp) error = 0; break; + case PPPIO_DEBUG: + if (iop->ioc_count != sizeof(int)) + break; + n = *(int *)mp->b_cont->b_rptr; + if (n == PPPDBG_LOG + PPPDBG_COMP) { + DPRINT1("ppp_comp%d: debug log enabled\n", cp->unit); + cp->flags |= DBGLOG; + error = 0; + iop->ioc_count = 0; + } else { + error = -1; + } + break; + case PPPIO_LASTMOD: cp->flags |= LAST_MOD; error = 0; @@ -587,7 +582,11 @@ ppp_comp_wsrv(q) cp = (comp_state_t *) q->q_ptr; while ((mp = getq(q)) != 0) { /* assert(mp->b_datap->db_type == M_DATA) */ - if (!canputnext(q)) { +#ifdef PRIOQ + if (!bcanputnext(q,mp->b_band)) { +#else + if (!canputnext(q)) { +#endif PRIOQ putbq(q, mp); return; } @@ -609,9 +608,9 @@ ppp_comp_wsrv(q) * Make sure we've got enough data in the first mblk * and that we are its only user. */ - if (proto = PPP_CCP) + if (proto == PPP_CCP) hlen = len; - else if (proto = PPP_IP) + else if (proto == PPP_IP) hlen = PPP_HDRLEN + MAX_IPHDR; else hlen = PPP_HDRLEN; @@ -626,7 +625,6 @@ ppp_comp_wsrv(q) continue; } } - proto = PPP_PROTOCOL(mp->b_rptr); /* * Do VJ compression if requested. @@ -663,6 +661,9 @@ ppp_comp_wsrv(q) (*cp->xcomp->compress)(cp->xstate, &cmp, mp, len, (cp->flags & CCP_ISUP? cp->mtu: 0)); if (cmp != NULL) { +#ifdef PRIOQ + cmp->b_band=mp->b_band; +#endif PRIOQ freemsg(mp); mp = cmp; } @@ -901,7 +902,8 @@ ppp_comp_rsrv(q) * First reset compressor if an input error has occurred. */ if (cp->stats.ppp_ierrors != cp->vj_last_ierrors) { - DPRINT1("ppp%d: resetting VJ\n", cp->unit); + if (cp->flags & DBGLOG) + DPRINT1("ppp%d: resetting VJ\n", cp->unit); vj_uncompress_err(&cp->vj_comp); cp->vj_last_ierrors = cp->stats.ppp_ierrors; } @@ -909,17 +911,9 @@ ppp_comp_rsrv(q) vjlen = vj_uncompress_tcp(dp, np->b_wptr - dp, len, &cp->vj_comp, &iphdr, &iphlen); if (vjlen < 0) { -#if DEBUG > 1 - int i; - DPRINT2("ppp%d: vj_uncomp_tcp failed, pkt len %d [", - cp->unit, len); - for (i = 0; i < len && i < 8; ++i) - DPRINT1(" %x", dp[i]); - DPRINT3("] c=%d u=%d e=%d\n", - cp->vj_comp.stats.vjs_compressedin, - cp->vj_comp.stats.vjs_uncompressedin, - cp->vj_comp.stats.vjs_errorin); -#endif + if (cp->flags & DBGLOG) + DPRINT2("ppp%d: vj_uncomp_tcp failed, pkt len %d\n", + cp->unit, len); ++cp->vj_last_ierrors; /* so we don't reset next time */ goto bad; } @@ -965,10 +959,9 @@ ppp_comp_rsrv(q) */ cp->vj_last_ierrors = cp->stats.ppp_ierrors; if (!vj_uncompress_uncomp(dp, hlen, &cp->vj_comp)) { -#if DEBUG > 1 - DPRINT2("ppp%d: vj_uncomp_uncomp failed, pkt len %d\n", - cp->unit, len); -#endif + if (cp->flags & DBGLOG) + DPRINT2("ppp%d: vj_uncomp_uncomp failed, pkt len %d\n", + cp->unit, len); ++cp->vj_last_ierrors; /* don't need to reset next time */ goto bad; } @@ -1027,13 +1020,13 @@ ppp_comp_ccp(q, mp, rcvd) if (cp->xstate != NULL && (*cp->xcomp->comp_init) (cp->xstate, dp + CCP_HDRLEN, clen - CCP_HDRLEN, - cp->unit, 0, 0)) + cp->unit, 0, ((cp->flags & DBGLOG) != 0))) cp->flags |= CCP_COMP_RUN; } else { if (cp->rstate != NULL && (*cp->rcomp->decomp_init) (cp->rstate, dp + CCP_HDRLEN, clen - CCP_HDRLEN, - cp->unit, 0, cp->mru, 0)) + cp->unit, 0, cp->mru, ((cp->flags & DBGLOG) != 0))) cp->flags = (cp->flags & ~CCP_ERR) | CCP_DECOMP_RUN; } } @@ -1055,7 +1048,7 @@ ppp_comp_ccp(q, mp, rcvd) } } -#if DEBUG +#if 0 dump_msg(mp) mblk_t *mp; {