From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 62F07C433B4 for ; Tue, 6 Apr 2021 11:51:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3FD3A613B8 for ; Tue, 6 Apr 2021 11:51:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243291AbhDFLvK (ORCPT ); Tue, 6 Apr 2021 07:51:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36578 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343511AbhDFLvK (ORCPT ); Tue, 6 Apr 2021 07:51:10 -0400 Received: from mail-ed1-x529.google.com (mail-ed1-x529.google.com [IPv6:2a00:1450:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 59DD6C06174A for ; Tue, 6 Apr 2021 04:51:02 -0700 (PDT) Received: by mail-ed1-x529.google.com with SMTP id e7so16166307edu.10 for ; Tue, 06 Apr 2021 04:51:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+fx8l8V5EMDboI86SA1WhpDb5yjACty79dIqKbVLav8=; b=Mw+HKiNgTYAt3ltCtfTKUT22NKauUilDW9Occ2pOpnCmMzpNdacES37uTFOsPebj+8 5taIAv0oPVlT1wqxHRDzzJHqToOkMEQMOkUcdrfjmzNosa9CEKiInJMOgidGaySlqWlP SZKCIcRxDC1iui2GvSMDk8jlM91x08pXjmUI2y0dm6CQVvvAgUz54+zCYOVz9UWXmrFW aRce0GtctkssK2yTSAeCSo5wsbOuDACyiaXNgvES2OA8AsAUESt6yuhhHzl1MSCIlvpb I29qQSkM2vKUgYmcSt0zy0HhMJpZydNKYbJOzqnDFXtbIFYo9yM4e2dxdAS+puLsFJIz M99g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+fx8l8V5EMDboI86SA1WhpDb5yjACty79dIqKbVLav8=; b=aPInXUtDR+cJyyD1y+ip/+xiamvd8lzlXYnKhJy29gIvbKp+IU+on94LqGj+qK8zD4 JplcTIhza5hOcvHtc4Y1WydrFwmAg0K/a3fCQ6swHbrBBK2Q7boBJ/fDaV9Mh+QlCp4O hawcLQn6wCFLsRZxOAvdQI+BvWQXPT7dyest7y4eGELWqhrsiCH2s5LAM4vF8RYthWxR nSOXaduCmhxJvPQ0OQrzvAKBzUlXcaxWY64+u4vh0OzTkkBKhfPJ/wEKnWg/tQcxCfMQ Q9C6FplA/x8cFK8NSWuR5ivKATTJbzy5YALgvnHwmF6jYXQse+cNLEYdvWGaTDlSd2tp jYDA== X-Gm-Message-State: AOAM530P3dEpOAkTjpuT0PMdJRBQYDF6nk6nCD2EQLfOM5Fqju/FVonc V18R+8ux8ySXa3xvIQ1MJvlpSQ2LJ+NuroOp X-Google-Smtp-Source: ABdhPJzeilIr9tABKRg36g/Pdxw7Tb/DAB8WoxzkIFBtiYNsqqQOY29asCy0Pss/V85BUHnTPCJrRQ== X-Received: by 2002:a05:6402:17e9:: with SMTP id t9mr37230916edy.211.1617709860981; Tue, 06 Apr 2021 04:51:00 -0700 (PDT) Received: from gkim-laptop.fkb.profitbricks.net (ip5f5aeee5.dynamic.kabel-deutschland.de. [95.90.238.229]) by smtp.googlemail.com with ESMTPSA id t1sm855964eds.53.2021.04.06.04.51.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Apr 2021 04:51:00 -0700 (PDT) From: Gioh Kim To: linux-rdma@vger.kernel.org, linux-doc@vger.kernel.org Cc: bvanassche@acm.org, leon@kernel.org, dledford@redhat.com, jgg@ziepe.ca, haris.iqbal@ionos.com, jinpu.wang@ionos.com, akinobu.mita@gmail.com, corbet@lwn.net, Gioh Kim , Jack Wang Subject: [PATCH 3/4] RDMA/rtrs-srv: Inject a fault at heart-beat sending Date: Tue, 6 Apr 2021 13:50:48 +0200 Message-Id: <20210406115049.196527-4-gi-oh.kim@ionos.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210406115049.196527-1-gi-oh.kim@ionos.com> References: <20210406115049.196527-1-gi-oh.kim@ionos.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org From: Gioh Kim If the fault-injection is enabled, it does not send a heart-beat and generates the error on the client side. Signed-off-by: Gioh Kim Signed-off-by: Jack Wang --- drivers/infiniband/ulp/rtrs/rtrs-srv-sysfs.c | 44 ++++++++++++++++++++ drivers/infiniband/ulp/rtrs/rtrs-srv.c | 5 +++ drivers/infiniband/ulp/rtrs/rtrs-srv.h | 13 ++++++ 3 files changed, 62 insertions(+) diff --git a/drivers/infiniband/ulp/rtrs/rtrs-srv-sysfs.c b/drivers/infiniband/ulp/rtrs/rtrs-srv-sysfs.c index a9288175fbb5..57af9e7c3588 100644 --- a/drivers/infiniband/ulp/rtrs/rtrs-srv-sysfs.c +++ b/drivers/infiniband/ulp/rtrs/rtrs-srv-sysfs.c @@ -309,3 +309,47 @@ void rtrs_srv_destroy_sess_files(struct rtrs_srv_sess *sess) rtrs_srv_destroy_once_sysfs_root_folders(sess); } } + +#ifdef CONFIG_FAULT_INJECTION_DEBUG_FS +void rtrs_srv_fault_inject_init(struct rtrs_srv_fault_inject *fault_inject, + struct rtrs_srv_sess *sess) +{ + char str[NAME_MAX]; + int cnt; + + cnt = sockaddr_to_str((struct sockaddr *)&sess->s.src_addr, + str, sizeof(str)); + cnt += scnprintf(str + cnt, sizeof(str) - cnt, "@"); + sockaddr_to_str((struct sockaddr *)&sess->s.dst_addr, + str + cnt, sizeof(str) - cnt); + + rtrs_fault_inject_init(&fault_inject->fj, str, -EBUSY); + /* injection points */ + rtrs_fault_inject_add(fault_inject->fj.dir, + "fail-hb-ack", &fault_inject->fail_hb_ack); +} + +void rtrs_srv_fault_inject_final(struct rtrs_srv_fault_inject *fault_inject) +{ + rtrs_fault_inject_final(&fault_inject->fj); +} + +int rtrs_should_fail_hb_ack(struct rtrs_srv_fault_inject *fault_inject) +{ + if (fault_inject->fail_hb_ack && should_fail(&fault_inject->fj.attr, 1)) + return fault_inject->fj.status; + return 0; +} +#else +void rtrs_srv_fault_inject_init(struct rtrs_srv_fault_inject *fault_inject, + struct rtrs_srv_sess *sess_name) +{ +} +void rtrs_srv_fault_inject_final(struct rtrs_srv_fault_inject *fault_inject) +{ +} +int rtrs_should_fail_hb_ack(struct rtrs_srv_fault_inject *fault_inject) +{ + return 0; +} +#endif diff --git a/drivers/infiniband/ulp/rtrs/rtrs-srv.c b/drivers/infiniband/ulp/rtrs/rtrs-srv.c index 5e9bb7bf5ef3..6e53dac0d22c 100644 --- a/drivers/infiniband/ulp/rtrs/rtrs-srv.c +++ b/drivers/infiniband/ulp/rtrs/rtrs-srv.c @@ -1232,6 +1232,8 @@ static void rtrs_srv_rdma_done(struct ib_cq *cq, struct ib_wc *wc) } } else if (imm_type == RTRS_HB_MSG_IMM) { WARN_ON(con->c.cid); + if (unlikely(rtrs_should_fail_hb_ack(&sess->fault_inject))) + break; rtrs_send_hb_ack(&sess->s); } else if (imm_type == RTRS_HB_ACK_IMM) { WARN_ON(con->c.cid); @@ -1489,6 +1491,7 @@ static void rtrs_srv_close_work(struct work_struct *work) sess = container_of(work, typeof(*sess), close_work); + rtrs_srv_fault_inject_final(&sess->fault_inject); rtrs_srv_destroy_sess_files(sess); rtrs_srv_stop_hb(sess); @@ -1748,6 +1751,8 @@ static struct rtrs_srv_sess *__alloc_sess(struct rtrs_srv *srv, __add_path_to_srv(srv, sess); + rtrs_srv_fault_inject_init(&sess->fault_inject, sess); + return sess; err_unmap_bufs: diff --git a/drivers/infiniband/ulp/rtrs/rtrs-srv.h b/drivers/infiniband/ulp/rtrs/rtrs-srv.h index 9543ae19996c..001889e148ac 100644 --- a/drivers/infiniband/ulp/rtrs/rtrs-srv.h +++ b/drivers/infiniband/ulp/rtrs/rtrs-srv.h @@ -13,6 +13,7 @@ #include #include #include "rtrs-pri.h" +#include "rtrs-fault.h" /* * enum rtrs_srv_state - Server states. @@ -73,6 +74,13 @@ struct rtrs_srv_mr { struct rtrs_iu *iu; /* send buffer for new rkey msg */ }; +struct rtrs_srv_fault_inject { +#ifdef CONFIG_FAULT_INJECTION_DEBUG_FS + struct rtrs_fault_inject fj; + bool fail_hb_ack; +#endif +}; + struct rtrs_srv_sess { struct rtrs_sess s; struct rtrs_srv *srv; @@ -90,6 +98,7 @@ struct rtrs_srv_sess { unsigned int mem_bits; struct kobject kobj; struct rtrs_srv_stats *stats; + struct rtrs_srv_fault_inject fault_inject; }; struct rtrs_srv { @@ -152,4 +161,8 @@ ssize_t rtrs_srv_reset_all_help(struct rtrs_srv_stats *stats, int rtrs_srv_create_sess_files(struct rtrs_srv_sess *sess); void rtrs_srv_destroy_sess_files(struct rtrs_srv_sess *sess); +void rtrs_srv_fault_inject_init(struct rtrs_srv_fault_inject *fault_inject, + struct rtrs_srv_sess *sess); +void rtrs_srv_fault_inject_final(struct rtrs_srv_fault_inject *fault_inject); +int rtrs_should_fail_hb_ack(struct rtrs_srv_fault_inject *fault_inject); #endif /* RTRS_SRV_H */ -- 2.25.1