From owner-p4-projects@FreeBSD.ORG Mon Nov 5 07:47:34 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 681EA16A419; Mon, 5 Nov 2007 07:47:34 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 065AA16A524 for ; Mon, 5 Nov 2007 07:47:34 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F0B6513C4B5 for ; Mon, 5 Nov 2007 07:47:33 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA57lXjo045915 for ; Mon, 5 Nov 2007 07:47:33 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA57lXlB045912 for perforce@freebsd.org; Mon, 5 Nov 2007 07:47:33 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 5 Nov 2007 07:47:33 GMT Message-Id: <200711050747.lA57lXlB045912@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128668 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Nov 2007 07:47:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=128668 Change 128668 by kmacy@kmacy:storage:toestack on 2007/11/05 07:47:18 handle listen close don't set offload flag so as to avoid dereferencing null toe_usrreqs Affected files ... .. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_listen.c#4 edit .. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_tom.c#7 edit Differences ... ==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_listen.c#4 (text+ko) ==== @@ -56,6 +56,7 @@ #include #include #include + #include #include @@ -80,7 +81,23 @@ static int do_close_server_rpl(struct t3cdev *cdev, struct mbuf *m, void *ctx) { - UNIMPLEMENTED(); + struct cpl_close_listserv_rpl *rpl = cplhdr(m); + unsigned int stid = GET_TID(rpl); + + if (rpl->status != CPL_ERR_NONE) + log(LOG_ERR, "Unexpected CLOSE_LISTSRV_RPL status %u for " + "STID %u\n", rpl->status, stid); + else { + struct listen_ctx *listen_ctx = (struct listen_ctx *)ctx; + + cxgb_free_stid(cdev, stid); +#if 0 + sock_put(listen_ctx->lsk); +#endif + free(listen_ctx, M_DEVBUF); + } + + return (CPL_RET_BUF_DONE); } /* @@ -222,7 +239,6 @@ struct cpl_pass_open_req *req; struct tom_data *d = TOM_DATA(dev); struct inpcb *inp = sotoinpcb(so); - struct tcpcb *tp = sototcpcb(so); struct listen_ctx *ctx; if (!TOM_TUNABLE(dev, activated)) @@ -256,7 +272,6 @@ if (!listen_hash_add(d, so, stid)) goto free_all; - tp->t_flags |= TF_TOE; req = mtod(m, struct cpl_pass_open_req *); req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_FORWARD)); OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_PASS_OPEN_REQ, stid)); @@ -294,8 +309,7 @@ struct mbuf *m; struct cpl_close_listserv_req *req; int stid = listen_hash_del(TOM_DATA(dev), so); - printf("stop listen\n"); - + if (stid < 0) return; ==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_tom.c#7 (text+ko) ==== @@ -358,8 +358,13 @@ TAILQ_FOREACH(p, &cxgb_list, entry) { if (event == OFLD_LISTEN_OPEN) t3_listen_start(&p->tdev, so, p->cdev); - else + else if (tp->t_state == TCPS_LISTEN) { + printf("stopping listen on port=%d\n", + ntohs(tp->t_inpcb->inp_lport)); + t3_listen_stop(&p->tdev, so, p->cdev); + } + } mtx_unlock(&cxgb_list_lock); break;