Back out "AF_XDP/XSK UDP client transport (under facebook/)"

Summary:
Original commit changeset: 605ad4d6d3f4

Original Phabricator Diff: D109703046

Reviewed By: fb-bjorn

Differential Revision: D110310180

fbshipit-source-id: 77009bf3aeebdb723656724730b9d562decebf4f

Author: Stuart Clark

mcrouter/ProxyDestination-inl.h

@@ -303,7 +303,6 @@ void ProxyDestination<Transport>::initializeTransport() {
     options.qosPath = qosPath();
   }
   options.useJemallocNodumpAllocator = opts.jemalloc_nodump_buffers;
-  options.xdpTxTruncateBytes = opts.xdp_tx_truncate_bytes;
   if (accessPoint()->compressed()) {
     if (auto codecManager = proxy().router().getCodecManager()) {
       options.compressionCodecMap =

mcrouter/lib/mc/protocol.h

@@ -19,7 +19,6 @@ typedef enum mc_protocol_e {
   mc_binary_protocol = 2,
   mc_caret_protocol = 4,
   mc_thrift_protocol = 5,
-  mc_xdp_protocol = 6,
   mc_nprotocols, // placeholder
 } mc_protocol_t;
 
@@ -32,8 +31,6 @@ static inline mc_protocol_t mc_string_to_protocol(const char* str) {
     return mc_caret_protocol;
   } else if (!strcmp(str, "thrift")) {
     return mc_thrift_protocol;
-  } else if (!strcmp(str, "xdp")) {
-    return mc_xdp_protocol;
   } else {
     return mc_unknown_protocol;
   }
@@ -49,8 +46,6 @@ static inline const char* mc_protocol_to_string(const mc_protocol_t value) {
       return "caret";
     case mc_thrift_protocol:
       return "thrift";
-    case mc_xdp_protocol:
-      return "xdp";
     case mc_unknown_protocol:
     case mc_nprotocols:
     default:

mcrouter/lib/network/AccessPoint.cpp

@@ -59,8 +59,6 @@ mc_protocol_t parseProtocol(folly::StringPiece str) {
     return mc_caret_protocol;
   } else if (str == "thrift") {
     return mc_thrift_protocol;
-  } else if (str == "xdp") {
-    return mc_xdp_protocol;
   }
   throw std::runtime_error("Invalid protocol");
 }

mcrouter/lib/network/ConnectionOptions.h

@@ -146,13 +146,6 @@ struct ConnectionOptions {
    * iff thriftCompression is enabled.
    */
   size_t thriftCompressionThreshold{0};
-
-  /**
-   * AF_XDP/XSK client: max request datagram payload in bytes before the
-   * request is rejected with LOCAL_ERROR. 0 means no cap (clamp to the jumbo
-   * buffer size). Plumbed from the xdp_tx_truncate_bytes mcrouter option.
-   */
-  size_t xdpTxTruncateBytes{0};
 };
 } // namespace memcache
 } // namespace facebook

mcrouter/mcrouter_options_list.h

@@ -888,16 +888,6 @@ MCROUTER_OPTION_INTEGER(
     "Payloads >= thriftCompressionTreshold will be compressed "
     "iff thriftCompression is enabled.")
 
-MCROUTER_OPTION_INTEGER(
-    size_t,
-    xdp_tx_truncate_bytes,
-    3072,
-    "xdp-tx-truncate-bytes",
-    no_short,
-    "AF_XDP/XSK client: max request datagram payload in bytes before the "
-    "request is rejected with LOCAL_ERROR. 0 means no cap (clamp to the jumbo "
-    "buffer size). Default 3072 (3K).")
-
 MCROUTER_OPTION_TOGGLE(
     enable_axonlog,
     false,

mcrouter/routes/McRouteHandleProvider-inl.h

@@ -28,9 +28,6 @@
 #include "mcrouter/lib/network/FailureDomains.h"
 #include "mcrouter/lib/network/SecurityOptions.h"
 #include "mcrouter/lib/network/ThriftTransport.h"
-#if defined(__linux__) && !defined(ANDROID) && !defined(MCROUTER_OSS_BUILD)
-#include "mcrouter/lib/network/facebook/XdpTransport.h"
-#endif
 #include "mcrouter/lib/network/gen/MemcacheRouterInfo.h"
 #include "mcrouter/routes/AllFastestRouteFactory.h"
 #include "mcrouter/routes/AsynclogRoute.h"
@@ -408,25 +405,6 @@ McRouteHandleProvider<RouterInfo>::makePool(
               idx);
           accessPointsSet.insert(destResult.second);
           addDestination(std::move(destResult.first));
-#if defined(__linux__) && !defined(ANDROID) && !defined(MCROUTER_OSS_BUILD)
-        } else if (ap->getProtocol() == mc_xdp_protocol) {
-          using Transport = XdpTransport;
-          auto destResult = createDestinationRoute<Transport>(
-              std::move(ap),
-              timeout,
-              connectTimeout,
-              qosClass,
-              qosPath,
-              nameSp,
-              i,
-              poolStatIndex,
-              disableRequestDeadlineCheck,
-              poolTkoTracker,
-              keepRoutingPrefix,
-              idx);
-          accessPointsSet.insert(destResult.second);
-          addDestination(std::move(destResult.first));
-#endif
         } else {
           using Transport = AsyncMcClient;
           auto destResult = createDestinationRoute<Transport>(

mcrouter/routes/McRouteHandleProvider.cpp

@@ -79,8 +79,6 @@ std::shared_ptr<CommonAccessPointAttributes> getCommonAccessPointAttributes(
       protocol = mc_caret_protocol;
     } else if (equalStr("thrift", str, folly::AsciiCaseInsensitive())) {
       protocol = mc_thrift_protocol;
-    } else if (equalStr("xdp", str, folly::AsciiCaseInsensitive())) {
-      protocol = mc_xdp_protocol;
     } else {
       throwLogic("Unknown protocol '{}'", str);
     }