Received: by 2002:ac0:a594:0:0:0:0:0 with SMTP id m20-v6csp5083024imm; Mon, 14 May 2018 19:17:58 -0700 (PDT) X-Google-Smtp-Source: AB8JxZolQJ8a4hIg9FrQwHa3Ynh2RbXgcs++oZnSHs0nSu0z1I803z7O1htu5WfbuMx+TQbXF+zt X-Received: by 2002:a62:c95c:: with SMTP id k89-v6mr12809527pfg.47.1526350678384; Mon, 14 May 2018 19:17:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526350678; cv=none; d=google.com; s=arc-20160816; b=h+LhCheVlS14IcZgTIxO5r+jKmiP8Ci3vAKuakB2vEN/ouuDT5x5UEI/2XOnkD/2qw IhpRpCH2XDNluOAwgkhTb2HpDSr/DTtyqOw2ameozSlabRrSVO8qtNZxQG2Xtq9E6hk6 P8ltbyjVz1KT1CpJYQRPX3KiCFGsubM+jYSOd8EvIetjCAmtrxaEdoBVXtzj/Dt+uVnT p3SePMDnOZXmogzhkkZdSwJIf6h8sEKwsTDSFrIEVQt+DwBg7RMhjkxfLjiBkzKYPwU/ cD7B2VIFt1ag6LUZ+QaiWRB7oTqhTwlkYfQd0wHOeuFp1n90k5uD3uRiCJ7jsa31hfsu Q7Jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=OZNy8tv8uwSdWzYPs/HWR2Z37Fz10WNtOGWYj+kXmX8=; b=pUNxgNUDC9lgQHzEbrnULoVH+36ThgayDK4Ws4odO4OIjrybT3GCbgT0ysJAKcv/ym pQ2Zd5mqp2PhbeIr1hWIn33MgNj8leFDKcwITPWkreyvbzlwfFDSOsjVYltKYIkMBBso 3bpxe3sPGrWWpldZz2E+VQnvFwHS+utwFXSWeVnP6qhAlJP7XJXBF29DK5qxeMXG6mOZ LDVWttGg8NxA14K31333ryUGTT5HfyLGTRKxnv+U73SLQ0HvdQ7MC/qQhcofnmk9hhuE QdUMGjIkZUS6zTdA7UTvW+40/G7Qu9Y0JINSmKNqOIYeT6uYradEjKXmyMlBGSkKF9mS ysoQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g59-v6si11108910plb.381.2018.05.14.19.17.44; Mon, 14 May 2018 19:17:58 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752254AbeEOCR0 (ORCPT + 99 others); Mon, 14 May 2018 22:17:26 -0400 Received: from smtp4.ccs.ornl.gov ([160.91.203.40]:39428 "EHLO smtp4.ccs.ornl.gov" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752186AbeEOCRN (ORCPT ); Mon, 14 May 2018 22:17:13 -0400 Received: from star.ccs.ornl.gov (star.ccs.ornl.gov [160.91.202.134]) by smtp4.ccs.ornl.gov (Postfix) with ESMTP id 24B61100516E; Mon, 14 May 2018 22:17:06 -0400 (EDT) Received: by star.ccs.ornl.gov (Postfix, from userid 2004) id 23444B8; Mon, 14 May 2018 22:17:06 -0400 (EDT) From: James Simmons To: Greg Kroah-Hartman , devel@driverdev.osuosl.org, Andreas Dilger , Oleg Drokin , NeilBrown Cc: Linux Kernel Mailing List , Lustre Development List , "John L. Hammond" , James Simmons Subject: [PATCH 5/5] staging: lustre: mdc: use large xattr buffers for old servers Date: Mon, 14 May 2018 22:17:03 -0400 Message-Id: <1526350623-4616-6-git-send-email-jsimmons@infradead.org> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1526350623-4616-1-git-send-email-jsimmons@infradead.org> References: <1526350623-4616-1-git-send-email-jsimmons@infradead.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "John L. Hammond" Pre 2.10.1 MDTs will crash when they receive a listxattr (MDS_GETXATTR with OBD_MD_FLXATTRLS) RPC for an orphan or dead object. So for clients connected to these older MDTs, try to avoid sending listxattr RPCs by making the bulk getxattr (MDS_GETXATTR with OBD_MD_FLXATTRALL) more likely to succeed and thereby reducing the chances of falling back to listxattr. Signed-off-by: John L. Hammond Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-10912 Reviewed-on: https://review.whamcloud.com/31990 Reviewed-by: Andreas Dilger Reviewed-by: Fan Yong Reviewed-by: Oleg Drokin Signed-off-by: James Simmons --- drivers/staging/lustre/lustre/mdc/mdc_locks.c | 31 +++++++++++++++++++++------ 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/drivers/staging/lustre/lustre/mdc/mdc_locks.c b/drivers/staging/lustre/lustre/mdc/mdc_locks.c index a8aa0fa..b991c6f 100644 --- a/drivers/staging/lustre/lustre/mdc/mdc_locks.c +++ b/drivers/staging/lustre/lustre/mdc/mdc_locks.c @@ -326,8 +326,10 @@ static void mdc_realloc_openmsg(struct ptlrpc_request *req, { struct ptlrpc_request *req; struct ldlm_intent *lit; + u32 min_buf_size = 0; int rc, count = 0; LIST_HEAD(cancels); + u32 buf_size = 0; req = ptlrpc_request_alloc(class_exp2cliimp(exp), &RQF_LDLM_INTENT_GETXATTR); @@ -344,18 +346,33 @@ static void mdc_realloc_openmsg(struct ptlrpc_request *req, lit = req_capsule_client_get(&req->rq_pill, &RMF_LDLM_INTENT); lit->opc = IT_GETXATTR; +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0) + /* If the supplied buffer is too small then the server will + * return -ERANGE and llite will fallback to using non cached + * xattr operations. On servers before 2.10.1 a (non-cached) + * listxattr RPC for an orphan or dead file causes an oops. So + * let's try to avoid sending too small a buffer to too old a + * server. This is effectively undoing the memory conservation + * of LU-9417 when it would be *more* likely to crash the + * server. See LU-9856. + */ + if (exp->exp_connect_data.ocd_version < OBD_OCD_VERSION(2, 10, 1, 0)) + min_buf_size = exp->exp_connect_data.ocd_max_easize; +#endif + buf_size = max_t(u32, min_buf_size, + GA_DEFAULT_EA_NAME_LEN * GA_DEFAULT_EA_NUM); + /* pack the intended request */ - mdc_pack_body(req, &op_data->op_fid1, op_data->op_valid, - GA_DEFAULT_EA_NAME_LEN * GA_DEFAULT_EA_NUM, -1, 0); + mdc_pack_body(req, &op_data->op_fid1, op_data->op_valid, buf_size, + -1, 0); - req_capsule_set_size(&req->rq_pill, &RMF_EADATA, RCL_SERVER, - GA_DEFAULT_EA_NAME_LEN * GA_DEFAULT_EA_NUM); + req_capsule_set_size(&req->rq_pill, &RMF_EADATA, RCL_SERVER, buf_size); - req_capsule_set_size(&req->rq_pill, &RMF_EAVALS, RCL_SERVER, - GA_DEFAULT_EA_NAME_LEN * GA_DEFAULT_EA_NUM); + req_capsule_set_size(&req->rq_pill, &RMF_EAVALS, RCL_SERVER, buf_size); req_capsule_set_size(&req->rq_pill, &RMF_EAVALS_LENS, RCL_SERVER, - sizeof(u32) * GA_DEFAULT_EA_NUM); + max_t(u32, min_buf_size, + sizeof(u32) * GA_DEFAULT_EA_NUM)); req_capsule_set_size(&req->rq_pill, &RMF_ACL, RCL_SERVER, 0); -- 1.8.3.1