diff options
Diffstat (limited to 'fs/cifs/transport.c')
| -rw-r--r-- | fs/cifs/transport.c | 618 |
1 files changed, 406 insertions, 212 deletions
diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c index 17ba329e2b3d..48d47b46b1fb 100644 --- a/fs/cifs/transport.c +++ b/fs/cifs/transport.c | |||
| @@ -3,7 +3,8 @@ | |||
| 3 | * | 3 | * |
| 4 | * Copyright (C) International Business Machines Corp., 2002,2005 | 4 | * Copyright (C) International Business Machines Corp., 2002,2005 |
| 5 | * Author(s): Steve French (sfrench@us.ibm.com) | 5 | * Author(s): Steve French (sfrench@us.ibm.com) |
| 6 | * | 6 | * Jeremy Allison (jra@samba.org) 2006. |
| 7 | * | ||
| 7 | * This library is free software; you can redistribute it and/or modify | 8 | * This library is free software; you can redistribute it and/or modify |
| 8 | * it under the terms of the GNU Lesser General Public License as published | 9 | * it under the terms of the GNU Lesser General Public License as published |
| 9 | * by the Free Software Foundation; either version 2.1 of the License, or | 10 | * by the Free Software Foundation; either version 2.1 of the License, or |
| @@ -36,7 +37,7 @@ extern mempool_t *cifs_mid_poolp; | |||
| 36 | extern kmem_cache_t *cifs_oplock_cachep; | 37 | extern kmem_cache_t *cifs_oplock_cachep; |
| 37 | 38 | ||
| 38 | static struct mid_q_entry * | 39 | static struct mid_q_entry * |
| 39 | AllocMidQEntry(struct smb_hdr *smb_buffer, struct cifsSesInfo *ses) | 40 | AllocMidQEntry(const struct smb_hdr *smb_buffer, struct cifsSesInfo *ses) |
| 40 | { | 41 | { |
| 41 | struct mid_q_entry *temp; | 42 | struct mid_q_entry *temp; |
| 42 | 43 | ||
| @@ -203,6 +204,10 @@ smb_send(struct socket *ssocket, struct smb_hdr *smb_buffer, | |||
| 203 | rc = 0; | 204 | rc = 0; |
| 204 | } | 205 | } |
| 205 | 206 | ||
| 207 | /* Don't want to modify the buffer as a | ||
| 208 | side effect of this call. */ | ||
| 209 | smb_buffer->smb_buf_length = smb_buf_length; | ||
| 210 | |||
| 206 | return rc; | 211 | return rc; |
| 207 | } | 212 | } |
| 208 | 213 | ||
| @@ -217,6 +222,7 @@ smb_send2(struct socket *ssocket, struct kvec *iov, int n_vec, | |||
| 217 | unsigned int len = iov[0].iov_len; | 222 | unsigned int len = iov[0].iov_len; |
| 218 | unsigned int total_len; | 223 | unsigned int total_len; |
| 219 | int first_vec = 0; | 224 | int first_vec = 0; |
| 225 | unsigned int smb_buf_length = smb_buffer->smb_buf_length; | ||
| 220 | 226 | ||
| 221 | if(ssocket == NULL) | 227 | if(ssocket == NULL) |
| 222 | return -ENOTSOCK; /* BB eventually add reconnect code here */ | 228 | return -ENOTSOCK; /* BB eventually add reconnect code here */ |
| @@ -293,36 +299,15 @@ smb_send2(struct socket *ssocket, struct kvec *iov, int n_vec, | |||
| 293 | } else | 299 | } else |
| 294 | rc = 0; | 300 | rc = 0; |
| 295 | 301 | ||
| 302 | /* Don't want to modify the buffer as a | ||
| 303 | side effect of this call. */ | ||
| 304 | smb_buffer->smb_buf_length = smb_buf_length; | ||
| 305 | |||
| 296 | return rc; | 306 | return rc; |
| 297 | } | 307 | } |
| 298 | 308 | ||
| 299 | int | 309 | static int wait_for_free_request(struct cifsSesInfo *ses, const int long_op) |
| 300 | SendReceive2(const unsigned int xid, struct cifsSesInfo *ses, | ||
| 301 | struct kvec *iov, int n_vec, int * pRespBufType /* ret */, | ||
| 302 | const int long_op) | ||
| 303 | { | 310 | { |
| 304 | int rc = 0; | ||
| 305 | unsigned int receive_len; | ||
| 306 | unsigned long timeout; | ||
| 307 | struct mid_q_entry *midQ; | ||
| 308 | struct smb_hdr *in_buf = iov[0].iov_base; | ||
| 309 | |||
| 310 | *pRespBufType = CIFS_NO_BUFFER; /* no response buf yet */ | ||
| 311 | |||
| 312 | if ((ses == NULL) || (ses->server == NULL)) { | ||
| 313 | cifs_small_buf_release(in_buf); | ||
| 314 | cERROR(1,("Null session")); | ||
| 315 | return -EIO; | ||
| 316 | } | ||
| 317 | |||
| 318 | if(ses->server->tcpStatus == CifsExiting) { | ||
| 319 | cifs_small_buf_release(in_buf); | ||
| 320 | return -ENOENT; | ||
| 321 | } | ||
| 322 | |||
| 323 | /* Ensure that we do not send more than 50 overlapping requests | ||
| 324 | to the same server. We may make this configurable later or | ||
| 325 | use ses->maxReq */ | ||
| 326 | if(long_op == -1) { | 311 | if(long_op == -1) { |
| 327 | /* oplock breaks must not be held up */ | 312 | /* oplock breaks must not be held up */ |
| 328 | atomic_inc(&ses->server->inFlight); | 313 | atomic_inc(&ses->server->inFlight); |
| @@ -345,53 +330,140 @@ SendReceive2(const unsigned int xid, struct cifsSesInfo *ses, | |||
| 345 | } else { | 330 | } else { |
| 346 | if(ses->server->tcpStatus == CifsExiting) { | 331 | if(ses->server->tcpStatus == CifsExiting) { |
| 347 | spin_unlock(&GlobalMid_Lock); | 332 | spin_unlock(&GlobalMid_Lock); |
| 348 | cifs_small_buf_release(in_buf); | ||
| 349 | return -ENOENT; | 333 | return -ENOENT; |
| 350 | } | 334 | } |
| 351 | 335 | ||
| 352 | /* can not count locking commands against total since | 336 | /* can not count locking commands against total since |
| 353 | they are allowed to block on server */ | 337 | they are allowed to block on server */ |
| 354 | 338 | ||
| 355 | if(long_op < 3) { | ||
| 356 | /* update # of requests on the wire to server */ | 339 | /* update # of requests on the wire to server */ |
| 340 | if (long_op < 3) | ||
| 357 | atomic_inc(&ses->server->inFlight); | 341 | atomic_inc(&ses->server->inFlight); |
| 358 | } | ||
| 359 | spin_unlock(&GlobalMid_Lock); | 342 | spin_unlock(&GlobalMid_Lock); |
| 360 | break; | 343 | break; |
| 361 | } | 344 | } |
| 362 | } | 345 | } |
| 363 | } | 346 | } |
| 364 | /* make sure that we sign in the same order that we send on this socket | 347 | return 0; |
| 365 | and avoid races inside tcp sendmsg code that could cause corruption | 348 | } |
| 366 | of smb data */ | ||
| 367 | |||
| 368 | down(&ses->server->tcpSem); | ||
| 369 | 349 | ||
| 350 | static int allocate_mid(struct cifsSesInfo *ses, struct smb_hdr *in_buf, | ||
| 351 | struct mid_q_entry **ppmidQ) | ||
| 352 | { | ||
| 370 | if (ses->server->tcpStatus == CifsExiting) { | 353 | if (ses->server->tcpStatus == CifsExiting) { |
| 371 | rc = -ENOENT; | 354 | return -ENOENT; |
| 372 | goto out_unlock2; | ||
| 373 | } else if (ses->server->tcpStatus == CifsNeedReconnect) { | 355 | } else if (ses->server->tcpStatus == CifsNeedReconnect) { |
| 374 | cFYI(1,("tcp session dead - return to caller to retry")); | 356 | cFYI(1,("tcp session dead - return to caller to retry")); |
| 375 | rc = -EAGAIN; | 357 | return -EAGAIN; |
| 376 | goto out_unlock2; | ||
| 377 | } else if (ses->status != CifsGood) { | 358 | } else if (ses->status != CifsGood) { |
| 378 | /* check if SMB session is bad because we are setting it up */ | 359 | /* check if SMB session is bad because we are setting it up */ |
| 379 | if((in_buf->Command != SMB_COM_SESSION_SETUP_ANDX) && | 360 | if((in_buf->Command != SMB_COM_SESSION_SETUP_ANDX) && |
| 380 | (in_buf->Command != SMB_COM_NEGOTIATE)) { | 361 | (in_buf->Command != SMB_COM_NEGOTIATE)) { |
| 381 | rc = -EAGAIN; | 362 | return -EAGAIN; |
| 382 | goto out_unlock2; | ||
| 383 | } /* else ok - we are setting up session */ | 363 | } /* else ok - we are setting up session */ |
| 384 | } | 364 | } |
| 385 | midQ = AllocMidQEntry(in_buf, ses); | 365 | *ppmidQ = AllocMidQEntry(in_buf, ses); |
| 386 | if (midQ == NULL) { | 366 | if (*ppmidQ == NULL) { |
| 367 | return -ENOMEM; | ||
| 368 | } | ||
| 369 | return 0; | ||
| 370 | } | ||
| 371 | |||
| 372 | static int wait_for_response(struct cifsSesInfo *ses, | ||
| 373 | struct mid_q_entry *midQ, | ||
| 374 | unsigned long timeout, | ||
| 375 | unsigned long time_to_wait) | ||
| 376 | { | ||
| 377 | unsigned long curr_timeout; | ||
| 378 | |||
| 379 | for (;;) { | ||
| 380 | curr_timeout = timeout + jiffies; | ||
| 381 | wait_event(ses->server->response_q, | ||
| 382 | (!(midQ->midState == MID_REQUEST_SUBMITTED)) || | ||
| 383 | time_after(jiffies, curr_timeout) || | ||
| 384 | ((ses->server->tcpStatus != CifsGood) && | ||
| 385 | (ses->server->tcpStatus != CifsNew))); | ||
| 386 | |||
| 387 | if (time_after(jiffies, curr_timeout) && | ||
| 388 | (midQ->midState == MID_REQUEST_SUBMITTED) && | ||
| 389 | ((ses->server->tcpStatus == CifsGood) || | ||
| 390 | (ses->server->tcpStatus == CifsNew))) { | ||
| 391 | |||
| 392 | unsigned long lrt; | ||
| 393 | |||
| 394 | /* We timed out. Is the server still | ||
| 395 | sending replies ? */ | ||
| 396 | spin_lock(&GlobalMid_Lock); | ||
| 397 | lrt = ses->server->lstrp; | ||
| 398 | spin_unlock(&GlobalMid_Lock); | ||
| 399 | |||
| 400 | /* Calculate time_to_wait past last receive time. | ||
| 401 | Although we prefer not to time out if the | ||
| 402 | server is still responding - we will time | ||
| 403 | out if the server takes more than 15 (or 45 | ||
| 404 | or 180) seconds to respond to this request | ||
| 405 | and has not responded to any request from | ||
| 406 | other threads on the client within 10 seconds */ | ||
| 407 | lrt += time_to_wait; | ||
| 408 | if (time_after(jiffies, lrt)) { | ||
| 409 | /* No replies for time_to_wait. */ | ||
| 410 | cERROR(1,("server not responding")); | ||
| 411 | return -1; | ||
| 412 | } | ||
| 413 | } else { | ||
| 414 | return 0; | ||
| 415 | } | ||
| 416 | } | ||
| 417 | } | ||
| 418 | |||
| 419 | int | ||
| 420 | SendReceive2(const unsigned int xid, struct cifsSesInfo *ses, | ||
| 421 | struct kvec *iov, int n_vec, int * pRespBufType /* ret */, | ||
| 422 | const int long_op) | ||
| 423 | { | ||
| 424 | int rc = 0; | ||
| 425 | unsigned int receive_len; | ||
| 426 | unsigned long timeout; | ||
| 427 | struct mid_q_entry *midQ; | ||
| 428 | struct smb_hdr *in_buf = iov[0].iov_base; | ||
| 429 | |||
| 430 | *pRespBufType = CIFS_NO_BUFFER; /* no response buf yet */ | ||
| 431 | |||
| 432 | if ((ses == NULL) || (ses->server == NULL)) { | ||
| 433 | cifs_small_buf_release(in_buf); | ||
| 434 | cERROR(1,("Null session")); | ||
| 435 | return -EIO; | ||
| 436 | } | ||
| 437 | |||
| 438 | if(ses->server->tcpStatus == CifsExiting) { | ||
| 439 | cifs_small_buf_release(in_buf); | ||
| 440 | return -ENOENT; | ||
| 441 | } | ||
| 442 | |||
| 443 | /* Ensure that we do not send more than 50 overlapping requests | ||
| 444 | to the same server. We may make this configurable later or | ||
| 445 | use ses->maxReq */ | ||
| 446 | |||
| 447 | rc = wait_for_free_request(ses, long_op); | ||
| 448 | if (rc) { | ||
| 449 | cifs_small_buf_release(in_buf); | ||
| 450 | return rc; | ||
| 451 | } | ||
| 452 | |||
| 453 | /* make sure that we sign in the same order that we send on this socket | ||
| 454 | and avoid races inside tcp sendmsg code that could cause corruption | ||
| 455 | of smb data */ | ||
| 456 | |||
| 457 | down(&ses->server->tcpSem); | ||
| 458 | |||
| 459 | rc = allocate_mid(ses, in_buf, &midQ); | ||
| 460 | if (rc) { | ||
| 387 | up(&ses->server->tcpSem); | 461 | up(&ses->server->tcpSem); |
| 388 | cifs_small_buf_release(in_buf); | 462 | cifs_small_buf_release(in_buf); |
| 389 | /* If not lock req, update # of requests on wire to server */ | 463 | /* Update # of requests on wire to server */ |
| 390 | if(long_op < 3) { | 464 | atomic_dec(&ses->server->inFlight); |
| 391 | atomic_dec(&ses->server->inFlight); | 465 | wake_up(&ses->server->request_q); |
| 392 | wake_up(&ses->server->request_q); | 466 | return rc; |
| 393 | } | ||
| 394 | return -ENOMEM; | ||
| 395 | } | 467 | } |
| 396 | 468 | ||
| 397 | rc = cifs_sign_smb2(iov, n_vec, ses->server, &midQ->sequence_number); | 469 | rc = cifs_sign_smb2(iov, n_vec, ses->server, &midQ->sequence_number); |
| @@ -406,32 +478,23 @@ SendReceive2(const unsigned int xid, struct cifsSesInfo *ses, | |||
| 406 | atomic_dec(&ses->server->inSend); | 478 | atomic_dec(&ses->server->inSend); |
| 407 | midQ->when_sent = jiffies; | 479 | midQ->when_sent = jiffies; |
| 408 | #endif | 480 | #endif |
| 409 | if(rc < 0) { | 481 | |
| 410 | DeleteMidQEntry(midQ); | 482 | up(&ses->server->tcpSem); |
| 411 | up(&ses->server->tcpSem); | 483 | cifs_small_buf_release(in_buf); |
| 412 | cifs_small_buf_release(in_buf); | 484 | |
| 413 | /* If not lock req, update # of requests on wire to server */ | 485 | if(rc < 0) |
| 414 | if(long_op < 3) { | 486 | goto out; |
| 415 | atomic_dec(&ses->server->inFlight); | ||
| 416 | wake_up(&ses->server->request_q); | ||
| 417 | } | ||
| 418 | return rc; | ||
| 419 | } else { | ||
| 420 | up(&ses->server->tcpSem); | ||
| 421 | cifs_small_buf_release(in_buf); | ||
| 422 | } | ||
| 423 | 487 | ||
| 424 | if (long_op == -1) | 488 | if (long_op == -1) |
| 425 | goto cifs_no_response_exit2; | 489 | goto out; |
| 426 | else if (long_op == 2) /* writes past end of file can take loong time */ | 490 | else if (long_op == 2) /* writes past end of file can take loong time */ |
| 427 | timeout = 180 * HZ; | 491 | timeout = 180 * HZ; |
| 428 | else if (long_op == 1) | 492 | else if (long_op == 1) |
| 429 | timeout = 45 * HZ; /* should be greater than | 493 | timeout = 45 * HZ; /* should be greater than |
| 430 | servers oplock break timeout (about 43 seconds) */ | 494 | servers oplock break timeout (about 43 seconds) */ |
| 431 | else if (long_op > 2) { | 495 | else |
| 432 | timeout = MAX_SCHEDULE_TIMEOUT; | ||
| 433 | } else | ||
| 434 | timeout = 15 * HZ; | 496 | timeout = 15 * HZ; |
| 497 | |||
| 435 | /* wait for 15 seconds or until woken up due to response arriving or | 498 | /* wait for 15 seconds or until woken up due to response arriving or |
| 436 | due to last connection to this server being unmounted */ | 499 | due to last connection to this server being unmounted */ |
| 437 | if (signal_pending(current)) { | 500 | if (signal_pending(current)) { |
| @@ -441,19 +504,7 @@ SendReceive2(const unsigned int xid, struct cifsSesInfo *ses, | |||
| 441 | } | 504 | } |
| 442 | 505 | ||
| 443 | /* No user interrupts in wait - wreaks havoc with performance */ | 506 | /* No user interrupts in wait - wreaks havoc with performance */ |
| 444 | if(timeout != MAX_SCHEDULE_TIMEOUT) { | 507 | wait_for_response(ses, midQ, timeout, 10 * HZ); |
| 445 | timeout += jiffies; | ||
| 446 | wait_event(ses->server->response_q, | ||
| 447 | (!(midQ->midState & MID_REQUEST_SUBMITTED)) || | ||
| 448 | time_after(jiffies, timeout) || | ||
| 449 | ((ses->server->tcpStatus != CifsGood) && | ||
| 450 | (ses->server->tcpStatus != CifsNew))); | ||
| 451 | } else { | ||
| 452 | wait_event(ses->server->response_q, | ||
| 453 | (!(midQ->midState & MID_REQUEST_SUBMITTED)) || | ||
| 454 | ((ses->server->tcpStatus != CifsGood) && | ||
| 455 | (ses->server->tcpStatus != CifsNew))); | ||
| 456 | } | ||
| 457 | 508 | ||
| 458 | spin_lock(&GlobalMid_Lock); | 509 | spin_lock(&GlobalMid_Lock); |
| 459 | if (midQ->resp_buf) { | 510 | if (midQ->resp_buf) { |
| @@ -481,11 +532,9 @@ SendReceive2(const unsigned int xid, struct cifsSesInfo *ses, | |||
| 481 | } | 532 | } |
| 482 | spin_unlock(&GlobalMid_Lock); | 533 | spin_unlock(&GlobalMid_Lock); |
| 483 | DeleteMidQEntry(midQ); | 534 | DeleteMidQEntry(midQ); |
| 484 | /* If not lock req, update # of requests on wire to server */ | 535 | /* Update # of requests on wire to server */ |
| 485 | if(long_op < 3) { | 536 | atomic_dec(&ses->server->inFlight); |
| 486 | atomic_dec(&ses->server->inFlight); | 537 | wake_up(&ses->server->request_q); |
| 487 | wake_up(&ses->server->request_q); | ||
| 488 | } | ||
| 489 | return rc; | 538 | return rc; |
| 490 | } | 539 | } |
| 491 | 540 | ||
| @@ -536,24 +585,12 @@ SendReceive2(const unsigned int xid, struct cifsSesInfo *ses, | |||
| 536 | cFYI(1,("Bad MID state?")); | 585 | cFYI(1,("Bad MID state?")); |
| 537 | } | 586 | } |
| 538 | } | 587 | } |
| 539 | cifs_no_response_exit2: | ||
| 540 | DeleteMidQEntry(midQ); | ||
| 541 | |||
| 542 | if(long_op < 3) { | ||
| 543 | atomic_dec(&ses->server->inFlight); | ||
| 544 | wake_up(&ses->server->request_q); | ||
| 545 | } | ||
| 546 | 588 | ||
| 547 | return rc; | 589 | out: |
| 548 | 590 | ||
| 549 | out_unlock2: | 591 | DeleteMidQEntry(midQ); |
| 550 | up(&ses->server->tcpSem); | 592 | atomic_dec(&ses->server->inFlight); |
| 551 | cifs_small_buf_release(in_buf); | 593 | wake_up(&ses->server->request_q); |
| 552 | /* If not lock req, update # of requests on wire to server */ | ||
| 553 | if(long_op < 3) { | ||
| 554 | atomic_dec(&ses->server->inFlight); | ||
| 555 | wake_up(&ses->server->request_q); | ||
| 556 | } | ||
| 557 | 594 | ||
| 558 | return rc; | 595 | return rc; |
| 559 | } | 596 | } |
| @@ -583,85 +620,34 @@ SendReceive(const unsigned int xid, struct cifsSesInfo *ses, | |||
| 583 | /* Ensure that we do not send more than 50 overlapping requests | 620 | /* Ensure that we do not send more than 50 overlapping requests |
| 584 | to the same server. We may make this configurable later or | 621 | to the same server. We may make this configurable later or |
| 585 | use ses->maxReq */ | 622 | use ses->maxReq */ |
| 586 | if(long_op == -1) { | ||
| 587 | /* oplock breaks must not be held up */ | ||
| 588 | atomic_inc(&ses->server->inFlight); | ||
| 589 | } else { | ||
| 590 | spin_lock(&GlobalMid_Lock); | ||
| 591 | while(1) { | ||
| 592 | if(atomic_read(&ses->server->inFlight) >= | ||
| 593 | cifs_max_pending){ | ||
| 594 | spin_unlock(&GlobalMid_Lock); | ||
| 595 | #ifdef CONFIG_CIFS_STATS2 | ||
| 596 | atomic_inc(&ses->server->num_waiters); | ||
| 597 | #endif | ||
| 598 | wait_event(ses->server->request_q, | ||
| 599 | atomic_read(&ses->server->inFlight) | ||
| 600 | < cifs_max_pending); | ||
| 601 | #ifdef CONFIG_CIFS_STATS2 | ||
| 602 | atomic_dec(&ses->server->num_waiters); | ||
| 603 | #endif | ||
| 604 | spin_lock(&GlobalMid_Lock); | ||
| 605 | } else { | ||
| 606 | if(ses->server->tcpStatus == CifsExiting) { | ||
| 607 | spin_unlock(&GlobalMid_Lock); | ||
| 608 | return -ENOENT; | ||
| 609 | } | ||
| 610 | 623 | ||
| 611 | /* can not count locking commands against total since | 624 | rc = wait_for_free_request(ses, long_op); |
| 612 | they are allowed to block on server */ | 625 | if (rc) |
| 613 | 626 | return rc; | |
| 614 | if(long_op < 3) { | 627 | |
| 615 | /* update # of requests on the wire to server */ | ||
| 616 | atomic_inc(&ses->server->inFlight); | ||
| 617 | } | ||
| 618 | spin_unlock(&GlobalMid_Lock); | ||
| 619 | break; | ||
| 620 | } | ||
| 621 | } | ||
| 622 | } | ||
| 623 | /* make sure that we sign in the same order that we send on this socket | 628 | /* make sure that we sign in the same order that we send on this socket |
| 624 | and avoid races inside tcp sendmsg code that could cause corruption | 629 | and avoid races inside tcp sendmsg code that could cause corruption |
| 625 | of smb data */ | 630 | of smb data */ |
| 626 | 631 | ||
| 627 | down(&ses->server->tcpSem); | 632 | down(&ses->server->tcpSem); |
| 628 | 633 | ||
| 629 | if (ses->server->tcpStatus == CifsExiting) { | 634 | rc = allocate_mid(ses, in_buf, &midQ); |
| 630 | rc = -ENOENT; | 635 | if (rc) { |
| 631 | goto out_unlock; | ||
| 632 | } else if (ses->server->tcpStatus == CifsNeedReconnect) { | ||
| 633 | cFYI(1,("tcp session dead - return to caller to retry")); | ||
| 634 | rc = -EAGAIN; | ||
| 635 | goto out_unlock; | ||
| 636 | } else if (ses->status != CifsGood) { | ||
| 637 | /* check if SMB session is bad because we are setting it up */ | ||
| 638 | if((in_buf->Command != SMB_COM_SESSION_SETUP_ANDX) && | ||
| 639 | (in_buf->Command != SMB_COM_NEGOTIATE)) { | ||
| 640 | rc = -EAGAIN; | ||
| 641 | goto out_unlock; | ||
| 642 | } /* else ok - we are setting up session */ | ||
| 643 | } | ||
| 644 | midQ = AllocMidQEntry(in_buf, ses); | ||
| 645 | if (midQ == NULL) { | ||
| 646 | up(&ses->server->tcpSem); | 636 | up(&ses->server->tcpSem); |
| 647 | /* If not lock req, update # of requests on wire to server */ | 637 | /* Update # of requests on wire to server */ |
| 648 | if(long_op < 3) { | 638 | atomic_dec(&ses->server->inFlight); |
| 649 | atomic_dec(&ses->server->inFlight); | 639 | wake_up(&ses->server->request_q); |
| 650 | wake_up(&ses->server->request_q); | 640 | return rc; |
| 651 | } | ||
| 652 | return -ENOMEM; | ||
| 653 | } | 641 | } |
| 654 | 642 | ||
| 655 | if (in_buf->smb_buf_length > CIFSMaxBufSize + MAX_CIFS_HDR_SIZE - 4) { | 643 | if (in_buf->smb_buf_length > CIFSMaxBufSize + MAX_CIFS_HDR_SIZE - 4) { |
| 656 | up(&ses->server->tcpSem); | ||
| 657 | cERROR(1, ("Illegal length, greater than maximum frame, %d", | 644 | cERROR(1, ("Illegal length, greater than maximum frame, %d", |
| 658 | in_buf->smb_buf_length)); | 645 | in_buf->smb_buf_length)); |
| 659 | DeleteMidQEntry(midQ); | 646 | DeleteMidQEntry(midQ); |
| 660 | /* If not lock req, update # of requests on wire to server */ | 647 | up(&ses->server->tcpSem); |
| 661 | if(long_op < 3) { | 648 | /* Update # of requests on wire to server */ |
| 662 | atomic_dec(&ses->server->inFlight); | 649 | atomic_dec(&ses->server->inFlight); |
| 663 | wake_up(&ses->server->request_q); | 650 | wake_up(&ses->server->request_q); |
| 664 | } | ||
| 665 | return -EIO; | 651 | return -EIO; |
| 666 | } | 652 | } |
| 667 | 653 | ||
| @@ -677,27 +663,19 @@ SendReceive(const unsigned int xid, struct cifsSesInfo *ses, | |||
| 677 | atomic_dec(&ses->server->inSend); | 663 | atomic_dec(&ses->server->inSend); |
| 678 | midQ->when_sent = jiffies; | 664 | midQ->when_sent = jiffies; |
| 679 | #endif | 665 | #endif |
| 680 | if(rc < 0) { | 666 | up(&ses->server->tcpSem); |
| 681 | DeleteMidQEntry(midQ); | 667 | |
| 682 | up(&ses->server->tcpSem); | 668 | if(rc < 0) |
| 683 | /* If not lock req, update # of requests on wire to server */ | 669 | goto out; |
| 684 | if(long_op < 3) { | 670 | |
| 685 | atomic_dec(&ses->server->inFlight); | ||
| 686 | wake_up(&ses->server->request_q); | ||
| 687 | } | ||
| 688 | return rc; | ||
| 689 | } else | ||
| 690 | up(&ses->server->tcpSem); | ||
| 691 | if (long_op == -1) | 671 | if (long_op == -1) |
| 692 | goto cifs_no_response_exit; | 672 | goto out; |
| 693 | else if (long_op == 2) /* writes past end of file can take loong time */ | 673 | else if (long_op == 2) /* writes past end of file can take loong time */ |
| 694 | timeout = 180 * HZ; | 674 | timeout = 180 * HZ; |
| 695 | else if (long_op == 1) | 675 | else if (long_op == 1) |
| 696 | timeout = 45 * HZ; /* should be greater than | 676 | timeout = 45 * HZ; /* should be greater than |
| 697 | servers oplock break timeout (about 43 seconds) */ | 677 | servers oplock break timeout (about 43 seconds) */ |
| 698 | else if (long_op > 2) { | 678 | else |
| 699 | timeout = MAX_SCHEDULE_TIMEOUT; | ||
| 700 | } else | ||
| 701 | timeout = 15 * HZ; | 679 | timeout = 15 * HZ; |
| 702 | /* wait for 15 seconds or until woken up due to response arriving or | 680 | /* wait for 15 seconds or until woken up due to response arriving or |
| 703 | due to last connection to this server being unmounted */ | 681 | due to last connection to this server being unmounted */ |
| @@ -708,19 +686,7 @@ SendReceive(const unsigned int xid, struct cifsSesInfo *ses, | |||
| 708 | } | 686 | } |
| 709 | 687 | ||
| 710 | /* No user interrupts in wait - wreaks havoc with performance */ | 688 | /* No user interrupts in wait - wreaks havoc with performance */ |
| 711 | if(timeout != MAX_SCHEDULE_TIMEOUT) { | 689 | wait_for_response(ses, midQ, timeout, 10 * HZ); |
| 712 | timeout += jiffies; | ||
| 713 | wait_event(ses->server->response_q, | ||
| 714 | (!(midQ->midState & MID_REQUEST_SUBMITTED)) || | ||
| 715 | time_after(jiffies, timeout) || | ||
| 716 | ((ses->server->tcpStatus != CifsGood) && | ||
| 717 | (ses->server->tcpStatus != CifsNew))); | ||
| 718 | } else { | ||
| 719 | wait_event(ses->server->response_q, | ||
| 720 | (!(midQ->midState & MID_REQUEST_SUBMITTED)) || | ||
| 721 | ((ses->server->tcpStatus != CifsGood) && | ||
| 722 | (ses->server->tcpStatus != CifsNew))); | ||
| 723 | } | ||
| 724 | 690 | ||
| 725 | spin_lock(&GlobalMid_Lock); | 691 | spin_lock(&GlobalMid_Lock); |
| 726 | if (midQ->resp_buf) { | 692 | if (midQ->resp_buf) { |
| @@ -748,11 +714,9 @@ SendReceive(const unsigned int xid, struct cifsSesInfo *ses, | |||
| 748 | } | 714 | } |
| 749 | spin_unlock(&GlobalMid_Lock); | 715 | spin_unlock(&GlobalMid_Lock); |
| 750 | DeleteMidQEntry(midQ); | 716 | DeleteMidQEntry(midQ); |
| 751 | /* If not lock req, update # of requests on wire to server */ | 717 | /* Update # of requests on wire to server */ |
| 752 | if(long_op < 3) { | 718 | atomic_dec(&ses->server->inFlight); |
| 753 | atomic_dec(&ses->server->inFlight); | 719 | wake_up(&ses->server->request_q); |
| 754 | wake_up(&ses->server->request_q); | ||
| 755 | } | ||
| 756 | return rc; | 720 | return rc; |
| 757 | } | 721 | } |
| 758 | 722 | ||
| @@ -799,23 +763,253 @@ SendReceive(const unsigned int xid, struct cifsSesInfo *ses, | |||
| 799 | cERROR(1,("Bad MID state?")); | 763 | cERROR(1,("Bad MID state?")); |
| 800 | } | 764 | } |
| 801 | } | 765 | } |
| 802 | cifs_no_response_exit: | 766 | |
| 767 | out: | ||
| 768 | |||
| 803 | DeleteMidQEntry(midQ); | 769 | DeleteMidQEntry(midQ); |
| 770 | atomic_dec(&ses->server->inFlight); | ||
| 771 | wake_up(&ses->server->request_q); | ||
| 804 | 772 | ||
| 805 | if(long_op < 3) { | 773 | return rc; |
| 806 | atomic_dec(&ses->server->inFlight); | 774 | } |
| 807 | wake_up(&ses->server->request_q); | 775 | |
| 808 | } | 776 | /* Send an NT_CANCEL SMB to cause the POSIX blocking lock to return. */ |
| 777 | |||
| 778 | static int | ||
| 779 | send_nt_cancel(struct cifsTconInfo *tcon, struct smb_hdr *in_buf, | ||
| 780 | struct mid_q_entry *midQ) | ||
| 781 | { | ||
| 782 | int rc = 0; | ||
| 783 | struct cifsSesInfo *ses = tcon->ses; | ||
| 784 | __u16 mid = in_buf->Mid; | ||
| 809 | 785 | ||
| 786 | header_assemble(in_buf, SMB_COM_NT_CANCEL, tcon, 0); | ||
| 787 | in_buf->Mid = mid; | ||
| 788 | down(&ses->server->tcpSem); | ||
| 789 | rc = cifs_sign_smb(in_buf, ses->server, &midQ->sequence_number); | ||
| 790 | if (rc) { | ||
| 791 | up(&ses->server->tcpSem); | ||
| 792 | return rc; | ||
| 793 | } | ||
| 794 | rc = smb_send(ses->server->ssocket, in_buf, in_buf->smb_buf_length, | ||
| 795 | (struct sockaddr *) &(ses->server->addr.sockAddr)); | ||
| 796 | up(&ses->server->tcpSem); | ||
| 810 | return rc; | 797 | return rc; |
| 798 | } | ||
| 799 | |||
| 800 | /* We send a LOCKINGX_CANCEL_LOCK to cause the Windows | ||
| 801 | blocking lock to return. */ | ||
| 802 | |||
| 803 | static int | ||
| 804 | send_lock_cancel(const unsigned int xid, struct cifsTconInfo *tcon, | ||
| 805 | struct smb_hdr *in_buf, | ||
| 806 | struct smb_hdr *out_buf) | ||
| 807 | { | ||
| 808 | int bytes_returned; | ||
| 809 | struct cifsSesInfo *ses = tcon->ses; | ||
| 810 | LOCK_REQ *pSMB = (LOCK_REQ *)in_buf; | ||
| 811 | |||
| 812 | /* We just modify the current in_buf to change | ||
| 813 | the type of lock from LOCKING_ANDX_SHARED_LOCK | ||
| 814 | or LOCKING_ANDX_EXCLUSIVE_LOCK to | ||
| 815 | LOCKING_ANDX_CANCEL_LOCK. */ | ||
| 816 | |||
| 817 | pSMB->LockType = LOCKING_ANDX_CANCEL_LOCK|LOCKING_ANDX_LARGE_FILES; | ||
| 818 | pSMB->Timeout = 0; | ||
| 819 | pSMB->hdr.Mid = GetNextMid(ses->server); | ||
| 820 | |||
| 821 | return SendReceive(xid, ses, in_buf, out_buf, | ||
| 822 | &bytes_returned, 0); | ||
| 823 | } | ||
| 811 | 824 | ||
| 812 | out_unlock: | 825 | int |
| 826 | SendReceiveBlockingLock(const unsigned int xid, struct cifsTconInfo *tcon, | ||
| 827 | struct smb_hdr *in_buf, struct smb_hdr *out_buf, | ||
| 828 | int *pbytes_returned) | ||
| 829 | { | ||
| 830 | int rc = 0; | ||
| 831 | int rstart = 0; | ||
| 832 | unsigned int receive_len; | ||
| 833 | struct mid_q_entry *midQ; | ||
| 834 | struct cifsSesInfo *ses; | ||
| 835 | |||
| 836 | if (tcon == NULL || tcon->ses == NULL) { | ||
| 837 | cERROR(1,("Null smb session")); | ||
| 838 | return -EIO; | ||
| 839 | } | ||
| 840 | ses = tcon->ses; | ||
| 841 | |||
| 842 | if(ses->server == NULL) { | ||
| 843 | cERROR(1,("Null tcp session")); | ||
| 844 | return -EIO; | ||
| 845 | } | ||
| 846 | |||
| 847 | if(ses->server->tcpStatus == CifsExiting) | ||
| 848 | return -ENOENT; | ||
| 849 | |||
| 850 | /* Ensure that we do not send more than 50 overlapping requests | ||
| 851 | to the same server. We may make this configurable later or | ||
| 852 | use ses->maxReq */ | ||
| 853 | |||
| 854 | rc = wait_for_free_request(ses, 3); | ||
| 855 | if (rc) | ||
| 856 | return rc; | ||
| 857 | |||
| 858 | /* make sure that we sign in the same order that we send on this socket | ||
| 859 | and avoid races inside tcp sendmsg code that could cause corruption | ||
| 860 | of smb data */ | ||
| 861 | |||
| 862 | down(&ses->server->tcpSem); | ||
| 863 | |||
| 864 | rc = allocate_mid(ses, in_buf, &midQ); | ||
| 865 | if (rc) { | ||
| 866 | up(&ses->server->tcpSem); | ||
| 867 | return rc; | ||
| 868 | } | ||
| 869 | |||
| 870 | if (in_buf->smb_buf_length > CIFSMaxBufSize + MAX_CIFS_HDR_SIZE - 4) { | ||
| 871 | up(&ses->server->tcpSem); | ||
| 872 | cERROR(1, ("Illegal length, greater than maximum frame, %d", | ||
| 873 | in_buf->smb_buf_length)); | ||
| 874 | DeleteMidQEntry(midQ); | ||
| 875 | return -EIO; | ||
| 876 | } | ||
| 877 | |||
| 878 | rc = cifs_sign_smb(in_buf, ses->server, &midQ->sequence_number); | ||
| 879 | |||
| 880 | midQ->midState = MID_REQUEST_SUBMITTED; | ||
| 881 | #ifdef CONFIG_CIFS_STATS2 | ||
| 882 | atomic_inc(&ses->server->inSend); | ||
| 883 | #endif | ||
| 884 | rc = smb_send(ses->server->ssocket, in_buf, in_buf->smb_buf_length, | ||
| 885 | (struct sockaddr *) &(ses->server->addr.sockAddr)); | ||
| 886 | #ifdef CONFIG_CIFS_STATS2 | ||
| 887 | atomic_dec(&ses->server->inSend); | ||
| 888 | midQ->when_sent = jiffies; | ||
| 889 | #endif | ||
| 813 | up(&ses->server->tcpSem); | 890 | up(&ses->server->tcpSem); |
| 814 | /* If not lock req, update # of requests on wire to server */ | 891 | |
| 815 | if(long_op < 3) { | 892 | if(rc < 0) { |
| 816 | atomic_dec(&ses->server->inFlight); | 893 | DeleteMidQEntry(midQ); |
| 817 | wake_up(&ses->server->request_q); | 894 | return rc; |
| 895 | } | ||
| 896 | |||
| 897 | /* Wait for a reply - allow signals to interrupt. */ | ||
| 898 | rc = wait_event_interruptible(ses->server->response_q, | ||
| 899 | (!(midQ->midState == MID_REQUEST_SUBMITTED)) || | ||
| 900 | ((ses->server->tcpStatus != CifsGood) && | ||
| 901 | (ses->server->tcpStatus != CifsNew))); | ||
| 902 | |||
| 903 | /* Were we interrupted by a signal ? */ | ||
| 904 | if ((rc == -ERESTARTSYS) && | ||
| 905 | (midQ->midState == MID_REQUEST_SUBMITTED) && | ||
| 906 | ((ses->server->tcpStatus == CifsGood) || | ||
| 907 | (ses->server->tcpStatus == CifsNew))) { | ||
| 908 | |||
| 909 | if (in_buf->Command == SMB_COM_TRANSACTION2) { | ||
| 910 | /* POSIX lock. We send a NT_CANCEL SMB to cause the | ||
| 911 | blocking lock to return. */ | ||
| 912 | |||
| 913 | rc = send_nt_cancel(tcon, in_buf, midQ); | ||
| 914 | if (rc) { | ||
| 915 | DeleteMidQEntry(midQ); | ||
| 916 | return rc; | ||
| 917 | } | ||
| 918 | } else { | ||
| 919 | /* Windows lock. We send a LOCKINGX_CANCEL_LOCK | ||
| 920 | to cause the blocking lock to return. */ | ||
| 921 | |||
| 922 | rc = send_lock_cancel(xid, tcon, in_buf, out_buf); | ||
| 923 | |||
| 924 | /* If we get -ENOLCK back the lock may have | ||
| 925 | already been removed. Don't exit in this case. */ | ||
| 926 | if (rc && rc != -ENOLCK) { | ||
| 927 | DeleteMidQEntry(midQ); | ||
| 928 | return rc; | ||
| 929 | } | ||
| 930 | } | ||
| 931 | |||
| 932 | /* Wait 5 seconds for the response. */ | ||
| 933 | if (wait_for_response(ses, midQ, 5 * HZ, 5 * HZ)==0) { | ||
| 934 | /* We got the response - restart system call. */ | ||
| 935 | rstart = 1; | ||
| 936 | } | ||
| 937 | } | ||
| 938 | |||
| 939 | spin_lock(&GlobalMid_Lock); | ||
| 940 | if (midQ->resp_buf) { | ||
| 941 | spin_unlock(&GlobalMid_Lock); | ||
| 942 | receive_len = midQ->resp_buf->smb_buf_length; | ||
| 943 | } else { | ||
| 944 | cERROR(1,("No response for cmd %d mid %d", | ||
| 945 | midQ->command, midQ->mid)); | ||
| 946 | if(midQ->midState == MID_REQUEST_SUBMITTED) { | ||
| 947 | if(ses->server->tcpStatus == CifsExiting) | ||
| 948 | rc = -EHOSTDOWN; | ||
| 949 | else { | ||
| 950 | ses->server->tcpStatus = CifsNeedReconnect; | ||
| 951 | midQ->midState = MID_RETRY_NEEDED; | ||
| 952 | } | ||
| 953 | } | ||
| 954 | |||
| 955 | if (rc != -EHOSTDOWN) { | ||
| 956 | if(midQ->midState == MID_RETRY_NEEDED) { | ||
| 957 | rc = -EAGAIN; | ||
| 958 | cFYI(1,("marking request for retry")); | ||
| 959 | } else { | ||
| 960 | rc = -EIO; | ||
| 961 | } | ||
| 962 | } | ||
| 963 | spin_unlock(&GlobalMid_Lock); | ||
| 964 | DeleteMidQEntry(midQ); | ||
| 965 | return rc; | ||
| 818 | } | 966 | } |
| 967 | |||
| 968 | if (receive_len > CIFSMaxBufSize + MAX_CIFS_HDR_SIZE) { | ||
| 969 | cERROR(1, ("Frame too large received. Length: %d Xid: %d", | ||
| 970 | receive_len, xid)); | ||
| 971 | rc = -EIO; | ||
| 972 | } else { /* rcvd frame is ok */ | ||
| 973 | |||
| 974 | if (midQ->resp_buf && out_buf | ||
| 975 | && (midQ->midState == MID_RESPONSE_RECEIVED)) { | ||
| 976 | out_buf->smb_buf_length = receive_len; | ||
| 977 | memcpy((char *)out_buf + 4, | ||
| 978 | (char *)midQ->resp_buf + 4, | ||
| 979 | receive_len); | ||
| 980 | |||
| 981 | dump_smb(out_buf, 92); | ||
| 982 | /* convert the length into a more usable form */ | ||
| 983 | if((receive_len > 24) && | ||
| 984 | (ses->server->secMode & (SECMODE_SIGN_REQUIRED | | ||
| 985 | SECMODE_SIGN_ENABLED))) { | ||
| 986 | rc = cifs_verify_signature(out_buf, | ||
| 987 | ses->server->mac_signing_key, | ||
| 988 | midQ->sequence_number+1); | ||
| 989 | if(rc) { | ||
| 990 | cERROR(1,("Unexpected SMB signature")); | ||
| 991 | /* BB FIXME add code to kill session */ | ||
| 992 | } | ||
| 993 | } | ||
| 994 | |||
| 995 | *pbytes_returned = out_buf->smb_buf_length; | ||
| 996 | |||
| 997 | /* BB special case reconnect tid and uid here? */ | ||
| 998 | rc = map_smb_to_linux_error(out_buf); | ||
| 819 | 999 | ||
| 1000 | /* convert ByteCount if necessary */ | ||
| 1001 | if (receive_len >= | ||
| 1002 | sizeof (struct smb_hdr) - | ||
| 1003 | 4 /* do not count RFC1001 header */ + | ||
| 1004 | (2 * out_buf->WordCount) + 2 /* bcc */ ) | ||
| 1005 | BCC(out_buf) = le16_to_cpu(BCC_LE(out_buf)); | ||
| 1006 | } else { | ||
| 1007 | rc = -EIO; | ||
| 1008 | cERROR(1,("Bad MID state?")); | ||
| 1009 | } | ||
| 1010 | } | ||
| 1011 | DeleteMidQEntry(midQ); | ||
| 1012 | if (rstart && rc == -EACCES) | ||
| 1013 | return -ERESTARTSYS; | ||
| 820 | return rc; | 1014 | return rc; |
| 821 | } | 1015 | } |
